refactor(ai): track reasoning by output index

Keep reasoning streams coherent when compatible providers omit item IDs. Synthetic IDs remain internal, while provider-issued IDs are retained for safe replay when they arrive later.

.github/workflows/pr-standards.yml

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

.github/workflows/test.yml

@@ -22,36 +22,6 @@ env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
 jobs:
-  affected:
-    name: affected packages
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    outputs:
-      app: ${{ steps.packages.outputs.app }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
-        with:
-          bun-version-file: package.json
-
-      - name: Find affected packages
-        id: packages
-        env:
-          TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha || github.event.before }}
-          TURBO_SCM_HEAD: ${{ github.sha }}
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "app=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          bun x turbo@2.10.2 ls --affected --filter=@opencode-ai/app --output=json > affected.json
-          bun -e 'const result = await Bun.file("affected.json").json(); console.log(`app=${result.packages.count > 0}`)' >> "$GITHUB_OUTPUT"
-
   unit:
     name: unit (${{ matrix.settings.name }})
     strategy:
@@ -163,7 +133,7 @@ jobs:
 
   e2e:
     name: e2e (${{ matrix.settings.name }})
-    needs: affected
+    if: github.ref_name != 'v2' && github.head_ref != 'v2'
     strategy:
       fail-fast: false
       matrix:
@@ -174,38 +144,32 @@ jobs:
             host: blacksmith-4vcpu-windows-2025
     runs-on: ${{ matrix.settings.host }}
     env:
-      E2E_ENABLED: ${{ needs.affected.outputs.app == 'true' && github.ref_name != 'v2' && github.head_ref != 'v2' }}
       PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/.playwright-browsers
     defaults:
       run:
         shell: bash
     steps:
       - name: Checkout repository
-        if: env.E2E_ENABLED == 'true'
         uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Node
-        if: env.E2E_ENABLED == 'true'
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           # Playwright 1.59 hangs while extracting Chromium with Node 24.16.
           node-version: "24.15"
 
       - name: Setup Bun
-        if: env.E2E_ENABLED == 'true'
         uses: ./.github/actions/setup-bun
 
       - name: Read Playwright version
-        if: env.E2E_ENABLED == 'true'
         id: playwright-version
         run: |
           version=$(node -e 'console.log(require("./package.json").workspaces.catalog["@playwright/test"])')
           echo "version=$version" >> "$GITHUB_OUTPUT"
 
       - name: Cache Playwright browsers
-        if: env.E2E_ENABLED == 'true'
         id: playwright-cache
         uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
@@ -213,24 +177,23 @@ jobs:
           key: ${{ runner.os }}-${{ runner.arch }}-playwright-${{ steps.playwright-version.outputs.version }}-chromium
 
       - name: Install Playwright system dependencies
-        if: env.E2E_ENABLED == 'true' && runner.os == 'Linux'
+        if: runner.os == 'Linux'
         working-directory: packages/app
         run: bunx playwright install-deps chromium
 
       - name: Install Playwright browsers
-        if: env.E2E_ENABLED == 'true' && steps.playwright-cache.outputs.cache-hit != 'true'
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
         working-directory: packages/app
         run: bunx playwright install chromium
 
       - name: Run app e2e tests
-        if: env.E2E_ENABLED == 'true'
         run: bun --cwd packages/app test:e2e:local
         env:
           CI: true
         timeout-minutes: 30
 
       - name: Upload Playwright artifacts
-        if: always() && env.E2E_ENABLED == 'true'
+        if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: playwright-${{ matrix.settings.name }}-${{ github.run_attempt }}

bun.lock

@@ -430,7 +430,6 @@
       },
       "devDependencies": {
         "@actions/artifact": "4.0.0",
-        "@brendonovich/vite-plugin-opencode": "0.1.1",
         "@lydell/node-pty": "catalog:",
         "@opencode-ai/app": "workspace:*",
         "@opencode-ai/client": "workspace:*",
@@ -686,7 +685,6 @@
       "version": "1.18.4",
       "dependencies": {
         "@effect/platform-node": "catalog:",
-        "@effect/platform-node-shared": "catalog:",
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
         "@opencode-ai/schema": "workspace:*",
@@ -1612,8 +1610,6 @@
 
     "@braintree/sanitize-url": ["@braintree/sanitize-url@7.1.2", "", {}, "sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA=="],
 
-    "@brendonovich/vite-plugin-opencode": ["@brendonovich/vite-plugin-opencode@0.1.1", "", { "dependencies": { "@babel/core": "^7.29.0", "@opencode-ai/client": "0.0.0-beta-18050" }, "peerDependencies": { "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-aPG0ct8ctxAqndbNOx7NW0GhU6QY6sOUfi/DaKqH9c5WdxICSsUop6uSkJwPDHP9WpN9eg0dd2D2qwYpG6UdHw=="],
-
     "@bruits/satteri-darwin-arm64": ["@bruits/satteri-darwin-arm64@0.9.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-iw4nZgx9v30lWo/MTngQqi1pI78KI0DnkSm+lVJGYdmPLgAyDNJigVhpG42/Iq55A6c1Ll8q66ljyyRiQUxwow=="],
 
     "@bruits/satteri-darwin-x64": ["@bruits/satteri-darwin-x64@0.9.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-6T26Z5Kf3cFW2PSlk9p7zT7yVxvuBSiJvYyz9u8KjYwMTqZyIDOj2wDyNpxKV4+6yUVG7rddq2QwvG/8LJA2+Q=="],
@@ -6136,8 +6132,6 @@
 
     "@babel/preset-env/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
 
-    "@brendonovich/vite-plugin-opencode/@opencode-ai/client": ["@opencode-ai/client@0.0.0-beta-18050", "", { "dependencies": { "@opencode-ai/protocol": "0.0.0-beta-18050", "@opencode-ai/schema": "0.0.0-beta-18050" }, "peerDependencies": { "effect": "4.0.0-rc.111", "solid-js": ">=1.9.0" }, "optionalPeers": ["effect", "solid-js"] }, "sha512-zWZv5X23iyx+/mxwiAi18YY/VMjQofTaH7RyKMBt7KL6FmaKAWf9Q05zbQhrLX8DYJD3MOtbjBeQCGLsPUDU8g=="],
-
     "@bruits/satteri-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.11.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.2", "tslib": "^2.4.0" } }, "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ=="],
 
     "@bruits/satteri-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.11.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw=="],
@@ -6962,10 +6956,6 @@
 
     "@babel/helper-compilation-targets/lru-cache/yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],
 
-    "@brendonovich/vite-plugin-opencode/@opencode-ai/client/@opencode-ai/protocol": ["@opencode-ai/protocol@0.0.0-beta-18050", "", { "dependencies": { "@opencode-ai/schema": "0.0.0-beta-18050", "effect": "4.0.0-rc.111" } }, "sha512-HDQMnvGp8IU0MdBRbEuydX1WQm09BZ4HJm9iSMQwzweJuQ2HNscgzHJPIH6P02BsbbtfJ8J7sZGPItrz1tWSgw=="],
-
-    "@brendonovich/vite-plugin-opencode/@opencode-ai/client/@opencode-ai/schema": ["@opencode-ai/schema@0.0.0-beta-18050", "", { "dependencies": { "@standard-schema/spec": "1.1.0", "effect": "4.0.0-rc.111" } }, "sha512-/D6VXaWlytTXR3IOiMLIKuPcfp7FQNUzRPm9z3K7UBFd1Bw4q/WZksaf5RVcBGz+0YRxYMc1V4D7MFlceSgtyg=="],
-
     "@bruits/satteri-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.2.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA=="],
 
     "@electron/asar/minimatch/brace-expansion": ["brace-expansion@1.1.18", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw=="],

bunfig.toml

@@ -2,7 +2,7 @@
 exact = true
 # Only install newly resolved package versions published at least 3 days ago.
 minimumReleaseAge = 259200
-minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@brendonovich/vite-plugin-opencode", "@opencode-ai/sdk", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish", "blume"]
+minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@opencode-ai/sdk", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish", "blume"]
 
 [test]
 root = "./do-not-run-tests-from-root"

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-3Jx1Q7hl+Y0Log/k2vd5y6dzBpzFKWlhShPESxn1Rm4=",
-    "aarch64-linux": "sha256-EiiI6g01oBIrExCMAUgT3w82P0fvu4FAJhI32C+ze0I=",
-    "aarch64-darwin": "sha256-s+w49HRp1+ewtiTaU65tPWjUiO1NQw3kzfemMEEQZb0=",
-    "x86_64-darwin": "sha256-/Ee5V7pnL/qm3c4ZHeWEjH7FhGVXArXryOugbG5vsz8="
+    "x86_64-linux": "sha256-2bkzaLe/n63btVRQNhu8LXCtMZJArX1Kedi5U40l1xw=",
+    "aarch64-linux": "sha256-5Cs9M3hvDKAymo71y8oZ7jj3pEm+MI+HHhuSuV7UvtM=",
+    "aarch64-darwin": "sha256-LsJcuxE/NMu+vUFdpBKHc2z0sC0C5bRMlH1Kj+ns9dY=",
+    "x86_64-darwin": "sha256-KDjmKC3JZD8I5A7gi+dYIl0dgHVt20/DwkM9RKBWiJk="
   }
 }

packages/ai/src/image-client.ts

@@ -1,8 +1,7 @@
 import { Context, Effect, Layer } from "effect"
 import { RequestExecutor } from "./route/executor.js"
-import { mergeHttpOptions, type AIError } from "./schema/index.js"
-import { sanitizeSurrogates } from "./utils/sanitize.js"
 import type { ImageOptions, ImageRequest, ImageRequestFor, ImageResponse } from "./image.js"
+import type { AIError } from "./schema/index.js"
 
 export type Execute = RequestExecutor.Interface["execute"]
 
@@ -27,18 +26,7 @@ export const layer: Layer.Layer<Service, never, RequestExecutor.Service> = Layer
   Effect.gen(function* () {
     const executor = yield* RequestExecutor.Service
     return Service.of({
-      generate: (request) =>
-        request.model.route.generate(
-          {
-            ...sanitizeSurrogates({
-              ...request,
-              model: undefined,
-              http: mergeHttpOptions(request.model.http, request.http),
-            }),
-            model: request.model,
-          },
-          executor.execute,
-        ),
+      generate: (request) => request.model.route.generate(request, executor.execute),
     })
   }),
 )

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

@@ -1,5 +1,5 @@
 import { Buffer } from "node:buffer"
-import { Effect, Option, Schema } from "effect"
+import { Effect, Schema } from "effect"
 import { Tool } from "@opencode-ai/schema/tool"
 import { Route } from "../route/client.js"
 import { Auth } from "../route/auth.js"
@@ -361,8 +361,6 @@ const AnthropicStreamBlock = Schema.Struct({
   tool_use_id: Schema.optional(Schema.String),
   content: Schema.optional(Schema.Unknown),
 })
-type AnthropicStreamBlock = Schema.Schema.Type<typeof AnthropicStreamBlock>
-const decodeAnthropicStreamBlock = Schema.decodeUnknownOption(AnthropicStreamBlock)
 
 const AnthropicStreamDelta = Schema.Struct({
   type: Schema.optional(Schema.String),
@@ -373,15 +371,13 @@ const AnthropicStreamDelta = Schema.Struct({
   stop_reason: optionalNull(Schema.String),
   stop_sequence: optionalNull(Schema.String),
 })
-type AnthropicStreamDelta = Schema.Schema.Type<typeof AnthropicStreamDelta>
-const decodeAnthropicStreamDelta = Schema.decodeUnknownOption(AnthropicStreamDelta)
 
 const AnthropicEvent = Schema.Struct({
   type: Schema.String,
   index: Schema.optional(Schema.Number),
   message: Schema.optional(Schema.Struct({ usage: Schema.optional(AnthropicUsage) })),
-  content_block: Schema.optional(Schema.Unknown),
-  delta: Schema.optional(Schema.Unknown),
+  content_block: Schema.optional(AnthropicStreamBlock),
+  delta: Schema.optional(AnthropicStreamDelta),
   usage: Schema.optional(AnthropicUsage),
   // `type` and `message` are both required per Anthropic's spec, but
   // OpenAI-compatible proxies and gateway translations occasionally drop one
@@ -1110,7 +1106,7 @@ const SERVER_TOOL_RESULT_NAMES: Record<AnthropicServerToolResultType, string> =
 
 const isServerToolResultType = (type: string): type is AnthropicServerToolResultType => type in SERVER_TOOL_RESULT_NAMES
 
-const serverToolResultEvent = (block: AnthropicStreamBlock): LLMEvent | undefined => {
+const serverToolResultEvent = (block: NonNullable<AnthropicEvent["content_block"]>): LLMEvent | undefined => {
   if (!block.type || !isServerToolResultType(block.type)) return undefined
   const errorPayload =
     typeof block.content === "object" && block.content !== null && "type" in block.content
@@ -1137,10 +1133,7 @@ const onMessageStart = (state: ParserState, event: AnthropicEvent): StepResult =
   return [usage ? { ...state, usage: mergeUsage(state.usage, usage) } : state, NO_EVENTS]
 }
 
-const onContentBlockStart = (
-  state: ParserState,
-  event: AnthropicEvent & { readonly content_block: AnthropicStreamBlock },
-): StepResult => {
+const onContentBlockStart = (state: ParserState, event: AnthropicEvent): StepResult => {
   const block = event.content_block
   if (!block) return [state, NO_EVENTS]
 
@@ -1231,12 +1224,11 @@ const onContentBlockStart = (
 
 const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(function* (
   state: ParserState,
-  event: AnthropicEvent & { readonly delta: AnthropicStreamDelta },
+  event: AnthropicEvent,
 ) {
   const delta = event.delta
 
   if (delta?.type === "text_delta" && delta.text) {
-    if (!state.lifecycle.text.has(`text-${event.index ?? 0}`)) return [state, NO_EVENTS] satisfies StepResult
     const events: LLMEvent[] = []
     return [
       { ...state, lifecycle: Lifecycle.textDelta(state.lifecycle, events, `text-${event.index ?? 0}`, delta.text) },
@@ -1245,7 +1237,6 @@ const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(f
   }
 
   if (delta?.type === "thinking_delta" && delta.thinking) {
-    if (!state.lifecycle.reasoning.has(`reasoning-${event.index ?? 0}`)) return [state, NO_EVENTS] satisfies StepResult
     const events: LLMEvent[] = []
     return [
       {
@@ -1258,7 +1249,6 @@ const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(f
 
   if (delta?.type === "signature_delta" && delta.signature) {
     const index = event.index ?? 0
-    if (!state.lifecycle.reasoning.has(`reasoning-${index}`)) return [state, NO_EVENTS] satisfies StepResult
     return [
       {
         ...state,
@@ -1311,10 +1301,7 @@ const onContentBlockStop = Effect.fn("AnthropicMessages.onContentBlockStop")(fun
   return [{ ...state, lifecycle, tools: result.tools, reasoningSignatures }, events] satisfies StepResult
 })
 
-const onMessageDelta = (
-  state: ParserState,
-  event: AnthropicEvent & { readonly delta?: AnthropicStreamDelta },
-): StepResult => {
+const onMessageDelta = (state: ParserState, event: AnthropicEvent): StepResult => {
   const usage = mergeUsage(state.usage, mapUsage(event.usage))
   return [
     {
@@ -1369,49 +1356,11 @@ const onError = (event: AnthropicEvent) =>
     }),
   )
 
-const isKnownStreamBlockType = (type: string) =>
-  type === "text" ||
-  type === "thinking" ||
-  type === "redacted_thinking" ||
-  type === "tool_use" ||
-  type === "server_tool_use" ||
-  isServerToolResultType(type)
-
-const isKnownStreamDeltaType = (type: string) =>
-  type === "text_delta" || type === "thinking_delta" || type === "signature_delta" || type === "input_json_delta"
-
-const invalidStreamEvent = (event: AnthropicEvent) =>
-  Effect.fail(
-    ProviderShared.eventError(
-      ADAPTER,
-      "Invalid anthropic/anthropic-messages stream event",
-      ProviderShared.encodeJson(event),
-    ),
-  )
-
 const step = (state: ParserState, event: AnthropicEvent) => {
-  if (!SSE_EVENTS.has(event.type)) return Effect.succeed<StepResult>([state, NO_EVENTS])
-  if (
-    event.type !== "content_block_start" &&
-    event.content_block !== undefined &&
-    Option.isNone(decodeAnthropicStreamBlock(event.content_block))
-  )
-    return invalidStreamEvent(event)
-  if (
-    event.type !== "content_block_delta" &&
-    event.delta !== undefined &&
-    Option.isNone(decodeAnthropicStreamDelta(event.delta))
-  )
-    return invalidStreamEvent(event)
   if (event.type === "message_start") return Effect.succeed(onMessageStart(state, event))
   if (event.type === "content_block_start") {
-    if (!ProviderShared.isRecord(event.content_block) || typeof event.content_block.type !== "string")
-      return invalidStreamEvent(event)
-    if (!isKnownStreamBlockType(event.content_block.type)) return Effect.succeed<StepResult>([state, NO_EVENTS])
-    const decoded = decodeAnthropicStreamBlock(event.content_block)
-    if (Option.isNone(decoded)) return invalidStreamEvent(event)
-    const block = decoded.value
-    if (block.type === "tool_use" || block.type === "server_tool_use") {
+    const block = event.content_block
+    if (block && (block.type === "tool_use" || block.type === "server_tool_use")) {
       if (event.index === undefined)
         return Effect.fail(ProviderShared.eventError(ADAPTER, `Anthropic ${block.type} missing index`))
       if (!block.id)
@@ -1419,22 +1368,11 @@ const step = (state: ParserState, event: AnthropicEvent) => {
           ProviderShared.eventError(ADAPTER, `Anthropic tool_use missing id at index ${event.index}`),
         )
     }
-    return Effect.succeed(onContentBlockStart(state, { ...event, content_block: block }))
-  }
-  if (event.type === "content_block_delta") {
-    if (!ProviderShared.isRecord(event.delta)) return invalidStreamEvent(event)
-    if (typeof event.delta.type === "string" && !isKnownStreamDeltaType(event.delta.type))
-      return Effect.succeed<StepResult>([state, NO_EVENTS])
-    const decoded = decodeAnthropicStreamDelta(event.delta)
-    if (Option.isNone(decoded)) return invalidStreamEvent(event)
-    return onContentBlockDelta(state, { ...event, delta: decoded.value })
+    return Effect.succeed(onContentBlockStart(state, event))
   }
+  if (event.type === "content_block_delta") return onContentBlockDelta(state, event)
   if (event.type === "content_block_stop") return onContentBlockStop(state, event)
-  if (event.type === "message_delta") {
-    const decoded = decodeAnthropicStreamDelta(event.delta)
-    if (Option.isNone(decoded)) return invalidStreamEvent(event)
-    return Effect.succeed(onMessageDelta(state, { ...event, delta: decoded.value }))
-  }
+  if (event.type === "message_delta") return Effect.succeed(onMessageDelta(state, event))
   if (event.type === "message_stop") return onMessageStop(state)
   if (event.type === "error") return onError(event)
   return Effect.succeed<StepResult>([state, NO_EVENTS])

packages/ai/src/protocols/bedrock-converse.ts

@@ -212,7 +212,11 @@ const BedrockEvent = Schema.Struct({
       metrics: Schema.optional(Schema.Unknown),
     }),
   ),
-  exception: Schema.optional(Schema.Struct({ type: Schema.String, details: BedrockStreamException })),
+  internalServerException: Schema.optional(BedrockStreamException),
+  modelStreamErrorException: Schema.optional(BedrockStreamException),
+  validationException: Schema.optional(BedrockStreamException),
+  throttlingException: Schema.optional(BedrockStreamException),
+  serviceUnavailableException: Schema.optional(BedrockStreamException),
 })
 type BedrockEvent = Schema.Schema.Type<typeof BedrockEvent>
 
@@ -646,14 +650,22 @@ const step = (state: ParserState, event: BedrockEvent) =>
       ] as const
     }
 
-    if (event.exception) {
+    const exception = (
+      [
+        ["internalServerException", event.internalServerException],
+        ["modelStreamErrorException", event.modelStreamErrorException],
+        ["serviceUnavailableException", event.serviceUnavailableException],
+        ["throttlingException", event.throttlingException],
+        ["validationException", event.validationException],
+      ] as const
+    ).find((entry) => entry[1] !== undefined)
+    if (exception) {
       return yield* new AIError({
         module: ADAPTER,
         method: "stream",
         reason: classifyProviderFailure({
-          message:
-            event.exception.details.message ?? event.exception.details.originalMessage ?? "Bedrock Converse stream error",
-          code: event.exception.type,
+          message: exception[1]?.message ?? exception[1]?.originalMessage ?? "Bedrock Converse stream error",
+          code: exception[0],
         }),
       })
     }
@@ -704,7 +716,7 @@ export const protocol = Protocol.make({
       reasoningSignatures: {},
     }),
     step,
-    onHalt: (state) => Effect.succeed(onHalt(state)),
+    onHalt,
   },
 })
 

packages/ai/src/protocols/bedrock-event-stream.ts

@@ -82,7 +82,7 @@ const consumeFrames = (route: string) => (state: FrameBufferState, chunk: Uint8A
         "Failed to parse Bedrock Converse event-stream payload",
       )) as Record<string, unknown>
       delete parsed.p
-      out.push(messageType === "exception" ? { exception: { type: eventType, details: parsed } } : { [eventType]: parsed })
+      out.push({ [eventType]: parsed })
     }
     return [cursor, out] as const
   })

packages/ai/src/protocols/gemini.ts

@@ -718,7 +718,7 @@ export const protocol = Protocol.make({
       lifecycle: Lifecycle.initial(),
     }),
     step,
-    onHalt: (state) => Effect.succeed(finish(state)),
+    onHalt: finish,
   },
 })
 

packages/ai/src/protocols/open-responses-continuation.ts

@@ -154,12 +154,7 @@ export const driver = (input: DriverInput): WebSocketChannelDriver => {
           ...observation,
           checkpoint: {
             protocol: PROTOCOL,
-            value: {
-              version: VERSION,
-              responseID,
-              request,
-              output: event.response?.output ? [...event.response.output] : output.slice(),
-            } satisfies CheckpointValue,
+            value: { version: VERSION, responseID, request, output: output.slice() } satisfies CheckpointValue,
           },
         }
       }),

packages/ai/src/protocols/open-responses.ts

@@ -79,60 +79,10 @@ const OpenResponsesReasoningItem = Schema.Struct({
   encrypted_content: optionalNull(Schema.String),
 })
 
-const OpenResponsesWebSearchCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("web_search_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    action: optionalNull(JsonObject),
-  }),
-  [JsonObject],
-)
-
-const OpenResponsesFileSearchCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("file_search_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    queries: Schema.optional(Schema.Array(Schema.String)),
-    results: optionalNull(Schema.Array(JsonObject)),
-  }),
-  [JsonObject],
-)
-
-const OpenResponsesCodeInterpreterCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("code_interpreter_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    code: optionalNull(Schema.String),
-    container_id: optionalNull(Schema.String),
-    outputs: optionalNull(Schema.Array(JsonObject)),
-  }),
-  [JsonObject],
-)
-
-const OpenResponsesMCPCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("mcp_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    server_label: Schema.optional(Schema.String),
-    name: Schema.optional(Schema.String),
-    arguments: Schema.optional(Schema.String),
-    output: optionalNull(Schema.String),
-    error: Schema.optional(Schema.Unknown),
-  }),
-  [JsonObject],
-)
-
-export const HostedToolItem = Schema.Union([
-  OpenResponsesWebSearchCall,
-  OpenResponsesFileSearchCall,
-  OpenResponsesCodeInterpreterCall,
-  OpenResponsesMCPCall,
-])
-export type HostedToolItem = Schema.Schema.Type<typeof HostedToolItem>
+const OpenResponsesItemReference = Schema.Struct({
+  type: Schema.tag("item_reference"),
+  id: Schema.String,
+})
 
 // `function_call_output.output` accepts either a plain string or an ordered
 // array of content items so tools can return images and files in addition to text.
@@ -161,6 +111,7 @@ export const InputItem = Schema.Union([
     phase: Schema.optionalKey(MessagePhase),
   }),
   OpenResponsesReasoningItem,
+  OpenResponsesItemReference,
   Schema.Struct({
     type: Schema.tag("function_call"),
     id: Schema.optionalKey(Schema.String),
@@ -173,17 +124,10 @@ export const InputItem = Schema.Union([
     call_id: Schema.String,
     output: OpenResponsesFunctionCallOutput,
   }),
-  HostedToolItem,
 ])
 type OpenResponsesInputItem = Schema.Schema.Type<typeof InputItem>
-export type ExtendedHostedToolItem = {
-  readonly type: string
-  readonly id: string
-  readonly [key: string]: unknown
-}
 type LoweredInputItem =
   | OpenResponsesInputItem
