fix(core): tighten ansi-quote and double-quoted parameter desync checks

Replace bashDelimited and bashExpansion with recursive-descent parsing in
scanBash so nested subshells, command substitutions, process substitutions,
brace groups, and nofork substitutions use the same tokenizer and command
parser rather than a separate delimiter pre-scan.

Update redirect.test.ts for 'pwd && cd >out /outside', where a real shell
executes cd /outside after the redirect while legacy tree-sitter drops the
trailing directory operand.

bun.lock

@@ -33,7 +33,7 @@
     },
     "packages/ai": {
       "name": "@opencode/ai",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@aws-sdk/credential-providers": "3.1057.0",
         "@opencode/schema": "workspace:*",
@@ -55,7 +55,7 @@
     },
     "packages/app": {
       "name": "@opencode/app",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@corvu/drawer": "catalog:",
         "@dnd-kit/abstract": "0.5.0",
@@ -112,7 +112,7 @@
     },
     "packages/cli": {
       "name": "@opencode/cli",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "bin": {
         "opencode": "./bin/opencode.cjs",
         "opencode2": "./bin/opencode2.cjs",
@@ -179,7 +179,7 @@
     },
     "packages/client": {
       "name": "@opencode/client",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/protocol": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -205,7 +205,7 @@
     },
     "packages/codemode": {
       "name": "@opencode/codemode",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -218,7 +218,7 @@
     },
     "packages/console/app": {
       "name": "@opencode/console-app",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -254,7 +254,7 @@
     },
     "packages/console/core": {
       "name": "@opencode/console-core",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -281,7 +281,7 @@
     },
     "packages/console/function": {
       "name": "@opencode/console-function",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@openauthjs/openauth": "0.0.0-20250322224806",
         "@opencode/console-core": "workspace:*",
@@ -298,7 +298,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode/console-mail",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -322,7 +322,7 @@
     },
     "packages/console/support": {
       "name": "@opencode/console-support",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode/console-core": "workspace:*",
@@ -342,7 +342,7 @@
     },
     "packages/core": {
       "name": "@opencode/core",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@ai-sdk/cohere": "3.0.27",
         "@ai-sdk/gateway": "3.0.104",
@@ -383,6 +383,7 @@
         "mime-types": "3.0.2",
         "tree-sitter-bash": "0.25.0",
         "tree-sitter-powershell": "0.25.10",
+        "venice-ai-sdk-provider": "2.1.1",
         "web-tree-sitter": "0.25.10",
         "which": "6.0.1",
         "zod": "catalog:",
@@ -410,7 +411,7 @@
     },
     "packages/desktop": {
       "name": "@opencode/desktop",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "electron-context-menu": "5.0.0",
@@ -455,7 +456,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode/enterprise",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/sdk": "1.18.21",
@@ -492,7 +493,7 @@
     },
     "packages/function": {
       "name": "@opencode/function",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -508,7 +509,7 @@
     },
     "packages/gui-extensions": {
       "name": "@opencode/gui-extensions",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@dnd-kit/abstract": "0.5.0",
         "@dnd-kit/dom": "0.5.0",
@@ -553,7 +554,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode/http-recorder",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@effect/platform-node-shared": "4.0.0-rc.112",
       },
@@ -572,7 +573,7 @@
     },
     "packages/httpapi-codegen": {
       "name": "@opencode/httpapi-codegen",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "effect": "catalog:",
         "prettier": "3.6.2",
@@ -585,7 +586,7 @@
     },
     "packages/latex": {
       "name": "@opencode/latex",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -599,7 +600,7 @@
     },
     "packages/merman": {
       "name": "@opencode/merman",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -614,7 +615,7 @@
     },
     "packages/plugin": {
       "name": "@opencode/plugin",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode/ai": "workspace:*",
@@ -653,7 +654,7 @@
     },
     "packages/plugin-browser": {
       "name": "@opencode/plugin-browser",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -683,7 +684,7 @@
     },
     "packages/protocol": {
       "name": "@opencode/protocol",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/schema": "workspace:*",
         "effect": "catalog:",
@@ -698,7 +699,7 @@
     },
     "packages/schema": {
       "name": "@opencode/schema",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@standard-schema/spec": "catalog:",
         "effect": "catalog:",
@@ -722,7 +723,7 @@
     },
     "packages/sdk": {
       "name": "@opencode/sdk",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -743,7 +744,7 @@
     },
     "packages/server": {
       "name": "@opencode/server",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "@effect/platform-node-shared": "catalog:",
@@ -765,7 +766,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode/session-ui",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode/client": "workspace:*",
@@ -800,7 +801,7 @@
     },
     "packages/simulation": {
       "name": "@opencode/simulation",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/ai": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -820,7 +821,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode/stats-app",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@kobalte/core": "catalog:",
@@ -854,7 +855,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode/stats-core",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -873,7 +874,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode/stats-server",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -919,7 +920,7 @@
     },
     "packages/theme": {
       "name": "@opencode/theme",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opentui/core": "catalog:",
         "effect": "catalog:",
@@ -933,7 +934,7 @@
     },
     "packages/tui": {
       "name": "@opencode/tui",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -967,7 +968,7 @@
     },
     "packages/ui": {
       "name": "@opencode/ui",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -1002,7 +1003,7 @@
     },
     "packages/util": {
       "name": "@opencode/util",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@effect/opentelemetry": "catalog:",
         "@effect/platform-node": "catalog:",
@@ -1040,7 +1041,7 @@
     },
     "packages/web": {
       "name": "@opencode/web",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
@@ -1081,7 +1082,7 @@
     },
     "services/update": {
       "name": "@opencode/update",
-      "version": "2.0.23",
+      "version": "2.0.22",
       "dependencies": {
         "jose": "6.0.11",
         "semver": "catalog:",
@@ -3326,6 +3327,8 @@
 
     "@webgpu/types": ["@webgpu/types@0.1.54", "", {}, "sha512-81oaalC8LFrXjhsczomEQ0u3jG+TqE6V9QHLA8GNZq/Rnot0KDugu3LhSYSlie8tSdooAN1Hov05asrUUp9qgg=="],
 
+    "@workflow/serde": ["@workflow/serde@4.1.0", "", {}, "sha512-pav4F2BoirECWR7Nf1TKt+2eETcBj7jj4cBefQ8VXQCA6NPkaKeLfj/zMgi+3zYV5ZIBT4GuUiphsj0/b9hPQQ=="],
+
     "@xmldom/xmldom": ["@xmldom/xmldom@0.8.14", "", {}, "sha512-T4EDRUBVZYRldYApjEJiU0e1stYWaRAX7CuSnKzrpwdZKo53zGV8/pqfzV6FfwNl9YThD2OumQYvqtvjvgG7aQ=="],
 
     "@yuuang/ffi-rs-android-arm64": ["@yuuang/ffi-rs-android-arm64@1.3.7", "", { "os": "android", "cpu": "arm64" }, "sha512-t6Wx3Xll6c07Nuk0k3xnZsxKFxlshm92i0U/BiTHc6kQbvu+fMJF+gKsj4yEj886jH51CM3EqZT9Xdhq9CdUVw=="],
@@ -3366,6 +3369,8 @@
 
     "agentkeepalive": ["agentkeepalive@4.6.0", "", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="],
 
+    "ai": ["ai@7.0.66", "", { "dependencies": { "@ai-sdk/gateway": "4.0.52", "@ai-sdk/provider": "4.0.7", "@ai-sdk/provider-utils": "5.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wBUyoCYF3GVr+62nelBgR8YbpTSsMZrzFyOOjiwijylNSM2TFCW35C+Pml2vc59/WLMpyhS/LWZ55M+B9DAcSg=="],
+
     "ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="],
 
     "ajv-draft-04": ["ajv-draft-04@1.0.0", "", { "peerDependencies": { "ajv": "^8.5.0" }, "optionalPeers": ["ajv"] }, "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw=="],
@@ -5718,6 +5723,8 @@
 
     "validate-npm-package-name": ["validate-npm-package-name@7.0.2", "", {}, "sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A=="],
 
+    "venice-ai-sdk-provider": ["venice-ai-sdk-provider@2.1.1", "", { "dependencies": { "@ai-sdk/openai-compatible": "^2.0.51", "@ai-sdk/provider": "^3.0.10", "@ai-sdk/provider-utils": "^4.0.30" }, "peerDependencies": { "ai": "^6.0.90" } }, "sha512-w3OHkuzzKZ3r2TOxER6myBYzZJNoDqol+DUHu3NnfBN/GETnUVxecZJab0CHQQ8GZc0jjzpFymepjcLDPS4SQg=="],
+
     "vfile": ["vfile@6.0.3", "", { "dependencies": { "@types/unist": "^3.0.0", "vfile-message": "^4.0.0" } }, "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q=="],
 
     "vfile-location": ["vfile-location@5.0.3", "", { "dependencies": { "@types/unist": "^3.0.0", "vfile": "^6.0.0" } }, "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg=="],
@@ -6386,6 +6393,12 @@
 
     "@vscode/emmet-helper/jsonc-parser": ["jsonc-parser@2.3.1", "", {}, "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="],
 
+    "ai/@ai-sdk/gateway": ["@ai-sdk/gateway@4.0.52", "", { "dependencies": { "@ai-sdk/provider": "4.0.7", "@ai-sdk/provider-utils": "5.0.27", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-SXUM8jzzuTUJRq+EOgPd5to6DSx0EKslVn+IVZHbUEX6k/3vCPNrvjckbK26HnNxHU/STxm+zTSJteqrO+7Z0w=="],
+
+    "ai/@ai-sdk/provider": ["@ai-sdk/provider@4.0.7", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6or44XprPzKbr8zkmzosowSE0pxkvJcoojBL+mCZvPUt3kvXp3XSNqeVun9golb1acEfSo6yaEBRT18h2VU+1Q=="],
+
+    "ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@5.0.27", "", { "dependencies": { "@ai-sdk/provider": "4.0.7", "@standard-schema/spec": "^1.1.0", "@workflow/serde": "4.1.0", "eventsource-parser": "^3.0.8", "undici": "^7.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-EzAn4pdgG5g0xXtH6lE2zyNmfjDQIDjATkfqzuidEI35g++hh4+07vnjzkT/RmGmIClPZiRj/Q2GMPV2V7mkHw=="],
+
     "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
 
     "anymatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],
@@ -6690,6 +6703,12 @@
 
     "unzipper/fs-extra": ["fs-extra@11.3.1", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g=="],
 
+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.69", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@ai-sdk/provider-utils": "4.0.46" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-C99M0T0SpRkcCClmJxbQkpSqGmxLfh3NhTsNF3aNaUQZZ7oXN5sPWi9LGs49X5Q/r9FWxBYeZARXs15xxtGIig=="],
+
+    "venice-ai-sdk-provider/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
+
+    "venice-ai-sdk-provider/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.40", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-OL5IrpUm9Y8Dwy+w/vvFwPotS6m52O9W0op2oXgXdCROMJIBalBI0oro6OIBYkPxvm5Xg02GSkoQN25RlR0bnw=="],
+
     "vite-plugin-dynamic-import/acorn": ["acorn@8.18.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="],
 
     "vite-plugin-icons-spritesheet/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
@@ -7238,6 +7257,8 @@
 
     "@vitest/expect/@vitest/utils/@vitest/pretty-format": ["@vitest/pretty-format@3.2.4", "", { "dependencies": { "tinyrainbow": "^2.0.0" } }, "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA=="],
 
+    "ai/@ai-sdk/provider-utils/undici": ["undici@7.29.0", "", {}, "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw=="],
+
     "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
 
     "ansi-align/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
@@ -7536,6 +7557,10 @@
 
     "tw-to-css/tailwindcss/postcss": ["postcss@8.5.26", "", { "dependencies": { "nanoid": "^3.3.17", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ=="],
 
+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider": ["@ai-sdk/provider@3.0.15", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-XeZW1CcDF2GMbH4wejW6xBRI2QCOgnkVYUnxoeDadB1mf85riL2bMUeDoh+6gJ/r4mjNfzUPW8OjLjvwTP0u1Q=="],
+
+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.46", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8", "undici": "^6.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-tEtld97plCFiYevsJuOkGkeuhQndeMWFBVrJS4AjnbD5AqrNSXRCe0p+BZ3Cju/sxDeeZ9ym3q9YUV8fASA7aQ=="],
+
     "vitest/@vitest/expect/chai": ["chai@6.2.2", "", {}, "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg=="],
 
     "vscode-languageserver/vscode-languageserver-protocol/vscode-jsonrpc": ["vscode-jsonrpc@8.2.0", "", {}, "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="],
@@ -8414,6 +8439,8 @@
 
     "tw-to-css/tailwindcss/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="],
 
+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider-utils/undici": ["undici@6.28.0", "", {}, "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA=="],
+
     "yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
 
     "@astrojs/cloudflare/@cloudflare/vite-plugin/miniflare/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.35.2", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.3.1" }, "os": "darwin", "cpu": "arm64" }, "sha512-eEieHsMksAW4IiO5NzauESRl2D2qz3J/kwUxUrSfV06A93eEaRfMpHXyUb1mAqrR7i8U9A0GRqE9pjn6u1Jjpg=="],

nix/hashes.json

@@ -1,7 +1,7 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-4AqU8dPEwo0ukoyEX1SuDVzsXQ7G/fIPnxoL400zH4M=",
-    "aarch64-linux": "sha256-p75sJYtR8a4oVKb1+Dgp8Kl+1onSmUw5NRv95bbV1+E=",
-    "aarch64-darwin": "sha256-Psyvbw/lGulysQlhK/MqcHVIwx2aCDTr+Pfr+gRWsG4="
+    "x86_64-linux": "sha256-2RlbJRTEKSliuUbAE2lAktX63JFR/RKAuLkcCou8wb4=",
+    "aarch64-linux": "sha256-P7DAE018lTJNGmttg87U9oaTAuw/wHlnMStdnXYKCr0=",
+    "aarch64-darwin": "sha256-N+NfV1ObOTnW+ez7As+CS+6ci/iRGCQ6cslvyQFCp6E="
   }
 }

package.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode",
   "description": "AI-powered development tool",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "private": true,
   "type": "module",
   "packageManager": "bun@1.4.2",

packages/ai/README.md

@@ -106,41 +106,6 @@ for await (const event of ai.llm.stream(ai.llm.request(input))) {
 await ai.dispose()
 ```
 
-## Venice AI
-
-`Venice` provides native Chat Completions with streaming tools and reasoning. `model` and `chat`
-select the same API; credentials default to `VENICE_API_KEY`.
-
-```ts
-import { LLM } from "@opencode/ai"
-import { Venice } from "@opencode/ai/providers"
-import { Effect } from "effect"
-
-const program = Effect.gen(function* () {
-  const response = yield* LLM.generate({
-    model: Venice.configure({ apiKey: process.env.VENICE_API_KEY }).chat("qwen3-6-27b"),
-    prompt: "Explain this design.",
-    providerOptions: {
-      reasoningEffort: "high",
-      veniceParameters: { includeVeniceSystemPrompt: false },
-    },
-  })
-  console.log(response.text)
-})
-```
-
-Effort lowers to `reasoning.effort`; `reasoning.enabled` and `reasoning.summary` are also available.
-Supported effort levels and toggles depend on the selected model. Omitted controls preserve its defaults.
-Venice's added system prompt is disabled by default, matching the previous OpenCode Venice SDK behavior.
-
-Replay complete `response.message` values to retain signed/encrypted reasoning and Gemini thought
-signatures, including per-tool signatures. Venice's encrypted scalar trailers are excluded from visible
-reasoning but retained in provider metadata for replay. Cache affinity uses `promptCacheKey`, and cache-write
-usage reads Venice's `cache_creation_input_tokens` field.
-
-The native package entrypoint is `@opencode/ai/providers/venice`. Image generation, embeddings, Responses, and
-client-side E2EE are not implemented by this provider.
-
 ## Experimental evaluation
 
 Evaluation models compare shared state with typed choice, score, and boolean questions. The API is

packages/ai/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "name": "@opencode/ai",
   "type": "module",
   "license": "MIT",

packages/ai/src/protocols/anthropic-messages.ts

@@ -584,7 +584,10 @@ const serverToolResultType = (name: string): AnthropicServerToolResultType | und
   return undefined
 }
 
-const lowerServerToolResult = Effect.fnUntraced(function* (part: ToolResultPart, providerMetadataKey: string) {
+const lowerServerToolResult = Effect.fnUntraced(function* (
+  part: ToolResultPart,
+  providerMetadataKey: string,
+) {
   const wireType = serverToolResultType(part.name)
   if (!wireType)
     return yield* invalid(`Anthropic Messages does not know how to round-trip server tool result for ${part.name}`)
@@ -654,7 +657,10 @@ const citationsFromMetadata = (metadata: MediaPart["metadata"]): AnthropicDocume
 
 const isHttpUrl = (value: string) => /^https?:\/\//i.test(value.trim())
 
-const lowerMedia = Effect.fnUntraced(function* (part: MediaPart, breakpoints?: Cache.Breakpoints) {
+const lowerMedia = Effect.fnUntraced(function* (
+  part: MediaPart,
+  breakpoints?: Cache.Breakpoints,
+) {
   const mime = part.media.mediaType.toLowerCase()
   const cacheControlValue = breakpoints ? cacheControl(breakpoints, part.cache) : undefined
   const fileId = fileIdFromMetadata(part.metadata)
@@ -798,6 +804,9 @@ const requireThinkingSignature = (request: LLMRequest) => {
   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.
 // Opus 4.8 and every Claude 5 model accept mid-conversation system messages; later versions inherit support.
 const supportsNativeSystemUpdates = (request: LLMRequest) => {
   const version = claudeVersion(String(request.model.id))
@@ -806,9 +815,25 @@ const supportsNativeSystemUpdates = (request: LLMRequest) => {
   return version.major >= 5
 }
 
-// Native system messages must follow a user turn (tool results count) or a paused server-tool turn.
-const acceptsNativeSystemAfter = (message: AnthropicMessage | undefined) =>
-  message?.role === "user" || (message?.role === "assistant" && message.content.at(-1)?.type === "server_tool_use")
+const endsInServerToolUse = (message: LLMRequest["messages"][number]) => {
+  const last = message.content.at(-1)
+  return message.role === "assistant" && last?.type === "tool-call" && last.providerExecuted === true
+}
+
+const canUseNativeSystemUpdate = (request: LLMRequest, index: number) => {
+  const previous = request.messages[index - 1]
+  const next = request.messages[index + 1]
+  // Vertex currently rejects/404s for a system message after local tool results,
+  // so fold it into the user tool-result turn across continuations and history.
+  if (request.model.route.id === "google-vertex-messages" && previous?.role === "tool") return false
+  return (
+    previous !== undefined &&
+    previous.role !== "system" &&
+    (previous.role === "user" || previous.role === "tool" || endsInServerToolUse(previous)) &&
+    next?.role !== "system" &&
+    (next === undefined || next.role === "assistant")
+  )
+}
 
 const splitsLocalToolResults = (messages: LLMRequest["messages"], index: number) => {
   const pending = new Set<string>()
@@ -837,34 +862,12 @@ const lowerNativeSystemUpdate = Effect.fnUntraced(function* (
   }
 })
 
-const lowerWrappedSystemUpdate = Effect.fnUntraced(function* (
-  message: LLMRequest["messages"][number],
+const lowerMessages = Effect.fnUntraced(function* (
+  request: LLMRequest,
   breakpoints: Cache.Breakpoints,
 ) {
-  const part = yield* ProviderShared.wrappedSystemUpdate("Anthropic Messages", message)
-  return { type: "text" as const, text: part.text, cache_control: cacheControl(breakpoints, part.cache) }
-})
-
-const appendToUserTurn = (messages: AnthropicMessage[], block: AnthropicUserBlock) => {
-  const last = messages.at(-1)
-  if (last?.role === "user") messages[messages.length - 1] = { role: "user", content: [...last.content, block] }
-  else messages.push({ role: "user", content: [block] })
-}
-
-const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoints: Cache.Breakpoints) {
   const messages: AnthropicMessage[] = []
   const providerMetadataKey = request.model.route.providerMetadataKey ?? String(request.model.provider)
-  // Text updates stay where they are unless a user turn follows them; then they move after the latest
-  // user turn, the nearest spot where Anthropic accepts a native system message.
-  const holdUpdates = supportsNativeSystemUpdates(request)
-  const held: Array<LLMRequest["messages"][number]> = []
-  const releaseHeld = Effect.fnUntraced(function* () {
-    const native = acceptsNativeSystemAfter(messages.findLast((message) => message.role !== "system"))
-    for (const update of held.splice(0)) {
-      if (native) messages.push(yield* lowerNativeSystemUpdate(update, breakpoints))
-      else appendToUserTurn(messages, yield* lowerWrappedSystemUpdate(update, breakpoints))
-    }
-  })
 
   for (const [index, message] of request.messages.entries()) {
     if (message.role === "system") {
@@ -876,8 +879,16 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi
       }
       if (splitsLocalToolResults(request.messages, index))
         return yield* invalid("Anthropic Messages system updates cannot split a local tool call from its tool result")
-      if (holdUpdates) held.push(message)
-      else appendToUserTurn(messages, yield* lowerWrappedSystemUpdate(message, breakpoints))
+      if (supportsNativeSystemUpdates(request) && canUseNativeSystemUpdate(request, index)) {
+        messages.push(yield* lowerNativeSystemUpdate(message, breakpoints))
+        continue
+      }
+      const part = yield* ProviderShared.wrappedSystemUpdate("Anthropic Messages", message)
+      const block = { type: "text" as const, text: part.text, cache_control: cacheControl(breakpoints, part.cache) }
+      const previous = messages.at(-1)
+      if (previous?.role === "user")
+        messages[messages.length - 1] = { role: "user", content: [...previous.content, block] }
+      else messages.push({ role: "user", content: [block] })
       continue
     }
 
@@ -953,9 +964,7 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi
           `Anthropic Messages assistant messages only support text, reasoning, and tool-call content for now`,
         )
       }
-      if (content.length === 0) continue
-      yield* releaseHeld()
-      messages.push({ role: "assistant", content })
+      if (content.length > 0) messages.push({ role: "assistant", content })
       continue
     }
 
@@ -976,7 +985,6 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi
       messages[messages.length - 1] = { role: "user", content: [...previous.content, ...content] }
     else messages.push({ role: "user", content })
   }
-  yield* releaseHeld()
 
   return messages
 })

packages/ai/src/protocols/openai-chat.ts

@@ -65,7 +65,7 @@ const ExtraContent = Schema.Struct({
 })
 const decodeExtraContent = (value: unknown) => Option.getOrUndefined(Schema.decodeUnknownOption(ExtraContent)(value))
 
-export const OpenAIChatAssistantToolCall = Schema.Struct({
+const OpenAIChatAssistantToolCall = Schema.Struct({
   id: Schema.String,
   type: Schema.tag("function"),
   function: Schema.Struct({
@@ -134,7 +134,7 @@ const OpenAIChatUserContent = Schema.Union([
 ])
 type OpenAIChatUserContent = Schema.Schema.Type<typeof OpenAIChatUserContent>
 
-export const OpenAIChatMessage = Schema.Union([
+const OpenAIChatMessage = Schema.Union([
   Schema.Struct({
     role: Schema.Literal("system"),
     content: Schema.Union([Schema.String, Schema.Array(OpenAIChatUserContent)]),
@@ -200,7 +200,7 @@ export type OpenAIChatBody = Schema.Schema.Type<typeof OpenAIChatBody>
 // The event schema is one decoded SSE `data:` payload. `Framing.sse` splits the
 // byte stream into strings, then `Protocol.jsonEvent` decodes each string into
 // this provider-native event shape.
-export const OpenAIChatUsage = Schema.StructWithRest(
+const OpenAIChatUsage = Schema.StructWithRest(
   Schema.Struct({
     prompt_tokens: optionalNull(Schema.Number),
     completion_tokens: optionalNull(Schema.Number),
@@ -238,7 +238,7 @@ const OpenAIChatToolCallDeltaFunction = Schema.Struct({
   arguments: optionalNull(Schema.String),
 })
 
-export const OpenAIChatToolCallDelta = Schema.Struct({
+const OpenAIChatToolCallDelta = Schema.Struct({
   index: optionalNull(Schema.Number),
   id: optionalNull(Schema.String),
   function: optionalNull(OpenAIChatToolCallDeltaFunction),
@@ -246,7 +246,7 @@ export const OpenAIChatToolCallDelta = Schema.Struct({
 })
 type OpenAIChatToolCallDelta = Schema.Schema.Type<typeof OpenAIChatToolCallDelta>
 
-export const OpenAIChatDelta = Schema.StructWithRest(
+const OpenAIChatDelta = Schema.StructWithRest(
   Schema.Struct({
     content: optionalNull(Schema.String),
     refusal: optionalNull(Schema.String),
@@ -259,7 +259,7 @@ export const OpenAIChatDelta = Schema.StructWithRest(
   [Schema.Record(Schema.String, Schema.Unknown)],
 )
 
-export const OpenAIChatChoice = Schema.StructWithRest(
+const OpenAIChatChoice = Schema.StructWithRest(
   Schema.Struct({
     delta: optionalNull(OpenAIChatDelta),
     finish_reason: optionalNull(Schema.String),
@@ -326,8 +326,6 @@ export interface ParserState {
 interface LoweringOptions {
   readonly cacheControl?: (cache: CacheHint | undefined) => OpenAIChatCacheControl | undefined
   readonly toolCallID?: (id: string) => string
-  /** Project provider-specific fields from the exact source, even when other messages are dropped during lowering. */
-  readonly assistant?: (source: LLMRequest["messages"][number], message: OpenAIChatMessage) => OpenAIChatMessage
 }
 
 const lowerTool = (tool: ToolDefinition, options: LoweringOptions, supportsStrictMode: boolean): OpenAIChatTool => ({
@@ -541,10 +539,8 @@ const lowerMessage = Effect.fnUntraced(function* (
   options: LoweringOptions & { readonly providerMetadataKey: string },
 ) {
   if (message.role === "user") return [yield* lowerUserMessage(message, options)]
-  if (message.role === "assistant") {
-    const lowered = yield* lowerAssistantMessage(message, reasoningField, requireReasoning, options)
-    return [options.assistant?.(message, lowered) ?? lowered]
-  }
+  if (message.role === "assistant")
+    return [yield* lowerAssistantMessage(message, reasoningField, requireReasoning, options)]
   return (yield* lowerToolMessages(message, options)).messages
 })
 
@@ -1218,7 +1214,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
     ] as const
   })
 
-export const finishEvents = Effect.fnUntraced(function* (state: ParserState) {
+const finishEvents = Effect.fnUntraced(function* (state: ParserState) {
   if (state.finishReason === undefined && state.requireFinishReason)
     return yield* new AIError({
       reason: new InvalidProviderOutputError({

packages/ai/src/protocols/venice-chat.ts

@@ -1,374 +0,0 @@
-import { Effect, Schema } from "effect"
-import { Protocol } from "../route/protocol.js"
-import { AIError, LLMEvent, type LanguageModelCompatibility, type LLMRequest } from "../schema/index.js"
-import { classifyProviderFailure } from "../provider-error.js"
-import { OpenAIChat } from "./openai-chat.js"
-import { JsonObject, optionalArray, optionalNull, ProviderShared } from "./shared.js"
-import { cacheControl } from "./utils/cache.js"
-
-// ---------------------------------------------------------------------------
-// Public options and request body
-// ---------------------------------------------------------------------------
-
-export type ReasoningEffort = "none" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max" | (string & {})
-
-const Parameters = Schema.Struct({
-  enableWebSearch: Schema.optional(Schema.String),
-  enableWebScraping: Schema.optional(Schema.Boolean),
-  enableWebCitations: Schema.optional(Schema.Boolean),
-  enableXSearch: Schema.optional(Schema.Boolean),
-  stripThinkingResponse: Schema.optional(Schema.Boolean),
-  disableThinking: Schema.optional(Schema.Boolean),
-  includeVeniceSystemPrompt: Schema.optional(Schema.Boolean),
-  characterSlug: Schema.optional(Schema.String),
-  includeSearchResultsInStream: Schema.optional(Schema.Boolean),
-  returnSearchResultsAsDocuments: Schema.optional(Schema.Boolean),
-})
-
-const Reasoning = Schema.Struct({
-  effort: Schema.optional(Schema.String),
-  enabled: Schema.optional(Schema.Boolean),
-  summary: Schema.optional(Schema.String),
-})
-
-export type OptionsInput = {
-  readonly reasoningEffort?: ReasoningEffort
-  readonly reasoning?: {
-    readonly effort?: ReasoningEffort
-    readonly enabled?: boolean
-    readonly summary?: "auto" | "concise" | "detailed" | (string & {})
-  }
-  readonly veniceParameters?: Omit<typeof Parameters.Type, "enableWebSearch"> & {
-    readonly enableWebSearch?: "off" | "on" | "auto" | (string & {})
-  }
-  readonly promptCacheKey?: string
-  readonly promptCacheRetention?: "default" | "extended" | "24h" | (string & {})
-  readonly parallelToolCalls?: boolean
-  readonly maxCompletionTokens?: number
-  readonly maxTokens?: number
-  readonly minP?: number
-  readonly repetitionPenalty?: number
-  readonly stopTokenIds?: readonly number[]
-  readonly logprobs?: boolean
-  readonly topLogprobs?: number
-  readonly maxTemp?: number
-  readonly minTemp?: number
-  readonly responseFormat?: Readonly<Record<string, unknown>>
-  readonly user?: string
-}
-
-const Options = Schema.Struct({
-  reasoningEffort: Schema.optional(Schema.String),
-  reasoning: Schema.optional(Reasoning),
-  veniceParameters: Schema.optional(Parameters),
-  promptCacheKey: Schema.optional(Schema.String),
-  promptCacheRetention: Schema.optional(Schema.String),
-  parallelToolCalls: Schema.optional(Schema.Boolean),
-  maxCompletionTokens: Schema.optional(Schema.Number),
-  maxTokens: Schema.optional(Schema.Number),
-  minP: Schema.optional(Schema.Number),
-  repetitionPenalty: Schema.optional(Schema.Number),
-  stopTokenIds: Schema.optional(Schema.Array(Schema.Number)),
-  logprobs: Schema.optional(Schema.Boolean),
-  topLogprobs: Schema.optional(Schema.Number),
-  maxTemp: Schema.optional(Schema.Number),
-  minTemp: Schema.optional(Schema.Number),
-  responseFormat: Schema.optional(JsonObject),
-  user: Schema.optional(Schema.String),
-})
-
-const ToolCall = Schema.Struct({
-  ...OpenAIChat.OpenAIChatAssistantToolCall.fields,
-  thought_signature: Schema.optional(Schema.String),
-})
-const Assistant = Schema.StructWithRest(
-  Schema.Struct({
-    ...OpenAIChat.OpenAIChatMessage.cases.assistant.schema.fields,
-    tool_calls: optionalArray(ToolCall),
-    thought_signature: Schema.optional(Schema.String),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-const Messages = Schema.Array(
-  Schema.Union([
-    OpenAIChat.OpenAIChatMessage.cases.system,
-    OpenAIChat.OpenAIChatMessage.cases.user,
-    Assistant,
-    OpenAIChat.OpenAIChatMessage.cases.tool,
-  ]),
-)
-const Body = Schema.Struct({
-  ...OpenAIChat.bodyFields,
-  messages: Messages,
-  reasoning: Schema.optional(Reasoning),
-  venice_parameters: Schema.Record(Schema.String, Schema.Union([Schema.String, Schema.Boolean])),
-  prompt_cache_retention: Options.fields.promptCacheRetention,
-  parallel_tool_calls: Options.fields.parallelToolCalls,
-  min_p: Options.fields.minP,
-  top_k: Schema.optional(Schema.Number),
-  repetition_penalty: Options.fields.repetitionPenalty,
-  stop_token_ids: Options.fields.stopTokenIds,
-  logprobs: Options.fields.logprobs,
-  top_logprobs: Options.fields.topLogprobs,
-  max_temp: Options.fields.maxTemp,
-  min_temp: Options.fields.minTemp,
-  response_format: Options.fields.responseFormat,
-  user: Options.fields.user,
-})
-
-// ---------------------------------------------------------------------------
-// Streaming schemas and state
-// ---------------------------------------------------------------------------
-
-const ToolDelta = Schema.Struct({
-  ...OpenAIChat.OpenAIChatToolCallDelta.fields,
-  thought_signature: optionalNull(Schema.String),
-})
-const Delta = Schema.StructWithRest(
-  Schema.Struct({
-    ...OpenAIChat.OpenAIChatDelta.schema.fields,
-    tool_calls: optionalNull(Schema.Array(ToolDelta)),
-    thought_signature: optionalNull(Schema.String),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-const Choice = Schema.StructWithRest(
-  Schema.Struct({ ...OpenAIChat.OpenAIChatChoice.schema.fields, delta: optionalNull(Delta) }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-const Usage = Schema.StructWithRest(
-  Schema.Struct({
-    ...OpenAIChat.OpenAIChatUsage.schema.fields,
-    prompt_tokens_details: optionalNull(
-      Schema.StructWithRest(
-        Schema.Struct({
-          cached_tokens: optionalNull(Schema.Number),
-          cache_write_tokens: optionalNull(Schema.Number),
-          cache_creation_input_tokens: optionalNull(Schema.Number),
-        }),
-        [Schema.Record(Schema.String, Schema.Unknown)],
-      ),
-    ),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-const Event = Schema.StructWithRest(
-  Schema.Struct({
-    ...OpenAIChat.OpenAIChatEvent.schema.fields,
-    choices: optionalNull(Schema.Array(Choice)),
-    usage: optionalNull(Usage),
-    error: optionalNull(Schema.Union([Schema.String, OpenAIChat.OpenAIChatEvent.schema.fields.error.schema])),
-    issues: optionalArray(
-      Schema.Struct({
-        message: Schema.String,
-        path: Schema.optional(Schema.Array(Schema.Union([Schema.String, Schema.Number]))),
-      }),
-    ),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-
-interface State {
-  readonly shared: OpenAIChat.ParserState
-  readonly pending: string
-  readonly reasoning: string
-  readonly encrypted: boolean
-  readonly signature?: string
-  readonly tools: Readonly<Record<string, string>>
-}
-
-const MARKER = "__ENCRYPTED_REASONING__"
-
-// ---------------------------------------------------------------------------
-// Request lowering
-// ---------------------------------------------------------------------------
-
-const fromRequest = Effect.fn("VeniceChat.fromRequest")(function* (request: LLMRequest) {
-  const options = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Options))(request.providerOptions ?? {})
-  const body = yield* OpenAIChat.fromRequest(request, {
-    cacheControl: cacheControl(),
-    assistant: (source, message) => {
-      if (message.role !== "assistant") return message
-      const parts = source.content.filter(
-        (part) => part.type === "text" || part.type === "reasoning" || part.type === "tool-call",
-      )
-      const calls = source.content.filter((part) => part.type === "tool-call")
-      const signature = parts
-        .map((part) => part.providerMetadata?.venice?.messageThoughtSignature)
-        .find((value) => typeof value === "string")
-      const raw = parts
-        .map((part) => part.providerMetadata?.venice?.encryptedReasoningContent)
-        .find((value) => typeof value === "string")
-      return {
-        ...message,
-        ...(signature === undefined ? {} : { thought_signature: signature }),
-        ...(raw === undefined ? {} : { reasoning_content: raw }),
-        tool_calls: message.tool_calls?.map((call, index) => {
-          const signature = calls[index]?.providerMetadata?.venice?.thoughtSignature
-          return { ...call, ...(typeof signature === "string" ? { thought_signature: signature } : {}) }
-        }),
-      }
-    },
-  })
-  return {
-    ...body,
-    max_completion_tokens: options.maxCompletionTokens ?? options.maxTokens ?? request.generation?.maxTokens,
-    reasoning_effort: undefined,
-    reasoning:
-      options.reasoningEffort === undefined
-        ? options.reasoning
-        : { ...options.reasoning, effort: options.reasoningEffort },
-    // Match the previous Venice SDK default, not the gateway's added prompt.
-    venice_parameters: Object.fromEntries(
-      Object.entries({
-        ...options.veniceParameters,
-        includeVeniceSystemPrompt: options.veniceParameters?.includeVeniceSystemPrompt ?? false,
-      })
-        .filter(([, value]) => value !== undefined)
-        .map(([key, value]) => [key.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`), value]),
-    ),
-    prompt_cache_retention: options.promptCacheRetention,
-    parallel_tool_calls: options.parallelToolCalls,
-    min_p: options.minP,
-    top_k: request.generation?.topK,
-    repetition_penalty: options.repetitionPenalty,
-    stop_token_ids: options.stopTokenIds,
-    logprobs: options.logprobs,
-    top_logprobs: options.topLogprobs,
-    max_temp: options.maxTemp,
-    min_temp: options.minTemp,
-    response_format: options.responseFormat,
-    user: options.user,
-  }
-})
-
-// ---------------------------------------------------------------------------
-// Venice normalization around the shared Chat state machine
-// ---------------------------------------------------------------------------
-
-const step = Effect.fn("VeniceChat.step")(function* (state: State, event: typeof Event.Type) {
-  if (typeof event.error === "string")
-    return yield* new AIError({
-      reason: classifyProviderFailure({
-        message: [
-          event.error,
-          ...(event.issues ?? []).map(
-            (issue) => `${issue.path?.length ? `${issue.path.join(".")}: ` : ""}${issue.message}`,
-          ),
-        ].join("; "),
-        rawBody: ProviderShared.encodeJson(event),
-      }),
-    })
-  const delta = event.choices?.[0]?.delta
-  const scalar = delta?.reasoning_content ?? ""
-  const text = state.pending + scalar
-  const marker = text.indexOf(MARKER)
-  const pending =
-    marker >= 0 || state.encrypted
-      ? 0
-      : (Array.from({ length: Math.min(text.length, MARKER.length - 1) }, (_, index) => index + 1)
-          .filter((length) => text.endsWith(MARKER.slice(0, length)))
-          .at(-1) ?? 0)
-  const visible = state.encrypted ? "" : marker >= 0 ? text.slice(0, marker) : text.slice(0, text.length - pending)
-  const result = yield* OpenAIChat.protocol.stream.step(state.shared, {
-    ...event,
-    error: event.error,
-    usage: event.usage
-      ? {
-          ...event.usage,
-          prompt_tokens_details: event.usage.prompt_tokens_details
-            ? {
-                ...event.usage.prompt_tokens_details,
-                cache_write_tokens:
-                  event.usage.prompt_tokens_details.cache_write_tokens ??
-                  event.usage.prompt_tokens_details.cache_creation_input_tokens,
-              }
-            : event.usage.prompt_tokens_details,
-        }
-      : event.usage,
-    choices: event.choices?.map((choice, index) =>
-      index === 0 && choice.delta
-        ? {
-            ...choice,
-            delta: {
-              ...choice.delta,
-              reasoning_content: visible || undefined,
-              // Opaque-only scalar reasoning still needs a canonical part for replay.
-              reasoning_details: choice.delta.reasoning_details ?? (marker >= 0 ? [] : undefined),
-            },
-          }
-        : choice,
-    ),
-  })
-  const tools = { ...state.tools }
-  for (const call of delta?.tool_calls ?? []) {
-    if (!call.thought_signature) continue
-    const index = call.index ?? result[0].latestToolIndex
-    const id =
-      call.id ?? (index === undefined ? undefined : (result[0].tools[index]?.id ?? result[0].pendingTools[index]?.id))
-    if (id) tools[id] = call.thought_signature
-  }
-  return [
-    {
-      shared: result[0],
-      pending: pending ? text.slice(-pending) : "",
-      reasoning: state.reasoning + scalar,
-      encrypted: state.encrypted || marker >= 0,
-      signature: delta?.thought_signature ?? state.signature,
-      tools,
-    },
-    result[1],
-  ] as const
-})
-
-const onHalt = Effect.fn("VeniceChat.onHalt")(function* (state: State) {
-  const events = yield* OpenAIChat.finishEvents(state.shared)
-  return events.flatMap((event): LLMEvent[] => {
-    if (
-      event.type !== "reasoning-end" &&
-      event.type !== "text-end" &&
-      event.type !== "tool-call" &&
-      event.type !== "tool-input-end"
-    )
-      return [event]
-    const signature = event.type === "tool-call" || event.type === "tool-input-end" ? state.tools[event.id] : undefined
-    const providerMetadata = {
-      ...event.providerMetadata,
-      venice: {
-        ...event.providerMetadata?.venice,
-        ...(state.signature ? { messageThoughtSignature: state.signature } : {}),
-        ...(signature ? { thoughtSignature: signature } : {}),
-        ...(event.type === "reasoning-end" && state.encrypted ? { encryptedReasoningContent: state.reasoning } : {}),
-      },
-    }
-    if (event.type === "reasoning-end" && state.pending)
-      return [LLMEvent.reasoningDelta({ id: event.id, text: state.pending }), { ...event, providerMetadata }]
-    return [{ ...event, providerMetadata }]
-  })
-})
-
-export const compatibility = {
-  maxTokensField: "max_completion_tokens",
-  supportsStore: false,
-  supportsPromptCacheKey: true,
-} satisfies LanguageModelCompatibility
-
-export const protocol = Protocol.make({
-  id: "venice-chat",
-  body: { schema: Body, from: fromRequest },
-  stream: {
-    event: Schema.Union([Schema.Literal("[DONE]"), Protocol.jsonEvent(Event)]),
-    initial: (request): State => ({
-      shared: OpenAIChat.protocol.stream.initial(request),
-      pending: "",
-      reasoning: "",
-      encrypted: false,
-      tools: {},
-    }),
-    step: (state: State, event) => (event === "[DONE]" ? Effect.succeed([state, []] as const) : step(state, event)),
-    terminal: (event) => event === "[DONE]",
-    onHalt,
-  },
-})
-
-export * as VeniceChat from "./venice-chat.js"

packages/ai/src/providers/google-vertex-messages.ts

@@ -54,7 +54,6 @@ const route = Route.make({
         ),
     },
     stream: AnthropicMessages.protocol.stream,
-    supportsEffortUpdates: AnthropicMessages.protocol.supportsEffortUpdates,
   }),
   endpoint: Endpoint.path(({ request }) => `/${request.model.id}:streamRawPredict`),
   auth: Auth.none,

packages/ai/src/providers/index.ts

@@ -40,7 +40,6 @@ export * as Stability from "./stability.js"
 export * as TogetherAI from "./togetherai.js"
 export * as TypeSafeAI from "./typesafe-ai.js"
 export * as VercelAIGateway from "./vercel-ai-gateway.js"
-export * as Venice from "./venice.js"
 export * as XAI from "./xai.js"
 export * as ZAI from "./zai.js"
 export * as ZAICodingPlan from "./zai-coding-plan.js"

packages/ai/src/providers/venice.ts

@@ -1,62 +0,0 @@
-import type { ProviderPackage } from "../provider-package.js"
-import { VeniceChat } from "../protocols/venice-chat.js"
-import { OpenAIChat } from "../protocols/openai-chat.js"
-import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
-import { Route, type RouteDefaultsInput } from "../route/client.js"
-import { Endpoint } from "../route/endpoint.js"
-import { ProviderID, type ModelID } from "../schema/index.js"
-
-export const id = ProviderID.make("venice")
-export type ChatOptionsInput = VeniceChat.OptionsInput
-export type Config = Omit<RouteDefaultsInput, "providerOptions"> &
-  ProviderAuthOption<"optional"> & {
-    readonly baseURL?: string
-    readonly queryParams?: Readonly<Record<string, string>>
-    readonly providerOptions?: ChatOptionsInput
-  }
-export type Settings = ProviderPackage.Settings &
-  ChatOptionsInput & {
-    readonly apiKey?: string
-    readonly baseURL?: string
-    readonly queryParams?: Readonly<Record<string, string>>
-  }
-
-const route = Route.make({
-  id: "venice-chat",
-  provider: id,
-  providerMetadataKey: "venice",
-  protocol: VeniceChat.protocol,
-  endpoint: Endpoint.path("/chat/completions", { baseURL: "https://api.venice.ai/api/v1" }),
-  framing: OpenAIChat.framing,
-})
-export const routes = [route]
-
-export const configure = (input: Config = {}) => {
-  const { apiKey: _apiKey, auth: _auth, baseURL, queryParams, ...rest } = input
-  const chat = (modelID: string | ModelID) =>
-    route
-      .with({
-        ...rest,
-        endpoint: { baseURL: baseURL ?? route.endpoint.baseURL, query: queryParams },
-        auth: AuthOptions.bearer(input, "VENICE_API_KEY"),
-      })
-      .model<ChatOptionsInput>({ id: modelID, compatibility: VeniceChat.compatibility })
-  return { id, model: chat, chat, configure }
-}
-
-export const provider = configure()
-export const chat = provider.chat
-export const model: ProviderPackage.Definition<Settings, ChatOptionsInput>["model"] = (
-  modelID,
-  { apiKey, baseURL, queryParams, body, headers, ...providerOptions },
-) =>
-  configure({
-    apiKey,
-    baseURL,
-    queryParams,
-    headers,
-    http: body === undefined ? undefined : { body: { ...body } },
-    providerOptions,
-  }).model(modelID)
-
-export * as Venice from "./venice.js"

packages/ai/test/effort-updates.test.ts

@@ -171,33 +171,6 @@ describe("Anthropic Messages effort updates", () => {
     }),
   )
 
-  it.effect("releases a held system update next to an effort marker as one valid section", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: opus5,
-          messages: [
-            Message.user("Fix it."),
-            Message.assistant("Done."),
-            lowFromHigh,
-            Message.system("Update."),
-            Message.user("Next."),
-          ],
-          providerOptions: { effort: "low" },
-          cache: "none",
-        }),
-      )
-
-      expect(prepared.body.messages).toEqual([
-        { role: "user", content: [{ type: "text", text: "Fix it." }] },
-        { role: "assistant", content: [{ type: "text", text: "Done." }] },
-        { role: "system", content: [], output_config: { effort: "low" } },
-        { role: "user", content: [{ type: "text", text: "Next." }] },
-        { role: "system", content: [{ type: "text", text: "Update.", cache_control: undefined }] },
-      ])
-    }),
-  )
-
   it.effect("falls back to a plain top-level effort when history drifted from the current effort", () =>
     Effect.gen(function* () {
       const drifted = yield* compileRequest(
@@ -293,28 +266,20 @@ describe("Anthropic Messages effort updates", () => {
     }),
   )
 
-  it.effect("lowers markers on the Vertex Anthropic route for models that support them", () =>
+  it.effect("strips markers on the Vertex Anthropic route, whose protocol wrapper does not forward support", () =>
     Effect.gen(function* () {
-      const vertex = GoogleVertexMessages.configure({ accessToken: "test", location: "global", project: "test" })
-      const opus5 = yield* compileRequest(
+      const prepared = yield* compileRequest(
         LLM.request({
-          model: vertex.model("claude-opus-5"),
-          messages: conversation,
-          providerOptions: { effort: "low" },
-        }),
-      )
-      const opus48 = yield* compileRequest(
-        LLM.request({
-          model: vertex.model("claude-opus-4-8"),
+          model: GoogleVertexMessages.configure({ accessToken: "test", location: "global", project: "test" }).model(
+            "claude-opus-5",
+          ),
           messages: conversation,
           providerOptions: { effort: "low" },
         }),
       )
 
-      expect(systemMessages(opus5.body)).toEqual([{ role: "system", content: [], output_config: { effort: "low" } }])
-      expect(opus5.body.output_config).toEqual({ effort: "high" })
-      expect(systemMessages(opus48.body)).toHaveLength(0)
-      expect(opus48.body.output_config).toEqual({ effort: "low" })
+      expect(systemMessages(prepared.body)).toHaveLength(0)
+      expect(prepared.body.output_config).toEqual({ effort: "low" })
     }),
   )
 })

packages/ai/test/fixtures/recordings/venice-chat/claude-opus-4-8-preserves-reasoning-through-a-tool-loop-and-follow-up.json

@@ -1,75 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "model": "claude-opus-4-8",
-    "tags": [
-      "prefix:venice-chat",
-      "provider:venice",
-      "protocol:venice-chat",
-      "reasoning",
-      "tool",
-      "tool-loop",
-      "continuation",
-      "usage",
-      "signed"
-    ],
-    "name": "venice-chat/claude-opus-4-8-preserves-reasoning-through-a-tool-loop-and-follow-up",
-    "recordedAt": "2026-10-05T03:00:37.127Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"claude-opus-4-8\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169233,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\"},\"finish_reason\":null}]}\n\n: processing\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"I need to find the rate for\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"I need to find the rate for\"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" ZEBRA.\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\" ZEBRA.\"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"\\n\\n\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"\\n\\n\"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"\",\"signature\":\"EsECCrwBCBIYAipASM082xA/ckQU1q1MLSuAGRD/F94kvqoBlyXoEKdxvH2f2kn+ESR0AZfmYtv8VB8ux7LQ+qq4DnODYQ2iBHemajIPY2xhdWRlLW9wdXMtNC04OABCCHRoaW5raW5nWiQ1YzJjNzI5YS0wMzVjLTQ5ZDYtODNiOC03NGNhZTAyMzU2NWRyEOtICOPsjcfgmcoVEjPetDWIAQGaAREKD2NsYXVkZS1vcHVzLTQtOKgB0qWM1gawAQISDFJE1AThUPJ/0OxIBxoMak46jCiQRsOzj1nIIjBV1UQ4WoUBtZX8F6kyFtKyRPkLdWp7WQKQYd+f4VT3GvmEqenUY2ANNJImtDj/BQAqMhz7JVFNqrlemYzJNRbF6ntHDPc2enCrd/tYXBG6nms1qbcfKWc7CYc2ZGogOqiItKNDGAE=\",\"id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\"}],\"tool_calls\":[{\"index\":0,\"id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"\"}}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"{\\\"code\\\"\"}}]},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\": \\\"ZEBR\"}}]},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"A\\\"}\"}}]},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{},\"finish_reason\":\"tool_calls\"}]}\n\ndata: {\"id\":\"msg_011CfiLtM3Rj4dVUWFJAEjoy\",\"object\":\"chat.completion.chunk\",\"created\":1791169234,\"model\":\"claude-opus-4-8\",\"choices\":[],\"usage\":{\"prompt_tokens\":499,\"completion_tokens\":74,\"total_tokens\":573,\"prompt_tokens_details\":{\"cached_tokens\":0}},\"cost\":{\"usd\":0.005214,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"claude-opus-4-8\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"I need to find the rate for ZEBRA.\\n\\n\",\"id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"signature\":\"EsECCrwBCBIYAipASM082xA/ckQU1q1MLSuAGRD/F94kvqoBlyXoEKdxvH2f2kn+ESR0AZfmYtv8VB8ux7LQ+qq4DnODYQ2iBHemajIPY2xhdWRlLW9wdXMtNC04OABCCHRoaW5raW5nWiQ1YzJjNzI5YS0wMzVjLTQ5ZDYtODNiOC03NGNhZTAyMzU2NWRyEOtICOPsjcfgmcoVEjPetDWIAQGaAREKD2NsYXVkZS1vcHVzLTQtOKgB0qWM1gawAQISDFJE1AThUPJ/0OxIBxoMak46jCiQRsOzj1nIIjBV1UQ4WoUBtZX8F6kyFtKyRPkLdWp7WQKQYd+f4VT3GvmEqenUY2ANNJImtDj/BQAqMhz7JVFNqrlemYzJNRbF6ntHDPc2enCrd/tYXBG6nms1qbcfKWc7CYc2ZGogOqiItKNDGAE=\"}],\"reasoning_content\":\"I need to find the rate for ZEBRA.\\n\\n\"},{\"role\":\"tool\",\"tool_call_id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169235,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\"},\"finish_reason\":null}]}\n\n: processing\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"23 times 17 is \",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"23 times 17 is \"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"391, plus 9 g\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"391, plus 9 g\"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"ives 400.\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"ives 400.\"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"\\n\\n\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"\\n\\n\"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"text\":\"\",\"signature\":\"ErgCCrwBCBIYAipAzm6Uz1fiUimJZ7ry16/5jOPhPfQ9Zm3zSb449atO4+Dv3KroxOwD17dLjPUhdRWeFNghT/lQsCRlsY9T6SWyMzIPY2xhdWRlLW9wdXMtNC04OABCCHRoaW5raW5nWiQ1YzJjNzI5YS0wMzVjLTQ5ZDYtODNiOC03NGNhZTAyMzU2NWRyEGhpfnmythMRLK5wcAMHasmIAQGaAREKD2NsYXVkZS1vcHVzLTQtOKgB1KWM1gawAQISDA4K+cR55K4LQVXyhhoMBUHsSBuaNQlHp5ZPIjBvSX58DhVBxFRl9sVZYgZwrMDqGzC1/tgyH1wflAP4TkHTPje+Gdbv0yUxBBIQtaEqKSS4Bh4olHSAKxLEG1SyH4Iy46lp50SxdXxGJ/PIwTfHI47SEaE9pEfNGAE=\"}],\"content\":\"\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"400\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{},\"finish_reason\":\"stop\"}]}\n\ndata: {\"id\":\"msg_011CfiLtUi3ffKFSXdhWtFbp\",\"object\":\"chat.completion.chunk\",\"created\":1791169236,\"model\":\"claude-opus-4-8\",\"choices\":[],\"usage\":{\"prompt_tokens\":183,\"completion_tokens\":23,\"total_tokens\":206,\"prompt_tokens_details\":{\"cached_tokens\":0}},\"cost\":{\"usd\":0.001788,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"claude-opus-4-8\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"I need to find the rate for ZEBRA.\\n\\n\",\"id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"signature\":\"EsECCrwBCBIYAipASM082xA/ckQU1q1MLSuAGRD/F94kvqoBlyXoEKdxvH2f2kn+ESR0AZfmYtv8VB8ux7LQ+qq4DnODYQ2iBHemajIPY2xhdWRlLW9wdXMtNC04OABCCHRoaW5raW5nWiQ1YzJjNzI5YS0wMzVjLTQ5ZDYtODNiOC03NGNhZTAyMzU2NWRyEOtICOPsjcfgmcoVEjPetDWIAQGaAREKD2NsYXVkZS1vcHVzLTQtOKgB0qWM1gawAQISDFJE1AThUPJ/0OxIBxoMak46jCiQRsOzj1nIIjBV1UQ4WoUBtZX8F6kyFtKyRPkLdWp7WQKQYd+f4VT3GvmEqenUY2ANNJImtDj/BQAqMhz7JVFNqrlemYzJNRbF6ntHDPc2enCrd/tYXBG6nms1qbcfKWc7CYc2ZGogOqiItKNDGAE=\"}],\"reasoning_content\":\"I need to find the rate for ZEBRA.\\n\\n\"},{\"role\":\"tool\",\"tool_call_id\":\"toolu_01KYDseHbTDZXSYg9bNwiwxU\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"},{\"role\":\"assistant\",\"content\":\"400\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"23 times 17 is 391, plus 9 gives 400.\\n\\n\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"signature\":\"ErgCCrwBCBIYAipAzm6Uz1fiUimJZ7ry16/5jOPhPfQ9Zm3zSb449atO4+Dv3KroxOwD17dLjPUhdRWeFNghT/lQsCRlsY9T6SWyMzIPY2xhdWRlLW9wdXMtNC04OABCCHRoaW5raW5nWiQ1YzJjNzI5YS0wMzVjLTQ5ZDYtODNiOC03NGNhZTAyMzU2NWRyEGhpfnmythMRLK5wcAMHasmIAQGaAREKD2NsYXVkZS1vcHVzLTQtOKgB1KWM1gawAQISDA4K+cR55K4LQVXyhhoMBUHsSBuaNQlHp5ZPIjBvSX58DhVBxFRl9sVZYgZwrMDqGzC1/tgyH1wflAP4TkHTPje+Gdbv0yUxBBIQtaEqKSS4Bh4olHSAKxLEG1SyH4Iy46lp50SxdXxGJ/PIwTfHI47SEaE9pEfNGAE=\"}],\"reasoning_content\":\"23 times 17 is 391, plus 9 gives 400.\\n\\n\"},{\"role\":\"user\",\"content\":\"Add 7 to your previous final answer. Reply with just the number.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"msg_011CfiLtbruiyeuxJmswkPPt\",\"object\":\"chat.completion.chunk\",\"created\":1791169237,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\"},\"finish_reason\":null}]}\n\n: processing\n\ndata: {\"id\":\"msg_011CfiLtbruiyeuxJmswkPPt\",\"object\":\"chat.completion.chunk\",\"created\":1791169237,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"407\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"msg_011CfiLtbruiyeuxJmswkPPt\",\"object\":\"chat.completion.chunk\",\"created\":1791169237,\"model\":\"claude-opus-4-8\",\"choices\":[{\"index\":0,\"delta\":{},\"finish_reason\":\"stop\"}]}\n\ndata: {\"id\":\"msg_011CfiLtbruiyeuxJmswkPPt\",\"object\":\"chat.completion.chunk\",\"created\":1791169237,\"model\":\"claude-opus-4-8\",\"choices\":[],\"usage\":{\"prompt_tokens\":229,\"completion_tokens\":3,\"total_tokens\":232,\"prompt_tokens_details\":{\"cached_tokens\":0}},\"cost\":{\"usd\":0.001464,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/venice-chat/deepseek-v4-flash-preserves-reasoning-through-a-tool-loop-and-follow-up.json

@@ -1,75 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "model": "deepseek-v4-flash",
-    "tags": [
-      "prefix:venice-chat",
-      "provider:venice",
-      "protocol:venice-chat",
-      "reasoning",
-      "tool",
-      "tool-loop",
-      "continuation",
-      "usage",
-      "scalar"
-    ],
-    "name": "venice-chat/deepseek-v4-flash-preserves-reasoning-through-a-tool-loop-and-follow-up",
-    "recordedAt": "2026-10-05T02:59:53.799Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"deepseek-v4-flash\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"Th\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"e user wants me to look\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" up the conversi\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"on rate fo\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"r code ZEBRA\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\", then mult\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"iply by\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" 17 and add 9. Let m\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"e start by lo\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"oking up the rate.\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":[{\"index\":0,\"id\":\"chatcmpl-tool-ab656a8b683341f2\",\"function\":{\"arguments\":\"\",\"name\":\"lookup_rate\"},\"type\":\"function\"}]},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-Rhr7pZI7Hv6zIafL3B1KoyzY\",\"object\":\"chat.completion.chunk\",\"created\":1791169188,\Line truncated
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"deepseek-v4-flash\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"chatcmpl-tool-ab656a8b683341f2\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_content\":\"The user wants me to look up the conversion rate for code ZEBRA, then multiply by 17 and add 9. Let me start by looking up the rate.\"},{\"role\":\"tool\",\"tool_call_id\":\"chatcmpl-tool-ab656a8b683341f2\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"We have the\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" rate: 2\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"3. Mul\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"tiply by\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" 17: 2\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"3 * 17\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" = 391.\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" Then ad\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"d 9:\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" 391 + 9 = 400.\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"400\",\"reasoning_content\":\" So the answer is 400.\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":\"stop\"}]}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RtwpMZBraGwqJiKRKQFrmmIq\",\"object\":\"chat.completion.chunk\",\"created\":1791169191,\"model\":\"deepseek-v4-flash\",\"choices\":[],\"usage\":{\"prompt_tokens\":128,\"completion_tokens\":46,\"total_tokens\":174,\"prompt_tokens_details\":{\"cached_tokens\":0}}Line truncated
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"deepseek-v4-flash\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"chatcmpl-tool-ab656a8b683341f2\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_content\":\"The user wants me to look up the conversion rate for code ZEBRA, then multiply by 17 and add 9. Let me start by looking up the rate.\"},{\"role\":\"tool\",\"tool_call_id\":\"chatcmpl-tool-ab656a8b683341f2\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"},{\"role\":\"assistant\",\"content\":\"400\",\"reasoning_content\":\"We have the rate: 23. Multiply by 17: 23 * 17 = 391. Then add 9: 391 + 9 = 400. So the answer is 400.\"},{\"role\":\"user\",\"content\":\"Add 7 to your previous final answer. Reply with just the number.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"We need to add\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" 7 to t\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"h\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"e previous ans\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"wer,\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" which\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\" was 400. S\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":\"o 400+7=407. Reply wi\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"407\",\"reasoning_content\":\"th just the number.\",\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":\"stop\"}]}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-R0MMWxoRA5NidBHTttxrMoVe\",\"object\":\"chat.completion.chunk\",\"created\":1791169192,\"model\":\"deepseek-v4-flash\",\"choices\":[],\"usage\":{\"prompt_tokens\":148,\"completion_tokens\":33,\"total_tokens\":181,\"prompt_tokens_details\":{\"cached_tokens\":0}},\"cost\":{\"usd\":0.000029499,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/venice-chat/gemini-3-1-pro-preview-preserves-reasoning-through-a-tool-loop-and-follow-up.json

@@ -1,75 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "model": "gemini-3-1-pro-preview",
-    "tags": [
-      "prefix:venice-chat",
-      "provider:venice",
-      "protocol:venice-chat",
-      "reasoning",
-      "tool",
-      "tool-loop",
-      "continuation",
-      "usage",
-      "details"
-    ],
-    "name": "venice-chat/gemini-3-1-pro-preview-preserves-reasoning-through-a-tool-loop-and-follow-up",
-    "recordedAt": "2026-10-05T03:00:58.104Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3-1-pro-preview\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"gen-1791169245-MjiWKnEhpgHVKzFcOlS0\",\"object\":\"chat.completion.chunk\",\"created\":1791169245,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"**Calculating ZEBRA Conversion**\\n\\nI'm currently processing the calculation involving ZEBRA's conversion rate. My next step is to use the `lookup_rate` tool with the code \\\"ZEBRA\\\" to fetch the necessary value, which will then be used in the full equation.\\n\\n\",\"format\":\"google-gemini-v1\",\"index\":0}],\"reasoning_content\":\"**Calculating ZEBRA Conversion**\\n\\nI'm currently processing the calculation involving ZEBRA's conversion rate. My next step is to use the `lookup_rate` tool with the code \\\"ZEBRA\\\" to fetch the necessary value, which will then be used in the full equation.\\n\\n\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169245-MjiWKnEhpgHVKzFcOlS0\",\"object\":\"chat.completion.chunk\",\"created\":1791169245,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning_details\":[{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a19Tkd2zuyuB3m6as2cMeOoFk8xFfcBdsUI+RBkTCE1GVBd5hMIfNsjOj+YTucPL1hYoWodr2oZsMKDnPuYee0AmGYl8jHzVKgQFSXzgIeWEhG+hOMvTEa4BoruFowcHzbLhym48OlBys47Tlo7WF4tK4s8Z7q8cpbqGsA0NkUqPt8P7Uk3ZaRTUJBbIE08+JgNUUwiJkT4AVSO635aMUYTcIkt+8TVbqOLITfSdDtkxhAmrInfn7FqGlNop3RH1TUcb3xnUOsnHXoreWLlAyWTlWNvOa7hjUH8vUwILPmtG6ixKZdf4i/UIgm551Z5tgE05SJBcR/m7ALagyOyEilWqxGkyf+5jvNycUlk/mBkNHLV45amgUG5zhboVEAEVFYPRa+Nnfzxi+DEdM1ntDURrB5dl4Jbotx67627EbsZm4z2sKUZ4jo/eBj9fI3MUqjTYKtMXBSyuen/m/Uw2Ji9iIQIlWUt/G86kOjQUYFY60g6TxEO4BLouwLZJ0fXxWdolvtMnH90+skJ+I7aFQjGrnwdjGsT0oXA0/vG3W8GhRSokdICVQBq14EFvjcVvI1kEgj7NTtKkB/+UWRtRbRhSA5F25/dHvqAT4ioYy/5sRwYFXMwJmM52I8DpLiaBrp8wTidLNjTpD9KlImbd2r89LS9GG5NeqNWksF9XbEQAMannsu19HC9xf+CCz5FBz5PjpR0+pvybIJLmph94u4I0cdLsbycbbdIaihqeIc593sQv3nvm9VYZMJcgnQWIKmXofSlV4zi6p0wRPvmgeiPo+Lv6DrtPTtcaRLkkyGrg8uvkq2Is9H6me8y8HCXGIze3np22MjWM5r2+UYMia+xY+E3neBC1AZrlN+GJarvf0THgHInLLnE78f+w3mJByFgXMy6OOEs4QI0+F8yxF9GembhqebXYKWGWUkuArnLfV6TZ13v8s1J9IiNObPU0AJjq+wmlg2ChAIs082sh8Q==\",\"format\":\"google-gemini-v1\",\"id\":\"call_4908320\",\"index\":0}],\"reasoning_encrypted\":true},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169245-MjiWKnEhpgHVKzFcOlS0\",\"object\":\"chat.completion.chunk\",\"created\":1791169245,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"id\":\"call_4908320\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169245-MjiWKnEhpgHVKzFcOlS0\",\"object\":\"chat.completion.chunk\",\"created\":1791169245,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169245-MjiWKnEhpgHVKzFcOlS0\",\"object\":\"chat.completion.chunk\",\"created\":1791169245,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"STOP\"}]}\n\ndata: {\"id\":\"gen-1791169245-MjiWKnEhpgHVKzFcOlS0\",\"object\":\"chat.completion.chunk\",\"created\":1791169245,\"model\":\"gemini-3-1-pro-preview\",\"service_tier\":\"provisioned\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"STOP\"}]}\n\ndata: {\"id\":\"gen-1791169245-MjiWKnEhpgHVKzFcOlS0\",\"object\":\"chat.completion.chunk\",\"created\":1791169245,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[],\"usage\":{\"prompt_tokens\":96,\"completion_tokens\":169,\"total_tokens\":265,\"prompt_tokens_details\":{\"cached_tokens\":0},\"completion_tokens_details\":{\"reasoning_tokens\":152,\"image_tokens\":0,\"audio_tokens\":0}},\"cost\":{\"usd\":0.002775,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3-1-pro-preview\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_4908320\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"**Calculating ZEBRA Conversion**\\n\\nI'm currently processing the calculation involving ZEBRA's conversion rate. My next step is to use the `lookup_rate` tool with the code \\\"ZEBRA\\\" to fetch the necessary value, which will then be used in the full equation.\\n\\n\",\"format\":\"google-gemini-v1\",\"index\":0},{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a19Tkd2zuyuB3m6as2cMeOoFk8xFfcBdsUI+RBkTCE1GVBd5hMIfNsjOj+YTucPL1hYoWodr2oZsMKDnPuYee0AmGYl8jHzVKgQFSXzgIeWEhG+hOMvTEa4BoruFowcHzbLhym48OlBys47Tlo7WF4tK4s8Z7q8cpbqGsA0NkUqPt8P7Uk3ZaRTUJBbIE08+JgNUUwiJkT4AVSO635aMUYTcIkt+8TVbqOLITfSdDtkxhAmrInfn7FqGlNop3RH1TUcb3xnUOsnHXoreWLlAyWTlWNvOa7hjUH8vUwILPmtG6ixKZdf4i/UIgm551Z5tgE05SJBcR/m7ALagyOyEilWqxGkyf+5jvNycUlk/mBkNHLV45amgUG5zhboVEAEVFYPRa+Nnfzxi+DEdM1ntDURrB5dl4Jbotx67627EbsZm4z2sKUZ4jo/eBj9fI3MUqjTYKtMXBSyuen/m/Uw2Ji9iIQIlWUt/G86kOjQUYFY60g6TxEO4BLouwLZJ0fXxWdolvtMnH90+skJ+I7aFQjGrnwdjGsT0oXA0/vG3W8GhRSokdICVQBq14EFvjcVvI1kEgj7NTtKkB/+UWRtRbRhSA5F25/dHvqAT4ioYy/5sRwYFXMwJmM52I8DpLiaBrp8wTidLNjTpD9KlImbd2r89LS9GG5NeqNWksF9XbEQAMannsu19HC9xf+CCz5FBz5PjpR0+pvybIJLmph94u4I0cdLsbycbbdIaihqeIc593sQv3nvm9VYZMJcgnQWIKmXofSlV4zi6p0wRPvmgeiPo+Lv6DrtPTtcaRLkkyGrg8uvkq2Is9H6me8y8HCXGIze3np22MjWM5r2+UYMia+xY+E3neBC1AZrlN+GJarvf0THgHInLLnE78f+w3mJByFgXMy6OOEs4QI0+F8yxF9GembhqebXYKWGWUkuArnLfV6TZ13v8s1J9IiNObPU0AJjq+wmlg2ChAIs082sh8Q==\",\"id\":\"call_4908320\",\"format\":\"google-gemini-v1\",\"index\":0}],\"reasoning_content\":\"**Calculating ZEBRA Conversion**\\n\\nI'm currently processing the calculation involving ZEBRA's conversion rate. My next step is to use the `lookup_rate` tool with the code \\\"ZEBRA\\\" to fetch the necessary value, which will then be used in the full equation.\\n\\n\"},{\"role\":\"tool\",\"tool_call_id\":\"call_4908320\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"gen-1791169249-6wlEwbJv7MicDxVsZViY\",\"object\":\"chat.completion.chunk\",\"created\":1791169249,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"400\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169249-6wlEwbJv7MicDxVsZViY\",\"object\":\"chat.completion.chunk\",\"created\":1791169249,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"signature\":\"AY89a1+fQ9YpZF71EoH4pNDO6g5NeqvLRAav/WG6sv9V/5fpifhK6ZDc6m89qgCpOEBhjTJ+a+ux1dFog+eB2nR/G8VVKt1Zr2+2NKXO3Q3ksKE+E51IRRzK/ywpDYpE8AlE6Kb7EG2x/ZVMpy24TOLY+LL8JNsrz8uHBC1PtPtiZe/gP+Kvu0Yqk+VNYv16wAubtiA0oy0c+wyRzd80jRvqCZpBIGPlLAU515MPpjXNGu0A5ft4uu3oGPJHl5G/Ry4Fm5fvWKl759+Jwx9m7d50+vcttr5SpHm//MvNsUTnqjYkraw1S69+9oB57HoBn8d8pwTHpud/6FARun33EjfPW86Xx2fS448QtKc3c9nxSdGyZgTV0TpA63Uz7n0nGd9fRYrghp3lQv5QyoRIgNg+YeBf/WDNzSW2MO6Y2HLFoo3K0vJh1KMfWhjECNxP1Qfjfz+VjwSV7+OzF9CNw23f8R2udRBr1EUYhTu13ckjFLWjCD5fGjvmLhsae3CgmuFV2Rvaxqrf/H79Tz+X9W/Tw8PuQ0E1pCCpiMe1gR1CT+LJPWxjV96DPHQ0r+1lnekrr5NkO7UAZ64HVALHJRpACdJsVhwI1TBi4f89b1by1s7OaWlQTw7thX7CLRV2W3HoMUccJaofszVEfbD8+SaeZtZgyw9mkYvxgYtu3Odxx2YGHgs=\",\"format\":\"google-gemini-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169249-6wlEwbJv7MicDxVsZViY\",\"object\":\"chat.completion.chunk\",\"created\":1791169249,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"STOP\"}]}\n\ndata: {\"id\":\"gen-1791169249-6wlEwbJv7MicDxVsZViY\",\"object\":\"chat.completion.chunk\",\"created\":1791169249,\"model\":\"gemini-3-1-pro-preview\",\"service_tier\":\"provisioned\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"STOP\"}]}\n\ndata: {\"id\":\"gen-1791169249-6wlEwbJv7MicDxVsZViY\",\"object\":\"chat.completion.chunk\",\"created\":1791169249,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[],\"usage\":{\"prompt_tokens\":233,\"completion_tokens\":129,\"total_tokens\":362,\"prompt_tokens_details\":{\"cached_tokens\":0},\"completion_tokens_details\":{\"reasoning_tokens\":126,\"image_tokens\":0,\"audio_tokens\":0}},\"cost\":{\"usd\":0.0025175,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3-1-pro-preview\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_4908320\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"**Calculating ZEBRA Conversion**\\n\\nI'm currently processing the calculation involving ZEBRA's conversion rate. My next step is to use the `lookup_rate` tool with the code \\\"ZEBRA\\\" to fetch the necessary value, which will then be used in the full equation.\\n\\n\",\"format\":\"google-gemini-v1\",\"index\":0},{\"type\":\"reasoning.encrypted\",\"data\":\"AY89a19Tkd2zuyuB3m6as2cMeOoFk8xFfcBdsUI+RBkTCE1GVBd5hMIfNsjOj+YTucPL1hYoWodr2oZsMKDnPuYee0AmGYl8jHzVKgQFSXzgIeWEhG+hOMvTEa4BoruFowcHzbLhym48OlBys47Tlo7WF4tK4s8Z7q8cpbqGsA0NkUqPt8P7Uk3ZaRTUJBbIE08+JgNUUwiJkT4AVSO635aMUYTcIkt+8TVbqOLITfSdDtkxhAmrInfn7FqGlNop3RH1TUcb3xnUOsnHXoreWLlAyWTlWNvOa7hjUH8vUwILPmtG6ixKZdf4i/UIgm551Z5tgE05SJBcR/m7ALagyOyEilWqxGkyf+5jvNycUlk/mBkNHLV45amgUG5zhboVEAEVFYPRa+Nnfzxi+DEdM1ntDURrB5dl4Jbotx67627EbsZm4z2sKUZ4jo/eBj9fI3MUqjTYKtMXBSyuen/m/Uw2Ji9iIQIlWUt/G86kOjQUYFY60g6TxEO4BLouwLZJ0fXxWdolvtMnH90+skJ+I7aFQjGrnwdjGsT0oXA0/vG3W8GhRSokdICVQBq14EFvjcVvI1kEgj7NTtKkB/+UWRtRbRhSA5F25/dHvqAT4ioYy/5sRwYFXMwJmM52I8DpLiaBrp8wTidLNjTpD9KlImbd2r89LS9GG5NeqNWksF9XbEQAMannsu19HC9xf+CCz5FBz5PjpR0+pvybIJLmph94u4I0cdLsbycbbdIaihqeIc593sQv3nvm9VYZMJcgnQWIKmXofSlV4zi6p0wRPvmgeiPo+Lv6DrtPTtcaRLkkyGrg8uvkq2Is9H6me8y8HCXGIze3np22MjWM5r2+UYMia+xY+E3neBC1AZrlN+GJarvf0THgHInLLnE78f+w3mJByFgXMy6OOEs4QI0+F8yxF9GembhqebXYKWGWUkuArnLfV6TZ13v8s1J9IiNObPU0AJjq+wmlg2ChAIs082sh8Q==\",\"id\":\"call_4908320\",\"format\":\"google-gemini-v1\",\"index\":0}],\"reasoning_content\":\"**Calculating ZEBRA Conversion**\\n\\nI'm currently processing the calculation involving ZEBRA's conversion rate. My next step is to use the `lookup_rate` tool with the code \\\"ZEBRA\\\" to fetch the necessary value, which will then be used in the full equation.\\n\\n\"},{\"role\":\"tool\",\"tool_call_id\":\"call_4908320\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"},{\"role\":\"assistant\",\"content\":\"400\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"format\":\"google-gemini-v1\",\"index\":0,\"signature\":\"AY89a1+fQ9YpZF71EoH4pNDO6g5NeqvLRAav/WG6sv9V/5fpifhK6ZDc6m89qgCpOEBhjTJ+a+ux1dFog+eB2nR/G8VVKt1Zr2+2NKXO3Q3ksKE+E51IRRzK/ywpDYpE8AlE6Kb7EG2x/ZVMpy24TOLY+LL8JNsrz8uHBC1PtPtiZe/gP+Kvu0Yqk+VNYv16wAubtiA0oy0c+wyRzd80jRvqCZpBIGPlLAU515MPpjXNGu0A5ft4uu3oGPJHl5G/Ry4Fm5fvWKl759+Jwx9m7d50+vcttr5SpHm//MvNsUTnqjYkraw1S69+9oB57HoBn8d8pwTHpud/6FARun33EjfPW86Xx2fS448QtKc3c9nxSdGyZgTV0TpA63Uz7n0nGd9fRYrghp3lQv5QyoRIgNg+YeBf/WDNzSW2MO6Y2HLFoo3K0vJh1KMfWhjECNxP1Qfjfz+VjwSV7+OzF9CNw23f8R2udRBr1EUYhTu13ckjFLWjCD5fGjvmLhsae3CgmuFV2Rvaxqrf/H79Tz+X9W/Tw8PuQ0E1pCCpiMe1gR1CT+LJPWxjV96DPHQ0r+1lnekrr5NkO7UAZ64HVALHJRpACdJsVhwI1TBi4f89b1by1s7OaWlQTw7thX7CLRV2W3HoMUccJaofszVEfbD8+SaeZtZgyw9mkYvxgYtu3Odxx2YGHgs=\"}]},{\"role\":\"user\",\"content\":\"Add 7 to your previous final answer. Reply with just the number.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"gen-1791169254-bvEsScICXWimu8xzJFF1\",\"object\":\"chat.completion.chunk\",\"created\":1791169254,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"407\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169254-bvEsScICXWimu8xzJFF1\",\"object\":\"chat.completion.chunk\",\"created\":1791169254,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"signature\":\"AY89a1/t2vneT6Dy8hJmYd66cSC0Fk3bKHK7hJI5vTtBcKe38EQ6JXMwTlxi2K47pfmvruV0B6Ks0CZCF9N7rEOT+fXTleU1WPEAHHJPX7KkncEJK4KNIeJsTzyEjSPn5t8kb/vNruIV2KE2/l0kylycTNOubuO8DGlkKOp478zuwZppB0vFaoLp1byEUtyT/MHdN/KckvvKY99ZB2ksWrc51/5Z7jx7GeXGpTl3jHEKzdLWrfsYYyjPOv4h0ZHN8ANmYMTWpGUm8jqxB0pHQFBVS0U5YhF+fuU6Nk3lUNuLnEydq6UH6VydtTxDjUDALIfHhkasmTRXnL/7X3/z3rLhRXRGhga9lHnSnEhmjdLj9iOn/73wjA4QxnT14P+8F45z4ePO19ZGKr/j5WBvBMem92Yqv9HweDo9IreBa8EbqPwlsnjbXvJB7MuBp2TJd4szb7azQ+zaPU7pf5B3fjKC3K8p26qF0C+TkGd72PezZw662/FMkkC/b88sgDgMfgSK7dMqVvv7swafRzFL1IZzTFoJJ3Ouk/VCKGWCHOx+c2EPtvv+IzGhQ1k9dn44bq953wBamkzDjQWcP46+VKp2PPz5yV9AgGCmdi1SRYNU361FiUGlU40cImBLK1MoIqa/YnYaaXMtK9L7/35uOjyg/hae3REIw5N4Y1fiSx9UCKi7eYviBwrY3kZJYdy4UdsN63ahHb2SO1gfZKAg1G36Gn5TIiYGO4dNWE9c\",\"format\":\"google-gemini-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1791169254-bvEsScICXWimu8xzJFF1\",\"object\":\"chat.completion.chunk\",\"created\":1791169254,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"STOP\"}]}\n\ndata: {\"id\":\"gen-1791169254-bvEsScICXWimu8xzJFF1\",\"object\":\"chat.completion.chunk\",\"created\":1791169254,\"model\":\"gemini-3-1-pro-preview\",\"service_tier\":\"provisioned\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"STOP\"}]}\n\ndata: {\"id\":\"gen-1791169254-bvEsScICXWimu8xzJFF1\",\"object\":\"chat.completion.chunk\",\"created\":1791169254,\"model\":\"gemini-3-1-pro-preview\",\"choices\":[],\"usage\":{\"prompt_tokens\":99,\"completion_tokens\":119,\"total_tokens\":218,\"prompt_tokens_details\":{\"cached_tokens\":0},\"completion_tokens_details\":{\"reasoning_tokens\":116,\"image_tokens\":0,\"audio_tokens\":0}},\"cost\":{\"usd\":0.0020325,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/venice-chat/gemini-preserves-per-call-signatures-through-parallel-tools.json

@@ -1,71 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "tags": [
-      "prefix:venice-chat",
-      "provider:venice",
-      "protocol:venice-chat",
-      "tool",
-      "parallel",
-      "signature"
-    ],
-    "name": "venice-chat/gemini-preserves-per-call-signatures-through-parallel-tools",
-    "recordedAt": "2026-10-05T03:21:54.383Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3-8-flash\",\"messages\":[{\"role\":\"user\",\"content\":\"Look up private rates for both ZEBRA and MOOSE using two calls to lookup_rate. Then add the rates and multiply by 7. Use parallel calls if possible.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false},\"parallel_tool_calls\":true}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"gcp-1791170510482-itouwq\",\"object\":\"chat.completion.chunk\",\"created\":1791170510,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"id\":\"call_0\",\"type\":\"function\",\"thought_signature\":\"AY89a1/bp+ihzOXpD71E6UhQv6xnBjHTAdPeNHvLEAevtqznKg46D/3qO3e9Qg7wGmccL6IpLV56PwWIT+6pXoeU6ix8JCCk7nlml/Sz2huX/rNFoSRHpB+YAZK07lHP9cbotXy7FPNMaRhsl18sPSJZLlPK0iTGhJa7MmH72r4v/G3/izffMKUPRos6i5qQ52La10FUWSunPigqNnglEvWEC3Yb+d+PnEq5iOPaVCD0awXjhsIk8L0n4+T6jM4epO+whUSSgvH9PGwgmsP197hb7l5YSjQncNX0oF1G4ch3xrFzXyS/noFFy6SlBfzfN0NJmAyP//4oVqjffUJngigTAtboI4HdDwH1fPHuI5FTfmVcUGVVIEjhAEDAAHtS77uW/XdLH4bsSigjYeCzgRTYmHP8bqFb1HjRjl2HK2Pr1y6ch0JSIgtAKv8Kj4R0PM8rIYxxf7LgrsaVWogt4rq2M4HvcUcBi6IhQ/500JUCoqdhlTGMqCFUHkN6P/qAoPGZXmo50OvtNChQ4vXVGYxWp89IRwdcv8vqjIFk75/R6oZG9BsrUaC1JnQN8i3BbYc1bz/lzFCQ1IC/g1Sm+wPhsaPmoVN77101ZAdNMiP4B5Ow7K/UycMunFKWy4xdpaT7Pb+LLNy6GYy9q2TvoRXTq1lJugLH4Q8TQZj5neWZmiDxqzsj0Xvwew7zLwGSMfkpBB4rgx9XWMx5CwqO068qjhmo+0gUkxMug2RHblEGnPO7i0i9fYj9ltDfUpFxN2adDpyk4dwuIeVSlu4N4oHOgjGms5jWLp0MqkyoKFo=\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}]}}]}\n\ndata: {\"id\":\"gcp-1791170510482-itouwq\",\"object\":\"chat.completion.chunk\",\"created\":1791170510,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":1,\"id\":\"call_1\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"MOOSE\\\"}\"}}]}}]}\n\ndata: {\"id\":\"gcp-1791170510482-itouwq\",\"object\":\"chat.completion.chunk\",\"created\":1791170510,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{},\"finish_reason\":\"tool_calls\"}]}\n\ndata: {\"id\":\"gcp-1791170510482-itouwq\",\"object\":\"chat.completion.chunk\",\"created\":1791170510,\"model\":\"gemini-3-8-flash\",\"choices\":[],\"usage\":{\"prompt_tokens\":74,\"completion_tokens\":156,\"total_tokens\":230},\"cost\":{\"usd\":0.000800625,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3-8-flash\",\"messages\":[{\"role\":\"user\",\"content\":\"Look up private rates for both ZEBRA and MOOSE using two calls to lookup_rate. Then add the rates and multiply by 7. Use parallel calls if possible.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_0\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"},\"thought_signature\":\"AY89a1/bp+ihzOXpD71E6UhQv6xnBjHTAdPeNHvLEAevtqznKg46D/3qO3e9Qg7wGmccL6IpLV56PwWIT+6pXoeU6ix8JCCk7nlml/Sz2huX/rNFoSRHpB+YAZK07lHP9cbotXy7FPNMaRhsl18sPSJZLlPK0iTGhJa7MmH72r4v/G3/izffMKUPRos6i5qQ52La10FUWSunPigqNnglEvWEC3Yb+d+PnEq5iOPaVCD0awXjhsIk8L0n4+T6jM4epO+whUSSgvH9PGwgmsP197hb7l5YSjQncNX0oF1G4ch3xrFzXyS/noFFy6SlBfzfN0NJmAyP//4oVqjffUJngigTAtboI4HdDwH1fPHuI5FTfmVcUGVVIEjhAEDAAHtS77uW/XdLH4bsSigjYeCzgRTYmHP8bqFb1HjRjl2HK2Pr1y6ch0JSIgtAKv8Kj4R0PM8rIYxxf7LgrsaVWogt4rq2M4HvcUcBi6IhQ/500JUCoqdhlTGMqCFUHkN6P/qAoPGZXmo50OvtNChQ4vXVGYxWp89IRwdcv8vqjIFk75/R6oZG9BsrUaC1JnQN8i3BbYc1bz/lzFCQ1IC/g1Sm+wPhsaPmoVN77101ZAdNMiP4B5Ow7K/UycMunFKWy4xdpaT7Pb+LLNy6GYy9q2TvoRXTq1lJugLH4Q8TQZj5neWZmiDxqzsj0Xvwew7zLwGSMfkpBB4rgx9XWMx5CwqO068qjhmo+0gUkxMug2RHblEGnPO7i0i9fYj9ltDfUpFxN2adDpyk4dwuIeVSlu4N4oHOgjGms5jWLp0MqkyoKFo=\"},{\"id\":\"call_1\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"MOOSE\\\"}\"}}]},{\"role\":\"tool\",\"tool_call_id\":\"call_0\",\"content\":\"{\\\"rate\\\":23}\"},{\"role\":\"tool\",\"tool_call_id\":\"call_1\",\"content\":\"{\\\"rate\\\":31}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false},\"parallel_tool_calls\":true}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"The retrieved rates are:\\n- **\"}}]}\n\ndata: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"ZEBRA:** 23\\n- **MOOSE:** 31\\n\\n### Calculation:\\n1. **Add\"}}]}\n\ndata: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\" the rates:**  \\n   $$23 + 31 = 54$$\\n\\n2. **Multiply by 7:**  \"}}]}\n\ndata: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\\n   $$54 \\\\times 7 = 378$$\\n\\nThe final result is **378\"}}]}\n\ndata: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"**.\"}}]}\n\ndata: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"thought_signature\":\"AY89a18wXUWI7m5/5GGqxfoJDqE4MU2X2SR/ZQMCX+JQ/clHQynyEjplK4a8w9tXAi8uuxYPVxYj1ULcb83zUQBsr77tSkJN5R0J2Jgc2HzYtmTW7OYHoFQqmMESnDjvDiO51y3xpXGbVkqRlXwfmap+Tpivfx45hiXlns/hObEQo1gE70NzD7d8CQOseYVz2N7MPMmGDqpAy+5SAHXGAcQ9K2ufHNUdfWM/uUi+sGUcDhGnjPXPlzIuYk7IjUQXNAH9FFqo19dBQPhE106C3aI69QAuMvyZZ/no4ou9XSOUXrstjzQwUM+TOJXsab80F1+C6DghvYm0UZSb827xCKPtj7oCQwtwg+f4sWELhflp42IL3URo2UxpZaDNpt7PYXmmcCvKAN7/PTirCijNWMtlDL0LDbiKj+DfOFEuS2VxVq+yQgWRbKJZF7bl8BCSe7+Qab0bAsu0ZJXKBlxs46ulaXn5cc933y/Yv7O0XGHbVULMzeEpZndzkHqZYs5D+ve+CJFfjWsVk1NKrTdXqt11Ov470+MCpSlHTXdjug7oUd0A0b5AH+bF4yAZAGj4snJ7hi04EQ4Ch7rASB3OB+YB+8SnStAGf0XuimNgY2wzR68qaQ==\"}}]}\n\ndata: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{},\"finish_reason\":\"stop\"}]}\n\ndata: {\"id\":\"gcp-1791170512529-w6lmsz\",\"object\":\"chat.completion.chunk\",\"created\":1791170512,\"model\":\"gemini-3-8-flash\",\"choices\":[],\"usage\":{\"prompt_tokens\":206,\"completion_tokens\":208,\"total_tokens\":414},\"cost\":{\"usd\":0.001168125,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3-8-flash\",\"messages\":[{\"role\":\"user\",\"content\":\"Look up private rates for both ZEBRA and MOOSE using two calls to lookup_rate. Then add the rates and multiply by 7. Use parallel calls if possible.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_0\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"},\"thought_signature\":\"AY89a1/bp+ihzOXpD71E6UhQv6xnBjHTAdPeNHvLEAevtqznKg46D/3qO3e9Qg7wGmccL6IpLV56PwWIT+6pXoeU6ix8JCCk7nlml/Sz2huX/rNFoSRHpB+YAZK07lHP9cbotXy7FPNMaRhsl18sPSJZLlPK0iTGhJa7MmH72r4v/G3/izffMKUPRos6i5qQ52La10FUWSunPigqNnglEvWEC3Yb+d+PnEq5iOPaVCD0awXjhsIk8L0n4+T6jM4epO+whUSSgvH9PGwgmsP197hb7l5YSjQncNX0oF1G4ch3xrFzXyS/noFFy6SlBfzfN0NJmAyP//4oVqjffUJngigTAtboI4HdDwH1fPHuI5FTfmVcUGVVIEjhAEDAAHtS77uW/XdLH4bsSigjYeCzgRTYmHP8bqFb1HjRjl2HK2Pr1y6ch0JSIgtAKv8Kj4R0PM8rIYxxf7LgrsaVWogt4rq2M4HvcUcBi6IhQ/500JUCoqdhlTGMqCFUHkN6P/qAoPGZXmo50OvtNChQ4vXVGYxWp89IRwdcv8vqjIFk75/R6oZG9BsrUaC1JnQN8i3BbYc1bz/lzFCQ1IC/g1Sm+wPhsaPmoVN77101ZAdNMiP4B5Ow7K/UycMunFKWy4xdpaT7Pb+LLNy6GYy9q2TvoRXTq1lJugLH4Q8TQZj5neWZmiDxqzsj0Xvwew7zLwGSMfkpBB4rgx9XWMx5CwqO068qjhmo+0gUkxMug2RHblEGnPO7i0i9fYj9ltDfUpFxN2adDpyk4dwuIeVSlu4N4oHOgjGms5jWLp0MqkyoKFo=\"},{\"id\":\"call_1\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"MOOSE\\\"}\"}}]},{\"role\":\"tool\",\"tool_call_id\":\"call_0\",\"content\":\"{\\\"rate\\\":23}\"},{\"role\":\"tool\",\"tool_call_id\":\"call_1\",\"content\":\"{\\\"rate\\\":31}\"},{\"role\":\"assistant\",\"content\":\"The retrieved rates are:\\n- **ZEBRA:** 23\\n- **MOOSE:** 31\\n\\n### Calculation:\\n1. **Add the rates:**  \\n   $$23 + 31 = 54$$\\n\\n2. **Multiply by 7:**  \\n   $$54 \\\\times 7 = 378$$\\n\\nThe final result is **378**.\",\"thought_signature\":\"AY89a18wXUWI7m5/5GGqxfoJDqE4MU2X2SR/ZQMCX+JQ/clHQynyEjplK4a8w9tXAi8uuxYPVxYj1ULcb83zUQBsr77tSkJN5R0J2Jgc2HzYtmTW7OYHoFQqmMESnDjvDiO51y3xpXGbVkqRlXwfmap+Tpivfx45hiXlns/hObEQo1gE70NzD7d8CQOseYVz2N7MPMmGDqpAy+5SAHXGAcQ9K2ufHNUdfWM/uUi+sGUcDhGnjPXPlzIuYk7IjUQXNAH9FFqo19dBQPhE106C3aI69QAuMvyZZ/no4ou9XSOUXrstjzQwUM+TOJXsab80F1+C6DghvYm0UZSb827xCKPtj7oCQwtwg+f4sWELhflp42IL3URo2UxpZaDNpt7PYXmmcCvKAN7/PTirCijNWMtlDL0LDbiKj+DfOFEuS2VxVq+yQgWRbKJZF7bl8BCSe7+Qab0bAsu0ZJXKBlxs46ulaXn5cc933y/Yv7O0XGHbVULMzeEpZndzkHqZYs5D+ve+CJFfjWsVk1NKrTdXqt11Ov470+MCpSlHTXdjug7oUd0A0b5AH+bF4yAZAGj4snJ7hi04EQ4Ch7rASB3OB+YB+8SnStAGf0XuimNgY2wzR68qaQ==\"},{\"role\":\"user\",\"content\":\"Add 7 to your previous final answer. Reply with just the number.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":\"none\",\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"effort\":\"high\"},\"venice_parameters\":{\"include_venice_system_prompt\":false},\"parallel_tool_calls\":true}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"gcp-1791170514341-j5gh1h\",\"object\":\"chat.completion.chunk\",\"created\":1791170514,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"385\"}}]}\n\ndata: {\"id\":\"gcp-1791170514341-j5gh1h\",\"object\":\"chat.completion.chunk\",\"created\":1791170514,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{\"thought_signature\":\"AY89a1/DMIB/2qixC5QVQQH1tA2QiQFpEsXnIDd7wlCgwuYQXBGWgSsP1bpTZJUJM/yqKdQh96+/c6c28VMbW5iovCDxxeK56KfmSBSBIPtNW8BUHHLxQw9vdsxQvQyHcGW6rLb4W3gElqx6JFmNkTMvijUS9QDgkPlPipirbv7pqLejFyQ040GD4IVhP8ovyR49EJm61W0JvJOPFT30/gVvaKA6RnRgTKGiHrZWVqLxhKVkb0gC7jI9CNNASOYH67uelFQ2trbcf5Qbhx4q93vAErFsBzvzliSuaELDrxZAF9VCNIiWz4AUtEWI1FLCMYxkgNry/K+iNpwcXu8BxABETbNkEb722wjpt1A2EZK/5qhqKQvUOq+WgSCPCLoI1zfUiGN6UV9D/QGtyS2Iyt3AYlvKjZVVzP217ItWSDacGzigLd4t+4MMW7Dvbs7ffBvBV+EzMCP1dnsLkKCxicfvT3e2EgY+liDSaSZG3sE7Lm4WKCYbI4rrBLMupERSaFfAHWdTlea5HeM=\"}}]}\n\ndata: {\"id\":\"gcp-1791170514341-j5gh1h\",\"object\":\"chat.completion.chunk\",\"created\":1791170514,\"model\":\"gemini-3-8-flash\",\"choices\":[{\"index\":0,\"delta\":{},\"finish_reason\":\"stop\"}]}\n\ndata: {\"id\":\"gcp-1791170514341-j5gh1h\",\"object\":\"chat.completion.chunk\",\"created\":1791170514,\"model\":\"gemini-3-8-flash\",\"choices\":[],\"usage\":{\"prompt_tokens\":429,\"completion_tokens\":83,\"total_tokens\":512},\"cost\":{\"usd\":0.00079125,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/venice-chat/openai-gpt-54-mini-preserves-reasoning-through-a-tool-loop-and-follow-up.json

@@ -1,75 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "model": "openai-gpt-54-mini",
-    "tags": [
-      "prefix:venice-chat",
-      "provider:venice",
-      "protocol:venice-chat",
-      "reasoning",
-      "tool",
-      "tool-loop",
-      "continuation",
-      "usage",
-      "encrypted"
-    ],
-    "name": "venice-chat/openai-gpt-54-mini-preserves-reasoning-through-a-tool-loop-and-follow-up",
-    "recordedAt": "2026-10-05T03:01:10.096Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"openai-gpt-54-mini\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for a code. Only this tool knows the rate.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"code\":{\"type\":\"string\",\"enum\":[\"ZEBRA\",\"MOOSE\"]}},\"required\":[\"code\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"**Calculating private data**\\n\\nI\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" need\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" to\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" follow\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" the\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" developer\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"'s\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" instructions\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" and\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" use\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" the\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" provided\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" tool\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" to\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" handle\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" private\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" data\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\".\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312efd07487d28fc51d6572174c85\",\"object\":\"chat.completion.chunk\",\"created\":1791169264,\"model\":\"openai-gpLine truncated
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"openai-gpt-54-mini\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_onp7EArhOgXu0hGRF6Y5WHLu\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_details\":[{\"type\":\"reasoning.encrypted\",\"data\":\"gAAAAABqwxLxEN4vtmI2WcZ_aDDttdmPwAHgnV2gLZBo_f_mmTdGm4oZzE2JVzcj72AeXHyABmmo2VQN4nXaZK9GSSUZRlYL8mECMxKTj9AMgL8zlnuN5WDexxU-e9SduGP36RN9nH56-go4dz8eu5DEMvMf_TMoTnxz5AnC_UWbty63Vp8jEgkD-DoRjd0cg9LjthP_FLyMvP2Wj9qMJxEuO7Mw2_Pu4I3YeChnygLvmRfRR2QkamL5vjb9yHkl0Lb502vEGB2DW_czNEpHxisifvwRBjA7vk0mbn2dlhiR80aNHO71hC-QqrtUfPXx2HIbVLfbPdJf0saI0wD7ZuCJSQCBfB7fMCnj2ZLQeXa67lgXwsZDLBg4HmSJFvsMinx1IHIjUk7iebsKvmYx40cjqpXL3wj7htZWk2hO9OyGGUwlRsn5THdhTsgwg2SPbuHxb-sLPQnEFZ7bRp5lsVm31X2dlHDa1uZ7KLJZyy9g2CLIKsBwFFoCK7jY3HBXfL21ac5TAkOzVmz-XKl6OMPSl-PSdByOO15uHHpyOcJvJvuaea5Tj1nihtuDlhUP5EQPi7MiWpJMFo9AhDCafAbaQOEF5W8AQPeb_GXvPTzhySRAC8PxrhraEcZ4fjpjLqkv6mi_A1YHwbHEHHWjcK5VEKc3dadlIM_s6djclFBocVXrvnQQElVhWBDM-RtK9sgR07BFj5LVk6fYvg0b6gQnbDuQH18jhtPoj0SX0lN921XEQ1ebMCWGLANND2ew_wyNShYouJohefLULicWG57xh_yV1KEG1ufBedq2CPvCHA9Hm5UssbeJx5yBriyUA2Yh4D7j2UBT_KDWEHydDLQ4mWEyLTfQn0ZB3ZOqkU79z3HpK2w_VHUnkl5nEYEU2bmF5lsG33B4gtbQIBtZT76-fizXsvVZx__taOWXg96VMi3CD3DY0TS76B4U92KFmAFJ4aeiM8bkPuzf1Qd202EWE39CotUDoxAM6mzQu0NObTDnGQE776P6kzUoIKUmP8sDwYG5xot8ZTuXcBYysvj4-pFC_fvqMhsdfgonbke78SIjHtmePsOkfHBnCjSSUFKEbaM0nm8jJ6nYVwiYFuXBKD31QD462TAC7ORVIn32sWSgV2t3Sd7vq4ws2Yy7nUoILRAt_NYQUEXt7_R8J5YWj1L6Ruagk7Vtt-CAWxT6FhVyU4JhMb6-tJrYHgdmtunYrjpHBiOVdQR25aOmLbc_WlDvpO4azcRazpgkASAjPaaDycYceKcheiyUDBgFrvcSYrS1fJb6YZrTzOKw1Ztd0YsklS4nc3jffLNLrBQVvnkajj0OHjGcW8wkP93TCMJyt8tfIH0Rd5hIZLY5EqUWj9yZgXO7CuDKQZIEI0oZXef3mjfQqH8Q9rZsSgS3DI3mCF3CN003R_ZKKLGWkG8VzwlvdocNxaV_Z-ujp_O0YMyOcmEoTJI-j3JP3nefNboyP7EWND6VWDjJbqg64dvu0PK0EW5L0lnAu0l-WVb2qmXLYao_7bOlD8JLFZOyUgHAWmetmnm0NuxzevJEVBkNUu1jQatPzf2Jzf9SGKM_3bM_z0TM5McCZ2Pikzwp96QlaiEEWV_j2g02PT5Y3td-lfpoKxoFD5tltGNY9TlPzK-4a9Iz0hloiCprxWMLGKw2JzctrPF1xr42PKGNgPE84xAQ3sQ4mQ==\",\"id\":\"rs_014406f0f45e19c6016ac312f01d2487d2a5f2bdb7fbc42f76\",\"format\":\"openai-responses-v1\",\"index\":0}],\"reasoning_content\":\"**Calculating private data**\\n\\nI need to follow the developer's instructions and use the provided tool to handle private data. First, I should look up the rate for \\\"ZEBRA\\\" before I answer. After that, I’ll multiply the rate by 17 and then add 9 to get the required number. It’s important to give only the requested number and avoid making another tool call. I’ll likely use the commentary channel for this tool call.\\n\\n__ENCRYPTED_REASONING__id=rs_014406f0f45e19c6016ac312f01d2487d2a5f2bdb7fbc42f76\\ngAAAAABqwxLxEN4vtmI2WcZ_aDDttdmPwAHgnV2gLZBo_f_mmTdGm4oZzE2JVzcj72AeXHyABmmo2VQN4nXaZK9GSSUZRlYL8mECMxKTj9AMgL8zlnuN5WDexxU-e9SduGP36RN9nH56-go4dz8eu5DEMvMf_TMoTnxz5AnC_UWbty63Vp8jEgkD-DoRjd0cg9LjthP_FLyMvP2Wj9qMJxEuO7Mw2_Pu4I3YeChnygLvmRfRR2QkamL5vjb9yHkl0Lb502vEGB2DW_czNEpHxisifvwRBjA7vk0mbn2dlhiR80aNHO71hC-QqrtUfPXx2HIbVLfbPdJf0saI0wD7ZuCJSQCBfB7fMCnj2ZLQeXa67lgXwsZDLBg4HmSJFvsMinx1IHIjUk7iebsKvmYx40cjqpXL3wj7htZWk2hO9OyGGUwlRsn5THdhTsgwg2SPbuHxb-sLPQnEFZ7bRp5lsVm31X2dlHDa1uZ7KLJZyy9g2CLIKsBwFFoCK7jY3HBXfL21ac5TAkOzVmz-XKl6OMPSl-PSdByOO15uHHpyOcJvJvuaea5Tj1nihtuDlhUP5EQPi7MiWpJMFo9AhDCafAbaQOEF5W8AQPeb_GXvPTzhySRAC8PxrhraEcZ4fjpjLqkv6mi_A1YHwbHEHHWjcK5VEKc3dadlIM_s6djclFBocVXrvnQQElVhWBDM-RtK9sgR07BFj5LVk6fYvg0b6gQnbDuQH18jhtPoj0SX0lN921XEQ1ebMCWGLANND2ew_wyNShYouJohefLULicWG57xh_yV1KEG1ufBedq2CPvCHA9Hm5UssbeJx5yBriyUA2Yh4D7j2UBT_KDWEHydDLQ4mWEyLTfQn0ZB3ZOqkU79z3HpK2w_VHUnkl5nEYEU2bmF5lsG33B4gtbQIBtZT76-fizXsvVZx__taOWXg96VMi3CD3DY0TS76B4U92KFmAFJ4aeiM8bkPuzf1Qd202EWE39CotUDoxAM6mzQu0NObTDnGQE776P6kzUoIKUmP8sDwYG5xot8ZTuXcBYysvj4-pFC_fvqMhsdfgonbke78SIjHtmePsOkfHBnCjSSUFKEbaM0nm8jJ6nYVwiYFuXBKD31QD462TAC7ORVIn32sWSgV2t3Sd7vq4ws2Yy7nUoILRAt_NYQUEXt7_R8J5YWj1L6Ruagk7Vtt-CAWxT6FhVyU4JhMb6-tJrYHgdmtunYrjpHBiOVdQR25aOmLbc_WlDvpO4azcRazpgkASAjPaaDycYceKcheiyUDBgFrvcSYrS1fJb6YZrTzOKw1Ztd0YsklS4nc3jffLNLrBQVvnkajj0OHjGcW8wkP93TCMJyt8tfIH0Rd5hIZLY5EqUWj9yZgXO7CuDKQZIEI0oZXef3mjfQqH8Q9rZsSgS3DI3mCF3CN003R_ZKKLGWkG8VzwlvdocNxaV_Z-ujp_O0YMyOcmEoTJI-j3JP3nefNboyP7EWND6VWDjJbqg64dvu0PK0EW5L0lnAu0l-WVb2qmXLYao_7bOlD8JLFZOyUgHAWmetmnm0NuxzevJEVBkNUu1jQatPzf2Jzf9SGKM_3bM_z0TM5McCZ2Pikzwp96QlaiEEWV_j2g02PT5Y3td-lfpoKxoFD5tltGNY9TlPzK-4a9Iz0hloiCprxWMLGKw2JzctrPF1xr42PKGNgPE84xAQ3sQ4mQ==\"},{\"role\":\"tool\",\"tool_call_id\":\"call_onp7EArhOgXu0hGRF6Y5WHLu\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"description\":\"Retrieve the private conversion rate for aLine truncated
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"**Calculating a simple math problem**\\n\\nI'm\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" working\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" through\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" the\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" math\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\":\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" first\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\",\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" I\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169266,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" multiply\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" 23\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" by\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" 17\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\",\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" and\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" that\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" gives\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" me\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f2137487d2aa3a1f180cbf07eb\",\"object\":\"chat.completion.chunk\",\"created\":1791169267,\"model\":\"openai-gpt-54-mini\"Line truncated
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"openai-gpt-54-mini\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.\"},{\"role\":\"user\",\"content\":\"Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_onp7EArhOgXu0hGRF6Y5WHLu\",\"type\":\"function\",\"function\":{\"name\":\"lookup_rate\",\"arguments\":\"{\\\"code\\\":\\\"ZEBRA\\\"}\"}}],\"reasoning_details\":[{\"type\":\"reasoning.encrypted\",\"data\":\"gAAAAABqwxLxEN4vtmI2WcZ_aDDttdmPwAHgnV2gLZBo_f_mmTdGm4oZzE2JVzcj72AeXHyABmmo2VQN4nXaZK9GSSUZRlYL8mECMxKTj9AMgL8zlnuN5WDexxU-e9SduGP36RN9nH56-go4dz8eu5DEMvMf_TMoTnxz5AnC_UWbty63Vp8jEgkD-DoRjd0cg9LjthP_FLyMvP2Wj9qMJxEuO7Mw2_Pu4I3YeChnygLvmRfRR2QkamL5vjb9yHkl0Lb502vEGB2DW_czNEpHxisifvwRBjA7vk0mbn2dlhiR80aNHO71hC-QqrtUfPXx2HIbVLfbPdJf0saI0wD7ZuCJSQCBfB7fMCnj2ZLQeXa67lgXwsZDLBg4HmSJFvsMinx1IHIjUk7iebsKvmYx40cjqpXL3wj7htZWk2hO9OyGGUwlRsn5THdhTsgwg2SPbuHxb-sLPQnEFZ7bRp5lsVm31X2dlHDa1uZ7KLJZyy9g2CLIKsBwFFoCK7jY3HBXfL21ac5TAkOzVmz-XKl6OMPSl-PSdByOO15uHHpyOcJvJvuaea5Tj1nihtuDlhUP5EQPi7MiWpJMFo9AhDCafAbaQOEF5W8AQPeb_GXvPTzhySRAC8PxrhraEcZ4fjpjLqkv6mi_A1YHwbHEHHWjcK5VEKc3dadlIM_s6djclFBocVXrvnQQElVhWBDM-RtK9sgR07BFj5LVk6fYvg0b6gQnbDuQH18jhtPoj0SX0lN921XEQ1ebMCWGLANND2ew_wyNShYouJohefLULicWG57xh_yV1KEG1ufBedq2CPvCHA9Hm5UssbeJx5yBriyUA2Yh4D7j2UBT_KDWEHydDLQ4mWEyLTfQn0ZB3ZOqkU79z3HpK2w_VHUnkl5nEYEU2bmF5lsG33B4gtbQIBtZT76-fizXsvVZx__taOWXg96VMi3CD3DY0TS76B4U92KFmAFJ4aeiM8bkPuzf1Qd202EWE39CotUDoxAM6mzQu0NObTDnGQE776P6kzUoIKUmP8sDwYG5xot8ZTuXcBYysvj4-pFC_fvqMhsdfgonbke78SIjHtmePsOkfHBnCjSSUFKEbaM0nm8jJ6nYVwiYFuXBKD31QD462TAC7ORVIn32sWSgV2t3Sd7vq4ws2Yy7nUoILRAt_NYQUEXt7_R8J5YWj1L6Ruagk7Vtt-CAWxT6FhVyU4JhMb6-tJrYHgdmtunYrjpHBiOVdQR25aOmLbc_WlDvpO4azcRazpgkASAjPaaDycYceKcheiyUDBgFrvcSYrS1fJb6YZrTzOKw1Ztd0YsklS4nc3jffLNLrBQVvnkajj0OHjGcW8wkP93TCMJyt8tfIH0Rd5hIZLY5EqUWj9yZgXO7CuDKQZIEI0oZXef3mjfQqH8Q9rZsSgS3DI3mCF3CN003R_ZKKLGWkG8VzwlvdocNxaV_Z-ujp_O0YMyOcmEoTJI-j3JP3nefNboyP7EWND6VWDjJbqg64dvu0PK0EW5L0lnAu0l-WVb2qmXLYao_7bOlD8JLFZOyUgHAWmetmnm0NuxzevJEVBkNUu1jQatPzf2Jzf9SGKM_3bM_z0TM5McCZ2Pikzwp96QlaiEEWV_j2g02PT5Y3td-lfpoKxoFD5tltGNY9TlPzK-4a9Iz0hloiCprxWMLGKw2JzctrPF1xr42PKGNgPE84xAQ3sQ4mQ==\",\"id\":\"rs_014406f0f45e19c6016ac312f01d2487d2a5f2bdb7fbc42f76\",\"format\":\"openai-responses-v1\",\"index\":0}],\"reasoning_content\":\"**Calculating private data**\\n\\nI need to follow the developer's instructions and use the provided tool to handle private data. First, I should look up the rate for \\\"ZEBRA\\\" before I answer. After that, I’ll multiply the rate by 17 and then add 9 to get the required number. It’s important to give only the requested number and avoid making another tool call. I’ll likely use the commentary channel for this tool call.\\n\\n__ENCRYPTED_REASONING__id=rs_014406f0f45e19c6016ac312f01d2487d2a5f2bdb7fbc42f76\\ngAAAAABqwxLxEN4vtmI2WcZ_aDDttdmPwAHgnV2gLZBo_f_mmTdGm4oZzE2JVzcj72AeXHyABmmo2VQN4nXaZK9GSSUZRlYL8mECMxKTj9AMgL8zlnuN5WDexxU-e9SduGP36RN9nH56-go4dz8eu5DEMvMf_TMoTnxz5AnC_UWbty63Vp8jEgkD-DoRjd0cg9LjthP_FLyMvP2Wj9qMJxEuO7Mw2_Pu4I3YeChnygLvmRfRR2QkamL5vjb9yHkl0Lb502vEGB2DW_czNEpHxisifvwRBjA7vk0mbn2dlhiR80aNHO71hC-QqrtUfPXx2HIbVLfbPdJf0saI0wD7ZuCJSQCBfB7fMCnj2ZLQeXa67lgXwsZDLBg4HmSJFvsMinx1IHIjUk7iebsKvmYx40cjqpXL3wj7htZWk2hO9OyGGUwlRsn5THdhTsgwg2SPbuHxb-sLPQnEFZ7bRp5lsVm31X2dlHDa1uZ7KLJZyy9g2CLIKsBwFFoCK7jY3HBXfL21ac5TAkOzVmz-XKl6OMPSl-PSdByOO15uHHpyOcJvJvuaea5Tj1nihtuDlhUP5EQPi7MiWpJMFo9AhDCafAbaQOEF5W8AQPeb_GXvPTzhySRAC8PxrhraEcZ4fjpjLqkv6mi_A1YHwbHEHHWjcK5VEKc3dadlIM_s6djclFBocVXrvnQQElVhWBDM-RtK9sgR07BFj5LVk6fYvg0b6gQnbDuQH18jhtPoj0SX0lN921XEQ1ebMCWGLANND2ew_wyNShYouJohefLULicWG57xh_yV1KEG1ufBedq2CPvCHA9Hm5UssbeJx5yBriyUA2Yh4D7j2UBT_KDWEHydDLQ4mWEyLTfQn0ZB3ZOqkU79z3HpK2w_VHUnkl5nEYEU2bmF5lsG33B4gtbQIBtZT76-fizXsvVZx__taOWXg96VMi3CD3DY0TS76B4U92KFmAFJ4aeiM8bkPuzf1Qd202EWE39CotUDoxAM6mzQu0NObTDnGQE776P6kzUoIKUmP8sDwYG5xot8ZTuXcBYysvj4-pFC_fvqMhsdfgonbke78SIjHtmePsOkfHBnCjSSUFKEbaM0nm8jJ6nYVwiYFuXBKD31QD462TAC7ORVIn32sWSgV2t3Sd7vq4ws2Yy7nUoILRAt_NYQUEXt7_R8J5YWj1L6Ruagk7Vtt-CAWxT6FhVyU4JhMb6-tJrYHgdmtunYrjpHBiOVdQR25aOmLbc_WlDvpO4azcRazpgkASAjPaaDycYceKcheiyUDBgFrvcSYrS1fJb6YZrTzOKw1Ztd0YsklS4nc3jffLNLrBQVvnkajj0OHjGcW8wkP93TCMJyt8tfIH0Rd5hIZLY5EqUWj9yZgXO7CuDKQZIEI0oZXef3mjfQqH8Q9rZsSgS3DI3mCF3CN003R_ZKKLGWkG8VzwlvdocNxaV_Z-ujp_O0YMyOcmEoTJI-j3JP3nefNboyP7EWND6VWDjJbqg64dvu0PK0EW5L0lnAu0l-WVb2qmXLYao_7bOlD8JLFZOyUgHAWmetmnm0NuxzevJEVBkNUu1jQatPzf2Jzf9SGKM_3bM_z0TM5McCZ2Pikzwp96QlaiEEWV_j2g02PT5Y3td-lfpoKxoFD5tltGNY9TlPzK-4a9Iz0hloiCprxWMLGKw2JzctrPF1xr42PKGNgPE84xAQ3sQ4mQ==\"},{\"role\":\"tool\",\"tool_call_id\":\"call_onp7EArhOgXu0hGRF6Y5WHLu\",\"content\":\"{\\\"code\\\":\\\"ZEBRA\\\",\\\"rate\\\":23}\"},{\"role\":\"assistant\",\"content\":\"400\",\"reasoning_details\":[{\"type\":\"reasoning.encrypted\",\"data\":\"gAAAAABqwxL0Nl6Jl5EZuOLine truncated
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\"**Calculating a simple addition**\\n\\nThe\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" user\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" wants\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" me\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" to\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" add\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" 7\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" to\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" the\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" previous\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" final\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" answer\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\",\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" which\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" was\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" 400\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\".\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"choices\":[{\"index\":0,\"delta\":{\"reasoning_content\":\" This\"},\"finish_reason\":null}]}\n\ndata: {\"id\":\"resp_014406f0f45e19c6016ac312f49b9c87d2afc60121b8910612\",\"object\":\"chat.completion.chunk\",\"created\":1791169269,\"model\":\"openai-gpt-54-mini\",\"Line truncated
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/venice-chat/qwen-disables-reasoning.json

@@ -1,35 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "tags": [
-      "prefix:venice-chat",
-      "provider:venice",
-      "protocol:venice-chat",
-      "text",
-      "reasoning",
-      "toggle"
-    ],
-    "name": "venice-chat/qwen-disables-reasoning",
-    "recordedAt": "2026-10-05T02:59:04.614Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"qwen3-6-27b\",\"messages\":[{\"role\":\"user\",\"content\":\"What is 23 multiplied by 17 plus 9? Reply with just the number.\"}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_completion_tokens\":4096,\"reasoning\":{\"enabled\":false},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream; charset=utf-8"
-        },
-        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-RxYUpStKYw7YgEZcXjsb2dOt\",\"object\":\"chat.completion.chunk\",\"created\":1791169144,\"model\":\"qwen3-6-27b\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxYUpStKYw7YgEZcXjsb2dOt\",\"object\":\"chat.completion.chunk\",\"created\":1791169144,\"model\":\"qwen3-6-27b\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxYUpStKYw7YgEZcXjsb2dOt\",\"object\":\"chat.completion.chunk\",\"created\":1791169144,\"model\":\"qwen3-6-27b\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"4\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxYUpStKYw7YgEZcXjsb2dOt\",\"object\":\"chat.completion.chunk\",\"created\":1791169144,\"model\":\"qwen3-6-27b\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"0\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxYUpStKYw7YgEZcXjsb2dOt\",\"object\":\"chat.completion.chunk\",\"created\":1791169144,\"model\":\"qwen3-6-27b\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"0\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxYUpStKYw7YgEZcXjsb2dOt\",\"object\":\"chat.completion.chunk\",\"created\":1791169144,\"model\":\"qwen3-6-27b\",\"choices\":[{\"index\":0,\"delta\":{\"role\":null,\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":\"stop\"}]}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxYUpStKYw7YgEZcXjsb2dOt\",\"object\":\"chat.completion.chunk\",\"created\":1791169144,\"model\":\"qwen3-6-27b\",\"choices\":[],\"usage\":{\"prompt_tokens\":32,\"completion_tokens\":4,\"total_tokens\":36},\"cost\":{\"usd\":0.0000234,\"diem\":0}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/venice-chat/surfaces-venice-model-errors.json

@@ -1,33 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "tags": [
-      "prefix:venice-chat",
-      "provider:venice",
-      "protocol:venice-chat",
-      "error"
-    ],
-    "name": "venice-chat/surfaces-venice-model-errors",
-    "recordedAt": "2026-10-05T02:59:11.768Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.venice.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"no-such-model-xyz\",\"messages\":[{\"role\":\"user\",\"content\":\"Hello\"}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"venice_parameters\":{\"include_venice_system_prompt\":false}}"
-      },
-      "response": {
-        "status": 404,
-        "headers": {
-          "content-type": "application/json; charset=utf-8"
-        },
-        "body": "{\"error\":\"Specified model not found: no-such-model-xyz. Did you mean: z-ai-glm-5-3, z-ai-glm-5-3-flash, z-ai-glm-5-turbo?\"}"
-      }
-    }
-  ]
-}

packages/ai/test/provider-options/venice.types.ts

@@ -1,26 +0,0 @@
-import { LLM } from "../../src/index.js"
-import { Venice } from "../../src/providers.js"
-
-LLM.request({
-  model: Venice.chat("qwen3-6-27b"),
-  providerOptions: { reasoningEffort: "high", reasoning: { summary: "concise" }, veniceParameters: { includeVeniceSystemPrompt: false } },
-})
-LLM.request({
-  model: Venice.configure({ providerOptions: { reasoningEffort: "future-effort" } }).model("future-model"),
-  providerOptions: { reasoning: { enabled: false }, promptCacheRetention: "future-retention", parallelToolCalls: false },
-})
-LLM.request({
-  model: Venice.chat("qwen3-6-27b"),
-  // @ts-expect-error Thinking toggles are boolean.
-  providerOptions: { reasoning: { enabled: "false" } },
-})
-LLM.request({
-  model: Venice.chat("qwen3-6-27b"),
-  // @ts-expect-error Venice uses nested reasoning, not Anthropic thinking controls.
-  providerOptions: { thinking: { type: "disabled" } },
-})
-LLM.request({
-  model: Venice.chat("qwen3-6-27b"),
-  // @ts-expect-error Venice's system-prompt toggle is boolean.
-  providerOptions: { veniceParameters: { includeVeniceSystemPrompt: "false" } },
-})

packages/ai/test/provider/anthropic-messages.test.ts

@@ -431,115 +431,42 @@ describe("Anthropic Messages route", () => {
         (yield* compileRequest(
           LLM.request({
             model: opus48,
-            messages: [
-              Message.user("Start."),
-              Message.assistant("One."),
-              Message.system("Update."),
-              Message.assistant("Two."),
-            ],
+            messages: [Message.user("Before."), Message.system("One."), Message.system("Two.")],
             cache: "none",
           }),
         )).body.messages,
       ).toEqual([
-        { role: "user", content: [{ type: "text", text: "Start." }] },
-        { role: "assistant", content: [{ type: "text", text: "One." }] },
-        { role: "user", content: [{ type: "text", text: "<system-update>\nUpdate.\n</system-update>" }] },
-        { role: "assistant", content: [{ type: "text", text: "Two." }] },
+        {
+          role: "user",
+          content: [
+            { type: "text", text: "Before." },
+            { type: "text", text: "<system-update>\nOne.\n</system-update>" },
+            { type: "text", text: "<system-update>\nTwo.\n</system-update>" },
+          ],
+        },
       ])
     }),
   )
 
-  it.effect("moves system updates to the next assistant turn and sends consecutive updates together", () =>
-    Effect.gen(function* () {
-      const lower = (messages: ReadonlyArray<Message>) =>
-        compileRequest(LLM.request({ model: opus48, messages: [...messages], cache: "none" })).pipe(
-          Effect.map((prepared) => prepared.body.messages),
-        )
-      const system = (text: string) => ({ role: "system", content: [{ type: "text", text, cache_control: undefined }] })
-      const user = (text: string) => ({ role: "user", content: [{ type: "text", text }] })
-      const assistant = (text: string) => ({ role: "assistant", content: [{ type: "text", text }] })
-
-      expect(
-        yield* lower([
-          Message.user("Fix it."),
-          Message.assistant("Done."),
-          Message.system("Update."),
-          Message.user("Next."),
-        ]),
-      ).toEqual([user("Fix it."), assistant("Done."), user("Next."), system("Update.")])
-      expect(yield* lower([Message.user("Before."), Message.system("One."), Message.system("Two.")])).toEqual([
-        user("Before."),
-        system("One."),
-        system("Two."),
-      ])
-      expect(
-        yield* lower([
-          Message.user("Fix it."),
-          Message.assistant("Done."),
-          Message.system("One."),
-          Message.user("Next."),
-          Message.system("Two."),
-          Message.assistant("After."),
-        ]),
-      ).toEqual([
-        user("Fix it."),
-        assistant("Done."),
-        user("Next."),
-        system("One."),
-        system("Two."),
-        assistant("After."),
-      ])
-      expect(
-        yield* lower([
-          Message.user("Use the tool."),
-          Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: {} })]),
-          Message.tool({ id: "call_1", name: "lookup", result: "Done." }),
-          Message.system("Update."),
-          Message.user("Also check tests."),
-        ]),
-      ).toEqual([
-        user("Use the tool."),
-        { role: "assistant", content: [{ type: "tool_use", id: "call_1", name: "lookup", input: {} }] },
-        { role: "user", content: [{ type: "tool_result", tool_use_id: "call_1", content: '"Done."' }] },
-        user("Also check tests."),
-        system("Update."),
-      ])
-    }),
-  )
-
-  it.effect("keeps wrapped system updates in place for models without native system updates", () =>
+  it.effect("keeps a terminal Vertex system update in the tool-result turn", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
         LLM.request({
-          model,
+          model: vertexOpus48,
           messages: [
-            Message.user("Fix it."),
-            Message.assistant("Done."),
-            Message.system("Update."),
-            Message.user("Next."),
+            Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: {} })]),
+            Message.tool({ id: "call_1", name: "lookup", result: "Done." }),
+            Message.system("Operator update."),
           ],
           cache: "none",
         }),
       )
 
       expect(prepared.body.messages).toEqual([
-        { role: "user", content: [{ type: "text", text: "Fix it." }] },
-        { role: "assistant", content: [{ type: "text", text: "Done." }] },
-        { role: "user", content: [{ type: "text", text: "<system-update>\nUpdate.\n</system-update>" }] },
-        { role: "user", content: [{ type: "text", text: "Next." }] },
-      ])
-    }),
-  )
-
-  it.effect("sends Vertex system updates after local tool results as native system messages", () =>
-    Effect.gen(function* () {
-      const toolTurn = [
-        Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: {} })]),
-        Message.tool({ id: "call_1", name: "lookup", result: "Done." }),
-        Message.system("Operator update."),
-      ]
-      const lowered = [
-        { role: "assistant", content: [{ type: "tool_use", id: "call_1", name: "lookup", input: {} }] },
+        {
+          role: "assistant",
+          content: [{ type: "tool_use", id: "call_1", name: "lookup", input: {} }],
+        },
         {
           role: "user",
           content: [
@@ -550,23 +477,55 @@ describe("Anthropic Messages route", () => {
               is_error: undefined,
               cache_control: undefined,
             },
+            {
+              type: "text",
+              text: "<system-update>\nOperator update.\n</system-update>",
+              cache_control: undefined,
+            },
           ],
         },
-        { role: "system", content: [{ type: "text", text: "Operator update.", cache_control: undefined }] },
-      ]
+      ])
+    }),
+  )
 
-      const terminal = yield* compileRequest(LLM.request({ model: vertexOpus48, messages: toolTurn, cache: "none" }))
-      const history = yield* compileRequest(
+  it.effect("preserves folded tool-result system updates across multi-turn Vertex history", () =>
+    Effect.gen(function* () {
+      const prepared = yield* compileRequest(
         LLM.request({
           model: vertexOpus48,
-          messages: [...toolTurn, Message.assistant("Acknowledged."), Message.user("Next step.")],
+          messages: [
+            Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: {} })]),
+            Message.tool({ id: "call_1", name: "lookup", result: "Done." }),
+            Message.system("Operator update."),
+            Message.assistant("Acknowledged."),
+            Message.user("Next step."),
+          ],
           cache: "none",
         }),
       )
 
-      expect(terminal.body.messages).toEqual(lowered)
-      expect(history.body.messages).toEqual([
-        ...lowered,
+      expect(prepared.body.messages).toEqual([
+        {
+          role: "assistant",
+          content: [{ type: "tool_use", id: "call_1", name: "lookup", input: {} }],
+        },
+        {
+          role: "user",
+          content: [
+            {
+              type: "tool_result",
+              tool_use_id: "call_1",
+              content: '"Done."',
+              is_error: undefined,
+              cache_control: undefined,
+            },
+            {
+              type: "text",
+              text: "<system-update>\nOperator update.\n</system-update>",
+              cache_control: undefined,
+            },
+          ],
+        },
         { role: "assistant", content: [{ type: "text", text: "Acknowledged." }] },
         { role: "user", content: [{ type: "text", text: "Next step." }] },
       ])

packages/ai/test/provider/venice.recorded.test.ts

@@ -1,233 +0,0 @@
-import { expect } from "bun:test"
-import { Effect, Schema } from "effect"
-import { LLM, LLMEvent, LLMRequest, Message, ToolChoice, ToolDefinition } from "../../src/index.js"
-import { Venice } from "../../src/providers.js"
-import { LLMClient } from "../../src/route.js"
-import { compileRequest } from "../../src/route/client.js"
-import { recordedTests } from "../recorded-test.js"
-
-const apiKey = process.env.VENICE_API_KEY ?? "fixture"
-const recorded = recordedTests({
-  prefix: "venice-chat",
-  provider: "venice",
-  protocol: "venice-chat",
-  requires: ["VENICE_API_KEY"],
-})
-const lookup = ToolDefinition.make({
-  name: "lookup_rate",
-  description: "Retrieve the private conversion rate for a code. Only this tool knows the rate.",
-  inputSchema: {
-    type: "object",
-    properties: { code: { type: "string", enum: ["ZEBRA", "MOOSE"] } },
-    required: ["code"],
-    additionalProperties: false,
-  },
-})
-
-for (const item of [
-  { model: "deepseek-v4-flash", reasoning: "scalar" },
-  { model: "claude-opus-4-8", reasoning: "signed", effort: "high" },
-  { model: "gemini-3-1-pro-preview", reasoning: "details", effort: "high" },
-  { model: "openai-gpt-54-mini", reasoning: "encrypted" },
-] as const) {
-  recorded.effect.with(
-    `${item.model} preserves reasoning through a tool loop and follow-up`,
-    {
-      tags: ["reasoning", "tool", "tool-loop", "continuation", "usage", item.reasoning],
-      metadata: { model: item.model },
-    },
-    () =>
-      Effect.gen(function* () {
-        const request = LLM.request({
-          model: Venice.configure({ apiKey }).chat(item.model),
-          system:
-            "Use the provided tool for private data. After receiving the result, give only the requested number; do not call the tool again.",
-          prompt:
-            "Look up conversion rate for code ZEBRA. Then multiply that rate by 17 and add 9. You must use lookup_rate before answering.",
-          tools: [lookup],
-          generation: { maxTokens: 4096 },
-          providerOptions: "effort" in item ? { reasoningEffort: item.effort } : undefined,
-        })
-        const first = yield* LLMClient.generate(request)
-        expect(first.toolCalls).toMatchObject([{ name: "lookup_rate", input: { code: "ZEBRA" } }])
-        expect(first.finishReason.normalized).toBe("tool-calls")
-        expect(first.events.filter(LLMEvent.is.finish)).toHaveLength(1)
-        const continuation = LLMRequest.update(request, {
-          toolChoice: ToolChoice.make("none"),
-          messages: [
-            ...request.messages,
-            first.message,
-            ...first.toolCalls.map((call) =>
-              Message.tool({ id: call.id, name: call.name, result: { code: "ZEBRA", rate: 23 } }),
-            ),
-          ],
-        })
-        const compiled = yield* compileRequest(continuation)
-        const assistant = compiled.body.messages.find((message) => message.role === "assistant")
-        expect(assistant).toBeDefined()
-        // Some models call a tool immediately and only reason after its result.
-        if (item.reasoning === "scalar" && first.reasoning.length > 0) {
-          expect(assistant).toMatchObject({ reasoning_content: first.reasoning })
-        }
-        if (item.reasoning === "signed") {
-          const details = first.message.content
-            .filter((part) => part.type === "reasoning")
-            .flatMap((part) => part.providerMetadata?.venice?.reasoningDetails ?? [])
-          expect(details).toEqual(
-            expect.arrayContaining([
-              expect.objectContaining({ type: "reasoning.text", signature: expect.any(String) }),
-            ]),
-          )
-          expect(assistant).toMatchObject({ reasoning_details: details })
-        }
-        if (item.reasoning === "details")
-          expect(assistant).toMatchObject({
-            reasoning_details: expect.arrayContaining([
-              expect.objectContaining({ type: "reasoning.encrypted", data: expect.any(String) }),
-            ]),
-          })
-        if (item.reasoning === "encrypted") {
-          expect(first.reasoning).not.toContain("__ENCRYPTED_REASONING__")
-          const details = first.message.content
-            .filter((part) => part.type === "reasoning")
-            .flatMap((part) => part.providerMetadata?.venice?.reasoningDetails ?? [])
-          if (details.length > 0) expect(assistant).toMatchObject({ reasoning_details: details })
-        }
-        const second = yield* LLMClient.generate(continuation)
-        expect(second.text).toContain("400")
-        expect(second.reasoning).not.toContain("__ENCRYPTED_REASONING__")
-        expect(second.toolCalls).toHaveLength(0)
-        expect(second.finishReason.normalized).toBe("stop")
-        expect(second.usage?.inputTokens).toBeGreaterThan(0)
-        expect(second.usage?.outputTokens).toBeGreaterThan(0)
-        const followUp = LLMRequest.update(continuation, {
-          messages: [
-            ...continuation.messages,
-            second.message,
-            Message.user("Add 7 to your previous final answer. Reply with just the number."),
-          ],
-        })
-        const third = yield* LLMClient.generate(followUp)
-        expect(third.text).toContain("407")
-        expect(third.finishReason.normalized).toBe("stop")
-        if (item.reasoning === "encrypted") {
-          expect(
-            [first, second, third].flatMap((response) =>
-              response.message.content
-                .filter((part) => part.type === "reasoning")
-                .flatMap((part) => part.providerMetadata?.venice?.reasoningDetails ?? []),
-            ),
-          ).toEqual(
-            expect.arrayContaining([
-              expect.objectContaining({ type: "reasoning.encrypted", data: expect.any(String) }),
-            ]),
-          )
-        }
-      }),
-    180_000,
-  )
-}
-
-recorded.effect.with(
-  "Gemini preserves per-call signatures through parallel tools",
-  { tags: ["tool", "parallel", "signature"] },
-  () =>
-    Effect.gen(function* () {
-      const request = LLM.request({
-        model: Venice.configure({ apiKey }).chat("gemini-3-8-flash"),
-        prompt:
-          "Look up private rates for both ZEBRA and MOOSE using two calls to lookup_rate. Then add the rates and multiply by 7. Use parallel calls if possible.",
-        tools: [lookup],
-        providerOptions: { reasoningEffort: "high", parallelToolCalls: true },
-        generation: { maxTokens: 4096 },
-      })
-      const first = yield* LLMClient.generate(request)
-      expect(first.toolCalls).toHaveLength(2)
-      const continuation = LLMRequest.update(request, {
-        toolChoice: ToolChoice.make("none"),
-        messages: [
-          ...request.messages,
-          first.message,
-          ...first.toolCalls.map((call) =>
-            Message.tool({
-              id: call.id,
-              name: call.name,
-              result: {
-                rate:
-                  Schema.decodeUnknownSync(Schema.Struct({ code: Schema.String }))(call.input).code === "ZEBRA"
-                    ? 23
-                    : 31,
-              },
-            }),
-          ),
-        ],
-      })
-      const compiled = yield* compileRequest(continuation)
-      expect(compiled.body.messages).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            tool_calls: first.toolCalls.map((call) =>
-              expect.objectContaining({
-                id: call.id,
-                ...(call.providerMetadata?.venice?.thoughtSignature === undefined
-                  ? {}
-                  : { thought_signature: call.providerMetadata.venice.thoughtSignature }),
-              }),
-            ),
-          }),
-        ]),
-      )
-      const second = yield* LLMClient.generate(continuation)
-      expect(second.text).toContain("378")
-      const signature = second.message.content
-        .filter((part) => part.type === "text")
-        .map((part) => part.providerMetadata?.venice?.messageThoughtSignature)
-        .find((value) => value !== undefined)
-      expect(signature).toEqual(expect.any(String))
-      const followUp = LLMRequest.update(continuation, {
-        messages: [
-          ...continuation.messages,
-          second.message,
-          Message.user("Add 7 to your previous final answer. Reply with just the number."),
-        ],
-      })
-      expect((yield* compileRequest(followUp)).body.messages).toEqual(
-        expect.arrayContaining([expect.objectContaining({ role: "assistant", thought_signature: signature })]),
-      )
-      expect((yield* LLMClient.generate(followUp)).text).toContain("385")
-    }),
-  180_000,
-)
-
-recorded.effect.with(
-  "Qwen disables reasoning",
-  { tags: ["text", "reasoning", "toggle"] },
-  () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(
-        LLM.request({
-          model: Venice.configure({ apiKey }).chat("qwen3-6-27b"),
-          prompt: "What is 23 multiplied by 17 plus 9? Reply with just the number.",
-          providerOptions: { reasoning: { enabled: false } },
-          generation: { maxTokens: 4096 },
-        }),
-      )
-      expect(response.text).toContain("400")
-      expect(response.reasoning).toBe("")
-    }),
-  120_000,
-)
-
-recorded.effect.with("surfaces Venice model errors", { tags: ["error"] }, () =>
-  Effect.gen(function* () {
-    const result = yield* LLMClient.generate(
-      LLM.request({ model: Venice.configure({ apiKey }).chat("no-such-model-xyz"), prompt: "Hello" }),
-    ).pipe(Effect.result)
-    expect(result._tag).toBe("Failure")
-    if (result._tag === "Failure") {
-      expect(result.failure.reason._tag).toBe("InvalidRequest")
-      expect(result.failure.message).toContain("Specified model not found")
-      expect(result.failure.reason.http?.status).toBe(404)
-    }
-  }),
-)

packages/ai/test/provider/venice.test.ts

@@ -1,370 +0,0 @@
-import { expect } from "bun:test"
-import { ConfigProvider, Effect } from "effect"
-import { Headers } from "effect/unstable/http"
-import { Auth, LLM, LLMClient, Message } from "../../src/index.js"
-import { OpenAI, Venice } from "../../src/providers.js"
-import { compileRequest } from "../../src/route/client.js"
-import { Endpoint } from "../../src/route/endpoint.js"
-import { it } from "../lib/effect.js"
-import { fixedResponse } from "../lib/http.js"
-import { sseEvents } from "../lib/sse.js"
-
-const model = Venice.configure({ apiKey: "fixture" }).chat("fixture-model")
-const frame = (delta: Record<string, unknown>, finish_reason: string | null = null) => ({
-  choices: [{ delta, finish_reason }],
-})
-
-it.effect("Venice owns its endpoint, environment auth, aliases, and SDK-compatible prompt default", () =>
-  Effect.gen(function* () {
-    expect(Venice.provider.model).toBe(Venice.provider.chat)
-    const selected = Venice.chat("qwen3-6-27b")
-    const request = LLM.request({ model: selected, prompt: "Hello", promptCacheKey: "session-123" })
-    const compiled = yield* compileRequest(request)
-    const url = Endpoint.render(selected.route.endpoint, { request, body: compiled.body }).toString()
-    expect(url).toBe("https://api.venice.ai/api/v1/chat/completions")
-    expect(selected.provider).toBe("venice")
-    expect(compiled.body.venice_parameters).toEqual({ include_venice_system_prompt: false })
-    expect(compiled.body.prompt_cache_key).toBe("session-123")
-    expect(compiled.body.store).toBeUndefined()
-    expect(compiled.body.stream_options).toEqual({ include_usage: true })
-    const headers = yield* selected.route.auth.apply({
-      request,
-      method: "POST",
-      url,
-      body: "{}",
-      headers: Headers.empty,
-    })
-    expect(headers.authorization).toBe("Bearer fixture")
-    const custom = Venice.configure({
-      baseURL: "https://gateway.example/v1",
-      queryParams: { deployment: "private" },
-      auth: Auth.header("x-key", "fixture"),
-    }).chat("qwen3-6-27b")
-    expect(Endpoint.render(custom.route.endpoint, { request, body: compiled.body }).toString()).toBe(
-      "https://gateway.example/v1/chat/completions?deployment=private",
-    )
-  }).pipe(Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env: { VENICE_API_KEY: "fixture" } })))),
-)
-
-it.effect("Venice lowers typed options, model defaults, and explicit reasoning overrides", () =>
-  Effect.gen(function* () {
-    const compiled = yield* compileRequest(
-      LLM.request({
-        model: Venice.configure({ apiKey: "fixture", providerOptions: { reasoningEffort: "low" } }).model(
-          "qwen3-6-27b",
-        ),
-        generation: { maxTokens: 200, topK: 20 },
-        providerOptions: {
-          reasoningEffort: "future-effort",
-          reasoning: { effort: "high", enabled: true, summary: "concise" },
-          veniceParameters: { includeVeniceSystemPrompt: true, enableWebSearch: "auto", stripThinkingResponse: false },
-          parallelToolCalls: false,
-          maxCompletionTokens: 123,
-          minP: 0.1,
-          repetitionPenalty: 1.1,
-          stopTokenIds: [12],
-          promptCacheRetention: "24h",
-          logprobs: true,
-          topLogprobs: 2,
-          minTemp: 0.1,
-          maxTemp: 1.5,
-          responseFormat: { type: "json_object" },
-          user: "user-123",
-        },
-      }),
-    )
-    expect(compiled.body).toMatchObject({
-      max_completion_tokens: 123,
-      top_k: 20,
-      min_p: 0.1,
-      repetition_penalty: 1.1,
-      reasoning: { effort: "future-effort", enabled: true, summary: "concise" },
-      venice_parameters: {
-        include_venice_system_prompt: true,
-        enable_web_search: "auto",
-        strip_thinking_response: false,
-      },
-      parallel_tool_calls: false,
-      stop_token_ids: [12],
-      prompt_cache_retention: "24h",
-      logprobs: true,
-      top_logprobs: 2,
-      min_temp: 0.1,
-      max_temp: 1.5,
-      response_format: { type: "json_object" },
-      user: "user-123",
-    })
-    expect(compiled.body.reasoning_effort).toBeUndefined()
-    expect(compiled.body.max_tokens).toBeUndefined()
-    expect(
-      (yield* compileRequest(LLM.request({ model, providerOptions: { reasoning: { enabled: false } } }))).body
-        .reasoning,
-    ).toEqual({ enabled: false })
-    expect(
-      (yield* compileRequest(LLM.request({ model, cache: "none", promptCacheKey: "session-123" }))).body
-        .prompt_cache_key,
-    ).toBeUndefined()
-  }),
-)
-
-it.effect("Venice hides encrypted trailers across every marker split while preserving exact replay", () =>
-  Effect.gen(function* () {
-    const marker = "__ENCRYPTED_REASONING__"
-    for (const split of Array.from({ length: marker.length + 1 }, (_, index) => index)) {
-      const raw = `Visible summary\n${marker}id=rs_123\nopaque-payload`
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              frame({ reasoning_content: `Visible summary\n${marker.slice(0, split)}` }),
-              frame({
-                reasoning_content: `${marker.slice(split)}id=rs_123\nopaque-payload`,
-                reasoning_details: [
-                  {
-                    type: "reasoning.encrypted",
-                    data: "opaque-payload",
-                    format: "openai-responses-v1",
-                    id: "rs_123",
-                    index: 0,
-                  },
-                ],
-              }),
-              frame({ content: "42" }, "stop"),
-            ),
-          ),
-        ),
-      )
-      expect(response.reasoning).toBe("Visible summary\n")
-      expect(
-        response.events
-          .filter((event) => event.type === "reasoning-delta")
-          .map((event) => event.text)
-          .join(""),
-      ).toBe("Visible summary\n")
-      const replay = yield* compileRequest(LLM.request({ model, messages: [Message.user("Hello"), response.message] }))
-      expect(replay.body.messages).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            role: "assistant",
-            reasoning_content: raw,
-            reasoning_details: [
-              {
-                type: "reasoning.encrypted",
-                data: "opaque-payload",
-                format: "openai-responses-v1",
-                id: "rs_123",
-                index: 0,
-              },
-            ],
-          }),
-        ]),
-      )
-    }
-  }),
-)
-
-it.effect("Venice preserves opaque-only reasoning and does not eat an incomplete marker prefix", () =>
-  Effect.gen(function* () {
-    for (const scalar of ["__ENCRYPTED_REASONING__opaque", "normal _", "normal __ENCRYPTED_"]) {
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-        Effect.provide(
-          fixedResponse(sseEvents(frame({ reasoning_content: scalar }), frame({ content: "42" }, "stop"))),
-        ),
-      )
-      expect(response.reasoning).toBe(scalar.startsWith("__ENCRYPTED_REASONING__") ? "" : scalar)
-      const body = (yield* compileRequest(LLM.request({ model, messages: [response.message] }))).body
-      expect(body.messages).toEqual(expect.arrayContaining([expect.objectContaining({ reasoning_content: scalar })]))
-    }
-  }),
-)
-
-it.effect("Venice encrypted trailers do not change the base OpenAI Chat protocol", () =>
-  LLMClient.generate(
-    LLM.request({ model: OpenAI.configure({ apiKey: "fixture" }).chat("gpt-4o"), prompt: "Hello" }),
-  ).pipe(
-    Effect.provide(
-      fixedResponse(
-        sseEvents(
-          frame({ reasoning_content: "text __ENCRYPTED_REASONING__payload" }),
-          frame({ content: "42" }, "stop"),
-        ),
-      ),
-    ),
-    Effect.tap((response) => Effect.sync(() => expect(response.reasoning).toBe("text __ENCRYPTED_REASONING__payload"))),
-  ),
-)
-
-it.effect("Venice keeps late Gemini signatures attached to the correct parallel call", () =>
-  Effect.gen(function* () {
-    const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Lookup" })).pipe(
-      Effect.provide(
-        fixedResponse(
-          sseEvents(
-            frame({
-              tool_calls: [
-                { index: 0, id: "call_0", function: { name: "lookup", arguments: '{"key":"A"}' } },
-                { index: 1, id: "call_1", function: { name: "lookup", arguments: '{"key":"B"}' } },
-              ],
-            }),
-            frame({ tool_calls: [{ index: 0, thought_signature: "signed-first-call" }] }),
-            frame({}, "tool_calls"),
-          ),
-        ),
-      ),
-    )
-    expect(response.toolCalls).toHaveLength(2)
-    expect(response.toolCalls[0].providerMetadata?.venice?.thoughtSignature).toBe("signed-first-call")
-    expect(response.toolCalls[1].providerMetadata?.venice?.thoughtSignature).toBeUndefined()
-    const replay = yield* compileRequest(LLM.request({ model, messages: [Message.user("Lookup"), response.message] }))
-    expect(replay.body.messages).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          tool_calls: [
-            expect.objectContaining({ id: "call_0", thought_signature: "signed-first-call" }),
-            expect.not.objectContaining({ thought_signature: expect.anything() }),
-          ],
-        }),
-      ]),
-    )
-  }),
-)
-
-it.effect("Venice preserves message signatures even for identical answers and empty intervening messages", () =>
-  Effect.gen(function* () {
-    const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-      Effect.provide(
-        fixedResponse(
-          sseEvents(frame({ content: "42" }), frame({ thought_signature: "second-signature" }), frame({}, "stop")),
-        ),
-      ),
-    )
-    const request = LLM.request({
-      model,
-      messages: [
-        Message.assistant([
-          { type: "text", text: "42", providerMetadata: { venice: { messageThoughtSignature: "first-signature" } } },
-        ]),
-        Message.assistant(""),
-        response.message,
-      ],
-    })
-    expect((yield* compileRequest(request)).body.messages).toEqual([
-      { role: "assistant", content: "42", thought_signature: "first-signature" },
-      { role: "assistant", content: "42", thought_signature: "second-signature" },
-    ])
-  }),
-)
-
-it.effect("Venice merges signed Claude reasoning without losing its final signature", () =>
-  Effect.gen(function* () {
-    const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-      Effect.provide(
-        fixedResponse(
-          sseEvents(
-            frame({
-              reasoning_content: "Think ",
-              reasoning_details: [{ type: "reasoning.text", text: "Think ", format: "anthropic-claude-v1", index: 0 }],
-            }),
-            frame({
-              reasoning_content: "carefully",
-              reasoning_details: [
-                { type: "reasoning.text", text: "carefully", format: "anthropic-claude-v1", index: 0 },
-              ],
-            }),
-            frame({
-              reasoning_details: [
-                {
-                  type: "reasoning.text",
-                  text: "",
-                  signature: "claude-signature",
-                  format: "anthropic-claude-v1",
-                  index: 0,
-                },
-              ],
-            }),
-            frame({ content: "42" }, "stop"),
-          ),
-        ),
-      ),
-    )
-    expect(response.reasoning).toBe("Think carefully")
-    expect((yield* compileRequest(LLM.request({ model, messages: [response.message] }))).body.messages).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          reasoning_details: [
-            {
-              type: "reasoning.text",
-              text: "Think carefully",
-              signature: "claude-signature",
-              format: "anthropic-claude-v1",
-              index: 0,
-            },
-          ],
-        }),
-      ]),
-    )
-  }),
-)
-
-it.effect("Venice maps cache-write usage and retains the raw wire spelling", () =>
-  LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-    Effect.provide(
-      fixedResponse(
-        sseEvents(frame({ content: "42" }, "stop"), {
-          choices: [],
-          usage: {
-            prompt_tokens: 100,
-            completion_tokens: 20,
-            total_tokens: 120,
-            prompt_tokens_details: { cached_tokens: 40, cache_creation_input_tokens: 30 },
-            completion_tokens_details: { reasoning_tokens: 10 },
-          },
-        }),
-      ),
-    ),
-    Effect.tap((response) =>
-      Effect.sync(() => {
-        expect(response.usage).toMatchObject({
-          inputTokens: 100,
-          outputTokens: 20,
-          nonCachedInputTokens: 30,
-          cacheReadInputTokens: 40,
-          cacheWriteInputTokens: 30,
-          reasoningTokens: 10,
-        })
-        expect(response.usage?.providerMetadata?.venice).toMatchObject({
-          prompt_tokens_details: { cache_creation_input_tokens: 30 },
-        })
-      }),
-    ),
-  ),
-)
-
-it.effect("Venice surfaces HTTP string errors and streaming validation details without losing the payload", () =>
-  Effect.gen(function* () {
-    const http = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-      Effect.provide(
-        fixedResponse('{"error":"Specified model not found"}', {
-          status: 404,
-          headers: { "content-type": "application/json" },
-        }),
-      ),
-      Effect.result,
-    )
-    expect(http._tag).toBe("Failure")
-    if (http._tag === "Failure") expect(http.failure.message).toContain("Specified model not found")
-    const payload = {
-      error: "Invalid request parameters",
-      issues: [{ message: "Unsupported value", path: ["reasoning", "effort"] }],
-    }
-    const streamed = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" })).pipe(
-      Effect.provide(fixedResponse(sseEvents(payload))),
-      Effect.result,
-    )
-    expect(streamed._tag).toBe("Failure")
-    if (streamed._tag === "Failure") {
-      expect(streamed.failure.message).toContain("reasoning.effort: Unsupported value")
-      expect(JSON.parse(streamed.failure.reason.body ?? "{}")).toEqual(payload)
-    }
-  }),
-)

packages/app/e2e/regression/btw-sidebar.spec.ts

@@ -5,149 +5,11 @@ import { expectSessionTitle } from "../utils/waits"
 
 test.use({ viewport: { width: 1440, height: 900 } })
 
-test("keeps separate one-shot /btw answers and restores them after reload", async ({ page }, testInfo) => {
-  const prompts: unknown[] = []
-  const generations: { sessionID: string; prompt: string }[] = []
-
-  const { editor } = await openSession(page, {
-    name: "BtwQuestions",
-    onPrompt: (input) => prompts.push(input),
-    generate: (input) => {
-      generations.push(input)
-
-      return {
-        text: input.prompt.includes("second question")
-          ? "Second answer"
-          : `First answer\n\n${"A detailed explanation of the first question.\n\n".repeat(100)}End of first answer`,
-      }
-    },
-  })
-
-  const panel = page.locator('[data-slot="session-btw-panel"]')
-  await editor.fill("/btw first question")
-  await editor.press("Enter")
-  await expect(panel.getByText("First answer", { exact: true })).toBeVisible()
-  await expect(panel.getByRole("textbox")).toHaveCount(0)
-  await expect(panel.getByRole("button", { name: "Send", exact: true })).toHaveCount(0)
-  await panel.getByText("End of first answer", { exact: true }).scrollIntoViewIfNeeded()
-  await expect(panel.getByText("End of first answer", { exact: true })).toBeInViewport()
-  await editor.fill("/btw second question")
-  await editor.press("Enter")
-  await expect(panel.getByText("Second answer", { exact: true })).toBeVisible()
-  const first = page.getByRole("tab", { name: "first question", exact: true })
-  const second = page.getByRole("tab", { name: "second question", exact: true })
-  await expect(first).toBeVisible()
-  await expect(second).toHaveAttribute("data-selected", "")
-  await page.screenshot({ path: testInfo.outputPath("separate-tabs.png") })
-  expect(generations).toHaveLength(2)
-  expect(generations[1]?.prompt).not.toContain("first question")
-  expect(generations[1]?.prompt).not.toContain("First answer")
-
-  await page.reload()
-  await expect(first).toBeVisible()
-  await expect(second).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("Second answer", { exact: true })).toBeVisible()
-  await first.click()
-  await expect(panel.getByText("First answer", { exact: true })).toBeVisible()
-  await expect(panel.getByText("Second answer", { exact: true })).toHaveCount(0)
-  await expect(panel.getByRole("textbox")).toHaveCount(0)
-  await page.screenshot({ path: testInfo.outputPath("restored-answer.png") })
-
-  // Closing a tab forgets its question; the other tab and its answer survive a reload.
-  await first.click({ button: "middle" })
-  await expect(first).toHaveCount(0)
-  await expect(second).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("Second answer", { exact: true })).toBeVisible()
-  await page.reload()
-  await expect(second).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("Second answer", { exact: true })).toBeVisible()
-  await expect(first).toHaveCount(0)
-  expect(generations).toHaveLength(2)
-  expect(prompts).toEqual([])
-})
-
-test("isolates concurrent side questions and makes an interrupted reload retryable", async ({ page }) => {
-  const held = Promise.withResolvers<void>()
-  const attempts: string[] = []
-  const prompts: unknown[] = []
-
-  const { editor } = await openSession(page, {
-    name: "BtwConcurrent",
-    onPrompt: (input) => prompts.push(input),
-    generate: async (input) => {
-      attempts.push(input.prompt)
-
-      if (input.prompt.includes("slow question") && attempts.length === 1) {
-        await held.promise
-
-        return { text: "Abandoned answer" }
-      }
-
-      return { text: input.prompt.includes("fast question") ? "Fast answer" : "Retried answer" }
-    },
-  })
-
-  const panel = page.locator('[data-slot="session-btw-panel"]')
-  await editor.fill("/btw slow question")
-  await editor.press("Enter")
-  await expect(panel.getByRole("status")).toContainText("Working")
-  await editor.fill("/btw fast question")
-  await editor.press("Enter")
-  await expect(panel.getByText("Fast answer", { exact: true })).toBeVisible()
-  await page.getByRole("tab", { name: "slow question", exact: true }).click()
-  await expect(panel.getByRole("status")).toContainText("Working")
-  await expect(panel.getByText("Fast answer", { exact: true })).toHaveCount(0)
-
-  await page.reload()
-  await expect(panel.getByText("Couldn’t answer that question", { exact: true })).toBeVisible()
-  await expect(panel.getByRole("status")).toHaveCount(0)
-  expect(attempts).toHaveLength(2)
-  await panel.getByRole("button", { name: "Retry", exact: true }).click()
-  await expect(panel.getByText("Retried answer", { exact: true })).toBeVisible()
-  expect(attempts).toHaveLength(3)
-  expect(attempts[2]).toContain("slow question")
-  expect(attempts[2]).not.toContain("fast question")
-  held.resolve()
-  await page.getByRole("tab", { name: "fast question", exact: true }).click()
-  await expect(panel.getByText("Fast answer", { exact: true })).toBeVisible()
-  await page.getByRole("tab", { name: "slow question", exact: true }).click()
-  await expect(panel.getByText("Retried answer", { exact: true })).toBeVisible()
-  await expect(panel.getByText("Abandoned answer", { exact: true })).toHaveCount(0)
-  await expect(panel.getByRole("textbox")).toHaveCount(0)
-  expect(prompts).toEqual([])
-})
-
-test("keeps many long-titled side tabs usable at a narrow desktop width", async ({ page }, testInfo) => {
-  await page.setViewportSize({ width: 900, height: 700 })
-
-  const { editor } = await openSession(page, {
-    name: "BtwOverflow",
-    generate: () => ({ text: "Saved overflow answer" }),
-  })
-
-  const panel = page.locator('[data-slot="session-btw-panel"]')
-  const questions = Array.from({ length: 12 }, (_, index) => `Side ${index + 1}: ${"long-title-".repeat(30)}`)
-
-  for (const question of questions) {
-    await editor.fill(`/btw ${question}`)
-    await editor.press("Enter")
-    await expect(page.getByRole("tab", { name: question, exact: true })).toHaveAttribute("data-selected", "")
-    await expect(panel.getByText("Saved overflow answer", { exact: true })).toBeVisible()
-  }
-
-  await expect(page.getByRole("tab", { name: /^Side \d+:/ })).toHaveCount(12)
-  await expect(panel.getByRole("textbox")).toHaveCount(0)
-  await page.reload()
-  await expect(page.getByRole("tab", { name: /^Side \d+:/ })).toHaveCount(12)
-  await expect(panel.getByText("Saved overflow answer", { exact: true })).toBeVisible()
-  await page.screenshot({ path: testInfo.outputPath("narrow-many-tabs.png") })
-})
-
 test("answers /btw in the side panel without admitting a prompt", async ({ page }) => {
   const generations: { sessionID: string; prompt: string }[] = []
   const prompts: unknown[] = []
   const generated = Promise.withResolvers<void>()
-  const leftBehind = Promise.withResolvers<void>()
+  const abandoned = Promise.withResolvers<void>()
   const main = { id: "ses_btw_sidebar", title: "Side question session" }
   const other = { id: "ses_btw_sidebar_other", title: "Other side question session" }
   const ownerWarnings: string[] = []
@@ -166,7 +28,7 @@ test("answers /btw in the side panel without admitting a prompt", async ({ page
       if (input.sessionID === other.id) return { text: "This answer belongs to the **other session**." }
 
       if (input.prompt.includes("left behind")) {
-        await leftBehind.promise
+        await abandoned.promise
 
         return { text: "This answer arrived after the user left." }
       }
@@ -185,6 +47,7 @@ test("answers /btw in the side panel without admitting a prompt", async ({ page
   await suggestion.click()
   await expect(editor).toHaveText("/btw ")
   await editor.press("Enter")
+
   const panel = page.locator('[data-slot="session-btw-panel"]')
   await expect(panel).toBeHidden()
   await expect(page.getByText("Add a question after /btw", { exact: true })).toBeVisible()
@@ -196,10 +59,7 @@ test("answers /btw in the side panel without admitting a prompt", async ({ page
   await expect(panel).toBeVisible()
   await expect(panel.getByRole("textbox")).toHaveCount(0)
   await expect(panel.getByRole("status")).toContainText("Working")
-  await expect(page.getByRole("tab", { name: "how does the retry loop work?", exact: true })).toHaveAttribute(
-    "data-selected",
-    "",
-  )
+  await expect(page.getByRole("tab", { name: "/btw" })).toHaveAttribute("data-selected", "")
   generated.resolve()
   await expect(panel.getByText("how does the retry loop work?", { exact: true })).toBeVisible()
   await expect(panel.getByText("exponential backoff", { exact: false })).toBeVisible()
@@ -215,11 +75,13 @@ test("answers /btw in the side panel without admitting a prompt", async ({ page
   await editor.fill("/btw what belongs here?")
   await editor.press("Enter")
   await expect(panel.getByText("other session", { exact: false })).toBeVisible()
+
   await page.locator(`[data-titlebar-tab-link][href="${sessionHref(main.id)}"]`).click()
   await expectSessionTitle(page, main.title)
   await expect(panel.getByText("exponential backoff", { exact: false })).toBeVisible()
   await expect(panel.getByText("other session", { exact: false })).toHaveCount(0)
 
+  // Leaving a session abandons its in-flight question, so it reads as failed on return.
   await editor.fill("/btw is this question left behind?")
   await editor.press("Enter")
   await expect(panel.getByRole("status")).toContainText("Working")
@@ -227,35 +89,13 @@ test("answers /btw in the side panel without admitting a prompt", async ({ page
   await expectSessionTitle(page, other.title)
   await page.locator(`[data-titlebar-tab-link][href="${sessionHref(main.id)}"]`).click()
   await expectSessionTitle(page, main.title)
-  // Leaving the session does not abandon its question: it is still working, and its answer lands once it arrives.
-  await expect(panel.getByRole("status")).toContainText("Working")
-  await page.getByRole("button", { name: "Home", exact: true }).click()
-  await expect(page).toHaveURL(/\/$/)
-  leftBehind.resolve()
-  await page.locator(`[data-titlebar-tab-link][href="${sessionHref(main.id)}"]`).click()
-  await expectSessionTitle(page, main.title)
-  await expect(panel.getByText("This answer arrived after the user left.", { exact: true })).toBeVisible()
-  await expect(panel.getByText("Couldn’t answer that question", { exact: true })).toHaveCount(0)
-  expect(generations.filter((item) => item.prompt.includes("left behind"))).toHaveLength(1)
+  await expect(panel.getByText("Couldn’t answer that question", { exact: true })).toBeVisible()
+  await expect(panel.getByRole("button", { name: "Retry", exact: true })).toBeVisible()
+  abandoned.resolve()
 
   await page.reload()
   await expectSessionTitle(page, main.title)
-  await expect(page.getByRole("tab", { name: "is this question left behind?", exact: true })).toHaveAttribute(
-    "data-selected",
-    "",
-  )
-  await expect(panel.getByText("This answer arrived after the user left.", { exact: true })).toBeVisible()
-  await expect(panel.getByRole("status")).toHaveCount(0)
-  await page.getByRole("tab", { name: "how does the retry loop work?", exact: true }).click()
-  await expect(panel.getByText("exponential backoff", { exact: false })).toBeVisible()
-  await page.getByRole("button", { name: "Home", exact: true }).click()
-  await expect(page).toHaveURL(/\/$/)
-  await page.locator(`[data-titlebar-tab-link][href="${sessionHref(main.id)}"]`).click()
-  await expectSessionTitle(page, main.title)
-  await expect(page.getByRole("tab", { name: "how does the retry loop work?", exact: true })).toHaveAttribute(
-    "data-selected",
-    "",
-  )
-  await expect(panel.getByText("exponential backoff", { exact: false })).toBeVisible()
+  await expect(page.getByRole("tab", { name: "/btw" })).toHaveCount(0)
+  await expect(panel).toHaveCount(0)
   expect(ownerWarnings).toEqual([])
 })

packages/app/e2e/regression/mobile-session.spec.ts

@@ -30,11 +30,9 @@ for (const position of ["top", "bottom"] as const) {
     const navigation = page.locator('[data-slot="session-mobile-view-navigation"]')
     const more = navigation.getByRole("button", { name: "More options", exact: true })
     const picker = tabs.getByRole("tab", { selected: true })
-
     const message = page.locator(
       `[data-timeline-row="UserMessage"][data-message-id="${fixture.expected.targetMessageIDs.at(-1)}"]`,
     )
-
     const composer = page.getByRole("textbox", { name: "Prompt", exact: true })
     await expect(picker).toHaveText("Session")
     await expect(message).toBeVisible()
@@ -42,17 +40,9 @@ for (const position of ["top", "bottom"] as const) {
     await expect(tabs.getByRole("tab")).toHaveText(["Session", "Changes", "Files", "Terminal"])
     await expect(tabs).toHaveCSS("padding-left", "0px")
     await expect(tabs).toHaveCSS("padding-right", "0px")
-
-    if (position === "top") {
-      const titlebar = page.locator('[data-slot="titlebar-v2"]')
-      await expect(titlebar).toHaveCSS("padding-top", "16px")
-      await expect(titlebar).toHaveCSS("height", "44px")
-    }
-
     await expect
       .poll(async () => {
         const bounds = await navigation.boundingBox()
-
         return !!bounds && bounds.x >= 8 && bounds.x <= 9 && bounds.width >= 372 && bounds.width <= 374
       })
       .toBe(true)
@@ -61,7 +51,6 @@ for (const position of ["top", "bottom"] as const) {
         const bar = await tabs.boundingBox()
         const input = await composer.boundingBox()
         const panel = await page.locator('[data-slot="session-chat-panel"]').boundingBox()
-
         return !!bar && !!input && !!panel && Math.abs(bar.y - panel.y) <= 1 && bar.y + bar.height <= input.y
       })
       .toBe(true)
@@ -160,19 +149,16 @@ for (const position of ["top", "bottom"] as const) {
 
     // The view resets to Session whenever the routed session changes, including through Home.
     const trigger = page.locator('[data-slot="mobile-tabs-trigger"]')
-
     const openTabs = async () => {
       await trigger.click()
       await expect(drawer).not.toHaveAttribute("data-transitioning")
     }
-
     const openTab = async (title: string) => {
       await openTabs()
       await drawer.locator('[data-slot="tab-link"]').filter({ hasText: title }).click()
       await expect(drawer).toBeHidden()
       await expect(trigger).toContainText(title)
     }
-
     await more.click()
     await page.getByRole("menuitem", { name: "Usage", exact: true }).click()
     await expect(page.getByText("Total Cost", { exact: true })).toBeVisible()
@@ -352,7 +338,6 @@ test.describe("touch", () => {
       .poll(async () => {
         const navigation = await settings.getByRole("button", { name: "Models", exact: true }).boundingBox()
         const content = await panel.boundingBox()
-
         return !!navigation && !!content && navigation.y + navigation.height <= content.y
       })
       .toBe(true)

packages/app/e2e/regression/session-location-sync.spec.ts

@@ -66,72 +66,6 @@ for (const endpoint of ["/api/location", "/api/agent"]) {
   }
 }
 
-test("replaces the composer when the location is not found and recovers by moving to another worktree", async ({
-  page,
-}) => {
-  const directory = "/projects/deleted-worktree"
-  const destination = "/projects/existing-worktree"
-  const sessionID = "ses_location_not_found"
-  const session = { id: sessionID, projectID: fixture.project.id, directory, title: "Missing location" }
-  const moves: unknown[] = []
-  const transport = await installSseTransport(page, { server: fixture.serverKey })
-  await mockOpenCodeServer(page, {
-    directory: fixture.directory,
-    project: fixture.project,
-    provider: fixture.provider,
-    sessions: [session],
-    fileList: () => [],
-    worktrees: [{ directory: fixture.directory }, { directory: destination, strategy: "git" }],
-    pageMessages: () => ({
-      items: [{ id: "msg_saved", type: "user", text: "Keep this session history", time: { created: 1 } }],
-    }),
-  })
-  let requests = 0
-  await page.route("**/api/location?**", (route) => {
-    if (new URL(route.request().url()).searchParams.get("location[directory]") !== directory) return route.fallback()
-    requests++
-
-    return route.fulfill({
-      status: 404,
-      // SAFETY: the server's wire body for a missing Location, which the client decodes into its own error.
-      // oxlint-disable-next-line anti-slop-effect/no-manual-tagged-construction -- see SAFETY above
-      json: { _tag: "LocationNotFoundError", location: { directory }, message: `Location not found: ${directory}` },
-      headers: { "access-control-allow-origin": "*" },
-    })
-  })
-  await page.route(`**/api/session/${sessionID}/move`, (route) => {
-    if (route.request().method() !== "POST") return route.fallback()
-    moves.push(route.request().postDataJSON())
-
-    return route.fulfill({ status: 204, headers: { "access-control-allow-origin": "*" } })
-  })
-
-  await page.goto(`/server/${base64Encode(fixture.serverKey)}/session/${sessionID}`)
-  const status = page.getByRole("status").filter({ hasText: "Session location unavailable" })
-  await expect(status).toContainText(directory)
-  await expect(page.getByText("Keep this session history", { exact: true })).toBeVisible()
-  await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toHaveCount(0)
-  // A typed not-found answer is final; retrying cannot succeed until the folder changes.
-  expect(requests).toBe(1)
-
-  await transport.waitForConnection()
-  await page.getByRole("button", { name: "Choose worktree", exact: true }).click()
-  await page.getByRole("menuitem", { name: "existing-worktree", exact: true }).click()
-  await expect.poll(() => moves).toEqual([{ directory: destination }])
-
-  session.directory = destination
-  await transport.send({
-    id: "evt_location_not_found_moved",
-    type: "session.moved",
-    created: 2,
-    durable: { aggregateID: sessionID, seq: 1, version: 1 },
-    data: { sessionID, location: { directory: destination }, projectID: fixture.project.id },
-  })
-  await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()
-  await expect(status).toHaveCount(0)
-  await expect(page.getByText("Keep this session history", { exact: true })).toBeVisible()
-})
-
 test("follows a live session move while the agent catalog is still loading", async ({ page }) => {
   const recovery = recoveryRequests(page)
   const directory = "/projects/old-tree"

packages/app/e2e/regression/subagent-child-navigation.spec.ts

@@ -1,6 +1,6 @@
 import type { OpenCodeEvent, SessionMessageInfo } from "@opencode/client/promise"
 import { timelinePresets } from "@opencode/session-ui/timeline/detail"
-import { expect, test, type Locator, type Page } from "@playwright/test"
+import { expect, test, type Page } from "@playwright/test"
 import { expectPath, SERVER, sessionHref } from "../utils/app"
 import { currentSession } from "../utils/mock-server"
 import { assistantMessage, session, sessionID, setupTimeline, textPart, userMessage } from "../utils/timeline"
@@ -38,32 +38,6 @@ test("navigates to a subagent child session missing from the session list", asyn
   await Promise.all([expect(page).toHaveURL(sessionHref(parentID)), expectSessionTitle(page, parentTitle)])
 })
 
-test("keeps the parent title anchored when opening a subagent", async ({ page }) => {
-  await setup(page)
-
-  for (const direction of ["ltr", "rtl"] as const) {
-    await page.goto(sessionHref(parentID))
-    await page.evaluate((direction) => (document.documentElement.dir = direction), direction)
-    await expectSessionTitle(page, parentTitle)
-
-    const start = await titleInlineStart(page.locator("[data-session-title]").getByRole("heading", { name: parentTitle }))
-
-    await page.getByRole("button", { name: "Used 1 Agent", exact: true }).click()
-    await page.locator(`a[href="${sessionHref(childID)}"]`).click()
-    await expectSessionTitle(page, taskDescription)
-
-    const breadcrumb = page.locator('[data-slot="session-title-parent"]')
-
-    await expect(breadcrumb).toHaveText(parentTitle)
-    await expect.poll(() => titleInlineStart(breadcrumb)).toBeCloseTo(start, 0)
-    await breadcrumb.click()
-    await expectSessionTitle(page, parentTitle)
-    await expect
-      .poll(() => titleInlineStart(page.locator("[data-session-title]").getByRole("heading", { name: parentTitle })))
-      .toBeCloseTo(start, 0)
-  }
-})
-
 test("navigates from a running subagent card and hides background controls in the child", async ({ page }) => {
   const runningChildID = "ses_running_child"
   await setupTimeline(page, {
@@ -342,19 +316,6 @@ async function setup(page: Page, events?: () => OpenCodeEvent[], nestedDepth: 0
       }),
   )
 }
-
-function titleInlineStart(title: Locator) {
-  return title.evaluate((element) => {
-    const range = document.createRange()
-
-    range.selectNodeContents(element)
-
-    const bounds = range.getBoundingClientRect()
-
-    return document.documentElement.dir === "rtl" ? bounds.right : bounds.left
-  })
-}
-
 async function openChildFromParent(page: Page) {
   await page.goto(sessionHref(parentID))
   await expectSessionTitle(page, parentTitle)

packages/app/e2e/regression/timeline-stream.spec.ts

@@ -1,4 +1,4 @@
-import { expect, test, type Locator, type Page } from "@playwright/test"
+import { expect, test, type Page } from "@playwright/test"
 import type { SessionMessageAssistant, SessionMessageInfo, ShellInfo } from "@opencode/client/promise"
 import { timelinePresets } from "@opencode/session-ui/timeline/detail"
 import { createTwoFilesPatch } from "diff"
@@ -650,43 +650,6 @@ test.describe("Working", () => {
     })
   }
 
-  test("keeps Working while a new read joins a standalone read group", async ({ page }) => {
-    const timeline = await setupTimeline(page, {
-      messages: [
-        userMessage(),
-        assistantMessage(
-          ["one", "two", "three"].map((name) =>
-            toolPart(`prt_read_${name}`, "read", "completed", { path: `src/${name}.ts` }),
-          ),
-          { completed: false },
-        ),
-      ],
-      settings: { timelineDetail: timelinePresets[0].value },
-    })
-
-    const working = page.locator('[data-component="session-working"]')
-    const group = page.locator('[data-component="read-tool-group"]')
-    const shimmer = group.locator('[data-component="text-shimmer"]')
-    await expect(group).toHaveAttribute("data-timeline-part-ids", "prt_read_one,prt_read_two,prt_read_three")
-    await expect(working).toBeVisible()
-
-    await timeline.send(partUpdated(toolPart("prt_read_four", "read", "streaming", { path: "src/four.ts" })))
-    await expect(group).toHaveAttribute(
-      "data-timeline-part-ids",
-      "prt_read_one,prt_read_two,prt_read_three,prt_read_four",
-    )
-    await expect(shimmer).toHaveAttribute("data-active", "true")
-    await expect(working).toBeVisible()
-
-    await timeline.send(partUpdated(toolPart("prt_read_four", "read", "running", { path: "src/four.ts" })))
-    await expect(group.locator('[data-slot="basic-tool-tool-subtitle"]')).toHaveText("one.ts, two.ts, three.ts, four.ts")
-    await expect(working).toBeVisible()
-
-    await timeline.send(partUpdated(toolPart("prt_read_four", "read", "completed", { path: "src/four.ts" })))
-    await expect(shimmer).toHaveAttribute("data-active", "false")
-    await expect(working).toBeVisible()
-  })
-
   for (const grouped of [false, true]) {
     test(`uses ${grouped ? "grouped" : "standalone"} background shell presentation`, async ({ page }) => {
       await setupTimeline(page, {
@@ -1012,153 +975,6 @@ test.describe("background shortcut", () => {
     await expect(backgroundCard).toContainText("Background task (background)")
   })
 
-  test("hides the running switcher when viewing the only running subagent", async ({ page }) => {
-    const childID = "ses_only_running_child"
-
-    const timeline = await setupTimeline(page, {
-      sessionMessages: [user, completed],
-      sessions: [
-        session(),
-        session({ id: childID, parentID: sessionID, title: "Only running task", agent: "explore" }),
-      ],
-      sessionStatus: { [childID]: { type: "busy" } },
-    })
-
-    const header = page.locator("[data-session-title]")
-    const trigger = header.getByRole("button", { name: "1 working", exact: true })
-
-    await trigger.click()
-    await page.getByRole("menuitem", { name: /Only running task/ }).click()
-    await expect(page).toHaveURL(new RegExp(`/session/${childID}$`))
-    await expect(header.getByRole("heading")).toHaveText("Only running task")
-    await expect(trigger).toHaveCount(0)
-
-    const working = header.getByRole("status", { name: "Working", exact: true })
-
-    await expect(working.locator('[data-component="session-progress-indicator-v2"]')).toBeVisible()
-    const gap = await working.evaluate((element) => {
-      const title = document.createRange()
-
-      title.selectNodeContents(element.nextElementSibling!)
-
-      return title.getBoundingClientRect().left - element.getBoundingClientRect().right
-    })
-
-    expect(gap).toBe(8)
-
-    const before = await header.getByRole("heading").boundingBox()
-    const exit = await pauseExitAnimations(working)
-
-    await timeline.transport.send(status("idle", 1, childID))
-    await expect.poll(() => exit.evaluate((animations) => animations.length)).toBeGreaterThan(0)
-    await exit.evaluate((animations) => animations.forEach((animation) => (animation.currentTime = 100)))
-    await expect(working).toBeAttached()
-
-    const midway = await header.getByRole("heading").boundingBox()
-
-    expect(midway!.x).toBeLessThan(before!.x)
-    await exit.evaluate((animations) => animations.forEach((animation) => animation.finish()))
-    await expect(working).toHaveCount(0)
-
-    const after = await header.getByRole("heading").boundingBox()
-
-    expect(after!.x).toBeLessThan(midway!.x)
-    expect(after!.x).toBeCloseTo(before!.x - 24, 0)
-    await exit.dispose()
-    await header.locator('[data-slot="session-title-parent"]').click()
-    await expect(page).toHaveURL(new RegExp(`/session/${sessionID}$`))
-    await expect(trigger).toHaveCount(0)
-  })
-
-  test("keeps the running menu closed when work restarts after all subagents finish", async ({ page }) => {
-    const childID = "ses_restarted_child"
-    const otherID = "ses_counted_child"
-    const timeline = await setupTimeline(page, {
-      sessionMessages: [user, completed],
-      sessions: [
-        session(),
-        session({ id: childID, parentID: sessionID, title: "Restarted task", agent: "explore" }),
-        session({ id: otherID, parentID: sessionID, title: "Other task", agent: "build" }),
-      ],
-      sessionStatus: {},
-    })
-
-    const trigger = page.locator("[data-session-title]").getByRole("button", { name: /^[12] working$/ })
-    const menu = page.getByRole("menu", { name: "1 working", exact: true })
-
-    await timeline.transport.send(status("busy", 1, childID))
-    await expect(trigger).toHaveAccessibleName("1 working")
-    await timeline.transport.send(status("busy", 1, otherID))
-    await expect(trigger).toHaveAccessibleName("2 working")
-    await expect(trigger.locator("..")).toHaveCSS("animation-name", "none")
-    await timeline.transport.send(status("idle", 1, otherID))
-    await expect(trigger).toHaveAccessibleName("1 working")
-    // Inspect the update itself, not the settled state after a replayed fade finishes.
-    expect(await trigger.evaluate((element) => getComputedStyle(element.parentElement!).animationName)).toBe("none")
-
-    await trigger.click()
-    await expect(menu.getByRole("menuitem", { name: /Restarted task/ })).toBeVisible()
-    await timeline.transport.send(status("idle", 1, childID))
-    await expect(trigger).toHaveCount(0)
-    await expect(menu).toHaveCount(0)
-    await timeline.transport.send(status("busy", 1, childID))
-    await expect(trigger).toBeEnabled()
-    await expect(trigger).toHaveAttribute("aria-expanded", "false")
-    await expect(menu).toHaveCount(0)
-    await trigger.click()
-    await expect(menu.getByRole("menuitem", { name: /Restarted task/ })).toBeVisible()
-  })
-
-  test("slides the subagent title left when its running switcher disappears", async ({ page }) => {
-    const childID = "ses_collapsing_viewed"
-    const otherID = "ses_collapsing_sibling"
-    const timeline = await setupTimeline(page, {
-      sessionMessages: [user, completed],
-      sessions: [
-        session(),
-        session({ id: childID, parentID: sessionID, title: "Viewed task", agent: "explore" }),
-        session({ id: otherID, parentID: sessionID, title: "Other task", agent: "build" }),
-      ],
-      sessionStatus: { [childID]: { type: "busy" }, [otherID]: { type: "busy" } },
-    })
-
-    const header = page.locator("[data-session-title]")
-    const trigger = header.getByRole("button", { name: "2 working", exact: true })
-
-    await trigger.click()
-    await page.getByRole("menuitem", { name: /Viewed task/ }).click()
-    await expect(header.getByRole("heading")).toHaveText("Viewed task")
-    await expect(trigger).toBeEnabled()
-
-    const before = await header.getByRole("heading").boundingBox()
-    const width = await trigger.evaluate((element) => element.parentElement!.getBoundingClientRect().width)
-    const exit = await pauseExitAnimations(trigger.locator(".."))
-
-    await timeline.transport.send(status("idle", 1, otherID))
-    await expect.poll(() => exit.evaluate((animations) => animations.length)).toBeGreaterThan(0)
-    expect(
-      await exit.evaluate((animations) =>
-        animations.some(
-          (animation) =>
-            animation.effect instanceof KeyframeEffect && animation.effect.getKeyframes().some((frame) => "width" in frame),
-        ),
-      ),
-    ).toBe(true)
-    await exit.evaluate((animations) => animations.forEach((animation) => (animation.currentTime = 75)))
-
-    const midway = await header.getByRole("heading").boundingBox()
-
-    expect(midway!.x).toBeLessThan(before!.x)
-    await exit.evaluate((animations) => animations.forEach((animation) => animation.finish()))
-    await expect(trigger).toHaveCount(0)
-
-    const after = await header.getByRole("heading").boundingBox()
-
-    expect(after!.x).toBeLessThan(midway!.x)
-    expect(after!.x).toBeCloseTo(before!.x - width - 2, 0)
-    await exit.dispose()
-  })
-
   test("moves between siblings and to the parent's shell from inside a subagent", async ({ page }) => {
     const siblings = [
       { id: "ses_sibling_one", agent: "explore", description: "Draft TUI proposal" },
@@ -1246,15 +1062,6 @@ test.describe("background shortcut", () => {
     await trigger.click()
     await list.getByRole("menuitem", { name: /Draft TUI proposal/ }).click()
     await expect(page).toHaveURL(/\/session\/ses_sibling_one$/)
-    await expect(list).toHaveCount(0)
-    await expect(header.getByRole("heading")).toHaveText("Draft TUI proposal")
-    await expect(trigger.locator('[data-component="text-shimmer"]')).toHaveCSS("font-variant-numeric", "tabular-nums")
-
-    const breadcrumbOrder = await header
-      .locator('[data-slot="session-title-parent"], button[aria-label="3 running"], [data-slot="session-title-child"]')
-      .evaluateAll((elements) => elements.map((element) => element.getAttribute("data-slot") ?? "running"))
-
-    expect(breadcrumbOrder).toEqual(["session-title-parent", "running", "session-title-child"])
 
     await trigger.click()
     await expect(list.getByRole("menuitem")).toHaveText([
@@ -1264,26 +1071,8 @@ test.describe("background shortcut", () => {
     ])
     await expect(list.getByRole("menuitem", { name: /Draft TUI proposal/ })).toHaveAttribute("aria-current", "page")
     await expect(list.getByRole("menuitem", { name: /Fix context controls/ })).not.toHaveAttribute("aria-current")
-
-    const requested = Promise.withResolvers<void>()
-    const release = Promise.withResolvers<void>()
-
-    await page.route(
-      (url) => url.pathname === "/api/session/ses_sibling_two/message",
-      async (route) => {
-        requested.resolve()
-        await release.promise
-        await route.fallback()
-      },
-    )
     await list.getByRole("menuitem", { name: /Fix context controls/ }).click()
-    await requested.promise
-    await Promise.all([
-      expect(page).toHaveURL(/\/session\/ses_sibling_two$/),
-      expect(header.getByRole("heading")).toHaveText("Fix context controls"),
-      expect(trigger).toBeEnabled(),
-    ]).finally(() => release.resolve())
-    await expect(list).toHaveCount(0)
+    await expect(page).toHaveURL(/\/session\/ses_sibling_two$/)
 
     // The shell call lives in the parent: the row opens it there, expanded.
     await trigger.click()
@@ -1705,22 +1494,6 @@ test.describe("shell completion", () => {
   })
 })
 
-function pauseExitAnimations(locator: Locator) {
-  return locator.evaluateHandle((element) => {
-    const animations: Animation[] = []
-    const pause = (event: AnimationEvent) => {
-      if (event.target !== element || event.animationName !== "exit") return
-
-      animations.push(...element.getAnimations())
-      animations.forEach((animation) => animation.pause())
-      element.removeEventListener("animationstart", pause)
-    }
-
-    element.addEventListener("animationstart", pause)
-    return animations
-  })
-}
-
 function runningSubagent(): SessionMessageAssistant {
   return {
     ...completed,

packages/app/e2e/utils/timeline.ts

@@ -524,11 +524,11 @@ export function messageUpdated(info: SessionMessageAssistant) {
   })
 }
 
-export function status(type: SessionStatus["type"], attempt = 1, id = sessionID) {
-  if (type === "busy") return makeEvent("session.execution.started", { sessionID: id })
-  if (type === "idle") return makeEvent("session.execution.succeeded", { sessionID: id })
+export function status(type: SessionStatus["type"], attempt = 1) {
+  if (type === "busy") return makeEvent("session.execution.started", { sessionID })
+  if (type === "idle") return makeEvent("session.execution.succeeded", { sessionID })
   return makeEvent("session.retry.scheduled", {
-    sessionID: id,
+    sessionID,
     assistantMessageID: assistantID,
     attempt,
     at: 1700000010000,

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/app",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "description": "",
   "type": "module",
   "exports": {

packages/app/src/composer/submit.test.ts

@@ -145,7 +145,7 @@ function session(input: {
 }
 
 describe("Composer submission", () => {
-  test("applies the selection and runs a client argument command without admitting it to the session", async () => {
+  test("runs a client argument command without admitting it to the session", async () => {
     const state = createMemoryComposerState().capture()
 
     const image = {
@@ -169,8 +169,7 @@ describe("Composer submission", () => {
       }
     }).submit(new Event("submit"))
 
-    // Client commands such as /btw generate with the session's model, so the composer's selection commits first.
-    expect(calls).toEqual(["switch-agent", "switch-model", "btw"])
+    expect(calls).toEqual(["btw"])
     expect(history).toEqual([])
     expect(state.current()).toEqual([{ type: "text", content: "", start: 0, end: 0 }, image])
     expect(state.context.items()).toHaveLength(1)

packages/app/src/composer/submit.ts

@@ -66,16 +66,6 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
       submitting.add(input.adapter.state)
 
       try {
-        // Client commands such as /btw answer with the session's model, so apply the composer's selection first,
-        // following the same steer rule as server commands.
-        const selection = currentSelection(input)
-
-        if (input.adapter.kind === "active-session" && selection && (input.delivery?.(false) ?? "steer") === "steer")
-          await applySelection(
-            input.adapter.session(),
-            selection,
-            input.adapter.controls().model.selection.trackSessionCommit,
-          )
         clearClientCommand(input, prompt)
         await clientCommand()
       } catch (error) {
@@ -282,22 +272,25 @@ function readSubmission(
 
   if (!text.trim() && !prompt.some(isAttachment) && comments === 0) return
 
-  const selection = currentSelection(input)
+  const controls = input.adapter.controls()
+  const model = controls.model.selection.current()
+  const agent = controls.agents.current
 
-  if (!selection) {
+  if (!model || !agent) {
     input.notify.missingSelection()
 
     return
   }
 
+  const variant = controls.model.selection.variant.current()
   const retry = input.adapter.state.retry.current()
 
   const retryID =
     retry &&
-    retry.agent === selection.agent &&
-    retry.providerID === selection.model.providerID &&
-    retry.modelID === selection.model.modelID &&
-    (retry.variant ?? "default") === (selection.variant ?? "default")
+    retry.agent === agent &&
+    retry.providerID === model.provider.id &&
+    retry.modelID === model.id &&
+    (retry.variant ?? "default") === (variant ?? "default")
       ? retry.id
       : undefined
 
@@ -308,25 +301,15 @@ function readSubmission(
     context,
     text,
     images,
-    selection,
+    selection: {
+      agent,
+      model: { modelID: model.id, providerID: model.provider.id },
+      variant,
+    },
     delivery: input.delivery?.(alternate) ?? "steer",
   }
 }
 
-function currentSelection(input: ComposerSubmitInput): ComposerSelection | undefined {
-  const controls = input.adapter.controls()
-  const model = controls.model.selection.current()
-  const agent = controls.agents.current
-
-  if (!model || !agent) return
-
-  return {
-    agent,
-    model: { modelID: model.id, providerID: model.provider.id },
-    variant: controls.model.selection.variant.current(),
-  }
-}
-
 function clearSubmission(input: ComposerSubmitInput, submission: ReturnType<typeof createComposerSubmission>) {
   submission.clear()
   submission.target().mode.set("normal")

packages/app/src/runtime/i18n/en.ts

@@ -2,13 +2,6 @@ import { DESKTOP_NATIVE_ENGLISH } from "./desktop-native"
 
 export const dict = {
   ...DESKTOP_NATIVE_ENGLISH,
-  "session.location.unavailable": "Session location unavailable",
-  "session.location.description": "Choose another directory to continue this session.",
-  "session.location.choose": "Choose directory",
-  "session.location.worktree": "Choose worktree",
-  "session.location.worktreesFailed": "Failed to load worktrees",
-  "session.location.moving": "Moving session…",
-  "session.location.moveFailed": "Failed to move session",
   "server.action.authenticate": "Authenticate",
   "server.status.connecting": "Connecting over SSH…",
   "server.status.authentication": "Authentication required",
@@ -516,8 +509,8 @@ export const dict = {
   "session.queue.attachments.one": "{{count}} attachment",
   "session.queue.attachments.other": "{{count}} attachments",
   "session.timeline.working": "Working",
-  "session.running.working.one": "{{count}} working",
-  "session.running.working.other": "{{count}} working",
+  "session.running.working.one": "{{count}} working…",
+  "session.running.working.other": "{{count}} working…",
   "session.running.running.one": "{{count}} running",
   "session.running.running.other": "{{count}} running",
   "session.running.stop.subagent": "Interrupt subagent",

packages/app/src/session/composer/location-missing.tsx

@@ -1,142 +0,0 @@
-import { Button } from "@opencode/ui/button"
-import { useDialog } from "@opencode/ui/context/dialog"
-import { DockShell, DockTray } from "@opencode/ui/dock-surface"
-import { Icon } from "@opencode/ui/icon"
-import { Menu } from "@opencode/ui/menu"
-import { getFilename, sameDirectory } from "@opencode/util/path"
-import { useMutation } from "@tanstack/solid-query"
-import { createEffect, createResource, For, Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useLanguage } from "@/runtime/i18n/language"
-import { useData, useServer } from "@/runtime/server/current"
-import { showToast } from "@/shell/notifications/toast"
-import { createWorktree } from "@/workspaces/create"
-import { useDirectoryPicker } from "@/workspaces/selection/picker"
-
-export function SessionLocationMissing(props: { sessionID: string; projectID: string; directory: string }) {
-  const language = useLanguage()
-  const server = useServer()
-  const data = useData()
-  const dialog = useDialog()
-  const pickDirectory = useDirectoryPicker()
-  const [state, setState] = createStore({ restoreFocus: false, worktreesOpen: false })
-  const project = () => data.project.get(props.projectID)
-
-  const [worktrees] = createResource(
-    () => (state.worktreesOpen ? props.projectID : undefined),
-    async (projectID) => {
-      await server.ctx.sync.worktrees.refresh(projectID)
-      const items = await server.ctx.sync.worktrees.list(projectID)
-
-      if (!items) showToast({ variant: "error", title: language.t("session.location.worktreesFailed") })
-
-      return items ?? []
-    },
-    // Seed latest so even the first fetch does not enter Suspense.
-    { initialValue: [] },
-  )
-
-  const otherWorktrees = () =>
-    worktrees.latest.filter((item) => item.strategy && !sameDirectory(item.directory, props.directory))
-
-  let button: HTMLButtonElement | undefined
-
-  const move = useMutation(() => ({
-    mutationFn: async (input: { directory?: string }) => {
-      // The missing worktree cannot resolve its own Location, so create from the project's saved checkout.
-      const current = project()
-
-      const destination =
-        input.directory ??
-        (current &&
-          (await createWorktree({
-            api: server.ctx.sdk.api,
-            data,
-            directory: current.canonical,
-            project: { id: current.id, canonical: current.canonical, directory: current.canonical },
-          })))
-
-      if (!destination) return
-      await server.ctx.sdk.api.session.move({ sessionID: props.sessionID, directory: destination })
-    },
-    onError: (error) => {
-      setState("restoreFocus", true)
-      showToast({
-        variant: "error",
-        title: language.t("session.location.moveFailed"),
-        description: error instanceof Error ? error.message : language.t("common.requestFailed"),
-      })
-    },
-  }))
-
-  createEffect(() => {
-    if (!state.restoreFocus || move.isPending || dialog.active) return
-    setState("restoreFocus", false)
-    button?.focus()
-  })
-
-  function choose() {
-    if (move.isPending) return
-    pickDirectory({
-      server: server.conn,
-      title: language.t("session.location.choose"),
-      onSelect: (result) => {
-        const selected = Array.isArray(result) ? result[0] : result
-
-        if (selected) move.mutate({ directory: selected })
-
-        if (!selected) setState("restoreFocus", true)
-      },
-    })
-  }
-
-  return (
-    <div data-component="session-location-missing">
-      <DockShell class="flex flex-col gap-2 p-3">
-        <div role="status" class="flex items-start gap-2 text-13-regular leading-[var(--line-height-base)]">
-          <Icon name="warning" class="shrink-0 text-icon-warning-base" />
-          <div class="min-w-0 flex flex-col gap-1">
-            <div class="font-medium text-text-strong">{language.t("session.location.unavailable")}</div>
-            <div class="break-all font-mono text-12-regular text-text-weak">{props.directory}</div>
-            <div class="text-text-base">{language.t("session.location.description")}</div>
-          </div>
-        </div>
-      </DockShell>
-      <DockTray attach="top" class="flex flex-wrap justify-end gap-2 p-2 pt-[22px]">
-        <Show when={project()?.vcs === "git"}>
-          <Menu placement="top-end" onOpenChange={(open) => setState("worktreesOpen", open)}>
-            <Menu.Trigger as={Button} variant="neutral" disabled={move.isPending}>
-              {language.t("session.location.worktree")}
-            </Menu.Trigger>
-            <Menu.Portal>
-              <Menu.Content class="max-h-80 max-w-[calc(100vw-32px)] overflow-y-auto">
-                <Menu.Item onSelect={() => move.mutate({})} disabled={move.isPending}>
-                  <Icon name="workspace-new" />
-                  {language.t("workspace.new")}
-                </Menu.Item>
-                <Show when={worktrees.loading && otherWorktrees().length === 0}>
-                  <Menu.Item disabled>{language.t("common.loading")}</Menu.Item>
-                </Show>
-                <For each={otherWorktrees()}>
-                  {(worktree) => (
-                    <Menu.Item
-                      title={worktree.directory}
-                      onSelect={() => move.mutate({ directory: worktree.directory })}
-                      disabled={move.isPending}
-                    >
-                      <Icon name="workspace-isolated" />
-                      <span class="truncate">{getFilename(worktree.directory)}</span>
-                    </Menu.Item>
-                  )}
-                </For>
-              </Menu.Content>
-            </Menu.Portal>
-          </Menu>
-        </Show>
-        <Button ref={button} variant="contrast" onClick={choose} disabled={move.isPending}>
-          {language.t(move.isPending ? "session.location.moving" : "session.location.choose")}
-        </Button>
-      </DockTray>
-    </div>
-  )
-}

packages/app/src/session/composer/region.tsx

@@ -1,10 +1,10 @@
 import type { SessionUserActions } from "@opencode/session-ui/message"
-import { getFilename, sameDirectory } from "@opencode/util/path"
+import { getFilename } from "@opencode/util/path"
 import { useDialog } from "@opencode/ui/context/dialog"
 import { isScrollKeyTarget, scrollKey, scrollKeyOwner } from "@opencode/ui/scroll-view"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { useNavigate } from "@solidjs/router"
-import { createEffect, createMemo, on, onMount, Show, type Accessor } from "solid-js"
+import { createEffect, createMemo, on, onMount, type Accessor } from "solid-js"
 import { Composer } from "@/composer/composer"
 import { useComposerState } from "@/composer/persistence"
 import { createComposerControls } from "@/composer/selection"
@@ -32,7 +32,6 @@ import { SessionQueuePanel } from "./queue-panel"
 import { resolveSessionComposerSelection } from "./selection"
 import { createSessionRequestModel } from "../requests/model"
 import type { Region } from "@/runtime/extension/panels"
-import { SessionLocationMissing } from "./location-missing"
 
 export function createActiveSessionRegion(input: {
   session: SessionModel
@@ -286,51 +285,24 @@ export function createActiveSessionRegion(input: {
 export type ActiveSessionRegionModel = ReturnType<typeof createActiveSessionRegion>
 
 export function ActiveSessionComposerRegion(props: {
-  session: SessionModel
   model: SessionComposerController
   suggestionBoundary: () => HTMLElement | undefined
 }) {
-  const location = useWorkspaceLocation()
-
-  // Only the server's LocationNotFoundError for the session's own Location replaces the composer.
-  const missing = createMemo(() => {
-    const ref = location().missing
-    const info = props.session.data.info()
-
-    if (!ref || !info || !sameDirectory(info.location.directory, ref.directory)) return
-
-    return { directory: info.location.directory, sessionID: info.id, projectID: info.projectID }
-  })
-
   return (
     <SessionComposerRegion
       controller={props.model.region}
       composer={
-        <Show
-          when={missing()}
-          keyed
-          fallback={
-            <div class="relative">
-              <SessionQueuePanel queue={props.model.queue} />
-              <div class="relative z-10">
-                <Composer
-                  model={props.model.composer}
-                  borderUnderlay
-                  readOnly={props.model.queue.undoing()}
-                  suggestionBoundary={props.suggestionBoundary}
-                />
-              </div>
-            </div>
-          }
-        >
-          {(current) => (
-            <SessionLocationMissing
-              sessionID={current.sessionID}
-              projectID={current.projectID}
-              directory={current.directory}
+        <div class="relative">
+          <SessionQueuePanel queue={props.model.queue} />
+          <div class="relative z-10">
+            <Composer
+              model={props.model.composer}
+              borderUnderlay
+              readOnly={props.model.queue.undoing()}
+              suggestionBoundary={props.suggestionBoundary}
             />
-          )}
-        </Show>
+          </div>
+        </div>
       }
     />
   )

packages/app/src/session/header/session-running-menu.tsx

@@ -4,9 +4,8 @@ import { Icon } from "@opencode/ui/icon"
 import { IconButton } from "@opencode/ui/icon-button"
 import { Menu } from "@opencode/ui/menu"
 import { TextShimmer } from "@opencode/ui/text-shimmer"
-import { createEffect, createMemo, For, on, onCleanup, Show } from "solid-js"
+import { createMemo, For, Show } from "solid-js"
 import { createStore } from "solid-js/store"
-import { createAnimatedPresence } from "@/runtime/animated-presence"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useServerSDK } from "@/runtime/server/client"
 import { useServer } from "@/runtime/server/current"
@@ -31,19 +30,13 @@ export function SessionRunningMenu(props: {
   owner?: string
   blocking: readonly { type: "shell" | "subagent"; partID: string; id?: string; label?: string }[]
   tasks: readonly BackgroundTask[]
-  onReveal?: (target: string) => void
-  separator?: "before" | "after"
+  onReveal: (target: string) => void
 }) {
   const language = useLanguage()
   const openRoute = useOpenSessionRoute()
   const server = useServer()
   const sdk = useServerSDK()
   const [menu, setMenu] = createStore({ open: false })
-  const [appearance, setAppearance] = createStore<{
-    group?: HTMLDivElement
-    collapse?: Animation
-    entered: boolean
-  }>({ entered: false })
   const sessionAgent = (id: string | undefined) => (id ? server.ctx.data.session.get(id)?.agent : undefined)
 
   // Foreground shells stay out: the timeline already shows them at the bottom.
@@ -69,58 +62,16 @@ export function SessionRunningMenu(props: {
     ...props.tasks.flatMap((task) => (task.type === "shell" ? [{ ...task, key: task.id, target: task.id }] : [])),
   ])
 
-  const viewing = (item: RunningItem) => !!item.sessionID && item.sessionID === props.sessionID
-
   const label = createMemo(() => {
     const count = items().length
 
-    if (!count || (count === 1 && viewing(items()[0]))) return undefined
-
     if (items().some((item) => item.type === "shell")) return language.plural("session.running.running", count)
 
     return language.plural("session.running.working", count)
   })
 
-  const presence = createAnimatedPresence(
-    label,
-    () => appearance.group ?? null,
-    () => props.sessionID,
-  )
-  // Label updates change presence state without changing visibility.
-  const visible = createMemo(presence.show)
-
-  createEffect(
-    on(
-      visible,
-      (show) => {
-        if (show) {
-          appearance.collapse?.cancel()
-          setAppearance({ collapse: undefined, entered: false })
-          return
-        }
-
-        setMenu("open", false)
-
-        const group = appearance.group
-
-        if (!group || props.separator !== "after" || matchMedia("(prefers-reduced-motion: reduce)").matches) return
-
-        setAppearance(
-          "collapse",
-          group.animate(
-            [
-              { width: `${group.getBoundingClientRect().width}px`, marginInlineEnd: "0px" },
-              // Cancel the header's 2px gap so removing the collapsed slot doesn't nudge the title.
-              { width: "0px", marginInlineEnd: "-2px" },
-            ],
-            { duration: 150, easing: "cubic-bezier(0, 0, 0.2, 1)", fill: "forwards" },
-          ),
-        )
-      },
-      { defer: true },
-    ),
-  )
-  onCleanup(() => appearance.collapse?.cancel())
+  // Inside a subagent, its own row is listed among its siblings.
+  const viewing = (item: RunningItem) => !!item.sessionID && item.sessionID === props.sessionID
 
   const open = (item: RunningItem) => {
     const current = props.sessionID
@@ -132,9 +83,7 @@ export function SessionRunningMenu(props: {
     // Shell calls and starting subagent calls live in the owner's timeline, which reveals them once open.
     if (props.owner && props.owner !== current) return openRoute(current, props.owner, item.target)
 
-    if (props.onReveal) return props.onReveal(item.target)
-
-    openRoute(current, current, item.target)
+    props.onReveal(item.target)
   }
 
   // A subagent can only be interrupted once its child session exists.
@@ -157,133 +106,99 @@ export function SessionRunningMenu(props: {
   }
 
   return (
-    <Show when={presence.present()}>
-      <div
-        ref={(element) => setAppearance("group", element)}
-        inert={!presence.show()}
-        class="flex shrink-0 items-center gap-0.5 duration-150 ease-out motion-reduce:animate-none"
-        classList={{
-          "animate-in fade-in": presence.animate() && presence.show() && !appearance.entered,
-          "animate-out fade-out fill-mode-forwards": presence.animate() && !presence.show(),
-          "overflow-hidden": props.separator === "after" && !presence.show(),
-        }}
-        onAnimationEnd={(event) => {
-          if (event.target === event.currentTarget && presence.show()) setAppearance("entered", true)
-        }}
-      >
-        <Show when={props.separator !== "after"}>
-          <span
-            aria-hidden="true"
-            class="shrink-0 ps-2 pe-1 text-[11px] font-medium leading-text-compact text-v2-text-text-faint"
-          >
-            /
-          </span>
-        </Show>
-        <Menu
-          gutter={6}
-          placement="bottom-start"
-          open={menu.open && presence.show()}
-          onOpenChange={(open) => setMenu("open", open)}
+    <Show when={items().length > 0}>
+      <Menu gutter={6} placement="bottom-start" open={menu.open} onOpenChange={(open) => setMenu("open", open)}>
+        <Menu.Trigger
+          as="button"
+          type="button"
+          aria-label={label()}
+          // 8px from the ··· menu, or from the padded title inside a subagent, which has no menu.
+          class={`${props.owner === props.sessionID ? "ms-1.5" : "ms-0.5"} flex h-7 shrink-0 items-center rounded-[6px] px-2 text-[13px] font-[530] leading-text-compact tracking-[-0.04px] whitespace-nowrap text-v2-text-text-base outline-none hover:bg-v2-overlay-simple-overlay-hover focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-v2-border-border-focus data-[expanded]:bg-v2-overlay-simple-overlay-hover`}
         >
-          <Menu.Trigger
-            as="button"
-            type="button"
-            aria-label={presence.value()}
-            class="flex h-7 shrink-0 items-center rounded-[6px] px-2 text-[13px] font-[530] leading-text-compact tracking-[-0.04px] tabular-nums whitespace-nowrap text-v2-text-text-base outline-none hover:bg-v2-overlay-simple-overlay-hover focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-v2-border-border-focus data-[expanded]:bg-v2-overlay-simple-overlay-hover"
-          >
-            <TextShimmer text={presence.value() ?? ""} active={presence.show()} />
-          </Menu.Trigger>
-          <Menu.Portal>
-            <Menu.Content class="w-60" aria-label={presence.value()}>
-              <For each={items()}>
-                {(item) => (
-                  <Menu.Item
-                    class="group/running-item"
-                    classList={{ "!bg-v2-overlay-simple-overlay-hover": viewing(item) }}
-                    aria-current={viewing(item) ? "page" : undefined}
-                    onSelect={() => {
-                      // Close before navigating: the router's transition would hold the close until this
-                      // timeline detaches, and the menu would flash at the viewport origin.
-                      setMenu("open", false)
-                      open(item)
-                    }}
-                    onKeyDown={(event) => {
-                      if ((event.key !== "Delete" && event.key !== "Backspace") || !stoppable(item)) return
+          <TextShimmer text={label()} active />
+        </Menu.Trigger>
+        <Menu.Portal>
+          <Menu.Content class="w-60" aria-label={label()}>
+            <For each={items()}>
+              {(item) => (
+                <Menu.Item
+                  class="group/running-item"
+                  classList={{ "!bg-v2-overlay-simple-overlay-hover": viewing(item) }}
+                  aria-current={viewing(item) ? "page" : undefined}
+                  onSelect={() => {
+                    // Close before navigating: the router's transition would hold the close until this
+                    // timeline detaches, and the menu would flash at the viewport origin.
+                    setMenu("open", false)
+                    open(item)
+                  }}
+                  onKeyDown={(event) => {
+                    if ((event.key !== "Delete" && event.key !== "Backspace") || !stoppable(item)) return
 
-                      event.preventDefault()
-                      stop(item)
+                    event.preventDefault()
+                    stop(item)
+                  }}
+                >
+                  <Show
+                    when={item.type === "subagent"}
+                    fallback={<Icon name="console" class="shrink-0 text-v2-icon-icon-muted" />}
+                  >
+                    {/* Built-in agents have theme tokens; any other agent keeps the neutral color. */}
+                    <SessionProgressIndicatorV2
+                      class="shrink-0"
+                      style={{
+                        color: item.agent ? `var(--v2-agent-${item.agent.toLowerCase()}-solid, ${neutral})` : neutral,
+                      }}
+                    />
+                  </Show>
+                  <span class="shrink-0 font-[530]">
+                    {item.type === "shell"
+                      ? language.t("ui.tool.shell")
+                      : item.agent
+                        ? `${item.agent[0].toUpperCase()}${item.agent.slice(1)}`
+                        : language.t("ui.tool.agent.default")}
+                  </span>
+                  {/* Menu rows end 6px in for trailing controls; text alone ends 12px in, like the leading edge. */}
+                  <span
+                    dir="auto"
+                    class="me-1.5 min-w-0 flex-1 truncate text-v2-text-text-muted"
+                    classList={{
+                      "group-hover/running-item:me-0 group-data-[highlighted]/running-item:me-0 [@media(hover:none)]:me-0":
+                        stoppable(item),
                     }}
                   >
-                    <Show
-                      when={item.type === "subagent"}
-                      fallback={<Icon name="console" class="shrink-0 text-v2-icon-icon-muted" />}
-                    >
-                      {/* Built-in agents have theme tokens; any other agent keeps the neutral color. */}
-                      <SessionProgressIndicatorV2
-                        class="shrink-0"
-                        style={{
-                          color: item.agent ? `var(--v2-agent-${item.agent.toLowerCase()}-solid, ${neutral})` : neutral,
+                    {item.label}
+                  </span>
+                  <Show when={stoppable(item)}>
+                    {/* The button's own display rule outranks utilities, so this wrapper shows and hides it. */}
+                    <span class="hidden shrink-0 group-hover/running-item:flex group-data-[highlighted]/running-item:flex [@media(hover:none)]:flex">
+                      {/* The row selects on press, so the stop button keeps its pointer events to itself. */}
+                      <IconButton
+                        type="button"
+                        size="small"
+                        variant="ghost-muted"
+                        tabIndex={-1}
+                        icon={<Icon name="outline-xmark" />}
+                        aria-label={language.t(
+                          item.type === "shell" ? "session.running.stop.shell" : "session.running.stop.subagent",
+                        )}
+                        onPointerDown={(event) => {
+                          event.preventDefault()
+                          event.stopPropagation()
+                        }}
+                        onPointerUp={(event) => event.stopPropagation()}
+                        onClick={(event) => {
+                          event.stopPropagation()
+                          stop(item)
                         }}
                       />
-                    </Show>
-                    <span class="shrink-0 font-[530]">
-                      {item.type === "shell"
-                        ? language.t("ui.tool.shell")
-                        : item.agent
-                          ? `${item.agent[0].toUpperCase()}${item.agent.slice(1)}`
-                          : language.t("ui.tool.agent.default")}
                     </span>
-                    {/* Menu rows end 6px in for trailing controls; text alone ends 12px in, like the leading edge. */}
-                    <span
-                      dir="auto"
-                      class="me-1.5 min-w-0 flex-1 truncate text-v2-text-text-muted"
-                      classList={{
-                        "group-hover/running-item:me-0 group-data-[highlighted]/running-item:me-0 [@media(hover:none)]:me-0":
-                          stoppable(item),
-                      }}
-                    >
-                      {item.label}
-                    </span>
-                    <Show when={stoppable(item)}>
-                      {/* The button's own display rule outranks utilities, so this wrapper shows and hides it. */}
-                      <span class="hidden shrink-0 group-hover/running-item:flex group-data-[highlighted]/running-item:flex [@media(hover:none)]:flex">
-                        {/* The row selects on press, so the stop button keeps its pointer events to itself. */}
-                        <IconButton
-                          type="button"
-                          size="small"
-                          variant="ghost-muted"
-                          tabIndex={-1}
-                          icon={<Icon name="outline-xmark" />}
-                          aria-label={language.t(
-                            item.type === "shell" ? "session.running.stop.shell" : "session.running.stop.subagent",
-                          )}
-                          onPointerDown={(event) => {
-                            event.preventDefault()
-                            event.stopPropagation()
-                          }}
-                          onPointerUp={(event) => event.stopPropagation()}
-                          onClick={(event) => {
-                            event.stopPropagation()
-                            stop(item)
-                          }}
-                        />
-                      </span>
-                    </Show>
-                  </Menu.Item>
-                )}
-              </For>
-            </Menu.Content>
-          </Menu.Portal>
-        </Menu>
-        <Show when={props.separator === "after"}>
-          <span
-            aria-hidden="true"
-            class="shrink-0 ps-2 pe-1 text-[11px] font-medium leading-text-compact text-v2-text-text-faint"
-          >
-            /
-          </span>
-        </Show>
-      </div>
+                  </Show>
+                </Menu.Item>
+              )}
+            </For>
+          </Menu.Content>
+        </Menu.Portal>
+      </Menu>
     </Show>
   )
 }

packages/app/src/session/header/session-working-indicator.tsx

@@ -1,43 +0,0 @@
-import { SessionProgressIndicatorV2 } from "@opencode/session-ui/v2/session-progress-indicator-v2"
-import { Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { createAnimatedPresence } from "@/runtime/animated-presence"
-import { useLanguage } from "@/runtime/i18n/language"
-import { useServer } from "@/runtime/server/current"
-
-export function SessionWorkingIndicator(props: { sessionID?: string }) {
-  const language = useLanguage()
-  const server = useServer()
-  const [elements, setElements] = createStore<{ indicator?: HTMLSpanElement }>({})
-  const presence = createAnimatedPresence(
-    () => {
-      const id = props.sessionID
-
-      return id && server.ctx.data.session.get(id)?.parentID && server.ctx.data.session.status(id) === "running"
-        ? true
-        : undefined
-    },
-    () => elements.indicator ?? null,
-    () => props.sessionID,
-  )
-
-  return (
-    <Show when={presence.present()}>
-      <span
-        ref={(element) => setElements("indicator", element)}
-        role="status"
-        aria-label={language.t("session.timeline.working")}
-        data-visible={presence.show()}
-        // Cancel the header's 2px gap at the end of the collapse so unmounting doesn't nudge the title.
-        class="ms-1 me-0.5 flex h-4 w-4 shrink-0 items-center justify-center overflow-hidden text-v2-icon-icon-muted duration-200 ease-out data-[visible=false]:ms-0 data-[visible=false]:-me-0.5 data-[visible=false]:w-0 data-[visible=false]:opacity-0 motion-reduce:animate-none motion-reduce:transition-none"
-        classList={{
-          "transition-[width,margin,opacity]": presence.animate(),
-          // Presence waits for animationend; transitions alone would unmount the icon immediately.
-          "animate-out fade-out fill-mode-forwards": presence.animate() && !presence.show(),
-        }}
-      >
-        <SessionProgressIndicatorV2 class="shrink-0" />
-      </span>
-    </Show>
-  )
-}

packages/app/src/session/route.tsx

@@ -139,7 +139,7 @@ function ResolvedTargetSessionRoute() {
     >
       <Show when={directory()} fallback={<PendingSessionState sessionID={params.id} />}>
         {(value) => (
-          <LocationProvider directory={value()}>
+          <LocationProvider directory={value}>
             <SessionUIProvider directory={value()} server={server.key}>
               <TargetSessionPage />
             </SessionUIProvider>

packages/app/src/session/screen.tsx

@@ -34,7 +34,6 @@ import { TimelineSearchBar } from "./timeline/search-bar"
 import { ActiveSessionComposerRegion, createActiveSessionRegion } from "./composer/region"
 import { SessionIdentityHeader } from "./session-identity-header"
 import { SessionReviewToggle } from "./header/session-header-actions"
-import { SessionRunningMenu } from "./header/session-running-menu"
 import { createAnimatedPresence } from "@/runtime/animated-presence"
 import { createTimelineCache } from "./timeline/cache"
 
@@ -334,15 +333,7 @@ function SessionScreenContent(props: {
           </Match>
           <Match when={session.identity.params.id}>
             <Show when={isDesktop() && !messagesReady()}>
-              <SessionIdentityHeader sessionID={session.identity.params.id ?? ""} session={session.data.info()}>
-                <SessionRunningMenu
-                  sessionID={session.identity.params.id}
-                  owner={composer.requests.background.running.sessionID()}
-                  blocking={composer.requests.background.running.blocking()}
-                  tasks={composer.requests.background.running.tasks()}
-                  separator={session.data.parentID() ? "after" : "before"}
-                />
-              </SessionIdentityHeader>
+              <SessionIdentityHeader sessionID={session.identity.params.id ?? ""} session={session.data.info()} />
             </Show>
             <Show when={messagesReady() && session.identity.params.id}>{timelineView()}</Show>
           </Match>
@@ -350,9 +341,7 @@ function SessionScreenContent(props: {
       </div>
 
       <Show when={composer.active()} keyed>
-        {(model) => (
-          <ActiveSessionComposerRegion session={session} model={model} suggestionBoundary={timeline.scroller} />
-        )}
+        {(model) => <ActiveSessionComposerRegion model={model} suggestionBoundary={timeline.scroller} />}
       </Show>
     </>
   )

packages/app/src/session/session-identity-header.tsx

@@ -26,7 +26,6 @@ import { isProjectDirectory, isWorkspaceDirectory } from "@/workspaces/paths"
 import { sessionHref } from "@/shell/routes/session"
 import { showToast } from "@/shell/notifications/toast"
 import { sessionTitle } from "./title"
-import { SessionWorkingIndicator } from "./header/session-working-indicator"
 import "./session-identity-header.css"
 
 export function SessionTitleHeader(props: ParentProps) {
@@ -254,16 +253,16 @@ export function SessionAncestorTrail(props: {
                 data-slot={ancestor.direct ? "session-title-parent" : "session-title-ancestor"}
                 data-session-id={ancestor.id}
                 title={ancestor.title}
-                class="max-w-[min(200px,40vw)] shrink-0 truncate text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-faint transition-colors hover:text-v2-text-text-muted"
-                classList={{ "ps-1": index() === 0, "ps-2": index() > 0 }}
+                dir="auto"
+                class="max-w-[min(200px,40vw)] shrink-0 truncate pl-2 text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-faint transition-colors hover:text-v2-text-text-muted"
                 onClick={() => open(props.sessionID, ancestor.id)}
               >
-                <bdi dir="auto">{ancestor.title}</bdi>
+                {ancestor.title}
               </button>
               <Show when={index() < ancestors().length - 1}>
                 <span
                   data-slot="session-title-separator"
-                  class="-translate-y-[0.5px] shrink-0 ps-2 pe-1 text-[11px] font-medium text-v2-text-text-faint"
+                  class="-translate-y-[0.5px] shrink-0 pl-2 pr-1 text-[11px] font-medium text-v2-text-text-faint"
                   aria-hidden="true"
                 >
                   /
@@ -276,7 +275,7 @@ export function SessionAncestorTrail(props: {
       <Show when={props.trailing}>
         <span
           data-slot="session-title-separator"
-          class="-translate-y-[0.5px] shrink-0 ps-2 pe-1 text-[11px] font-medium text-v2-text-text-faint"
+          class="-translate-y-[0.5px] shrink-0 pl-2 pr-1 text-[11px] font-medium text-v2-text-text-faint"
           aria-hidden="true"
         >
           /
@@ -306,7 +305,7 @@ export function useOpenSessionRoute() {
   }
 }
 
-export function SessionIdentityHeader(props: ParentProps<{ sessionID: string; session?: SessionInfo }>) {
+export function SessionIdentityHeader(props: { sessionID: string; session?: SessionInfo }) {
   const server = useServer()
   const tabs = useTabs()
   const language = useLanguage()
@@ -395,8 +394,6 @@ export function SessionIdentityHeader(props: ParentProps<{ sessionID: string; se
                   />
                 )}
               </Show>
-              <Show when={parentID()}>{props.children}</Show>
-              <SessionWorkingIndicator sessionID={props.sessionID} />
               <Show when={title()}>
                 {(value) => (
                   <h1
@@ -409,7 +406,6 @@ export function SessionIdentityHeader(props: ParentProps<{ sessionID: string; se
                   </h1>
                 )}
               </Show>
-              <Show when={!parentID()}>{props.children}</Show>
             </div>
           </div>
         </div>

packages/app/src/session/timeline/message-timeline.tsx

@@ -27,7 +27,6 @@ import { useCommand } from "@/shell/commands/command"
 import { SessionAncestorTrail, SessionProjectMenu, SessionTitleHeader } from "../session-identity-header"
 import { SessionHeaderSpacer } from "@/session/header/session-header"
 import { SessionRunningMenu } from "@/session/header/session-running-menu"
-import { SessionWorkingIndicator } from "@/session/header/session-working-indicator"
 
 type BlockingTask = { type: "shell" | "subagent"; partID: string; id?: string; label?: string }
 
@@ -375,9 +374,8 @@ function MessageTimelineView(
         return message?.type === "compaction" && message.status === "running"
       }
 
-      // Used and read groups keep the fallback, so each new read does not swap Working out for its short call.
-      if (!Predicate.isTagged(row, "AssistantPart") || row.group.type === "context" || row.group.type === "read")
-        return false
+      // Used groups keep the fallback regardless of disclosure state.
+      if (!Predicate.isTagged(row, "AssistantPart") || row.group.type === "context") return false
 
       return (row.group.type === "part" ? [row.group.ref] : row.group.refs).some((ref) => {
         const content = Timeline.resolveContent(messageByID().get(ref.messageID), ref.partID)
@@ -392,17 +390,6 @@ function MessageTimelineView(
     })
   })
 
-  const runningMenu = (separator: "before" | "after") => (
-    <SessionRunningMenu
-      sessionID={sessionID()}
-      owner={props.background.running.sessionID()}
-      blocking={props.background.running.blocking()}
-      tasks={props.background.running.tasks()}
-      onReveal={virtualized.revealPart}
-      separator={separator}
-    />
-  )
-
   return (
     <VirtualizedTimeline
       workspaceSession={workspaceSession}
@@ -468,8 +455,6 @@ function MessageTimelineView(
                       />
                     )}
                   </Show>
-                  <Show when={parentID()}>{runningMenu("after")}</Show>
-                  <SessionWorkingIndicator sessionID={sessionID()} />
                   <Show when={childTitle() || title.editing}>
                     <Show
                       when={title.editing}
@@ -520,7 +505,6 @@ function MessageTimelineView(
                       />
                     </Show>
                   </Show>
-                  <Show when={!parentID()}>{runningMenu("before")}</Show>
                   <Show when={!parentID() && sessionID()} keyed>
                     {(id) => (
                       <Menu
@@ -574,6 +558,13 @@ function MessageTimelineView(
                       </Menu>
                     )}
                   </Show>
+                  <SessionRunningMenu
+                    sessionID={sessionID()}
+                    owner={props.background.running.sessionID()}
+                    blocking={props.background.running.blocking()}
+                    tasks={props.background.running.tasks()}
+                    onReveal={virtualized.revealPart}
+                  />
                 </div>
               </div>
               <Show when={sessionID()} keyed>

packages/app/src/shell/titlebar/titlebar.tsx

@@ -59,7 +59,6 @@ export function Titlebar(props: { verticalTabs?: { mount?: HTMLElement } }) {
   const location = useLocation()
   const mobile = createMediaQuery("(max-width: 767px)")
   const bottom = createMemo(() => mobile() && settings.general.mobileTitlebarPosition() === "bottom")
-  const mobileTop = createMemo(() => platform.platform === "web" && mobile() && !bottom())
 
   const mac = createMemo(() => platform.platform === "desktop" && platform.os === "macos")
   const windows = createMemo(() => platform.platform === "desktop" && platform.os === "windows")
@@ -151,17 +150,9 @@ export function Titlebar(props: { verticalTabs?: { mount?: HTMLElement } }) {
           platform.platform === "web"
             ? bottom()
               ? "calc(28px + max(8px, var(--safe-area-inset-bottom, env(safe-area-inset-bottom, 0px))))"
-              : mobileTop()
-                ? "calc(28px + 16px + env(safe-area-inset-top, 0px))"
-                : "calc(28px + max(8px, env(safe-area-inset-top, 0px)))"
+              : "calc(28px + max(8px, env(safe-area-inset-top, 0px)))"
             : undefined,
-        // iOS blurs page content just below the status bar in Home Screen web apps, so keep the phone titlebar row
-        // 16px clear of the safe area, as ChatGPT's phone header does.
-        "padding-top": bottom()
-          ? "0px"
-          : mobileTop()
-            ? "calc(16px + env(safe-area-inset-top, 0px))"
-            : "env(safe-area-inset-top, 0px)",
+        "padding-top": bottom() ? "0px" : "env(safe-area-inset-top, 0px)",
         "padding-bottom": bottom() ? "var(--safe-area-inset-bottom, env(safe-area-inset-bottom, 0px))" : "0px",
         "min-height": minHeight(),
         // Keep native macOS traffic lights clear even when the desktop window is narrow.
@@ -521,7 +512,7 @@ export function Titlebar(props: { verticalTabs?: { mount?: HTMLElement } }) {
               <div
                 class="h-full flex-1 overflow-hidden flex flex-row items-center gap-1.5 px-2 md:pe-3"
                 classList={{
-                  "pt-[max(0px,calc(8px-env(safe-area-inset-top,0px)))]": !bottom() && !windows() && !mobileTop(),
+                  "pt-[max(0px,calc(8px-env(safe-area-inset-top,0px)))]": !bottom() && !windows(),
                   "pb-[max(0px,calc(8px-var(--safe-area-inset-bottom,env(safe-area-inset-bottom,0px))))]": bottom(),
                   "pl-4": macTrafficLights(),
                   // Center the 20px app icon over the sidebar's 16px icon column.

packages/app/src/workspaces/location.tsx

@@ -1,40 +1,33 @@
 import { createSimpleContext } from "@opencode/ui/context"
-import { isLocationNotFoundError, type LocationGetOutput, type LocationRef } from "@opencode/client/promise"
+import type { LocationGetOutput, LocationRef } from "@opencode/client/promise"
 import { retry } from "@opencode/util/retry"
 import { type Accessor, createEffect, createMemo, onCleanup } from "solid-js"
-import { createStore } from "solid-js/store"
 import { type LocationContext, useServerSDK } from "@/runtime/server/client"
 import { useData, useServer } from "@/runtime/server/current"
-
 export type { LocationContext } from "@/runtime/server/client"
 
 export type WorkspaceLocation = LocationContext & {
   readonly ref: LocationRef
   readonly current: LocationGetOutput | undefined
-  /** Set only when the server reports that this exact Location's folder does not exist. */
-  readonly missing: LocationRef | undefined
 }
 
 const context = createSimpleContext({
   name: "Location",
-  init: (props: { directory: string; workspaceID?: string }) => {
+  init: (props: { directory: string | Accessor<string>; workspaceID?: string | Accessor<string | undefined> }) => {
     const serverSDK = useServerSDK()
     const server = useServer()
     const data = useData()
-
     const ref = createMemo(
       () => ({
-        directory: props.directory,
-        workspaceID: props.workspaceID,
+        directory: typeof props.directory === "function" ? props.directory() : props.directory,
+        workspaceID: typeof props.workspaceID === "function" ? props.workspaceID() : props.workspaceID,
       }),
       undefined,
       {
         equals: (previous, next) => previous.directory === next.directory && previous.workspaceID === next.workspaceID,
       },
     )
-
     const current = createMemo(() => data.location.info(ref()))
-    const [state, setState] = createStore<{ missing?: LocationRef }>({})
 
     createEffect(() => {
       const location = ref()
@@ -42,37 +35,27 @@ const context = createSimpleContext({
       onCleanup(() => {
         stale = true
       })
-      setState("missing", undefined)
-
       if (serverSDK.connection.status() !== "connected") return
-      // Generic sync failures do not prove the directory is missing; only the server's typed
-      // LocationNotFoundError does, and retrying it cannot succeed until the folder changes.
+      // A failed sync does not prove the directory is missing. Keep recovery local to reads.
       void retry(() => (stale ? Promise.resolve() : data.location.sync(location)), {
-        retryIf: (error) => !stale && !isLocationNotFoundError(error),
-      }).catch((error) => {
-        if (stale || !isLocationNotFoundError(error)) return
-        setState("missing", location)
-      })
+        retryIf: () => !stale,
+      }).catch(() => undefined)
     })
     createEffect(() => {
       const id = current()?.project.id
-
       if (!id || serverSDK.connection.status() !== "connected") return
       // Showing a Location is the demand for its project's worktree inventory (workspace styling, picker).
       void server.ctx.sync.worktrees.list(id).then(() => server.ctx.sync.worktrees.refresh(id))
     })
 
     const location = createMemo(() => serverSDK.ensureDirSdkContext(current()?.directory ?? ref().directory))
-
     return createMemo<WorkspaceLocation>(() => ({
       ...location(),
       ref: ref(),
       current: current(),
-      missing: state.missing,
     }))
   },
 })
 
 export const useWorkspaceLocation: () => Accessor<WorkspaceLocation> = context.use
-
 export const LocationProvider = context.provider

packages/app/src/workspaces/selection/dialog.tsx

@@ -49,12 +49,10 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
   const dialog = useDialog()
   const language = useLanguage()
   const policy = pickerMode(props.mode ?? "directory", props.start)
-
   const action = {
     file: language.t("dialog.directory.action.selectFile"),
     directory: language.t("dialog.directory.action.selectFolder"),
   }
-
   const [root, setRoot] = createSignal("")
   const [input, setInput] = createSignal("")
   const [selected, setSelected] = createSignal("")
@@ -76,42 +74,31 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
     () => sdk.api.location.get().catch(() => undefined),
     { initialValue: undefined },
   )
-
   const home = createMemo(() => sync.data.path.home || "")
-
   const location = createMemo(() => {
-    const current = props.location ?? fallbackPath.latest
-
+    const current = props.location ?? fallbackPath()
     return current ? { directory: current.directory } : undefined
   })
-
   const start = createMemo(
     () =>
       props.start ||
       sync.data.path.home ||
       props.location?.directory ||
       sync.data.path.directory ||
-      fallbackPath.latest?.directory,
+      fallbackPath()?.directory,
   )
-
   const search = createDirectorySearch({ sdk, home, location, base: () => root() || start() })
-
   const [suggestions] = createResource(input, async (value) => {
     const cleaned = cleanPickerInput(value)
     const typed = cleaned.replace(/\/+$/, "")
     const current = displayPickerPath(root(), value, home()).replace(/\/+$/, "")
-
     if (!cleaned || (root() && typed === current)) return { query: value, items: [] }
     const directories = (await search(value)).map((absolute) => ({ absolute, type: "directory" as const }))
-
     if (!policy.includeFiles) return { query: value, items: directories.slice(0, 5) }
     const base = location()?.directory
-
     if (!base) return { query: value, items: directories.slice(0, 5) }
     const query = pickerRelativePath(base, pickerAbsoluteInput(cleaned, home(), root() || base))
-
     if (query === undefined) return { query: value, items: directories.slice(0, 5) }
-
     const files = await sdk.api.file
       .find({
         location: location(),
@@ -121,64 +108,48 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
       })
       .then((result) => result.data)
       .catch(() => [])
-
     const results = [
       ...directories,
       ...files.map((entry) => ({ absolute: pickerAbsolutePath(entry.path, base), type: "file" as const })),
     ]
-
     return {
       query: value,
       items: Array.from(new Map(results.map((result) => [result.absolute, result])).values()).slice(0, 8),
     }
   })
-
-  const currentSuggestions = createMemo(() => currentPickerSuggestions(suggestions.latest, input()))
+  const currentSuggestions = createMemo(() => currentPickerSuggestions(suggestions(), input()))
 
   async function load(path: string, generation: number, eager = false) {
     const key = path.replace(/\/+$/, "")
     setError(false)
     const absolute = absoluteTreePath(root(), key)
     const existing = listings.get(key)
-
     if (existing && !eager) loads.promote(`${generation}:${key}`)
-
     const request =
       existing ??
       loads.schedule(`${generation}:${key}`, eager ? "background" : "user", () => {
         if (!activeTreeNavigation(generation, navigation)) return Promise.resolve(undefined)
         const current = location()
-
         if (!current) return Promise.resolve(undefined)
-
         return listPickerDirectory(sdk, current, absolute).catch(() => undefined)
       })
-
     listings.set(key, request)
     const nodes = await request
-
     if (!activeTreeNavigation(generation, navigation)) return false
-
     if (!nodes) {
       listings.delete(key)
-
       if (!key) setError(true)
-
       return false
     }
-
     tree?.batch(policy.entries(key, nodes).map((item) => ({ type: "add", path: item })))
-
     if (!eager && advanceTreePreload(advanced, key)) {
       for (const directory of preloadTreeDirectories(key, nodes)) void load(directory, generation, true)
     }
-
     return true
   }
 
   async function navigate(path: string) {
     const value = policy.navigation(pickerAbsoluteInput(cleanPickerInput(path), home(), root() || start() || home()))
-
     if (!value) return
     const token = ++navigation
     setLoading(true)
@@ -192,7 +163,6 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
     advanced.clear()
     tree?.resetPaths([])
     const valid = await load("", token)
-
     if (!activeTreeNavigation(token, navigation)) return
     setRootValid(valid)
     setLoading(false)
@@ -201,11 +171,9 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
   function complete() {
     const items = currentSuggestions()
     const match = items[activeSuggestion()] ?? items[0]
-
     if (!match) return
     const value = displayPickerPath(match.absolute, input(), home())
     setInput(match.type === "directory" && !value.endsWith("/") ? value + "/" : value)
-
     if (match.type === "file") {
       setSelected(policy.selection(root(), pickerFileSearchQuery(root(), match.absolute, home())) ?? "")
       setSuggestionsOpen(false)
@@ -216,10 +184,8 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
   function chooseSuggestion(suggestion: { absolute: string; type: "file" | "directory" }) {
     if (suggestion.type === "directory") {
       void navigate(suggestion.absolute)
-
       return
     }
-
     setInput(displayPickerPath(suggestion.absolute, input(), home()))
     setSelected(policy.selection(root(), pickerFileSearchQuery(root(), suggestion.absolute, home())) ?? "")
     setSuggestionsOpen(false)
@@ -233,31 +199,23 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
 
   function activeSuggestionValue() {
     const items = currentSuggestions()
-
     return items[activeSuggestion()] ?? items[0]
   }
 
-  const keyActions = new Map([
-    ["ArrowDown", () => moveSuggestion(1)],
-    ["ArrowUp", () => moveSuggestion(-1)],
-    [
-      "Enter",
-      () => {
-        const suggestion = activeSuggestionValue()
-
-        if (suggestion) chooseSuggestion(suggestion)
-
-        if (!suggestion) void navigate(input())
-      },
-    ],
-    ["Tab", complete],
-  ])
+  const keyActions: Partial<Record<string, () => void>> = {
+    ArrowDown: () => moveSuggestion(1),
+    ArrowUp: () => moveSuggestion(-1),
+    Enter: () => {
+      const suggestion = activeSuggestionValue()
+      if (suggestion) chooseSuggestion(suggestion)
+      if (!suggestion) void navigate(input())
+    },
+    Tab: complete,
+  }
 
   function handleInputKey(event: KeyboardEvent) {
-    const action = keyActions.get(event.key)
-
+    const action = keyActions[event.key]
     if (!action) return
-
     if (event.key === "Tab" && event.shiftKey) return
     event.preventDefault()
     action()
@@ -265,7 +223,6 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
 
   function resolve() {
     const path = policy.result(root(), selected(), rootValid())
-
     if (!path) return
     props.onSelect(props.multiple ? [path] : path)
     dialog.close()
@@ -273,11 +230,10 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
 
   onMount(() => {
     const closeSuggestions = (event: PointerEvent) => {
-      if (event.target instanceof Node && pathArea?.contains(event.target)) return
+      if (pathArea?.contains(event.target as Node)) return
       setSuggestionsOpen(false)
       setActiveSuggestion(-1)
     }
-
     document.addEventListener("pointerdown", closeSuggestions)
     onCleanup(() => document.removeEventListener("pointerdown", closeSuggestions))
     tree = new FileTree({
@@ -310,7 +266,6 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
         setSelected(path ? (policy.selection(root(), path) ?? "") : "")
       },
     })
-
     if (!container) return
     tree.render({ containerWrapper: container })
     tree.getFileTreeContainer()?.classList.add("directory-picker-tree")
@@ -318,7 +273,6 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
 
   createEffect(() => {
     const path = start()
-
     if (!path || !location() || root()) return
     void navigate(path)
   })
@@ -393,16 +347,13 @@ export function DirectoryPickerDialog(props: DirectoryPickerDialogProps) {
             const scroller = tree
               ?.getFileTreeContainer()
               ?.shadowRoot?.querySelector<HTMLElement>("[data-file-tree-virtualized-scroll]")
-
             if (!scroller) return
-
             const next = nextTreeScrollTop(
               scroller.scrollTop,
               event.deltaY,
               scroller.scrollHeight,
               scroller.clientHeight,
             )
-
             if (next === scroller.scrollTop) return
             event.preventDefault()
             scroller.scrollTop = next

packages/app/src/workspaces/selection/picker.tsx

@@ -1,7 +1,7 @@
 import { useDialog } from "@opencode/ui/context/dialog"
 import { ServerConnection } from "@/runtime/server/registry"
 import { usePlatform } from "@/runtime/platform/platform"
-import { lazy, Suspense } from "solid-js"
+import { lazy } from "solid-js"
 import type { LocationRef } from "@opencode/client/promise"
 import { directoryPickerKind } from "./policy"
 
@@ -24,29 +24,17 @@ export function useDirectoryPicker() {
   return (input: DirectoryPickerInput) => {
     if (directoryPickerKind(platform.platform, input.server) === "native" && platform.platform === "desktop") {
       void platform.openDirectoryPickerDialog({ title: input.title, multiple: input.multiple }).then(input.onSelect)
-
       return
     }
 
     let selected = false
-
     const onSelect = (result: string | string[] | null) => {
       selected = result !== null
       input.onSelect(result)
     }
-
     const cancel = () => {
       if (!selected) input.onSelect(null)
     }
-
-    // Dialogs render under the caller's owner, so loading the lazy chunk would otherwise suspend the caller's boundary.
-    dialog.show(
-      () => (
-        <Suspense>
-          <DirectoryPickerDialog {...input} onSelect={onSelect} />
-        </Suspense>
-      ),
-      cancel,
-    )
+    dialog.show(() => <DirectoryPickerDialog {...input} onSelect={onSelect} />, cancel)
   }
 }

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/cli",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "type": "module",
   "license": "MIT",
   "bin": {

packages/cli/src/acp/agent.ts

@@ -20,30 +20,20 @@ import { ACPService } from "./service"
 import { ACPSessions } from "./sessions"
 import { ACPTurn } from "./turn"
 
-type HandlerContext<Params> = AgentHandlerContext<Params> & { readonly requestId?: JsonRpcId }
-
 // Untraced so request spans parent to the caller's span instead of a setup span that has already ended.
 export const connect = Effect.fnUntraced(function* (client: OpenCodeClient, stream: Stream) {
   const run = Effect.runPromiseWith(yield* Effect.context<Scope.Scope>())
   const catalog = yield* ACPCatalog.make(client)
   // Requests can dispatch before the service below is built.
-  const ready = yield* Deferred.make<{
-    readonly service: ACPService.Interface
-    readonly connection: ACPConnection.Interface
-  }>()
+  const ready = yield* Deferred.make<ACPService.Interface>()
   const handle =
     <Params, A>(
       call: (service: ACPService.Interface, ctx: AgentHandlerContext<Params>) => Effect.Effect<A, ACPError.Failure>,
     ) =>
     (name: string) => {
       const handler = Effect.fn(name)(
-        function* (ctx: HandlerContext<Params>) {
-          const connected = yield* Deferred.await(ready)
-          if (ctx.requestId === undefined) return yield* call(connected.service, ctx)
-          return yield* call(connected.service, ctx).pipe(
-            Effect.provideService(ACPConnection.Responded, connected.connection.responded(ctx.requestId)),
-          )
-        },
+        (ctx: AgentHandlerContext<Params>) =>
+          Deferred.await(ready).pipe(Effect.flatMap((service) => call(service, ctx))),
         Effect.catchTags({
           ACPCatalogLoadError: (error) => ACPClient.classify(error.cause),
           ACPCatalogNotReadyError: (error) =>
@@ -53,7 +43,12 @@ export const connect = Effect.fnUntraced(function* (client: OpenCodeClient, stre
         Effect.tapCauseIf(Cause.hasDies, (cause) => Effect.logError("ACP request failed", cause)),
         Effect.catchDefect((defect) => Effect.fail(ACPError.toRequestError(ACPError.fromUnknown(defect)))),
       )
-      return (ctx: HandlerContext<Params>) => run(handler(ctx))
+      return (ctx: AgentHandlerContext<Params> & { readonly requestId?: JsonRpcId }) => {
+        if (ctx.requestId === undefined) return run(handler(ctx))
+        return run(
+          handler(ctx).pipe(Effect.provideService(ACPConnection.Responded, acp.connection.responded(ctx.requestId))),
+        )
+      }
     }
   const app = agent({ name: "opencode" })
   const request = <Method extends AgentRequestMethod>(
@@ -122,10 +117,7 @@ export const connect = Effect.fnUntraced(function* (client: OpenCodeClient, stre
   const sessions = yield* ACPSessions.make({ client, connection, catalog })
   const capabilities = yield* Ref.make(ACPCapabilities.parse(undefined))
   const turn = yield* ACPTurn.make({ client, connection, sessions, catalog, capabilities })
-  yield* Deferred.succeed(ready, {
-    service: ACPService.make({ client, connection, catalog, sessions, capabilities, turn }),
-    connection,
-  })
+  yield* Deferred.succeed(ready, ACPService.make({ client, connection, catalog, sessions, capabilities, turn }))
   return acp.agent
 })
 

packages/cli/src/acp/catalog.ts

@@ -3,14 +3,15 @@ import type { Agent } from "@opencode/schema/agent"
 import type { Command } from "@opencode/schema/command"
 import type { Model } from "@opencode/schema/model"
 import { FSUtil } from "@opencode/util/fs-util"
-import { Cause, Deferred, Effect, Exit, Schedule, Semaphore, Stream, SubscriptionRef } from "effect"
-import { ACPError } from "./error"
+import { Cause, Deferred, Effect, Exit, Schedule, Schema, Semaphore, Stream, SubscriptionRef } from "effect"
+import type { ConfigOptionProvider } from "./config-option"
 
 export const builtinCommands = new Map([
   ["compact", { description: "Compact the session", start: "compaction" as const }],
 ])
 
 export type Catalog = {
+  readonly providers: ConfigOptionProvider[]
   readonly models: ReadonlyArray<Model.Info>
   readonly defaultModel: Model.Ref
   readonly modes: ReadonlyArray<{ id: Agent.ID; name: string; description?: string }>
@@ -18,14 +19,24 @@ export type Catalog = {
   readonly commands: ReadonlyArray<Command.Info>
 }
 
-export function findModel(models: ReadonlyArray<Model.Info>, ref: Model.Ref) {
-  return models.find((model) => model.providerID === ref.providerID && model.id === ref.id)
+class NotReadyError extends Schema.TaggedError<NotReadyError>()("ACPCatalogNotReadyError", {
+  reason: Schema.Literals(["models", "agents"]),
+}) {
+  override get message() {
+    return this.reason === "models" ? "No models are available" : "No primary agents are available"
+  }
 }
 
+class LoadError extends Schema.TaggedError<LoadError>()("ACPCatalogLoadError", {
+  cause: Schema.Defect(),
+}) {}
+
+export type Error = NotReadyError | LoadError
+
 export interface Interface {
-  readonly get: (cwd: string) => Effect.Effect<Catalog, ACPError.CatalogError>
-  readonly reload: (cwd: string) => Effect.Effect<void, ACPError.CatalogError>
-  readonly changes: (cwd: string) => Stream.Stream<Catalog, ACPError.CatalogError>
+  readonly get: (cwd: string) => Effect.Effect<Catalog, Error>
+  readonly reload: (cwd: string) => Effect.Effect<void, Error>
+  readonly changes: (cwd: string) => Stream.Stream<Catalog, Error>
 }
 
 type Entry = {
@@ -40,7 +51,7 @@ const reloadOn = new Set<OpenCodeEvent["type"]>(["model.updated", "agent.updated
 
 export const make = Effect.fnUntraced(function* (client: OpenCodeClient) {
   const scope = yield* Effect.scope
-  const entries = new Map<string, Deferred.Deferred<Entry, ACPError.CatalogError>>()
+  const entries = new Map<string, Deferred.Deferred<Entry, Error>>()
   const connected = yield* Deferred.make<void>()
 
   // Requests queued behind a running load share the next one.
@@ -100,7 +111,7 @@ export const make = Effect.fnUntraced(function* (client: OpenCodeClient) {
       const key = FSUtil.resolve(cwd)
       const cached = entries.get(key)
       if (cached) return Deferred.await(cached)
-      const loading = Deferred.makeUnsafe<Entry, ACPError.CatalogError>()
+      const loading = Deferred.makeUnsafe<Entry, Error>()
       entries.set(key, loading)
       return create(cwd).pipe(
         Effect.onExit((exit) => {
@@ -144,17 +155,20 @@ const read = Effect.fnUntraced(function* (client: OpenCodeClient, cwd: string) {
       client.command.list({ location }),
     ],
     { concurrency: "unbounded" },
-  ).pipe(Effect.mapError((cause) => new ACPError.CatalogLoadError({ cause })))
+  ).pipe(Effect.mapError((cause) => new LoadError({ cause })))
   const models = modelResult.data.filter((model) => model.enabled)
   const preferred = defaultResult.data
   // The parallel default read can name a model missing from this list.
-  const defaultModel = preferred ? findModel(models, preferred) : models[0]
-  if (!defaultModel) return yield* new ACPError.CatalogNotReadyError({ reason: "models" })
+  const defaultModel = preferred
+    ? models.find((model) => model.providerID === preferred.providerID && model.id === preferred.id)
+    : models[0]
+  if (!defaultModel) return yield* new NotReadyError({ reason: "models" })
   const agents = agentResult.data.filter((agent) => agent.mode !== "subagent" && !agent.hidden)
   // Core lists its resolved default agent first, the same one a new session runs.
   const defaultAgent = agents[0]
-  if (!defaultAgent) return yield* new ACPError.CatalogNotReadyError({ reason: "agents" })
+  if (!defaultAgent) return yield* new NotReadyError({ reason: "agents" })
   return {
+    providers: providers(models),
     models,
     defaultModel: {
       providerID: defaultModel.providerID,
@@ -167,4 +181,16 @@ const read = Effect.fnUntraced(function* (client: OpenCodeClient, cwd: string) {
   } satisfies Catalog
 })
 
+function providers(models: ReadonlyArray<Model.Info>) {
+  return Array.from(new Set(models.map((model) => model.providerID)))
+    .toSorted()
+    .map((providerID) => ({
+      id: providerID,
+      name: providerID,
+      models: models
+        .filter((model) => model.providerID === providerID)
+        .map((model) => ({ id: model.id, name: model.name, variants: model.variants.map((variant) => variant.id) })),
+    }))
+}
+
 export * as ACPCatalog from "./catalog"

packages/cli/src/acp/config-option.ts

@@ -1,70 +1,51 @@
 import type { SessionConfigOption } from "@agentclientprotocol/sdk"
 import type { Agent } from "@opencode/schema/agent"
-import { Model } from "@opencode/schema/model"
-import { Provider } from "@opencode/schema/provider"
-import { Effect, Order } from "effect"
-import { builtinCommands, findModel, type Catalog } from "./catalog"
-import { ACPError } from "./error"
+import type { Model } from "@opencode/schema/model"
+import { builtinCommands, type Catalog } from "./catalog"
 
-const DEFAULT_VARIANT_VALUE = "default"
+export const DEFAULT_VARIANT_VALUE = "default"
+
+type ConfigOptionModel = {
+  id: string
+  name: string
+  variants?: ReadonlyArray<string>
+}
+
+export type ConfigOptionProvider = {
+  id: string
+  name: string
+  models: ReadonlyArray<ConfigOptionModel>
+}
+
+type ConfigOptionMode = {
+  id: string
+  name: string
+  description?: string
+}
+
+export type ModelSelection = {
+  model: { providerID: string; modelID: string }
+  variant?: string
+}
 
 export type Selection = {
   readonly model?: Model.Ref
   readonly modeID?: Agent.ID
 }
 
-export type Change = { readonly model: Model.Ref } | { readonly modeID: Agent.ID }
-
 export function currentModel(catalog: Catalog, selection: Selection) {
   return selection.model ?? catalog.defaultModel
 }
 
-export function configOptions(catalog: Catalog, selection: Selection): SessionConfigOption[] {
+export function configOptions(catalog: Catalog, selection: Selection) {
   const model = currentModel(catalog, selection)
-  const variants = findModel(catalog.models, model)?.variants.map((variant) => variant.id) ?? []
-  return [
-    {
-      id: "model",
-      name: "Model",
-      category: "model",
-      type: "select",
-      currentValue: `${model.providerID}/${model.id}`,
-      options: catalog.models
-        .toSorted((a, b) => Order.String(a.providerID, b.providerID) || a.name.localeCompare(b.name))
-        .map((item) => ({ value: `${item.providerID}/${item.id}`, name: `${item.providerID}/${item.name}` })),
-    },
-    ...(variants.length > 0
-      ? [
-          {
-            id: "effort",
-            name: "Effort",
-            description: "Available effort levels for this model",
-            category: "thought_level",
-            type: "select",
-            currentValue: selectVariant(model.variant, variants),
-            options: [...new Set([...variants, DEFAULT_VARIANT_VALUE])].map((variant) => ({
-              value: variant,
-              name: variant
-                .split(/[_-]/)
-                .map((part) => (part ? part.charAt(0).toUpperCase() + part.slice(1) : part))
-                .join(" "),
-            })),
-          } satisfies SessionConfigOption,
-        ]
-      : []),
-    {
-      id: "mode",
-      name: "Session Mode",
-      category: "mode",
-      type: "select",
-      currentValue: selection.modeID ?? catalog.defaultModeID,
-      options: catalog.modes.map((mode) => ({
-        value: mode.id,
-        name: mode.name,
-        ...(mode.description ? { description: mode.description } : {}),
-      })),
-    },
-  ]
+  return buildConfigOptions({
+    providers: catalog.providers,
+    currentModel: { providerID: model.providerID, modelID: model.id },
+    currentVariant: model.variant,
+    modes: catalog.modes,
+    currentModeId: selection.modeID ?? catalog.defaultModeID,
+  })
 }
 
 export function availableCommands(catalog: Catalog) {
@@ -74,72 +55,111 @@ export function availableCommands(catalog: Catalog) {
   ]
 }
 
-export const resolveChange = Effect.fnUntraced(function* (
-  catalog: Catalog,
-  selection: Selection,
-  configId: string,
-  value: string,
-) {
-  const current = currentModel(catalog, selection)
-  switch (configId) {
-    case "model":
-      return { model: yield* requireModel(catalog, value, current) }
-    case "effort": {
-      const model = findModel(catalog.models, current)
-      if (!model || (value !== DEFAULT_VARIANT_VALUE && !model.variants.some((variant) => variant.id === value)))
-        return yield* new ACPError.InvalidEffortError({ effort: value })
-      return { model: { ...current, variant: Model.VariantID.make(value) } }
-    }
-    case "mode": {
-      const mode = catalog.modes.find((item) => item.id === value)
-      if (!mode) return yield* new ACPError.InvalidModeError({ mode: value })
-      return { modeID: mode.id }
-    }
-    default:
-      return yield* new ACPError.InvalidConfigOptionError({ configId })
-  }
-})
-
-export function parseModelSelection(value: string, models: ReadonlyArray<Model.Info>): Model.Ref {
-  const providerID = models
-    .map((model) => model.providerID)
-    .toSorted()
-    .find((id) => value.startsWith(`${id}/`))
-  if (!providerID) {
-    const separator = value.indexOf("/")
-    if (separator === -1) return { providerID: Provider.ID.make(value), id: Model.ID.make("") }
-    return { providerID: Provider.ID.make(value.slice(0, separator)), id: Model.ID.make(value.slice(separator + 1)) }
-  }
-  const id = Model.ID.make(value.slice(providerID.length + 1))
-  if (findModel(models, { providerID, id })) return { providerID, id }
-  const separator = id.lastIndexOf("/")
-  const baseID = Model.ID.make(separator === -1 ? id : id.slice(0, separator))
-  const variant = separator === -1 ? undefined : id.slice(separator + 1)
-  const model = findModel(models, { providerID, id: baseID })
-  if (model && variant && model.variants.some((item) => item.id === variant))
-    return { providerID, id: baseID, variant: Model.VariantID.make(variant) }
-  return { providerID, id }
+export function buildConfigOptions(input: {
+  providers: readonly ConfigOptionProvider[]
+  currentModel: ModelSelection["model"]
+  currentVariant?: string
+  modes?: readonly ConfigOptionMode[]
+  currentModeId?: string
+}): SessionConfigOption[] {
+  const variants =
+    input.providers
+      .find((provider) => provider.id === input.currentModel.providerID)
+      ?.models.find((model) => model.id === input.currentModel.modelID)?.variants ?? []
+  const effort =
+    variants.length > 0 ? buildEffortSelectOption({ variants, currentVariant: input.currentVariant }) : undefined
+  return [
+    buildModelSelectOption({ providers: input.providers, currentModel: input.currentModel }),
+    ...(effort ? [effort] : []),
+    ...(input.modes && input.currentModeId
+      ? [buildModeSelectOption({ modes: input.modes, currentModeId: input.currentModeId })]
+      : []),
+  ]
 }
 
-const requireModel = Effect.fnUntraced(function* (catalog: Catalog, value: string, current: Model.Ref) {
-  const selected = parseModelSelection(value, catalog.models)
-  const model = findModel(catalog.models, selected)
-  if (!model) return yield* new ACPError.InvalidModelError({ providerId: selected.providerID, modelId: value })
-  const selectedVariant = model.variants.find((variant) => variant.id === selected.variant)
-  if (selected.variant && !selectedVariant) return yield* new ACPError.InvalidEffortError({ effort: selected.variant })
-  const variant =
-    selectedVariant?.id ??
-    (current.providerID === model.providerID &&
-    current.id === model.id &&
-    (current.variant === DEFAULT_VARIANT_VALUE || model.variants.some((variant) => variant.id === current.variant))
-      ? current.variant
-      : undefined)
-  return { providerID: model.providerID, id: model.id, variant } satisfies Model.Ref
-})
+export function buildModelSelectOption(input: {
+  providers: readonly ConfigOptionProvider[]
+  currentModel: ModelSelection["model"]
+}): SessionConfigOption {
+  return {
+    id: "model",
+    name: "Model",
+    category: "model",
+    type: "select",
+    currentValue: `${input.currentModel.providerID}/${input.currentModel.modelID}`,
+    options: input.providers.flatMap((provider) =>
+      provider.models
+        .toSorted((a, b) => a.name.localeCompare(b.name))
+        .map((model) => ({ value: `${provider.id}/${model.id}`, name: `${provider.name}/${model.name}` })),
+    ),
+  }
+}
+
+export function buildEffortSelectOption(input: {
+  variants: readonly string[]
+  currentVariant?: string
+}): SessionConfigOption {
+  return {
+    id: "effort",
+    name: "Effort",
+    description: "Available effort levels for this model",
+    category: "thought_level",
+    type: "select",
+    currentValue: selectVariant(input.currentVariant, input.variants),
+    options: [...new Set([...input.variants, DEFAULT_VARIANT_VALUE])].map((variant) => ({
+      value: variant,
+      name: formatVariantName(variant),
+    })),
+  }
+}
+
+export function buildModeSelectOption(input: {
+  modes: readonly ConfigOptionMode[]
+  currentModeId: string
+}): SessionConfigOption {
+  return {
+    id: "mode",
+    name: "Session Mode",
+    category: "mode",
+    type: "select",
+    currentValue: input.currentModeId,
+    options: input.modes.map((mode) => ({
+      value: mode.id,
+      name: mode.name,
+      ...(mode.description ? { description: mode.description } : {}),
+    })),
+  }
+}
+
+export function parseModelSelection(modelId: string, providers: readonly ConfigOptionProvider[]): ModelSelection {
+  const provider = providers.find((item) => modelId.startsWith(`${item.id}/`))
+  if (!provider) {
+    const separator = modelId.indexOf("/")
+    if (separator === -1) return { model: { providerID: modelId, modelID: "" } }
+    return { model: { providerID: modelId.slice(0, separator), modelID: modelId.slice(separator + 1) } }
+  }
+  const modelID = modelId.slice(provider.id.length + 1)
+  if (provider.models.some((model) => model.id === modelID)) return { model: { providerID: provider.id, modelID } }
+  const separator = modelID.lastIndexOf("/")
+  const baseModelID = separator === -1 ? modelID : modelID.slice(0, separator)
+  const variant = separator === -1 ? undefined : modelID.slice(separator + 1)
+  const model = provider.models.find((item) => item.id === baseModelID)
+  if (model && variant && model.variants?.includes(variant)) {
+    return { model: { providerID: provider.id, modelID: baseModelID }, variant }
+  }
+  return { model: { providerID: provider.id, modelID } }
+}
+
+export function formatVariantName(variant: string) {
+  return variant
+    .split(/[_-]/)
+    .map((part) => (part ? part.charAt(0).toUpperCase() + part.slice(1) : part))
+    .join(" ")
+}
 
 function selectVariant(variant: string | undefined, variants: readonly string[]) {
   if (!variant || variant === DEFAULT_VARIANT_VALUE) return DEFAULT_VARIANT_VALUE
-  if (variants.includes(variant)) return variant
+  if (variant && variants.includes(variant)) return variant
   if (variants.includes(DEFAULT_VARIANT_VALUE)) return DEFAULT_VARIANT_VALUE
   return variants[0] ?? DEFAULT_VARIANT_VALUE
 }

packages/cli/src/acp/elicitation.ts

@@ -6,7 +6,7 @@ import type {
 } from "@agentclientprotocol/sdk"
 import type { OpenCodeClient } from "@opencode/client/effect"
 import { Form } from "@opencode/schema/form"
-import { Effect, Option, Schema } from "effect"
+import { Cause, Effect, Option, Schema } from "effect"
 import type { Capabilities } from "./capabilities"
 import { ACPChild } from "./child"
 import { ACPClient } from "./client"
@@ -30,8 +30,28 @@ type Input = {
   readonly clientSessionID: string
   readonly child?: ACPChild.Session
   readonly toolCallSent: boolean
+  readonly settled: Effect.Effect<void>
 }
 
+type Outcome = Form.Answer | "cancel" | "settled"
+
+export const reply = Effect.fn("cli.acp.elicitation.reply")(function* (input: Input, cancelled: Effect.Effect<void>) {
+  yield* Effect.uninterruptibleMask((restore) =>
+    // The race starts racers in order and stops once one is done, so an earlier cancel never starts the ask.
+    restore(
+      cancelled.pipe(
+        Effect.as("cancel" as const),
+        Effect.raceFirst(input.settled.pipe(Effect.as("settled" as const))),
+        Effect.raceFirst(ask(input)),
+      ),
+    ).pipe(
+      Effect.tapCauseIf(Cause.hasDies, (cause) => Effect.logWarning("ACP elicitation failed", cause)),
+      Effect.catchCause(() => Effect.succeed("cancel" as const)),
+      Effect.flatMap((outcome) => respond(input, outcome)),
+    ),
+  )
+})
+
 export const UnshownQuestionMessage =
   "The question couldn't be shown to the user in this client. Continue without an answer: make reasonable assumptions and state them, or ask the user in your reply if you can't proceed."
 
@@ -83,7 +103,7 @@ function answer(form: AskedForm, response: CreateElicitationResponse): Form.Answ
   )
 }
 
-export const ask = Effect.fnUntraced(function* (input: Input) {
+const ask = Effect.fnUntraced(function* (input: Input) {
   const source = input.toolCallSent ? Schema.decodeUnknownOption(ToolSource)(input.form.metadata) : Option.none()
   const toolCallID = Option.getOrUndefined(Option.map(source, (metadata) => metadata.tool.id))
   const response = yield* input.connection.createElicitation({
@@ -96,7 +116,8 @@ export const ask = Effect.fnUntraced(function* (input: Input) {
   return answer(input.form, response) ?? "cancel"
 })
 
-export function respond(input: Input, outcome: Form.Answer | "cancel") {
+function respond(input: Input, outcome: Outcome) {
+  if (outcome === "settled") return Effect.void
   if (outcome === "cancel") return cancel(input.client, input.form)
   return input.client.session.form
     .reply({ sessionID: input.form.sessionID, formID: input.form.id, answer: outcome })

packages/cli/src/acp/error.ts

@@ -1,5 +1,6 @@
 import { RequestError } from "@agentclientprotocol/sdk"
 import { Schema } from "effect"
+import type { ACPCatalog } from "./catalog"
 
 export class SessionNotFoundError extends Schema.TaggedError<SessionNotFoundError>()("ACPSessionNotFoundError", {
   sessionId: Schema.String,
@@ -55,20 +56,6 @@ export class ServerUnavailableError extends Schema.TaggedError<ServerUnavailable
   {},
 ) {}
 
-export class CatalogNotReadyError extends Schema.TaggedError<CatalogNotReadyError>()("ACPCatalogNotReadyError", {
-  reason: Schema.Literals(["models", "agents"]),
-}) {
-  override get message() {
-    return this.reason === "models" ? "No models are available" : "No primary agents are available"
-  }
-}
-
-export class CatalogLoadError extends Schema.TaggedError<CatalogLoadError>()("ACPCatalogLoadError", {
-  cause: Schema.Defect(),
-}) {}
-
-export type CatalogError = CatalogNotReadyError | CatalogLoadError
-
 export type Error =
   | SessionNotFoundError
   | SessionDirectoryMismatchError
@@ -83,7 +70,7 @@ export type Error =
   | ServiceFailureError
   | ServerUnavailableError
 
-export type Failure = Error | RequestError | CatalogError
+export type Failure = Error | RequestError | ACPCatalog.Error
 
 export function toRequestError(error: Error): RequestError {
   switch (error._tag) {

packages/cli/src/acp/permission.ts

@@ -5,20 +5,11 @@ import type { Permission } from "@opencode/schema/permission"
 import type { Session } from "@opencode/schema/session"
 import { Patch } from "@opencode/util/patch"
 import { applyPatch } from "diff"
-import { Effect, Option, Schema } from "effect"
+import { Cause, Effect, Option, Schema } from "effect"
 import { ACPChild } from "./child"
 import { ACPClient } from "./client"
 import type { ACPConnection } from "./connection"
-import {
-  absolutePath,
-  canonicalName,
-  filePath,
-  patchHunks,
-  pendingToolCall,
-  stringValue,
-  toLocations,
-  type ToolInput,
-} from "./tool"
+import { absolutePath, filePath, patchHunks, pendingToolCall, stringValue, toLocations, type ToolInput } from "./tool"
 
 type PermissionEvent = Extract<OpenCodeEvent, { type: "permission.asked" }>
 type Tool = { readonly id: string; readonly name: string; readonly input: ToolInput }
@@ -33,6 +24,7 @@ type Input = {
   readonly cwd: string
   readonly tool?: Tool
   readonly child?: ACPChild.Session
+  readonly settled: Effect.Effect<void>
 }
 
 const options: PermissionOption[] = [
@@ -43,7 +35,24 @@ const options: PermissionOption[] = [
 
 const decodeFiles = Schema.decodeUnknownOption(Schema.Array(FileDiff.Info))
 
-export const ask = Effect.fnUntraced(function* (input: Input) {
+export const reply = Effect.fn("cli.acp.permission.reply")(function* (input: Input, cancelled: Effect.Effect<void>) {
+  yield* Effect.uninterruptibleMask((restore) =>
+    // The race starts racers in order and stops once one is done, so an earlier cancel never starts the ask.
+    restore(
+      cancelled.pipe(
+        Effect.as("reject" as const),
+        Effect.raceFirst(input.settled.pipe(Effect.as("settled" as const))),
+        Effect.raceFirst(ask(input)),
+      ),
+    ).pipe(
+      Effect.tapCauseIf(Cause.hasDies, (cause) => Effect.logWarning("ACP permission ask failed", cause)),
+      Effect.catchCause(() => Effect.succeed("reject" as const)),
+      Effect.flatMap((decision) => respond(input, decision)),
+    ),
+  )
+})
+
+const ask = Effect.fnUntraced(function* (input: Input) {
   const toolName = input.tool?.name ?? input.event.data.action
   const toolInput = input.tool?.input ?? input.event.data.metadata ?? {}
   const previews = yield* permissionPreviews(toolName, toolInput, input.event.data.metadata, input.cwd).pipe(
@@ -71,7 +80,8 @@ export const ask = Effect.fnUntraced(function* (input: Input) {
   return selected === "once" || selected === "always" ? selected : "reject"
 })
 
-export function respond(input: Input, decision: Permission.Reply) {
+function respond(input: Input, decision: Permission.Reply | "settled") {
+  if (decision === "settled") return Effect.void
   return input.client.permission.reply({ sessionID: input.sessionID, requestID: input.event.data.id, decision }).pipe(
     Effect.catchTag("PermissionNotFoundError", () => Effect.void),
     Effect.catch(ACPClient.classify),
@@ -85,7 +95,8 @@ const permissionPreviews = Effect.fnUntraced(function* (
   metadata: ToolInput | undefined,
   cwd: string,
 ) {
-  if (canonicalName(toolName) === "patch") return yield* patchPreviews(input, cwd)
+  const tool = toolName.toLocaleLowerCase()
+  if (tool === "patch" || tool === "apply_patch") return yield* patchPreviews(input, cwd)
   const files = Option.getOrElse(decodeFiles(metadata?.files), () => [])
   const previews = yield* Effect.forEach(
     files,
@@ -126,7 +137,7 @@ function diff(path: string, oldText: string | null, newText: string) {
 
 function permissionTitle(toolName: string, input: ToolInput, previews: ReadonlyArray<Preview>) {
   if (previews.length > 1) return `${previews.length} files`
-  switch (canonicalName(toolName)) {
+  switch (toolName.toLocaleLowerCase()) {
     case "external_directory":
       return stringValue(input.description) ?? stringValue(input.command) ?? stringValue(input.parentDir)
     case "webfetch":
@@ -140,6 +151,7 @@ function permissionTitle(toolName: string, input: ToolInput, previews: ReadonlyA
     case "edit":
     case "write":
     case "patch":
+    case "apply_patch":
       return filePath(input) ?? previews[0]?.path
     default:
       return undefined

packages/cli/src/acp/prompt.ts

@@ -1,61 +0,0 @@
-import type { ContentBlock } from "@agentclientprotocol/sdk"
-import type { Command } from "@opencode/schema/command"
-import { SessionMessage } from "@opencode/schema/session-message"
-import { Effect } from "effect"
-import { access, constants } from "node:fs/promises"
-import { fileURLToPath } from "node:url"
-import { builtinCommands, type Catalog } from "./catalog"
-import { linkReference, promptContentToParts, type PromptPart } from "./content"
-import { ACPError } from "./error"
-import type { ACPTranslate } from "./translate"
-
-export type Prepared = {
-  readonly start: ACPTranslate.TurnStart
-  readonly text: string
-  readonly files: Array<{ readonly uri: string; readonly name?: string }>
-  readonly synthetic: ReadonlyArray<string>
-  readonly slash?: { readonly name: string; readonly args: string }
-  readonly command?: Command.Info
-}
-
-export const prepare = Effect.fnUntraced(function* (catalog: Catalog, content: readonly ContentBlock[]) {
-  if (content.some((block) => block.type === "image" && !block.data && !block.uri)) {
-    return yield* new ACPError.InvalidRequestError({ message: "image content has no data or uri", field: "prompt" })
-  }
-  const parts = yield* Effect.forEach(promptContentToParts(content), referenceUnreadableFile, {
-    concurrency: "unbounded",
-  })
-  const visible = parts.filter((part) => part.type !== "text" || (!part.synthetic && !part.ignored))
-  const text = visible.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n")
-  const slash = detectSlashCommand(text)
-  const id = SessionMessage.ID.create()
-  return {
-    start:
-      slash && builtinCommands.get(slash.name)?.start === "compaction"
-        ? { type: "compaction", id }
-        : { type: "input", id },
-    text,
-    files: visible.flatMap((part) => (part.type === "file" ? [{ uri: part.url, name: part.filename }] : [])),
-    synthetic: parts.flatMap((part) => (part.type === "text" && part.synthetic ? [part.text] : [])),
-    slash,
-    command: slash ? catalog.commands.find((item) => item.name === slash.name) : undefined,
-  } satisfies Prepared
-})
-
-function referenceUnreadableFile(part: PromptPart) {
-  if (part.type !== "file" || !part.url.startsWith("file://")) return Effect.succeed(part)
-  return Effect.tryPromise(() => access(fileURLToPath(part.url), constants.R_OK)).pipe(
-    Effect.as(part),
-    Effect.orElseSucceed(() => linkReference(part.filename, part.url)),
-  )
-}
-
-function detectSlashCommand(text: string) {
-  const value = text.trim()
-  if (!value.startsWith("/")) return undefined
-  const [name, ...rest] = value.slice(1).split(/\s+/)
-  if (!name) return undefined
-  return { name, args: rest.join(" ").trim() }
-}
-
-export * as ACPPrompt from "./prompt"

packages/cli/src/acp/service.ts

@@ -1,5 +1,6 @@
 import type { OpenCodeClient } from "@opencode/client/effect"
 import { SessionsCursor } from "@opencode/protocol/groups/session"
+import { Model } from "@opencode/schema/model"
 import { AbsolutePath } from "@opencode/schema/schema"
 import { FSUtil } from "@opencode/util/fs-util"
 import { DateTime, Effect, Ref, Schema } from "effect"
@@ -35,9 +36,9 @@ import type {
 } from "@agentclientprotocol/sdk"
 import { OPENCODE_VERSION } from "../version"
 import { ACPCapabilities, type Capabilities } from "./capabilities"
-import type { ACPCatalog } from "./catalog"
+import type { ACPCatalog, Catalog } from "./catalog"
 import { ACPClient } from "./client"
-import { configOptions, resolveChange } from "./config-option"
+import { configOptions, currentModel, DEFAULT_VARIANT_VALUE, parseModelSelection } from "./config-option"
 import type { ACPConnection } from "./connection"
 import { ACPDirectories } from "./directories"
 import { ACPError } from "./error"
@@ -77,21 +78,42 @@ export function make(input: {
     return configOptions(yield* input.catalog.get(attached.cwd), yield* Ref.get(attached.selection))
   })
 
-  const withReload = <A>(attached: Attached, attempt: Effect.Effect<A, ACPError.Failure>) => {
-    const retry = () => input.catalog.reload(attached.cwd).pipe(Effect.andThen(attempt))
-    return attempt.pipe(
+  const withReload = <A>(attached: Attached, select: Effect.Effect<A, ACPError.Failure>) => {
+    const retry = () => input.catalog.reload(attached.cwd).pipe(Effect.andThen(select))
+    return select.pipe(
       Effect.catchTags({ ACPInvalidModelError: retry, ACPInvalidModeError: retry, ACPInvalidEffortError: retry }),
     )
   }
 
-  const select = Effect.fnUntraced(function* (attached: Attached, configId: string, value: string) {
-    const change = yield* resolveChange(
-      yield* input.catalog.get(attached.cwd),
-      yield* Ref.get(attached.selection),
-      configId,
-      value,
-    )
-    yield* input.sessions.select(attached, change)
+  const selectOption = Effect.fnUntraced(function* (attached: Attached, configId: string, value: string) {
+    const catalog = yield* input.catalog.get(attached.cwd)
+    const current = currentModel(catalog, yield* Ref.get(attached.selection))
+    switch (configId) {
+      case "model":
+        return yield* selectModel(attached, yield* requireModel(catalog, value, current))
+      case "effort":
+        return yield* selectModel(attached, yield* requireEffort(catalog, value, current))
+      case "mode":
+        return yield* selectMode(attached, value)
+      default:
+        return yield* new ACPError.InvalidConfigOptionError({ configId })
+    }
+  })
+
+  // Update selection before switching so the echoed event is a no-op.
+  const selectModel = Effect.fnUntraced(function* (attached: Attached, model: Model.Ref) {
+    yield* Ref.update(attached.selection, (selection) => ({ ...selection, model }))
+    yield* input.client.session.switchModel({ sessionID: attached.id, model }).pipe(Effect.catch(ACPClient.classify))
+  })
+
+  const selectMode = Effect.fnUntraced(function* (attached: Attached, modeID: string) {
+    const catalog = yield* input.catalog.get(attached.cwd)
+    const mode = catalog.modes.find((item) => item.id === modeID)
+    if (!mode) return yield* new ACPError.InvalidModeError({ mode: modeID })
+    yield* Ref.update(attached.selection, (selection) => ({ ...selection, modeID: mode.id }))
+    yield* input.client.session
+      .switchAgent({ sessionID: attached.id, agent: mode.id })
+      .pipe(Effect.catch(ACPClient.classify))
   })
 
   const getSession = Effect.fnUntraced(function* (sessionId: string, cwd: string) {
@@ -223,12 +245,12 @@ export function make(input: {
       const attached = yield* input.sessions.require(params.sessionId)
       const value = params.value
       if (typeof value !== "string") return yield* new ACPError.InvalidConfigOptionError({ configId: params.configId })
-      yield* withReload(attached, select(attached, params.configId, value))
+      yield* withReload(attached, selectOption(attached, params.configId, value))
       return { configOptions: yield* currentOptions(attached) }
     }),
     setSessionMode: Effect.fnUntraced(function* (params) {
       const attached = yield* input.sessions.require(params.sessionId)
-      yield* withReload(attached, select(attached, "mode", params.modeId))
+      yield* withReload(attached, selectMode(attached, params.modeId))
       return {}
     }),
     prompt: input.turn.prompt,
@@ -248,4 +270,29 @@ const supportedMcpServers = Effect.fnUntraced(function* (servers: readonly McpSe
   return supported
 })
 
+const requireModel = Effect.fnUntraced(function* (catalog: Catalog, modelID: string, current: Model.Ref) {
+  const selected = parseModelSelection(modelID, catalog.providers)
+  const model = catalog.models.find(
+    (item) => item.providerID === selected.model.providerID && item.id === selected.model.modelID,
+  )
+  if (!model) return yield* new ACPError.InvalidModelError({ providerId: selected.model.providerID, modelId: modelID })
+  const selectedVariant = model.variants.find((variant) => variant.id === selected.variant)
+  if (selected.variant && !selectedVariant) return yield* new ACPError.InvalidEffortError({ effort: selected.variant })
+  const variant =
+    selectedVariant?.id ??
+    (current.providerID === model.providerID &&
+    current.id === model.id &&
+    (current.variant === DEFAULT_VARIANT_VALUE || model.variants.some((variant) => variant.id === current.variant))
+      ? current.variant
+      : undefined)
+  return { providerID: model.providerID, id: model.id, variant } satisfies Model.Ref
+})
+
+const requireEffort = Effect.fnUntraced(function* (catalog: Catalog, effort: string, current: Model.Ref) {
+  const model = catalog.models.find((item) => item.providerID === current.providerID && item.id === current.id)
+  if (!model || (effort !== DEFAULT_VARIANT_VALUE && !model.variants.some((variant) => variant.id === effort)))
+    return yield* new ACPError.InvalidEffortError({ effort })
+  return { ...current, variant: Model.VariantID.make(effort) } satisfies Model.Ref
+})
+
 export * as ACPService from "./service"

packages/cli/src/acp/sessions.ts

@@ -6,7 +6,7 @@ import type { Session } from "@opencode/schema/session"
 import { Cause, Deferred, Effect, Exit, Queue, Ref, Scope, Stream } from "effect"
 import type { ACPCatalog, Catalog } from "./catalog"
 import { ACPClient } from "./client"
-import { availableCommands, configOptions, type Change, type Selection } from "./config-option"
+import { availableCommands, configOptions, type Selection } from "./config-option"
 import { ACPConnection } from "./connection"
 import { ACPError } from "./error"
 
@@ -28,13 +28,12 @@ export interface Interface {
   readonly release: (attached: Attached) => Effect.Effect<void>
   readonly require: (sessionID: string) => Effect.Effect<Attached, ACPError.SessionNotFoundError>
   readonly fork: (attached: Attached, effect: Effect.Effect<void>) => Effect.Effect<void, ACPError.SessionNotFoundError>
-  readonly select: (attached: Attached, change: Change) => Effect.Effect<void, ACPError.Error>
 }
 
 type Entry = {
   readonly attached: Attached
   readonly scope: Scope.Closeable
-  readonly selected: Queue.Queue<Change>
+  readonly selected: Queue.Queue<Selection>
 }
 
 type SelectedEvent = Extract<OpenCodeEvent, { type: "session.model.selected" | "session.agent.selected" }>
@@ -131,7 +130,7 @@ export const make = Effect.fnUntraced(function* (input: {
           selection: yield* Ref.make<Selection>({ model: session.model, modeID: session.agent }),
         },
         scope: Scope.forkUnsafe(scope),
-        selected: yield* Queue.unbounded<Change>(),
+        selected: yield* Queue.unbounded<Selection>(),
       }
       // Swap synchronously so concurrent attaches of one ID cannot both keep a scope.
       const replaced = sessions.get(session.id)
@@ -180,15 +179,6 @@ export const make = Effect.fnUntraced(function* (input: {
       if (entry?.attached !== attached) return yield* new ACPError.SessionNotFoundError({ sessionId: attached.id })
       yield* Effect.forkIn(effect, entry.scope, { startImmediately: true })
     }),
-    // Update selection before switching so the echoed event is a no-op.
-    select: Effect.fnUntraced(function* (attached, change) {
-      yield* Ref.update(attached.selection, (selection) => ({ ...selection, ...change }))
-      yield* (
-        "model" in change
-          ? input.client.session.switchModel({ sessionID: attached.id, model: change.model })
-          : input.client.session.switchAgent({ sessionID: attached.id, agent: change.modeID })
-      ).pipe(Effect.catch(ACPClient.classify))
-    }),
   } satisfies Interface
 })
 

packages/cli/src/acp/tool.ts

@@ -8,12 +8,14 @@ import { Result } from "effect"
 export type ToolInput = Record<string, unknown>
 
 function toToolKind(toolName: string): ToolKind {
-  switch (canonicalName(toolName)) {
+  switch (toolName.toLocaleLowerCase()) {
+    case "bash":
     case "shell":
       return "execute"
     case "webfetch":
       return "fetch"
     case "edit":
+    case "apply_patch":
     case "patch":
     case "write":
       return "edit"
@@ -25,6 +27,7 @@ function toToolKind(toolName: string): ToolKind {
       return "search"
     case "read":
       return "read"
+    case "task":
     case "subagent":
       return "think"
     default:
@@ -33,7 +36,8 @@ function toToolKind(toolName: string): ToolKind {
 }
 
 export function toLocations(toolName: string, input: ToolInput, cwd: string): ToolCallLocation[] {
-  switch (canonicalName(toolName)) {
+  switch (toolName.toLocaleLowerCase()) {
+    case "bash":
     case "shell":
       return locationFrom(cwd, stringValue(input.workdir) ?? stringValue(input.cwd) ?? cwd)
     case "read":
@@ -41,6 +45,7 @@ export function toLocations(toolName: string, input: ToolInput, cwd: string): To
     case "write":
       return locationFrom(cwd, filePath(input))
     case "patch":
+    case "apply_patch":
       return locationFrom(
         cwd,
         ...patchHunks(input).flatMap((hunk) => [hunk.path, hunk.type === "update" ? hunk.movePath : undefined]),
@@ -100,7 +105,7 @@ export function completedToolUpdate(input: {
 }): ToolCallUpdate {
   const normalized = toolContent(input.content)
   const firstText = input.content.find((part) => part.type === "text")
-  const read = canonicalName(input.toolName) === "read" && firstText ? readDisplayText(firstText.text) : undefined
+  const read = input.toolName.toLocaleLowerCase() === "read" && firstText ? readDisplayText(firstText.text) : undefined
   const images = normalized.filter((part) => part.type === "content" && part.content.type === "image")
   const primary =
     read === undefined
@@ -168,7 +173,8 @@ function rawInput(toolName: string, input: ToolInput, cwd: string): ToolInput {
 }
 
 function isShell(toolName: string) {
-  return canonicalName(toolName) === "shell"
+  const tool = toolName.toLocaleLowerCase()
+  return tool === "bash" || tool === "shell"
 }
 
 function locationFrom(cwd: string, ...values: unknown[]): ToolCallLocation[] {
@@ -178,17 +184,6 @@ function locationFrom(cwd: string, ...values: unknown[]): ToolCallLocation[] {
   )
 }
 
-const V1Aliases = new Map([
-  ["bash", "shell"],
-  ["task", "subagent"],
-  ["apply_patch", "patch"],
-])
-
-export function canonicalName(toolName: string) {
-  const name = toolName.toLocaleLowerCase()
-  return V1Aliases.get(name) ?? name
-}
-
 // Sessions migrated from V1 keep their original `filePath` tool inputs.
 export function filePath(input: ToolInput) {
   return stringValue(input.path) ?? stringValue(input.filePath)

packages/cli/src/acp/translate.ts

@@ -15,12 +15,14 @@ export type TurnStart = { readonly type: "input" | "compaction"; readonly id: Se
 
 export type Terminal = "succeeded" | "failed" | "interrupted"
 
-export type TurnContext = {
+export type Context = {
   readonly sessionID: Session.ID
   readonly cwd: string
   readonly start: TurnStart
   readonly childUpdates: boolean
   readonly compaction: boolean
+  /** Background mode follows open children after the turn ends and never writes `session/update`. */
+  readonly mode: "turn" | "background"
 }
 
 type Tool = {
@@ -53,7 +55,6 @@ export type TurnState = {
 
 type PermissionEvent = Extract<OpenCodeEvent, { type: "permission.asked" }>
 type FormEvent = Extract<OpenCodeEvent, { type: "form.created" }>
-type CreatedEvent = Extract<OpenCodeEvent, { type: "session.created" }>
 
 export type Output =
   | { readonly _tag: "SessionUpdate"; readonly update: SessionUpdate }
@@ -64,10 +65,15 @@ export type Output =
       readonly tool?: Tool
       readonly child?: ACPChild.Session
     }
-  | { readonly _tag: "FormAsk"; readonly form: FormEvent["data"]["form"]; readonly child?: ACPChild.Session }
+  | {
+      readonly _tag: "FormAsk"
+      readonly form: FormEvent["data"]["form"]
+      readonly child?: ACPChild.Session
+      readonly toolCallSent: boolean
+    }
   | { readonly _tag: "AskSettled"; readonly id: string }
 
-export type Folded = {
+type Step = {
   readonly state: TurnState
   readonly outputs: ReadonlyArray<Output>
   readonly terminal?: Terminal
@@ -83,11 +89,27 @@ export const initial: TurnState = {
   asks: new Set(),
 }
 
-export function fold(state: TurnState, event: OpenCodeEvent, ctx: TurnContext): Folded {
-  if (event.type === "session.created") return childCreated(state, event, ctx)
+export function step(state: TurnState, event: OpenCodeEvent, ctx: Context): Step {
+  if (event.type === "session.created") {
+    const parentID = event.data.parentID
+    if (!parentID) return { state, outputs: [] }
+    const parent = parentID === ctx.sessionID ? undefined : state.children.get(parentID)
+    if (!parent && (ctx.mode === "background" || parentID !== ctx.sessionID)) return { state, outputs: [] }
+    const child = { id: event.data.sessionID, parentID, depth: parent ? parent.depth + 1 : 1, title: event.data.title }
+    return {
+      state: {
+        ...state,
+        children: new Map(state.children).set(child.id, child),
+        openChildren: new Set(state.openChildren).add(child.id),
+      },
+      outputs: childStatus(ctx, child, { type: "status", status: "created" }),
+    }
+  }
 
-  const sessionID = sessionIDFromEvent(event)
-  const child = sessionID ? state.children.get(sessionID) : undefined
+  const eventSessionID = sessionIDFromEvent(event)
+  const child = eventSessionID ? state.children.get(eventSessionID) : undefined
+  if (ctx.mode === "background" && !child) return { state, outputs: [] }
+  const send = (update: SessionUpdate) => route(ctx, child, update)
 
   if (event.type === "permission.asked" && (event.data.sessionID === ctx.sessionID || child)) {
     const tool = event.data.source?.id
@@ -101,7 +123,14 @@ export function fold(state: TurnState, event: OpenCodeEvent, ctx: TurnContext):
   if (event.type === "form.created" && (event.data.form.sessionID === ctx.sessionID || child)) {
     return {
       state: { ...state, asks: new Set(state.asks).add(event.data.form.id) },
-      outputs: [{ _tag: "FormAsk", form: event.data.form, child }],
+      outputs: [
+        {
+          _tag: "FormAsk",
+          form: event.data.form,
+          child,
+          toolCallSent: ctx.mode === "turn" && (!child || !ctx.childUpdates),
+        },
+      ],
     }
   }
   const settledID =
@@ -115,148 +144,22 @@ export function fold(state: TurnState, event: OpenCodeEvent, ctx: TurnContext):
     asks.delete(settledID)
     return { state: { ...state, asks }, outputs: [{ _tag: "AskSettled", id: settledID }] }
   }
-  if (!sessionID || (sessionID !== ctx.sessionID && !child)) return { state, outputs: [] }
+  if (!eventSessionID || (eventSessionID !== ctx.sessionID && !child)) return { state, outputs: [] }
   if (event.type === "session.inbox.delivered" && event.data.inboxID === ctx.start.id)
     return { state: { ...state, started: true }, outputs: [] }
   if (!state.started) return { state, outputs: [] }
-  return child ? childEvent(state, event, ctx, child) : rootEvent(state, event, ctx)
-}
 
-export function fromTrackedChild(state: TurnState, event: OpenCodeEvent) {
-  const sessionID = event.type === "session.created" ? event.data.parentID : sessionIDFromEvent(event)
-  return sessionID !== undefined && state.children.has(sessionID)
-}
-
-export function failure(state: TurnState) {
-  const error = state.stepError ?? state.executionError
-  if (error?.type === "provider.auth") return new ACPError.AuthRequiredError()
-  if (error && error.type !== "aborted" && error.type !== "provider.content-filter") {
-    return new ACPError.ServiceFailureError({
-      safeMessage: error.message || "OpenCode prompt failed",
-      service: "session",
-      errorName: error.type,
-    })
-  }
-  return undefined
-}
-
-export function response(state: TurnState, sessionID: string, terminal: Terminal): PromptResponse {
-  const tokens = state.usage?.turn
-  const usage = tokens
-    ? {
-        inputTokens: tokens.input,
-        outputTokens: tokens.output,
-        totalTokens: TokenUsage.total(tokens),
-        ...(tokens.reasoning > 0 ? { thoughtTokens: tokens.reasoning } : {}),
-        ...(tokens.cache.read > 0 ? { cachedReadTokens: tokens.cache.read } : {}),
-        ...(tokens.cache.write > 0 ? { cachedWriteTokens: tokens.cache.write } : {}),
-      }
-    : undefined
-  const error = (state.stepError ?? state.executionError)?.type
-  const stopReason = resolveStopReason({ terminal, finish: state.finish, error })
-  // Interruption clears the projected retry, so a retry pending at interrupt is reported here.
-  const retry = state.retries.get(sessionID)
-  return { stopReason, ...(usage ? { usage } : {}), _meta: retry ? { [RetryMeta]: retry } : {} }
-}
-
-// Child compactions are left to the background consumer.
-export function abandon(state: TurnState, ctx: TurnContext): Folded {
-  const compaction = state.compactions.get(ctx.sessionID)
-  return {
-    state: { ...state, tools: new Map(), compactions: without(state.compactions, ctx.sessionID) },
-    outputs: [
-      ...[...state.tools.values()].flatMap((tool) =>
-        route(ctx, state.children.get(tool.sessionID), {
-          sessionUpdate: "tool_call_update",
-          ...errorToolUpdate({
-            toolCallId: tool.id,
-            toolName: tool.name,
-            input: tool.input,
-            metadata: tool.metadata,
-            content: [],
-            error: "Cancelled",
-            cwd: ctx.cwd,
-          }),
-        }),
-      ),
-      ...(compaction
-        ? route(ctx, undefined, ACPCompaction.abandon(compaction, ACPCompaction.usesStandardUpdates(ctx, false)))
-        : []),
-    ],
-  }
-}
-
-export function reasoningMessageID(messageID: string, ordinal: number) {
-  return `${messageID}:reasoning:${ordinal}`
-}
-
-function childCreated(state: TurnState, event: CreatedEvent, ctx: TurnContext): Folded {
-  const parentID = event.data.parentID
-  if (!parentID) return { state, outputs: [] }
-  const parent = parentID === ctx.sessionID ? undefined : state.children.get(parentID)
-  if (!parent && parentID !== ctx.sessionID) return { state, outputs: [] }
-  const child = { id: event.data.sessionID, parentID, depth: parent ? parent.depth + 1 : 1, title: event.data.title }
-  return {
-    state: {
-      ...state,
-      children: new Map(state.children).set(child.id, child),
-      openChildren: new Set(state.openChildren).add(child.id),
-    },
-    outputs: childStatus(ctx, child, { type: "status", status: "created" }),
-  }
-}
-
-function rootEvent(state: TurnState, event: OpenCodeEvent, ctx: TurnContext): Folded {
-  switch (event.type) {
-    case "session.step.started":
-      return sessionEvent({ ...state, stepError: undefined }, event, ctx, undefined)
-    case "session.step.ended":
-      return { state: { ...recordStep(state, event.data.tokens), finish: event.data.finish }, outputs: [] }
-    case "session.step.failed": {
-      const recorded = event.data.tokens ? recordStep(state, event.data.tokens) : state
-      return { state: { ...recorded, stepError: event.data.error }, outputs: [] }
-    }
-    case "session.execution.succeeded":
-      return { state, outputs: [], terminal: "succeeded" }
-    case "session.execution.interrupted":
-      return { state, outputs: [], terminal: "interrupted" }
-    case "session.execution.failed":
-      return { state: { ...state, executionError: event.data.error }, outputs: [], terminal: "failed" }
-    default:
-      return sessionEvent(state, event, ctx, undefined)
-  }
-}
-
-function childEvent(state: TurnState, event: OpenCodeEvent, ctx: TurnContext, child: ACPChild.Session): Folded {
   switch (event.type) {
     case "session.execution.started":
-      return { state, outputs: childStatus(ctx, child, { type: "status", status: "running" }) }
-    case "session.execution.succeeded":
-      return childEnded(state, ctx, child, { type: "status", status: "completed" })
-    case "session.execution.interrupted":
-      return childEnded(state, ctx, child, { type: "status", status: "interrupted" })
-    case "session.execution.failed":
-      return childEnded(state, ctx, child, { type: "status", status: "failed", error: event.data.error })
-    default:
-      return sessionEvent(state, event, ctx, child)
-  }
-}
-
-function sessionEvent(
-  state: TurnState,
-  event: OpenCodeEvent,
-  ctx: TurnContext,
-  child: ACPChild.Session | undefined,
-): Folded {
-  const sessionID = child?.id ?? ctx.sessionID
-  const send = (update: SessionUpdate) => route(ctx, child, update)
-  switch (event.type) {
-    case "session.step.started":
-      if (!state.retries.has(sessionID)) return { state, outputs: [] }
+      return { state, outputs: child ? childStatus(ctx, child, { type: "status", status: "running" }) : [] }
+    case "session.step.started": {
+      const next = child ? state : { ...state, stepError: undefined }
+      if (!state.retries.has(eventSessionID)) return { state: next, outputs: [] }
       return {
-        state: { ...state, retries: without(state.retries, sessionID) },
+        state: { ...next, retries: without(state.retries, eventSessionID) },
         outputs: send({ sessionUpdate: "session_info_update", _meta: { [RetryMeta]: null } }),
       }
+    }
     case "session.retry.scheduled": {
       const retry = {
         attempt: event.data.attempt,
@@ -264,7 +167,7 @@ function sessionEvent(
         error: event.data.error,
       }
       return {
-        state: { ...state, retries: new Map(state.retries).set(sessionID, retry) },
+        state: { ...state, retries: new Map(state.retries).set(eventSessionID, retry) },
         outputs: send({ sessionUpdate: "session_info_update", _meta: { [RetryMeta]: retry } }),
       }
     }
@@ -280,7 +183,7 @@ function sessionEvent(
     }
     case "session.compaction.delta": {
       const update = ACPCompaction.chunk(
-        state.compactions.get(sessionID),
+        state.compactions.get(eventSessionID),
         event.data.text,
         ACPCompaction.usesStandardUpdates(ctx, child !== undefined),
       )
@@ -396,31 +299,121 @@ function sessionEvent(
         }),
       }
     }
+    case "session.step.ended":
+      if (child) return { state, outputs: [] }
+      return { state: { ...recordStep(state, event.data.tokens), finish: event.data.finish }, outputs: [] }
+    case "session.step.failed": {
+      if (child) return { state, outputs: [] }
+      const recorded = event.data.tokens ? recordStep(state, event.data.tokens) : state
+      return { state: { ...recorded, stepError: event.data.error }, outputs: [] }
+    }
+    case "session.execution.succeeded":
+      if (!child) return { state, outputs: [], terminal: "succeeded" }
+      return childEnded(state, ctx, child, { type: "status", status: "completed" }, "succeeded")
+    case "session.execution.interrupted":
+      if (!child) return { state, outputs: [], terminal: "interrupted" }
+      return childEnded(state, ctx, child, { type: "status", status: "interrupted" }, "interrupted")
+    case "session.execution.failed":
+      if (!child) return { state: { ...state, executionError: event.data.error }, outputs: [], terminal: "failed" }
+      return childEnded(state, ctx, child, { type: "status", status: "failed", error: event.data.error }, "failed")
     default:
       return { state, outputs: [] }
   }
 }
 
+export function failure(state: TurnState) {
+  const error = state.stepError ?? state.executionError
+  if (error?.type === "provider.auth") return new ACPError.AuthRequiredError()
+  if (error && error.type !== "aborted" && error.type !== "provider.content-filter") {
+    return new ACPError.ServiceFailureError({
+      safeMessage: error.message || "OpenCode prompt failed",
+      service: "session",
+      errorName: error.type,
+    })
+  }
+  return undefined
+}
+
+export function response(state: TurnState, sessionID: string, terminal: Terminal): PromptResponse {
+  const tokens = state.usage?.turn
+  const usage = tokens
+    ? {
+        inputTokens: tokens.input,
+        outputTokens: tokens.output,
+        totalTokens: TokenUsage.total(tokens),
+        ...(tokens.reasoning > 0 ? { thoughtTokens: tokens.reasoning } : {}),
+        ...(tokens.cache.read > 0 ? { cachedReadTokens: tokens.cache.read } : {}),
+        ...(tokens.cache.write > 0 ? { cachedWriteTokens: tokens.cache.write } : {}),
+      }
+    : undefined
+  const error = (state.stepError ?? state.executionError)?.type
+  const stopReason = resolveStopReason({ terminal, finish: state.finish, error })
+  // Interruption clears the projected retry, so a retry pending at interrupt is reported here.
+  const retry = state.retries.get(sessionID)
+  return { stopReason, ...(usage ? { usage } : {}), _meta: retry ? { [RetryMeta]: retry } : {} }
+}
+
+// Child compactions are left to the background consumer.
+export function abandon(state: TurnState, ctx: Context): Step {
+  const compaction = state.compactions.get(ctx.sessionID)
+  return {
+    state: { ...state, tools: new Map(), compactions: without(state.compactions, ctx.sessionID) },
+    outputs: [
+      ...[...state.tools.values()].flatMap((tool) =>
+        route(ctx, state.children.get(tool.sessionID), {
+          sessionUpdate: "tool_call_update",
+          ...errorToolUpdate({
+            toolCallId: tool.id,
+            toolName: tool.name,
+            input: tool.input,
+            metadata: tool.metadata,
+            content: [],
+            error: "Cancelled",
+            cwd: ctx.cwd,
+          }),
+        }),
+      ),
+      ...(compaction
+        ? route(ctx, undefined, ACPCompaction.abandon(compaction, ACPCompaction.usesStandardUpdates(ctx, false)))
+        : []),
+    ],
+  }
+}
+
+export function reasoningMessageID(messageID: string, ordinal: number) {
+  return `${messageID}:reasoning:${ordinal}`
+}
+
 function newTool(sessionID: string, id: string, name = "tool"): Tool {
   return { sessionID, id, name, input: {}, metadata: {} }
 }
 
-function route(ctx: TurnContext, child: ACPChild.Session | undefined, update: SessionUpdate): Output[] {
-  if (!child) return [{ _tag: "SessionUpdate", update }]
+function route(ctx: Context, child: ACPChild.Session | undefined, update: SessionUpdate): Output[] {
+  if (!child) return ctx.mode === "turn" ? [{ _tag: "SessionUpdate", update }] : []
   const projected = ACPChild.project(update, child)
   if (ctx.childUpdates) return childStatus(ctx, child, { type: "update", update: projected })
-  return [{ _tag: "SessionUpdate", update: projected }]
+  return ctx.mode === "turn" ? [{ _tag: "SessionUpdate", update: projected }] : []
 }
 
-function childStatus(ctx: TurnContext, child: ACPChild.Session, event: ACPChild.Event): Output[] {
+function childStatus(ctx: Context, child: ACPChild.Session, event: ACPChild.Event): Output[] {
   if (!ctx.childUpdates) return []
   return [{ _tag: "ChildUpdate", update: ACPChild.update(ctx.sessionID, child, event) }]
 }
 
-function childEnded(state: TurnState, ctx: TurnContext, child: ACPChild.Session, status: ACPChild.Event): Folded {
+function childEnded(
+  state: TurnState,
+  ctx: Context,
+  child: ACPChild.Session,
+  status: ACPChild.Event,
+  terminal: Terminal,
+): Step {
   const openChildren = new Set(state.openChildren)
   openChildren.delete(child.id)
-  return { state: { ...state, openChildren }, outputs: childStatus(ctx, child, status) }
+  return {
+    state: { ...state, openChildren },
+    outputs: childStatus(ctx, child, status),
+    ...(ctx.mode === "background" && openChildren.size === 0 ? { terminal } : {}),
+  }
 }
 
 function recordStep(state: TurnState, tokens: TokenUsage.Info): TurnState {

packages/cli/src/acp/turn.ts

@@ -1,5 +1,7 @@
 import type { CancelNotification, PromptRequest, PromptResponse, RequestError } from "@agentclientprotocol/sdk"
 import type { OpenCodeClient, OpenCodeEvent } from "@opencode/client/effect"
+import type { Command } from "@opencode/schema/command"
+import { SessionMessage } from "@opencode/schema/session-message"
 import { TokenUsage } from "@opencode/schema/token-usage"
 import {
   Cause,
@@ -16,16 +18,18 @@ import {
   Scope,
   Stream,
 } from "effect"
+import { access, constants } from "node:fs/promises"
+import { fileURLToPath } from "node:url"
 import type { Capabilities } from "./capabilities"
-import type { ACPCatalog } from "./catalog"
+import { builtinCommands, type ACPCatalog, type Catalog } from "./catalog"
 import { ACPChild } from "./child"
 import { ACPClient } from "./client"
 import { currentModel } from "./config-option"
 import type { ACPConnection } from "./connection"
+import { linkReference, promptContentToParts, type PromptPart } from "./content"
 import { ACPElicitation } from "./elicitation"
 import { ACPError } from "./error"
 import { ACPPermission } from "./permission"
-import { ACPPrompt } from "./prompt"
 import type { ACPSessions, Attached } from "./sessions"
 import { ACPTranslate } from "./translate"
 
@@ -41,19 +45,24 @@ export const CancelDrainTimeout = Context.Reference<Duration.Input>("@opencode/c
   defaultValue: () => "5 seconds",
 })
 
+type PreparedPrompt = {
+  readonly start: ACPTranslate.TurnStart
+  readonly text: string
+  readonly files: Array<{ readonly uri: string; readonly name?: string }>
+  readonly synthetic: ReadonlyArray<string>
+  readonly slash?: { readonly name: string; readonly args: string }
+  readonly command?: Command.Info
+}
+
+type PermissionAsk = Extract<ACPTranslate.Output, { readonly _tag: "PermissionAsk" }>
+
 type Subscription = {
   readonly scope: Scope.Closeable
   readonly events: Queue.Dequeue<OpenCodeEvent, unknown>
-  readonly askQueue: Queue.Queue<Effect.Effect<void, ACPError.Error | RequestError>>
-  readonly settled: Map<string, Deferred.Deferred<void>>
-}
-
-type Turn = {
-  readonly ctx: ACPTranslate.TurnContext
-  readonly state: Ref.Ref<ACPTranslate.TurnState>
-  readonly subscription: Subscription
+  /** Asks run serially off the event stream. */
+  readonly asks: Queue.Queue<Effect.Effect<void, ACPError.Error | RequestError>>
   readonly cancelled: Deferred.Deferred<void>
-  readonly background: boolean
+  readonly settled: Map<string, Deferred.Deferred<void>>
 }
 
 export const make = Effect.fnUntraced(function* (input: {
@@ -67,7 +76,7 @@ export const make = Effect.fnUntraced(function* (input: {
   const drainTimeout = yield* CancelDrainTimeout
   const turns = yield* FiberMap.make<string, PromptResponse, ACPError.Failure>()
 
-  const open = Effect.fnUntraced(function* (ctx: ACPTranslate.TurnContext, state: Ref.Ref<ACPTranslate.TurnState>) {
+  const subscribe = Effect.fnUntraced(function* () {
     // Parented to the service scope; the session scope may already be closed.
     const subscriptionScope = yield* Scope.fork(scope)
     const subscription: Subscription = {
@@ -75,18 +84,19 @@ export const make = Effect.fnUntraced(function* (input: {
       events: yield* input.client.event
         .subscribe()
         .pipe(Stream.toQueue({ capacity: "unbounded" }), Scope.provide(subscriptionScope)),
-      askQueue: yield* Queue.unbounded<Effect.Effect<void, ACPError.Error | RequestError>>(),
+      asks: yield* Queue.unbounded<Effect.Effect<void, ACPError.Error | RequestError>>(),
+      cancelled: yield* Deferred.make<void>(),
       settled: new Map(),
     }
-    yield* Queue.take(subscription.askQueue).pipe(
+    yield* Queue.take(subscription.asks).pipe(
       Effect.flatten,
       Effect.catchCause((cause) =>
-        Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logWarning("ACP ask reply failed", cause),
+        Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logWarning("ACP permission reply failed", cause),
       ),
       Effect.forever,
       Effect.forkIn(subscriptionScope),
     )
-    return { ctx, state, subscription, cancelled: yield* Deferred.make<void>(), background: false } satisfies Turn
+    return subscription
   })
 
   const take = (subscription: Subscription) =>
@@ -98,44 +108,35 @@ export const make = Effect.fnUntraced(function* (input: {
 
   const asksSettled = Effect.fnUntraced(function* (subscription: Subscription) {
     const settled = yield* Deferred.make<void>()
-    yield* Queue.offer(subscription.askQueue, Deferred.succeed(settled, undefined).pipe(Effect.asVoid))
+    yield* Queue.offer(subscription.asks, Deferred.succeed(settled, undefined).pipe(Effect.asVoid))
     yield* Deferred.await(settled)
   })
 
-  const queueAsk = <A>(
-    turn: Turn,
-    id: string,
-    ask: Effect.Effect<A, unknown>,
-    fallback: A,
-    respond: (outcome: A) => Effect.Effect<void, ACPError.Error | RequestError>,
+  const reply = (
+    subscription: Subscription,
+    ctx: ACPTranslate.Context,
+    ask: PermissionAsk,
+    settled: Deferred.Deferred<void>,
   ) =>
-    Effect.gen(function* () {
-      const settled = yield* Deferred.make<void>()
-      turn.subscription.settled.set(id, settled)
-      yield* Queue.offer(
-        turn.subscription.askQueue,
-        Effect.uninterruptibleMask((restore) =>
-          // The race starts racers in order and stops once one is done, so an earlier cancel never starts the ask.
-          restore(
-            Deferred.await(turn.cancelled).pipe(
-              Effect.as(fallback),
-              Effect.raceFirst(Deferred.await(settled).pipe(Effect.as("settled" as const))),
-              Effect.raceFirst(ask),
-            ),
-          ).pipe(
-            Effect.tapCauseIf(Cause.hasDies, (cause) => Effect.logWarning("ACP ask failed", cause)),
-            Effect.catchCause(() => Effect.succeed(fallback)),
-            Effect.flatMap((outcome) => (outcome === "settled" ? Effect.void : respond(outcome))),
-          ),
-        ).pipe(Effect.withSpan("cli.acp.turn.ask")),
-      )
-    })
+    ACPPermission.reply(
+      {
+        client: input.client,
+        connection: input.connection,
+        event: ask.event,
+        sessionID: ask.event.data.sessionID,
+        clientSessionID: ctx.sessionID,
+        cwd: ctx.cwd,
+        tool: ask.tool,
+        child: ask.child,
+        settled: Deferred.await(settled),
+      },
+      Deferred.await(subscription.cancelled),
+    )
 
-  const interpret = (turn: Turn, output: ACPTranslate.Output) => {
+  const interpret = (subscription: Subscription, ctx: ACPTranslate.Context, output: ACPTranslate.Output) => {
     switch (output._tag) {
       case "SessionUpdate":
-        if (turn.background) return Effect.void
-        return input.connection.sessionUpdate({ sessionId: turn.ctx.sessionID, update: output.update })
+        return input.connection.sessionUpdate({ sessionId: ctx.sessionID, update: output.update })
       case "ChildUpdate":
         return input.connection
           .extNotification(ACPChild.UpdateMethod, output.update)
@@ -146,79 +147,65 @@ export const make = Effect.fnUntraced(function* (input: {
                 : Effect.logWarning("ACP child session update failed", cause),
             ),
           )
-      case "PermissionAsk": {
-        const permission = {
-          client: input.client,
-          connection: input.connection,
-          event: output.event,
-          sessionID: output.event.data.sessionID,
-          clientSessionID: turn.ctx.sessionID,
-          cwd: turn.ctx.cwd,
-          tool: output.tool,
-          child: output.child,
-        }
-        return queueAsk(turn, output.event.data.id, ACPPermission.ask(permission), "reject", (decision) =>
-          ACPPermission.respond(permission, decision),
-        )
-      }
+      case "PermissionAsk":
+        return Effect.gen(function* () {
+          const settled = yield* Deferred.make<void>()
+          subscription.settled.set(output.event.data.id, settled)
+          yield* Queue.offer(subscription.asks, reply(subscription, ctx, output, settled))
+        })
       case "FormAsk":
         return Effect.gen(function* () {
           const capabilities = yield* Ref.get(input.capabilities)
           const requestedSchema = ACPElicitation.requestedSchema(output.form, capabilities)
           if (!requestedSchema) return yield* ACPElicitation.cancelUnshown(input.client, output.form)
-          const elicitation = {
-            client: input.client,
-            connection: input.connection,
-            form: output.form,
-            requestedSchema,
-            clientSessionID: turn.ctx.sessionID,
-            child: output.child,
-            toolCallSent: !turn.background && (!output.child || !turn.ctx.childUpdates),
-          }
-          yield* queueAsk(turn, output.form.id, ACPElicitation.ask(elicitation), "cancel", (outcome) =>
-            ACPElicitation.respond(elicitation, outcome),
+          const settled = yield* Deferred.make<void>()
+          subscription.settled.set(output.form.id, settled)
+          yield* Queue.offer(
+            subscription.asks,
+            ACPElicitation.reply(
+              {
+                client: input.client,
+                connection: input.connection,
+                form: output.form,
+                requestedSchema,
+                clientSessionID: ctx.sessionID,
+                child: output.child,
+                toolCallSent: output.toolCallSent,
+                settled: Deferred.await(settled),
+              },
+              Deferred.await(subscription.cancelled),
+            ),
           )
         })
       case "AskSettled":
         return Effect.suspend(() => {
-          const settled = turn.subscription.settled.get(output.id)
-          turn.subscription.settled.delete(output.id)
+          const settled = subscription.settled.get(output.id)
+          subscription.settled.delete(output.id)
           return settled ? Deferred.succeed(settled, undefined) : Effect.void
         })
     }
   }
 
-  const advance = Effect.fnUntraced(function* (turn: Turn) {
-    const event = yield* take(turn.subscription)
-    const folded = yield* Ref.modify(turn.state, (current) => {
-      const next =
-        turn.background && !ACPTranslate.fromTrackedChild(current, event)
-          ? { state: current, outputs: [] }
-          : ACPTranslate.fold(current, event, turn.ctx)
-      return [next, next.state]
-    })
-    yield* Effect.forEach(folded.outputs, (output) => interpret(turn, output), { discard: true })
-    return folded
-  })
-
-  const consume = Effect.fnUntraced(function* (turn: Turn) {
+  const consume = Effect.fnUntraced(function* (
+    subscription: Subscription,
+    ctx: ACPTranslate.Context,
+    state: Ref.Ref<ACPTranslate.TurnState>,
+  ) {
     while (true) {
-      const folded = yield* advance(turn)
-      if (folded.terminal) {
-        yield* asksSettled(turn.subscription)
-        return folded.terminal
+      const event = yield* take(subscription)
+      const next = yield* Ref.modify(state, (current) => {
+        const step = ACPTranslate.step(current, event, ctx)
+        return [step, step.state]
+      })
+      yield* Effect.forEach(next.outputs, (output) => interpret(subscription, ctx, output), { discard: true })
+      if (next.terminal) {
+        yield* asksSettled(subscription)
+        return next.terminal
       }
     }
   })
 
-  const followChildren = Effect.fnUntraced(function* (turn: Turn) {
-    while (true) {
-      const folded = yield* advance(turn)
-      if (folded.state.openChildren.size === 0) return yield* asksSettled(turn.subscription)
-    }
-  })
-
-  const submit = Effect.fnUntraced(function* (attached: Attached, prompt: ACPPrompt.Prepared) {
+  const submit = Effect.fnUntraced(function* (attached: Attached, prompt: PreparedPrompt) {
     const sessionID = attached.id
     if (prompt.synthetic.length > 0) {
       yield* input.client.session
@@ -254,64 +241,80 @@ export const make = Effect.fnUntraced(function* (input: {
   })
 
   const windDown = Effect.fnUntraced(function* (
-    turn: Turn,
+    subscription: Subscription,
+    ctx: ACPTranslate.Context,
+    state: Ref.Ref<ACPTranslate.TurnState>,
     events: Fiber.Fiber<ACPTranslate.Terminal, ACPError.Failure>,
   ) {
-    yield* Deferred.succeed(turn.cancelled, undefined)
+    yield* Deferred.succeed(subscription.cancelled, undefined)
     yield* input.client.session
-      .interrupt({ sessionID: turn.ctx.sessionID })
+      .interrupt({ sessionID: ctx.sessionID })
       .pipe(
         Effect.catchCause((cause) =>
           Cause.hasInterruptsOnly(cause) ? Effect.void : Effect.logWarning("ACP server interrupt failed", cause),
         ),
       )
-    if (!(yield* Ref.get(turn.state)).started) return
+    if (!(yield* Ref.get(state)).started) return
     if (Option.exists(yield* Fiber.await(events).pipe(Effect.timeoutOption(drainTimeout)), Exit.isSuccess)) return
     yield* Fiber.interrupt(events)
-    const abandoned = ACPTranslate.abandon(yield* Ref.get(turn.state), turn.ctx)
-    yield* Ref.set(turn.state, abandoned.state)
-    yield* Effect.forEach(abandoned.outputs, (output) => interpret(turn, output), { discard: true }).pipe(Effect.ignore)
+    const abandoned = ACPTranslate.abandon(yield* Ref.get(state), ctx)
+    yield* Ref.set(state, abandoned.state)
+    yield* Effect.forEach(abandoned.outputs, (output) => interpret(subscription, ctx, output), { discard: true }).pipe(
+      Effect.ignore,
+    )
   })
 
-  const execute = (attached: Attached, prompt: ACPPrompt.Prepared, turn: Turn) =>
-    Effect.gen(function* () {
-      // The feed opens with `server.connected`, so every event the submission causes comes after it.
-      const connected = yield* take(turn.subscription)
-      if (connected.type !== "server.connected")
-        return yield* Effect.die(new Error(`expected server.connected, got ${connected.type}`))
-      const events = yield* consume(turn).pipe(Effect.forkScoped)
-      return yield* Effect.gen(function* () {
-        yield* submit(attached, prompt)
-        if (prompt.command) return "succeeded" as const
-        return yield* Fiber.join(events)
-      }).pipe(Effect.onInterrupt(() => windDown(turn, events)))
-    }).pipe(Effect.scoped)
+  const execute = (
+    attached: Attached,
+    prompt: PreparedPrompt,
+    ctx: ACPTranslate.Context,
+    state: Ref.Ref<ACPTranslate.TurnState>,
+  ) =>
+    Effect.acquireUseRelease(
+      subscribe(),
+      (subscription) =>
+        Effect.gen(function* () {
+          // The feed opens with `server.connected`, so every event the submission causes comes after it.
+          const connected = yield* take(subscription)
+          if (connected.type !== "server.connected")
+            return yield* Effect.die(new Error(`expected server.connected, got ${connected.type}`))
+          const events = yield* consume(subscription, ctx, state).pipe(Effect.forkScoped)
+          return yield* Effect.gen(function* () {
+            yield* submit(attached, prompt)
+            if (prompt.command) return "succeeded" as const
+            return yield* Fiber.join(events)
+          }).pipe(Effect.onInterrupt(() => windDown(subscription, ctx, state, events)))
+        }).pipe(Effect.scoped),
+      (subscription, exit) => handoff(attached, subscription, ctx, state, exit),
+    )
 
   const handoff = Effect.fnUntraced(function* (
     attached: Attached,
-    turn: Turn,
+    subscription: Subscription,
+    ctx: ACPTranslate.Context,
+    state: Ref.Ref<ACPTranslate.TurnState>,
     exit: Exit.Exit<ACPTranslate.Terminal, ACPError.Failure>,
   ) {
-    const close = Scope.close(turn.subscription.scope, Exit.void)
+    const close = Scope.close(subscription.scope, Exit.void)
     if (Exit.isFailure(exit) && !Cause.hasInterruptsOnly(exit.cause)) return yield* close
-    const state = yield* Ref.get(turn.state)
-    if (state.openChildren.size === 0) return yield* close
+    if ((yield* Ref.get(state)).openChildren.size === 0) return yield* close
     // Children outlive a cancelled turn, so their asks still reach the client.
-    const background = followChildren({
-      ...turn,
-      state: yield* Ref.make(state),
-      cancelled: yield* Deferred.make<void>(),
-      background: true,
-    }).pipe(Effect.ignore, Effect.ensuring(close), Effect.withSpan("cli.acp.turn.background"))
+    const cancelled = yield* Deferred.make<void>()
+    const background = consume({ ...subscription, cancelled }, { ...ctx, mode: "background" }, state).pipe(
+      Effect.ignore,
+      Effect.ensuring(close),
+      Effect.withSpan("cli.acp.turn.background"),
+    )
     yield* input.sessions.fork(attached, background).pipe(Effect.catchTag("ACPSessionNotFoundError", () => close))
   })
 
   const settle = Effect.fnUntraced(function* (
     attached: Attached,
-    current: ACPTranslate.TurnState,
+    state: Ref.Ref<ACPTranslate.TurnState>,
     exit: Exit.Exit<ACPTranslate.Terminal, ACPError.Failure>,
   ) {
     if (Exit.isFailure(exit) && !Cause.hasInterrupts(exit.cause)) return yield* Effect.failCause(exit.cause)
+    const current = yield* Ref.get(state)
     const failure = ACPTranslate.failure(current)
     if (failure) return yield* failure
     yield* sendUsageUpdate(attached, current)
@@ -343,31 +346,32 @@ export const make = Effect.fnUntraced(function* (input: {
   )
 
   // Forked uninterruptible: interruption reaches only `execute`, so the fiber still settles with a response.
-  const run = Effect.fn("cli.acp.turn.run")(function* (attached: Attached, prompt: ACPPrompt.Prepared) {
+  const run = Effect.fn("cli.acp.turn.run")(function* (attached: Attached, prompt: PreparedPrompt) {
     const capabilities = yield* Ref.get(input.capabilities)
     const state = yield* Ref.make(ACPTranslate.initial)
-    const exit = yield* Effect.acquireUseRelease(
-      open(
-        {
-          sessionID: attached.id,
-          cwd: attached.cwd,
-          start: prompt.start,
-          childUpdates: capabilities.childSessionUpdates,
-          compaction: capabilities.compaction,
-        },
-        state,
-      ),
-      (turn) => execute(attached, prompt, turn),
-      (turn, exit) => handoff(attached, turn, exit),
-    ).pipe(Effect.interruptible, Effect.exit)
-    return yield* settle(attached, yield* Ref.get(state), exit)
+    const ctx: ACPTranslate.Context = {
+      sessionID: attached.id,
+      cwd: attached.cwd,
+      start: prompt.start,
+      childUpdates: capabilities.childSessionUpdates,
+      compaction: capabilities.compaction,
+      mode: "turn",
+    }
+    const exit = yield* Effect.exit(Effect.interruptible(execute(attached, prompt, ctx, state)))
+    return yield* settle(attached, state, exit)
   })
 
   return {
     prompt: Effect.fnUntraced(function* (params, signal) {
       const attached = yield* input.sessions.require(params.sessionId)
       const catalog = yield* input.catalog.get(attached.cwd)
-      const prompt = yield* ACPPrompt.prepare(catalog, params.prompt)
+      if (params.prompt.some((block) => block.type === "image" && !block.data && !block.uri)) {
+        return yield* new ACPError.InvalidRequestError({ message: "image content has no data or uri", field: "prompt" })
+      }
+      const parts = yield* Effect.forEach(promptContentToParts(params.prompt), referenceUnreadableFile, {
+        concurrency: "unbounded",
+      })
+      const prompt = preparePrompt(catalog, parts, SessionMessage.ID.create())
       // Synchronous, so concurrent prompts for one session cannot both register.
       const turn = yield* Effect.withFiber((fiber) => {
         if (FiberMap.hasUnsafe(turns, attached.id)) {
@@ -409,4 +413,40 @@ function aborted(signal: AbortSignal) {
   })
 }
 
+function preparePrompt(catalog: Catalog, parts: readonly PromptPart[], messageID: SessionMessage.ID): PreparedPrompt {
+  const visible = parts.filter((part) => part.type !== "text" || (!part.synthetic && !part.ignored))
+  const synthetic = parts.flatMap((part) => (part.type === "text" && part.synthetic ? [part.text] : []))
+  const text = visible.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n")
+  const files = visible.flatMap((part) => (part.type === "file" ? [{ uri: part.url, name: part.filename }] : []))
+  const slash = detectSlashCommand(text)
+  const command = slash ? catalog.commands.find((item) => item.name === slash.name) : undefined
+  return {
+    start:
+      slash && builtinCommands.get(slash.name)?.start === "compaction"
+        ? { type: "compaction", id: messageID }
+        : { type: "input", id: messageID },
+    text,
+    files,
+    synthetic,
+    slash,
+    command,
+  }
+}
+
+function referenceUnreadableFile(part: PromptPart) {
+  if (part.type !== "file" || !part.url.startsWith("file://")) return Effect.succeed(part)
+  return Effect.tryPromise(() => access(fileURLToPath(part.url), constants.R_OK)).pipe(
+    Effect.as(part),
+    Effect.orElseSucceed(() => linkReference(part.filename, part.url)),
+  )
+}
+
+function detectSlashCommand(text: string) {
+  const value = text.trim()
+  if (!value.startsWith("/")) return undefined
+  const [name, ...rest] = value.slice(1).split(/\s+/)
+  if (!name) return undefined
+  return { name, args: rest.join(" ").trim() }
+}
+
 export * as ACPTurn from "./turn"

packages/cli/src/server-process.ts

@@ -1,13 +1,13 @@
 export * as ServerProcess from "./server-process"
 
 import { NodeServices } from "@effect/platform-node"
-import { Service } from "@opencode/client/effect/service"
+import { Service, type DiscoverOptions } from "@opencode/client/effect/service"
 import { LayerNode } from "@opencode/util/effect/layer-node"
 import { Global } from "@opencode/util/global"
 import { OPENCODE_ARTIFACT, OPENCODE_CHANNEL, OPENCODE_VERSION } from "./version"
 import { AppProcess } from "@opencode/util/process"
 import { randomBytes, randomUUID } from "node:crypto"
-import { Effect, Option, Redacted, Schema } from "effect"
+import { Effect, Option, Redacted, Schedule, Schema } from "effect"
 import { PersistentPty } from "@opencode/schema/persistent-pty"
 import { HttpServer } from "effect/unstable/http"
 import { Env } from "./env"
@@ -64,11 +64,11 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
       const config = options.mode === "service" ? yield* ServiceConfig.read() : {}
       const hostname = options.hostname ?? config.hostname ?? "127.0.0.1"
       const port = options.port ?? config.port ?? (options.mode === "service" ? ServiceConfig.defaultPort() : undefined)
-      const findIncumbent =
+      const incumbent =
         serviceOptions !== undefined && port !== undefined
-          ? Service.incumbent({ ...serviceOptions, url: serviceURL(hostname, port) })
+          ? yield* Service.incumbent({ ...serviceOptions, url: serviceURL(hostname, port) })
           : undefined
-      if (findIncumbent !== undefined && (yield* findIncumbent) !== undefined) return
+      if (incumbent !== undefined) return
       // Keep a package-manager or curl install replaceable while the service runs; Desktop updates its own copy.
       if (options.mode === "service" && process.platform === "win32" && RetainedImage.installed(global.home))
         yield* RetainedImage.retain(global.cache, "service")
@@ -88,7 +88,7 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
       if (!password) return yield* Effect.fail(new Error("Missing server password"))
       const instanceID = randomUUID()
       const transform = yield* WebUi.handler()
-      const launch = start(
+      const server = yield* start(
         {
           app: {
             name: process.env.OPENCODE_CLIENT ?? OPENCODE_ARTIFACT,
@@ -144,29 +144,22 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
                 }),
             },
         transform,
-      )
-      const server = yield* launch.pipe(
+      ).pipe(
         Effect.catch((error) => {
-          if (findIncumbent === undefined || !addressInUse(error)) return Effect.fail(error)
-          return Effect.gen(function* () {
-            const deadline = Date.now() + 15_000
-            while (Date.now() < deadline) {
-              const found = yield* findIncumbent.pipe(Effect.timeoutOption(deadline - Date.now()))
-              if (Option.isSome(found) && found.value !== undefined) return
-              yield* Effect.sleep("100 millis")
-              if (Date.now() >= deadline) break
-              // Failed binds close their scope; a successful bind may take longer than this window to boot.
-              const server = yield* launch.pipe(Effect.catchIf(addressInUse, () => Effect.void))
-              if (server !== undefined) return server
-            }
-            return yield* Effect.fail(
-              new Error(
-                `Managed service port ${port} on ${hostname} is already in use by another process. ` +
-                  "Configure another port with `opencode service set port <port>` and start the service again.",
-                { cause: error },
-              ),
-            )
-          })
+          if (serviceOptions === undefined || port === undefined || !addressInUse(error)) return Effect.fail(error)
+          return recognizeIncumbent(serviceOptions, hostname, port).pipe(
+            Effect.flatMap((found) =>
+              found
+                ? Effect.void
+                : Effect.fail(
+                    new Error(
+                      `Managed service port ${port} on ${hostname} is already in use by another process. ` +
+                        "Configure another port with `opencode service set port <port>` and start the service again.",
+                      { cause: error },
+                    ),
+                  ),
+            ),
+          )
         }),
       )
       if (server === undefined) return
@@ -182,6 +175,15 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
   )
 })
 
+const recognizeIncumbent = Effect.fnUntraced(function* (options: DiscoverOptions, hostname: string, port: number) {
+  const found = yield* Service.incumbent({ ...options, url: serviceURL(hostname, port) }).pipe(
+    Effect.filterOrFail((value) => value !== undefined),
+    Effect.retry(Schedule.spaced("100 millis")),
+    Effect.timeoutOption("15 seconds"),
+  )
+  return Option.isSome(found)
+})
+
 function serviceURL(hostname: string, port: number) {
   return `http://${hostname.includes(":") ? `[${hostname}]` : hostname}:${port}`
 }

packages/cli/src/services/web-ui.ts

@@ -58,10 +58,8 @@ function isRouteNotFound(error: unknown) {
   return error instanceof HttpServerError.HttpServerError && error.reason._tag === "RouteNotFound"
 }
 
-// qr-scanner decodes in a worker it creates from a blob: URL whenever the browser has no BarcodeDetector (Safari, desktop
-// Chrome on Windows and Linux). Without worker-src that worker falls under script-src 'self' and never starts.
 function csp(hash = "") {
-  return `default-src 'self'; script-src 'self' 'wasm-unsafe-eval'${hash ? ` 'sha256-${hash}'` : ""}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https: blob:; font-src 'self' data:; media-src 'self' data:; connect-src * data: blob:; worker-src 'self' blob:`
+  return `default-src 'self'; script-src 'self' 'wasm-unsafe-eval'${hash ? ` 'sha256-${hash}'` : ""}; style-src 'self' 'unsafe-inline'; img-src 'self' data: https: blob:; font-src 'self' data:; media-src 'self' data:; connect-src * data: blob:`
 }
 
 function cspForHtml(body: string) {

packages/cli/test/acp/config-option.test.ts

@@ -1,41 +1,21 @@
 import { describe, expect, test } from "bun:test"
-import { Agent } from "@opencode/schema/agent"
-import { Model } from "@opencode/schema/model"
-import { Provider } from "@opencode/schema/provider"
-import type { Catalog } from "../../src/acp/catalog"
-import { configOptions, parseModelSelection } from "../../src/acp/config-option"
+import { buildEffortSelectOption, parseModelSelection, type ConfigOptionProvider } from "../../src/acp/config-option"
 
-const model = (providerID: string, id: string, name: string, variants: string[] = []) => ({
-  ...Model.Info.default(Provider.ID.make(providerID), Model.ID.make(id)),
-  name,
-  variants: variants.map((variant) => ({ id: Model.VariantID.make(variant) })),
-})
-
-const catalog: Catalog = {
-  models: [
-    model("anthropic", "claude/sonnet-4", "Claude Sonnet 4", ["default", "high", "very-high"]),
-    model("anthropic", "claude-haiku", "Claude Haiku"),
-    model("openai", "gpt-5", "GPT-5", ["minimal", "low"]),
-    model("test", "effort", "Effort", ["low", "default", "high"]),
-  ],
-  defaultModel: { providerID: Provider.ID.make("openai"), id: Model.ID.make("gpt-5") },
-  modes: [{ id: Agent.ID.make("build"), name: "Build" }],
-  defaultModeID: Agent.ID.make("build"),
-  commands: [],
-}
-
-const effortOption = (providerID: string, id: string) =>
-  configOptions(catalog, {
-    model: {
-      providerID: Provider.ID.make(providerID),
-      id: Model.ID.make(id),
-      variant: Model.VariantID.make("missing"),
-    },
-  }).find((option) => option.id === "effort")
+const providers: ConfigOptionProvider[] = [
+  {
+    id: "anthropic",
+    name: "Anthropic",
+    models: [
+      { id: "claude/sonnet-4", name: "Claude Sonnet 4", variants: ["default", "high", "very-high"] },
+      { id: "claude-haiku", name: "Claude Haiku" },
+    ],
+  },
+  { id: "openai", name: "OpenAI", models: [{ id: "gpt-5", name: "GPT-5", variants: ["minimal", "low"] }] },
+]
 
 describe("acp config options", () => {
   test("builds effort option from variants and falls back to default when current variant is invalid", () => {
-    expect(effortOption("test", "effort")).toEqual({
+    expect(buildEffortSelectOption({ variants: ["low", "default", "high"], currentVariant: "missing" })).toEqual({
       id: "effort",
       name: "Effort",
       description: "Available effort levels for this model",
@@ -48,29 +28,21 @@ describe("acp config options", () => {
         { value: "high", name: "High" },
       ],
     })
-    expect(effortOption("openai", "gpt-5")?.currentValue).toBe("minimal")
+    expect(buildEffortSelectOption({ variants: ["minimal", "low"], currentVariant: "missing" }).currentValue).toBe(
+      "minimal",
+    )
   })
 
   test.each([
-    ["openai/gpt-5", { providerID: Provider.ID.openai, id: Model.ID.make("gpt-5") }],
-    [
-      "openai/gpt-5/low",
-      { providerID: Provider.ID.openai, id: Model.ID.make("gpt-5"), variant: Model.VariantID.make("low") },
-    ],
-    ["anthropic/claude/sonnet-4", { providerID: Provider.ID.anthropic, id: Model.ID.make("claude/sonnet-4") }],
+    ["openai/gpt-5", { model: { providerID: "openai", modelID: "gpt-5" } }],
+    ["openai/gpt-5/low", { model: { providerID: "openai", modelID: "gpt-5" }, variant: "low" }],
+    ["anthropic/claude/sonnet-4", { model: { providerID: "anthropic", modelID: "claude/sonnet-4" } }],
     [
       "anthropic/claude/sonnet-4/high",
-      {
-        providerID: Provider.ID.anthropic,
-        id: Model.ID.make("claude/sonnet-4"),
-        variant: Model.VariantID.make("high"),
-      },
-    ],
-    [
-      "anthropic/claude/sonnet-4/missing",
-      { providerID: Provider.ID.anthropic, id: Model.ID.make("claude/sonnet-4/missing") },
+      { model: { providerID: "anthropic", modelID: "claude/sonnet-4" }, variant: "high" },
     ],
+    ["anthropic/claude/sonnet-4/missing", { model: { providerID: "anthropic", modelID: "claude/sonnet-4/missing" } }],
   ])("parses the model selection %s, preferring exact slash-containing model ids", (value, expected) => {
-    expect(parseModelSelection(value, catalog.models)).toEqual(expected)
+    expect(parseModelSelection(value, providers)).toEqual(expected)
   })
 })

packages/cli/test/acp/translate.test.ts

@@ -13,6 +13,7 @@ import {
   durableEvent,
   ephemeralEvent,
   failed,
+  interrupted,
   reasoningDelta,
   stepEnded,
   succeeded,
@@ -25,12 +26,13 @@ import {
 } from "./wire-fixture"
 
 const root = Session.ID.make("ses_root")
-const ctx: ACPTranslate.TurnContext = {
+const ctx: ACPTranslate.Context = {
   sessionID: root,
   cwd: "/workspace",
   start: { type: "input", id: SessionMessage.ID.make("msg_input") },
   childUpdates: false,
   compaction: false,
+  mode: "turn",
 }
 const decodeEvent = Schema.decodeUnknownSync(OpenCodeEvent)
 const decodeMessage = Schema.decodeUnknownSync(SessionMessage.Info)
@@ -69,7 +71,7 @@ const compactionMessage = (input: Record<string, unknown>) => ({
 
 type Row = {
   readonly name: string
-  readonly ctx?: Partial<ACPTranslate.TurnContext>
+  readonly ctx?: Partial<ACPTranslate.Context>
   readonly events?: OpenCodeEventEncoded[]
   readonly messages?: unknown[]
   readonly expected: object
@@ -599,6 +601,23 @@ describe("acp turn translation", () => {
   test.each(rows)("$name", (row) => {
     expect(translate(row)).toMatchObject(row.expected)
   })
+
+  test("ends a background consumer when its last open child settles, without session updates", () => {
+    const turn = run(live(childCreated("ses_a", root, "A"), childCreated("ses_b", root, "B"), succeeded(root)))
+    const background = { ...ctx, mode: "background" as const }
+    const first = run(
+      [textDelta(root, "msg_root", "ignored"), toolStarted("ses_a", "call_1", "read"), succeeded("ses_a")],
+      background,
+      turn.state,
+    )
+    const last = run([childCreated("ses_later", root, "Later"), interrupted("ses_b")], background, first.state)
+
+    expect(turn.terminal).toBe("succeeded")
+    expect(first.outputs).toEqual([])
+    expect(first.terminal).toBeUndefined()
+    expect(last.state.children.has("ses_later")).toBe(false)
+    expect(last.terminal).toBe("interrupted")
+  })
 })
 
 function translate(row: Row) {
@@ -627,21 +646,21 @@ function translate(row: Row) {
   }
 }
 
-function run(events: ReadonlyArray<OpenCodeEventEncoded>, context = ctx) {
+function run(events: ReadonlyArray<OpenCodeEventEncoded>, context = ctx, state = ACPTranslate.initial) {
   return events.reduce<{
     state: ACPTranslate.TurnState
     outputs: ACPTranslate.Output[]
     terminal?: ACPTranslate.Terminal
   }>(
     (acc, event, index) => {
-      const next = ACPTranslate.fold(acc.state, decodeEvent({ ...event, id: `evt_${index + 1}` }), context)
+      const next = ACPTranslate.step(acc.state, decodeEvent({ ...event, id: `evt_${index + 1}` }), context)
       return {
         state: next.state,
         outputs: [...acc.outputs, ...next.outputs],
         ...(next.terminal ? { terminal: next.terminal } : {}),
       }
     },
-    { state: ACPTranslate.initial, outputs: [] },
+    { state, outputs: [] },
   )
 }
 

packages/cli/test/acp/turn.test.ts

@@ -9,7 +9,6 @@ import {
   permissionAsked,
   startSession,
   succeeded,
-  textDelta,
   toolCalled,
   toolStarted,
   toolSucceeded,
@@ -59,8 +58,6 @@ describe("acp turn events over the wire", () => {
         { childSessionId: "ses_background", type: "status", status: "created" },
         { childSessionId: "ses_child", type: "status", status: "completed" },
         { childSessionId: "ses_background", type: "status", status: "running" },
-        { childSessionId: "ses_background", type: "update", update: { sessionUpdate: "agent_message_chunk" } },
-        { childSessionId: "ses_background", type: "status", status: "completed" },
       ],
     },
   ])(
@@ -69,43 +66,35 @@ describe("acp turn events over the wire", () => {
       await using acp = await startSession({
         capabilities: { childSessionUpdates: row.childSessionUpdates },
         onPrompt: ({ sessionID, id }) =>
-          acp.server.prompts.length > 1
-            ? turn(sessionID, id)
-            : turn(
-                sessionID,
-                id,
-                childCreated("ses_child", sessionID, "Explore code"),
-                durableEvent("session.execution.started", { sessionID: "ses_child" }),
-                childCreated("ses_grandchild", "ses_child", "Deeper"),
-                toolStarted("ses_grandchild", "call_read", "read"),
-                toolCalled("ses_grandchild", "call_read", { path: "/workspace/src/index.ts" }),
-                permissionAsked("ses_grandchild", "perm_child", {
-                  action: "read",
-                  source: { type: "tool", messageID: "msg_child", id: "call_read" },
-                }),
-                toolSucceeded("ses_grandchild", "call_read", {}, "source"),
-                succeeded("ses_grandchild"),
-                childCreated("ses_background", sessionID, "Research"),
-                succeeded("ses_child"),
-              ),
+          turn(
+            sessionID,
+            id,
+            childCreated("ses_child", sessionID, "Explore code"),
+            durableEvent("session.execution.started", { sessionID: "ses_child" }),
+            childCreated("ses_grandchild", "ses_child", "Deeper"),
+            toolStarted("ses_grandchild", "call_read", "read"),
+            toolCalled("ses_grandchild", "call_read", { path: "/workspace/src/index.ts" }),
+            permissionAsked("ses_grandchild", "perm_child", {
+              action: "read",
+              source: { type: "tool", messageID: "msg_child", id: "call_read" },
+            }),
+            toolSucceeded("ses_grandchild", "call_read", {}, "source"),
+            succeeded("ses_grandchild"),
+            childCreated("ses_background", sessionID, "Research"),
+            succeeded("ses_child"),
+          ),
         permission: () => ({ outcome: { outcome: "selected", optionId: "once" } }),
       })
 
       expect((await acp.prompt(acp.sessionId, "hello")).stopReason).toBe("end_turn")
-      const responded = turnUpdates(acp.updates).length
       acp.server.send(
         durableEvent("session.execution.started", { sessionID: "ses_background" }),
         permissionAsked("ses_background", "perm_background", {
           action: "read",
           metadata: { path: "/workspace/notes.md" },
         }),
-        textDelta("ses_background", "msg_background", "late"),
-        succeeded("ses_background"),
-        permissionAsked("ses_background", "perm_after_end", { action: "read" }),
       )
       await acp.until(() => acp.server.replies.length === 2, "child permission replies")
-      expect(turnUpdates(acp.updates).slice(responded)).toEqual([])
-      expect((await acp.prompt(acp.sessionId, "again")).stopReason).toBe("end_turn")
 
       expect(turnUpdates(acp.updates).map((item) => item.update)).toMatchObject(row.parent)
       expect(acp.childUpdates).toMatchObject(row.child)

packages/cli/test/service.test.ts

@@ -3,7 +3,7 @@ import { Service, type Info } from "@opencode/client/effect/service"
 import { Global } from "@opencode/util/global"
 import { OPENCODE_VERSION } from "../src/version"
 import { expect, test } from "bun:test"
-import { Effect, FileSystem, Schedule, Schema } from "effect"
+import { Effect, FileSystem, Schema } from "effect"
 import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
@@ -403,77 +403,6 @@ test("unrelated managed port occupancy reports an actionable conflict", async ()
   }
 }, 30_000)
 
-test("the original managed service contender binds when the occupied port is released", async () => {
-  const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-service-bind-retry-"))
-  const recognizing = Promise.withResolvers<void>()
-  const requests: string[] = []
-  using listener = Bun.serve({
-    hostname: "127.0.0.1",
-    port: 0,
-    fetch(request) {
-      requests.push(new URL(request.url).pathname)
-      if (requests.length === 2) recognizing.resolve()
-      return Response.json({ unrelated: true })
-    },
-  })
-  const port = listener.port
-  if (port === undefined) throw new Error("Server did not bind a port")
-  const registration = path.join(root, "state", "opencode", "service-local.json")
-  await fs.mkdir(path.join(root, "config"), { recursive: true })
-  await fs.mkdir(path.dirname(registration), { recursive: true })
-  await fs.writeFile(path.join(root, "config", "service-local.json"), JSON.stringify({ port }))
-  await fs.writeFile(
-    registration,
-    JSON.stringify({
-      id: "stale",
-      version: OPENCODE_VERSION,
-      url: "http://127.0.0.1:1",
-      pid: 2_147_483_647,
-      password: "stale",
-    }),
-  )
-  const contender = Bun.spawn([process.execPath, path.join(import.meta.dir, "../src/index.ts"), "serve", "--service"], {
-    env: isolatedEnv(root),
-    stderr: "pipe",
-    stdout: "ignore",
-  })
-  const stderr = new Response(contender.stderr).text()
-  try {
-    // The first probe is preflight; the second only happens after start() fails to bind.
-    expect(await Promise.race([recognizing.promise.then(() => true), Bun.sleep(20_000).then(() => false)])).toBe(true)
-    expect(requests).toEqual(["/api/info", "/api/info"])
-    await listener.stop(true)
-
-    const info = await Promise.race([
-      waitForInfo(registration, (info) => info.pid === contender.pid),
-      contender.exited.then(() => undefined),
-    ])
-    expect(info?.pid, contender.exitCode === null ? undefined : await stderr).toBe(contender.pid)
-    const endpoint = await Effect.runPromise(
-      Service.discover({ file: registration }).pipe(
-        Effect.filterOrFail((value) => value !== undefined),
-        Effect.retry({ times: 400, schedule: Schedule.spaced("50 millis") }),
-        Effect.provide(NodeFileSystem.layer),
-      ),
-    )
-    expect(new URL(endpoint.url).port).toBe(String(port))
-    expect(
-      await fetch(new URL("/api/info", endpoint.url), { headers: Service.headers(endpoint) }).then((response) =>
-        response.json(),
-      ),
-    ).toMatchObject({ pid: contender.pid, version: OPENCODE_VERSION, urls: [endpoint.url] })
-    expect(contender.exitCode).toBe(null)
-    await Effect.runPromise(Service.stop({ file: registration }).pipe(Effect.provide(NodeFileSystem.layer)))
-    expect(await waitForExit(contender)).toBe(true)
-    expect(await Bun.file(registration).exists()).toBe(false)
-    await expectPortAvailable(port)
-  } finally {
-    contender.kill("SIGTERM")
-    await contender.exited
-    await fs.rm(root, { recursive: true, force: true })
-  }
-}, 45_000)
-
 test("unresponsive managed port occupancy reports a bounded conflict", async () => {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-service-unresponsive-conflict-"))
   const recognizing = Promise.withResolvers<void>()

packages/cli/test/web-ui.test.ts

@@ -171,7 +171,6 @@ describe("web UI", () => {
           expect(yield* Effect.promise(() => fallback.text())).toContain("embedded")
           expect(fallback.headers.get("content-security-policy")).toContain("default-src 'self'")
           expect(fallback.headers.get("content-security-policy")).toContain("connect-src * data: blob:")
-          expect(fallback.headers.get("content-security-policy")).toContain("worker-src 'self' blob:")
 
           const dotted = yield* Effect.promise(() => fetch(`${origin}/workspace/example.js`))
           expect(dotted.status).toBe(200)

packages/client/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/client",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "type": "module",
   "license": "MIT",
   "repository": {

packages/client/src/effect/service.ts

@@ -1,5 +1,7 @@
 import { Effect, FileSystem, Option, Schedule, Schema } from "effect"
-import type { DiscoverOptions, EnsureOptions, StopOptions } from "../service.js"
+import { homedir } from "node:os"
+import { join } from "node:path"
+import type { DiscoverOptions, Endpoint, EnsureOptions, StopOptions } from "../service.js"
 import {
   contenderFailure,
   contenderFinished,
@@ -9,10 +11,8 @@ import {
 import { defaultEnsureTiming, ensureTiming, type EnsureTiming } from "../service-timing.js"
 import { matchesVersion } from "../service-version.js"
 import { PtyHandoff } from "../pty-handoff.js"
-import { fallback, headers, type LocalService, probeResult, same } from "../service-probe.js"
 
 export * from "../service.js"
-export { headers }
 /** Contents of the local service registration file. */
 export type Info = import("../service.js").Info
 
@@ -40,9 +40,9 @@ export const incumbent = Effect.fn("service.incumbent")(function* (
   options: DiscoverOptions & { readonly url: string },
 ) {
   const info = yield* read(options.file)
-  if (info === undefined) return undefined
-  const found = (yield* Effect.promise(() => probeResult({ ...info, url: options.url }))).service
-  if (!found?.compatible) return undefined
+  const found = info === undefined ? undefined : yield* probe({ ...info, url: options.url })
+  if (found === undefined) return undefined
+  if (!found.compatible) return undefined
   if (!matchesVersion(found.version, options)) return undefined
   return { endpoint: found.endpoint, state: found.state }
 })
@@ -58,7 +58,6 @@ export const ensure = Effect.fn("service.ensure")(function* (options: EnsureOpti
   let announced = false
   let lastSpawn = 0
   let spawnDelay = timing.spawnDelay
-  let failure: Error | undefined
   const announce = (reason: "missing" | "version-mismatch", previousVersion?: string) =>
     Effect.sync(() => {
       if (announced) return
@@ -90,13 +89,6 @@ export const ensure = Effect.fn("service.ensure")(function* (options: EnsureOpti
         yield* Effect.logWarning("Background service is unresponsive; recovery cannot preserve persistent terminals")
         yield* Effect.tryPromise(() => PtyHandoff.clear(options.file ?? fallback()))
         yield* terminate(info, options, timing)
-        for (const item of contenders) {
-          if (item.child.pid === info.pid || contenderFinished(item)) {
-            item.release()
-            contenders.delete(item)
-          }
-        }
-        failure = undefined
         timeouts = undefined
         lastSpawn = Date.now() - spawnDelay
       }
@@ -125,27 +117,19 @@ export const ensure = Effect.fn("service.ensure")(function* (options: EnsureOpti
         file: options.file,
         pty: service.state === "ready" ? "handoff" : "clear",
       }).pipe(Effect.ignore)
-      for (const item of contenders) {
-        if (item.child.pid === service.info.pid || contenderFinished(item)) {
-          item.release()
-          contenders.delete(item)
-        }
-      }
-      failure = undefined
       lastSpawn = 0
       return Option.none<LocalService>()
     } else if (lastSpawn === 0 && info !== undefined) lastSpawn = Date.now()
 
     const finished = [...contenders].filter(contenderFinished)
-    failure ??= finished.map(contenderFailure).find((error): error is Error => error !== undefined)
+    const failure = finished.map(contenderFailure).find((error): error is Error => error !== undefined)
     if (finished.some((item) => item.child.exitCode === 0)) {
       spawnDelay = Math.min(spawnDelay * 2, timing.maxSpawnDelay)
     }
     finished.forEach((item) => contenders.delete(item))
     if (failure !== undefined && contenders.size === 0) return yield* Effect.fail(failure)
-    // Keep one candidate plus one lock probe for pre-lock stalls. After a failure, let the
-    // survivors finish without recruiting replacements that could hide the error indefinitely.
-    if (failure === undefined && contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
+    // Keep one candidate plus one lock probe so a pre-lock stall cannot block recovery.
+    if (contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
       yield* announce("missing")
       contenders.add(yield* spawnContender)
       lastSpawn = Date.now()
@@ -161,7 +145,7 @@ export const ensure = Effect.fn("service.ensure")(function* (options: EnsureOpti
     Effect.ensuring(Effect.sync(() => contenders.forEach((contender) => contender.release()))),
   )
   if (Option.isNone(found))
-    return yield* Effect.fail(failure ?? new Error("Timed out waiting for the background service to start"))
+    return yield* Effect.fail(new Error("Timed out waiting for the background service to start"))
   return found.value.endpoint
 })
 
@@ -177,6 +161,17 @@ export const stop = Effect.fn("service.stop")(function* (options: StopOptions =
   if (info !== undefined) yield* terminate(info, options, ensureTiming(options))
 })
 
+function fallback() {
+  const state = process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state")
+  return join(state, "opencode", "service.json")
+}
+
+/** Create HTTP authentication headers for a service endpoint. */
+export function headers(endpoint: Endpoint) {
+  if (endpoint.auth === undefined) return undefined
+  return { authorization: "Basic " + btoa(endpoint.auth.username + ":" + endpoint.auth.password) }
+}
+
 /** Schema for the local service registration file. */
 export const Info = Schema.Struct({
   id: Schema.optional(Schema.String),
@@ -187,6 +182,13 @@ export const Info = Schema.Struct({
 })
 
 const decode = Schema.decodeUnknownEffect(Schema.fromJsonString(Info))
+const decodeInfo = Schema.decodeUnknownOption(
+  Schema.Struct({
+    version: Schema.String,
+    pid: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
+  }),
+)
+
 // A missing or corrupt file means no valid info; callers treat both
 // the same (the registering server self-evicts, clients rediscover).
 const read = Effect.fnUntraced(function* (file?: string) {
@@ -196,10 +198,77 @@ const read = Effect.fnUntraced(function* (file?: string) {
   return yield* decode(text.value).pipe(Effect.option, Effect.map(Option.getOrUndefined))
 })
 
+type LocalService = {
+  readonly info: Info
+  readonly endpoint: Endpoint
+  readonly version?: string
+  readonly state: "ready" | "waiting" | "failed"
+  readonly compatible: boolean
+}
+
+const probe = Effect.fnUntraced(function* (info: Info) {
+  return (yield* probeResult(info)).service
+})
+
+const probeResult = Effect.fnUntraced(function* (info: Info, timeout = defaultEnsureTiming.requestTimeout) {
+  const endpoint = {
+    url: info.url,
+    auth:
+      info.password === undefined
+        ? undefined
+        : { type: "basic" as const, username: "opencode", password: info.password },
+  } satisfies Endpoint
+  const signal = AbortSignal.timeout(timeout)
+  const result = yield* Effect.promise(() =>
+    fetch(new URL("/api/info", info.url), { headers: headers(endpoint), signal })
+      .then(async (response) => ({
+        response,
+        body: response.status === 404 ? undefined : ((await response.json()) as unknown),
+      }))
+      .then(
+        (value) => ({ value }),
+        (cause: unknown) => ({ cause }),
+      ),
+  )
+  if ("cause" in result) return { service: undefined, timedOut: signal.aborted }
+  const response = result.value.response
+  // A missing health endpoint identifies protocol incompatibility, not an older
+  // version. Only an unmet version requirement lets ensure replace this owner.
+  if (response.status === 404)
+    return {
+      service: {
+        info,
+        endpoint,
+        version: info.version,
+        state: "ready" as const,
+        compatible: false,
+      } satisfies LocalService,
+      timedOut: false,
+    }
+  const body = result.value.body
+  const serverInfo = decodeInfo(body)
+  if (Option.isSome(serverInfo)) {
+    if (serverInfo.value.pid !== info.pid) return { service: undefined, timedOut: false }
+    if (info.version !== undefined && serverInfo.value.version !== info.version)
+      return { service: undefined, timedOut: false }
+    return {
+      service: {
+        info,
+        endpoint,
+        version: serverInfo.value.version,
+        state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
+        compatible: true,
+      } satisfies LocalService,
+      timedOut: false,
+    }
+  }
+  return { service: undefined, timedOut: false }
+})
+
 const registered = Effect.fnUntraced(function* (file?: string, timeout?: number) {
   const info = yield* read(file)
   if (info === undefined) return { info: undefined, service: undefined, timedOut: false }
-  return { info, ...(yield* Effect.promise(() => probeResult(info, timeout))) }
+  return { info, ...(yield* probeResult(info, timeout)) }
 })
 
 // 50ms cadence bounded at ~5s, shared by stop escalation and each ensure
@@ -218,6 +287,10 @@ const stopped = Effect.fnUntraced(function* (pid: number) {
   return yield* Effect.fail(new Error(`Server process ${pid} is still running`))
 })
 
+function same(left: Info, right: Info) {
+  return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid
+}
+
 const terminate = Effect.fnUntraced(function* (info: Info, options: { readonly file?: string }, timing: EnsureTiming) {
   const current = yield* read(options.file)
   if (current === undefined || !same(current, info)) return

packages/client/src/promise/service.ts

@@ -1,4 +1,6 @@
 import { readFile, rm } from "node:fs/promises"
+import { homedir } from "node:os"
+import { join } from "node:path"
 import type { DiscoverOptions, Endpoint, Info, EnsureOptions, StopOptions } from "../service.js"
 import {
   contenderFailure,
@@ -9,10 +11,8 @@ import {
 import { defaultEnsureTiming, ensureTiming, type EnsureTiming } from "../service-timing.js"
 import { matchesVersion } from "../service-version.js"
 import { PtyHandoff } from "../pty-handoff.js"
-import { fallback, headers, probeResult, same } from "../service-probe.js"
 
 export * from "../service.js"
-export { headers }
 
 // Find, start, and stop the local opencode background service.
 //
@@ -38,7 +38,6 @@ export async function ensure(options: EnsureOptions = {}): Promise<Endpoint> {
   let announced = false
   let lastSpawn = 0
   let spawnDelay = timing.spawnDelay
-  let failure: Error | undefined
 
   const announce = (reason: "missing" | "version-mismatch", previousVersion?: string) => {
     if (announced) return
@@ -57,7 +56,7 @@ export async function ensure(options: EnsureOptions = {}): Promise<Endpoint> {
 
   try {
     while (true) {
-      if (Date.now() >= deadline) throw failure ?? new Error("Timed out waiting for the background service to start")
+      if (Date.now() >= deadline) throw new Error("Timed out waiting for the background service to start")
       const registration = await registered(options.file, timing.requestTimeout)
       if (registration.timedOut && registration.info !== undefined) {
         timeouts = {
@@ -69,13 +68,6 @@ export async function ensure(options: EnsureOptions = {}): Promise<Endpoint> {
           console.warn("Background service is unresponsive; recovery cannot preserve persistent terminals")
           await PtyHandoff.clear(options.file ?? fallback())
           await terminate(registration.info, options, timing)
-          for (const item of contenders) {
-            if (item.child.pid === registration.info.pid || contenderFinished(item)) {
-              item.release()
-              contenders.delete(item)
-            }
-          }
-          failure = undefined
           timeouts = undefined
           lastSpawn = Date.now() - spawnDelay
         }
@@ -103,27 +95,19 @@ export async function ensure(options: EnsureOptions = {}): Promise<Endpoint> {
             file: options.file,
             pty: service.state === "ready" ? "handoff" : "clear",
           }).catch(() => undefined)
-          for (const item of contenders) {
-            if (item.child.pid === service.info.pid || contenderFinished(item)) {
-              item.release()
-              contenders.delete(item)
-            }
-          }
-          failure = undefined
           lastSpawn = 0
         }
       } else {
         if (lastSpawn === 0 && registration.info !== undefined) lastSpawn = Date.now()
         const finished = [...contenders].filter(contenderFinished)
-        failure ??= finished.map(contenderFailure).find((error) => error !== undefined)
+        const failure = finished.map(contenderFailure).find((error) => error !== undefined)
         if (finished.some((item) => item.child.exitCode === 0)) {
           spawnDelay = Math.min(spawnDelay * 2, timing.maxSpawnDelay)
         }
         finished.forEach((item) => contenders.delete(item))
         if (failure !== undefined && contenders.size === 0) throw failure
-        // Keep one candidate plus one lock probe for pre-lock stalls. After a failure, let the
-        // survivors finish without recruiting replacements that could hide the error indefinitely.
-        if (failure === undefined && contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
+        // Keep one candidate plus one lock probe so a pre-lock stall cannot block recovery.
+        if (contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
           announce("missing")
           contenders.add(await spawnContender())
           lastSpawn = Date.now()
@@ -148,6 +132,18 @@ export async function stop(options: StopOptions = {}) {
   if (info !== undefined) await terminate(info, options, ensureTiming(options))
 }
 
+function fallback() {
+  return join(process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state"), "opencode", "service.json")
+}
+
+/** Create HTTP authentication headers for a service endpoint. */
+export function headers(endpoint: Endpoint) {
+  if (endpoint.auth === undefined) return undefined
+  return {
+    authorization: "Basic " + Buffer.from(endpoint.auth.username + ":" + endpoint.auth.password).toString("base64"),
+  }
+}
+
 async function read(file?: string) {
   const text = await readFile(file ?? fallback(), "utf8").catch(() => undefined)
   if (text === undefined) return undefined
@@ -158,6 +154,73 @@ async function read(file?: string) {
   }
 }
 
+type LocalService = {
+  readonly info: Info
+  readonly endpoint: Endpoint
+  readonly version?: string
+  readonly state: "ready" | "waiting" | "failed"
+  readonly compatible: boolean
+}
+
+async function probeResult(info: Info, timeout = defaultEnsureTiming.requestTimeout) {
+  const endpoint = {
+    url: info.url,
+    auth:
+      info.password === undefined
+        ? undefined
+        : { type: "basic" as const, username: "opencode", password: info.password },
+  } satisfies Endpoint
+  const signal = AbortSignal.timeout(timeout)
+  const result = await fetch(new URL("/api/info", info.url), { headers: headers(endpoint), signal })
+    .then(async (response) => ({
+      response,
+      body: response.status === 404 ? undefined : ((await response.json()) as unknown),
+    }))
+    .then(
+      (value) => ({ value }),
+      (cause: unknown) => ({ cause }),
+    )
+  if ("cause" in result) return { service: undefined, timedOut: signal.aborted }
+  const response = result.value.response
+  // A missing health endpoint identifies protocol incompatibility, not an older
+  // version. Only an unmet version requirement lets ensure replace this owner.
+  if (response.status === 404)
+    return {
+      service: {
+        info,
+        endpoint,
+        version: info.version,
+        state: "ready" as const,
+        compatible: false,
+      } satisfies LocalService,
+      timedOut: false,
+    }
+  const serverInfo = decodeInfo(result.value.body)
+  if (serverInfo !== undefined) {
+    if (serverInfo.pid !== info.pid) return { service: undefined, timedOut: false }
+    if (info.version !== undefined && serverInfo.version !== info.version)
+      return { service: undefined, timedOut: false }
+    return {
+      service: {
+        info,
+        endpoint,
+        version: serverInfo.version,
+        state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
+        compatible: true,
+      } satisfies LocalService,
+      timedOut: false,
+    }
+  }
+  return { service: undefined, timedOut: false }
+}
+
+function decodeInfo(input: unknown) {
+  if (typeof input !== "object" || input === null) return
+  if (!("version" in input) || typeof input.version !== "string") return
+  if (!("pid" in input) || typeof input.pid !== "number" || !Number.isInteger(input.pid) || input.pid < 0) return
+  return { version: input.version, pid: input.pid }
+}
+
 async function registered(file?: string, timeout?: number) {
   const info = await read(file)
   if (info === undefined) return { info: undefined, service: undefined, timedOut: false }
@@ -187,6 +250,10 @@ async function waitUntilStopped(pid: number, timing: EnsureTiming) {
   return false
 }
 
+function same(left: Info, right: Info) {
+  return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid
+}
+
 async function terminate(info: Info, options: { readonly file?: string }, timing: EnsureTiming) {
   const current = await read(options.file)
   if (current === undefined || !same(current, info)) return

packages/client/src/service-probe.ts

@@ -1,84 +0,0 @@
-import { homedir } from "node:os"
-import { join } from "node:path"
-import type { Endpoint, Info } from "./service.js"
-import { defaultEnsureTiming } from "./service-timing.js"
-
-// Shared by the Effect and Promise clients. Keep this module free of Effect so the
-// Promise client never loads the Effect runtime.
-
-export type LocalService = {
-  readonly info: Info
-  readonly endpoint: Endpoint
-  readonly version?: string
-  readonly state: "ready" | "waiting" | "failed"
-  readonly compatible: boolean
-}
-
-/** The default registration file. */
-export function fallback() {
-  return join(process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state"), "opencode", "service.json")
-}
-
-/** Whether two registrations describe the same service instance. */
-export function same(left: Info, right: Info) {
-  return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid
-}
-
-/** Ask a registered owner for its health and classify the answer. */
-export async function probeResult(info: Info, timeout = defaultEnsureTiming.requestTimeout) {
-  const endpoint = {
-    url: info.url,
-    auth: info.password === undefined ? undefined : { type: "basic", username: "opencode", password: info.password },
-  } satisfies Endpoint
-  const signal = AbortSignal.timeout(timeout)
-  const result = await fetch(new URL("/api/info", info.url), { headers: headers(endpoint), signal })
-    .then(async (response) => ({
-      response,
-      body: response.status === 404 ? undefined : ((await response.json()) as unknown),
-    }))
-    .catch(() => undefined)
-  if (result === undefined) return { service: undefined, timedOut: signal.aborted }
-  const response = result.response
-  // A missing health endpoint identifies protocol incompatibility, not an older
-  // version. Only an unmet version requirement lets ensure replace this owner.
-  if (response.status === 404)
-    return {
-      service: {
-        info,
-        endpoint,
-        version: info.version,
-        state: "ready",
-        compatible: false,
-      } satisfies LocalService,
-      timedOut: false,
-    }
-  const serverInfo = decodeInfo(result.body)
-  if (serverInfo === undefined) return { service: undefined, timedOut: false }
-  if (serverInfo.pid !== info.pid) return { service: undefined, timedOut: false }
-  if (info.version !== undefined && serverInfo.version !== info.version) return { service: undefined, timedOut: false }
-  return {
-    service: {
-      info,
-      endpoint,
-      version: serverInfo.version,
-      state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
-      compatible: true,
-    } satisfies LocalService,
-    timedOut: false,
-  }
-}
-
-/** Create HTTP authentication headers for a service endpoint. */
-export function headers(endpoint: Endpoint) {
-  if (endpoint.auth === undefined) return undefined
-  return {
-    authorization: "Basic " + Buffer.from(endpoint.auth.username + ":" + endpoint.auth.password).toString("base64"),
-  }
-}
-
-function decodeInfo(input: unknown) {
-  if (typeof input !== "object" || input === null) return
-  if (!("version" in input) || typeof input.version !== "string") return
-  if (!("pid" in input) || typeof input.pid !== "number" || !Number.isInteger(input.pid) || input.pid < 0) return
-  return { version: input.version, pid: input.pid }
-}

packages/client/test/fixture/service-fixture.ts

@@ -1,4 +1,4 @@
-import { mkdtemp, rename, rm } from "node:fs/promises"
+import { mkdtemp, rm } from "node:fs/promises"
 import { tmpdir } from "node:os"
 import { join } from "node:path"
 import { waitForExit } from "./service-timing"
@@ -8,16 +8,6 @@ export async function serviceFixture() {
   const registration = join(directory, "service.json")
   const processes: Bun.Subprocess[] = []
   const pids = new Set<number>()
-  const starts = async () =>
-    (
-      await Bun.file(registration + ".starts")
-        .text()
-        .catch(() => "")
-    )
-      .trim()
-      .split("\n")
-      .filter(Boolean)
-      .map(Number)
   const command = (mode: string, ...args: string[]) => [
     process.execPath,
     join(import.meta.dir, "service.ts"),
@@ -30,21 +20,6 @@ export async function serviceFixture() {
     directory,
     registration,
     command,
-    starts,
-    async waitForStarts(count: number) {
-      for (let attempt = 0; attempt < 600; attempt++) {
-        const result = await starts()
-        if (result.length >= count) return result
-        await Bun.sleep(5)
-      }
-      throw new Error(`Timed out waiting for ${count} contenders`)
-    },
-    async release(pid: number, action: "fail" | "hang" | "ready") {
-      const file = registration + `.release-${pid}`
-      await Bun.write(file + ".tmp", action)
-      await rename(file + ".tmp", file)
-      if (action === "fail") await waitForExit(pid)
-    },
     spawn(mode: string, ...args: string[]) {
       const subprocess = Bun.spawn(command(mode, ...args), { stdout: "ignore", stderr: "inherit" })
       processes.push(subprocess)
@@ -72,8 +47,6 @@ export async function serviceFixture() {
       throw new Error(`Timed out waiting for ${file}`)
     },
     async [Symbol.asyncDispose]() {
-      // Include detached contenders that never registered, even when an assertion fails.
-      for (const pid of await starts()) pids.add(pid)
       await Promise.all([
         ...processes.map(async (subprocess) => {
           subprocess.kill("SIGTERM")

packages/client/test/fixture/service.ts

@@ -17,18 +17,6 @@ if (mode === "environment") {
 }
 if (mode === "signal") process.kill(process.pid, process.platform === "win32" ? "SIGTERM" : "SIGKILL")
 
-let controlled = ""
-if (mode === "controlled") {
-  await appendFile(registration + ".starts", process.pid + "\n")
-  const release = registration + `.release-${process.pid}`
-  while (!(await Bun.file(release).exists())) await Bun.sleep(5)
-  controlled = await Bun.file(release).text()
-  if (controlled === "fail") {
-    process.stderr.write("actionable startup failure: storage initialization denied\n")
-    process.exit(23)
-  }
-}
-
 if (mode === "delayed" || mode === "delayed-failed" || mode === "coordinated" || mode === "coordinated-failed-loser") {
   await appendFile(registration + ".starts", process.pid + "\n")
   const owner = await writeFile(registration + ".owner", String(process.pid), { flag: "wx" })
@@ -75,7 +63,7 @@ const server = Bun.serve({
       return new Response(null, { status: 404 })
     requests += 1
     if (mode === "starting") await writeFile(registration + ".status-request", "")
-    if (mode === "hanging" || controlled === "hang") {
+    if (mode === "hanging") {
       await appendFile(registration + ".requests", process.pid + "\n")
       return new Promise<Response>(() => {})
     }
@@ -104,10 +92,8 @@ const server = Bun.serve({
 })
 
 // Install handlers before publishing: a test may signal as soon as the registration appears.
-if (controlled !== "hang") {
-  process.on("SIGTERM", () => void shutdown("SIGTERM"))
-  process.on("SIGINT", () => void shutdown("SIGINT"))
-}
+process.on("SIGTERM", () => void shutdown("SIGTERM"))
+process.on("SIGINT", () => void shutdown("SIGINT"))
 
 await writeFile(
   registration + ".tmp",

packages/client/test/promise-service.test.ts

@@ -112,76 +112,6 @@ test("reports a failed registered service", async () => {
   )
 })
 
-test("reports overlapping contender failures without recruiting replacements", async () => {
-  await using fixture = await serviceFixture()
-  const started = Date.now()
-  const pending = ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") }).catch(
-    (error: unknown) => error,
-  )
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(first, "fail")
-  // Let discovery observe the exit across two accelerated spawn windows before the survivor exits.
-  await Bun.sleep(450)
-  await fixture.release(second, "fail")
-  const error = await pending
-
-  expect(Date.now() - started).toBeLessThan(3_000)
-  expect(error).toBeInstanceOf(Error)
-  if (!(error instanceof Error)) throw error
-  expect(error.message).toContain("Server process exited with code 23")
-  expect(error.message).toContain("storage initialization denied")
-  expect(await fixture.starts()).toHaveLength(2)
-})
-
-test("retains a contender failure until the deadline while its survivor stalls", async () => {
-  await using fixture = await serviceFixture()
-  const started = Date.now()
-  const pending = ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") }).catch(
-    (error: unknown) => error,
-  )
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(first, "fail")
-  const error = await pending
-
-  expect(Date.now() - started).toBeGreaterThanOrEqual(3_000)
-  expect(error).toBeInstanceOf(Error)
-  if (!(error instanceof Error)) throw error
-  expect(error.message).toContain("Server process exited with code 23")
-  expect(error.message).toContain("storage initialization denied")
-  expect(await fixture.starts()).toHaveLength(2)
-  expect(() => process.kill(second, 0)).not.toThrow()
-})
-
-test("accepts a surviving contender after a failure without recruiting replacements", async () => {
-  await using fixture = await serviceFixture()
-  const pending = ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") })
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(first, "fail")
-  await Bun.sleep(450)
-  await fixture.release(second, "ready")
-  const endpoint = await pending
-
-  expect((await Service.discover({ file: fixture.registration, version: "test" }))?.url).toBe(endpoint.url)
-  expect((await Bun.file(fixture.registration).json()).pid).toBe(second)
-  expect(await fixture.starts()).toHaveLength(2)
-})
-
-test("recovers when an unresponsive contender is evicted after a prior failure", async () => {
-  await using fixture = await serviceFixture()
-  const pending = ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") })
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(second, "hang")
-  await fixture.waitForFile()
-  await fixture.release(first, "fail")
-  const [, , third] = await fixture.waitForStarts(3)
-  await fixture.release(third, "ready")
-  const endpoint = await pending
-  fixture.track(third)
-
-  expect((await Service.discover({ file: fixture.registration, version: "test" }))?.url).toBe(endpoint.url)
-  expect((await Bun.file(fixture.registration).json()).pid).toBe(third)
-})
-
 test("reports a bounded contender stderr tail with native promises", async () => {
   await using fixture = await serviceFixture()
   const registration = fixture.registration

packages/client/test/service.test.ts

@@ -290,76 +290,6 @@ test("reports a contender that fails to start", async () => {
   ).rejects.toThrow("Server process exited with code 1")
 })
 
-test("reports overlapping contender failures without recruiting replacements", async () => {
-  await using fixture = await serviceFixture()
-  const started = Date.now()
-  const pending = run(
-    ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") }),
-  ).catch((error: unknown) => error)
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(first, "fail")
-  // Let discovery observe the exit across two accelerated spawn windows before the survivor exits.
-  await Bun.sleep(450)
-  await fixture.release(second, "fail")
-  const error = await pending
-
-  expect(Date.now() - started).toBeLessThan(3_000)
-  expect(error).toBeInstanceOf(Error)
-  if (!(error instanceof Error)) throw error
-  expect(error.message).toContain("Server process exited with code 23")
-  expect(error.message).toContain("storage initialization denied")
-  expect(await fixture.starts()).toHaveLength(2)
-})
-
-test("retains a contender failure until the deadline while its survivor stalls", async () => {
-  await using fixture = await serviceFixture()
-  const started = Date.now()
-  const pending = run(
-    ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") }),
-  ).catch((error: unknown) => error)
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(first, "fail")
-  const error = await pending
-
-  expect(Date.now() - started).toBeGreaterThanOrEqual(3_000)
-  expect(error).toBeInstanceOf(Error)
-  if (!(error instanceof Error)) throw error
-  expect(error.message).toContain("Server process exited with code 23")
-  expect(error.message).toContain("storage initialization denied")
-  expect(await fixture.starts()).toHaveLength(2)
-  expect(() => process.kill(second, 0)).not.toThrow()
-})
-
-test("accepts a surviving contender after a failure without recruiting replacements", async () => {
-  await using fixture = await serviceFixture()
-  const pending = run(ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") }))
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(first, "fail")
-  await Bun.sleep(450)
-  await fixture.release(second, "ready")
-  const endpoint = await pending
-
-  expect((await run(Service.discover({ file: fixture.registration, version: "test" })))?.url).toBe(endpoint.url)
-  expect((await Bun.file(fixture.registration).json()).pid).toBe(second)
-  expect(await fixture.starts()).toHaveLength(2)
-})
-
-test("recovers when an unresponsive contender is evicted after a prior failure", async () => {
-  await using fixture = await serviceFixture()
-  const pending = run(ensure({ file: fixture.registration, version: "test", command: fixture.command("controlled") }))
-  const [first, second] = await fixture.waitForStarts(2)
-  await fixture.release(second, "hang")
-  await fixture.waitForFile()
-  await fixture.release(first, "fail")
-  const [, , third] = await fixture.waitForStarts(3)
-  await fixture.release(third, "ready")
-  const endpoint = await pending
-  fixture.track(third)
-
-  expect((await run(Service.discover({ file: fixture.registration, version: "test" })))?.url).toBe(endpoint.url)
-  expect((await Bun.file(fixture.registration).json()).pid).toBe(third)
-})
-
 test("reports a bounded contender stderr tail", async () => {
   await using fixture = await serviceFixture()
   const registration = fixture.registration

packages/codemode/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/codemode",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "description": "Effect-native confined code execution over schema-described tools",
   "type": "module",
   "license": "MIT",

packages/console/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-app",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/console/core/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/console-core",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/console/function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-function",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",

packages/console/mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-mail",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",

packages/console/support/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/console-support",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "name": "@opencode/core",
   "type": "module",
   "license": "MIT",
@@ -134,6 +134,7 @@
     "mime-types": "3.0.2",
     "tree-sitter-bash": "0.25.0",
     "tree-sitter-powershell": "0.25.10",
+    "venice-ai-sdk-provider": "2.1.1",
     "web-tree-sitter": "0.25.10",
     "which": "6.0.1",
     "zod": "catalog:"

packages/core/src/aisdk-native.ts

@@ -70,7 +70,6 @@ const PACKAGES: Readonly<Record<string, string>> = {
   "@ai-sdk/xai": "@opencode/ai/providers/xai",
   "@openrouter/ai-sdk-provider": "@opencode/ai/providers/openrouter",
   "ai-gateway-provider": "@opencode/ai/providers/cloudflare-ai-gateway",
-  "venice-ai-sdk-provider": "@opencode/ai/providers/venice",
 }
 
 const protocols = (name: string) => ({

packages/core/src/plugin/provider.ts

@@ -26,6 +26,7 @@ import { PoePlugin } from "./provider/poe.js"
 import { PromptCacheKeyPlugin } from "./provider/prompt-cache-key.js"
 import { SapAICorePlugin } from "./provider/sap-ai-core.js"
 import { VercelPlugin } from "./provider/vercel.js"
+import { VenicePlugin } from "./provider/venice.js"
 import { VLLMPlugin } from "./provider/vllm.js"
 import { XAIPlugin } from "./provider/xai.js"
 import { ZenmuxPlugin } from "./provider/zenmux.js"
@@ -59,6 +60,7 @@ export const ProviderPlugins: PluginInternal.InternalPlugin[] = [
   PromptCacheKeyPlugin,
   SapAICorePlugin,
   VercelPlugin,
+  VenicePlugin,
   VLLMPlugin,
   XAIPlugin,
   ZenmuxPlugin,

packages/core/src/plugin/provider/venice.ts

@@ -0,0 +1,10 @@
+import { createProviderPlugin } from "./factory.js"
+
+export const VenicePlugin = createProviderPlugin({
+  id: "opencode.provider.venice",
+  package: "venice-ai-sdk-provider",
+  load: async (options) => {
+    const { createVenice } = await import("venice-ai-sdk-provider")
+    return createVenice(options)
+  },
+})

packages/core/src/provider.ts

@@ -97,7 +97,6 @@ const builtins = new Map<string, () => Promise<unknown>>([
   ["@opencode/ai/providers/openai-compatible", () => import("@opencode/ai/providers/openai-compatible")],
   ["@opencode/ai/providers/openrouter", () => import("@opencode/ai/providers/openrouter")],
   ["@opencode/ai/providers/togetherai", () => import("@opencode/ai/providers/togetherai")],
-  ["@opencode/ai/providers/venice", () => import("@opencode/ai/providers/venice")],
   ["@opencode/ai/providers/xai", () => import("@opencode/ai/providers/xai")],
   ["@opencode/ai/providers/zai/chat", () => import("@opencode/ai/providers/zai/chat")],
   ["@opencode/ai/providers/zai-coding-plan/chat", () => import("@opencode/ai/providers/zai-coding-plan/chat")],

packages/core/src/session/compaction.ts

@@ -19,11 +19,9 @@ import type { SessionCompactionResult } from "@opencode/plugin/effect/session"
 import type { SessionError } from "@opencode/schema/session-error"
 import { makeLocationNode } from "@opencode/util/effect/app-node"
 import { Context, Effect, Layer, Result, Stream } from "effect"
-import { Agent } from "../agent.js"
 import { Bus } from "../bus.js"
 import { Database } from "../database/database.js"
 import { llmClient } from "../effect/app-node-platform.js"
-import { Model } from "../model.js"
 import { State } from "../state.js"
 import { Token } from "../util/token.js"
 import type { SessionContext } from "./context.js"
@@ -32,7 +30,6 @@ import { SessionHistory } from "./history.js"
 import type { SessionMessage } from "./message.js"
 import { SessionModelRequest } from "./model-request.js"
 import { SessionProviderContext } from "./provider-context.js"
-import { SessionRunnerModel } from "./runner/model.js"
 import { SessionRunnerRetry } from "./runner/retry.js"
 import { toLLMMessages } from "./runner/to-llm-message.js"
 import { contentFilterError, toSessionError } from "./to-session-error.js"
@@ -184,11 +181,8 @@ const LEGACY_HEADING = "## Additional Context"
 export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
-    const agents = yield* Agent.Service
     const bus = yield* Bus.Service
     const llm = yield* LLMClient.Service
-    const catalog = yield* Model.Service
-    const models = yield* SessionRunnerModel.Service
     const db = (yield* Database.Service).db
     const requests = yield* SessionModelRequest.Service
 
@@ -208,33 +202,24 @@ export const layer = Layer.effect(
 
       // Only the user compacts when automatic compaction is off, overflow included.
       if (trigger.reason !== "manual" && !settings.auto) return { status: "skipped" }
-      if (trigger.reason === "auto" && !due(context, calculateCeiling(context.model.limit, settings.buffer)))
-        return { status: "skipped" }
-      const native = context.model.compaction?.type === "native"
-      const agent = native ? undefined : yield* agents.get(Agent.ID.make("compaction"))
-      const model =
-        (agent?.model &&
-          (yield* models
-            .resolve({ ...context.session, model: agent.model }, catalog.available)
-            .pipe(Effect.orElseSucceed(() => undefined)))) ??
-        context.model
-      const ceiling = calculateCeiling(model.limit, settings.buffer)
+      const ceiling = calculateCeiling(context.model.limit, settings.buffer)
+      if (trigger.reason === "auto" && !due(context, ceiling)) return { status: "skipped" }
       // An unknown window never triggers auto compaction, but the compaction request still needs a size to aim for.
       const cap = Number.isFinite(ceiling)
         ? ceiling
-        : calculateCeiling({ ...model.limit, context: UNKNOWN_WINDOW }, settings.buffer)
+        : calculateCeiling({ ...context.model.limit, context: UNKNOWN_WINDOW }, settings.buffer)
       // The provider just rejected this context, so the estimate ran low; the first attempt already aims below it.
       const budget =
         trigger.reason === "overflow" ? Math.min(cap, Math.floor(estimateContext(context) * SHRINK_STEPS[0])) : cap
 
-      const selected = model === context.model ? trigger : { ...trigger, context: { ...context, model } }
-      const compaction = native
-        ? compactNatively(selected, budget, settings.keep)
-        : summarize(selected, budget, settings.keep)
+      const compaction =
+        context.model.compaction?.type === "native"
+          ? compactNatively(trigger, budget, settings.keep)
+          : summarize(trigger, budget, settings.keep)
       return yield* compaction.pipe(
         Effect.matchEffect({
-          onSuccess: (result) => publish(selected, result),
-          onFailure: (failure) => publish(selected, failure),
+          onSuccess: (result) => publish(trigger, result),
+          onFailure: (failure) => publish(trigger, failure),
         }),
       )
     })
@@ -677,7 +662,7 @@ export const layer = Layer.effect(
 export const node = makeLocationNode({
   service: Service,
   layer,
-  deps: [Agent.node, Bus.node, Database.node, llmClient, Model.node, SessionModelRequest.node, SessionRunnerModel.node],
+  deps: [Bus.node, Database.node, llmClient, SessionModelRequest.node],
 })
 
 /** History loads from the latest completed compaction, so a previous one is always the first message. */

packages/core/src/shell/parse.ts

@@ -210,7 +210,10 @@ export const scanPortable = Effect.fnUntraced(function* (command: string, shell:
     catch: (cause) => new Error(`Portable shell scanner failed to load: ${cause}`, { cause }),
   })
   const powershell = ShellSelect.ps(shell)
-  const result = powershell ? ShellScan.scanPowerShell(command) : ShellScan.scan(command)
+  const name = ShellSelect.name(shell)
+  const result = powershell
+    ? ShellScan.scanPowerShell(command)
+    : ShellScan.scan(command, name === "bash" || name === "zsh" ? name : "posix")
   if (result.kind === "opaque")
     return yield* Effect.fail(new Error(`Portable shell scanner cannot analyze command: ${result.reason}`))
 
@@ -225,15 +228,21 @@ export const scanPortable = Effect.fnUntraced(function* (command: string, shell:
     if (CWD.has(name)) {
       output.directories.push(
         ...directoryArgs(
-          words.flatMap((text): Part[] => {
-            const parameter = powershell ? /^(-(?:literalpath|path)):(.*)$/i.exec(text) : undefined
-            if (parameter)
-              return [
-                { type: "command_parameter", text: parameter[1] },
-                { type: "word", text: parameter[2] },
-              ]
-            return [{ type: powershell && text.startsWith("-") ? "command_parameter" : "word", text }]
-          }),
+          powershell
+            ? words.flatMap((text): Part[] => {
+                const parameter = /^(-(?:literalpath|path)):(.*)$/i.exec(text)
+                if (parameter)
+                  return [
+                    { type: "command_parameter", text: parameter[1] },
+                    { type: "word", text: parameter[2] },
+                  ]
+                return [{ type: text.startsWith("-") ? "command_parameter" : "word", text }]
+              })
+            : item.rawWords.map((text, index) => ({
+                type: "word",
+                // Only literal quoting resolves to a static directory.
+                text: text.startsWith("$'") || (!/[$`~\\]/.test(text) && /['"]/.test(text)) ? item.words[index] : text,
+              })),
           powershell,
           cwd,
           shell,

packages/core/src/variant.ts

@@ -220,14 +220,6 @@ const openaiCompatible: Protocol = (model, support) => {
   return openaiChat(model, support)
 }
 
-const veniceChat: Protocol = (_, support) => {
-  if (support.type === "effort")
-    return efforts(support.values ?? EFFORTS, (effort) => ({ settings: { reasoningEffort: effort } }))
-  if (support.type === "toggle")
-    return toggle({ settings: { reasoning: { enabled: false } } }, { settings: { reasoning: { enabled: true } } })
-  return []
-}
-
 const moonshotChat: Protocol = (model, support) => {
   const id = modelID(model).toLowerCase()
   const toggleable = id.includes("k2.5") || id.includes("k2-5") || id.includes("k2.6") || id.includes("k2-6")
@@ -591,7 +583,6 @@ const PROTOCOLS: Readonly<Record<string, Protocol>> = {
   "@opencode/ai/providers/mistral": openaiChat,
   "@opencode/ai/providers/moonshot/chat": moonshotChat,
   "@opencode/ai/providers/togetherai": openaiChat,
-  "@opencode/ai/providers/venice": veniceChat,
   "@opencode/ai/providers/xai": xaiResponses,
   "@opencode/ai/providers/zai/chat": zaiChat,
   "@opencode/ai/providers/zai-coding-plan/chat": zaiChat,
@@ -611,7 +602,7 @@ const PROTOCOLS: Readonly<Record<string, Protocol>> = {
   "@opencode/ai/providers/cohere": cohere,
   "@opencode/ai/providers/openrouter": openrouter,
 
-  [Provider.aisdk("venice-ai-sdk-provider")]: veniceChat,
+  [Provider.aisdk("venice-ai-sdk-provider")]: openaiChat,
   "@opencode/ai/providers/cloudflare-ai-gateway": cloudflareAIGateway,
   [Provider.aisdk("@ai-sdk/gateway")]: vercelGateway,
   [Provider.aisdk("@jerome-benoit/sap-ai-provider-v2")]: sapAICore,

packages/core/test/config/compaction.test.ts

@@ -46,7 +46,6 @@ const it = testEffect(
         }),
       ),
       Config.node.replace(config),
-      Location.node.replace(Location.boundNode({ directory: AbsolutePath.make("/tmp") })),
     ]),
   ),
 )

packages/core/test/plugin/provider-factory.test.ts

@@ -7,6 +7,7 @@ import { PluginHost } from "@opencode/core/plugin/host"
 import { CoherePlugin } from "@opencode/core/plugin/provider/cohere"
 import { GatewayPlugin } from "@opencode/core/plugin/provider/gateway"
 import { PerplexityPlugin } from "@opencode/core/plugin/provider/perplexity"
+import { VenicePlugin } from "@opencode/core/plugin/provider/venice"
 import { Provider } from "@opencode/core/provider"
 import { testEffect } from "../lib/effect"
 import { PluginTestLayer } from "./fixture"
@@ -17,6 +18,7 @@ const providers = [
   { id: "cohere", plugin: CoherePlugin, package: "@ai-sdk/cohere", provider: "cohere.chat" },
   { id: "gateway", plugin: GatewayPlugin, package: "@ai-sdk/gateway", provider: "gateway" },
   { id: "perplexity", plugin: PerplexityPlugin, package: "@ai-sdk/perplexity", provider: "perplexity" },
+  { id: "venice", plugin: VenicePlugin, package: "venice-ai-sdk-provider", provider: "custom-provider.chat" },
 ] as const
 
 const it = testEffect(PluginTestLayer)

packages/core/test/session-compaction.test.ts

@@ -18,7 +18,6 @@ import { SessionRunnerModel } from "@opencode/core/session/runner/model"
 import { SessionTable } from "@opencode/core/session/sql"
 import { SessionStore } from "@opencode/core/session/store"
 import { Session } from "@opencode/core/session"
-import { Location } from "@opencode/core/location"
 import { Project } from "@opencode/core/project"
 import { ProjectTable } from "@opencode/core/project/sql"
 import { App } from "@opencode/core/app"
@@ -88,11 +87,7 @@ const it = testEffect(
       SessionModelRequest.node,
       PluginHooks.node,
     ]),
-    [
-      Bus.node.replace(Bus.configured({ persist: true })),
-      llmClient.replace(client),
-      Location.node.replace(Location.boundNode({ directory: AbsolutePath.make("/project") })),
-    ],
+    [Bus.node.replace(Bus.configured({ persist: true })), llmClient.replace(client)],
   ),
 )
 

packages/core/test/session-native-compaction.test.ts

@@ -8,7 +8,6 @@ import { AppNodeBuilder } from "@opencode/core/effect/app-node-builder"
 import { llmClient } from "@opencode/core/effect/app-node-platform"
 import { Instructions } from "@opencode/core/instructions/index"
 import { PluginHooks } from "@opencode/core/plugin/hooks"
-import { Location } from "@opencode/core/location"
 import { Project } from "@opencode/core/project"
 import { ProjectTable } from "@opencode/core/project/sql"
 import { AbsolutePath } from "@opencode/core/schema"
@@ -41,10 +40,7 @@ const it = testEffect(
       PluginHooks.node,
       llmClient,
     ]),
-    [
-      Bus.node.replace(Bus.configured({ persist: true })),
-      Location.node.replace(Location.boundNode({ directory: AbsolutePath.make("/project") })),
-    ],
+    [Bus.node.replace(Bus.configured({ persist: true }))],
   ),
 )
 

packages/core/test/shell-scan/adversarial.test.ts

@@ -42,6 +42,21 @@ describe("ShellScan adversarial corpus", () => {
     expect(result.commands.map((command) => command.words[0])).toEqual([...names])
   })
 
+  // Only shell sinks evaluate subscripts; ordinary arguments, heredoc bodies, and bound data without a sink are safe.
+  test.each([
+    "bun -e 'f(`a[${x}]`)'",
+    "rg 'a[$(x)]'",
+    "cat <<'EOF'\na[$(x)]\nEOF",
+    "echo 'a[$(x)]'",
+    'BODY="- [x] Fix \\`scan.ts\\`"; gh pr create --title "fix" --body "$BODY"',
+    "MSG='[feat] Fix `foo`'; git commit -m \"$MSG\"",
+    "PATTERN='a[${b}]'; rg \"$PATTERN\"",
+    "export REGEX='[0-9]+${foo}'",
+    "cat <<< 'const a = arr[0]; const b = `${a}`'",
+  ])("scans subscript-shaped text outside shell sinks: %s", (input) => {
+    expect(ShellScan.scan(input).kind).toBe("scanned")
+  })
+
   test.each(['printf "unterminated', "printf ok &&", "printf ok >", "echo > >out"])(
     "keeps structurally uncertain Bash input opaque: %s",
     (input) => {
@@ -49,6 +64,19 @@ describe("ShellScan adversarial corpus", () => {
     },
   )
 
+  test.each([
+    ["repeated assignment value operators", "x[a]" + "=]".repeat(32_000)],
+    ["unclosed assignment subscripts", "a[\n".repeat(21_000)],
+    ["case patterns with substitutions", "case x in " + "[$(:)".repeat(10_000)],
+    ["nested groups with bracket words", "{ ".repeat(31) + "echo " + "a[] ".repeat(15_000) + "; }".repeat(31)],
+    ["continued heredoc lines", "cat <<E\n" + "x\\\n".repeat(20_000) + "E\n"],
+    ["heredoc backslash runs", "cat <<E\n" + "\\".repeat(60_000) + "x\nE\n"],
+  ])("scans adversarial Bash input in bounded time: %s", (_, input) => {
+    const start = performance.now()
+    ShellScan.scan(input)
+    expect(performance.now() - start).toBeLessThan(500)
+  })
+
   test.each([
     ['pwsh --command "Remove-Item victim.txt"', ["pwsh"]],
     ["Import-Module ./evil.psm1", ["Import-Module"]],

packages/core/test/shell-scan/bash-syntax.test.ts

@@ -60,23 +60,41 @@ const fixtures = [
   ["! scan_probe", ["scan_probe"]],
   ["time scan_probe", ["time"]],
   ["{fd}>/dev/null scan_probe", ["scan_probe"]],
+  ["case $r in a) ls | head;; esac", ["ls", "head"]],
+  ["case $r in a) ls && echo;; esac", ["ls", "echo"]],
+  ["{ find . -exec echo {} \\; ; }", ["find"]],
+  ["{ echo {a,{b,c}}; }", ["echo"]],
+  ["if true; then\\\n echo hi; fi", ["true", "echo"]],
+  ["for ((i=0; i<2; i++)) do echo hi; done", ["echo"]],
+  ['echo "$(case x in @(a)) echo hi;; esac)"', ["echo", "echo"]],
+  ["set -- 1; for x do scan_probe; done", ["set", "scan_probe"]],
+  ["'q'; x=1 a", ["q", "a"]],
+  ["cat <<E; ( true\nscan_ignored\nE\n)", ["cat", "true"]],
+  ["cat <<E; f() { true\nscan_ignored\nE\n}; f", ["cat", "true", "f"]],
+  ["cat <<E; case x in\nscan_ignored\nE\nx) scan_probe;; esac", ["cat", "scan_probe"]],
+  ["time [[ ( -f foo ) ]]", []],
+  ["time ! { echo a; echo b; }", ["echo", "echo"]],
 ] as const
 
 describe("ordinary Bash and Zsh syntax", () => {
   test.each(fixtures)("extracts actual command nodes: %s", (source, names) => {
-    const result = ShellScan.scan(source)
-    expect(result.kind).toBe("scanned")
-    if (result.kind !== "scanned") throw new Error(result.reason)
-    expect(result.commands.map((command) => command.words[0])).toEqual([...names])
+    for (const dialect of ["bash", "zsh"] as const) {
+      const result = ShellScan.scan(source, dialect)
+      expect(result.kind).toBe("scanned")
+      if (result.kind !== "scanned") throw new Error(result.reason)
+      expect(result.commands.map((command) => command.words[0])).toEqual([...names])
+    }
   })
 
   for (const shell of ["bash", "zsh"]) {
     const executable = Bun.which(shell)
     for (const [source] of fixtures) {
-      // These are Bash spellings; Zsh's fd allocation is a standalone statement.
+      // These are Bash spellings; Zsh's fd allocation is a standalone statement. Bash parses extglob
+      // patterns only when extglob is enabled.
       test.skipIf(
         !executable ||
-          (shell === "zsh" && (source.includes('$"') || source.startsWith("{fd}") || source.includes("$["))),
+          (shell === "zsh" && (source.includes('$"') || source.startsWith("{fd}") || source.includes("$["))) ||
+          (shell === "bash" && source.includes("@(")),
       )(`${shell} accepts the source grammar: ${source}`, () => {
         const result = Bun.spawnSync([
           executable ?? shell,
@@ -132,10 +150,15 @@ describe("ordinary Bash and Zsh syntax", () => {
     "cat <<EOF\nunclosed",
     "echo ${missing",
     "echo $'missing",
+    "case $r in a) ls |;; esac",
   ])("rejects incomplete syntax: %s", (source) => {
     expect(ShellScan.scan(source).kind).toBe("opaque")
   })
 
+  test("scans a Zsh brace group closed after a redirect", () => {
+    expect(ShellScan.scan("{ a && >f }")).toMatchObject({ kind: "scanned", commands: [{ words: ["a"] }] })
+  })
+
   test("preserves raw lexical spelling of ANSI-C and locale quoted words", () => {
     expect(ShellScan.scan("$'pri\\x6etf' $'line\\n' $\"text\"")).toMatchObject({
       kind: "scanned",
@@ -145,7 +168,7 @@ describe("ordinary Bash and Zsh syntax", () => {
 
   test.each([
     ["coproc job { scan_probe; }", ["scan_probe"]],
-    ["printf '%s' @(one|$(scan_probe))", ["printf", "scan_probe"]],
+    ["case x in @(one|$(scan_probe))) ;; esac", ["scan_probe"]],
     ["printf '%s' $((1 + '$(scan_probe)'))", ["printf", "scan_probe"]],
     ["printf '%s' $(((1 + '$(scan_probe)')))", ["printf", "scan_probe"]],
     ['printf %s "${ scan_probe; }"', ["printf", "scan_probe"]],
@@ -241,3 +264,56 @@ describe("Bash shared heredoc delimiter grammar", () => {
     )
   })
 })
+
+describe("Bash dialects", () => {
+  const heads = (source: string, dialect?: ShellScan.Dialect) => {
+    const result = ShellScan.scan(source, dialect)
+    return result.kind === "scanned" ? result.commands.map((command) => command.words[0]) : result.kind
+  }
+
+  test("posix reports both readings of a double parenthesis", () => {
+    expect(heads("(( x = 1 )); y", "bash")).toEqual(["y"])
+    expect(heads("(( x = 1 )); y", "zsh")).toEqual(["y"])
+    expect(heads("(( x = 1 )); y", "posix")).toEqual(["x", "y"])
+    expect(heads("(( x = 1 )); y")).toEqual(["x", "y"])
+    expect(heads("(( (1) + (2) ))", "bash")).toEqual([])
+    expect(heads("(( (1) + (2) ))", "posix")).toBe("opaque")
+  })
+
+  test.each([
+    ["true &>/dev/null next", ["true"], "opaque"],
+    ["X=$[1 + 2] next", ["next"], "opaque"],
+  ] as const)("reads Bash and Zsh syntax precisely where Dash diverges: %s", (source, precise, posix) => {
+    expect(heads(source, "bash")).toEqual([...precise])
+    expect(heads(source, "zsh")).toEqual([...precise])
+    expect(heads(source, "posix")).toEqual(posix)
+  })
+
+  test("reads a reserved word after a redirect as a Zsh keyword", () => {
+    const source = "if true; then >/dev/null fi; next"
+    expect(heads(source, "zsh")).toEqual(["true", "next"])
+    expect(heads(source, "bash")).toBe("opaque")
+    expect(heads(source, "posix")).toBe("opaque")
+  })
+
+  test("scans safe Zsh parameter flags, Zsh repeat loops, and Bash extglob arguments", () => {
+    expect(heads("print -l ${(M)files:#*.ts}", "zsh")).toEqual(["print"])
+    expect(heads("print -l ${(ps:\\n:)text}", "zsh")).toEqual(["print"])
+    expect(heads("print -r -- ${(q-)x} ${(q+)x} ${(on-)x}", "zsh")).toEqual(["print"])
+    expect(heads("repeat 3; do echo hi; done", "zsh")).toEqual(["echo"])
+    expect(heads("repeat 3; do echo hi; done", "posix")).toEqual(["echo"])
+    expect(heads("f() repeat 3; do echo hi; done", "zsh")).toEqual(["echo"])
+    expect(heads("ls @(foo|bar)", "bash")).toEqual(["ls"])
+  })
+
+  test.each([
+    ["/bin/bash", ["y"]],
+    ["/usr/local/bin/zsh", ["y"]],
+    ["/bin/sh", ["x = 1", "y"]],
+    ["/bin/dash", ["x = 1", "y"]],
+    ["/opt/bin/mksh", ["x = 1", "y"]],
+  ] as const)("derives the dialect from the shell executable: %s", async (shell, resources) => {
+    const result = await Effect.runPromise(ShellParse.scanPortable("(( x = 1 )); y", shell, "/workspace"))
+    expect(result.commands.map((command) => command.resource)).toEqual([...resources])
+  })
+})

packages/core/test/shell-scan/oracle.test.ts

@@ -0,0 +1,751 @@
+import { afterAll, describe, expect, test } from "bun:test"
+import { Effect, Exit } from "effect"
+import fs from "fs"
+import os from "os"
+import path from "path"
+import { ShellParse } from "../../src/shell/parse.js"
+import { ShellScan } from "../../src/shell/scan.js"
+
+const shellCandidates = ["/bin/bash", "/opt/homebrew/bin/bash", "/usr/local/bin/bash", "bash", "zsh", "dash"]
+const shells = [
+  ...new Set(
+    shellCandidates
+      .map((item) => (item.startsWith("/") ? (fs.existsSync(item) ? item : undefined) : Bun.which(item)))
+      .filter((item): item is string => Boolean(item)),
+  ),
+]
+// Fixtures target specific shells and versions (bash 3.2 and 5.3, zsh, dash). Set SHELL_ORACLE_STRICT=1 on a
+// machine with all of them to also verify that every fixture still executes somewhere.
+const strict = process.env.SHELL_ORACLE_STRICT === "1"
+
+const root = fs.mkdtempSync(path.join(os.tmpdir(), "opencode-shell-oracle-"))
+const bin = path.join(root, "bin")
+const target = path.join(root, "target")
+const log = path.join(root, "log")
+fs.mkdirSync(bin)
+fs.mkdirSync(target)
+fs.writeFileSync(
+  path.join(bin, "scan_probe"),
+  '#!/bin/sh\nprintf \'%s\\n\' "scan_probe${1:+ $*}" >> "$SCAN_PROBE_LOG"\n',
+  {
+    mode: 0o755,
+  },
+)
+// Dash runs `scan_probe[x y]=1` as the command `scan_probe[x`.
+fs.copyFileSync(path.join(bin, "scan_probe"), path.join(bin, "scan_probe[x"))
+// Zsh treats a trailing parenthesized group after an existing file name as glob qualifiers.
+fs.writeFileSync(path.join(root, "a="), "")
+
+afterAll(() => fs.rmSync(root, { recursive: true, force: true }))
+
+function shellFlags(executable: string) {
+  if (executable.endsWith("/bash")) return ["--noprofile", "--norc"]
+  if (executable.endsWith("/zsh")) return ["-f"]
+  return []
+}
+
+// Runs source in a real shell and returns the lines it logged.
+function observe(executable: string, source: string) {
+  fs.writeFileSync(log, "")
+  Bun.spawnSync([executable, ...shellFlags(executable), "-c", source], {
+    cwd: root,
+    env: { PATH: `${bin}:/usr/bin:/bin`, HOME: root, LC_ALL: "C", SCAN_PROBE_LOG: log },
+    timeout: 2_000,
+  })
+  return fs
+    .readFileSync(log, "utf8")
+    .split("\n")
+    .map((line) => line.trim())
+    .filter(Boolean)
+}
+
+// Each dialect must report what its shells run; posix, the default, covers every shell.
+const dialects = {
+  bash: (executable: string) => path.basename(executable) === "bash",
+  zsh: (executable: string) => path.basename(executable) === "zsh",
+  posix: () => true,
+} satisfies Record<ShellScan.Dialect, (executable: string) => boolean>
+
+function expectProbesReported(source: string) {
+  const runs = shells.map((executable) => [executable, observe(executable, source)] as const)
+  if (strict)
+    expect(
+      runs.some(([, invocations]) => invocations.length > 0),
+      `Fixture never executed scan_probe in any real shell: ${source}`,
+    ).toBe(true)
+  expect(ShellScan.scan(source)).toEqual(ShellScan.scan(source, "posix"))
+  for (const [dialect, runsIn] of Object.entries(dialects)) {
+    const result = ShellScan.scan(source, dialect as ShellScan.Dialect)
+    if (result.kind === "opaque") continue
+    const reported = result.commands.filter((command) => !command.declaration).map((command) => command.words.join(" "))
+    for (const [executable, invocations] of runs.filter(([executable]) => runsIn(executable)))
+      for (const invocation of invocations)
+        expect(reported, `${executable} executed ${invocation} with ${dialect} in: ${source}`).toContain(invocation)
+  }
+}
+
+// Each fixture runs scan_probe in at least one real shell, which the scanner must report or reject.
+const fixtures = [
+  "a=(1)scan_probe",
+  "a=(\n1)scan_probe; ",
+  "a=(1)'scan_probe'",
+  "alias p=scan_probe\np",
+  "command alias p=scan_probe\np",
+  "x='*(e:scan_probe:)'; echo $^~x",
+  "x='$(scan_probe)'; echo \"${\\\n(e)x}\"",
+  "x='$(scan_probe)'; echo ${(j:):e)x}",
+  "x='*(e:scan_probe:)'; echo ${(f)~x}",
+  "x='*(e:scan_probe:)'; echo ${=~x}",
+  "x='*(e:scan_probe:)'; echo $=~x",
+  "x='$(scan_probe)'; echo ${(%e)x}",
+  "x='$(scan_probe)'; echo ${(s.:.e)x}",
+  "x='$(scan_probe)'; echo ${(s(:)e)x}",
+  "x='$(scan_probe)'; echo ${(ej: :)x}",
+  "x='*(e:scan_probe:)'; echo ${(s: :)~x}",
+  "x='*(e:scan_probe:)'; echo ${^~x}",
+  "printf -v x 'a[$(scan_probe)]'; echo $((x))",
+  "a=(1); getopts a: x -a 'a[$(scan_probe)]'; echo $((OPTARG))",
+  "command -- declare 'a[$(scan_probe)]=1'",
+  "a=(1); unset 'a[b[$\\\n(scan_probe)0]]'",
+  'declare \'a["\\"]"$(scan_probe)0]=1\'',
+  "declare -a 'a=(+ [$(scan_probe)]=1)'",
+  "a=(1); echo ${a[b[\\$(scan_probe)]]}",
+  'a["b[\\$(scan_probe)]"]=1',
+  'b=1; a["b[\\$(scan_probe)1]"]=1',
+  "a=(1); echo $[ ${x:-a[\\$(scan_probe)1]} ]",
+  "a=(1); s=abc; echo ${s:'a[$(scan_probe)0]'}",
+  "a=(1); s=abc; echo ${s:${x:-'a[$(scan_probe)1]'}}",
+  "read x <<< 'a[$(scan_probe f)]'; echo $((x))",
+  "mapfile -t a <<< 'b[$(scan_probe g)]'; echo $((a[0]))",
+  "x=1; echo $(( x[\\$(scan_probe i)] ))",
+  "a=(1); echo ${a[@]:'a[$(scan_probe k)]'}",
+  "builtin -- declare 'a[$(scan_probe)]=1'",
+  "command -p declare 'a[$(scan_probe)]=1'",
+  'echo "${unset:+${x[\'"\']}}"]}} \'$(scan_probe)\' " # "',
+  "echo \"${unset:+${x['}}\"']}}'; scan_probe # \"",
+  "echo \"${x:-$'\\''}\"; scan_probe # '\"",
+  "cat <<E\n${x:-'}'}' $(scan_probe)\nE",
+  'echo "${x:-a\'b}c\'d}"$(scan_probe)"\'"',
+  "echo \"${PATH//:/$'\\n'}\"; scan_probe ok",
+  "echo $(( : # ))'\n); scan_probe ) # '",
+  "echo $(( $(echo 1) # ))'\n); scan_probe ) # '",
+  "(( : # ))'\n); scan_probe ) # '",
+  "echo $(( 16#ff + 2#1 + $# + ${#x} )); scan_probe ok",
+  "(( scan_probe ))",
+  "(( (scan_probe) & (scan_probe) ))",
+  "(( (scan_probe)\n(scan_probe) ))",
+  "cat <<'}'; {\n:\n}\nscan_probe; cat <<'}'; }\n}",
+  "cat <<'x)'; case x in\nx)\nx) scan_probe; cat <<'x)'\nx)\n;; esac",
+  "cat <<'if'; f()\nif\nif scan_probe; cat <<'if'\nif\ntrue; then :; fi; f",
+  "cat <<E; ( true\nE\nscan_probe g\n)",
+  "cat <<E; { true\nE\nscan_probe g\n}",
+  "cat <<E; f() { true\nE\nscan_probe f\n}; f",
+  "cat <<E; if true\nE\nscan_probe i\nthen :; fi",
+  "cat <<E; echo $(true\nscan_probe s\n)\nE\nscan_probe after",
+  "cat <<E; echo `true\nscan_probe b\n`\nE\nscan_probe after",
+  "cat <<E; cat <(true\nscan_probe s\n)\nE\nscan_probe after",
+  "cat <<E; x=$(cat <<F\nF\n)\nE\nscan_probe out",
+  "{ cat <<E; }\nscan_probe x\nE\nscan_probe y",
+  "[[ a]]b# ]] && scan_probe",
+  '[[ "a]]"# ]] && scan_probe',
+  "[[ 'a]]'# ]] && scan_probe",
+  "[[ a]]b = a]]b ]] && scan_probe",
+  '{ export X="a"{}# ; scan_probe; }',
+  "{ export X=a}# ; scan_probe; }",
+  "{ case esac in (esac) scan_probe;; esac\n}",
+  "unset a[b\nscan_probe\necho ]+=1",
+  "export a[b; scan_probe; echo ]=1",
+  "a[b; scan_probe; echo ]=1",
+  "a[0 #]\n]=1; scan_probe",
+  "for i in 1; { scan_probe; }; while false; do export X=1; done",
+  "for ((i=0; i<1; i++)); { scan_probe; }; while false; do export X=1; done",
+  "for i in 1; scan_probe",
+  "((( echo '\"' ); scan_probe; ( echo '\"' )))",
+  "set=1; export X=${set:-${x['0\"0']}}; scan_probe; : '\"]}}' # '",
+  "export X=$$$$'\\'; scan_probe # '",
+  'export X="`export Y=\\"\'\\" ; scan_probe; export Z=\\"\'\\"`"',
+  'export X="`echo \\"(\\"; scan_probe; echo \\")\\"`"',
+  ": <<-export\n\tex\\\n\tport\n$(scan_probe)\nexport",
+  'export X="${\\\n scan_probe; }"',
+  'export X="${\n scan_probe; }"',
+  'export X="${|\\\n REPLY=$(scan_probe); }"',
+  "!(scan_probe; true)",
+  "if !(scan_probe); then :; fi",
+  "f+() { scan_probe; }; f+",
+  ': <<$"export"\n$export\nscan_probe\nexport',
+  ': <<$"export"\nexport\nscan_probe\n$export',
+  "export X=$[1; scan_probe; : ]",
+  "X=$[1 scan_probe ]",
+  'export X=$["]"]; scan_probe # ]',
+  "export X=${#}# ; scan_probe",
+  "export X=$#a# ; scan_probe",
+  "export X=~+# ; scan_probe",
+  "{ export X=1; }# ; scan_probe; }",
+  "if true; then export X=1; fi# ; scan_probe; fi",
+  "for i in 1; do export X=1; done# ; scan_probe; done",
+  "case esac# in x) export X=1;; esac#) scan_probe;; esac",
+  ": <<A <<B\nA\n$(scan_probe)\nB",
+  'export X="$(cat <<EOF\n)\nEOF\nscan_probe)"',
+  "cat <<EOF | scan_probe\nhello\nEOF",
+  "cat <<EOF && scan_probe\nhello\nEOF",
+  "cat <<'E'\"O\"F\n# $(scan_probe)\nEOF\nscan_probe",
+  "cat <<E\\\nOF\n$(scan_probe)\nEOF",
+  "cat <<-EOF\n\t EOF\n$(scan_probe)\n\tEOF",
+  "cat <<export\nex\\\nport\n# $(scan_probe)\nexport",
+  "cat <<< 'a'\"$(scan_probe)\"",
+  'export X=${x:-"}"}; scan_probe',
+  "export X=${x:-'}'}; scan_probe",
+  'export X="${x:-"}"}"; scan_probe',
+  'export X="${x:-"$(scan_probe)"}"',
+  "export X=${x//\\}/}; scan_probe; : }",
+  'export X="${x//\\}/}"; scan_probe; : "}"',
+  "export X=${x#${y}}; scan_probe",
+  'export X="${x#${y:-"}"}}"; scan_probe',
+  "export X=${!prefix*}; scan_probe",
+  "export X=${x@Q}; scan_probe",
+  "export X=\"${unset:+${x['\"']}}\"; scan_probe; : '\"}]}'",
+  'export X="${unset:+${x[\'}}\"; scan_probe; : \"\']}}"',
+  'echo $(case x in x) echo ")" ;; esac; scan_probe)',
+  "echo \"$(case x in (x) echo ')' ;; esac; scan_probe)\"",
+  'echo "`echo \\"$(scan_probe)\\"`"',
+  "echo `echo \\`scan_probe\\``",
+  "echo $( (echo a); scan_probe )",
+  "echo $((echo a); scan_probe)",
+  "if true; then scan_probe; elif true; then :; else :; fi",
+  "for i in in do done esac; do scan_probe; done",
+  "for do in 1; do scan_probe; done",
+  "for in in 1; do scan_probe; done",
+  "for x\nin 1; do scan_probe; done",
+  "set -- 1; for x\ndo scan_probe; done",
+  "set -- 1; for x do scan_probe; done",
+  "case in in in) scan_probe;; esac",
+  "case esac in a|esac) scan_probe;; esac",
+  "case y in x) ;; y) scan_probe;; esac",
+  "case x in x) scan_probe ;& y) : ;;& z) : ;; esac",
+  "case x in x) scan_probe ;| y) : ;; esac",
+  "case [ in [) scan_probe & ( scan_probe q ]) ;; esac",
+  "case x in (x|[) scan_probe & ( scan_probe q ]) ;; esac",
+  "while false; do :; done & scan_probe",
+  "{ scan_probe & }",
+  "( scan_probe & )",
+  "[[ b =~ b ]] && scan_probe",
+  "[[ ( a == a ) && ( b == b ) ]] && scan_probe",
+  '[[ "$(scan_probe)" == "]]" ]]',
+  "(( 1 + $(scan_probe) ))",
+  "(( a = 1 )) && scan_probe",
+  "(( (1) + (2) )); scan_probe",
+  "(( (echo a); scan_probe ))",
+  ">/dev/null scan_probe",
+  "2>&1 scan_probe",
+  "A=1 >/dev/null B=2 scan_probe",
+  'export A=1 B="$(scan_probe)"',
+  'declare -a arr=(1 "$(scan_probe)")',
+  "export X=$'a'\\\n; scan_probe",
+  "case x in \\\nx) \\\nscan_probe;; \\\nesac",
+  "if true; then \\\nscan_probe; fi",
+  '() { :; } "$(scan_probe)"',
+  "function f() ( scan_probe ); f",
+  "{ export X=1 } && scan_probe",
+  "{ export X=1 } ; scan_probe ; }",
+
+  // Dialects disagree about reserved words after redirects and operators split by line continuations.
+  "if true; then >/dev/null fi; scan_probe; fi",
+  "if true; then >/dev/null fi; scan_probe",
+  "case x in x) >/dev/null esac; scan_probe; esac",
+  "true &>/dev/null scan_probe",
+  "true &>>/dev/null scan_probe",
+  "true &\\\n>/dev/null scan_probe",
+  "cat <<\\\n-EOF\nEOF\nscan_probe h1\n-EOF",
+  "cat <<\\\n-EOF\n-EOF\nscan_probe z\nEOF",
+  "cat <\\\n(scan_probe i)",
+  "[[ -n <\\\n(scan_probe c1) ]]",
+  "a=(<\\\n(scan_probe a1))",
+  "cat <<E\n$\\\n(scan_probe h)\nE",
+  "echo ${x:-$\\\n(scan_probe p)}",
+  "(( $\\\n(scan_probe a) ))",
+  "[[ $\\\n(scan_probe c) ]]",
+  "a=($\\\n(scan_probe arr))",
+
+  // Dash splits assignment subscripts at blanks.
+  "scan_probe[x y]=1",
+  "a[x '$(scan_probe)']=1",
+  "a[1 + $(scan_probe)]=1",
+
+  // Expansions inside parameter words, arithmetic, and subscripts.
+  "echo \"${x:-$'$(scan_probe q1)'}\"",
+  "echo ${x:-<(scan_probe p1)}",
+  "echo ${x:->(scan_probe g)}",
+  "x=${y:-<(scan_probe p4)}",
+  "[[ x == ${y:-<(scan_probe p5)} ]]",
+  "echo $(( $'$(scan_probe a)' ))",
+  "(( x = $'$(scan_probe b)' ))",
+  "echo $(( ${x:-'$(scan_probe a)'} ))",
+  "(( ${x:-'$(scan_probe b)'} ))",
+  "a[${x:-'$(scan_probe c)'}]=1",
+  "echo $[ ${x:-'$(scan_probe d)'} ]",
+  "echo $[ $'$(scan_probe h)' ]",
+  "echo ${a[${x:-'$(scan_probe e)'}]}",
+  "echo \"${a[${x:-'$(scan_probe f)'}]}\"",
+  "cat <<E\n${x:-'$(scan_probe h)'}\nE",
+
+  // Zsh glob qualifiers and extglob groups run code in globbed words.
+  "echo @(<(scan_probe e1))",
+  "printf '%s' @(one|$(scan_probe))",
+  "echo *(e:'scan_probe q1':)",
+  "echo *(+scan_probe)",
+  "a=(*(e:'scan_probe g':))",
+  "declare -a a=(*(e:'scan_probe g':))",
+  "export a=(*(e:'scan_probe h':))",
+  "for f in *(e:'scan_probe h':); do :; done",
+  "echo ${x:-target(e:'scan_probe p2':)}",
+  "echo ${x:-*(e:'scan_probe j':)}",
+  "echo a=(e:'scan_probe p3':)",
+  "echo >*(e:'scan_probe f':)",
+  "cat <*(e:'scan_probe g':)",
+  "echo $x*(e:'scan_probe h':)",
+  "echo \"\"*(e:'scan_probe i':)",
+  "echo {a,*(e:'scan_probe m':)}",
+
+  // Builtins and arithmetic evaluate subscripts in decoded literal text.
+  "declare -i x='a[$(scan_probe)]'",
+  "declare 'a[$(scan_probe)]=1'",
+  "declare -a 'a=([$(scan_probe)]=1)'",
+  "a=(1); unset 'a[$(scan_probe)]'",
+  'a=(1); unset "a[\\$(scan_probe)]"',
+  "[[ 'a[$(scan_probe)]' -eq 1 ]]",
+  "[[ -v 'a[$(scan_probe)]' ]]",
+  "read 'a[$(scan_probe)]' </dev/null",
+  "printf -v 'a[$(scan_probe)]' x",
+  "x='a[$(scan_probe)]'; echo $((x))",
+  "s=abc; x='a[$(scan_probe)0]'; printf '%s' \"${s:x}\"",
+  "ref='x[$(scan_probe)0]'; printf '%s' \"${!ref}\"",
+  "declare ${x:-'a[$(scan_probe)]=1'}",
+  'declare "${x:-a[\\$(scan_probe)]=1}"',
+  "read ${x:-'a[$(scan_probe)]'} </dev/null",
+  "declare \"$(echo 'a[$(scan_probe)]=1')\"",
+  "declare \"${ echo a; }\"'[$(scan_probe)]=1'",
+  "n=a; declare \"$n\"'[$(scan_probe)]=1'",
+  "declare \"$(echo a)\"'[$(scan_probe)]=1'",
+  "builtin declare 'a[$(scan_probe)]=1'",
+  "printf -v'a[$(scan_probe)]' x",
+  "set -- 'a[$(scan_probe)]'; echo $(($1))",
+  "for x in 'a[$(scan_probe)]'; do echo $((x)); done",
+  "a=(1 'a[$(scan_probe)]'); echo $((a[1]))",
+  "x='a[$(scan_probe)]' eval 'echo $((x))'",
+  "a=(1); echo $(( a[\\$(scan_probe)] ))",
+  "a=(1); (( a[\\$(scan_probe)] ))",
+
+  // Explicit evaluation operators.
+  "x='$(scan_probe)'; echo ${x@P}",
+  "x='$(scan_probe)'; echo \"${x@P}\"",
+  "x='$(scan_probe)'; echo ${(e)x}",
+  "x='$(scan_probe)'; echo ${(ee)x}",
+  "echo ${(e):-'$(scan_probe)'}",
+  "x='*(e:scan_probe:)'; echo ${~x}",
+  "x='*(e:scan_probe:)'; echo $~x",
+
+  // Precommand modifiers, bundled/ordered binding options, repeat, compgen, and setopt.
+  "noglob typeset 'a[$(scan_probe)]=1'",
+  "nocorrect typeset 'a[$(scan_probe)]=1'",
+  "a=(1); noglob unset 'a[$(scan_probe)]'",
+  "noglob read 'a[$(scan_probe)]' <<< x",
+  'a=(1); noglob let "a[\\$(scan_probe)]"',
+  "print -r -v 'a[$(scan_probe)]' x",
+  "print -rv 'a[$(scan_probe)]' x",
+  "a=(1); print -r -v x 'a[$(scan_probe)]'; echo $((x))",
+  "a=(1); print -rv x 'a[$(scan_probe)]'; echo $((x))",
+  ": & wait -np 'a[$(scan_probe)]'",
+  ": & wait -n -p'a[$(scan_probe)]'",
+  ": & wait -fp 'a[$(scan_probe)]' $!",
+  "time declare 'a[$(scan_probe)]=1'",
+  "coproc declare 'a[$(scan_probe)]=1'",
+  "a=(1); time unset 'a[$(scan_probe)]'",
+  "a=(1); time let 'a[$(scan_probe)]'",
+  "a=(1); time [[ -v 'a[$(scan_probe)]' ]]",
+  "a=(1); time [[ 'a[$(scan_probe)]' -eq 1 ]]",
+  "a=(1); coproc [[ -v 'a[$(scan_probe)]' ]]",
+  'export X="${ time ! { :; }; scan_probe; }"',
+  'export X="${ time\\\n { :; }; scan_probe; }"',
+  'export X="${ time -- { :; }; scan_probe; }"',
+  "repeat 1 scan_probe",
+  "a=(1); repeat 'a[$(scan_probe)]' :",
+  "setopt globsubst; x='*(e:scan_probe:)'; echo $x",
+  "set -o globsubst; x='*(e:scan_probe:)'; echo $x",
+  "compgen -C scan_probe",
+  "compgen -C 'scan_probe'",
+
+  // Combined literal/output subscripts, deferred bindings, continuations, Zsh flags, and ANSI-C escapes.
+  "declare \"a[$(echo '$(scan_probe)')]=1\"",
+  "declare \"$(echo 'a[')\"'$(scan_probe)]=1'",
+  "a=(1); unset \"a[$(echo '$(scan_probe)')]\"",
+  "a=(1); echo $(( a[$(echo '$(scan_probe)')] ))",
+  "x='$(scan_probe)'; declare \"a[$x]=1\"",
+  "x='$(scan_probe)'; a=(1); unset \"a[$x]\"",
+  "x='$(scan_probe)'; let \"a[$x]=1\"",
+  "x='$(scan_probe)'; read \"a[$x]\" <<< 1",
+  "x='$(scan_probe)'; printf -v \"a[$x]\" 1",
+  "a=(1); x='$(scan_probe)'; echo $((a[$x]))",
+  "a=(1); x='$(scan_probe)'; [[ -v \"a[$x]\" ]]",
+  "a=(1); x='$(scan_probe)'; [[ \"a[$x]\" -eq 1 ]]",
+  "a=(1); echo ${a\\\n['$(scan_probe)']}",
+  "a=(1); s=abc; echo ${s\\\n:'a[$(scan_probe)0]'}",
+  "a=(1); echo ${a[0]\\\n:'a[$(scan_probe)0]'}",
+  "x='$(scan_probe)'; echo ${x@\\\nP}",
+  "x='$(scan_probe)'; echo \"${x@\\\nP}\"",
+  "x='$(scan_probe)'; echo ${x@P\\\n}",
+  "x='*(e:scan_probe:)'; echo $\\\n~x",
+  "x='*(e:scan_probe:)'; echo $^\\\n~x",
+  "x='*(e:scan_probe:)'; echo ${^\\\n~x}",
+  "x='*(e:scan_probe:)'; echo ${(f)\\\n~x}",
+  "a=(1); echo ${(f)a['a[$(scan_probe)]']}",
+  "a=(1); echo ${=a['a[$(scan_probe)]']}",
+  "a=(1); echo ${^a['a[$(scan_probe)]']}",
+  "a=(1); s=abc; echo ${(f)s:'a[$(scan_probe)0]'}",
+  "a=(1); s=abc; echo ${=s:'a[$(scan_probe)0]'}",
+  "a=(1); s=abc; echo ${^s:'a[$(scan_probe)0]'}",
+  "a=(1); [[ x != *(a)]] && 0 -eq 'a[$(scan_probe)]' ]]",
+  "a=(1); [[ x != *(a)]] && -v 'a[$(scan_probe)]' ]]",
+  "a=(1); [[ x != (a)]] && 0 -eq 'a[$(scan_probe)]' ]]",
+  "shopt -s extglob\na=(1); [[ x != *(a)]] && 0 -eq 'a[$(scan_probe)]' ]]",
+  "a=(1); echo $(( $'a\\x5b\\x24\\x28scan_probe\\x29\\x5d' ))",
+  "a=(1); (( $'a\\x5b\\x24\\x28scan_probe\\x29\\x5d' ))",
+  "a=(1); echo ${a[$'a\\x5b\\x24\\x28scan_probe\\x29\\x5d']}",
+  "a=(1); declare \"${x:-$'a\\x5b\\x24\\x28scan_probe\\x29\\x5d=1'}\"",
+  "a=(1); unset \"${x:-$'a\\x5b\\x24\\x28scan_probe\\x29\\x5d'}\"",
+  "(( $'\\' )) # ' )); scan_probe",
+  "declare -A a; a[$'\\']=1 # ']=1; scan_probe",
+  "a=(1); echo ${a[$'\\']} # ']} $(scan_probe)",
+  ": <<$'export'\n$export\nscan_probe\nexport",
+  ": <<$'EOF'\n$EOF\nscan_probe\nEOF",
+  "echo $'\\'; scan_probe; : ' # '",
+  "export X=$'\\'; scan_probe; : ' # '",
+  "export X=$'\\c\\\\'; scan_probe # '",
+  "export X=$'\\c'; scan_probe; : ' # '",
+  "$'scan_probe\\0x'",
+  "$'scan_probe\\x00x'",
+  "$'scan_probe\\u0000x'",
+  "$'scan_probe\\c@x'",
+  "$'declare\\0x' 'a[$(scan_probe)]=1'",
+  "a=(1); $'unset\\0x' 'a[$(scan_probe)]'",
+  "$'let\\0x' 'a[$(scan_probe)]'",
+  "x='x y'; scan_probe[$x]=1",
+
+  // Parameter default bindings, Zsh subscripts, precommands, namerefs, ANSI-C escapes, and Zsh builtins.
+  "a=(1); : ${x:='a[$(scan_probe)]'}; echo $((x))",
+  "a=(1); : ${x:='$(scan_probe)'}; echo $((a[$x]))",
+  "a=(1); : ${x='$(scan_probe)'}; unset \"a[$x]\"",
+  'a=(1); : "${x:="a[\\$(scan_probe)]"}"; echo $((x))',
+  "a=(); : ${a[0]:='a[$(scan_probe)]'}; echo $((a[0]))",
+  "declare -i a x; : ${x:='a[$(scan_probe)]'}",
+  "a=(1); echo ${@[1,'a[$(scan_probe)]']}",
+  "a=(1); echo ${*[1,'a[$(scan_probe)]']}",
+  "a=(1); echo ${1[1,'a[$(scan_probe)]']}",
+  "a=(1); echo ${a[1]['$(scan_probe)']}",
+  "a=(1); echo ${s[1][1]:'a[$(scan_probe)0]'}",
+  "a=(1); echo ${${a}['$(scan_probe)']}",
+  "a=(1); echo ${${s}:'a[$(scan_probe)0]'}",
+  "a=(1); echo $a['$(scan_probe)']",
+  'a=(1); echo "$a[a[\\$(scan_probe)]]"',
+  "a=(1); x='$(scan_probe)'; echo $a[a[$x]]",
+  "a=(1); x='$(scan_probe)'; echo \"$a[a[$x]]\"",
+  "a=(1); echo $@[1,'a[$(scan_probe)]']",
+  "a=(1); echo $^a['$(scan_probe)']",
+  "exec typeset 'a[$(scan_probe)]=1'",
+  "a=(1); - typeset 'a[$(scan_probe)]=1'",
+  "a=(1); exec unset 'a[$(scan_probe)]'",
+  "a=(1); - unset 'a[$(scan_probe)]'",
+  "a=(1); exec -a foo unset 'a[$(scan_probe)]'",
+  "a=(1); exec let 'a[$(scan_probe)]'",
+  "a=(1); - let 'a[$(scan_probe)]'",
+  "unset a=(e:'scan_probe':)",
+  "unsetenv a=(e:'scan_probe':)",
+  "a=(1); r='a[$(scan_probe)]'; declare -n r; r=1",
+  "a=(1); r='a[$(scan_probe)]'; declare -n r; echo $r",
+  "a=(1); r='a[$(scan_probe)]'; typeset -n r; r=1",
+  "a=(1); x='a[$(scan_probe)]'; (( $'\\170' ))",
+  "a=(1); x='a[$(scan_probe)]'; echo ${a[$'\\170']}",
+  "a=(1); x='a[$(scan_probe)]'; declare a[x]=1",
+  "a=(1); x='a[$(scan_probe)]'; declare 'a[x]=1'",
+  "a=(1); x='a[$(scan_probe)]'; unset 'a[x]'",
+  "a=(1); x='a[$(scan_probe)]'; [[ -v a[x] ]]",
+  "a=(1); x='a[$(scan_probe)]'; read 'a[x]' <<< 1",
+  "a=(1); x='a[$(scan_probe)]'; printf -v 'a[x]' 1",
+  "a=(1); x='a[$(scan_probe)]'; test -v 'a[x]'",
+  "a=(1); echo ${(s:):)a['a[$(scan_probe)]']}",
+  "a=(1); s=abc; echo ${(s:):)s:'a[$(scan_probe)0]'}",
+  "a=(1); [[ !(-v 'a[$(scan_probe)]') ]]",
+  "echo $'a\\'; scan_probe; ' \\'",
+  "echo $'\\'$(scan_probe)' \\'",
+  ": <<$'a\\'; scan_probe; '\\'\n$a\\\n\na'; scan_probe; '",
+  "export X=$'\\c\\''; scan_probe # '",
+  "a=(1); declare $'a[\\0$(scan_probe)]=1'",
+  "a=(1); unset $'a[\\0$(scan_probe)]'",
+  "a=(1); declare $'a[\\u0000$(scan_probe)]=1'",
+  ": <<$'\\u0041'\n\\u0041\nscan_probe\nA",
+  ": <<$'\\U00000041'\n\\U00000041\nscan_probe\nA",
+  "$'s\\can_probe'",
+  "$'de\\clare' 'a[$(scan_probe)]=1'",
+  "$'\\scan_probe'",
+  "a=(1); typeset $'a\\[\\$\\(scan_probe\\)\\]=1'",
+  "$'scan_probe\\xz'",
+  "$'scan_probe\\uz'",
+  "$'scan_probe\\Uz'",
+  "$'scan_probe\\C-@x'",
+  "$'scan_probe\\C@x'",
+  "a=(1); set -A 'a[$(scan_probe)]' 1",
+  "a=(1); set +A 'a[$(scan_probe)]' 1",
+  "unsetopt noglobsubst; x='*(e:scan_probe:)'; echo $x",
+  "set +o noglobsubst; x='*(e:scan_probe:)'; echo $x",
+  "set -xo globsubst; x='*(e:scan_probe:)'; echo $x",
+  "emulate zsh -o globsubst; x='*(e:scan_probe:)'; echo $x",
+  "NULLCMD=scan_probe; >/dev/null",
+  "READNULLCMD=scan_probe; </dev/null",
+  "NULLCMD=scan_probe; <<< x",
+  "setopt promptsubst; x='$(scan_probe)'; print -P $x",
+  "setopt promptvars; print -P '$(scan_probe)'",
+  "a=(1); exit 'a[$(scan_probe)]'",
+  "f() { return 'a[$(scan_probe)]'; }; a=(1); f",
+  "a=(1); shift 'a[$(scan_probe)]'",
+  "a=(1); for x in 1; do break 'a[$(scan_probe)]'; done",
+  "a=(1); for x in 1; do continue 'a[$(scan_probe)]'; done",
+  "a=(1); bye 'a[$(scan_probe)]'",
+  "a=(1); logout 'a[$(scan_probe)]'",
+  "a=(1); getln 'a[$(scan_probe)]'",
+  "a=(1); vared 'a[$(scan_probe)]'",
+  "a=(1); zformat -f 'a[$(scan_probe)]' x",
+  "a=(1); zstyle -s : x 'a[$(scan_probe)]'",
+  "zmodload zsh/stat; a=(1); zstat -A 'a[$(scan_probe)]' .",
+  "a=(1); compgen -V x -W 'a[$(scan_probe)]'; echo $((x[0]))",
+
+  // Special/positional subscripts, escape decoders, split expansions, float/array declarations, and continuations.
+  "a=(1); set -- 1 2 3 4 5 6 7 8 9 abc; echo ${1\\\n0:'a[$(scan_probe)0]'}",
+  "a=(1); echo ${1\\\n0[1,'a[$(scan_probe)]']}",
+  "a=(1); echo $0[1,'a[$(scan_probe)]']",
+  "a=(1); echo $?[1,'a[$(scan_probe)]']",
+  "a=(1); echo $#[1,'a[$(scan_probe)]']",
+  "a=(1); echo $-[1,'a[$(scan_probe)]']",
+  "a=(1); echo $![1,'a[$(scan_probe)]']",
+  "a=(1); echo $$[1,'a[$(scan_probe)]']",
+  'a=(1); echo "$?[1,a[\\$(scan_probe)]]"',
+  'a=(1); echo "$$[1,a[\\$(scan_probe)]]"',
+  "a=(1); x='a[\\x24(scan_probe)]'; unset \"${x@E}\"",
+  "a=(1); x='a[\\x24(scan_probe)]'; declare \"${x@E}=1\"",
+  "a=(1); x='a[\\x24(scan_probe)]'; y=${x@E}; echo $((y))",
+  'a=(1); x="$\'a[\\\\x24(scan_probe)]\'"; unset "${(Q)x}"',
+  'a=(1); x="$\'a[\\\\x24(scan_probe)]\'"; typeset "${(Q)x}=1"',
+  "a=(1); x=\"$'a[\\\\x24(scan_probe)]'\"; y=${(Q)x}; echo $((y))",
+  "a=(1); x='a[$'; x+='(scan_probe)]'; unset \"$x\"",
+  'a=(1); d=\'$\'; x="a[${d}(scan_probe)]"; unset "$x"',
+  "a=(1); x='a[$_1(scan_probe)]'; unset \"${x/_1/}\"",
+  "a=(1); x='a[$_1(scan_probe)]'; echo $(( ${x/_1/} ))",
+  "a=(1); x='a[$'; y='(scan_probe)]'; echo $(( $x$y ))",
+  "a=(1); read x <<< 'a[$\\(scan_probe)]'; echo $((x))",
+  "a=(1); printf -v x 'a[\\x24(scan_probe)]'; echo $((x))",
+  "a=(1); print -v x 'a[\\x24(scan_probe)]'; echo $((x))",
+  "a=(1); typeset -E x; x='a[$(scan_probe)]'",
+  "a=(1); typeset -F x; x='a[$(scan_probe)]'",
+  "a=(1); y='a[$(scan_probe)]'; typeset -E x=y",
+  "a=(1); y='a[$(scan_probe)]'; typeset -F x=y",
+  "a=(); declare a='([$(scan_probe)]=1)'",
+  "a=(); typeset a='([$(scan_probe)]=1)'",
+  "a=(); declare a+='([$(scan_probe)]=1)'",
+  "f() { local -a a; local a='([$(scan_probe)]=1)'; }; f",
+  "declare -a a; x='([$(scan_probe)]=1)'; declare a=$x",
+  "x=${NULLCMD::=scan_probe}; >/dev/null",
+  "x=${READNULLCMD::=scan_probe}; </dev/null",
+  ": a${NULLCMD::=scan_probe}; >/dev/null",
+  ": ${^NULLCMD::=scan_probe}; >/dev/null",
+  ": ${(f)NULLCMD::=scan_probe}; >/dev/null",
+  "print -vNULLCMD scan_probe; >/dev/null",
+  "(( ${NULLCMD::=scan_probe} )); >/dev/null",
+  "[[ -n ${NULLCMD::=scan_probe} ]]; >/dev/null",
+  "a=(${NULLCMD::=scan_probe}); >/dev/null",
+  ": <<EOF\n${NULLCMD::=scan_probe}\nEOF\n>/dev/null",
+  "PS4='$(scan_probe)'; set -x; x=1",
+  "PS4='$(scan_probe)'; set -o xtrace; x=1",
+  "export PS4='$(scan_probe)'; set -x; x=1",
+  "setopt -m 'glob*'; x='*(e:scan_probe:)'; echo $x",
+  "setopt -m '*subst*'; x='*(e:scan_probe:)'; echo $x",
+  "emulate sh; unsetopt shglob; setopt bareglobqual; x='*(e:scan_probe:)'; echo $x",
+  "emulate ksh; unsetopt shglob; setopt bareglobqual; x='*(e:scan_probe:)'; echo $x",
+  "a=(1); zregexparse 'a[$(scan_probe)]' 'a[$(scan_probe)]' x /x/",
+  "a=(1); private 'a[$(scan_probe)]=1'",
+  "a=(1); [[ x =~ (a )(b)]] || 0 -eq 'a[$(scan_probe)]' ]]",
+  "a=(1); [[ x =~ (a )(b)]] || -v 'a[$(scan_probe)]' ]]",
+  "a=(1); [[ -t 'a[$(scan_probe)]' ]]",
+  "a=(1); x='a[$(scan_probe)]'; [[ -t x ]]",
+  "a=(1); x='a[$(scan_probe)]'; [[ -t $x ]]",
+  "a=(1); test -t 'a[$(scan_probe)]'",
+  "a=(1); [ -t 'a[$(scan_probe)]' ]",
+  "a=(1); x='a[$(scan_probe)]'; test -t x",
+  "a=(1); x='a[$(scan_probe)]'; [ -t x ]",
+  "echo $\\\n'a\\''; scan_probe; : \\'",
+  ": <<$\\\n'EOF'\nEOF\nscan_probe\n$EOF",
+  ': <<$\\\n"EOF"\nEOF\nscan_probe\n$EOF',
+  "$\\\n'scan_probe'",
+  '$\\\n"scan_probe"',
+  "a=(1); unset $\\\n'a[\\x24(scan_probe)]'",
+  "echo \"${x:-$\\\n'\\x24(scan_probe)'}\"",
+  "[[ -n x ]\\\n] && scan_probe && [[ -n y ]]",
+  "a=(1); (\\\n( 'a[$(scan_probe)]' ))",
+  "a=(1); (\\\n( 1 + 'a[$(scan_probe)]' ))",
+  "a=(1); echo $(\\\n( 'a[$(scan_probe)]' ))",
+  "a=(1); x='a[$(scan_probe)]'; echo $(( x )\\\n)",
+  "a=(1); [\\\n[ -v 'a[$(scan_probe)]' ]]",
+  "a=(1); [\\\n[ 0 -eq 'a[$(scan_probe)]' ]]",
+  "a[0]\\\n=1 scan_probe",
+  "a[0]+\\\n=1 scan_probe",
+  "a=(); a[0]\\\n='a[$(scan_probe)]'; echo $((a[0]))",
+  "x='x y'; scan_probe[$x]\\\n=1",
+  "a=(1); x='a[$_1]'; y='(scan_probe)'; unset \"${x/_1/$y}\"",
+  "a=(1); x='a[$_1]'; y='(scan_probe)'; echo $(( ${x/_1/$y} ))",
+  "a=(1); x='a[$1'; y='(scan_probe)]'; echo $(( ${x%1}$y ))",
+  "a=(1); x='a[$1\n(scan_probe)]'; unset \"${x/1?/}\"",
+  "printf -v x 'a[\\x24\\x28scan_probe\\x29]'; echo $((x))",
+  "printf -v x 'a[\\044\\050scan_probe\\051]'; echo $((x))",
+  "a=(1); printf -v x 'a[\\u0024(scan_probe)]'; echo $((x))",
+  "a=(1); printf -v x 'a[\\U00000024(scan_probe)]'; echo $((x))",
+  "typeset -a a; print -v x 'a[\\x24\\x28scan_probe\\x29]'; echo $((x))",
+  "typeset -a a; print -v x 'a[\\044\\050scan_probe\\051]'; echo $((x))",
+  "typeset -a a; print -v x 'a[\\u0024\\u0028scan_probe\\u0029]'; echo $((x))",
+  "typeset -a a; print -v x 'a[\\U00000024\\U00000028scan_probe\\U00000029]'; echo $((x))",
+  'a=(1); x="$\'a[\\\\x24\\\\x28scan_probe\\\\x29]\'"; unset "${x:Q}"',
+  'a=(1); x="$\'a[\\\\x24\\\\x28scan_probe\\\\x29]\'"; unset "$x:Q"',
+  "a=(1); x=\"$'a[\\\\x24\\\\x28scan_probe\\\\x29]'\"; y=${x:Q}; echo $((y))",
+  "a=(1); read x <<'EOF'\na[$(scan_probe)]\nEOF\necho $((x))",
+  "a=(1); read x <<EOF\na[\\$(scan_probe)]\nEOF\necho $((x))",
+  "mapfile -t a <<'EOF'\nb[$(scan_probe)]\nEOF\necho $((a[0]))",
+  "a=(); declare a=\"$(echo '([$(scan_probe)]=1)')\"",
+  "a=(); declare a=\"`echo '([$(scan_probe)]=1)'`\"",
+  "a=(); set -- '([$(scan_probe)]=1)'; declare a=$1",
+  "a=(); set -- '([$(scan_probe)]=1)'; declare a=$@",
+  "a=(); set -- '([$(scan_probe)]=1)'; declare a=$*",
+  "a=(); set -- '([$(scan_probe)]=1)'; declare a=\"$1\"",
+  "x==(scan_probe)",
+  "x+==(scan_probe)",
+  "a=(1); a[1]==(scan_probe)",
+  "a=(1); a[1]+==(scan_probe)",
+  "export x==(scan_probe)",
+  "typeset x==(scan_probe)",
+  "f() { local x==(scan_probe); }; f",
+  "x==\\\n(scan_probe)",
+  "a=(1); ref='a[$(scan_probe)]'; echo ${\\\n!ref}",
+  "a=(1); ref='a[$(scan_probe)]'; echo \"${\\\n!ref}\"",
+  "a=(1); set -k; f() { echo $((x)); }; f x='a[$(scan_probe)]'",
+  "a=(1); set -o keyword; f() { echo $((x)); }; f x='a[$(scan_probe)]'",
+  "a=(1); set -k; test -v 'a[x]' x='a[$(scan_probe)]'",
+  "a=(1); set -o posix -k; : x='a[$(scan_probe)]'; echo $((x))",
+  "set -oglobsubst; x='*(e:scan_probe:)'; echo $x",
+  "set +onoglobsubst; x='*(e:scan_probe:)'; echo $x",
+  "setopt -oglobsubst; x='*(e:scan_probe:)'; echo $x",
+  "setopt +onoglobsubst; x='*(e:scan_probe:)'; echo $x",
+  "printf -vPS4 '\\x24(scan_probe)'; set -x; x=1",
+  "printf -vPS4 '\\044(scan_probe)'; set -x; x=1",
+  "functions[zshexit]=scan_probe",
+  "functions[TRAPEXIT]=scan_probe",
+  "functions[TRAPDEBUG]=scan_probe; x=1",
+  "functions=(zshexit scan_probe)",
+  ": ${functions[zshexit]::=scan_probe}",
+  "functions[echo]=scan_probe; echo hi",
+  "options[globsubst]=on; x='*(e:scan_probe:)'; echo $x",
+  "options=(globsubst on); x='*(e:scan_probe:)'; echo $x",
+  ": ${options[globsubst]::=on}; x='*(e:scan_probe:)'; echo $x",
+  "aliases[echo]=scan_probe; options[aliases]=on; : `echo`",
+  "galiases[echo]=scan_probe; options[aliases]=on; : `echo`",
+  "saliases[x]=scan_probe; options[aliases]=on; : `a.x`",
+  "commands[ls]=$(command -v scan_probe); ls",
+  "a=(1); [[ x == \"\" || ( 0 -eq 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ x != '' && ( 0 -eq 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ x != '' && ( -v 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ x != '' && ( -t 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ == && ( 0 -eq 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ -n == && ( 0 -eq 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ x == != || ( -t 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ x == == || ( 0 -eq 'a[$(scan_probe)]' ) ]]",
+  "a=(1); [[ ( -n == ) && ( 0 -eq 'a[$(scan_probe)]' ) ]]",
+  "[[ -n $$'\\'' ]]; scan_probe # ' ]]",
+  "a=($$'\\''); scan_probe # ')",
+  "echo ${x:-$$'\\''}; scan_probe # '}",
+  "export X=$$\\\n'\\''; scan_probe # '",
+  "export X=$'\\'; scan_probe; : '; cat <<E\n'\nE",
+  "export X=$\\\n$'\\'; scan_probe; : ' # '",
+  'a=(1); echo "$a[(r)\\],a[\\$(scan_probe)]]"',
+  'a=(1); echo "$?[1\\],a[\\$(scan_probe)]]"',
+  'export X="${unset:+${a[0}}"; scan_probe; : "]}}"',
+  "export X=${unset:+${a[0}}; scan_probe; : ]}}",
+  'export X=${unset:+${a["0}"}}; scan_probe; : ]}}',
+  'cat <<E; export X="${unset:+$(( 0 + "0 ))}" && scan_probe\n))}"\nE',
+  'false && export X="${unset:+$(( 0 }"; scan_probe; : "))}"',
+  'false && export X="${unset:+$(echo a}"; scan_probe; : ")}"',
+  'false && export X="${unset:+$(echo {a}"; scan_probe; : ")}"',
+  'false && export X="${unset:+$(echo a})}"; scan_probe; : "}"',
+  "export X=$$'\\' # '; scan_probe",
+  "export X=$$'\\' #\nexport Y='; scan_probe # '",
+  "export X=$^$'\\' # '; scan_probe",
+  "export X=$#$'\\' # '; scan_probe",
+  "export X=$'\\'\nscan_probe\n'",
+] as const
+
+// These also run inside every wrapper below.
+const nestedFixtures = [
+  "[[ a]]# ]] && scan_probe",
+  "{ export X={}# ; scan_probe; }",
+  "unset a[b; scan_probe; echo ]=1",
+  "case esac in (esac) scan_probe;; esac",
+  "case esac in (a|esac) scan_probe;; esac",
+  "for i in 1; { if true; then scan_probe; fi }; while false; do export X=1; done",
+  "(( echo '\"' ); scan_probe; ( echo '\"' ))",
+  "export X=${unset:+${x['0\"0']}}; scan_probe; : '\"]}}' # '",
+  "export X=$$'\\'; scan_probe # '",
+  ": <<-export\n\tex\\\n\tport\n# $(scan_probe)\nexport",
+  "!(scan_probe)",
+  "f+() case x in x) scan_probe;; esac; f+",
+  "f@g() case x in x) scan_probe;; esac; f@g",
+  "f@g() for i in 1; do scan_probe; done; f@g",
+] as const
+
+const wrappers: Array<[name: string, wrap: (inner: string) => string]> = [
+  ["$(...)", (inner) => `export OUTER=$( ${inner}\n)`],
+  ['"$(...)"', (inner) => `export OUTER="$( ${inner}\n)"`],
+  ["backticks", (inner) => `export OUTER=\` ${inner}\n\``],
+  ["heredoc", (inner) => `: <<EOF\n$( ${inner}\n)\nEOF`],
+  ["case arm", (inner) => `case x in x) ${inner}\n;; esac`],
+  ["for loop", (inner) => `for k in 1; do ${inner}\ndone`],
+  ["function", (inner) => `wrap_fn() {\n${inner}\n}; wrap_fn`],
+  ["brace group", (inner) => `{ ${inner}\n}`],
+]
+
+describe.skipIf(process.platform === "win32")("real-shell soundness oracle", () => {
+  test("discovers at least bash on PATH", () => {
+    expect(shells.some((item) => item.endsWith("/bash"))).toBe(true)
+  })
+
+  test.each([...fixtures, ...nestedFixtures])("reports or rejects real-shell execution: %j", (source) => {
+    expectProbesReported(source)
+  })
+
+  test.each(wrappers.flatMap(([name, wrap]) => nestedFixtures.map((source) => [name, source, wrap(source)])))(
+    "reports or rejects in %s: %j",
+    (_, __, source) => {
+      expectProbesReported(source)
+    },
+  )
+})
+
+describe.skipIf(process.platform === "win32")("real-shell directory oracle", () => {
+  test.each(["cd >/dev/null TARGET", "cd 2>/dev/null TARGET", "cd $'TARGET'", 'cd "TARGET"'])(
+    "reports the directory a real shell changes to: %s",
+    async (template) => {
+      const source = template.replace("TARGET", target)
+      const targets = [target, fs.realpathSync(target)]
+      const changed = shells.filter((executable) =>
+        targets.includes(observe(executable, `${source}\npwd >> "$SCAN_PROBE_LOG"`).at(-1) ?? ""),
+      )
+      expect(changed.length, `Fixture never changed directory in any real shell: ${source}`).toBeGreaterThan(0)
+      for (const executable of changed) {
+        const parsed = await Effect.runPromiseExit(ShellParse.scanPortable(source, executable, root))
+        if (Exit.isSuccess(parsed)) expect(parsed.value.directories, `${executable} in: ${source}`).toContain(target)
+      }
+    },
+  )
+})

packages/core/test/shell-scan/redirect.test.ts

@@ -38,6 +38,11 @@ describe("Bash redirect resource oracle", () => {
         `${redirect} FOO=bar git status 3>tail`,
         `npm run ${redirect} test`,
       ]) {
+        // Dash reads `&>` as `&` and `>`, so words after its target start another command there.
+        if (redirect.startsWith("&") && !command.endsWith(redirect)) {
+          expect(ShellScan.scan(command).kind).toBe("opaque")
+          continue
+        }
         await parity(command)
         for (const separator of separators) {
           await parity(`printf ok${separator}${command}`)
@@ -80,7 +85,6 @@ describe("Bash redirect resource oracle", () => {
     "pwd | cat 2\\>out",
     "if true; then printf ok && cat >$(printf path); fi",
     "if true; then printf ok && git >out status; else cat >log; fi",
-    "pwd && cd >out /outside",
     "time git status",
     "time -p git status",
     "coproc git status",
@@ -151,4 +155,12 @@ describe("Bash redirect resource oracle", () => {
       { resource: "FOO=bar >output git status", save: "git status *" },
     ])
   })
+
+  test("known gap: redirect before cd operand retains the target directory natively", async () => {
+    const source = "pwd && cd >out /outside"
+    const legacy = await Effect.runPromise(ShellParse.scan(source, "/bin/bash", "/workspace"))
+    const native = await Effect.runPromise(ShellParse.scanPortable(source, "/bin/bash", "/workspace"))
+    expect(legacy).toEqual({ commands: [{ resource: "pwd", save: "pwd *" }], directories: [] })
+    expect(native).toEqual({ commands: [{ resource: "pwd", save: "pwd *" }], directories: ["/outside"] })
+  })
 })

packages/core/test/shell-scan/scan.test.ts

@@ -217,6 +217,8 @@ describe("ShellScan", () => {
     ["CDPATH=/usr # comment\ncd bin; rm victim", ["cd", "rm"]],
     ["HOME=/etc # comment\ncd; rm victim", ["cd", "rm"]],
     ["VALUE=$(printf 2); echo $((VALUE + 1))", ["printf", "echo"]],
+    ["MSG='Use ${FOO} here'; some_cmd || exit $?", ["some_cmd", "exit"]],
+    ["f() { local REGEX='[0-9]+${FOO}'; return $?; }", ["local", "return"]],
   ] as const)("scans assignment-only boundaries without evaluating their effects: %s", (command, names) => {
     const result = ShellScan.scan(command)
     expect(result.kind).toBe("scanned")
@@ -234,8 +236,6 @@ describe("ShellScan", () => {
     "{fd}>/tmp/log touch /tmp/victim",
     "time touch /tmp/victim",
     "printf '%s' \"$(printf safe ${x%)}; touch /tmp/victim)\"",
-    "s=abc; x='a[$(touch /tmp/victim)0]'; printf '%s' \"${s:x}\"",
-    "ref='x[$(touch /tmp/victim)0]'; printf '%s' \"${!ref}\"",
     "if true; then echo safe; fi > /tmp/victim",
     "if true; then :; 'if' victim; fi",
   ])("scans Bash lexical forms without interpreting shell values: %s", (command) => {

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opencode/desktop",
   "private": true,
-  "version": "2.0.23",
+  "version": "2.0.22",
   "type": "module",
   "license": "MIT",
   "homepage": "https://opencode.ai",

packages/desktop/scripts/publish.ts

@@ -4,26 +4,20 @@ import { Script } from "@opencode/script"
 import { UpdateArtifact } from "../../../script/update-artifact"
 
 const dryRun = process.argv.includes("--dry-run")
-
 if (!Script.release) {
   console.log("skipped desktop publication without a release")
   process.exit(0)
 }
-
 const directory = process.env.OPENCODE_DESKTOP_DIST
-
 if (!directory) throw new Error("OPENCODE_DESKTOP_DIST is required")
-
 const files = (
   await Array.fromAsync(
     new Bun.Glob("*.{exe,blockmap,dmg,zip,AppImage,deb,rpm,app.tar.gz}").scan({ cwd: directory, absolute: true }),
   )
 ).sort()
-
 if (!files.length) throw new Error("No desktop release files found")
 
 const uploaded = await UpdateArtifact.upload({ version: Script.version, files, dryRun })
-
 const artifact = {
   channel: Script.channel,
   name: "desktop",
@@ -31,9 +25,7 @@ const artifact = {
   version: Script.version,
   metadata: { files: uploaded, ...(await metadata(Script.version, uploaded)) },
 }
-
 if (dryRun) console.log(`dry-run artifact: ${JSON.stringify(artifact)}`)
-
 if (!dryRun) await UpdateArtifact.publish(artifact)
 
 type DesktopFile = {
@@ -45,9 +37,7 @@ type DesktopFile = {
 
 async function metadata(version: string, files: Record<string, { url: string }>) {
   const directory = process.env.LATEST_YML_DIR
-
   if (!directory) throw new Error("LATEST_YML_DIR is required")
-
   const entries = await Promise.all(
     [
       {
@@ -74,75 +64,54 @@ async function metadata(version: string, files: Record<string, { url: string }>)
         await Promise.all(
           item.sources.map(async ([subdirectory, source]) => {
             const file = Bun.file(`${directory}/${subdirectory}/${source}`)
-
             if (!(await file.exists())) return undefined
-
             return parse(await file.text(), version, files)
           }),
         )
       ).filter((manifest) => manifest !== undefined)
-
       if (manifests.length !== item.sources.length) return undefined
-
       return [
         item.name,
         { files: manifests.flatMap((manifest) => manifest.files), releaseDate: manifests[0]!.releaseDate },
       ] as const
     }),
   )
-
   if (entries.some((entry) => entry === undefined)) throw new Error("Desktop update metadata is incomplete")
   const manifests = Object.fromEntries(entries.filter((entry) => entry !== undefined))
-
   return { manifests }
 }
 
 function parse(content: string, version: string, uploaded: Record<string, { url: string }>) {
   const lines = content.split("\n")
-
   const found = lines
     .find((line) => line.startsWith("version:"))
     ?.slice("version:".length)
     .trim()
-
   if (found !== version) throw new Error(`Desktop metadata version mismatch: expected ${version}, got ${found}`)
-
   const releaseDate = lines
     .find((line) => line.startsWith("releaseDate:"))
     ?.slice("releaseDate:".length)
     .trim()
     .replace(/^['"]|['"]$/g, "")
-
   if (!releaseDate) throw new Error("Desktop metadata did not include a release date")
   const files: DesktopFile[] = []
   lines.forEach((line) => {
     const value = line.trim()
-
     if (value.startsWith("- url:")) {
       const name = value.slice("- url:".length).trim()
       const filename = name.startsWith("http") ? decodeURIComponent(new URL(name).pathname.split("/").pop()!) : name
       const url = uploaded[filename]?.url
-
       if (!url) throw new Error(`Desktop update file was not uploaded: ${filename}`)
       files.push({ url, sha512: "", size: 0 })
-
       return
     }
-
     const current = files.at(-1)
-
-    // electron-builder repeats the first file's sha512 as a top-level legacy field after the list.
-    if (!current || !line.startsWith(" ")) return
-
+    if (!current) return
     if (value.startsWith("sha512:")) current.sha512 = value.slice("sha512:".length).trim()
-
     if (value.startsWith("size:")) current.size = Number(value.slice("size:".length).trim())
-
     if (value.startsWith("blockMapSize:")) current.blockMapSize = Number(value.slice("blockMapSize:".length).trim())
   })
-
   if (!files.length || files.some((file) => !file.sha512 || !file.size))
     throw new Error("Desktop metadata contained an incomplete file")
-
   return { files, releaseDate }
 }

packages/enterprise/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode/enterprise",
-  "version": "2.0.23",
+  "version": "2.0.22",
   "private": true,
   "type": "module",
   "license": "MIT",