-  | ExtendedHostedToolItem
   | {
       readonly type: "message"
       readonly id?: string
@@ -341,7 +285,6 @@ export const Event = Schema.StructWithRest(
   Schema.Struct({
     type: Schema.String,
     delta: Schema.optional(Schema.String),
-    arguments: Schema.optional(Schema.String),
     text: Schema.optional(Schema.String),
     item_id: Schema.optional(Schema.String),
     output_index: Schema.optional(Schema.Number),
@@ -353,7 +296,6 @@ export const Event = Schema.StructWithRest(
           id: Schema.optional(Schema.String),
           service_tier: optionalNull(Schema.String),
           incomplete_details: optionalNull(Schema.Struct({ reason: Schema.optional(Schema.String) })),
-          output: Schema.optional(Schema.Array(StreamItem)),
           usage: optionalNull(OpenResponsesUsage),
           error: optionalNull(OpenResponsesErrorPayload),
         }),
@@ -373,7 +315,7 @@ export const Event = Schema.StructWithRest(
 export type Event = Schema.Schema.Type<typeof Event>
 
 // Which lowered input item a persisted item id is about to be attached to.
-export type ItemKind = "message" | "reasoning" | "function-call" | "hosted-tool"
+export type ItemKind = "message" | "reasoning" | "function-call" | "reference"
 
 export interface Extension {
   readonly id: string
@@ -383,7 +325,6 @@ export interface Extension {
     readonly media: ProviderShared.NormalizedMedia
     readonly request: LLMRequest
   }) => MediaInput | undefined
-  readonly lowerHostedToolItem?: (item: unknown) => ExtendedHostedToolItem | undefined
   // Optional grammar check applied before a persisted item id is resent as
   // part of replayed history. Returning false drops the id; every lowered
   // item treats a dropped id the same as an absent one.
@@ -399,15 +340,17 @@ export interface ParserState {
   readonly tools: ToolStream.State<string>
   readonly hasFunctionCall: boolean
   readonly lifecycle: Lifecycle.State
-  readonly outputItems: Readonly<Record<number, string>>
   readonly messageItems: ReadonlySet<string>
   readonly messagePhases: Readonly<Record<string, MessagePhase | null>>
   readonly reasoningItems: Readonly<Record<string, ReasoningStreamItem>>
+  readonly store: boolean | undefined
 }
 
 type ReasoningSummaryStatus = "active" | "can-conclude" | "concluded"
 
 interface ReasoningStreamItem {
+  readonly providerItemID: string | undefined
+  readonly outputIndex: number | undefined
   readonly encryptedContent: string | null | undefined
   // Keyed by the wire protocol's numeric `summary_index`. JS object keys coerce to
   // strings, but typing the map as `Record<number, ...>` documents intent
@@ -587,6 +530,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
   const system: LoweredInputItem[] =
     request.system.length === 0 ? [] : [{ role: "system", content: ProviderShared.joinText(request.system) }]
   const input: LoweredInputItem[] = [...system]
+  const store = OpenResponsesOptions.resolve(request).store
   const providerMetadataKey = request.model.route.providerMetadataKey ?? "openresponses"
 
   for (const message of request.messages) {
@@ -609,7 +553,8 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
     if (message.role === "assistant") {
       const content: TextPart[] = []
       const reasoningItems: Record<string, OpenResponsesReasoningInput> = {}
-      const hostedToolItems = new Set<string>()
+      const reasoningReferences = new Set<string>()
+      const hostedToolReferences = new Set<string>()
       const flushText = () => {
         if (content.length === 0) return
         const groups = content.reduce<
@@ -644,6 +589,11 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
           flushText()
           const reasoning = lowerReasoning(part, providerMetadataKey, extension)
           if (!reasoning) continue
+          if (store !== false) {
+            if (!reasoningReferences.has(reasoning.id)) input.push({ type: "item_reference", id: reasoning.id })
+            reasoningReferences.add(reasoning.id)
+            continue
+          }
           const existing = reasoningItems[reasoning.id]
           if (existing) {
             existing.summary.push(...reasoning.summary)
@@ -664,29 +614,24 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
         if (part.type === "tool-result" && part.providerExecuted === true) {
           flushText()
           const id = itemID(part.providerMetadata, providerMetadataKey)
-          const hosted =
-            part.result.type !== "json"
-              ? undefined
-              : Schema.is(HostedToolItem)(part.result.value)
+          const reference = acceptsItemID(extension, "reference", id) ? id : undefined
+          if (store !== false && reference && !hostedToolReferences.has(reference))
+            input.push({ type: "item_reference", id: reference })
+          if (store === false) {
+            // The server is not storing this exchange, so the tool outcome has to
+            // travel in the input. Non-content results degrade to their text form.
+            const content: ReadonlyArray<Content> =
+              part.result.type === "content"
                 ? part.result.value
-                : extension.lowerHostedToolItem?.(part.result.value)
-          if (acceptsItemID(extension, "hosted-tool", id) && hosted?.id === id) {
-            if (!hostedToolItems.has(id)) {
-              input.push(hosted)
-              hostedToolItems.add(id)
-            }
-            continue
+                : [{ type: "text", text: ProviderShared.toolResultText(part) }]
+            input.push({
+              role: "user",
+              content: yield* Effect.forEach(content, (item) =>
+                lowerHostedToolResultContentItem(item, request, extension),
+              ),
+            })
           }
-          const content: ReadonlyArray<Content> =
-            part.result.type === "content"
-              ? part.result.value
-              : [{ type: "text", text: ProviderShared.toolResultText(part) }]
-          input.push({
-            role: "user",
-            content: yield* Effect.forEach(content, (item) =>
-              lowerHostedToolResultContentItem(item, request, extension),
-            ),
-          })
+          if (reference) hostedToolReferences.add(reference)
           continue
         }
         return yield* ProviderShared.unsupportedContent(extension.name, "assistant", [
@@ -711,12 +656,19 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
     }
   }
 
-  return input
+  // With store:false, Responses APIs only accept previous reasoning items when the
+  // complete item has encrypted state. Summary blocks for one item may carry
+  // that state only on the last block, so filter after they have been joined.
+  return store === false
+    ? input.filter(
+        (item) => !("type" in item) || item.type !== "reasoning" || typeof item.encrypted_content === "string",
+      )
+    : input
 })
 
 const lowerOptions = (request: LLMRequest) => {
   const options = OpenResponsesOptions.resolve(request)
-  const cacheKey = ProviderShared.promptCacheKey(request)
+  const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
   const parallelToolCalls = resolveParallelToolCalls(request)
   return {
     ...(options.instructions ? { instructions: options.instructions } : {}),
@@ -867,9 +819,6 @@ const onOutputTextDone = (state: ParserState, event: Event, id: string): StepRes
   return [{ ...state, lifecycle: Lifecycle.textEnd(state.lifecycle, events, id) }, events]
 }
 
-export const outputItemID = (state: ParserState, event: Event) =>
-  event.output_index === undefined ? event.item_id : (state.outputItems[event.output_index] ?? event.item_id)
-
 export const onReasoningDelta = (state: ParserState, event: Event, itemID: string): StepResult => {
   const item = state.reasoningItems[itemID]
   if (!event.delta || !item) return [state, NO_EVENTS]
@@ -899,8 +848,32 @@ export const onReasoningDone = (state: ParserState, event: Event, itemID: string
   return onReasoningDelta(state, { ...event, delta: event.text }, itemID)
 }
 
-const reasoningMetadata = (state: ParserState, item: StreamItem & { id: string }) =>
-  providerMetadata(state, { itemId: item.id, reasoningEncryptedContent: item.encrypted_content ?? null })
+const reasoningMetadata = (state: ParserState, item: StreamItem) =>
+  providerMetadata(state, {
+    ...(item.id ? { itemId: item.id } : {}),
+    reasoningEncryptedContent: item.encrypted_content ?? null,
+  })
+
+const reasoningStreamMetadata = (state: ParserState, item: ReasoningStreamItem, includeEncrypted: boolean) => {
+  if (!item.providerItemID && !includeEncrypted) return undefined
+  return providerMetadata(state, {
+    ...(item.providerItemID ? { itemId: item.providerItemID } : {}),
+    ...(includeEncrypted ? { reasoningEncryptedContent: item.encryptedContent ?? null } : {}),
+  })
+}
+
+const findReasoningItem = (state: ParserState, event: Event, itemID: string | undefined) => {
+  if (itemID && state.reasoningItems[itemID]) return [itemID, state.reasoningItems[itemID]] as const
+  const items = Object.entries(state.reasoningItems)
+  if (itemID) {
+    const known = items.find((entry) => entry[1].providerItemID === itemID)
+    if (known) return known
+  }
+  if (event.output_index === undefined) return undefined
+  const indexed = items.find((entry) => entry[1].outputIndex === event.output_index)
+  if (indexed?.[1].providerItemID && itemID && indexed[1].providerItemID !== itemID) return undefined
+  return indexed
+}
 
 // Responses APIs stream reasoning items in a stable order:
 //   `output_item.added` (reasoning) →
@@ -927,15 +900,18 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
       NO_EVENTS,
     ]
   }
-  if (item && isReasoningItem(item)) {
+  if (item?.type === "reasoning") {
+    const id = item.id || `reasoning:${event.output_index}`
     const events: LLMEvent[] = []
     return [
       {
         ...state,
-        lifecycle: Lifecycle.reasoningStart(state.lifecycle, events, `${item.id}:0`, reasoningMetadata(state, item)),
+        lifecycle: Lifecycle.reasoningStart(state.lifecycle, events, `${id}:0`, reasoningMetadata(state, item)),
         reasoningItems: {
           ...state.reasoningItems,
-          [item.id]: {
+          [id]: {
+            providerItemID: item.id,
+            outputIndex: event.output_index,
             encryptedContent: item.encrypted_content,
             summaryParts: { 0: "active" },
             deltaIndexes: new Set(),
@@ -982,7 +958,7 @@ const onReasoningSummaryPartAdded = (state: ParserState, event: Event): StepResu
           lifecycle,
           events,
           `${event.item_id}:${entry[0]}`,
-          providerMetadata(state, { itemId: event.item_id }),
+          reasoningStreamMetadata(state, item, false),
         ),
       state.lifecycle,
     )
@@ -993,7 +969,7 @@ const onReasoningSummaryPartAdded = (state: ParserState, event: Event): StepResu
         closed,
         events,
         `${event.item_id}:${event.summary_index}`,
-        providerMetadata(state, { itemId: event.item_id, reasoningEncryptedContent: item.encryptedContent ?? null }),
+        reasoningStreamMetadata(state, item, true),
       ),
       reasoningItems: {
         ...state.reasoningItems,
@@ -1018,21 +994,31 @@ const onReasoningSummaryPartDone = (state: ParserState, event: Event): StepResul
   if (!event.item_id || event.summary_index === undefined) return [state, NO_EVENTS]
   const item = state.reasoningItems[event.item_id]
   if (!item) return [state, NO_EVENTS]
+  const events: LLMEvent[] = []
   return [
     {
       ...state,
+      lifecycle:
+        state.store !== false
+          ? Lifecycle.reasoningEnd(
+              state.lifecycle,
+              events,
+              `${event.item_id}:${event.summary_index}`,
+              reasoningStreamMetadata(state, item, false),
+            )
+          : state.lifecycle,
       reasoningItems: {
         ...state.reasoningItems,
         [event.item_id]: {
           ...item,
           summaryParts: {
             ...item.summaryParts,
-            [event.summary_index]: "can-conclude",
+            [event.summary_index]: state.store !== false ? "concluded" : "can-conclude",
           },
         },
       },
     },
-    NO_EVENTS,
+    events,
   ]
 }
 
@@ -1040,24 +1026,12 @@ const onFunctionCallArgumentsDelta = Effect.fn("OpenResponses.onFunctionCallArgu
   state: ParserState,
   event: Event,
 ) {
-  if (!event.item_id) return [state, NO_EVENTS] satisfies StepResult
-  const tool = state.tools[event.item_id]
-  if (!tool) return [state, NO_EVENTS] satisfies StepResult
-  const final = event.type === "response.function_call_arguments.done" ? event.arguments : undefined
-  if (event.type === "response.function_call_arguments.done" && final === undefined)
-    return [state, NO_EVENTS] satisfies StepResult
-  if (final !== undefined && !final.startsWith(tool.input))
-    return [
-      { ...state, tools: ToolStream.start(state.tools, event.item_id, { ...tool, input: final }) },
-      NO_EVENTS,
-    ] satisfies StepResult
-  const delta = final === undefined ? event.delta : final.slice(tool.input.length)
-  if (!delta) return [state, NO_EVENTS] satisfies StepResult
+  if (!event.item_id || !event.delta || !state.tools[event.item_id]) return [state, NO_EVENTS] satisfies StepResult
   const result = ToolStream.appendExisting(
     state.id,
     state.tools,
     event.item_id,
-    delta,
+    event.delta,
     `${state.name} tool argument delta is missing its tool call`,
   )
   if (ToolStream.isError(result)) return yield* result
@@ -1124,28 +1098,35 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
     ] satisfies StepResult
   }
 
-  if (isReasoningItem(item)) {
+  if (item?.type === "reasoning") {
+    const id = findReasoningItem(state, event, item.id)?.[0] ?? item.id ?? `reasoning:${event.output_index}`
     const events: LLMEvent[] = []
-    const metadata = reasoningMetadata(state, item)
-    const reasoningItem = state.reasoningItems[item.id]
+    const reasoningItem = state.reasoningItems[id]
+    const metadata = reasoningMetadata(state, {
+      ...item,
+      id: item.id || reasoningItem?.providerItemID,
+    })
     if (reasoningItem) {
       const lifecycle = Object.entries(reasoningItem.summaryParts)
         .filter((entry) => entry[1] === "active" || entry[1] === "can-conclude")
         .reduce(
-          (lifecycle, entry) => Lifecycle.reasoningEnd(lifecycle, events, `${item.id}:${entry[0]}`, metadata),
+          (lifecycle, entry) => Lifecycle.reasoningEnd(lifecycle, events, `${id}:${entry[0]}`, metadata),
           state.lifecycle,
         )
-      const { [item.id]: _removed, ...reasoningItems } = state.reasoningItems
+      const { [id]: _removed, ...reasoningItems } = state.reasoningItems
       return [{ ...state, lifecycle, reasoningItems }, events] satisfies StepResult
     }
-    if (!state.lifecycle.reasoning.has(item.id)) {
+    if (!state.lifecycle.reasoning.has(id)) {
       const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
-      events.push(LLMEvent.reasoningStart({ id: item.id, providerMetadata: metadata }))
-      events.push(LLMEvent.reasoningEnd({ id: item.id, providerMetadata: metadata }))
+      events.push(LLMEvent.reasoningStart({ id, providerMetadata: metadata }))
+      events.push(LLMEvent.reasoningEnd({ id, providerMetadata: metadata }))
       return [{ ...state, lifecycle }, events] satisfies StepResult
     }
     return [
-      { ...state, lifecycle: Lifecycle.reasoningEnd(state.lifecycle, events, item.id, metadata) },
+      {
+        ...state,
+        lifecycle: Lifecycle.reasoningEnd(state.lifecycle, events, id, metadata),
+      },
       events,
     ] satisfies StepResult
   }
@@ -1154,51 +1135,50 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
 })
 
 const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (state: ParserState, event: Event) {
-  const reconciled =
-    event.type === "response.completed"
-      ? yield* Effect.reduce(
-          event.response?.output ?? [],
-          () => [state, NO_EVENTS] satisfies StepResult,
-          ([current, events], item) => {
-            if (
-              !item.id ||
-              ((item.type !== "function_call" || !current.tools[item.id]) &&
-                (item.type !== "reasoning" || !current.reasoningItems[item.id]))
-            )
-              return Effect.succeed([current, events] satisfies StepResult)
-            return onOutputItemDone(current, { type: "response.output_item.done", item }).pipe(
-              Effect.map(([next, emitted]) => [next, [...events, ...emitted]] satisfies StepResult),
-            )
-          },
-        )
-      : ([state, NO_EVENTS] satisfies StepResult)
-  const current = reconciled[0]
   // Some compatible providers omit output_item.done even after completing the response.
   const pending =
     event.type === "response.completed"
-      ? yield* ToolStream.finishAll(current.id, current.tools)
-      : { tools: current.tools, events: NO_EVENTS }
-  const events: LLMEvent[] = [...reconciled[1], ...pending.events]
+      ? yield* ToolStream.finishAll(state.id, state.tools)
+      : { tools: state.tools, events: NO_EVENTS }
+  const events: LLMEvent[] = [...pending.events]
   const hasFunctionCall =
     pending.events.some((event) => LLMEvent.is.toolCall(event) || LLMEvent.is.toolInputError(event)) ||
-    current.hasFunctionCall
-  const lifecycle = Lifecycle.finish(current.lifecycle, events, {
+    state.hasFunctionCall
+  const lifecycle = Lifecycle.finish(state.lifecycle, events, {
     reason: {
       normalized: mapFinishReason(event, hasFunctionCall),
       raw: event.response?.incomplete_details?.reason,
     },
-    usage: mapUsage(event.response?.usage, current.providerMetadataKey),
+    usage: mapUsage(event.response?.usage, state.providerMetadataKey),
     providerMetadata:
       event.response?.id || event.response?.service_tier
-        ? providerMetadata(current, {
+        ? providerMetadata(state, {
             responseId: event.response.id,
             serviceTier: event.response.service_tier,
           })
         : undefined,
   })
-  return [{ ...current, lifecycle, hasFunctionCall, tools: pending.tools }, events] satisfies StepResult
+  return [{ ...state, lifecycle, hasFunctionCall, tools: pending.tools }, events] satisfies StepResult
 })
 
+const normalizeReasoningEvent = (state: ParserState, event: Event) => {
+  const entry = findReasoningItem(state, event, event.item_id)
+  if (!entry) return [state, event] as const
+  const id = entry[0]
+  const item = entry[1]
+  if (!event.item_id || item.providerItemID) return [state, { ...event, item_id: id }] as const
+  return [
+    {
+      ...state,
+      reasoningItems: {
+        ...state.reasoningItems,
+        [id]: { ...item, providerItemID: event.item_id },
+      },
+    },
+    { ...event, item_id: id },
+  ] as const
+}
+
 // Build the prettiest summary available from whatever the provider supplied.
 // When both code and message are present, prefix the code so consumers see
 // the failure mode (e.g. `rate_limit_exceeded: Slow down`) instead of just
@@ -1243,11 +1223,7 @@ export const providerFailure = (id: string, event: Event, fallback: string) => {
 
 const providerError = (state: ParserState, event: Event, fallback: string) => providerFailure(state.id, event, fallback)
 
-export const step = (state: ParserState, input: Event) => {
-  const event =
-    input.item_id && outputItemID(state, input) !== input.item_id
-      ? { ...input, item_id: outputItemID(state, input) }
-      : input
+export const step = (state: ParserState, event: Event) => {
   if (event.type === "response.output_text.delta" || event.type === "response.output_text.done") {
     if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
     return Effect.succeed(
@@ -1267,44 +1243,47 @@ export const step = (state: ParserState, input: Event) => {
     )
   }
   if (event.type === "response.reasoning.delta" || event.type === "response.reasoning_summary_text.delta") {
-    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
-    return Effect.succeed(onReasoningDelta(state, event, event.item_id))
+    const [next, normalized] = normalizeReasoningEvent(state, event)
+    if (!normalized.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
+    return Effect.succeed(onReasoningDelta(next, normalized, normalized.item_id))
   }
   if (
     event.type === "response.reasoning.done" ||
     event.type === "response.reasoning_summary_text.done" ||
     event.type === "response.reasoning_text.done"
   ) {
-    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
-    return Effect.succeed(onReasoningDone(state, event, event.item_id))
+    const [next, normalized] = normalizeReasoningEvent(state, event)
+    if (!normalized.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
+    return Effect.succeed(onReasoningDone(next, normalized, normalized.item_id))
   }
-  if (event.type === "response.reasoning_summary_part.added")
-    return event.item_id
-      ? Effect.succeed(onReasoningSummaryPartAdded(state, event))
+  if (event.type === "response.reasoning_summary_part.added") {
+    const [next, normalized] = normalizeReasoningEvent(state, event)
+    return normalized.item_id
+      ? Effect.succeed(onReasoningSummaryPartAdded(next, normalized))
       : ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
-  if (event.type === "response.reasoning_summary_part.done")
-    return event.item_id
-      ? Effect.succeed(onReasoningSummaryPartDone(state, event))
+  }
+  if (event.type === "response.reasoning_summary_part.done") {
+    const [next, normalized] = normalizeReasoningEvent(state, event)
+    return normalized.item_id
+      ? Effect.succeed(onReasoningSummaryPartDone(next, normalized))
       : ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
+  }
   if (event.type === "response.output_item.added") {
     if (event.item?.type === "message" && !event.item.id)
       return ProviderShared.eventError(state.id, `${event.type} message is missing id`)
-    return Effect.succeed(
-      onOutputItemAdded(
-        event.output_index !== undefined && event.item?.id
-          ? { ...state, outputItems: { ...state.outputItems, [event.output_index]: event.item.id } }
-          : state,
-        event,
-      ),
-    )
+    if (event.item?.type === "reasoning" && !event.item.id && event.output_index === undefined)
+      return ProviderShared.eventError(state.id, `${event.type} reasoning is missing id and output_index`)
+    return Effect.succeed(onOutputItemAdded(state, event))
   }
-  if (event.type === "response.function_call_arguments.delta" || event.type === "response.function_call_arguments.done")
+  if (event.type === "response.function_call_arguments.delta")
     return event.item_id
       ? onFunctionCallArgumentsDelta(state, event)
       : ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
   if (event.type === "response.output_item.done") {
     if (event.item?.type === "message" && !event.item.id)
       return ProviderShared.eventError(state.id, `${event.type} message is missing id`)
+    if (event.item?.type === "reasoning" && !event.item.id && event.output_index === undefined)
+      return ProviderShared.eventError(state.id, `${event.type} reasoning is missing id and output_index`)
     return onOutputItemDone(state, event)
   }
   if (event.type === "response.completed" || event.type === "response.incomplete") return onResponseFinish(state, event)
@@ -1331,10 +1310,10 @@ export const initial = (request: LLMRequest, extension: Extension = BASE): Parse
   hasFunctionCall: false,
   tools: ToolStream.empty<string>(),
   lifecycle: Lifecycle.initial(),
-  outputItems: {},
   messageItems: new Set<string>(),
   messagePhases: {},
   reasoningItems: {},
+  store: OpenResponsesOptions.resolve(request).store,
 })
 
 export const protocol = Protocol.make({

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

@@ -7,10 +7,7 @@ import { HttpTransport } from "../route/transport/index.js"
 import { Protocol } from "../route/protocol.js"
 import {
   AIError,
-  InvalidProviderOutputReason,
   LLMEvent,
-  ProviderInternalReason,
-  UnknownProviderReason,
   Usage,
   type FinishReason,
   type FinishReasonDetails,
@@ -227,22 +224,16 @@ const OpenAIChatChoice = Schema.StructWithRest(
   [Schema.Record(Schema.String, Schema.Unknown)],
 )
 
-const OpenAIChatError = Schema.StructWithRest(
-  Schema.Struct({
-    code: optionalNull(Schema.Union([Schema.String, Schema.Number])),
-    message: Schema.String,
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
+const OpenAIChatError = Schema.Struct({
+  code: optionalNull(Schema.Union([Schema.String, Schema.Number])),
+  message: Schema.String,
+})
 
-export const OpenAIChatEvent = Schema.StructWithRest(
-  Schema.Struct({
-    choices: optionalNull(Schema.Array(OpenAIChatChoice)),
-    usage: optionalNull(OpenAIChatUsage),
-    error: optionalNull(OpenAIChatError),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
+export const OpenAIChatEvent = Schema.Struct({
+  choices: optionalNull(Schema.Array(OpenAIChatChoice)),
+  usage: optionalNull(OpenAIChatUsage),
+  error: optionalNull(OpenAIChatError),
+})
 export type OpenAIChatEvent = Schema.Schema.Type<typeof OpenAIChatEvent>
 type OpenAIChatRequestMessage = LLMRequest["messages"][number]
 
@@ -265,7 +256,6 @@ export interface ParserState {
   readonly reasoningEmitted: boolean
   readonly latestToolIndex?: number
   readonly nextToolIndex: number
-  readonly requireFinishReason: boolean
 }
 
 // =============================================================================
@@ -278,7 +268,6 @@ interface LoweringOptions {
   readonly cacheControl?: (
     cache: CacheHint | undefined,
   ) => Schema.Schema.Type<typeof OpenAIChatCacheControl> | undefined
-  readonly toolCallID?: (id: string) => string
 }
 
 const lowerTool = (
@@ -305,8 +294,8 @@ const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
     tool: (name) => ({ type: "function" as const, function: { name } }),
   })
 
-const lowerToolCall = (part: ToolCallPart, options: LoweringOptions): OpenAIChatAssistantToolCall => ({
-  id: options.toolCallID?.(part.id) ?? part.id,
+const lowerToolCall = (part: ToolCallPart): OpenAIChatAssistantToolCall => ({
+  id: part.id,
   type: "function",
   function: {
     name: part.name,
@@ -382,7 +371,7 @@ const lowerAssistantMessage = Effect.fn("OpenAIChat.lowerAssistantMessage")(func
       continue
     }
     if (part.type === "tool-call") {
-      toolCalls.push(lowerToolCall(part, options))
+      toolCalls.push(lowerToolCall(part))
       continue
     }
   }
@@ -428,7 +417,7 @@ const lowerToolMessages = Effect.fn("OpenAIChat.lowerToolMessages")(function* (
     if (part.result.type !== "content") {
       messages.push({
         role: "tool",
-        tool_call_id: options.toolCallID?.(part.id) ?? part.id,
+        tool_call_id: part.id,
         content: ProviderShared.toolResultText(part),
         cache_control: options.cacheControl?.(part.cache),
       })
@@ -438,7 +427,7 @@ const lowerToolMessages = Effect.fn("OpenAIChat.lowerToolMessages")(function* (
     const text = content.filter((item) => item.type === "text").map((item) => item.text)
     messages.push({
       role: "tool",
-      tool_call_id: options.toolCallID?.(part.id) ?? part.id,
+      tool_call_id: part.id,
       content: text.join("\n"),
       cache_control: options.cacheControl?.(part.cache),
     })
@@ -479,30 +468,12 @@ const lowerMessages = Effect.fn("OpenAIChat.lowerMessages")(function* (request:
           ]
         : [{ role: "system", content: ProviderShared.joinText(request.system) }]
   const messages = [...system]
-  const modelID = request.model.id.toLowerCase()
-  const mistral = ["mistral", "devstral", "codestral", "pixtral", "mixtral"].some((family) => modelID.includes(family))
-  const lowering = {
-    ...options,
-    toolCallID: (id: string) => {
-      if (mistral) return id.replace(/[^a-zA-Z0-9]/g, "").slice(0, 9).padEnd(9, "0")
-      if (modelID.includes("claude")) return id.replace(/[^a-zA-Z0-9_-]/g, "_")
-      if (request.model.provider === "openai" || request.model.provider === "azure" || modelID.startsWith("openai/"))
-        return id.slice(0, 40)
-      return id
-    },
-  }
-  const requireAssistantAfterTool = request.model.compatibility?.requireAssistantAfterTool ?? mistral
-  const bridgeTools = () => {
-    if (requireAssistantAfterTool && messages.at(-1)?.role === "tool") messages.push({ role: "assistant", content: "Done." })
-  }
   const pendingImages: Array<Schema.Schema.Type<typeof OpenAIChatUserContent>> = []
   const flushImages = () => {
     if (pendingImages.length === 0) return
-    bridgeTools()
     messages.push({ role: "user", content: pendingImages.splice(0) })
   }
   for (const message of request.messages) {
-    if (message.role === "user") bridgeTools()
     if (message.role === "system") {
       const part = yield* ProviderShared.wrappedSystemUpdate("OpenAI Chat", message)
       if (pendingImages.length > 0) {
@@ -545,16 +516,14 @@ const lowerMessages = Effect.fn("OpenAIChat.lowerMessages")(function* (request:
         )
       continue
     }
-    if (message.role === "assistant" && message.content.every((part) => part.type === "text" && part.text.trim() === ""))
-      continue
     if (message.role === "tool") {
-      const lowered = yield* lowerToolMessages(message, lowering)
+      const lowered = yield* lowerToolMessages(message, options)
       messages.push(...lowered.messages)
       pendingImages.push(...lowered.images)
       continue
     }
     flushImages()
-    messages.push(...(yield* lowerMessage(message, request.model.compatibility?.reasoningField, lowering)))
+    messages.push(...(yield* lowerMessage(message, request.model.compatibility?.reasoningField, options)))
   }
   flushImages()
   return messages
@@ -680,7 +649,7 @@ const detectZaiToolStream = (
 
 const lowerOptions = (request: LLMRequest, supportsStore: boolean) => {
   const options = OpenAIOptions.resolve(request)
-  const cacheKey = ProviderShared.promptCacheKey(request)
+  const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
   return {
     ...(supportsStore && options.store !== undefined ? { store: options.store } : {}),
     // For providers that support `store`, ensure stateless `store:false` is sent
@@ -757,40 +726,14 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
 // Streaming parsers are small state machines: every event returns a new state
 // plus the common `LLMEvent`s produced by that event. Tool calls are accumulated
 // because OpenAI streams JSON arguments across multiple deltas.
-const finishReasonError = (event: OpenAIChatEvent, reason: AIError["reason"]) =>
-  new AIError({
-    module: ADAPTER,
-    method: "stream",
-    body: ProviderShared.encodeJson(event),
-    reason,
-  })
-
-const mapFinishReason = Effect.fn("OpenAIChat.mapFinishReason")(function* (event: OpenAIChatEvent, reason: string) {
-  switch (reason) {
-    case "error":
-      return yield* finishReasonError(
-        event,
-        new UnknownProviderReason({ message: "Provider reported an error (finish_reason: error)" }),
-      )
-    case "network_error":
-      return yield* finishReasonError(
-        event,
-        new ProviderInternalReason({ message: "Provider reported a network error (finish_reason: network_error)" }),
-      )
-    case "stop":
-    case "end":
-      return "stop" as const
-    case "length":
-      return "length" as const
-    case "content_filter":
-      return "content-filter" as const
-    case "function_call":
-    case "tool_calls":
-      return "tool-calls" as const
-    default:
-      return "unknown" as const
-  }
-})
+const mapFinishReason = (reason: string | null | undefined): FinishReason => {
+  if (reason === "stop") return "stop"
+  if (reason === "length") return "length"
+  if (reason === "content_filter") return "content-filter"
+  if (reason === "function_call" || reason === "tool_calls") return "tool-calls"
+  if (reason === "error") return "error"
+  return "unknown"
+}
 
 // OpenAI Chat reports `prompt_tokens` (inclusive total) with a
 // cached-read and cache-write subsets, and `completion_tokens` (inclusive
@@ -903,20 +846,16 @@ const reasoningMetadata = (field: ParserState["reasoningField"], details?: Reado
 
 const step = (state: ParserState, event: OpenAIChatEvent) =>
   Effect.gen(function* () {
-    if (event.error) {
-      const body = ProviderShared.encodeJson(event)
+    if (event.error)
       return yield* new AIError({
         module: ADAPTER,
         method: "stream",
-        body,
         reason: classifyProviderFailure({
           message: event.error.message,
           code: event.error.code === undefined || event.error.code === null ? undefined : String(event.error.code),
           status: typeof event.error.code === "number" ? event.error.code : undefined,
-          rawBody: body,
         }),
       })
-    }
     const events: LLMEvent[] = []
     const choice = event.choices?.[0]
     // Moonshot (and a few other OpenAI-compatible providers) attach usage to
@@ -925,11 +864,8 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
     const usage = mapUsage(event.usage) ?? (choiceUsage ? mapUsage(choiceUsage) : undefined) ?? state.usage
     const rawFinishReason = choice?.finish_reason
     const finishReason =
-      rawFinishReason
-        ? {
-            normalized: yield* mapFinishReason(event, rawFinishReason),
-            raw: choice?.native_finish_reason ?? rawFinishReason,
-          }
+      rawFinishReason !== undefined && rawFinishReason !== null
+        ? { normalized: mapFinishReason(rawFinishReason), raw: choice?.native_finish_reason ?? rawFinishReason }
         : state.finishReason
     const delta = choice?.delta
     const toolDeltas = delta?.tool_calls ?? []
@@ -949,11 +885,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
       toolDeltas.some((tool) => Boolean(tool.id) || Boolean(tool.function?.name) || Boolean(tool.function?.arguments))
     if (state.finishReason !== undefined) {
       if (hasLateContent)
-        return yield* ProviderShared.eventError(
-          ADAPTER,
-          "OpenAI Chat received content after the finish reason",
-          ProviderShared.encodeJson(event),
-        )
+        return yield* ProviderShared.eventError(ADAPTER, "OpenAI Chat received content after the finish reason")
       return [{ ...state, usage }, events] as const
     }
 
@@ -1025,19 +957,14 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
         { id: id || undefined, name: name || undefined, text },
         "OpenAI Chat tool call delta is missing id or name",
       )
-      if (ToolStream.isError(result))
-        return yield* ProviderShared.eventError(ADAPTER, result.reason.message, ProviderShared.encodeJson(event))
+      if (ToolStream.isError(result)) return yield* result
       tools = result.tools
       if (result.events.length) lifecycle = Lifecycle.stepStart(lifecycle, events)
       events.push(...result.events)
     }
 
     if (finishReason !== undefined && state.finishReason === undefined && Object.keys(pendingTools).length > 0)
-      return yield* ProviderShared.eventError(
-        ADAPTER,
-        "OpenAI Chat tool call delta is missing id or name",
-        ProviderShared.encodeJson(event),
-      )
+      return yield* ProviderShared.eventError(ADAPTER, "OpenAI Chat tool call delta is missing id or name")
 
     // Finalize accumulated tool inputs eagerly when finish_reason arrives so
     // valid calls and malformed local calls settle independently.
@@ -1060,27 +987,16 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
         reasoningEmitted,
         latestToolIndex,
         nextToolIndex,
-        requireFinishReason: state.requireFinishReason,
       },
       events,
     ] as const
   })
 
-const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: ParserState) {
-  if (state.finishReason === undefined && state.requireFinishReason)
-    return yield* new AIError({
-      module: ADAPTER,
-      method: "stream",
-      reason: new InvalidProviderOutputReason({
-        classification: "incomplete-stream",
-        message: "OpenAI Chat stream ended without finish_reason",
-        route: ADAPTER,
-      }),
-    })
+const finishEvents = (state: ParserState): ReadonlyArray<LLMEvent> => {
   const events: LLMEvent[] = []
   const toolCallEvents =
     state.finishReason === undefined && Object.keys(state.tools).length > 0
-      ? (yield* ToolStream.finishAll(ADAPTER, state.tools)).events
+      ? Effect.runSync(ToolStream.finishAll(ADAPTER, state.tools)).events
       : state.toolCallEvents
   const hasToolCalls = toolCallEvents.length > 0
   const reason = state.finishReason
@@ -1089,7 +1005,7 @@ const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: Pars
         normalized:
           state.finishReason.normalized === "stop" && hasToolCalls ? "tool-calls" : state.finishReason.normalized,
       }
-    : { normalized: hasToolCalls ? ("tool-calls" as const) : ("stop" as const) }
+    : { normalized: hasToolCalls ? ("tool-calls" as const) : ("unknown" as const) }
   const metadata = reasoningMetadata(
     state.reasoningField,
     state.reasoningDetailsObserved ? state.reasoningDetails : undefined,
@@ -1103,7 +1019,7 @@ const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: Pars
   events.push(...toolCallEvents)
   Lifecycle.finish(lifecycle, events, { reason, usage: state.usage })
   return events
-})
+}
 
 // =============================================================================
 // Protocol And OpenAI Route
@@ -1132,7 +1048,6 @@ export const protocol = Protocol.make({
       reasoningDetailsObserved: false,
       reasoningEmitted: false,
       nextToolIndex: 0,
-      requireFinishReason: request.model.compatibility?.requireFinishReason ?? true,
     }),
     step,
     onHalt: finishEvents,

packages/ai/src/protocols/openai-compatible-responses.ts

@@ -17,7 +17,6 @@ export const route = Route.make({
   protocol: OpenResponses.protocol,
   endpoint: Endpoint.path(OpenResponses.PATH),
   transport: OpenResponses.httpTransport,
-  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
 })
 
 export * as OpenAICompatibleResponses from "./openai-compatible-responses.js"

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

@@ -7,7 +7,7 @@ import { Protocol } from "../route/protocol.js"
 import { HttpTransport } from "../route/transport/index.js"
 import { LLMRequest, type JsonSchema, type ToolDefinition } from "../schema/index.js"
 import { OpenResponses } from "./open-responses.js"
-import { JsonObject, optionalArray, optionalNull, ProviderShared } from "./shared.js"
+import { optionalArray, ProviderShared } from "./shared.js"
 import { OpenAIImage } from "./utils/openai-image.js"
 import { ResponsesHostedTools } from "./utils/responses-hosted-tools.js"
 import { ToolSchemaProjection } from "./utils/tool-schema.js"
@@ -32,40 +32,6 @@ const OpenAIResponsesImageGenerationTool = Schema.Struct({
   size: Schema.optional(OpenAIImage.Size),
 })
 
-const OpenAIResponsesHostedToolItem = Schema.Union([
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("computer_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      call_id: Schema.optional(Schema.String),
-      action: optionalNull(JsonObject),
-      pending_safety_checks: Schema.optional(Schema.Array(JsonObject)),
-    }),
-    [JsonObject],
-  ),
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("web_search_preview_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      action: optionalNull(JsonObject),
-    }),
-    [JsonObject],
-  ),
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("image_generation_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      result: optionalNull(Schema.String),
-      output_format: Schema.optional(Schema.Literals(["png", "jpeg", "webp"])),
-      revised_prompt: optionalNull(Schema.String),
-    }),
-    [JsonObject],
-  ),
-])
-
 const OpenAIResponsesTools = Schema.Union([OpenResponses.Tool, OpenAIResponsesImageGenerationTool])
 
 const OpenAIResponsesToolChoice = Schema.Union([
@@ -75,7 +41,6 @@ const OpenAIResponsesToolChoice = Schema.Union([
 
 const OpenAIResponsesCoreFields = {
   ...OpenResponses.coreFields,
-  input: Schema.Array(Schema.Union([OpenResponses.InputItem, OpenAIResponsesHostedToolItem])),
   tools: optionalArray(OpenAIResponsesTools),
   tool_choice: Schema.optional(OpenAIResponsesToolChoice),
 }
@@ -89,21 +54,21 @@ export type OpenAIResponsesBody = Schema.Schema.Type<typeof OpenAIResponsesBody>
 // Replayed items are paired with stored server state by id, so a foreign or
 // synthetic token can fail request validation even when `call_id` pairing is
 // intact. Only resend ids in each item kind's own grammar; hosted tool
-// items keep generic validation because every hosted tool mints its own
+// references keep generic validation because every hosted tool mints its own
 // prefix. The same allowlist approach codex uses before resending history
 // (codex-rs core/src/client.rs, `prepare_response_items_for_request`).
 const ITEM_ID_PREFIXES: Record<OpenResponses.ItemKind, ReadonlyArray<string>> = {
   message: ["msg_"],
   reasoning: ["rs_"],
   "function-call": ["fc_"],
-  // Every hosted tool mints its own id prefix, so items keep generic validation.
-  "hosted-tool": [],
+  // Every hosted tool mints its own id prefix, so references keep generic
+  // validation only.
+  reference: [],
 }
 
 const extension = {
   id: ADAPTER,
   name: NAME,
-  lowerHostedToolItem: (item: unknown) => (Schema.is(OpenAIResponsesHostedToolItem)(item) ? item : undefined),
   acceptsItemID: (kind: OpenResponses.ItemKind, id: string) => {
     const prefixes = ITEM_ID_PREFIXES[kind]
     return prefixes.length === 0 || prefixes.some((prefix) => id.startsWith(prefix))
@@ -140,8 +105,6 @@ const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>, tool
         : { type: "function" as const, name },
   })
 
-const decodeBody = ProviderShared.validateWith(Schema.decodeUnknownEffect(OpenAIResponsesBody))
-
 const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request: LLMRequest) {
   const body = yield* OpenResponses.fromRequestWithExtension(
     LLMRequest.update(request, { tools: [], toolChoice: undefined }),
@@ -149,7 +112,7 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
   )
   const toolSchemaCompatibility = request.model.compatibility?.toolSchema
   const parallelToolCalls = OpenResponses.resolveParallelToolCalls(request)
-  return yield* decodeBody({
+  return {
     ...body,
     ...(parallelToolCalls === undefined ? {} : { parallel_tool_calls: parallelToolCalls }),
     tools:
@@ -160,7 +123,7 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
           ),
     tool_choice:
       body.tool_choice ?? (request.toolChoice ? yield* lowerToolChoice(request.toolChoice, request.tools) : undefined),
-  })
+  } satisfies OpenAIResponsesBody
 })
 
 const hostedToolResult = Effect.fn("OpenAIResponses.hostedToolResult")(function* (item: ResponsesHostedTools.Item) {
@@ -203,9 +166,7 @@ const HOSTED_TOOLS = {
 const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
   if (event.type === "response.reasoning_text.delta")
     return event.item_id
-      ? Effect.succeed(
-          OpenResponses.onReasoningDelta(state, event, OpenResponses.outputItemID(state, event) ?? event.item_id),
-        )
+      ? Effect.succeed(OpenResponses.onReasoningDelta(state, event, event.item_id))
       : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
   if (event.type === "response.output_item.done" && event.item && ResponsesHostedTools.isItem(event.item, HOSTED_TOOLS))
     return ResponsesHostedTools.onDone(state, event.item, HOSTED_TOOLS)
@@ -246,7 +207,7 @@ export const route = Route.make({
   endpoint,
   auth,
   transport,
-  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
+  defaults: { providerOptions: { store: false } },
 })
 
 export * as OpenAIResponses from "./openai-responses.js"

packages/ai/src/protocols/shared.ts

@@ -28,10 +28,10 @@ export const OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH = 64
 
 // OpenAI limits `prompt_cache_key` to 64 chars; DeepSeek and Zai inherit the same
 // limit via their OpenAI-compatible APIs. Clamp with unicode-aware slicing.
-export const promptCacheKey = (request: LLMRequest): string | undefined => {
-  if (request.cache === "none" || request.promptCacheKey === undefined) return undefined
-  const chars = Array.from(request.promptCacheKey)
-  if (chars.length <= OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH) return request.promptCacheKey
+export const clampPromptCacheKey = (key: string | undefined): string | undefined => {
+  if (key === undefined) return undefined
+  const chars = Array.from(key)
+  if (chars.length <= OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH) return key
   return chars.slice(0, OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH).join("")
 }
 

packages/ai/src/protocols/utils/partial-json-options.ts

@@ -1,64 +0,0 @@
-/*
- * Adapted from partial-json by the Promplate Dev Team:
- * https://github.com/promplate/partial-json-parser-js/blob/main/src/options.ts
- * Licensed under the MIT License; see partial-json.ts for the complete notice.
- */
-
-/**
- * allow partial strings like `"hello \u12` to be parsed as `"hello `
- */
-export const STR = 0b000000001
-
-/**
- * allow partial numbers like `123.` to be parsed as `123`
- */
-export const NUM = 0b000000010
-
-/**
- * allow partial arrays like `[1, 2,` to be parsed as `[1, 2]`
- */
-export const ARR = 0b000000100
-
-/**
- * allow partial objects like `{"a": 1, "b":` to be parsed as `{"a": 1}`
- */
-export const OBJ = 0b000001000
-
-/**
- * allow `nu` to be parsed as `null`
- */
-export const NULL = 0b000010000
-
-/**
- * allow `tr` to be parsed as `true`, and `fa` to be parsed as `false`
- */
-export const BOOL = 0b000100000
-
-/**
- * allow `Na` to be parsed as `NaN`
- */
-export const NAN = 0b001000000
-
-/**
- * allow `Inf` to be parsed as `Infinity`
- */
-export const INFINITY = 0b010000000
-
-/**
- * allow `-Inf` to be parsed as `-Infinity`
- */
-export const _INFINITY = 0b100000000
-
-export const INF = INFINITY | _INFINITY
-export const SPECIAL = NULL | BOOL | INF | NAN
-export const ATOM = STR | NUM | SPECIAL
-export const COLLECTION = ARR | OBJ
-export const ALL = ATOM | COLLECTION
-
-/**
- * Control what types you allow to be partially parsed.
- * The default is to allow all types to be partially parsed, which in most cases is the best option.
- */
-export const Allow = { STR, NUM, ARR, OBJ, NULL, BOOL, NAN, INFINITY, _INFINITY, INF, SPECIAL, ATOM, COLLECTION, ALL }
-
-export default Allow

packages/ai/src/protocols/utils/partial-json.ts

@@ -1,282 +0,0 @@
-/*
- * Adapted from partial-json by the Promplate Dev Team:
- * https://github.com/promplate/partial-json-parser-js
- *
- * MIT License
- *
- * Copyright (c) 2023 Promplate Dev Team
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { Schema } from "effect"
-import { Allow } from "./partial-json-options.js"
-export * from "./partial-json-options.js"
-
-export class PartialJSON extends Error {}
-export class MalformedJSON extends Error {}
-
-const decodeJson = Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown))
-
-/** Parse complete or incomplete JSON, restricted by the supplied partial-value flags. */
-export function parseJSON(jsonString: string, allowPartial = Allow.ALL): unknown {
-  if (typeof jsonString !== "string") throw new TypeError(`expecting str, got ${typeof jsonString}`)
-  const input = jsonString.trim()
-  if (!input) throw new Error(`${jsonString} is empty`)
-  try {
-    return decodeJson(input)
-  } catch {}
-
-  const repaired = repairJSON(input)
-  if (repaired !== input) {
-    try {
-      return decodeJson(repaired)
-    } catch {}
-  }
-
-  try {
-    return _parseJSON(input, allowPartial)
-  } catch (error) {
-    if (repaired !== input) return _parseJSON(repaired, allowPartial)
-    throw error
-  }
-}
-
-const repairJSON = (input: string) => {
-  let repaired = ""
-  let quoted = false
-
-  for (let index = 0; index < input.length; index++) {
-    const character = input[index]
-    if (!quoted) {
-      repaired += character
-      if (character === '"') quoted = true
-      continue
-    }
-
-    if (character === '"') {
-      repaired += character
-      quoted = false
-      continue
-    }
-
-    if (character === "\\") {
-      const next = input[index + 1]
-      if (next === "u" && /^[0-9a-fA-F]{4}$/.test(input.slice(index + 2, index + 6))) {
-        repaired += input.slice(index, index + 6)
-        index += 5
-        continue
-      }
-      if (next !== undefined && '"\\/bfnrtu'.includes(next)) {
-        repaired += `\\${next}`
-        index++
-        continue
-      }
-      repaired += "\\\\"
-      continue
-    }
-
-    const code = character.charCodeAt(0)
-    repaired += code <= 0x1f ? `\\u${code.toString(16).padStart(4, "0")}` : character
-  }
-
-  return repaired
-}
-
-const _parseJSON = (jsonString: string, allow: number) => {
-  const length = jsonString.length
-  let index = 0
-
-  const markPartialJSON = (message: string): never => {
-    throw new PartialJSON(`${message} at position ${index}`)
-  }
-
-  const throwMalformedError = (message: string): never => {
-    throw new MalformedJSON(`${message} at position ${index}`)
-  }
-
-  const parseAny = (): unknown => {
-    skipBlank()
-    if (index >= length) markPartialJSON("Unexpected end of input")
-    if (jsonString[index] === '"') return parseStr()
-    if (jsonString[index] === "{") return parseObj()
-    if (jsonString[index] === "[") return parseArr()
-    if (
-      jsonString.substring(index, index + 4) === "null" ||
-      (Allow.NULL & allow && length - index < 4 && "null".startsWith(jsonString.substring(index)))
-    ) {
-      index += 4
-      return null
-    }
-    if (
-      jsonString.substring(index, index + 4) === "true" ||
-      (Allow.BOOL & allow && length - index < 4 && "true".startsWith(jsonString.substring(index)))
-    ) {
-      index += 4
-      return true
-    }
-    if (
-      jsonString.substring(index, index + 5) === "false" ||
-      (Allow.BOOL & allow && length - index < 5 && "false".startsWith(jsonString.substring(index)))
-    ) {
-      index += 5
-      return false
-    }
-    if (
-      jsonString.substring(index, index + 8) === "Infinity" ||
-      (Allow.INFINITY & allow && length - index < 8 && "Infinity".startsWith(jsonString.substring(index)))
-    ) {
-      index += 8
-      return Infinity
-    }
-    if (
-      jsonString.substring(index, index + 9) === "-Infinity" ||
-      (Allow._INFINITY & allow &&
-        1 < length - index &&
-        length - index < 9 &&
-        "-Infinity".startsWith(jsonString.substring(index)))
-    ) {
-      index += 9
-      return -Infinity
-    }
-    if (
-      jsonString.substring(index, index + 3) === "NaN" ||
-      (Allow.NAN & allow && length - index < 3 && "NaN".startsWith(jsonString.substring(index)))
-    ) {
-      index += 3
-      return NaN
-    }
-    return parseNum()
-  }
-
-  const parseStr = (): string => {
-    const start = index
-    let escape = false
-    index++
-    while (index < length && (jsonString[index] !== '"' || (escape && jsonString[index - 1] === "\\"))) {
-      escape = jsonString[index] === "\\" ? !escape : false
-      index++
-    }
-    if (jsonString.charAt(index) === '"') {
-      try {
-        return decodeJson(jsonString.substring(start, ++index - Number(escape))) as string
-      } catch (error) {
-        throwMalformedError(String(error))
-      }
-    }
-    if (Allow.STR & allow) {
-      try {
-        return decodeJson(`${jsonString.substring(start, index - Number(escape))}"`) as string
-      } catch {
-        return decodeJson(`${jsonString.substring(start, jsonString.lastIndexOf("\\"))}"`) as string
-      }
-    }
-    return markPartialJSON("Unterminated string literal")
-  }
-
-  const parseObj = (): Record<string, unknown> => {
-    index++
-    skipBlank()
-    const object: Record<string, unknown> = {}
-    try {
-      while (jsonString[index] !== "}") {
-        skipBlank()
-        if (index >= length && Allow.OBJ & allow) return object
-        const key = parseStr()
-        skipBlank()
-        index++
-        try {
-          Object.defineProperty(object, key, {
-            value: parseAny(),
-            enumerable: true,
-            configurable: true,
-            writable: true,
-          })
-        } catch (error) {
-          if (Allow.OBJ & allow) return object
-          throw error
-        }
-        skipBlank()
-        if (jsonString[index] === ",") index++
-      }
-    } catch {
-      if (Allow.OBJ & allow) return object
-      return markPartialJSON("Expected '}' at end of object")
-    }
-    index++
-    return object
-  }
-
-  const parseArr = (): unknown[] => {
-    index++
-    const array: unknown[] = []
-    try {
-      while (jsonString[index] !== "]") {
-        array.push(parseAny())
-        skipBlank()
-        if (jsonString[index] === ",") index++
-      }
-    } catch {
-      if (Allow.ARR & allow) return array
-      return markPartialJSON("Expected ']' at end of array")
-    }
-    index++
-    return array
-  }
-
-  const parseNum = (): unknown => {
-    if (index === 0) {
-      if (jsonString === "-") throwMalformedError("Not sure what '-' is")
-      try {
-        return decodeJson(jsonString)
-      } catch (error) {
-        if (Allow.NUM & allow) {
-          try {
-            return decodeJson(jsonString.substring(0, jsonString.lastIndexOf("e")))
-          } catch {}
-        }
-        throwMalformedError(String(error))
-      }
-    }
-
-    const start = index
-    if (jsonString[index] === "-") index++
-    while (jsonString[index] && !",]}".includes(jsonString[index])) index++
-    if (index === length && !(Allow.NUM & allow)) markPartialJSON("Unterminated number literal")
-
-    try {
-      return decodeJson(jsonString.substring(start, index))
-    } catch (error) {
-      if (jsonString.substring(start, index) === "-") markPartialJSON("Not sure what '-' is")
-      try {
-        return decodeJson(jsonString.substring(start, jsonString.lastIndexOf("e")))
-      } catch {
-        throwMalformedError(String(error))
-      }
-    }
-  }
-
-  const skipBlank = () => {
-    while (index < length && " \n\r\t".includes(jsonString[index])) index++
-  }
-
-  return parseAny()
-}
-
-export const parse = parseJSON

packages/ai/src/protocols/utils/tool-stream.ts

@@ -1,10 +1,8 @@
-import { Effect, Option } from "effect"
-import { AIError, LLMEvent, type ProviderMetadata, type ToolCall } from "../../schema/index.js"
+import { Effect } from "effect"
+import { AIError, LLMEvent, type ProviderMetadata, type ToolCall, type ToolInputError } from "../../schema/index.js"
 import { eventError, parseToolInput, type ToolAccumulator } from "../shared.js"
-import { parse } from "./partial-json.js"
 
 type StreamKey = string | number
-const parsePartialInput = Option.liftThrowable(parse)
 
 /**
  * One pending streamed tool call. Providers emit the tool identity and JSON
@@ -64,39 +62,38 @@ const inputDelta = (tool: PendingTool, text: string) =>
     id: tool.id,
     name: tool.name,
     text,
-    input: Option.getOrElse(parsePartialInput(tool.input), () => ({})),
   })
 
 const toolCall = (route: string, tool: PendingTool, inputOverride?: string) => {
   const raw = inputOverride ?? tool.input
   return parseToolInput(route, tool.name, raw).pipe(
+    Effect.map((input): ToolCall | ToolInputError =>
+      LLMEvent.toolCall({
+        id: tool.id,
+        name: tool.name,
+        input,
+        providerExecuted: tool.providerExecuted ? true : undefined,
+        providerMetadata: tool.providerMetadata,
+      }),
+    ),
     Effect.catch((error) =>
       tool.providerExecuted
         ? Effect.fail(error)
         : Effect.succeed(
-            Option.getOrElse(
-              Option.map(parsePartialInput(raw), (input) => input ?? {}),
-              () => ({}),
-            ),
+            LLMEvent.toolInputError({
+              id: tool.id,
+              name: tool.name,
+              raw,
+            }),
           ),
     ),
-    Effect.map(
-      (input): ToolCall =>
-        LLMEvent.toolCall({
-          id: tool.id,
-          name: tool.name,
-          input,
-          providerExecuted: tool.providerExecuted ? true : undefined,
-          providerMetadata: tool.providerMetadata,
-        }),
-    ),
   )
 }
 
-const finishEvents = (tool: PendingTool, event: ToolCall): ReadonlyArray<LLMEvent> => [
-  LLMEvent.toolInputEnd({ id: tool.id, name: tool.name, providerMetadata: tool.providerMetadata }),
-  event,
-]
+const finishEvents = (tool: PendingTool, event: ToolCall | ToolInputError): ReadonlyArray<LLMEvent> =>
+  event.type === "tool-input-error"
+    ? [event]
+    : [LLMEvent.toolInputEnd({ id: tool.id, name: tool.name, providerMetadata: tool.providerMetadata }), event]
 
 /** Store the updated tool and produce the optional public delta event. */
 const appendTool = <K extends StreamKey>(
@@ -179,7 +176,7 @@ export const appendExisting = <K extends StreamKey>(
 
 /**
  * Finalize one pending tool call: parse the accumulated raw JSON, remove it
- * from state, and recover incomplete local arguments when needed.
+ * from state, and return either a call or a non-executable local input error.
  * Missing keys are a no-op because some providers emit stop events for
  * non-tool content blocks.
  */

packages/ai/src/protocols/xai-responses.ts

@@ -1,52 +1,15 @@
-import { Effect, Schema } from "effect"
 import { Protocol } from "../route/protocol.js"
-import type { LLMRequest } from "../schema/index.js"
 import { OpenResponses } from "./open-responses.js"
-import { JsonObject, optionalNull, ProviderShared } from "./shared.js"
 import { ResponsesHostedTools } from "./utils/responses-hosted-tools.js"
 
 const ADAPTER = "xai-responses"
 const NAME = "xAI Responses"
 
-const XAIResponsesHostedToolItem = Schema.Union([
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("x_search_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      action: optionalNull(JsonObject),
-    }),
-    [JsonObject],
-  ),
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("image_generation_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      result: Schema.optional(Schema.Unknown),
-      error: Schema.optional(Schema.Unknown),
-    }),
-    [JsonObject],
-  ),
-])
-
-const XAIResponsesBody = Schema.Struct({
-  ...OpenResponses.coreFields,
-  input: Schema.Array(Schema.Union([OpenResponses.InputItem, XAIResponsesHostedToolItem])),
-  stream: Schema.Literal(true),
-})
-
 const extension = {
   id: ADAPTER,
   name: NAME,
-  lowerHostedToolItem: (item: unknown) => (Schema.is(XAIResponsesHostedToolItem)(item) ? item : undefined),
 } satisfies OpenResponses.Extension
 
-const decodeBody = ProviderShared.validateWith(Schema.decodeUnknownEffect(XAIResponsesBody))
-const fromRequest = Effect.fn("XAIResponses.fromRequest")(function* (request: LLMRequest) {
-  return yield* decodeBody(yield* OpenResponses.fromRequestWithExtension(request, extension))
-})
-
 const HOSTED_TOOLS = {
   web_search_call: { name: "web_search", input: (item) => item.action ?? {} },
   x_search_call: { name: "x_search", input: (item) => item.action ?? {} },
@@ -72,10 +35,7 @@ const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
 
 export const protocol = Protocol.make({
   id: ADAPTER,
-  body: {
-    schema: XAIResponsesBody,
-    from: fromRequest,
-  },
+  body: OpenResponses.protocol.body,
   stream: {
     event: OpenResponses.protocol.stream.event,
     initial: (request) => OpenResponses.initial(request, extension),

packages/ai/src/providers/openrouter.ts

@@ -9,7 +9,7 @@ import type { ProviderPackage } from "../provider-package.js"
 import * as OpenAICompatibleProfiles from "./openai-compatible-profile.js"
 import * as OpenAIChat from "../protocols/openai-chat.js"
 import { newBreakpoints, ttlBucket } from "../protocols/utils/cache.js"
-import { isRecord } from "../protocols/shared.js"
+import { isRecord, ProviderShared } from "../protocols/shared.js"
 
 export const profile = OpenAICompatibleProfiles.profiles.openrouter
 export const id = ProviderID.make(profile.provider)
@@ -115,10 +115,12 @@ export const protocol = Protocol.make({
               reasoning_details: reasoningDetails,
             }
           })
+          const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
           return {
             ...body,
             messages,
             ...bodyOptions(request.providerOptions),
+            ...(cacheKey ? { prompt_cache_key: cacheKey } : {}),
           } as OpenRouterBody
         }),
       ),

packages/ai/src/providers/xai.ts

@@ -42,7 +42,7 @@ const responsesRoute = Route.make({
     name: "xAI Responses",
     rotateAfterMs: RESPONSES_WEBSOCKET_ROTATE_AFTER_MS,
   }),
-  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
+  defaults: { providerOptions: { store: false } },
 })
 
 const chatRoute = Route.make({

packages/ai/src/route/client.ts

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

packages/ai/src/route/protocol.ts

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

packages/ai/src/schema/events.ts

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

packages/ai/src/schema/options.ts

@@ -155,7 +155,6 @@ export class LanguageModelCompatibility extends Schema.Class<LanguageModelCompat
   reasoningField: Schema.optional(Schema.String),
   maxTokensField: Schema.optional(LanguageModelMaxTokensFieldCompatibility),
   requireFinishReason: Schema.optional(Schema.Boolean),
-  requireAssistantAfterTool: Schema.optional(Schema.Boolean),
   supportsStore: Schema.optional(Schema.Boolean),
   supportsUsageInStreaming: Schema.optional(Schema.Boolean),
   supportsStrictMode: Schema.optional(Schema.Boolean),

packages/ai/src/utils/sanitize.ts

@@ -1,12 +0,0 @@
-import { isRecord } from "./record.js"
-
-export const sanitizeSurrogates = <T>(value: T): T => {
-  if (typeof value === "string") return value.toWellFormed() as T
-  if (Array.isArray(value)) return value.map(sanitizeSurrogates) as T
-  if (value instanceof Uint8Array || value instanceof Error) return value
-  if (isRecord(value))
-    return Object.fromEntries(
-      Object.entries(value).map(([key, entry]) => [key.toWellFormed(), sanitizeSurrogates(entry)]),
-    ) as T
-  return value
-}

packages/ai/test/compile.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { Effect, Ref, Schema } from "effect"
 import { HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
-import { LLM, Message, ToolCallPart, mergeProviderOptions } from "../src/index.js"
+import { LLM, mergeProviderOptions } from "../src/index.js"
 import { AnthropicMessages, OpenAIChat } from "../src/protocols.js"
 import { Auth, LLMClient } from "../src/route.js"
 import { compileRequest } from "../src/route/client.js"
@@ -247,73 +247,6 @@ describe("request option precedence", () => {
     }),
   )
 
-  it.effect("sanitizes outbound JSON without an HTTP overlay", () =>
-    LLMClient.generate(
-      LLM.request({
-        model: OpenAIChat.route
-          .with({ endpoint: { baseURL: "https://api.openai.test/v1/" }, auth: Auth.bearer("test") })
-          .model({ id: "gpt-4o-mini" }),
-        prompt: "hello \uD800 \u{1F600}",
-      }),
-    ).pipe(
-      Effect.provide(
-        dynamicResponse((input) =>
-          Effect.gen(function* () {
-            expect(decodeJson(input.text)).toMatchObject({
-              messages: [{ role: "user", content: "hello \uFFFD \u{1F600}" }],
-            })
-            return input.respond(sseEvents(deltaChunk({}, "stop")), {
-              headers: { "content-type": "text/event-stream" },
-            })
-          }),
-        ),
-      ),
-    ),
-  )
-
-  it.effect("sanitizes unpaired surrogates throughout outbound JSON", () =>
-    LLMClient.generate(
-      LLM.request({
-        model: OpenAIChat.route
-          .with({ endpoint: { baseURL: "https://api.openai.test/v1/" }, auth: Auth.bearer("test") })
-          .model({ id: "gpt-4o-mini" }),
-        system: "system \uD800 \u{1F600}",
-        messages: [
-          Message.user("user \uDC00"),
-          Message.assistant([
-            Message.text("assistant \uD800"),
-            ToolCallPart.make({ id: "call_1", name: "lookup", input: { query: "input \uDC00" } }),
-          ]),
-          Message.tool({ id: "call_1", name: "lookup", result: { output: "result \uD800" } }),
-        ],
-        http: { body: { metadata: { "key\uD800": ["overlay \uDC00", "valid \u{1F600}"] } } },
-      }),
-    ).pipe(
-      Effect.provide(
-        dynamicResponse((input) =>
-          Effect.gen(function* () {
-            expect(decodeJson(input.text)).toMatchObject({
-              messages: [
-                { role: "system", content: "system \uFFFD \u{1F600}" },
-                { role: "user", content: "user \uFFFD" },
-                {
-                  role: "assistant",
-                  content: "assistant \uFFFD",
-                  tool_calls: [{ function: { arguments: '{"query":"input \uFFFD"}' } }],
-                },
-                { role: "tool", content: '{"output":"result \uFFFD"}' },
-              ],
-              metadata: { "key\uFFFD": ["overlay \uFFFD", "valid \u{1F600}"] },
-            })
-            return input.respond(sseEvents(deltaChunk({}, "stop")), {
-              headers: { "content-type": "text/event-stream" },
-            })
-          }),
-        ),
-      ),
-    ),
-  )
-
   it.effect("applies raw body overlays after protocol lowering", () =>
     LLMClient.generate(
       LLM.request({

packages/ai/test/partial-json.test.ts

@@ -1,58 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { Allow, MalformedJSON, PartialJSON, parse } from "../src/protocols/utils/partial-json.js"
-
-describe("partial JSON", () => {
-  test("parses complete JSON", () => {
-    expect(parse('{"key":"value","items":[1,true,null]}')).toEqual({
-      key: "value",
-      items: [1, true, null],
-    })
-
-    const object = parse('{"__proto__":{"safe":true}}') as Record<string, unknown>
-    expect(Object.hasOwn(object, "__proto__")).toBe(true)
-  })
-
-  test("parses partial strings", () => {
-    expect(parse('"hello')).toBe("hello")
-    expect(parse('"hello \\u12')).toBe("hello ")
-    expect(() => parse('"hello', ~Allow.STR)).toThrow(PartialJSON)
-  })
-
-  test("repairs invalid escapes and raw control characters", () => {
-    expect(parse('{"path":"A\\H","text":"first\tsecond"}')).toEqual({
-      path: "A\\H",
-      text: "first\tsecond",
-    })
-  })
-
-  test("preserves prototype keys in partial objects", () => {
-    const object = parse('{"__proto__":{"safe":true}') as Record<string, unknown>
-
-    expect(Object.hasOwn(object, "__proto__")).toBe(true)
-    expect(Object.getPrototypeOf(object)).toBe(Object.prototype)
-    expect(object.__proto__).toEqual({ safe: true })
-  })
-
-  test("controls partial collection values independently", () => {
-    expect(parse('["', Allow.ARR)).toEqual([])
-    expect(parse('["', Allow.ARR | Allow.STR)).toEqual([""])
-    expect(parse('{"key":"', Allow.OBJ)).toEqual({})
-    expect(parse('{"key":"', Allow.OBJ | Allow.STR)).toEqual({ key: "" })
-  })
-
-  test("parses partial literals and numbers", () => {
-    expect(parse("nu", Allow.NULL)).toBeNull()
-    expect(parse("tr", Allow.BOOL)).toBe(true)
-    expect(parse("fa", Allow.BOOL)).toBe(false)
-    expect(parse("1e", Allow.NUM)).toBe(1)
-  })
-
-  test("distinguishes disallowed partial values from malformed values", () => {
-    expect(() => parse("[", Allow.STR)).toThrow(PartialJSON)
-    expect(() => parse("n", ~Allow.NULL)).toThrow(MalformedJSON)
-  })
-
-  test("rejects empty input", () => {
-    expect(() => parse("  ")).toThrow("is empty")
-  })
-})

packages/ai/test/provider-package.test.ts

@@ -95,11 +95,7 @@ describe("provider package entrypoints", () => {
     })
     expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(selected.route.defaults.http?.body).toEqual({ service_tier: "priority" })
-    expect(selected.route.defaults.providerOptions).toEqual({
-      reasoningEffort: "low",
-      store: true,
-      include: ["reasoning.encrypted_content"],
-    })
+    expect(selected.route.defaults.providerOptions).toEqual({ reasoningEffort: "low", store: true })
   })
 
   test("maps Anthropic-compatible settings onto the executable model", async () => {
@@ -289,10 +285,7 @@ describe("provider package entrypoints", () => {
       baseURL: "https://aiplatform.googleapis.com/v1/projects/vertex-project/locations/global/endpoints/openapi",
       path: "/responses",
     })
-    expect(responses.route.defaults.providerOptions).toEqual({
-      store: false,
-      include: ["reasoning.encrypted_content"],
-    })
+    expect(responses.route.defaults.providerOptions).toEqual({ store: false })
   })
 
   test("rejects conflicting Vertex auth settings at runtime", async () => {

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

@@ -585,11 +585,12 @@ describe("Anthropic Messages route", () => {
 
   it.effect("infers empty-signature compatibility across Kimi providers", () =>
     Effect.gen(function* () {
-      const coding = AnthropicMessages.route.with({
-        provider: "kimi-for-coding",
-        endpoint: { baseURL: "https://compatible.test/v1/" },
-        auth: Auth.header("x-api-key", "test"),
-      })
+      const coding = AnthropicMessages.route
+        .with({
+          provider: "kimi-for-coding",
+          endpoint: { baseURL: "https://compatible.test/v1/" },
+          auth: Auth.header("x-api-key", "test"),
+        })
       const moonshot = AnthropicMessages.route
         .with({
           provider: "moonshotai",
@@ -770,108 +771,6 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
-  it.effect("ignores unknown content block and delta variants", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "message_start", message: { usage: { input_tokens: 5 } } },
-              { type: "future_event", content_block: 42, delta: 42 },
-              { type: "content_block_start", index: 0, content_block: { type: "future_block", text: 42 } },
-              { type: "content_block_delta", index: 0, delta: { text: "ignored" } },
-              { type: "content_block_delta", index: 0, delta: { type: "future_delta", text: 42 } },
-              { type: "content_block_delta", index: 0, delta: { type: "text_delta", text: "hidden" } },
-              { type: "content_block_delta", index: 0, delta: { type: "thinking_delta", thinking: "hidden" } },
-              { type: "content_block_delta", index: 0, delta: { type: "signature_delta", signature: "hidden" } },
-              { type: "content_block_stop", index: 0 },
-              { type: "content_block_start", index: 1, content_block: { type: "text", text: "" } },
-              { type: "content_block_delta", index: 1, delta: { type: "text_delta", text: "Hello" } },
-              { type: "content_block_stop", index: 1 },
-              { type: "message_delta", delta: { stop_reason: "end_turn" }, usage: { output_tokens: 1 } },
-              { type: "message_stop" },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.message.content).toEqual([{ type: "text", text: "Hello" }])
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "end_turn" })
-    }),
-  )
-
-  it.effect("rejects malformed recognized content block variants", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "message_start", message: { usage: { input_tokens: 5 } } },
-              { type: "content_block_start", index: 0, content_block: { type: "text", text: 42 } },
-            ),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "InvalidProviderOutput",
-        message: "Invalid anthropic/anthropic-messages stream event",
-      })
-    }),
-  )
-
-  it.effect("rejects malformed recognized content delta variants", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "message_start", message: { usage: { input_tokens: 5 } } },
-              { type: "content_block_start", index: 0, content_block: { type: "text", text: "" } },
-              { type: "content_block_delta", index: 0, delta: { type: "text_delta", text: 42 } },
-            ),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "InvalidProviderOutput",
-        message: "Invalid anthropic/anthropic-messages stream event",
-      })
-    }),
-  )
-
-  it.effect("rejects malformed payloads on unrelated stream events", () =>
-    Effect.gen(function* () {
-      const events = [
-        { type: "message_start", message: { usage: { input_tokens: 1 } }, delta: 42 },
-        { type: "content_block_start", index: 0 },
-        { type: "content_block_delta", index: 0 },
-        { type: "content_block_stop", index: 0, content_block: { type: "text", text: 42 } },
-        { type: "message_delta" },
-        { type: "message_delta", delta: { stop_reason: 42 } },
-        { type: "message_stop", delta: { text: 42 } },
-        { type: "error", error: { type: "overloaded_error", message: "busy" }, content_block: 42 },
-      ]
-
-      yield* Effect.forEach(events, (event) =>
-        Effect.gen(function* () {
-          const error = yield* LLMClient.generate(request).pipe(
-            Effect.provide(fixedResponse(sseEvents(event))),
-            Effect.flip,
-          )
-
-          expect(error.reason).toMatchObject({
-            _tag: "InvalidProviderOutput",
-            message: "Invalid anthropic/anthropic-messages stream event",
-          })
-        }),
-      )
-    }),
-  )
-
   it.effect("rejects malformed recognized SSE events", () =>
     Effect.gen(function* () {
       const error = yield* LLMClient.generate(request).pipe(
@@ -1230,14 +1129,8 @@ describe("Anthropic Messages route", () => {
       expect(response.events).toEqual([
         { type: "step-start", index: 0 },
         { type: "tool-input-start", id: "call_1", name: "lookup" },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' },
         { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata: undefined },
         {
           type: "tool-call",

packages/ai/test/provider/bedrock-converse.test.ts

@@ -475,14 +475,8 @@ describe("Bedrock Converse route", () => {
       ])
       const events = response.events.filter((event) => event.type === "tool-input-delta")
       expect(events).toEqual([
-        { type: "tool-input-delta", id: "tool_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "tool_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "tool_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "tool_1", name: "lookup", text: ':"weather"}' },
       ])
       expect(response.events.at(-1)).toMatchObject({
         type: "finish",
@@ -491,7 +485,7 @@ describe("Bedrock Converse route", () => {
     }),
   )
 
-  it.effect("recovers incomplete tool input at finalization", () =>
+  it.effect("emits malformed tool input as an unexecuted tool error", () =>
     Effect.gen(function* () {
       const body = eventStreamBody(
         ["messageStart", { role: "assistant" }],
@@ -508,10 +502,10 @@ describe("Bedrock Converse route", () => {
       )
       const response = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body)))
 
-      expect(response.events.find((event) => event.type === "tool-call")).toMatchObject({
+      expect(response.events.find((event) => event.type === "tool-input-error")).toMatchObject({
         id: "tool_1",
         name: "lookup",
-        input: { query: "partial" },
+        raw: '{"query":"partial',
       })
       expect(response.finishReason).toEqual({ normalized: "tool-calls", raw: "end_turn" })
     }),
@@ -716,32 +710,6 @@ describe("Bedrock Converse route", () => {
     }),
   )
 
-  it.effect("ignores unknown normal stream events", () =>
-    Effect.gen(function* () {
-      const body = concat([
-        eventFrame("messageStart", { role: "assistant" }),
-        eventFrame("futureEvent", { message: "Ignore this" }),
-        eventFrame("messageStop", { stopReason: "end_turn" }),
-      ])
-      const response = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body)))
-
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "end_turn" })
-    }),
-  )
-
-  it.effect("fails unknown stream exceptions after message stop", () =>
-    Effect.gen(function* () {
-      const body = concat([
-        eventFrame("messageStart", { role: "assistant" }),
-        eventFrame("messageStop", { stopReason: "end_turn" }),
-        exceptionFrame("futureException", { message: "A future provider failure" }),
-      ])
-      const error = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body)), Effect.flip)
-
-      expect(error.reason).toMatchObject({ _tag: "UnknownProvider", message: "A future provider failure" })
-    }),
-  )
-
   it.effect("classifies throttlingException as a rate limit", () =>
     Effect.gen(function* () {
       const body = concat([

packages/ai/test/provider/bedrock-mantle.test.ts

@@ -6,7 +6,6 @@ import { AmazonBedrockMantle } from "../../src/providers.js"
 import { compileRequest, LLMClient } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
 import { dynamicResponse } from "../lib/http.js"
-import { sseEvents } from "../lib/sse.js"
 import { recordedTests } from "../recorded-test.js"
 
 const credentials = {
@@ -72,9 +71,7 @@ describe("Amazon Bedrock Mantle provider", () => {
             Effect.gen(function* () {
               const request = yield* HttpClientRequest.toWeb(input.request)
               seen.push({ url: request.url, authorization: request.headers.get("authorization") ?? undefined })
-              return input.respond(sseEvents({ choices: [{ delta: {}, finish_reason: "stop" }] }), {
-                headers: { "content-type": "text/event-stream" },
-              })
+              return input.respond("", { headers: { "content-type": "text/event-stream" } })
             }),
           ),
         ),

packages/ai/test/provider/openai-chat.test.ts

@@ -85,28 +85,6 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
-  it.effect("omits empty and whitespace-only assistant messages", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.user("Before."),
-            Message.assistant([]),
-            Message.assistant(""),
-            Message.assistant(" \n\t "),
-            Message.assistant("After."),
-          ],
-        }),
-      )
-
-      expect(prepared.body.messages).toEqual([
-        { role: "user", content: "Before." },
-        { role: "assistant", content: "After." },
-      ])
-    }),
-  )
-
   it.effect("replays canonical reasoning as OpenAI-compatible reasoning_content", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
@@ -214,21 +192,6 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
-  it.effect("omits the prompt cache key when caching is disabled", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          prompt: "Hello",
-          promptCacheKey: "session_123",
-          cache: "none",
-        }),
-      )
-
-      expect(prepared.body).not.toHaveProperty("prompt_cache_key")
-    }),
-  )
-
   it.effect("maps the xAI Chat prompt cache key to conversation affinity", () =>
     LLMClient.generate(
       LLM.request({
@@ -388,35 +351,6 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
-  it.effect("limits OpenAI and Azure Chat tool call IDs to 40 characters", () =>
-    Effect.gen(function* () {
-      const id = `call_${"a".repeat(48)}`
-      const models = [
-        model,
-        Azure.configure({ baseURL: "https://opencode-test.openai.azure.com/openai/", apiKey: "test" }).chat("gpt-4o"),
-      ]
-
-      yield* Effect.forEach(models, (selected) =>
-        Effect.gen(function* () {
-          const prepared = yield* compileRequest(
-            LLM.request({
-              model: selected,
-              messages: [
-                Message.assistant([ToolCallPart.make({ id, name: "lookup", input: {} })]),
-                Message.tool({ id, name: "lookup", result: "Sunny" }),
-              ],
-            }),
-          )
-
-          expect(prepared.body.messages).toMatchObject([
-            { role: "assistant", tool_calls: [{ id: id.slice(0, 40) }] },
-            { role: "tool", tool_call_id: id.slice(0, 40) },
-          ])
-        }),
-      )
-    }),
-  )
-
   it.effect("preserves structured tool errors for the model", () =>
     Effect.gen(function* () {
       const error = { error: { type: "unknown", message: "Tool execution interrupted" } }
@@ -482,30 +416,6 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
-  it.effect("bridges image tool results before their synthetic user message when required", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: LanguageModel.update(model, { compatibility: { requireAssistantAfterTool: true } }),
-          messages: [
-            Message.assistant([ToolCallPart.make({ id: "call_image", name: "read", input: {} })]),
-            Message.tool({
-              id: "call_image",
-              name: "read",
-              result: {
-                type: "content",
-                value: [{ type: "file", uri: "data:image/png;base64,AAECAw==", mime: "image/png", name: "pixel.png" }],
-              },
-            }),
-          ],
-        }),
-      )
-
-      expect(prepared.body.messages.map((message) => message.role)).toEqual(["assistant", "tool", "assistant", "user"])
-      expect(prepared.body.messages[2]).toEqual({ role: "assistant", content: "Done." })
-    }),
-  )
-
   it.effect("orders parallel tool responses before one aggregated vision message", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
@@ -1254,14 +1164,8 @@ describe("OpenAI Chat route", () => {
       expect(response.events).toEqual([
         { type: "step-start", index: 0 },
         { type: "tool-input-start", id: "call_1", name: "lookup", providerMetadata: undefined },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' },
         { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata: undefined },
         {
           type: "tool-call",
@@ -1341,11 +1245,6 @@ describe("OpenAI Chat route", () => {
       ).pipe(Effect.provide(fixedResponse(body)), Effect.flip)
 
       expect(error.message).toContain("OpenAI Chat tool call delta is missing id or name")
-      expect(error.reason._tag).toBe("InvalidProviderOutput")
-      if (error.reason._tag !== "InvalidProviderOutput") return
-      expect(decodeJson(error.reason.raw ?? "")).toMatchObject({
-        choices: [{ finish_reason: "tool_calls" }],
-      })
     }),
   )
 
@@ -1359,7 +1258,6 @@ describe("OpenAI Chat route", () => {
         deltaChunk({ tool_calls: [{ index: 0, function: { arguments: ':"weather"}' } }] }),
       )
       const input = LLMRequest.update(request, {
-        model: LanguageModel.update(model, { compatibility: { requireFinishReason: false } }),
         tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
       })
       const response = yield* LLMClient.generate(input).pipe(Effect.provide(fixedResponse(body)))
@@ -1367,14 +1265,8 @@ describe("OpenAI Chat route", () => {
       expect(response.events).toEqual([
         { type: "step-start", index: 0 },
         { type: "tool-input-start", id: "call_1", name: "lookup", providerMetadata: undefined },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' },
         { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata: undefined },
         {
           type: "tool-call",

packages/ai/test/provider/openai-compatible-chat.test.ts

@@ -238,85 +238,6 @@ describe("OpenAI-compatible Chat route", () => {
     }),
   )
 
-  it.effect("normalizes tool call IDs for the selected model family", () =>
-    Effect.gen(function* () {
-      const longID = `call_${"a".repeat(48)}`
-      const cases = [
-        { provider: "custom", model: "mistral-small", id: "toolu_01CBhTTz95qkd9LJMdC9sf8t", expected: "toolu01CB" },
-        { provider: "custom", model: "devstral-small", id: "abc", expected: "abc000000" },
-        { provider: "custom", model: "codestral-latest", id: "toolu_01CBhTTz95", expected: "toolu01CB" },
-        { provider: "custom", model: "pixtral-large", id: "toolu_01CBhTTz95", expected: "toolu01CB" },
-        { provider: "custom", model: "open-mixtral-8x22b", id: "toolu_01CBhTTz95", expected: "toolu01CB" },
-        { provider: "gateway", model: "anthropic/claude-sonnet-4", id: "call|item/+", expected: "call_item__" },
-        { provider: "gateway", model: "openai/gpt-4o", id: longID, expected: longID.slice(0, 40) },
-        { provider: "custom", model: "ordinary-model", id: "call|item/+", expected: "call|item/+" },
-        { provider: "mistral", model: "zai-glm-5-2", id: "call_long_identifier", expected: "call_long_identifier" },
-      ]
-
-      yield* Effect.forEach(cases, (item) =>
-        Effect.gen(function* () {
-          const prepared = yield* compileRequest(
-            LLM.request({
-              model: OpenAICompatibleChat.route
-                .with({ provider: item.provider, endpoint: { baseURL: "https://api.custom.test/v1" } })
-                .model({ id: item.model }),
-              messages: [
-                Message.assistant([ToolCallPart.make({ id: item.id, name: "lookup", input: {} })]),
-                Message.tool({ id: item.id, name: "lookup", result: { type: "content", value: [] } }),
-              ],
-            }),
-          )
-
-          expect(prepared.body.messages).toMatchObject([
-            { role: "assistant", tool_calls: [{ id: item.expected }] },
-            { role: "tool", tool_call_id: item.expected },
-          ])
-        }),
-      )
-    }),
-  )
-
-  it.effect("bridges tool results for Mistral-family models and honors compatibility overrides", () =>
-    Effect.gen(function* () {
-      const cases = [
-        { id: "mistral-small", bridge: true },
-        { id: "devstral-small", bridge: true },
-        { id: "codestral-latest", bridge: true },
-        { id: "pixtral-large", bridge: true },
-        { id: "open-mixtral-8x22b", bridge: true },
-        { id: "ordinary-model", bridge: false },
-        { id: "ordinary-model", override: true, bridge: true },
-        { id: "mistral-small", override: false, bridge: false },
-      ] as const
-
-      yield* Effect.forEach(cases, (item) =>
-        Effect.gen(function* () {
-          const selected = OpenAICompatibleChat.route
-            .with({ provider: "custom", endpoint: { baseURL: "https://api.custom.test/v1" } })
-            .model({
-              id: item.id,
-              compatibility: "override" in item ? { requireAssistantAfterTool: item.override } : undefined,
-            })
-          const prepared = yield* compileRequest(
-            LLM.request({
-              model: selected,
-              messages: [
-                Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: {} })]),
-                Message.tool({ id: "call_1", name: "lookup", result: "Sunny" }),
-                Message.user("What next?"),
-              ],
-            }),
-          )
-
-          expect(prepared.body.messages.map((message) => message.role)).toEqual(
-            item.bridge ? ["assistant", "tool", "assistant", "user"] : ["assistant", "tool", "user"],
-          )
-          if (item.bridge) expect(prepared.body.messages[2]).toEqual({ role: "assistant", content: "Done." })
-        }),
-      )
-    }),
-  )
-
   it.effect("posts to the configured compatible endpoint and parses text usage", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(
@@ -432,106 +353,13 @@ describe("OpenAI-compatible Chat route", () => {
     }),
   )
 
-  it.effect("rejects a stream without a required finish reason", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "")))),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "InvalidProviderOutput",
-        classification: "incomplete-stream",
-        message: "OpenAI Chat stream ended without finish_reason",
-      })
-    }),
-  )
-
-  it.effect("infers stop when finish reasons are optional", () =>
-    Effect.gen(function* () {
-      const compatible = OpenAICompatibleChat.route
-        .with({ provider: "custom", endpoint: { baseURL: "https://api.custom.test/v1" } })
-        .model({ id: "custom-model", compatibility: { requireFinishReason: false } })
-      const response = yield* LLMClient.generate(LLMRequest.update(request, { model: compatible })).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "")))),
-      )
-
-      expect(response.finishReason).toEqual({ normalized: "stop" })
-    }),
-  )
-
-  it.effect("normalizes the end finish reason to stop", () =>
+  it.effect("treats an empty finish reason as terminal", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "end")))),
+        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "")))),
       )
 
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "end" })
-    }),
-  )
-
-  it.effect("classifies provider error finish reasons", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "network_error")))),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "ProviderInternal",
-        message: "Provider reported a network error (finish_reason: network_error)",
-      })
-      expect(decodeJson(error.body ?? "")).toMatchObject({
-        id: "chatcmpl_fixture",
-        choices: [{ finish_reason: "network_error" }],
-      })
-
-      const generic = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "error")))),
-        Effect.flip,
-      )
-      expect(generic.reason).toMatchObject({
-        _tag: "UnknownProvider",
-        message: "Provider reported an error (finish_reason: error)",
-      })
-    }),
-  )
-
-  it.effect("preserves explicit provider error events", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents({
-              id: "chatcmpl_error",
-              error: { code: 502, message: "Provider disconnected", details: { upstream: "vendor" } },
-              trace_id: "trace_1",
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({ _tag: "ProviderInternal", message: "Provider disconnected", status: 502 })
-      expect(decodeJson(error.body ?? "")).toMatchObject({
-        id: "chatcmpl_error",
-        error: { code: 502, message: "Provider disconnected", details: { upstream: "vendor" } },
-        trace_id: "trace_1",
-      })
-    }),
-  )
-
-  it.effect("preserves provider finish outcomes in the common reason algebra", () =>
-    Effect.gen(function* () {
-      const filtered = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "content_filter")))),
-      )
-      const future = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "future_reason")))),
-      )
-
-      expect(filtered.finishReason).toEqual({ normalized: "content-filter", raw: "content_filter" })
-      expect(future.finishReason).toEqual({ normalized: "unknown", raw: "future_reason" })
+      expect(response.finishReason).toEqual({ normalized: "unknown", raw: "" })
     }),
   )
 
@@ -551,11 +379,6 @@ describe("OpenAI-compatible Chat route", () => {
       )
 
       expect(error.message).toContain("OpenAI Chat received content after the finish reason")
-      expect(error.reason._tag).toBe("InvalidProviderOutput")
-      if (error.reason._tag !== "InvalidProviderOutput") return
-      expect(decodeJson(error.reason.raw ?? "")).toMatchObject({
-        choices: [{ delta: { tool_calls: [{ id: "call_1" }] } }],
-      })
     }),
   )
 })

packages/ai/test/provider/openai-compatible-responses.test.ts

@@ -52,28 +52,10 @@ describe("Open Responses-compatible route", () => {
           { role: "user", content: [{ type: "input_text", text: "Say hello." }] },
         ],
         stream: true,
-        store: false,
-        include: ["reasoning.encrypted_content"],
       })
     }),
   )
 
-  it.effect("allows callers to override stateless encrypted reasoning defaults", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-        provider: "example",
-      }).model("example-model")
-      const prepared = yield* compileRequest(
-        LLM.request({ model, prompt: "Say hello.", providerOptions: { store: true, include: [] } }),
-      )
-
-      expect(prepared.body.store).toBe(true)
-      expect(prepared.body.include).toBeUndefined()
-    }),
-  )
-
   it.effect("lowers chronological system updates as standard developer messages", () =>
     Effect.gen(function* () {
       const model = configure({
@@ -225,143 +207,6 @@ describe("Open Responses-compatible route", () => {
     }),
   )
 
-  it.effect("replays only shared hosted tool items", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-        provider: "example",
-      }).model("example-model")
-      const items = [
-        { type: "web_search_call", id: "ws_1", status: "completed" },
-        { type: "x_search_call", id: "x_search_1", status: "completed" },
-        { type: "future_call", id: "future_1", status: "completed" },
-        { type: "file_search_call", id: "fs_1", queries: "not-an-array" },
-      ]
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: items.map((item) =>
-            Message.assistant({
-              type: "tool-result",
-              id: item.id,
-              name: item.type,
-              result: { type: "json", value: item },
-              providerExecuted: true,
-              providerMetadata: { openresponses: { itemId: item.id } },
-            }),
-          ),
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([
-        items[0],
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[1]) }] },
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[2]) }] },
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[3]) }] },
-      ])
-    }),
-  )
-
-  it.effect("routes response deltas by output index", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Say hello." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "response.output_item.added", output_index: 2, item: { type: "message", id: "msg_1" } },
-              { type: "response.output_text.delta", output_index: 2, item_id: "wrong_message", delta: "Indexed" },
-              { type: "response.output_item.done", output_index: 2, item: { type: "message", id: "msg_1" } },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.message.content).toEqual([
-        { type: "text", text: "Indexed", providerMetadata: { openresponses: { itemId: "msg_1" } } },
-      ])
-    }),
-  )
-
-  it.effect("finalizes pending function calls from completed response output", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-        provider: "example",
-      }).model("example-model")
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Look it up." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                item: { type: "function_call", id: "item_1", call_id: "call_1", name: "lookup", arguments: "" },
-              },
-              { type: "response.function_call_arguments.delta", item_id: "item_1", delta: '{"query":"par' },
-              {
-                type: "response.completed",
-                response: {
-                  output: [
-                    {
-                      type: "function_call",
-                      id: "item_1",
-                      call_id: "call_1",
-                      name: "lookup",
-                      arguments: '{"query":"complete"}',
-                    },
-                  ],
-                },
-              },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({
-        input: { query: "complete" },
-        providerMetadata: { openresponses: { itemId: "item_1" } },
-      })
-    }),
-  )
-
-  it.effect("preserves terminal reasoning metadata when item completion is missing", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think it through." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                item: { type: "reasoning", id: "rs_raw", encrypted_content: null },
-              },
-              { type: "response.reasoning_summary_text.delta", item_id: "rs_raw", delta: "Thinking" },
-              {
-                type: "response.completed",
-                response: {
-                  output: [{ type: "reasoning", id: "rs_raw", encrypted_content: "raw-state" }],
-                },
-              },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.events.find((event) => event.type === "reasoning-end")).toMatchObject({
-        providerMetadata: { openresponses: { itemId: "rs_raw", reasoningEncryptedContent: "raw-state" } },
-      })
-    }),
-  )
-
   it.effect("reconciles raw reasoning finals without streamed deltas", () =>
     Effect.gen(function* () {
       const model = configure({

packages/ai/test/provider/openrouter.test.ts

@@ -190,21 +190,6 @@ describe("OpenRouter", () => {
     }),
   )
 
-  it.effect("omits the prompt cache key when caching is disabled", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("openai/gpt-4o-mini"),
-          prompt: "Hello",
-          promptCacheKey: "session_123",
-          cache: "none",
-        }),
-      )
-
-      expect(prepared.body).not.toHaveProperty("prompt_cache_key")
-    }),
-  )
-
   it.effect("filters invalid known OpenRouter options while preserving extensions", () =>
     Effect.gen(function* () {
       const invalid: Record<string, unknown> = {

packages/ai/test/provider/xai-responses.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
-import { LLM, LLMEvent, Message } from "../../src/index.js"
+import { LLM, LLMEvent } from "../../src/index.js"
 import { XAI } from "../../src/providers.js"
 import { OpenResponses } from "../../src/protocols/open-responses.js"
 import { OpenAIResponses } from "../../src/protocols/openai-responses.js"
@@ -14,24 +14,13 @@ import { sseEvents } from "../lib/sse.js"
 const model = XAI.configure({ apiKey: "test", baseURL: "https://api.x.ai/v1" }).responses("grok-4.6")
 
 describe("xAI Responses route", () => {
-  it.effect("composes the Open Responses baseline with xAI extensions", () =>
+  it.effect("extends the Open Responses baseline directly", () =>
     Effect.gen(function* () {
-      expect(XAIResponses.protocol.body).not.toBe(OpenResponses.protocol.body)
+      expect(XAIResponses.protocol.body).toBe(OpenResponses.protocol.body)
       expect(XAIResponses.protocol.body).not.toBe(OpenAIResponses.protocol.body)
 
       const prepared = yield* compileRequest(LLM.request({ model, prompt: "Hello" }))
       expect(prepared.protocol).toBe("xai-responses")
-      expect(prepared.body.store).toBe(false)
-      expect(prepared.body.include).toEqual(["reasoning.encrypted_content"])
-    }),
-  )
-
-  it.effect("allows callers to opt out of encrypted reasoning", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(LLM.request({ model, prompt: "Hello", providerOptions: { include: [] } }))
-
-      expect(prepared.body.store).toBe(false)
-      expect(prepared.body.include).toBeUndefined()
     }),
   )
 
@@ -70,106 +59,16 @@ describe("xAI Responses route", () => {
     }),
   )
 
-  it.effect("routes xAI reasoning summaries by output index", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think" })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                output_index: 3,
-                item: { type: "reasoning", id: "reasoning_1" },
-              },
-              {
-                type: "response.reasoning_summary_text.delta",
-                output_index: 3,
-                item_id: "wrong_reasoning",
-                summary_index: 0,
-                delta: "Considering.",
-              },
-              {
-                type: "response.output_item.done",
-                output_index: 3,
-                item: { type: "reasoning", id: "reasoning_1", encrypted_content: "opaque" },
-              },
-              { type: "response.completed", response: { id: "response_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.reasoning).toBe("Considering.")
-      expect(response.message.content.find((part) => part.type === "reasoning")).toMatchObject({
-        providerMetadata: { xai: { itemId: "reasoning_1", reasoningEncryptedContent: "opaque" } },
-      })
-    }),
-  )
-
-  it.effect("replays xAI hosted tool items when continuing with the same provider", () =>
-    Effect.gen(function* () {
-      const item = { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } }
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.assistant([
-              {
-                type: "tool-result",
-                id: "x_search_1",
-                name: "x_search",
-                result: { type: "json", value: item },
-                providerExecuted: true,
-                providerMetadata: { xai: { itemId: "x_search_1" } },
-              },
-            ]),
-          ],
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([item])
-    }),
-  )
-
-  it.effect("replays shared and xAI hosted tool items but rejects OpenAI extensions", () =>
-    Effect.gen(function* () {
-      const items = [
-        { type: "web_search_call", id: "ws_1", status: "completed" },
-        { type: "image_generation_call", id: "ig_1", status: "completed", result: "AQID" },
-        { type: "computer_call", id: "computer_1", status: "completed" },
-      ]
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: items.map((item) =>
-            Message.assistant({
-              type: "tool-result",
-              id: item.id,
-              name: item.type,
-              result: { type: "json", value: item },
-              providerExecuted: true,
-              providerMetadata: { xai: { itemId: item.id } },
-            }),
-          ),
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([
-        items[0],
-        items[1],
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[2]) }] },
-      ])
-    }),
-  )
-
   it.effect("parses xAI hosted tool items", () =>
     Effect.gen(function* () {
-      const item = { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } }
       const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Search X" })).pipe(
         Effect.provide(
           fixedResponse(
             sseEvents(
-              { type: "response.output_item.done", item },
+              {
+                type: "response.output_item.done",
+                item: { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } },
+              },
               { type: "response.completed", response: { id: "response_1" } },
             ),
           ),
@@ -181,11 +80,6 @@ describe("xAI Responses route", () => {
         name: "x_search",
         input: { query: "news" },
         providerExecuted: true,
-        providerMetadata: { xai: { itemId: "x_search_1" } },
-      })
-      expect(response.events.find(LLMEvent.is.toolResult)).toMatchObject({
-        result: { type: "json", value: item },
-        providerMetadata: { xai: { itemId: "x_search_1" } },
       })
     }),
   )

packages/ai/test/provider/zai-images.test.ts

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

packages/ai/test/tool-stream.test.ts

@@ -23,11 +23,9 @@ describe("ToolStream", () => {
 
       expect(first.events).toEqual([
         { type: "tool-input-start", id: "call_1", name: "lookup" },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-      ])
-      expect(second.events).toEqual([
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}', input: { query: "weather" } },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
       ])
+      expect(second.events).toEqual([{ type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' }])
       expect(finished).toEqual({
         tools: {},
         events: [
@@ -38,45 +36,6 @@ describe("ToolStream", () => {
     }),
   )
 
-  it.effect("exposes cumulative partial string values", () =>
-    Effect.gen(function* () {
-      const result = ToolStream.appendOrStart(
-        ADAPTER,
-        ToolStream.empty<number>(),
-        0,
-        { id: "call_1", name: "lookup", text: '{"query":"wea' },
-        "missing tool",
-      )
-      if (ToolStream.isError(result)) return yield* result
-
-      expect(result.events.at(-1)).toEqual({
-        type: "tool-input-delta",
-        id: "call_1",
-        name: "lookup",
-        text: '{"query":"wea',
-        input: { query: "wea" },
-      })
-    }),
-  )
-
-  it.effect("defaults partial input to an empty object when the accumulated value cannot be parsed", () =>
-    Effect.gen(function* () {
-      const result = ToolStream.appendOrStart(
-        ADAPTER,
-        ToolStream.empty<number>(),
-        0,
-        { id: "call_1", name: "lookup", text: "x" },
-        "missing tool",
-      )
-      if (ToolStream.isError(result)) return yield* result
-
-      expect(result.events).toEqual([
-        { type: "tool-input-start", id: "call_1", name: "lookup" },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: "x", input: {} },
-      ])
-    }),
-  )
-
   it.effect("keeps accumulated identity when later deltas contain empty strings", () =>
     Effect.gen(function* () {
       const first = ToolStream.appendOrStart(
@@ -132,7 +91,7 @@ describe("ToolStream", () => {
     }),
   )
 
-  it.effect("finalizes incomplete local input using the partial JSON parser", () =>
+  it.effect("finalizes malformed local input as a non-executable tool error", () =>
     Effect.gen(function* () {
       const tools = ToolStream.start(ToolStream.empty<string>(), "item_1", {
         id: "call_1",
@@ -144,46 +103,18 @@ describe("ToolStream", () => {
       expect(finished).toEqual({
         tools: {},
         events: [
-          { type: "tool-input-end", id: "call_1", name: "lookup" },
-          { type: "tool-call", id: "call_1", name: "lookup", input: { query: "partial" } },
+          {
+            type: "tool-input-error",
+            id: "call_1",
+            name: "lookup",
+            raw: '{"query":"partial',
+          },
         ],
       })
     }),
   )
 
-  it.effect("repairs malformed string escapes in final local input", () =>
-    Effect.gen(function* () {
-      const tools = ToolStream.start(ToolStream.empty<string>(), "item_1", {
-        id: "call_1",
-        name: "lookup",
-        input: '{"path":"A\\H","text":"first\tsecond"}',
-      })
-      const finished = yield* ToolStream.finish(ADAPTER, tools, "item_1")
-
-      expect(finished.events).toEqual([
-        { type: "tool-input-end", id: "call_1", name: "lookup" },
-        { type: "tool-call", id: "call_1", name: "lookup", input: { path: "A\\H", text: "first\tsecond" } },
-      ])
-    }),
-  )
-
-  it.effect("defaults unrecoverable local input to an empty object", () =>
-    Effect.gen(function* () {
-      const tools = ToolStream.start(ToolStream.empty<string>(), "item_1", {
-        id: "call_1",
-        name: "lookup",
-        input: "invalid",
-      })
-      const finished = yield* ToolStream.finish(ADAPTER, tools, "item_1")
-
-      expect(finished.events).toEqual([
-        { type: "tool-input-end", id: "call_1", name: "lookup" },
-        { type: "tool-call", id: "call_1", name: "lookup", input: {} },
-      ])
-    }),
-  )
-
-  it.effect("recovers incomplete input alongside valid parallel tool calls", () =>
+  it.effect("preserves valid siblings when one parallel input is malformed", () =>
     Effect.gen(function* () {
       const valid = ToolStream.start(ToolStream.empty<number>(), 0, {
         id: "call_valid",
@@ -202,8 +133,12 @@ describe("ToolStream", () => {
         events: [
           { type: "tool-input-end", id: "call_valid", name: "lookup" },
           { type: "tool-call", id: "call_valid", name: "lookup", input: { query: "weather" } },
-          { type: "tool-input-end", id: "call_invalid", name: "lookup" },
-          { type: "tool-call", id: "call_invalid", name: "lookup", input: { query: "partial" } },
+          {
+            type: "tool-input-error",
+            id: "call_invalid",
+            name: "lookup",
+            raw: '{"query":"partial',
+          },
         ],
       })
     }),

packages/app/e2e/regression/new-session-workspace-branch.spec.ts

@@ -1,53 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const draftID = "draft_new_session_workspace_branch"
-const directory = "C:/OpenCode/WorkspaceBranch"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test("selects a base branch for a new workspace", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_new_session_workspace_branch",
-      worktree: directory,
-      vcs: "git",
-      name: "workspace-branch",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [],
-    pageMessages: () => ({ items: [] }),
-    vcsBranches: ["feature/api", "main", "origin/release"],
-  })
-  await page.addInitScript(
-    ({ directory, draftID, server }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "draft", draftID, server, directory }]),
-      )
-    },
-    { directory, draftID, server },
-  )
-
-  await page.goto(`/new-session?draftId=${draftID}`)
-  await expectAppVisible(page.locator('[data-component="composer-editor"]'))
-  await page.getByRole("button", { name: "Local", exact: true }).click()
-  await page.getByRole("menuitem", { name: "New workspace", exact: true }).click()
-  await page.getByRole("button", { name: "from main", exact: true }).click()
-  await page.getByRole("menuitemradio", { name: "feature/api", exact: true }).click()
-
-  const selected = page.getByRole("button", { name: "from feature/api", exact: true })
-  await expect(selected).toBeVisible()
-  await selected.click()
-  await expect(page.getByRole("menuitemradio", { name: "feature/api", exact: true })).toBeChecked()
-})

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

@@ -1,226 +0,0 @@
-import { expect, test, type Page } from "@playwright/test"
-import type { OpenCodeEvent } from "@opencode-ai/client/promise"
-import { base64Encode } from "@opencode-ai/util/encode"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const directory = "C:/OpenCode/SessionQueueRegression"
-const projectID = "proj_session_queue_regression"
-const sessionID = "ses_session_queue_regression"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-type InboxRow = {
-  id: string
-  sessionID: string
-  timeCreated: number
-  type: "user"
-  payload: { text: string; metadata?: Record<string, unknown> }
-  delivery: "steer" | "queue"
-}
-
-function createQueueMock(seed: string[]) {
-  const rows: InboxRow[] = seed.map((text, index) => ({
-    id: `inb_seed_${index + 1}`,
-    sessionID,
-    timeCreated: 1700000000000 + index,
-    type: "user",
-    payload: { text },
-    delivery: "queue",
-  }))
-  const events: OpenCodeEvent[] = []
-  const prompts: Record<string, unknown>[] = []
-  const changes: { inboxID: string; action: "cancel" | "steer" }[] = []
-  const log: string[] = []
-  let sequence = 0
-  const emit = (type: OpenCodeEvent["type"], data: OpenCodeEvent["data"]) => {
-    sequence += 1
-    events.push({
-      id: `evt_queue_${sequence}`,
-      type,
-      created: Date.now(),
-      durable: { aggregateID: sessionID, seq: sequence, version: 1 },
-      data,
-    } as OpenCodeEvent)
-  }
-  return {
-    rows,
-    prompts,
-    changes,
-    log,
-    events: () => events.splice(0),
-    onPrompt: (input: { sessionID: string; body: Record<string, unknown> }) => {
-      prompts.push(input.body)
-      log.push(`prompt:${String(input.body.delivery ?? "steer")}`)
-      const row: InboxRow = {
-        id: typeof input.body.id === "string" ? input.body.id : `inb_mock_${sequence}`,
-        sessionID: input.sessionID,
-        timeCreated: Date.now(),
-        type: "user",
-        payload: {
-          text: typeof input.body.text === "string" ? input.body.text : "",
-          ...(input.body.metadata === undefined ? {} : { metadata: input.body.metadata as Record<string, unknown> }),
-        },
-        delivery: input.body.delivery === "queue" ? "queue" : "steer",
-      }
-      rows.push(row)
-      emit("session.inbox.enqueued", {
-        sessionID: input.sessionID,
-        inboxID: row.id,
-        item: { type: "user", payload: row.payload, delivery: row.delivery },
-      })
-    },
-    onInboxChange: (input: { sessionID: string; inboxID: string; action: "cancel" | "steer" }) => {
-      changes.push({ inboxID: input.inboxID, action: input.action })
-      log.push(`${input.action}:${input.inboxID}`)
-      const index = rows.findIndex((row) => row.id === input.inboxID)
-      const row = rows[index]
-      if (!row) return
-      if (input.action === "cancel") {
-        rows.splice(index, 1)
-        emit("session.inbox.cancelled", { sessionID: input.sessionID, inboxID: input.inboxID })
-        return
-      }
-      row.delivery = "steer"
-      emit("session.inbox.delivery.changed", {
-        sessionID: input.sessionID,
-        inboxID: input.inboxID,
-        delivery: "steer",
-      })
-    },
-  }
-}
-
-async function openSession(page: Page, mock: ReturnType<typeof createQueueMock>, followUpBehavior?: "queue" | "steer") {
-  if (followUpBehavior) {
-    await page.addInitScript(
-      (behavior) => localStorage.setItem("settings.v3", JSON.stringify({ general: { followUpBehavior: behavior } })),
-      followUpBehavior,
-    )
-  }
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "session-queue-regression",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { "queue-model": { id: "queue-model", name: "Queue Model", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "queue-model" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        slug: "session-queue-regression",
-        projectID,
-        directory,
-        title: "Session queue regression",
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    pageMessages: () => ({ items: [] }),
-    sessionStatus: () => ({ [sessionID]: { type: "running" } }),
-    inbox: () => mock.rows.map((row) => ({ ...row, payload: { ...row.payload } })),
-    onPrompt: mock.onPrompt,
-    onInboxChange: mock.onInboxChange,
-    events: mock.events,
-  })
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  const composer = page.locator('[data-component="composer"]')
-  await expectAppVisible(composer)
-  return {
-    composer,
-    input: composer.locator('[data-component="composer-editor"]'),
-    rows: page.locator('[data-component="session-queue-row"]'),
-  }
-}
-
-test("follow-up preference controls Enter while Mod+Enter uses the alternate delivery", async ({ page }) => {
-  const mock = createQueueMock([])
-  const view = await openSession(page, mock, "queue")
-
-  await view.input.fill("queue this follow-up")
-  await expect(view.composer.locator('[data-action="composer-alternate-delivery"]')).toContainText("Steer")
-  await view.input.press("Enter")
-  await expect(view.rows.getByText("queue this follow-up", { exact: true })).toBeVisible()
-
-  await view.input.fill("steer this correction")
-  await view.input.press("ControlOrMeta+Enter")
-  await expect.poll(() => mock.prompts.map((prompt) => prompt.delivery)).toEqual(["queue", "steer"])
-  await expect(view.input).toHaveText("")
-})
-
-test("dragging reorders queued prompts", async ({ page }) => {
-  const mock = createQueueMock(["first queued prompt", "second queued prompt", "third queued prompt"])
-  const view = await openSession(page, mock)
-  await expect(view.rows).toHaveCount(3)
-
-  const first = view.rows.filter({ hasText: "first queued prompt" })
-  const third = view.rows.filter({ hasText: "third queued prompt" })
-  await first.getByRole("button", { name: "Reorder queued prompt" }).hover()
-  await page.mouse.down()
-  const target = await third.boundingBox()
-  if (!target) throw new Error("The target queue row is not visible")
-  await page.mouse.move(target.x + target.width / 2, target.y + target.height / 2, { steps: 10 })
-  await page.mouse.up()
-
-  await expect(view.rows.locator('[data-action="session-queue-edit"]')).toHaveText([
-    "second queued prompt",
-    "third queued prompt",
-    "first queued prompt",
-  ])
-  expect(mock.prompts.map((prompt) => prompt.text)).toEqual([
-    "second queued prompt",
-    "third queued prompt",
-    "first queued prompt",
-  ])
-  expect(mock.changes).toEqual([
-    { inboxID: "inb_seed_1", action: "cancel" },
-    { inboxID: "inb_seed_2", action: "cancel" },
-    { inboxID: "inb_seed_3", action: "cancel" },
-  ])
-})
-
-test("editing restores the existing draft and replaces only the original queue position", async ({ page }) => {
-  const mock = createQueueMock(["first queued prompt", "tighten the error copy", "third queued prompt"])
-  const view = await openSession(page, mock)
-  const original = view.rows.getByText("tighten the error copy", { exact: true })
-  await expect(original).toBeVisible()
-
-  await view.input.fill("my in-progress draft")
-  await original.click()
-  await expect(view.input).toHaveText("tighten the error copy")
-  await view.input.press("Escape")
-  await expect(view.input).toHaveText("my in-progress draft")
-
-  await original.click()
-  await expect(view.input).toHaveText("tighten the error copy")
-  await view.input.fill("tighten the error copy and add a retry hint")
-  await view.input.press("Enter")
-
-  await expect(view.rows.locator('[data-action="session-queue-edit"]')).toHaveText([
-    "first queued prompt",
-    "tighten the error copy and add a retry hint",
-    "third queued prompt",
-  ])
-  await expect(view.input).toHaveText("my in-progress draft")
-  expect(mock.prompts.map((prompt) => prompt.text)).toEqual([
-    "tighten the error copy and add a retry hint",
-    "tighten the error copy and add a retry hint",
-    "third queued prompt",
-  ])
-  expect(mock.prompts.every((prompt) => prompt.delivery === "queue" && prompt.resume === false)).toBe(true)
-  expect(mock.changes.map((change) => change.action)).toEqual(["cancel", "cancel", "cancel"])
-  expect(mock.log[0]).toBe("prompt:queue")
-})

packages/app/e2e/regression/session-timeline-collapse-state.spec.ts

@@ -139,7 +139,7 @@ test.describe("regression: session timeline local row state", () => {
     expect(siblingProbe).toEqual({
       fileMarker: "before",
       frameMarker: "before",
-      rowKey: `assistant-part:file:part:${assistantMessageID}:${editPartID}`,
+      rowKey: `assistant-part:part:${assistantMessageID}:${editPartID}`,
       rowMarker: "before",
       shadowRoots: 0,
       toolMarker: "before",

packages/app/e2e/regression/session-timeline-lifecycle-state.spec.ts

@@ -59,12 +59,12 @@ test("transitions a streaming shell from writing through command execution", asy
   await expect(tool.locator('[data-slot="collapsible-trigger"]')).toHaveCSS("height", "28px")
   await expect(tool.locator('[data-component="tool-trigger"]')).toHaveCSS("gap", "6px")
   await expect(title).toHaveCSS("font-size", "13px")
-  await expect(title).toHaveCSS("font-family", /^Inter,/)
+  await expect(title).toHaveCSS("font-family", "Inter, sans-serif")
   await expect(title).toHaveCSS("font-weight", "530")
   await expect(title).toHaveCSS("line-height", "16px")
   await expect(title).toHaveCSS("color", "rgb(22, 22, 22)")
   await expect(subtitle).toHaveCSS("font-size", "13px")
-  await expect(subtitle).toHaveCSS("font-family", /^Inter,/)
+  await expect(subtitle).toHaveCSS("font-family", "Inter, sans-serif")
   await expect(subtitle).toHaveCSS("font-weight", "440")
   await expect(subtitle).toHaveCSS("line-height", "16px")
   await expect(subtitle).toHaveCSS("color", "rgb(92, 92, 92)")

packages/app/e2e/regression/session-timeline-tool-projection.spec.ts

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

packages/app/e2e/regression/tab-navigate-mousedown.spec.ts

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

packages/app/e2e/utils/mock-api.ts

@@ -100,7 +100,6 @@ const Group = HttpApiGroup.make("mock")
   .add(HttpApiEndpoint.get("formRequests", "/api/form/request", { success: Json }))
   .add(HttpApiEndpoint.get("vcs", "/api/vcs", { success: Json }))
   .add(HttpApiEndpoint.get("vcsStatus", "/api/vcs/status", { success: Json }))
-  .add(HttpApiEndpoint.get("vcsBranches", "/api/vcs/branches", { success: Json }))
   .add(HttpApiEndpoint.get("vcsDiff", "/api/vcs/diff", { success: Json }))
   .add(HttpApiEndpoint.get("fsList", "/api/fs/list", { query: Query, success: Json }))
   .add(
@@ -175,39 +174,6 @@ const Group = HttpApiGroup.make("mock")
       success: Json,
     }),
   )
-  .add(
-    HttpApiEndpoint.post("sessionPrompt", "/api/session/:sessionID/prompt", {
-      params: SessionParams,
-      payload: JsonPayload,
-      success: Json,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.post("sessionSwitchAgent", "/api/session/:sessionID/agent", {
-      params: SessionParams,
-      payload: JsonPayload,
-      success: NoContent,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.post("sessionSwitchModel", "/api/session/:sessionID/model", {
-      params: SessionParams,
-      payload: JsonPayload,
-      success: NoContent,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.delete("sessionInboxCancel", "/api/session/:sessionID/inbox/:inboxID", {
-      params: { ...SessionParams, inboxID: Schema.String },
-      success: NoContent,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.post("sessionInboxSteer", "/api/session/:sessionID/inbox/:inboxID/steer", {
-      params: { ...SessionParams, inboxID: Schema.String },
-      success: NoContent,
-    }),
-  )
   .add(
     HttpApiEndpoint.get("sessionPermission", "/api/session/:sessionID/permission", {
       params: SessionParams,

packages/app/e2e/utils/mock-server.ts

@@ -21,7 +21,6 @@ export interface MockServerConfig {
     cursor?: string
   }
   vcsDiff?: unknown[]
-  vcsBranches?: string[]
   messageDelay?: number
   beforeMessagesResponse?: (input: { sessionID: string; before?: string }) => Promise<void>
   onMessages?: (input: { sessionID: string; before?: string; phase: "start" | "end" }) => void
@@ -36,9 +35,6 @@ export interface MockServerConfig {
   fileContent?: (path: string) => unknown | Promise<unknown>
   findFiles?: (input: { query: string; dirs?: string; limit?: number }) => unknown
   sessionStatus?: Record<string, unknown> | (() => Record<string, unknown>)
-  inbox?: unknown[] | (() => unknown[])
-  onPrompt?: (input: { sessionID: string; body: Record<string, unknown> }) => void
-  onInboxChange?: (input: { sessionID: string; inboxID: string; action: "cancel" | "steer" }) => void
 }
 
 type MockStreamWindow = Window & {
@@ -297,7 +293,6 @@ function mockHandlers(config: MockServerConfig, state: { cursors: Map<string, st
         vcs: () =>
           Effect.succeed({ location: location(config), data: { branch: { current: "main", default: "main" } } }),
         vcsStatus: () => Effect.succeed({ location: location(config), data: [] }),
-        vcsBranches: () => Effect.succeed({ location: location(config), data: config.vcsBranches ?? ["main"] }),
         vcsDiff: () => Effect.succeed({ location: location(config), data: config.vcsDiff ?? [] }),
         fsList: (ctx) =>
           Effect.promise(() => Promise.resolve(config.fileList?.(ctx.query.path ?? ""))).pipe(
@@ -402,39 +397,7 @@ function mockHandlers(config: MockServerConfig, state: { cursors: Map<string, st
         sessionFormReply: () => noContent,
         sessionFormCancel: () => noContent,
         sessionBackground: () => noContent,
-        sessionInbox: () =>
-          Effect.sync(() => ({ data: typeof config.inbox === "function" ? config.inbox() : (config.inbox ?? []) })),
-        sessionPrompt: (ctx) =>
-          Effect.sync(() => {
-            const body = record(ctx.payload) ? ctx.payload : {}
-            config.onPrompt?.({ sessionID: ctx.params.sessionID, body })
-            return {
-              data: {
-                id: typeof body.id === "string" ? body.id : `inb_mock_${Date.now()}`,
-                sessionID: ctx.params.sessionID,
-                timeCreated: Date.now(),
-                type: "user",
-                payload: {
-                  text: typeof body.text === "string" ? body.text : "",
-                  ...(body.files === undefined ? {} : { files: body.files }),
-                  ...(body.agents === undefined ? {} : { agents: body.agents }),
-                  ...(body.skills === undefined ? {} : { skills: body.skills }),
-                  ...(body.metadata === undefined ? {} : { metadata: body.metadata }),
-                },
-                delivery: body.delivery === "queue" ? "queue" : "steer",
-              },
-            }
-          }),
-        sessionInboxCancel: (ctx) =>
-          Effect.sync(() =>
-            config.onInboxChange?.({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID, action: "cancel" }),
-          ).pipe(Effect.andThen(noContent)),
-        sessionInboxSteer: (ctx) =>
-          Effect.sync(() =>
-            config.onInboxChange?.({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID, action: "steer" }),
-          ).pipe(Effect.andThen(noContent)),
-        sessionSwitchAgent: () => noContent,
-        sessionSwitchModel: () => noContent,
+        sessionInbox: () => Effect.succeed({ data: [] }),
         sessionPermission: (ctx) => {
           const permissions =
             typeof config.permissions === "function" ? config.permissions() : (config.permissions ?? [])

packages/app/src/composer/adapter.ts

@@ -39,26 +39,6 @@ export type ComposerSelection = {
   variant?: string
 }
 
-export type ComposerDelivery = "steer" | "queue"
-
-// Contract between the composer and the session prompt queue. The session
-// owns the queue (pending inbox items); the composer only asks which delivery
-// a submit should use and delegates edit confirmation while a queued prompt
-// is loaded in the editor.
-export type ComposerQueue = {
-  count: Accessor<number>
-  // Delivery a plain submit uses right now.
-  delivery: Accessor<ComposerDelivery>
-  // Delivery offered on Mod+Enter and the toolbar hint button; undefined hides the hint.
-  alternate: Accessor<ComposerDelivery | undefined>
-  // Inbox ID of the queued prompt currently loaded in the composer for editing.
-  editing: Accessor<string | undefined>
-  confirmEdit: (delivery: ComposerDelivery) => void
-  cancelEdit: () => void
-  // Loads the first queued prompt into the composer. Returns false when the queue is empty.
-  editFirst: () => boolean
-}
-
 export type ComposerSession = {
   id: string
   directory: string

packages/app/src/composer/composer.tsx

@@ -8,7 +8,7 @@ import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { ComposerEditor } from "./editor/editor"
 import { ModelSelectorPopover } from "@/providers/models/select-dialog"
 import { DialogSelectModelUnpaid } from "@/providers/models/unpaid"
-import { formatKeybind, useCommand } from "@/shell/commands/command"
+import { useCommand } from "@/shell/commands/command"
 import { useLanguage } from "@/runtime/i18n/language"
 import type { ComposerModel } from "./model"
 
@@ -32,7 +32,6 @@ export function Composer(props: {
         modelControlsVisible={!props.model.model.loading}
         attachKeybind={command.keybindParts("file.attach")}
         attachShortcut={command.keybind("file.attach")}
-        alternateKeybind={[formatKeybind("mod", language.t), formatKeybind("enter", language.t)]}
         modelControl={
           <ComposerModelControl
             loading={props.model.model.loading}

packages/app/src/composer/editor/editor.tsx

@@ -1,8 +1,7 @@
-import { createEffect, createMemo, createSignal, For, Show, type JSX } from "solid-js"
+import { createEffect, createMemo, For, Show, type JSX } from "solid-js"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { createAnimatedPresence } from "@/runtime/animated-presence"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { useI18n } from "@opencode-ai/ui/context/i18n"
 import { Button } from "@opencode-ai/ui/button"
@@ -46,7 +45,6 @@ export type ComposerEditorProps = {
   modelControlsVisible?: boolean
   attachKeybind?: string[]
   attachShortcut?: string
-  alternateKeybind?: string[]
 }
 
 export function ComposerEditor(props: ComposerEditorProps) {
@@ -179,15 +177,10 @@ export function ComposerEditor(props: ComposerEditorProps) {
             }}
             onKeyDown={(event) => {
               if (props.controller.onKeyDown(event)) return
-              const mod = event.metaKey || event.ctrlKey
-              if (mod && event.key === "ArrowUp" && !event.shiftKey && !event.altKey) {
-                if (view.submit.queue?.editFirst()) event.preventDefault()
-                return
-              }
               if (event.key === "Enter" && !event.shiftKey && !event.isComposing) {
                 event.preventDefault()
                 if (event.repeat) return
-                props.controller.submit(mod ? { alternate: true } : undefined)
+                props.controller.submit()
               }
             }}
             onKeyUp={updateCursor}
@@ -255,12 +248,6 @@ export function ComposerEditor(props: ComposerEditorProps) {
               </Show>
             </Show>
           </div>
-          <Show when={state.mode === "normal"}>
-            <ComposerEditorAlternateDelivery
-              controller={props.controller}
-              keybind={props.alternateKeybind ?? ["Mod", "Enter"]}
-            />
-          </Show>
           <ComposerEditorSubmitButton
             mode={state.mode}
             stopping={view.submit.stopping()}
@@ -268,7 +255,7 @@ export function ComposerEditor(props: ComposerEditorProps) {
             accent={props.accentSubmit}
             sendLabel={i18n.t("ui.promptInput.send")}
             stopLabel={i18n.t("ui.promptInput.stop")}
-            onSubmit={() => props.controller.submit()}
+            onSubmit={props.controller.submit}
             onStop={props.controller.stop}
           />
         </div>
@@ -704,49 +691,6 @@ export function ComposerEditorPopover(props: {
   )
 }
 
-// "Steer ⌘⏎" / "Queue ⌘⏎" hint next to the submit button: submits with the
-// delivery opposite to what plain Enter does. Visible only while the queue
-// exposes an alternate (turn running and composer holding a value), so it
-// disappears on its own when the current turn ends.
-function ComposerEditorAlternateDelivery(props: { controller: ComposerEditorModel; keybind: string[] }) {
-  const i18n = useI18n()
-  const view = props.controller.view
-  const action = createMemo(() => {
-    const queue = view.submit.queue
-    if (!queue || !props.controller.canSubmit()) return undefined
-    if (queue.editing()) return "steer" as const
-    return queue.alternate()
-  })
-  const [button, setButton] = createSignal<HTMLButtonElement>()
-  const presence = createAnimatedPresence(action, () => button() ?? null)
-  return (
-    <Show when={presence.present() && presence.value()} keyed>
-      {(delivery) => (
-        <Tooltip placement="top" inactive={delivery !== "steer"} value={i18n.t("ui.promptInput.steerHint")}>
-          <Button
-            ref={setButton}
-            data-action="composer-alternate-delivery"
-            type="button"
-            variant="ghost-muted"
-            size="small"
-            class="me-3 gap-1.5 px-1.5 text-v2-text-text-muted ![font-weight:530] duration-150 motion-reduce:animate-none"
-            classList={{
-              "animate-in fade-in": presence.animate() && presence.show(),
-              "animate-out fade-out fill-mode-forwards": presence.animate() && !presence.show(),
-            }}
-            onClick={() => props.controller.submit({ alternate: true })}
-          >
-            {delivery === "steer" ? i18n.t("ui.promptInput.steer") : i18n.t("ui.promptInput.queue")}
-            <span class="hidden sm:block">
-              <Keybind keys={props.keybind} variant="neutral" />
-            </span>
-          </Button>
-        </Tooltip>
-      )}
-    </Show>
-  )
-}
-
 export function ComposerEditorSubmitButton(props: {
   mode: ComposerMode
   stopping: boolean

packages/app/src/composer/editor/interaction.ts

@@ -19,7 +19,6 @@ import {
   type ComposerInteractionEvent,
 } from "../suggestions/machine"
 import { clonePrompt, promptLength } from "../prompt-parts"
-import type { ComposerQueue } from "../adapter"
 
 export type ComposerSelectControl = {
   options: Accessor<ComposerOption[]>
@@ -38,8 +37,7 @@ export type ComposerEditorView = {
   submit: {
     stopping: Accessor<boolean>
     working?: Accessor<boolean>
-    queue?: ComposerQueue
-    onSubmit: (options?: { alternate?: boolean }) => void
+    onSubmit: () => void
     onStop: () => void
   }
   shell?: {
@@ -214,11 +212,6 @@ export function createComposerEditor(input: {
       )
     }
     if (handled) return true
-    if (event.key === "Escape" && input.view.submit.queue?.editing()) {
-      event.preventDefault()
-      input.view.submit.queue.cancelEdit()
-      return true
-    }
     const stop =
       input.view.submit.working?.() &&
       ((event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey && event.key.toLowerCase() === "g") ||
@@ -361,8 +354,8 @@ export function createComposerEditor(input: {
     openShell() {
       dispatch({ type: "mode.shell" })
     },
-    submit(options?: { alternate?: boolean }) {
-      input.view.submit.onSubmit(options)
+    submit() {
+      input.view.submit.onSubmit()
       dispatch({ type: "popover.close" })
     },
     stop() {

packages/app/src/composer/model.ts

@@ -16,7 +16,7 @@ import { createSessionTabs } from "@/session/helpers"
 import { showToast } from "@/shell/notifications/toast"
 import { formatServerError } from "@/runtime/server/errors"
 import { Skill } from "@opencode-ai/schema/skill"
-import type { ComposerAdapter, ComposerControls, ComposerQueue } from "./adapter"
+import type { ComposerAdapter, ComposerControls } from "./adapter"
 import type { ImageAttachmentPart } from "./state"
 import type { PromptHistoryComment } from "./history/entry"
 import { createComposerHistory } from "./history/store"
@@ -27,7 +27,7 @@ export type ComposerModel = ComposerEditorModel & {
   readonly model: ComposerControls["model"]
 }
 
-export function createComposerModel(adapter: ComposerAdapter, options?: { queue?: ComposerQueue }): ComposerModel {
+export function createComposerModel(adapter: ComposerAdapter): ComposerModel {
   const sdk = useWorkspaceLocation()
   const data = useData()
   const files = useFile()
@@ -80,11 +80,7 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
   })
   const stopping = createMemo(() => adapter.working() && blank())
   const placeholder = () =>
-    composerPlaceholder(
-      mode(),
-      (key, params) => language.t(key as Parameters<typeof language.t>[0], params as never),
-      adapter.working() || (options?.queue?.count() ?? 0) > 0,
-    )
+    composerPlaceholder(mode(), (key, params) => language.t(key as Parameters<typeof language.t>[0], params as never))
 
   const historyComments = () => {
     const byID = new Map(comments.all().map((item) => [`${item.file}\n${item.id}`, item] as const))
@@ -257,11 +253,6 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
     resetHistory: () => controller.resetHistory(),
     setMode: (next) => controller.dispatch({ type: next === "shell" ? "mode.shell" : "mode.normal" }),
     closePopover: () => controller.dispatch({ type: "popover.close" }),
-    delivery: (alternate) => {
-      const queue = options?.queue
-      if (!queue) return "steer"
-      return (alternate ? queue.alternate() : queue.delivery()) ?? "steer"
-    },
     notify: {
       missingSelection: () =>
         showToast({
@@ -369,18 +360,7 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
       submit: {
         stopping,
         working: adapter.working,
-        queue: options?.queue,
-        onSubmit: (submitOptions) => {
-          const queue = options?.queue
-          // Confirming an edit re-admits the queued prompt instead of sending
-          // the composer value as a new prompt. Enter keeps it queued in
-          // place; the alternate action sends it as a steer.
-          if (queue?.editing()) {
-            queue.confirmEdit(submitOptions?.alternate ? "steer" : "queue")
-            return
-          }
-          void submission.submit(new Event("submit"), submitOptions)
-        },
+        onSubmit: () => void submission.submit(new Event("submit")),
         onStop: () => void submission.stop(),
       },
     },

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

@@ -12,12 +12,4 @@ describe("Composer placeholder", () => {
   test("uses the command and context hint in normal mode", () => {
     expect(composerPlaceholder("normal", t)).toBe("ui.promptInput.placeholder.normal/@")
   })
-
-  test("uses the follow-up copy while a turn runs or prompts are queued", () => {
-    expect(composerPlaceholder("normal", t, true)).toBe("ui.promptInput.placeholder.followUp/@")
-  })
-
-  test("keeps the shell placeholder while a turn runs", () => {
-    expect(composerPlaceholder("shell", t, true)).toBe("prompt.placeholder.shell:git status")
-  })
 })

packages/app/src/composer/placeholder.ts

@@ -1,9 +1,7 @@
 export function composerPlaceholder(
   mode: "normal" | "shell",
   t: (key: string, params?: Record<string, string>) => string,
-  followUp?: boolean,
 ) {
   if (mode === "shell") return t("prompt.placeholder.shell", { example: "git status" })
-  if (followUp) return t("ui.promptInput.placeholder.followUp", { slash: "/", at: "@" })
   return t("ui.promptInput.placeholder.normal", { slash: "/", at: "@" })
 }

packages/app/src/composer/submit.ts

@@ -5,7 +5,7 @@ import type { Accessor } from "solid-js"
 import type { PromptHistoryComment } from "./history/entry"
 import type { ImageAttachmentPart, Prompt } from "./state"
 import { clonePrompt, promptLength } from "./prompt-parts"
-import type { ComposerAdapter, ComposerDelivery, ComposerSelection, ComposerSession } from "./adapter"
+import type { ComposerAdapter, ComposerSelection, ComposerSession } from "./adapter"
 import { createComposerSubmission } from "./submission-state"
 import { buildPromptRequest } from "./request"
 import { setCursorPosition } from "./editor/dom"
@@ -21,7 +21,7 @@ type ComposerSubmission = {
   text: string
   images: ImageAttachmentPart[]
   selection: ComposerSelection
-  delivery: ComposerDelivery
+  delivery: "steer"
 }
 
 type ComposerSubmitInput = {
@@ -33,7 +33,6 @@ type ComposerSubmitInput = {
   resetHistory: () => void
   setMode: (mode: "normal" | "shell") => void
   closePopover: () => void
-  delivery?: (alternate: boolean) => ComposerDelivery
   notify: {
     missingSelection: () => void
     failed: (kind: "shell" | "command" | "prompt", error: unknown) => void
@@ -46,7 +45,7 @@ type ComposerSubmitInput = {
 }
 
 export function createComposerSubmit(input: ComposerSubmitInput) {
-  const submit = async (event: globalThis.Event, options?: { alternate?: boolean }) => {
+  const submit = async (event: globalThis.Event) => {
     event.preventDefault()
 
     const submission = createComposerSubmission({
@@ -57,7 +56,7 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
         selection: item.selection ? { ...item.selection } : undefined,
       })),
     })
-    const value = readSubmission(input, submission.prompt, submission.context, options?.alternate ?? false)
+    const value = readSubmission(input, submission.prompt, submission.context)
     if (!value) {
       if (input.adapter.working() && input.adapter.kind === "active-session") void input.adapter.interrupt()
       return
@@ -114,10 +113,7 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
 
       if (command) {
         clearSubmission(input, submission)
-        // Commands always steer: the server applies a command's configured
-        // agent and model immediately at admission, so queueing one would
-        // reconfigure the turn it is supposed to wait behind.
-        void sendCommand(session, { ...value, delivery: "steer" }, command).catch((error) =>
+        void sendCommand(session, value, command).catch((error) =>
           failSubmission(input, session, "command", error, restore, value.id),
         )
         return
@@ -161,7 +157,6 @@ function readSubmission(
   input: ComposerSubmitInput,
   prompt: Prompt,
   context: ComposerSubmission["context"],
-  alternate: boolean,
 ): ComposerSubmission | undefined {
   const text = prompt.map((part) => ("content" in part ? part.content : "")).join("")
   const mode = input.mode()
@@ -200,7 +195,7 @@ function readSubmission(
       model: { modelID: model.id, providerID: model.provider.id },
       variant,
     },
-    delivery: input.delivery?.(alternate) ?? "steer",
+    delivery: "steer",
   }
 }
 
@@ -290,30 +285,23 @@ async function sendCommand(
 
 async function sendPrompt(session: ComposerSession, value: ComposerSubmission) {
   const request = await buildSubmissionRequest(session, value)
-  // Switching agent or model reconfigures the session immediately, and with it
-  // the remainder of a running turn. A steer targets that turn, so its
-  // selection applies now; a queued follow-up must not reconfigure the turn it
-  // waits behind, so it runs with the session selection at delivery time (the
-  // intended selection stays recorded in its metadata).
-  if (value.delivery === "steer") {
-    const current = session.current()
-    if (current?.agent !== value.selection.agent) {
-      await session.api.switchAgent({ sessionID: session.id, agent: value.selection.agent })
-    }
-    if (
-      current?.model?.providerID !== value.selection.model.providerID ||
-      current.model.id !== value.selection.model.modelID ||
-      (current.model.variant ?? "default") !== (value.selection.variant ?? "default")
-    ) {
-      await session.api.switchModel({
-        sessionID: session.id,
-        model: {
-          id: value.selection.model.modelID,
-          providerID: value.selection.model.providerID,
-          variant: value.selection.variant,
-        },
-      })
-    }
+  const current = session.current()
+  if (current?.agent !== value.selection.agent) {
+    await session.api.switchAgent({ sessionID: session.id, agent: value.selection.agent })
+  }
+  if (
+    current?.model?.providerID !== value.selection.model.providerID ||
+    current.model.id !== value.selection.model.modelID ||
+    (current.model.variant ?? "default") !== (value.selection.variant ?? "default")
+  ) {
+    await session.api.switchModel({
+      sessionID: session.id,
+      model: {
+        id: value.selection.model.modelID,
+        providerID: value.selection.model.providerID,
+        variant: value.selection.variant,
+      },
+    })
   }
 
   const admission = {

packages/app/src/home/model.ts

@@ -3,7 +3,7 @@ import { type HomeProjectSelection, useLayout } from "@/shell/state/layout"
 import { ServerConnection, useServers } from "@/runtime/server/registry"
 import { useTabs } from "@/shell/tabs/tabs"
 import { toggleHomeProjectSelection } from "@/shell/layout/helpers"
-import { createEffect, createMemo } from "solid-js"
+import { createEffect, createMemo, startTransition } from "solid-js"
 
 export function createHomeController() {
   const layout = useLayout()
@@ -49,7 +49,8 @@ export function createHomeController() {
     selection: {
       value: selection,
       set: setSelection,
-      focusServer: (conn: ServerConnection.Any) => setSelection({ server: ServerConnection.key(conn) }),
+      focusServer: (conn: ServerConnection.Any) =>
+        void startTransition(() => setSelection({ server: ServerConnection.key(conn) })),
     },
     server: {
       list: () => servers.visible,

packages/app/src/home/sessions/controller.tsx

@@ -5,6 +5,7 @@ import { DialogFooter, DialogHeader, DialogTitleGroup, Dialog } from "@opencode-
 import { skipToken, useQuery, useQueryClient } from "@tanstack/solid-query"
 import { DateTime } from "luxon"
 import { type Accessor, createEffect, createMemo, type JSX, startTransition, untrack } from "solid-js"
+import { createStore } from "solid-js/store"
 import { notifySessionTabsRemoved } from "@/shell/titlebar/session-events"
 import { useCommand } from "@/shell/commands/command"
 import { loadHomeSessionIndex, mergeHomeSessionIndex, retainHomeSessions } from "@/home/sessions/index"
@@ -42,6 +43,7 @@ export function createHomeSessionsController(home: HomeController) {
   const dialog = useDialog()
   const language = useLanguage()
   const queryClient = useQueryClient()
+  const [removed, setRemoved] = createStore({ keys: [] as string[] })
   const projectDirectories = createMemo(() => {
     const selected = home.selection.value().directory
     if (!selected) return
@@ -68,9 +70,10 @@ export function createHomeSessionsController(home: HomeController) {
     const ctx = home.server.focusedContext()
     const conn = home.server.focused()
     if (!ctx || !conn) return []
+    const server = ServerConnection.key(conn)
     return retainHomeSessions(
-      ctx.data.session.apply(
-        mergeHomeSessionIndex(sessionLoad.isPending ? [] : (sessionLoad.data?.() ?? []), ctx.data.session.list()),
+      mergeHomeSessionIndex(sessionLoad.data?.() ?? [], ctx.data.session.list()).filter(
+        (session) => !removed.keys.includes(`${server}\0${session.id}`),
       ),
       HOME_SESSION_LIMIT,
       Date.now(),
@@ -189,9 +192,15 @@ export function createHomeSessionsController(home: HomeController) {
     const ctx = conn ? home.server.context(conn) : undefined
     if (!conn || !ctx) return false
     const ids = [...removedSessionIDs(ctx.data.session.list(), session.id)]
-    return ctx.data.session
-      .remove(session.id)
+    await queryClient.cancelQueries({ queryKey: ["home-sessions", conn], exact: true })
+    return ctx.sdk.api.session
+      .remove({ sessionID: session.id })
       .then(() => {
+        const removedIDs = new Set(ids)
+        setRemoved("keys", (current) => [...new Set([...current, ...ids.map((id) => `${server}\0${id}`)])])
+        queryClient.setQueryData<SessionInfo[]>(["home-sessions", conn], (current) =>
+          current?.filter((item) => !removedIDs.has(item.id)),
+        )
         notifySessionTabsRemoved({
           server: ServerConnection.key(conn),
           directory: session.location.directory,
@@ -207,6 +216,9 @@ export function createHomeSessionsController(home: HomeController) {
         return false
       })
       .finally(() => {
+        // Always refetch: the pre-mutation cancel may have aborted an
+        // in-flight index fetch, and a failed delete must not leave the
+        // index unloaded either.
         void queryClient.invalidateQueries({ queryKey: ["home-sessions", conn], exact: true })
       })
   }
@@ -244,7 +256,7 @@ export function createHomeSessionsController(home: HomeController) {
     data: {
       records,
       groups,
-      loading: () => sessionLoad.isPending,
+      loading: () => sessionLoad.isLoading,
       searchRecords: allRecords,
     },
     session: {

packages/app/src/home/sessions/region.tsx

@@ -12,7 +12,6 @@ export function HomeSessions(props: {
     <HomeSessionsView
       language={props.sessions.copy.language}
       groups={props.sessions.data.groups()}
-      loading={props.sessions.data.loading()}
       showProjectName={props.sessions.session.showProjectName()}
       server={props.sessions.session.server()}
       canCreateSession={props.sessions.session.canCreate()}

packages/app/src/home/sessions/view.tsx

@@ -1,6 +1,6 @@
 import type { SessionInfo } from "@opencode-ai/client/promise"
 import { Key } from "@solid-primitives/keyed"
-import { createMemo, For, Index, onCleanup, Show } from "solid-js"
+import { createMemo, For, Index, onCleanup, Show, Suspense } from "solid-js"
 import { createStore, type SetStoreFunction } from "solid-js/store"
 import { InlineInput } from "@opencode-ai/ui/inline-input"
 import { Spinner } from "@opencode-ai/ui/spinner"
@@ -44,7 +44,6 @@ function isBackgroundOpen(event: MouseEvent) {
 export type HomeSessionsViewProps = {
   language: ReturnType<typeof useLanguage>
   groups: HomeSessionGroup[]
-  loading: boolean
   showProjectName: boolean
   server: ServerConnection.Key
   canCreateSession: boolean
@@ -98,20 +97,22 @@ export function HomeSessionsView(props: HomeSessionsViewProps) {
     >
       <div class="sticky top-0 z-30 shrink-0 bg-v2-background-bg-base pb-3 pt-6 lg:pt-12" onWheel={props.onWheel}>
         <HomeSessionSearch {...props} />
-        <Show when={props.groups.length > 0 && props.canCreateSession}>
-          <div class="pointer-events-none absolute right-0 top-[84px] z-20 flex lg:top-[108px]">
-            <Button
-              data-action="home-new-session"
-              variant="ghost-muted"
-              size="normal"
-              icon="edit"
-              class="pointer-events-auto h-7 px-2 [font-weight:530]"
-              onClick={props.onCreateSession}
-            >
-              {props.language.t("command.session.new")}
-            </Button>
-          </div>
-        </Show>
+        <Suspense>
+          <Show when={props.groups.length > 0 && props.canCreateSession}>
+            <div class="pointer-events-none absolute right-0 top-[84px] z-20 flex lg:top-[108px]">
+              <Button
+                data-action="home-new-session"
+                variant="ghost-muted"
+                size="normal"
+                icon="edit"
+                class="pointer-events-auto h-7 px-2 [font-weight:530]"
+                onClick={props.onCreateSession}
+              >
+                {props.language.t("command.session.new")}
+              </Button>
+            </div>
+          </Show>
+        </Suspense>
       </div>
       <div class="pointer-events-none sticky top-[84px] z-40 h-0 -mr-3 lg:top-[108px]">
         <div
@@ -121,8 +122,7 @@ export function HomeSessionsView(props: HomeSessionsViewProps) {
         />
       </div>
       <div class="-mr-3 min-h-[calc(100cqh-72px)] lg:min-h-[calc(100cqh-96px)]">
-        <Show
-          when={!props.loading}
+        <Suspense
           fallback={
             <div class="pt-3">
               <HomeSessionSkeleton label={props.language.t("common.loading")} />
@@ -164,7 +164,7 @@ export function HomeSessionsView(props: HomeSessionsViewProps) {
               </Index>
             </div>
           </Show>
-        </Show>
+        </Suspense>
       </div>
     </section>
   )

packages/app/src/new-session/composer-adapter.ts

@@ -20,7 +20,6 @@ import { clearSessionMessageHandoff, setSessionMessageHandoff } from "@/session/
 export function createNewSessionComposerAdapter(props: {
   draftID: string
   worktree: () => string
-  branch: () => string | undefined
   submitted: () => void
 }) {
   const route = useSessionKey()
@@ -49,7 +48,6 @@ export function createNewSessionComposerAdapter(props: {
       const sessionDirectory = await resolveSessionDirectory({
         projectDirectory,
         worktree,
-        branch: props.branch(),
         data,
         serverSDK,
         language,
@@ -75,7 +73,7 @@ export function createNewSessionComposerAdapter(props: {
           return { ok: false as const, error }
         },
       )
-      const afterCreation = async <T>(run: () => Promise<T>) => {
+      const afterCreation = async <T,>(run: () => Promise<T>) => {
         const result = await creation
         if (!result.ok) throw result.error
         return run()
@@ -85,7 +83,7 @@ export function createNewSessionComposerAdapter(props: {
         SessionRouteKey.fromRoute(base64Encode(sessionDirectory), created.id),
       )
       const cleanupReady = startTransition(() => {
-        tabs.updateDraft(props.draftID, { worktree: undefined, branch: undefined })
+        tabs.updateDraft(props.draftID, { worktree: undefined })
         local.session.promote(sessionDirectory, created.id, {
           agent: selection.agent,
           model: selection.model,
@@ -163,7 +161,6 @@ function createMessageHandoff(key: string, sessionID: string, event: ServerSDK["
 async function resolveSessionDirectory(input: {
   projectDirectory: string
   worktree: string
-  branch?: string
   data: ReturnType<typeof useData>
   serverSDK: ReturnType<typeof useServerSDK>
   language: ReturnType<typeof useLanguage>
@@ -175,7 +172,6 @@ async function resolveSessionDirectory(input: {
     .create({
       projectID: input.data.location.info({ directory: input.projectDirectory })?.project.id ?? "",
       strategy: "git",
-      branch: input.branch,
       directory: getDirectory(
         input.data.location.info({ directory: input.projectDirectory })?.project.directory ?? input.projectDirectory,
       ),

packages/app/src/new-session/project/controller.ts

@@ -39,7 +39,6 @@ export function createComposerProjectControls(props: { draftId: string }) {
       server: ServerConnection.key(connection),
       directory: worktree,
       worktree: undefined,
-      branch: undefined,
     })
   }
   const addProject = (title: string, serverKey?: string) => {

packages/app/src/new-session/project/selector.tsx

@@ -421,7 +421,7 @@ export function PromptProjectSelector(props: {
                   <span class="min-w-0 flex-1 truncate leading-5">{props.controller.labels.add()}</span>
                 </Menu.SubTrigger>
                 <Menu.Portal>
-                  <Menu.SubContent class="max-h-[224px] min-w-[180px] overflow-y-auto rounded-md border-0 bg-v2-background-bg-layer-01 shadow-[var(--v2-elevation-floating)] focus:outline-none">
+                  <Menu.SubContent class="min-w-[180px] overflow-hidden rounded-md border-0 bg-v2-background-bg-layer-01 shadow-[var(--v2-elevation-floating)] focus:outline-none">
                     <For each={props.controller.servers()}>
                       {(server) => <ServerAction server={server!} onSelect={selectAction} />}
                     </For>

packages/app/src/new-session/screen.tsx

@@ -21,20 +21,15 @@ export default function NewSessionPage(props: { draftId: string }) {
     tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === search.draftId),
   )
   const workspace = createNewSessionWorkspaceController({
-    selectedWorktree: () => draftTab()?.worktree,
-    selectedBranch: () => draftTab()?.branch,
-    setSelectedWorktree: (worktree) => {
+    selected: () => draftTab()?.worktree,
+    setSelected: (worktree) => {
       if (search.draftId) tabs.updateDraft(search.draftId, { worktree })
     },
-    setSelectedBranch: (branch) => {
-      if (search.draftId) tabs.updateDraft(search.draftId, { branch })
-    },
     onViewAll: openWorkspaces,
   })
   const composer = createNewSessionComposerAdapter({
     draftID: props.draftId,
     worktree: workspace.selection.value,
-    branch: workspace.bar.branch,
     submitted: workspace.selection.remember,
   })
   const model = createComposerModel(composer.adapter)

packages/app/src/new-session/view.tsx

@@ -69,12 +69,9 @@ export function NewSessionView(props: {
                       value={props.workspace.selection.value()}
                       projectRoot={props.workspace.project.root()}
                       workspaces={props.workspace.project.workspaces()}
-                      branches={props.workspace.project.branches()}
                       branch={props.workspace.bar.branch()}
                       onboarding={onboardingReady() && !onboarding.used}
                       onChange={select}
-                      onCreate={props.workspace.selection.create}
-                      onSearch={props.workspace.project.searchBranches}
                       onDone={props.composer.restoreFocus}
                       onViewAll={props.workspace.project.openAll}
                     />

packages/app/src/new-session/workspace/controller.test.ts

@@ -65,17 +65,6 @@ describe("new session workspace selection", () => {
     ).toBe(undefined)
   })
 
-  test("uses a selected branch for a new workspace", () => {
-    expect(
-      resolveNewSessionBranch({
-        worktree: "create",
-        directory: "/project/feature",
-        createBranch: "release",
-        worktreeBranch: () => "feature",
-      }),
-    ).toBe("release")
-  })
-
   test("uses location VCS state when the project inventory is stale", () => {
     expect(resolveNewSessionGit({ branch: "dev" })).toBe(true)
     expect(resolveNewSessionGit({ projectVcs: "git" })).toBe(true)

packages/app/src/new-session/workspace/controller.ts

@@ -1,6 +1,4 @@
-import { debounce } from "@solid-primitives/scheduled"
-import { createEffect, createMemo, createResource } from "solid-js"
-import { createStore } from "solid-js/store"
+import { createEffect, createMemo } from "solid-js"
 import { useWorkspaceLocation } from "@/workspaces/location"
 import { useServerSDK } from "@/runtime/server/client"
 import { useData } from "@/runtime/server/current"
@@ -34,10 +32,8 @@ export function normalizeNewSessionWorktree(value: string, directory: string, pr
 export function resolveNewSessionBranch(input: {
   worktree: string
   directory: string
-  createBranch?: string
   worktreeBranch: (worktree: string) => string | undefined
 }) {
-  if (input.worktree === "create" && input.createBranch) return input.createBranch
   const directory = input.worktree === "main" || input.worktree === "create" ? input.directory : input.worktree
   return input.worktreeBranch(directory)
 }
@@ -47,18 +43,14 @@ export function resolveNewSessionGit(input: { projectVcs?: string; branch?: stri
 }
 
 export function createNewSessionWorkspaceController(input: {
-  selectedWorktree: () => string | undefined
-  selectedBranch: () => string | undefined
-  setSelectedWorktree: (worktree: string | undefined) => void
-  setSelectedBranch: (branch: string | undefined) => void
+  selected: () => string | undefined
+  setSelected: (worktree: string | undefined) => void
   onViewAll: () => void
 }) {
   const sdk = useWorkspaceLocation()
   const serverSDK = useServerSDK()
   const data = useData()
   const settings = useSettings()
-  const [state, setState] = createStore({ search: "" })
-  const searchBranches = debounce((search: string) => setState("search", search.trim()), 100)
   const currentProject = createMemo(() => {
     const projectID = data.location.info({ directory: sdk().directory })?.project.id
     const current = projectID ? data.project.get(projectID) : undefined
@@ -72,7 +64,7 @@ export function createNewSessionWorkspaceController(input: {
   )
   const selected = createMemo(() => {
     const project = currentProject()
-    const worktree = input.selectedWorktree()
+    const worktree = input.selected()
     if (!project || !worktree) return
     return isWorkspaceSelection(project, worktree) ? worktree : undefined
   })
@@ -94,14 +86,6 @@ export function createNewSessionWorkspaceController(input: {
     }),
   )
   const projectRoot = createMemo(() => currentProject()?.worktree ?? sdk().directory)
-  const [branches] = createResource(
-    () => (visible() ? { directory: projectRoot(), search: state.search } : undefined),
-    ({ directory, search }) =>
-      serverSDK.api.vcs
-        .branches({ location: { directory }, search, limit: 50 })
-        .then((response) => ({ directory, search, data: response.data }))
-        .catch(() => ({ directory, search, data: [] })),
-  )
   createEffect(() => {
     void Promise.all([data.location.syncInfo({ directory: sdk().directory }), data.project.sync()]).catch(
       () => undefined,
@@ -114,7 +98,6 @@ export function createNewSessionWorkspaceController(input: {
     resolveNewSessionBranch({
       worktree: value(),
       directory: sdk().directory,
-      createBranch: input.selectedBranch(),
       worktreeBranch: (worktree) => data.location.vcs.info({ directory: worktree })?.branch.current,
     }),
   )
@@ -133,19 +116,10 @@ export function createNewSessionWorkspaceController(input: {
         const current = value()
         return current === "create" || (!!project && isWorkspaceDirectory(project, current))
       }),
-      reset: () => {
-        input.setSelectedWorktree(undefined)
-        input.setSelectedBranch(undefined)
-      },
+      reset: () => input.setSelected(undefined),
       remember,
       set: (worktree: string) => {
-        input.setSelectedBranch(undefined)
-        input.setSelectedWorktree(normalizeNewSessionWorktree(worktree, sdk().directory, currentProject()?.worktree))
-      },
-      create: (branch: string) => {
-        input.setSelectedBranch(branch)
-        input.setSelectedWorktree("create")
-        remember("create")
+        input.setSelected(normalizeNewSessionWorktree(worktree, sdk().directory, currentProject()?.worktree))
       },
     },
     project: {
@@ -155,15 +129,6 @@ export function createNewSessionWorkspaceController(input: {
         return project ? workspaceDirectories(project) : []
       },
       git: visible,
-      branches: () => {
-        const current = data.location.vcs.info({ directory: sdk().directory })?.branch.current
-        const loaded = branches.latest
-        const list = loaded?.directory === projectRoot() ? loaded.data : []
-        return [
-          ...new Set([...list, ...(current && current.toLowerCase().includes(state.search.toLowerCase()) ? [current] : [])]),
-        ].slice(0, 50)
-      },
-      searchBranches,
       openAll: input.onViewAll,
     },
     bar: {

packages/app/src/new-session/workspace/selector.tsx

@@ -1,5 +1,4 @@
-import { createMemo, For, Show } from "solid-js"
-import { createStore } from "solid-js/store"
+import { createMemo, createSignal, For, Show } from "solid-js"
 import { Menu } from "@opencode-ai/ui/menu"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -11,24 +10,20 @@ export function PromptWorkspaceSelector(props: {
   value: string
   projectRoot: string
   workspaces: string[]
-  branches: string[]
   branch?: string
   onboarding?: boolean
   onChange: (value: string) => void
-  onCreate: (branch: string) => void
-  onSearch: (search: string) => void
   onDone: () => void
   onViewAll: () => void
 }) {
   const language = useLanguage()
-  const [search, setSearch] = createStore({ workspaces: "", branches: "" })
+  const [search, setSearch] = createSignal("")
   let searchInput: HTMLInputElement | undefined
-  let branchSearchInput: HTMLInputElement | undefined
   let focusSearch = false
-  let pending: { type: "select"; value: string } | { type: "create"; branch: string } | { type: "viewAll" } | undefined
+  let pending: { type: "select"; value: string } | { type: "viewAll" } | undefined
   const selected = () => (sameDirectory(props.value, props.projectRoot) ? "main" : props.value)
   const workspaces = createMemo(() => {
-    const query = search.workspaces.trim().toLowerCase()
+    const query = search().trim().toLowerCase()
     if (!query) return props.workspaces
     return props.workspaces.filter((workspace) => getFilename(workspace).toLowerCase().includes(query))
   })
@@ -42,14 +37,12 @@ export function PromptWorkspaceSelector(props: {
   }
   const onOpenChange = (open: boolean) => {
     if (open) {
-      setSearch({ workspaces: "", branches: "" })
-      props.onSearch("")
+      setSearch("")
       return
     }
     const action = pending
     pending = undefined
     if (action?.type === "select") props.onChange(action.value)
-    if (action?.type === "create") props.onCreate(action.branch)
     if (action?.type === "viewAll") {
       props.onViewAll()
       return
@@ -127,7 +120,21 @@ export function PromptWorkspaceSelector(props: {
                 </Menu.Item>
                 <Menu.Item onSelect={() => select("create")}>
                   <Icon name="workspace-new" />
-                  <span class="min-w-0 flex-1 truncate">{language.t("workspace.new")}</span>
+                  <Tooltip
+                    placement="right"
+                    openDelay={800}
+                    value={
+                      <span class="flex flex-col gap-0.5">
+                        <span>{language.t("workspace.new")}</span>
+                        <span class="font-[440] text-v2-text-text-muted">
+                          {language.t("session.new.workspace.new.tooltip")}
+                        </span>
+                      </span>
+                    }
+                    class="min-w-0 flex-1"
+                  >
+                    <span class="min-w-0 truncate">{language.t("workspace.new")}</span>
+                  </Tooltip>
                   <Show when={selected() === "create"}>
                     <Icon name="check" size="small" class="shrink-0" />
                   </Show>
@@ -184,11 +191,11 @@ export function PromptWorkspaceSelector(props: {
                             ref={(element) => {
                               searchInput = element
                             }}
-                            value={search.workspaces}
+                            value={search()}
                             placeholder={language.t("session.new.workspace.search.placeholder")}
                             aria-label={language.t("session.new.workspace.search.placeholder")}
                             class="h-7 min-w-0 flex-1 border-0 bg-transparent text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base outline-none placeholder:text-v2-text-text-faint"
-                            onInput={(event) => setSearch("workspaces", event.currentTarget.value)}
+                            onInput={(event) => setSearch(event.currentTarget.value)}
                             onKeyDown={(event) => {
                               if (
                                 event.key === "Escape" ||
@@ -225,94 +232,7 @@ export function PromptWorkspaceSelector(props: {
           </Menu.Portal>
         </Menu>
       </Tooltip>
-      <Show
-        when={selected() === "create" && props.branch}
-        fallback={<PromptGitStatus branch={props.branch} from={selected() === "create"} class="ms-1" />}
-      >
-        <Tooltip
-          placement="top"
-          value={language.t("session.new.workspace.fromBranch", { branch: props.branch! })}
-          class="ms-1 min-w-0 max-w-[220px]"
-          contentClass="max-w-[calc(100vw-32px)] break-all"
-        >
-          <Menu
-            placement="bottom"
-            gutter={4}
-            onOpenChange={(open) => {
-              onOpenChange(open)
-              if (open) requestAnimationFrame(() => branchSearchInput?.focus())
-            }}
-          >
-            <Menu.Trigger class="flex h-6 min-w-0 max-w-[220px] items-center gap-1.5 rounded-full bg-v2-background-bg-layer-02 px-2.5 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint transition-colors hover:bg-v2-background-bg-layer-03 hover:text-v2-text-text-muted focus-visible:bg-v2-background-bg-layer-03 focus-visible:text-v2-text-text-muted focus-visible:outline-none data-[expanded]:bg-v2-background-bg-layer-03 data-[expanded]:text-v2-text-text-muted">
-              <Icon name="branch-out" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-              <span class="min-w-0 truncate">
-                {language.t("session.new.workspace.fromBranch", { branch: props.branch! })}
-              </span>
-              <Icon name="chevron-down" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-            </Menu.Trigger>
-            <Menu.Portal>
-              <Menu.Content class="w-[243px] overflow-hidden rounded-md border-0 bg-v2-background-bg-layer-01 shadow-[var(--v2-elevation-floating)] focus:outline-none">
-                <div class="flex h-7 shrink-0 items-center gap-2 rounded-sm pl-3 pr-2.5 text-v2-icon-icon-muted">
-                  <Icon name="magnifying-glass" size="small" class="shrink-0" />
-                  <input
-                    ref={(element) => {
-                      branchSearchInput = element
-                    }}
-                    value={search.branches}
-                    placeholder={language.t("session.new.workspace.branch.search.placeholder")}
-                    aria-label={language.t("session.new.workspace.branch.search.placeholder")}
-                    class="h-7 min-w-0 flex-1 border-0 bg-transparent text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base outline-none placeholder:text-v2-text-text-faint"
-                    onInput={(event) => {
-                      setSearch("branches", event.currentTarget.value)
-                      props.onSearch(event.currentTarget.value)
-                    }}
-                    onKeyDown={(event) => {
-                      if (
-                        event.key === "Escape" ||
-                        event.key === "ArrowDown" ||
-                        event.key === "ArrowUp" ||
-                        event.key === "Enter"
-                      )
-                        return
-                      event.stopPropagation()
-                    }}
-                  />
-                  <Show when={search.branches.trim()}>
-                    <button
-                      type="button"
-                      class="flex size-5 items-center justify-center rounded-sm text-v2-icon-icon-muted hover:bg-v2-overlay-simple-overlay-hover"
-                      onPointerDown={(event) => event.preventDefault()}
-                      onClick={() => {
-                        setSearch("branches", "")
-                        props.onSearch("")
-                      }}
-                      aria-label={language.t("common.clear")}
-                    >
-                      <Icon name="close-small" size="small" />
-                    </button>
-                  </Show>
-                </div>
-                <div class="max-h-[224px] overflow-y-auto">
-                  <Menu.RadioGroup value={props.branch}>
-                    <For each={props.branches}>
-                      {(branch) => (
-                        <Menu.RadioItem
-                          value={branch}
-                          class="h-7 gap-2 rounded-sm px-3 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base [font-family:var(--v2-font-family-sans)] data-[highlighted]:!bg-v2-overlay-simple-overlay-hover"
-                          closeOnSelect
-                          onSelect={() => (pending = { type: "create", branch })}
-                        >
-                          <span class="min-w-0 truncate leading-5">{branch}</span>
-                        </Menu.RadioItem>
-                      )}
-                    </For>
-                  </Menu.RadioGroup>
-                </div>
-              </Menu.Content>
-            </Menu.Portal>
-          </Menu>
-        </Tooltip>
-      </Show>
+      <PromptGitStatus branch={props.branch} from={selected() === "create"} class="ms-1" />
     </>
   )
 }

packages/app/src/runtime/animated-presence.ts

@@ -1,21 +0,0 @@
-import { createMemo, type Accessor } from "solid-js"
-import createPresence from "solid-presence"
-
-export function createAnimatedPresence<T>(value: Accessor<T | undefined>, element: Accessor<HTMLElement | null>) {
-  const animation = createMemo<{ show: boolean; animate: boolean; value: T | undefined }>((previous) => {
-    const current = value()
-    const show = current !== undefined
-    return {
-      show,
-      animate: previous !== undefined && (previous.animate || previous.show !== show),
-      value: current ?? previous?.value,
-    }
-  })
-  const presence = createPresence({ show: () => animation().show, element })
-  return {
-    ...presence,
-    show: () => animation().show,
-    animate: () => animation().animate,
-    value: () => animation().value,
-  }
-}

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

@@ -460,8 +460,7 @@ export const dict = {
   "dialog.project.edit.color": "Color",
   "dialog.project.edit.color.select": "Select {{color}} color",
   "dialog.project.edit.worktree.startup": "Workspace startup script",
-  "dialog.project.edit.worktree.startup.description":
-    "Runs after creating a new workspace (worktree). Use $OPENCODE_WORKTREE_BASE for the base worktree and $OPENCODE_WORKTREE_PATH for the new worktree.",
+  "dialog.project.edit.worktree.startup.description": "Runs after creating a new workspace (worktree).",
   "dialog.project.edit.worktree.startup.placeholder": "e.g. bun install",
 
   "dialog.releaseNotes.action.getStarted": "Get started",
@@ -500,7 +499,7 @@ export const dict = {
   "context.stats.lastActivity": "Last Activity",
 
   "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Context Usage",
+  "context.usage.usage": "Usage",
   "context.usage.cost": "Cost",
   "context.usage.clickToView": "Click to view context",
   "context.usage.view": "View context usage",
@@ -678,14 +677,6 @@ export const dict = {
   "session.background.subagent.one": "{{count}} subagent",
   "session.background.subagent.other": "{{count}} subagents",
   "command.session.background": "Move to background",
-  "session.queue.count.one": "{{count}} queued",
-  "session.queue.count.other": "{{count}} queued",
-  "session.queue.steer": "Steer",
-  "session.queue.send": "Send",
-  "session.queue.steerTooltip": "Send without interrupting",
-  "session.queue.remove": "Remove",
-  "session.queue.reorder": "Reorder queued prompt",
-  "session.queue.attachments": "+ attachments",
   "session.timeline.notice.finished": "{{actor}} finished",
   "session.timeline.notice.failed": "{{actor}} failed",
   "session.timeline.notice.cancelled": "{{actor}} cancelled",
@@ -970,11 +961,6 @@ export const dict = {
   "settings.general.row.showCustomAgents.title": "Show agent",
   "settings.general.row.showCustomAgents.description":
     "Switch between agents in the composer. When hidden, defaults to Build agent.",
-  "settings.general.row.followUpBehavior.title": "Follow-up behavior",
-  "settings.general.row.followUpBehavior.description":
-    "Choose whether to queue follow-ups or steer the current turn. Use {{keybind}} to switch.",
-  "settings.general.row.followUpBehavior.queue": "Queue",
-  "settings.general.row.followUpBehavior.steer": "Steer",
   "settings.general.row.reasoningSummaries.title": "Show reasoning summaries",
   "settings.general.row.reasoningSummaries.description": "Display model reasoning summaries in the timeline",
   "settings.general.row.shellToolPartsExpanded.title": "Expand shell tool parts",
@@ -1152,8 +1138,6 @@ export const dict = {
   "session.new.workspace.local.tooltip": "Use current checkout",
   "session.new.workspace.new.tooltip": "Create isolated checkout",
   "session.new.workspace.fromBranch": "from {{branch}}",
-  "session.new.workspace.createFrom": "Create from branch",
-  "session.new.workspace.branch.search.placeholder": "Search branches",
   "session.new.workspace.trigger.tooltip": "Select where to run session",
   "session.new.workspace.search.placeholder": "Search workspaces",
   "settings.tab.workspaces": "Workspaces",

packages/app/src/runtime/server/data.test.ts

@@ -1,33 +0,0 @@
-import { expect, test } from "bun:test"
-import type { SessionInfo } from "@opencode-ai/client/promise"
-import { createSessionMutations } from "./data"
-
-const session = { id: "ses_test" } as SessionInfo
-
-test("keeps a successful removal applied until its event arrives", async () => {
-  const release = Promise.withResolvers<void>()
-  const mutation = createSessionMutations(async () => release.promise)
-
-  const request = mutation.remove(session.id)
-  expect(mutation.apply([session])).toEqual([])
-  release.resolve()
-  await request
-  expect(mutation.apply([session])).toEqual([])
-
-  mutation.deleted(session.id)
-  expect(mutation.apply([session])).toEqual([session])
-})
-
-test("rolls back a failed removal", async () => {
-  const release = Promise.withResolvers<void>()
-  const mutation = createSessionMutations(async () => {
-    await release.promise
-    throw new Error("offline")
-  })
-
-  const request = mutation.remove(session.id)
-  expect(mutation.apply([session])).toEqual([])
-  release.resolve()
-  await expect(request).rejects.toThrow("offline")
-  expect(mutation.apply([session])).toEqual([session])
-})

packages/app/src/runtime/server/data.ts

@@ -1,51 +0,0 @@
-import type { Data } from "@opencode-ai/client/solid"
-import type { SessionInfo } from "@opencode-ai/client/promise"
-import { onCleanup } from "solid-js"
-import { createStore } from "solid-js/store"
-
-type SessionMutation = { readonly id: string; readonly type: "remove"; readonly sessionID: string }
-
-export function createDesktopData(input: { data: Data; remove: (sessionID: string) => Promise<void> }) {
-  const mutation = createSessionMutations(input.remove)
-  onCleanup(input.data.on("session.deleted", (event) => mutation.deleted(event.data.sessionID)))
-
-  return {
-    ...input.data,
-    session: {
-      ...input.data.session,
-      list: () => mutation.apply(input.data.session.list()),
-      apply: mutation.apply,
-      remove: mutation.remove,
-    },
-  }
-}
-
-export function createSessionMutations(remove: (sessionID: string) => Promise<void>) {
-  const [store, setStore] = createStore({ session: [] as SessionMutation[] })
-
-  const clear = (id: string) => {
-    setStore("session", (current) => current.filter((mutation) => mutation.id !== id))
-  }
-
-  return {
-    apply(sessions: readonly SessionInfo[]) {
-      const removed = new Set(
-        store.session.flatMap((mutation) => (mutation.type === "remove" ? [mutation.sessionID] : [])),
-      )
-      return removed.size === 0 ? [...sessions] : sessions.filter((session) => !removed.has(session.id))
-    },
-    remove(sessionID: string) {
-      const mutation = { id: crypto.randomUUID(), type: "remove" as const, sessionID }
-      setStore("session", (current) => [...current, mutation])
-      return Promise.resolve()
-        .then(() => remove(sessionID))
-        .catch((error) => {
-          clear(mutation.id)
-          throw error
-        })
-    },
-    deleted(sessionID: string) {
-      setStore("session", (current) => current.filter((mutation) => mutation.sessionID !== sessionID))
-    },
-  }
-}

packages/app/src/runtime/server/runtime.tsx

@@ -11,7 +11,6 @@ import type { ServerScope } from "@/runtime/server/scope"
 import { createPermissionAutoApprover } from "@/session/requests/auto-approve"
 import { createServerNotificationState } from "@/shell/notifications/notification"
 import { Persist, persisted } from "@/runtime/persistence/storage"
-import { createDesktopData } from "./data"
 
 export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext({
   name: "Global",
@@ -135,7 +134,7 @@ function createServerController(
 ) {
   const connKey = ServerConnection.key(conn)
   const sdk = createServerSdkContext(conn, scope)
-  const source = createData({
+  const data = createData({
     api: () => sdk.api,
     event: {
       on: sdk.event.on,
@@ -144,10 +143,6 @@ function createServerController(
     connection: sdk.connection,
     directory: "",
   })
-  const data = createDesktopData({
-    data: source,
-    remove: (sessionID) => sdk.api.session.remove({ sessionID }),
-  })
   const sync = createServerSyncContext(sdk, data)
   createPermissionAutoApprover({ sdk, data })
   const notification = createServerNotificationState({ sdk, data, key: connKey })

packages/app/src/runtime/server/sync.tsx

@@ -66,11 +66,11 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
     provider_auth: {},
     get path() {
       const EMPTY = { state: "", config: "", worktree: "", directory: "", home: "" }
-      if (pathQuery.isPending) return EMPTY
+      if (pathQuery.isLoading) return EMPTY
       return pathQuery.data ?? EMPTY
     },
     get config() {
-      if (configQuery.isPending) return {}
+      if (configQuery.isLoading) return {}
       return configQuery.data ?? {}
     },
     get reload() {

packages/app/src/session/composer/queue-panel.tsx

@@ -1,186 +0,0 @@
-import { createMemo, For, Show } from "solid-js"
-import { DragDropProvider, PointerSensor } from "@dnd-kit/solid"
-import { isSortable, useSortable } from "@dnd-kit/solid/sortable"
-import { AutoScroller, Feedback, PointerActivationConstraints } from "@dnd-kit/dom"
-import { RestrictToVerticalAxis } from "@dnd-kit/abstract/modifiers"
-import { RestrictToElement } from "@dnd-kit/dom/modifiers"
-import { arrayMove } from "@dnd-kit/helpers"
-import { Button } from "@opencode-ai/ui/button"
-import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { useLanguage } from "@/runtime/i18n/language"
-import type { SessionQueueView } from "./queue"
-
-// Pullout above the composer listing the prompts queued behind the current
-// turn. The panel slides under the composer card (negative margin, opaque
-// composer background) so the two read as one attached surface.
-export function SessionQueuePanel(props: { queue: SessionQueueView }) {
-  const language = useLanguage()
-  const count = () => props.queue.rows().length
-  let listRef!: HTMLDivElement
-  return (
-    <Show when={count() > 0}>
-      <div
-        data-component="session-queue-panel"
-        class="relative z-0 -mb-3 rounded-xl bg-v2-background-bg-base px-1.5 pt-1.5 pb-[18px] shadow-[inset_0_0_0_0.5px_var(--v2-border-border-base)]"
-      >
-        <Show when={count() > 3}>
-          <div class="px-1.5 pb-px text-[11px] font-[530] uppercase leading-[var(--line-height-tight)] tracking-[0.05px] text-v2-text-text-muted [font-variant-numeric:tabular-nums]">
-            {language.plural("session.queue.count", count())}
-          </div>
-        </Show>
-        <DragDropProvider
-          sensors={(defaults) => [
-            ...defaults.filter((sensor) => sensor !== PointerSensor),
-            PointerSensor.configure({
-              activationConstraints: [new PointerActivationConstraints.Distance({ value: 4 })],
-            }),
-          ]}
-          modifiers={[RestrictToVerticalAxis, RestrictToElement.configure({ element: () => listRef })]}
-          plugins={(defaults) => [
-            ...defaults.filter((plugin) => plugin !== AutoScroller && plugin !== Feedback),
-            AutoScroller.configure({ acceleration: 8, threshold: { x: 0, y: 0.05 } }),
-            Feedback.configure({ dropAnimation: null }),
-          ]}
-          onDragEnd={(event) => {
-            const source = event.operation.source
-            if (event.canceled || !isSortable(source)) return
-            if (source.initialIndex === source.index) return
-            void props.queue.reorder(
-              arrayMove(
-                props.queue.rows().map((row) => row.id),
-                source.initialIndex,
-                source.index,
-              ),
-            )
-          }}
-        >
-          {/* Keyed on row IDs so store updates move row elements instead of
-              remounting them, which would kill an in-flight drag. */}
-          <div
-            ref={listRef}
-            class="flex flex-col gap-px"
-            classList={{ "max-h-[131px] overflow-y-auto": count() > 3 }}
-          >
-            <For each={props.queue.rows().map((row) => row.id)}>
-              {(id, index) => <SessionQueueRow queue={props.queue} id={id} index={index()} />}
-            </For>
-          </div>
-        </DragDropProvider>
-      </div>
-    </Show>
-  )
-}
-
-function SessionQueueRow(props: { queue: SessionQueueView; id: string; index: number }) {
-  const language = useLanguage()
-  const row = createMemo(() => props.queue.rows().find((entry) => entry.id === props.id))
-  const editing = () => props.queue.editing() === props.id
-  // While the turn is stopped the queue stays parked, so the first prompt
-  // shows its actions without hover and its label reads Send: that is how a
-  // parked queue resumes.
-  const active = () => !props.queue.working() && props.index === 0
-  const sortable = useSortable({
-    get id() {
-      return props.id
-    },
-    get index() {
-      return props.index
-    },
-    get disabled() {
-      return props.queue.busy()
-    },
-  })
-  return (
-    <Show when={row()} keyed>
-      {(entry) => (
-        <div
-          ref={sortable.ref}
-          data-component="session-queue-row"
-          class="group/queue-row flex items-center justify-between gap-2 rounded-md py-1 ps-1 pe-2"
-          classList={{
-            "bg-v2-overlay-simple-overlay-hover": editing(),
-            "opacity-60": sortable.isDragSource(),
-          }}
-        >
-          <div class="flex min-w-0 flex-1 items-center gap-2">
-            <button
-              ref={sortable.handleRef}
-              type="button"
-              class="grid shrink-0 cursor-grab touch-none grid-cols-2 gap-x-[2px] gap-y-[2.25px] p-1"
-              aria-label={language.t("session.queue.reorder")}
-            >
-              <For each={Array.from({ length: 6 })}>
-                {() => <span class="size-[2px] bg-v2-background-bg-layer-04" />}
-              </For>
-            </button>
-            <div class="flex min-w-0 flex-col">
-              <button
-                type="button"
-                data-action="session-queue-edit"
-                dir="auto"
-                disabled={props.queue.busy()}
-                class="max-w-full min-w-0 self-start truncate rounded-sm text-start text-[13px] font-[440] leading-[var(--line-height-compact)]"
-                classList={{
-                  "text-v2-text-text-faint": editing(),
-                  "cursor-text text-v2-text-text-base hover:bg-v2-overlay-simple-overlay-hover": !editing(),
-                }}
-                onClick={() => props.queue.edit(props.id)}
-              >
-                {entry.text || (entry.attachments ? language.t("session.queue.attachments") : "")}
-              </button>
-              <Show when={entry.attachments && entry.text}>
-                <span class="text-[13px] font-[440] leading-[var(--line-height-compact)] text-v2-text-text-muted">
-                  {language.t("session.queue.attachments")}
-                </span>
-              </Show>
-            </div>
-          </div>
-          <div
-            data-slot="session-queue-actions"
-            class="flex shrink-0 items-center gap-1.5"
-            classList={{
-              "opacity-0 focus-within:opacity-100 group-hover/queue-row:opacity-100 [@media(hover:none)]:opacity-100":
-                !active() && !editing(),
-              "pointer-events-none": props.queue.busy(),
-            }}
-          >
-            <Show when={!editing()}>
-              <Tooltip
-                placement="top"
-                inactive={!props.queue.working()}
-                value={language.t("session.queue.steerTooltip")}
-              >
-                <Button
-                  data-action="session-queue-steer"
-                  type="button"
-                  size="small"
-                  variant="ghost-muted"
-                  icon="arrow-up"
-                  disabled={props.queue.busy()}
-                  class="text-v2-text-text-muted ![font-weight:530]"
-                  onClick={() => void props.queue.steer(props.id)}
-                >
-                  {props.queue.working() ? language.t("session.queue.steer") : language.t("session.queue.send")}
-                </Button>
-              </Tooltip>
-            </Show>
-            <Tooltip placement="top" value={language.t("session.queue.remove")}>
-              <IconButton
-                data-action="session-queue-remove"
-                type="button"
-                size="small"
-                variant="ghost-muted"
-                icon={<Icon name="outline-xmark" />}
-                disabled={props.queue.busy()}
-                aria-label={language.t("session.queue.remove")}
-                onClick={() => void props.queue.remove(props.id)}
-              />
-            </Tooltip>
-          </div>
-        </div>
-      )}
-    </Show>
-  )
-}

packages/app/src/session/composer/queue.ts

@@ -1,275 +0,0 @@
-import { createEffect, createMemo, onCleanup, type Accessor } from "solid-js"
-import { createStore } from "solid-js/store"
-import type { SessionInboxInfo } from "@opencode-ai/client/promise"
-import type { ComposerDelivery } from "@/composer/adapter"
-import type { ComposerModel } from "@/composer/model"
-import type { ComposerStateTarget } from "@/composer/submission-state"
-import type { ImageAttachmentPart, Prompt } from "@/composer/state"
-import { clonePrompt, promptLength } from "@/composer/prompt-parts"
-import { buildPromptRequest } from "@/composer/request"
-import { blobDataUrl } from "@/runtime/persistence/drafts"
-import { useData } from "@/runtime/server/current"
-import { useServerSDK } from "@/runtime/server/client"
-import { useWorkspaceLocation } from "@/workspaces/location"
-import { useLanguage } from "@/runtime/i18n/language"
-import { showToast } from "@/shell/notifications/toast"
-
-export type QueuedPrompt = Extract<SessionInboxInfo, { type: "user" }>
-
-type EditStash = {
-  prompt: Prompt
-  cursor: number
-  mode: "normal" | "shell"
-  retry: ReturnType<ComposerStateTarget["retry"]["current"]>
-}
-
-export function createSessionQueue(input: {
-  sessionID: string
-  draft: ComposerStateTarget
-  working: Accessor<boolean>
-  behavior: Accessor<ComposerDelivery>
-  composer: Accessor<ComposerModel | undefined>
-}) {
-  const data = useData()
-  const server = useServerSDK()
-  const location = useWorkspaceLocation()
-  const language = useLanguage()
-  const [state, setState] = createStore<{ editing?: { id: string; stash: EditStash }; busy: boolean }>({ busy: false })
-
-  const queued = createMemo(() =>
-    data.session.pending
-      .list(input.sessionID)
-      .filter((item): item is QueuedPrompt => item.type === "user" && item.delivery === "queue"),
-  )
-  const rows = createMemo(() =>
-    queued().map((item) => ({
-      id: item.id,
-      text: queuedPromptText(item),
-      attachments: (item.payload.files?.length ?? 0) > 0,
-    })),
-  )
-
-  createEffect(() => {
-    const editing = state.editing
-    if (!editing || state.busy || queued().some((item) => item.id === editing.id)) return
-    setState("editing", undefined)
-  })
-  onCleanup(() => cancelEdit())
-
-  const notify = () => showToast({ title: language.t("common.requestFailed") })
-  const run = (work: () => Promise<unknown>) => {
-    setState("busy", true)
-    return work()
-      .catch(() => notify())
-      .finally(async () => {
-        await data.session.pending.sync(input.sessionID).catch(() => undefined)
-        setState("busy", false)
-      })
-  }
-
-  const rewrite = async (inboxIDs: string[]) => {
-    const pending = await server.api.session.inbox.list({ sessionID: input.sessionID })
-    if (pending.some((item) => item.delivery === "queue" && item.type !== "user"))
-      throw new Error("Queued control items block reordering")
-    const current = pending.filter((item): item is QueuedPrompt => item.type === "user" && item.delivery === "queue")
-    const ordered = inboxIDs.flatMap((id) => current.filter((item) => item.id === id))
-    if (ordered.length !== current.length) throw new Error("Queued prompts changed before reordering")
-    const changed = ordered.findIndex((item, index) => item.id !== current[index]?.id)
-    if (changed < 0) return
-
-    // Existing inbox APIs cannot reorder rows, so replace only the changed suffix.
-    for (const item of ordered.slice(changed)) {
-      await data.session.prompt({
-        sessionID: input.sessionID,
-        text: item.payload.text,
-        files: item.payload.files?.map((file) => ({
-          uri: `data:${file.mime};base64,${file.data}`,
-          name: file.name,
-          description: file.description,
-          mention: file.mention,
-        })),
-        agents: item.payload.agents,
-        skills: item.payload.skills,
-        metadata: item.payload.metadata,
-        delivery: "queue",
-        resume: false,
-      })
-    }
-    for (const item of current.slice(changed)) {
-      await server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: item.id })
-    }
-  }
-  const steer = (id: string) => {
-    if (state.editing?.id === id) cancelEdit()
-    return server.api.session.inbox.steer({ sessionID: input.sessionID, inboxID: id }).catch(() => notify())
-  }
-  const remove = (id: string) => {
-    if (state.editing?.id === id) cancelEdit()
-    return server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: id }).catch(() => notify())
-  }
-  const reorder = (inboxIDs: string[]) => {
-    if (state.busy) return Promise.resolve()
-    return run(() => rewrite(inboxIDs))
-  }
-
-  const edit = (id: string) => {
-    if (state.busy) return false
-    if (state.editing?.id === id) return true
-    const item = queued().find((entry) => entry.id === id)
-    if (!item) return false
-    if (state.editing) cancelEdit()
-    const draft = input.draft.current()
-    setState("editing", {
-      id,
-      stash: {
-        prompt: clonePrompt(draft),
-        cursor: input.draft.cursor() ?? promptLength(draft),
-        mode: input.draft.mode.current(),
-        retry: input.draft.retry.current(),
-      },
-    })
-    const text = queuedPromptText(item)
-    input.composer()?.dispatch({ type: "mode.normal" })
-    input.draft.set([{ type: "text", content: text, start: 0, end: text.length }], text.length)
-    input.composer()?.restoreFocus(text.length)
-    return true
-  }
-  const cancelEdit = () => {
-    const editing = state.editing
-    if (!editing) return
-    setState("editing", undefined)
-    // Mode first, then prompt, then retry: mode and prompt writes both clear
-    // the retry marker.
-    input.composer()?.dispatch({ type: editing.stash.mode === "shell" ? "mode.shell" : "mode.normal" })
-    input.draft.set(editing.stash.prompt, editing.stash.cursor)
-    if (editing.stash.retry) input.draft.retry.set(editing.stash.retry)
-    input.composer()?.restoreFocus(editing.stash.cursor)
-  }
-  const confirmEdit = (delivery: ComposerDelivery) => {
-    const editing = state.editing
-    if (!editing || state.busy) return
-    const prompt = clonePrompt(input.draft.current())
-    const text = prompt.map((part) => ("content" in part ? part.content : "")).join("")
-    if (!text.trim() && !prompt.some((part) => part.type === "image")) return cancelEdit()
-    const item = queued().find((entry) => entry.id === editing.id)
-    const pristine = item && text.trim() === queuedPromptText(item) && !prompt.some((part) => part.type === "image")
-    if (pristine && delivery === "queue") return cancelEdit()
-    const inboxIDs = queued().map((entry) => entry.id)
-    void run(async () => {
-      const replacement = await editedPromptInput(input.sessionID, location().directory, item, prompt, text)
-      // Admit before cancelling so a failed replacement never discards the original.
-      const admitted = await data.session.prompt({
-        ...replacement,
-        delivery,
-        ...(delivery === "queue" ? { resume: false } : {}),
-      })
-      await server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: editing.id })
-      cancelEdit()
-      if (delivery === "queue") await rewrite(inboxIDs.map((id) => (id === editing.id ? admitted.id : id)))
-    })
-  }
-  const editFirst = () => {
-    const first = queued()[0]
-    if (!first) return false
-    return edit(first.id)
-  }
-
-  return {
-    count: () => queued().length,
-    delivery: () => (input.working() ? input.behavior() : "steer"),
-    alternate: () => {
-      if (state.editing) return "steer"
-      if (!input.working()) return undefined
-      return input.behavior() === "queue" ? "steer" : "queue"
-    },
-    editing: () => state.editing?.id,
-    confirmEdit,
-    cancelEdit,
-    editFirst,
-    rows,
-    busy: () => state.busy,
-    working: input.working,
-    steer,
-    remove,
-    edit,
-    reorder,
-  }
-}
-
-export type SessionQueue = ReturnType<typeof createSessionQueue>
-
-// The slice of the queue the panel renders and drives.
-export type SessionQueueView = Pick<
-  SessionQueue,
-  "rows" | "editing" | "working" | "busy" | "steer" | "remove" | "edit" | "reorder"
->
-
-export function queuedPromptText(item: QueuedPrompt) {
-  const display = item.payload.metadata?.["displayText"]
-  return typeof display === "string" && display.length > 0 ? display : item.payload.text
-}
-
-// Confirming an edit submits the current composer content as the replacement:
-// mentions and images added during the edit are parsed like a normal
-// submission, the original's stored attachments are preserved, and the
-// review-comment notes appended to the original's model-visible text survive.
-// Ambient composer context (open review comments) stays out: it belongs to
-// the next fresh prompt, not to a queued edit.
-async function editedPromptInput(
-  sessionID: string,
-  directory: string,
-  item: QueuedPrompt | undefined,
-  prompt: Prompt,
-  text: string,
-) {
-  const images = await Promise.all(
-    prompt
-      .filter((part): part is ImageAttachmentPart => part.type === "image")
-      .map(async (part) => ({ ...part, dataUrl: await blobDataUrl(part.blob, part.mime) })),
-  )
-  const request = buildPromptRequest({ prompt, context: [], images, text, sessionDirectory: directory })
-  const payload = item?.payload
-  const display = item ? queuedPromptText(item) : ""
-  const notes = payload && display && payload.text.startsWith(display) ? payload.text.slice(display.length) : ""
-  const mention = (value: { start: number; end: number; text: string } | undefined) => {
-    if (!value) return undefined
-    const start = text.indexOf(value.text)
-    if (start < 0) return undefined
-    return { text: value.text, start, end: start + value.text.length }
-  }
-  // Structured mentions degrade to plain text in the editor, so an original
-  // agent or skill reference survives the edit as long as its mention text
-  // still appears; newly typed structured mentions come from the request.
-  const agents = [
-    ...(payload?.agents?.filter(
-      (agent) =>
-        agent.mention &&
-        text.includes(agent.mention.text) &&
-        !request.agents.some((entry) => entry.name === agent.name),
-    ) ?? []),
-    ...request.agents,
-  ]
-  const skills = [
-    ...(payload?.skills?.filter(
-      (skill) =>
-        skill.mention && text.includes(skill.mention.text) && !request.skills.some((entry) => entry.id === skill.id),
-    ) ?? []),
-    ...request.skills,
-  ]
-  return {
-    sessionID,
-    text: request.text + notes,
-    files: [
-      ...(payload?.files?.map((file) => ({
-        uri: `data:${file.mime};base64,${file.data}`,
-        name: file.name,
-        description: file.description,
-        mention: mention(file.mention),
-      })) ?? []),
-      ...request.files.map((file) => ({ uri: file.uri, name: file.name, mention: file.mention })),
-    ],
-    agents: agents.map((agent) => ({ name: agent.name, mention: mention(agent.mention) })),
-    skills: skills.map((skill) => ({ id: skill.id, mention: mention(skill.mention) })),
-    metadata: { ...payload?.metadata, displayText: request.displayText },
-  }
-}

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

@@ -6,7 +6,7 @@ import { makeEventListener } from "@solid-primitives/event-listener"
 import { useNavigate } from "@solidjs/router"
 import { createEffect, on, onMount } from "solid-js"
 import { Composer } from "@/composer/composer"
-import { createComposerModel, type ComposerModel } from "@/composer/model"
+import { createComposerModel } from "@/composer/model"
 import { useComposerState } from "@/composer/persistence"
 import { createComposerControls } from "@/composer/selection"
 import { setCursorPosition } from "@/composer/editor/dom"
@@ -27,11 +27,8 @@ import { createSessionRevert } from "../revert"
 import { SessionComposerRegion } from "./session-composer-region"
 import { createSessionComposerRegionController } from "./session-composer-region-controller"
 import { createActiveComposerAdapter } from "./adapter"
-import { createSessionQueue } from "./queue"
-import { SessionQueuePanel } from "./queue-panel"
 import { resolveSessionComposerSelection } from "./selection"
 import { createSessionRequestModel } from "../requests/model"
-import { useSettings } from "@/settings/model"
 
 export function createActiveSessionRegion(input: {
   session: SessionModel
@@ -219,7 +216,6 @@ export function ActiveSessionComposerRegion(props: {
   accentSubmit: boolean
   onResponseSubmit: () => void
 }) {
-  const settings = useSettings()
   const region = createSessionComposerRegionController({
     state: props.model.region.state,
     parentID: props.session.data.parentID,
@@ -235,32 +231,11 @@ export function ActiveSessionComposerRegion(props: {
     submitted: props.model.submitted,
     setEditor: props.model.input.setPromptRef,
   })
-  let composer: ComposerModel | undefined
-  const queue = createSessionQueue({
-    sessionID: requireSessionID(props.session),
-    draft: adapter.state,
-    working: adapter.working,
-    behavior: settings.general.followUpBehavior,
-    composer: () => composer,
-  })
-  composer = createComposerModel(adapter, { queue })
+  const composer = createComposerModel(adapter)
   return (
     <SessionComposerRegion
       controller={region}
-      composer={
-        <div class="relative">
-          <SessionQueuePanel queue={queue} />
-          <div class="relative z-10">
-            <Composer model={composer} borderUnderlay accentSubmit={props.accentSubmit} />
-          </div>
-        </div>
-      }
+      composer={<Composer model={composer} borderUnderlay accentSubmit={props.accentSubmit} />}
     />
   )
 }
-
-function requireSessionID(session: SessionModel) {
-  const id = session.identity.params.id
-  if (!id) throw new Error("Active Composer requires a Session ID")
-  return id
-}

packages/app/src/session/revert.ts

@@ -55,28 +55,6 @@ export function createSessionRevert(input: {
       await server.api.session.interrupt({ sessionID }).catch(() => undefined)
     }
     if (!(await request(() => server.api.session.revert.stage({ sessionID, messageID: message.id })))) return
-    // Reverting to a previous prompt discards the pending queue (and pending
-    // steers): they were written against the history being rewound. Cancel
-    // the authoritative inbox merged with the local snapshot, fire-and-forget
-    // so a slow request cannot delay restoring the composer. The cutoff keeps
-    // the asynchronous sweep away from prompts admitted after the revert; an
-    // old admission still in flight when the list is fetched can survive it,
-    // and fully closing that race needs a server-side revert-discards-inbox
-    // rule.
-    const cutoff = Date.now()
-    const local = data.session.pending
-      .list(sessionID)
-      .filter((item) => item.type === "user")
-      .map((item) => item.id)
-    void server.api.session.inbox
-      .list({ sessionID })
-      .then((rows) => rows.filter((row) => row.type === "user" && row.timeCreated <= cutoff).map((row) => row.id))
-      .catch(() => [])
-      .then((authoritative) => {
-        new Set([...local, ...authoritative]).forEach(
-          (inboxID) => void server.api.session.inbox.cancel({ sessionID, inboxID }).catch(() => undefined),
-        )
-      })
     restore(target, message)
     owner.run(() => input.setActiveMessage(previous))
   }

packages/app/src/session/timeline/controller.tsx

@@ -168,15 +168,15 @@ export function createTimelineController(input: { session: TimelineSessionSource
     const sessions = data.session.list().filter((item) => !item.parentID && !item.time?.archived)
     const index = sessions.findIndex((item) => item.id === id)
     const next = index === -1 ? undefined : (sessions[index + 1] ?? sessions[index - 1])
-    const removed = removedSessionIDs(data.session.list(), id)
-    const success = await data.session
-      .remove(id)
+    const success = await serverSDK.api.session
+      .remove({ sessionID: id })
       .then(() => true)
       .catch((error) => {
         showToast({ title: language.t("session.delete.failed.title"), description: errorMessage(error) })
         return false
       })
     if (!success) return false
+    const removed = removedSessionIDs(data.session.list(), id)
     void navigateAfterRemoval(id, session.parentID, next?.id)
     notifySessionTabsRemoved({ server: server.key, directory: sdk().directory, sessionIDs: [...removed] })
     return true

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

@@ -1,6 +1,6 @@
 import { createEffect, createMemo, createSignal, For, on, Show, type Accessor, type JSX } from "solid-js"
+import createPresence from "solid-presence"
 import { createStore } from "solid-js/store"
-import { createAnimatedPresence } from "@/runtime/animated-presence"
 import type { SessionUserActions } from "@opencode-ai/session-ui/actions"
 import { Badge } from "@opencode-ai/ui/badge"
 import { DiffChanges } from "@opencode-ai/ui/diff-changes"
@@ -479,7 +479,17 @@ function MessageTimelineView(
     return row.group.ref.partID
   })
   const [backgroundHintRef, setBackgroundHintRef] = createSignal<HTMLDivElement>()
-  const backgroundHintPresence = createAnimatedPresence(backgroundHintPartID, () => backgroundHintRef() ?? null)
+  const backgroundHintVisibility = createMemo<{ show: boolean; animate: boolean }>(
+    (previous) => {
+      const show = backgroundHintPartID() !== undefined
+      return { show, animate: previous.animate || previous.show !== show }
+    },
+    { show: backgroundHintPartID() !== undefined, animate: false },
+  )
+  const backgroundHintPresence = createPresence({
+    show: () => backgroundHintVisibility().show,
+    element: () => backgroundHintRef() ?? null,
+  })
   return (
     <VirtualizedTimeline
       workspaceSession={workspaceSession}
@@ -497,9 +507,9 @@ function MessageTimelineView(
               class="duration-150 motion-reduce:animate-none"
               classList={{
                 [`flex h-9 items-start pt-3 ${turnPadding()}`]: true,
-                "animate-in fade-in": backgroundHintPresence.animate() && backgroundHintPresence.show(),
+                "animate-in fade-in": backgroundHintVisibility().animate && backgroundHintVisibility().show,
                 "animate-out fade-out fill-mode-forwards":
-                  backgroundHintPresence.animate() && !backgroundHintPresence.show(),
+                  backgroundHintVisibility().animate && !backgroundHintVisibility().show,
               }}
             >
               <BackgroundMoveHint />

packages/app/src/settings/general/general.tsx

@@ -7,13 +7,7 @@ import { TextInput } from "@opencode-ai/ui/text-input"
 import { useLanguage } from "@/runtime/i18n/language"
 import { usePlatform } from "@/runtime/platform/platform"
 import { useUpdaterAction } from "@/shell/updates/action"
-import {
-  type FollowUpBehavior,
-  type TerminalPlacement,
-  type WorkspaceDefaultDestination,
-  useSettings,
-} from "@/settings/model"
-import { formatKeybind } from "@/shell/commands/command"
+import { type TerminalPlacement, type WorkspaceDefaultDestination, useSettings } from "@/settings/model"
 import { ExternalLink } from "@/runtime/platform/external-link"
 import { SettingsList } from "@/settings/list"
 import { SettingsRow } from "@/settings/row"
@@ -154,35 +148,6 @@ const TerminalPlacementSetting: Component = () => {
   )
 }
 
-const FollowUpBehaviorSetting: Component = () => {
-  const language = useLanguage()
-  const settings = useSettings()
-  const options = createMemo((): { value: FollowUpBehavior; label: string }[] => [
-    { value: "queue", label: language.t("settings.general.row.followUpBehavior.queue") },
-    { value: "steer", label: language.t("settings.general.row.followUpBehavior.steer") },
-  ])
-
-  return (
-    <SettingsRow
-      title={language.t("settings.general.row.followUpBehavior.title")}
-      description={language.t("settings.general.row.followUpBehavior.description", {
-        keybind: formatKeybind("mod+enter", language.t),
-      })}
-    >
-      <Select
-        data-action="settings-follow-up-behavior"
-        options={options()}
-        current={options().find((option) => option.value === settings.general.followUpBehavior())}
-        value={(option) => option.value}
-        label={(option) => option.label}
-        placement="bottom-end"
-        gutter={6}
-        onSelect={(option) => option && settings.general.setFollowUpBehavior(option.value)}
-      />
-    </SettingsRow>
-  )
-}
-
 const AppearanceSection: Component<{ controller: AppearanceSettingsController }> = (props) => {
   const language = useLanguage()
   return (
@@ -329,7 +294,6 @@ export const SettingsGeneral: Component<{
 
         <ShellSetting controller={shell} />
         <TerminalPlacementSetting />
-        <FollowUpBehaviorSetting />
 
         <SettingsRow
           title={language.t("settings.general.row.reasoningSummaries.title")}

packages/app/src/settings/model.test.ts

@@ -1,30 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { monoDefault, monoFontFamily, sansDefault, sansFontFamily, terminalFontFamily } from "./model"
-
-describe("settings font families", () => {
-  test("defaults normal text to Inter", () => {
-    expect(sansDefault).toBe("Inter")
-    expect(sansFontFamily(undefined)).toStartWith('"Inter", ')
-    expect(sansFontFamily("")).toStartWith('"Inter", ')
-    expect(sansFontFamily("   ")).toStartWith('"Inter", ')
-  })
-
-  test("keeps custom normal fonts ahead of the default", () => {
-    expect(sansFontFamily("Custom Sans")).toStartWith('"Custom Sans", "Inter", ')
-  })
-
-  test("defaults monospace text to IBM Plex Mono", () => {
-    expect(monoDefault).toBe("IBM Plex Mono")
-    expect(monoFontFamily(undefined)).toStartWith('"IBM Plex Mono", ')
-    expect(monoFontFamily("")).toStartWith('"IBM Plex Mono", ')
-    expect(monoFontFamily("   ")).toStartWith('"IBM Plex Mono", ')
-  })
-
-  test("keeps custom monospace fonts ahead of the default", () => {
-    expect(monoFontFamily("Custom Mono")).toStartWith('"Custom Mono", "IBM Plex Mono", ')
-  })
-
-  test("preserves the separate terminal font default", () => {
-    expect(terminalFontFamily(undefined)).toStartWith('"JetBrainsMono Nerd Font Mono", ')
-  })
-})

packages/app/src/settings/model.tsx

@@ -7,7 +7,6 @@ import { ScopedKey, type ServerScope } from "@/runtime/server/scope"
 export type WorkspaceDefaultDestination = "last-used" | "local" | "new"
 export type WorkspaceLastUsed = "local" | "workspace"
 export type TerminalPlacement = "side" | "bottom"
-export type FollowUpBehavior = "queue" | "steer"
 
 export interface NotificationSettings {
   agent: boolean
@@ -40,7 +39,6 @@ export interface Settings {
     showCustomAgents: boolean
     mobileTitlebarPosition: "top" | "bottom"
     terminalPlacement: TerminalPlacement
-    followUpBehavior: FollowUpBehavior
   }
   appearance: {
     fontSize: number
@@ -60,12 +58,12 @@ export interface Settings {
   sounds: SoundSettings
 }
 
-export const monoDefault = "IBM Plex Mono"
-export const sansDefault = "Inter"
+export const monoDefault = "System Mono"
+export const sansDefault = "System Sans"
 export const terminalDefault = "JetBrainsMono Nerd Font Mono"
 const monoFallback =
-  '"IBM Plex Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'
-const sansFallback = '"Inter", ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif'
+  'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'
+const sansFallback = 'ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif'
 const terminalFallback =
   '"JetBrainsMono Nerd Font Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'
 
@@ -128,7 +126,6 @@ const defaultSettings: Settings = {
     showCustomAgents: false,
     mobileTitlebarPosition: "top",
     terminalPlacement: "side",
-    followUpBehavior: "steer",
   },
   appearance: {
     fontSize: 14,
@@ -259,10 +256,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
         setTerminalPlacement(value: TerminalPlacement) {
           setStore("general", "terminalPlacement", value)
         },
-        followUpBehavior: withFallback(() => store.general?.followUpBehavior, defaultSettings.general.followUpBehavior),
-        setFollowUpBehavior(value: FollowUpBehavior) {
-          setStore("general", "followUpBehavior", value)
-        },
       },
       visibility: {
         fileTree: showFileTree,

packages/app/src/settings/workspaces/project-dialog.tsx

@@ -39,7 +39,7 @@ function ProjectSettingsDialog(props: { project: LocalProject; server: ServerCon
       <Button type="button" variant="neutral" disabled={model.save.isPending} onClick={model.close}>
         {language.t("common.cancel")}
       </Button>
-      <Button type="submit" variant="contrast" disabled={model.save.isPending}>
+      <Button type="submit" variant="contrast" disabled={!model.supported || model.save.isPending}>
         {model.save.isPending ? language.t("common.saving") : language.t("common.save")}
       </Button>
     </DialogFooter>

packages/app/src/settings/workspaces/project-model.ts

@@ -1,6 +1,7 @@
 import { getFilename } from "@opencode-ai/util/path"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useMutation } from "@tanstack/solid-query"
+import { normalizeProjectInfo } from "@/runtime/server/global-sync/utils"
 import { createMemo } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useGlobal } from "@/runtime/server/runtime"
@@ -8,6 +9,7 @@ import { type LocalProject } from "@/shell/state/layout"
 import { ServerConnection } from "@/runtime/server/registry"
 
 export function createEditProjectModel(props: { project: LocalProject; server: ServerConnection.Any }) {
+  const supported = !props.project.id || props.project.id === "global"
   const dialog = useDialog()
   const global = useGlobal()
   const serverCtx = createMemo(() => global.ensureServerCtx(props.server))
@@ -70,14 +72,9 @@ export function createEditProjectModel(props: { project: LocalProject; server: S
       const start = store.startup.trim()
 
       if (props.project.id && props.project.id !== "global") {
-        await serverCtx().sdk.api.project.update({
-          projectID: props.project.id,
-          name,
-          icon: { color: store.color ?? "", override: store.iconOverride ?? "" },
-          commands: { start },
-        })
-        dialog.close()
-        return
+        // TODO: Restore project edits when the V2 client exposes a project update API.
+        // await serverCtx().sdk.api.project.update({ projectID: props.project.id, name, icon, commands })
+        throw new Error(`Project ${props.project.id} cannot be updated`)
       }
 
       serverCtx().sync.project.meta(props.project.worktree, {
@@ -91,7 +88,7 @@ export function createEditProjectModel(props: { project: LocalProject; server: S
 
   function submit(event: SubmitEvent) {
     event.preventDefault()
-    if (save.isPending) return
+    if (!supported || save.isPending) return
     save.mutate()
   }
 
@@ -101,6 +98,7 @@ export function createEditProjectModel(props: { project: LocalProject; server: S
     folderName,
     defaultName,
     save,
+    supported,
     submit,
     drop,
     dragOver,

packages/app/src/shell/notifications/notification.test.ts

@@ -1,26 +0,0 @@
-import { expect, test } from "bun:test"
-import type { ServerConnection } from "@/runtime/server/registry"
-import type { Tab } from "@/shell/tabs/tabs"
-import { openNotificationSession } from "./notification"
-
-test("opens notification sessions through the tab router", () => {
-  const server = "local\nhttp://localhost:4096" as ServerConnection.Key
-  const tab = { type: "session" as const, server, sessionId: "session-1" }
-  const calls: string[] = []
-  const tabs = {
-    addSessionTab: (input: Omit<typeof tab, "type">) => {
-      calls.push(`add:${input.sessionId}`)
-      return tab
-    },
-    rememberSessionRoute: (_tab: typeof tab, sessionID: string) => {
-      calls.push(`route:${sessionID}`)
-    },
-    select: (input: Tab) => {
-      calls.push(`select:${input.type === "session" ? input.sessionId : input.draftID}`)
-    },
-  }
-
-  openNotificationSession(tabs, server, "session-1")
-
-  expect(calls).toEqual(["add:session-1", "route:session-1", "select:session-1"])
-})

packages/app/src/shell/notifications/notification.tsx

@@ -51,19 +51,6 @@ type NotificationIndex = {
   }
 }
 
-type NotificationTabs = Pick<ReturnType<typeof useTabs>, "addSessionTab" | "rememberSessionRoute" | "select">
-
-export function openNotificationSession(
-  tabs: NotificationTabs,
-  server: ServerConnection.Key,
-  sessionID: string,
-) {
-  const tab = tabs.addSessionTab({ server, sessionId: sessionID })
-  if (tab.type !== "session") return
-  tabs.rememberSessionRoute(tab, sessionID)
-  tabs.select(tab)
-}
-
 const MAX_NOTIFICATIONS = 500
 const NOTIFICATION_TTL_MS = 1000 * 60 * 60 * 24 * 30
 
@@ -224,6 +211,11 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
     return typeof location !== "undefined" && location.pathname === sessionHref(input.key, sessionID)
   }
 
+  const navigate = (href: string) => {
+    history.pushState(null, "", href)
+    dispatchEvent(new PopStateEvent("popstate"))
+  }
+
   const handleSessionIdle = (sessionID: string, eventID: string, time: number) => {
     void lookup(sessionID).then((session) => {
       if (meta.disposed) return
@@ -245,9 +237,10 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
         session: sessionID,
       })
 
+      const href = sessionHref(input.key, sessionID)
       if (settings.notifications.agent()) {
         void platform.notify(language.t("notification.session.responseReady.title"), session.title ?? sessionID, () =>
-          openNotificationSession(tabs, input.key, sessionID),
+          navigate(href),
         )
       }
     })
@@ -281,10 +274,9 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
       const description =
         session?.title ??
         (typeof error === "string" ? error : language.t("notification.session.error.fallbackDescription"))
+      const href = sessionHref(input.key, sessionID)
       if (settings.notifications.errors()) {
-        void platform.notify(language.t("notification.session.error.title"), description, () =>
-          openNotificationSession(tabs, input.key, sessionID),
-        )
+        void platform.notify(language.t("notification.session.error.title"), description, () => navigate(href))
       }
     })
   }

packages/app/src/shell/tabs/migration.ts

@@ -31,19 +31,9 @@ export function migrateTabs(value: unknown): Tab[] {
       tab.type === "draft" &&
       typeof tab.draftID === "string" &&
       typeof tab.directory === "string" &&
-      (tab.worktree === undefined || typeof tab.worktree === "string") &&
-      (tab.branch === undefined || typeof tab.branch === "string")
+      (tab.worktree === undefined || typeof tab.worktree === "string")
     ) {
-      return [
-        {
-          type: tab.type,
-          server,
-          draftID: tab.draftID,
-          directory: tab.directory,
-          worktree: tab.worktree,
-          branch: tab.branch,
-        },
-      ]
+      return [{ type: tab.type, server, draftID: tab.draftID, directory: tab.directory, worktree: tab.worktree }]
     }
     return []
   })

packages/app/src/shell/tabs/tabs.tsx

@@ -29,7 +29,6 @@ export type DraftTab = {
   server: ServerConnection.Key
   directory: string
   worktree?: string
-  branch?: string
 }
 
 export type Tab = SessionTab | DraftTab

packages/app/src/shell/titlebar/tab-nav.css

@@ -143,10 +143,6 @@
     display: none;
   }
 
-  [data-titlebar-tab]:not([data-active="true"]) [data-slot="tab-close"] {
-    display: none;
-  }
-
   [data-slot="tab-close"] {
     right: auto;
     left: 50%;

packages/app/test-browser/animated-presence-state.test.ts

@@ -1,49 +0,0 @@
-import { expect, test } from "bun:test"
-import { createAnimatedPresence } from "../src/runtime/animated-presence"
-import { createRoot, createSignal } from "solid-js"
-
-test("animates visibility changes without animating initial presence", () => {
-  createRoot((dispose) => {
-    const [value, setValue] = createSignal<string | undefined>("steer")
-    const presence = createAnimatedPresence(value, () => null)
-
-    expect(presence.show()).toBe(true)
-    expect(presence.animate()).toBe(false)
-    expect(presence.value()).toBe("steer")
-    expect(presence.present()).toBe(true)
-
-    setValue("queue")
-    expect(presence.animate()).toBe(false)
-    expect(presence.value()).toBe("queue")
-
-    setValue(undefined)
-    expect(presence.show()).toBe(false)
-    expect(presence.animate()).toBe(true)
-    expect(presence.value()).toBe("queue")
-
-    setValue("steer")
-    expect(presence.show()).toBe(true)
-    expect(presence.animate()).toBe(true)
-    expect(presence.value()).toBe("steer")
-
-    dispose()
-  })
-})
-
-test("animates the first appearance when initially hidden", () => {
-  createRoot((dispose) => {
-    const [value, setValue] = createSignal<string | undefined>()
-    const presence = createAnimatedPresence(value, () => null)
-
-    expect(presence.show()).toBe(false)
-    expect(presence.animate()).toBe(false)
-    expect(presence.present()).toBe(false)
-
-    setValue("steer")
-    expect(presence.show()).toBe(true)
-    expect(presence.animate()).toBe(true)
-    expect(presence.value()).toBe("steer")
-
-    dispose()
-  })
-})

packages/cli/script/build.ts

@@ -9,7 +9,6 @@ import type { BunPlugin } from "bun"
 import pkg from "../package.json"
 import { buildAppArchive } from "./app-assets"
 import { verifyArtifact, verifySimulationGraph } from "./verify-artifact"
-import { resolveOpencodePty } from "./opencode-pty"
 
 const dir = path.resolve(import.meta.dirname, "..")
 const binary = "opencode2"
@@ -79,23 +78,6 @@ const appAssetsPlugin: BunPlugin = {
 }
 
 for (const item of targets) {
-  const opencodePty = await resolveOpencodePty({
-    platform: item.os,
-    arch: item.arch,
-    ...(item.os === "linux" ? { libc: item.abi ?? "glibc" } : {}),
-  })
-  const opencodePtyPlugin: BunPlugin = {
-    name: "opencode-pty-binary",
-    setup(build) {
-      build.onLoad({ filter: /persistent-pty[/\\]pty-binding\.ts$/ }, () => ({
-        loader: "js",
-        contents: opencodePty
-          ? `import file from ${JSON.stringify(opencodePty.source)} with { type: "file" }
-export default { path: file, version: ${JSON.stringify(opencodePty.version)}, sha256: ${JSON.stringify(opencodePty.sha256)} }`
-          : "export default undefined",
-      }))
-    },
-  }
   const simulationInputs = new Set<string>()
   const simulationGraphPlugin: BunPlugin = {
     name: "opencode-simulation-graph",
@@ -123,7 +105,7 @@ export default { path: file, version: ${JSON.stringify(opencodePty.version)}, sh
   const result = await Bun.build({
     entrypoints: ["./src/index.ts"],
     tsconfig: "./tsconfig.json",
-    plugins: [appAssetsPlugin, solidPlugin, parcelWatcherPlugin, opencodePtyPlugin, simulationGraphPlugin],
+    plugins: [appAssetsPlugin, solidPlugin, parcelWatcherPlugin, simulationGraphPlugin],
     external: ["node-gyp"],
     format: "esm",
     minify: true,