fix(codemode): enumerate inherited keys in for...in, intern tool references, freeze template objects, and delegate Array and Error toString

2026-09-29 03:57:40 +00:00 · 2026-09-25 12:01:22 -05:00
223 changed files with 2703 additions and 5944 deletions
@@ -0,0 +1,5 @@
+---
+"@opencode/core": patch
+---
+
+Correct directory page headings when the read offset is zero.
@@ -24,10 +24,6 @@ on:
        description: "Override version (optional)"
        required: false
        type: string
-      release_notes:
-        description: "Reviewed V2 release notes for the Discord announcement (optional)"
-        required: false
-        type: string

 concurrency: ${{ github.workflow }}-${{ github.ref }}-${{ (github.ref_name == 'v2' && (inputs.version || inputs.bump) && 'release') || inputs.version || inputs.bump }}

@@ -657,19 +653,3 @@ jobs:
          OPENCODE_DESKTOP_DIST: /tmp/desktop
          CLOUDFLARE_ACCOUNT_ID: 15d29c8639fd3733b1b5486a2acfd968
          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-
-  notify-discord-v2:
-    needs:
-      - version
-      - publish
-    if: github.repository == 'anomalyco/opencode' && github.ref_name == 'v2' && needs.version.outputs.release && needs.publish.result == 'success'
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    steps:
-      # Unlike dev, V2 publishes a tag rather than a GitHub Release event.
-      - name: Announce V2 release in Discord
-        uses: SethCohen/github-releases-to-discord@24d166886aee4646d448c8a389ff9e1ebcab3682 # v1.20.0
-        with:
-          webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
-          release_name: OpenCode V2 ${{ needs.version.outputs.tag }}
-          release_body: ${{ inputs.release_notes }}
-          release_html_url: https://github.com/${{ github.repository }}/tree/${{ needs.version.outputs.tag }}
@@ -184,7 +184,7 @@ const table = sqliteTable("session", {
 - Keep `SessionRunner`, model resolution, tool registry, permissions, and filesystem Location-scoped. Omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
 - Preserve one explicit `llm.stream(request)` call per Physical Attempt and reload projected history before durable continuation. A logical Step may use generic pre-output retries, one full-context retry after continuation rejection, incomplete-stream continuation, or one overflow-compaction rebuild. Generic retries retain the logical step number and do not consume another agent-step allowance. Do not delegate orchestration to an in-memory tool loop.
 - Keep local Session drains process-local until clustering is implemented. `SessionRunCoordinator` joins explicit same-Session resumes, coalesces prompt wakeups, and allows different Sessions to run concurrently. A write-ahead execution claim marks a process-local busy period for restart recovery: terminal completion, failure, or user interruption releases it, while shutdown interruption and process death preserve it. Startup recovery resumes claimed top-level Sessions with durable per-execution attempt accounting. The claim is a recovery marker, not clustered ownership, fencing, or an exactly-once guarantee.
- Keep provider-specific native compaction mechanisms in `@opencode/ai` behind `LLMClient.compact`. `SessionCompaction` chooses a summary or native compaction from the model's `compaction` setting and owns route provenance, request shrinking, the retry policy, interruption, usage accounting, and checkpoint persistence.
+- Keep native compaction mechanisms out of `SessionCompaction`. Plugins register `native` strategies through the `SessionCompaction` editor that turn a prepared request into a replacement window (the built-in `NativeCompactionPlugin` handles `@opencode/ai` compaction operations); later registrations win. Core owns the provider-mode decision, route provenance, the retry policy, overflow recovery, interruption, usage accounting, and checkpoint persistence.
 - Keep delivery vocabulary explicit. Prompts steer by default. At safe step boundaries, steered compaction takes priority up to the first steered move control; other steers retain enqueue order. At an idle boundary, steers take priority; otherwise exactly one queued item delivers before the runner reevaluates continuation. Inbox items may be cancelled or changed between queue and steer before delivery. Promoting new user input resets the selected agent's step allowance; a batch of steers resets it once.
 - One step is one logical LLM call; its durable record covers only the model-visible span. Do not write "provider turn", and do not use bare "turn" for a single call: "turn" is reserved for the future assistant-turn unit containing all steps from prompt promotion until the session would go idle.
 - Keep event replay ownership separate from clustered Session execution ownership.
@@ -32,7 +32,7 @@
    },
    "packages/ai": {
      "name": "@opencode/ai",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode/schema": "workspace:*",
@@ -54,7 +54,7 @@
    },
    "packages/app": {
      "name": "@opencode/app",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -112,14 +112,13 @@
    },
    "packages/cli": {
      "name": "@opencode/cli",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "bin": {
        "opencode": "./bin/opencode.cjs",
        "opencode2": "./bin/opencode2.cjs",
      },
      "dependencies": {
        "@agentclientprotocol/sdk": "1.2.1",
-        "@clack/core": "1.0.0-alpha.1",
        "@clack/prompts": "1.0.0-alpha.1",
        "@effect/platform-node": "catalog:",
        "@opencode-ai/pty": "0.1.13",
@@ -136,7 +135,7 @@
        "effect": "catalog:",
        "immer": "11.1.4",
        "jsonc-parser": "3.3.1",
-        "picocolors": "1.1.1",
+        "open": "10.1.2",
        "solid-js": "catalog:",
        "tree-sitter-bash": "0.25.0",
        "tree-sitter-powershell": "0.25.10",
@@ -178,7 +177,7 @@
    },
    "packages/client": {
      "name": "@opencode/client",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/protocol": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -204,7 +203,7 @@
    },
    "packages/codemode": {
      "name": "@opencode/codemode",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -217,7 +216,7 @@
    },
    "packages/console/app": {
      "name": "@opencode/console-app",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -253,7 +252,7 @@
    },
    "packages/console/core": {
      "name": "@opencode/console-core",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -280,7 +279,7 @@
    },
    "packages/console/function": {
      "name": "@opencode/console-function",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@openauthjs/openauth": "0.0.0-20250322224806",
        "@opencode/console-core": "workspace:*",
@@ -297,7 +296,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode/console-mail",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -321,7 +320,7 @@
    },
    "packages/console/support": {
      "name": "@opencode/console-support",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode/console-core": "workspace:*",
@@ -341,7 +340,7 @@
    },
    "packages/core": {
      "name": "@opencode/core",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@ai-sdk/cohere": "3.0.27",
        "@ai-sdk/gateway": "3.0.104",
@@ -409,7 +408,7 @@
    },
    "packages/desktop": {
      "name": "@opencode/desktop",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "electron-context-menu": "5.0.0",
@@ -458,7 +457,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode/enterprise",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/sdk": "1.18.21",
@@ -495,7 +494,7 @@
    },
    "packages/function": {
      "name": "@opencode/function",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -511,7 +510,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode/http-recorder",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@effect/platform-node-shared": "4.0.0-rc.112",
      },
@@ -530,7 +529,7 @@
    },
    "packages/httpapi-codegen": {
      "name": "@opencode/httpapi-codegen",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "effect": "catalog:",
        "prettier": "3.6.2",
@@ -543,7 +542,7 @@
    },
    "packages/latex": {
      "name": "@opencode/latex",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -557,7 +556,7 @@
    },
    "packages/merman": {
      "name": "@opencode/merman",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -572,7 +571,7 @@
    },
    "packages/plugin": {
      "name": "@opencode/plugin",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode/ai": "workspace:*",
@@ -611,7 +610,7 @@
    },
    "packages/plugin-browser": {
      "name": "@opencode/plugin-browser",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -641,7 +640,7 @@
    },
    "packages/protocol": {
      "name": "@opencode/protocol",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/schema": "workspace:*",
        "effect": "catalog:",
@@ -656,7 +655,7 @@
    },
    "packages/schema": {
      "name": "@opencode/schema",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@standard-schema/spec": "catalog:",
        "effect": "catalog:",
@@ -680,7 +679,7 @@
    },
    "packages/sdk": {
      "name": "@opencode/sdk",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -701,7 +700,7 @@
    },
    "packages/server": {
      "name": "@opencode/server",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@effect/platform-node-shared": "catalog:",
@@ -723,7 +722,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode/session-ui",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode/client": "workspace:*",
@@ -758,7 +757,7 @@
    },
    "packages/simulation": {
      "name": "@opencode/simulation",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/ai": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -778,7 +777,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode/stats-app",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -812,7 +811,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode/stats-core",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -831,7 +830,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode/stats-server",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -877,7 +876,7 @@
    },
    "packages/theme": {
      "name": "@opencode/theme",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opentui/core": "catalog:",
        "effect": "catalog:",
@@ -891,7 +890,7 @@
    },
    "packages/tui": {
      "name": "@opencode/tui",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -910,6 +909,7 @@
        "effect": "catalog:",
        "fuzzysort": "catalog:",
        "get-east-asian-width": "catalog:",
+        "open": "10.1.2",
        "opentui-spinner": "catalog:",
        "remeda": "catalog:",
        "solid-js": "catalog:",
@@ -925,7 +925,7 @@
    },
    "packages/ui": {
      "name": "@opencode/ui",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -960,7 +960,7 @@
    },
    "packages/util": {
      "name": "@opencode/util",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -982,7 +982,6 @@
        "mime-types": "3.0.2",
        "minimatch": "10.2.5",
        "npm-package-arg": "13.0.2",
-        "open": "11.0.4",
        "pacote": "21.5.1",
      },
      "devDependencies": {
@@ -998,7 +997,7 @@
    },
    "packages/web": {
      "name": "@opencode/web",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1039,7 +1038,7 @@
    },
    "services/update": {
      "name": "@opencode/update",
-      "version": "2.0.18",
+      "version": "2.0.16",
      "dependencies": {
        "jose": "6.0.11",
        "semver": "catalog:",
@@ -1099,7 +1098,6 @@
    "@types/node": "catalog:",
    "bun-types": "1.4.2",
    "effect": "catalog:",
-    "open": "11.0.4",
    "solid-js": "catalog:",
  },
  "catalog": {
@@ -4324,7 +4322,7 @@

    "is-decimal": ["is-decimal@2.0.1", "", {}, "sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A=="],

-    "is-docker": ["is-docker@4.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-LHE+wROyG/Y/0ZnbktRCoTix2c1RhgWaZraMZ8o1Q7zCh0VSrICJQO5oqIIISrcSBtrXv0o233w1IYwsWCjTzA=="],
+    "is-docker": ["is-docker@3.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="],

    "is-document.all": ["is-document.all@1.0.0", "", { "dependencies": { "call-bound": "^1.0.4" } }, "sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g=="],

@@ -4342,8 +4340,6 @@

    "is-hexadecimal": ["is-hexadecimal@2.0.1", "", {}, "sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg=="],

-    "is-in-ssh": ["is-in-ssh@1.0.0", "", {}, "sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw=="],
-
    "is-inside-container": ["is-inside-container@1.0.0", "", { "dependencies": { "is-docker": "^3.0.0" }, "bin": { "is-inside-container": "cli.js" } }, "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA=="],

    "is-map": ["is-map@2.0.3", "", {}, "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw=="],
@@ -4390,7 +4386,7 @@

    "is-whitespace": ["is-whitespace@0.3.0", "", {}, "sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg=="],

-    "is-wsl": ["is-wsl@2.2.0", "", { "dependencies": { "is-docker": "^2.0.0" } }, "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="],
+    "is-wsl": ["is-wsl@3.1.1", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw=="],

    "isarray": ["isarray@1.0.0", "", {}, "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="],

@@ -4854,7 +4850,7 @@

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

-    "open": ["open@11.0.4", "", { "dependencies": { "default-browser": "^5.5.1", "define-lazy-prop": "^3.0.0", "is-in-ssh": "^1.0.0", "is-inside-container": "^1.0.0", "powershell-utils": "^0.2.1", "wsl-utils": "^1.0.0" } }, "sha512-++Zlftm0kVLPmzC06t6epuWmcRMDbI4z5P3NNX979WA/k23+NtSOynEGzsVfZwguKw2mi5umVgnBlJQMwRz4Pg=="],
+    "open": ["open@10.1.2", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "is-wsl": "^3.1.0" } }, "sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw=="],

    "openai": ["openai@6.49.0", "", { "peerDependencies": { "@aws-sdk/credential-provider-node": ">=3.972.0 <4", "@smithy/hash-node": ">=4.3.0 <5", "@smithy/signature-v4": ">=5.4.0 <6", "ws": "^8.18.0", "zod": "^3.25 || ^4.0" }, "optionalPeers": ["@aws-sdk/credential-provider-node", "@smithy/hash-node", "@smithy/signature-v4", "ws", "zod"] }, "sha512-aYCc0C6L864eR6WSYIwQGyXriw/nIyZx0ObvhzOEVuk0zoBDpynjSbrionWI7q65B5H8jJX0DXR9snEzM6bfPg=="],

@@ -4998,8 +4994,6 @@

    "postject": ["postject@1.0.0-alpha.6", "", { "dependencies": { "commander": "^9.4.0" }, "bin": { "postject": "dist/cli.js" } }, "sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A=="],

-    "powershell-utils": ["powershell-utils@0.2.1", "", {}, "sha512-C+y9x90UElAddDZmV4qOx9W53B61PO7cIqWz2dQsWlwswuq4mr8NEwytdGKboYbQlGZ3awrkTeNvcZiZNHnQ8A=="],
-
    "preact": ["preact@11.0.0-beta.0", "", {}, "sha512-IcODoASASYwJ9kxz7+MJeiJhvLriwSb4y4mHIyxdgaRZp6kPUud7xytrk/6GZw8U3y6EFJaRb5wi9SrEK+8+lg=="],

    "preact-render-to-string": ["preact-render-to-string@6.6.5", "", { "peerDependencies": { "preact": ">=10 || >= 11.0.0-0" } }, "sha512-O6MHzYNIKYaiSX3bOw0gGZfEbOmlIDtDfWwN1JJdc/T3ihzRT6tGGSEWE088dWrEDGa1u7101q+6fzQnO9XCPA=="],
@@ -5820,7 +5814,7 @@

    "ws": ["ws@8.21.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g=="],

-    "wsl-utils": ["wsl-utils@1.0.0", "", { "dependencies": { "is-wsl": "^3.1.0", "powershell-utils": "^0.1.0" } }, "sha512-Hl0ZOAs672vg+06kfujwRhoS6/jehvULrlFkuF2dRu6pHgA8U06h3xqNIqNNU1LTXPcedxByAR4GS6pwQK0mgA=="],
+    "wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],

    "xdg-basedir": ["xdg-basedir@5.1.0", "", {}, "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ=="],

@@ -5916,6 +5910,8 @@

    "@astrojs/telemetry/ci-info": ["ci-info@4.4.0", "", {}, "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg=="],

+    "@astrojs/telemetry/is-docker": ["is-docker@4.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-LHE+wROyG/Y/0ZnbktRCoTix2c1RhgWaZraMZ8o1Q7zCh0VSrICJQO5oqIIISrcSBtrXv0o233w1IYwsWCjTzA=="],
+
    "@aws-crypto/crc32/@aws-sdk/types": ["@aws-sdk/types@3.974.4", "", { "dependencies": { "@smithy/types": "^4.16.1", "tslib": "^2.6.2" } }, "sha512-dSFDNG00MEz0/xl5gxL62giLd1iYyJsTxZ1I1DOj6lC+bbgLB4TRsYClJg3b62dhXT1uATzsTNXPnC+33EJV3A=="],

    "@aws-crypto/crc32c/@aws-sdk/types": ["@aws-sdk/types@3.974.4", "", { "dependencies": { "@smithy/types": "^4.16.1", "tslib": "^2.6.2" } }, "sha512-dSFDNG00MEz0/xl5gxL62giLd1iYyJsTxZ1I1DOj6lC+bbgLB4TRsYClJg3b62dhXT1uATzsTNXPnC+33EJV3A=="],
@@ -6398,6 +6394,8 @@

    "builder-util/js-yaml": ["js-yaml@4.3.1", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ=="],

+    "chrome-launcher/is-wsl": ["is-wsl@2.2.0", "", { "dependencies": { "is-docker": "^2.0.0" } }, "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="],
+
    "chromium-bidi/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],

    "clean-css/source-map": ["source-map@0.6.1", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
@@ -6502,10 +6500,6 @@

    "import-in-the-middle/es-module-lexer": ["es-module-lexer@2.3.2", "", {}, "sha512-poHGpORABojJJucnV9KbOavETW8lBVnphkW77ER5/BQ5Fz7oXSoCNek7IH3vR5nRjdsEz926ibFYX8KtLQmdyw=="],

-    "is-inside-container/is-docker": ["is-docker@3.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="],
-
-    "is-wsl/is-docker": ["is-docker@2.2.1", "", { "bin": { "is-docker": "cli.js" } }, "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="],
-
    "js-beautify/glob": ["glob@10.5.0", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg=="],

    "js-beautify/nopt": ["nopt@7.2.1", "", { "dependencies": { "abbrev": "^2.0.0" }, "bin": { "nopt": "bin/nopt.js" } }, "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w=="],
@@ -6516,6 +6510,8 @@

    "lighthouse/devtools-protocol": ["devtools-protocol@0.0.1663043", "", {}, "sha512-33aOY3ZnBP1dgZsshgaL+/XlsQleiFZgyUaDtdZkEa1nbZhVY1MoDeWjk+wxg25fU924l1ZJfoGNmjjeA/5s1w=="],

+    "lighthouse/open": ["open@8.4.2", "", { "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", "is-wsl": "^2.2.0" } }, "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="],
+
    "lighthouse/ws": ["ws@7.5.13", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": "^5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-rsKI6xDBFVf4r/x8XyChGK04QR/XHroxs/jUcoWvtEZM8TPU/X/uIY9B1CsSzYws9ZJb/6bbBu7dPhFW00CAoA=="],

    "md-to-react-email/marked": ["marked@7.0.4", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ=="],
@@ -6618,6 +6614,8 @@

    "sst/jose": ["jose@5.2.3", "", {}, "sha512-KUXdbctm1uHVL8BYhnyHkgp3zDX5KW8ZhAKVFEfUbU2P8Alpzjb+48hHvjOdQIyPshoblhzsuqOwEEAbtHVirA=="],

+    "storybook/open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="],
+
    "storybook-solidjs-vite/semver": ["semver@7.8.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg=="],

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

    "write-file-atomic/signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],

-    "wsl-utils/is-wsl": ["is-wsl@3.1.1", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw=="],
-
-    "wsl-utils/powershell-utils": ["powershell-utils@0.1.0", "", {}, "sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A=="],
-
    "yaml-language-server/prettier": ["prettier@3.9.6", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g=="],

    "yaml-language-server/request-light": ["request-light@0.5.8", "", {}, "sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg=="],
@@ -7342,6 +7336,8 @@

    "builder-util/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],

+    "chrome-launcher/is-wsl/is-docker": ["is-docker@2.2.1", "", { "bin": { "is-docker": "cli.js" } }, "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="],
+
    "cliui/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

    "cliui/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
@@ -7402,6 +7398,12 @@

    "lazystream/readable-stream/string_decoder": ["string_decoder@1.1.1", "", { "dependencies": { "safe-buffer": "~5.1.0" } }, "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="],

+    "lighthouse/open/define-lazy-prop": ["define-lazy-prop@2.0.0", "", {}, "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="],
+
+    "lighthouse/open/is-docker": ["is-docker@2.2.1", "", { "bin": { "is-docker": "cli.js" } }, "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="],
+
+    "lighthouse/open/is-wsl": ["is-wsl@2.2.0", "", { "dependencies": { "is-docker": "^2.0.0" } }, "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="],
+
    "miniflare/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="],

    "miniflare/sharp/@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.0.4" }, "os": "darwin", "cpu": "x64" }, "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q=="],
@@ -7672,10 +7674,6 @@

    "@astrojs/starlight/@astrojs/mdx/@astrojs/markdown-remark/shiki": ["shiki@3.23.0", "", { "dependencies": { "@shikijs/core": "3.23.0", "@shikijs/engine-javascript": "3.23.0", "@shikijs/engine-oniguruma": "3.23.0", "@shikijs/langs": "3.23.0", "@shikijs/themes": "3.23.0", "@shikijs/types": "3.23.0", "@shikijs/vscode-textmate": "^10.0.2", "@types/hast": "^3.0.4" } }, "sha512-55Dj73uq9ZXL5zyeRPzHQsK7Nbyt6Y10k5s7OjuFZGMhpp4r/rsLBH0o/0fstIzX1Lep9VxefWljK/SKCzygIA=="],

-    "@astrojs/starlight/astro/@astrojs/telemetry/is-docker": ["is-docker@3.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="],
-
-    "@astrojs/starlight/astro/@astrojs/telemetry/is-wsl": ["is-wsl@3.1.1", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw=="],
-
    "@astrojs/starlight/astro/p-queue/p-timeout": ["p-timeout@6.1.4", "", {}, "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg=="],

    "@astrojs/starlight/astro/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.33.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.0.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ=="],
@@ -8078,10 +8076,6 @@

    "@opencode/web/@astrojs/cloudflare/wrangler/workerd": ["workerd@1.20260708.1", "", { "optionalDependencies": { "@cloudflare/workerd-darwin-64": "1.20260708.1", "@cloudflare/workerd-darwin-arm64": "1.20260708.1", "@cloudflare/workerd-linux-64": "1.20260708.1", "@cloudflare/workerd-linux-arm64": "1.20260708.1", "@cloudflare/workerd-windows-64": "1.20260708.1" }, "bin": { "workerd": "bin/workerd" } }, "sha512-WAK+Kt/VVCSldH2qSr8lx46XCJ4Q+bdlHNaFqUtOHthBEIB8C1N8HVW+VOLrxDoTCk0NGNv0zajnBeQK4JOB9w=="],

-    "@opencode/web/astro/@astrojs/telemetry/is-docker": ["is-docker@3.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="],
-
-    "@opencode/web/astro/@astrojs/telemetry/is-wsl": ["is-wsl@3.1.1", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw=="],
-
    "@opencode/web/astro/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],

    "@opencode/web/astro/p-queue/p-timeout": ["p-timeout@6.1.4", "", {}, "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg=="],
@@ -8222,10 +8216,6 @@

    "archiver-utils/glob/path-scurry/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],

-    "astro-expressive-code/astro/@astrojs/telemetry/is-docker": ["is-docker@3.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="],
-
-    "astro-expressive-code/astro/@astrojs/telemetry/is-wsl": ["is-wsl@3.1.1", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw=="],
-
    "astro-expressive-code/astro/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],

    "astro-expressive-code/astro/p-queue/p-timeout": ["p-timeout@6.1.4", "", {}, "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg=="],
@@ -8328,10 +8318,6 @@

    "temp/rimraf/glob/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="],

-    "toolbeam-docs-theme/astro/@astrojs/telemetry/is-docker": ["is-docker@3.0.0", "", { "bin": { "is-docker": "cli.js" } }, "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ=="],
-
-    "toolbeam-docs-theme/astro/@astrojs/telemetry/is-wsl": ["is-wsl@3.1.1", "", { "dependencies": { "is-inside-container": "^1.0.0" } }, "sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw=="],
-
    "toolbeam-docs-theme/astro/js-yaml/argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],

    "toolbeam-docs-theme/astro/p-queue/p-timeout": ["p-timeout@6.1.4", "", {}, "sha512-MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg=="],
@@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1790510107,
-        "narHash": "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=",
+        "lastModified": 1776683584,
+        "narHash": "sha256-NuTLMrr10Tng72hurYG8jYQ4XKK8wnpJmOGcPiis96g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3181085bfd08663b6b9e60bc7a8395c2aaa741bd",
+        "rev": "9dd5558b06dbdacbf635a3dd36dce1b1a7ee3a89",
        "type": "github"
      },
      "original": {
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-7DgxTpKv6ITKTom0mhlJNPQfdEjtEHK5P8uyCr26HZw=",
-    "aarch64-linux": "sha256-PJxW1Ibfx6oS1neWPSHqzP1Pm1HT9my1TrrHmOb6/no=",
-    "aarch64-darwin": "sha256-VIme5VHfM8JxNiDSOykkr5FytghDLI0FxkhiOXUSyQw=",
-    "x86_64-darwin": "sha256-rQ/j0QkR1vxAq4jgUbr0nY4RDyiLTJqN8q1AfoiEqVQ="
+    "x86_64-linux": "sha256-aQQQhaUlAhpfqzH0vNi0IJ1cg7FQHIKYzxeq5d8PZoU=",
+    "aarch64-linux": "sha256-r9aDFu3UYmudmmYPhzCrpFvQlaejXc8V1IzLtG3jZPc=",
+    "aarch64-darwin": "sha256-B0m41LelD7d61vPHGIZZSO/cU7gbjHDJHt6oxNRRM8Q=",
+    "x86_64-darwin": "sha256-9TWJsyI3Y6BMomtGSgqA1th9LpxpqP4F5Tl/GyexVYw="
  }
 }
@@ -2,7 +2,7 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.4.2",
@@ -162,7 +162,6 @@
    "@types/node": "catalog:",
    "bun-types": "1.4.2",
    "effect": "catalog:",
-    "open": "11.0.4",
    "solid-js": "catalog:"
  },
  "patchedDependencies": {
@@ -12,9 +12,9 @@

 Per-type constructors live on the type, not as top-level re-exports. Use `Message.system(...)`, `Message.user(...)`, `Message.assistant(...)`, `Message.tool(...)`, `Message.media(...)`, `LanguageModel.make(...)`, `ToolDefinition.make(...)`, `ToolCallPart.make(...)`, `ToolResultPart.make(...)`, `ToolChoice.make(...)`, `ToolChoice.named(...)`, `SystemPart.make(...)`, and `GenerationOptions.make(...)` directly. The top-level `LLM` namespace is reserved for request-shaped call APIs: `LLM.request`, `LLM.generate`, `LLM.stream`, and `LLM.generateObject`. `LLM.generate`/`LLM.stream` and Promise `ai.llm.generate`/`ai.llm.stream` accept ergonomic input or an `LLMRequest`; both paths use the same canonical request. Core still builds, logs, replays, and updates that durable `LLMRequest` boundary. Use `LLMRequest.update(...)` when deriving canonical request data; do not add a duplicate `LLM.updateRequest(...)` path.

-Modality namespaces mirror `LLM` exactly: `Image.request`, `Image.generate`, `Image.stream`, and the same for `Video`, `Speech`, and `Transcription`. Common request fields (`images`, `mask`, `n`, `size`, `aspectRatio`, `seed`, `format`) lower natively or fail with a typed `AIError`; provider-native controls always live under `providerOptions`, never under a modality-specific `options` key.
+Modality namespaces mirror `LLM` exactly: `Image.request`, `Image.generate`, `Image.stream` (later `Video`, `Speech`, `Transcription`). Common request fields (`images`, `mask`, `n`, `size`, `aspectRatio`, `seed`, `format`) lower natively or fail with a typed `AIError`; provider-native controls always live under `providerOptions`, never under a modality-specific `options` key.

-Media payloads are always `Media.Asset` (`src/media.ts`). Construct them with `Media.bytes`, `Media.base64`, `Media.url`, `Media.ref`, `Media.fromDataUrl`, or `Media.file`; never introduce a parallel `data: string | Uint8Array` shape. `MediaPart.media`, `ImageRequest.images`/`mask`, `ImageResponse.images`, and the `media` `LLMEvent` all share it. Protocols branch on `asset.source.type` and `asset.kind` and use `ProviderShared.requireInlineMedia` / `inlineRequired` / `mediaUrl` / `mediaReference` and `MediaInput.inlineBytes` / `refID` rather than re-deriving base64 or URL handling.
+Media payloads are always `Media.Asset` (`src/media.ts`). Construct them with `Media.bytes`, `Media.base64`, `Media.url`, `Media.ref`, `Media.fromDataUrl`, or `Media.file`; never introduce a parallel `data: string | Uint8Array` shape. `MediaPart.media`, `ImageRequest.images`/`mask`, `ImageResponse.images`, and the `media` `LLMEvent` all share it. Protocols branch on `asset.source.type` and `asset.kind` and use `ProviderShared.inlineMedia` / `requireInlineMedia` / `mediaUrl` / `MediaInput.refID` rather than re-deriving base64 or URL handling.

 `schema/messages.ts → media.ts → route/executor-service.ts` is an accepted runtime dependency from the schema layer on the executor service tag: `Media.Asset.bytes()` must be able to download `url` sources, and the tag lives in that leaf module precisely so the schema barrel never imports the executor implementation (which imports the schema barrel back). Do not move the tag into `route/executor.ts` or import `route/executor.ts` from `src/schema/*` or `src/media.ts`.

@@ -98,11 +98,11 @@ When a provider supports multiple physical transports, selection remains executi

 Media does not fit the SSE-frames-to-event-state-machine LLM route. `MediaRoute.inline(...)` / `queued(...)` / `stream(...)` (`src/route/media.ts`) compose a `MediaProtocol` kind with `Endpoint` and `Auth` and own the transport plumbing: `http` option merging, URL/query rendering, auth headers, JSON vs multipart encoding, and handing the response back to the protocol. `MediaProtocol.inline` (`src/route/media-protocol.ts`) is `body.from(request)` plus `response.decode(response, context)`; each protocol declares `const route = MediaProtocol.identity({ id, name, provider })` once and decodes through `route.decodeJson` / `route.text` / `route.decodeStarted` so decode failures retain the raw body and HTTP context, raising `route.unsupported(operation, message)` for requests it cannot lower, and passes `route` as the first argument to `MediaProtocol.inline` / `queued` / `stream`. `Generation` (`src/generation.ts`) is the provider-neutral handle for a queued generation over a `GenerationRoute` (`status`, `result`, `cancel`). Image protocol files follow the same section order as LLM protocols and declare unsupported common fields once through the protocol's `unsupported` list.

-`MediaProtocol.queued` is the submit-then-poll kind every video route uses: `start` (body + decode into `{ token, snapshot }`), `status`, `result`, and optional `cancel` (with `activeOnly` when the provider's cancel endpoint deletes finished work, as Runway's does: the route refreshes status first and skips terminal generations), each addressed by a route-owned `token` whose `Schema.Codec` makes it serializable. `MediaRoute.inline` and `MediaRoute.queued` compose the two kinds with `Endpoint` and `Auth`; the queued route decodes the token once at the boundary (`start` output or `resume` input) and closes over it in a token-free `GenerationRoute` (`status`/`result`/`cancel` are plain Effects), so `Generation` never sees the token's shape and only carries the encoded JSON for persistence. Polls reuse the route's auth and deployment headers plus the request's `http` overlay after `start`, and resolve relative paths against the route base URL (provider-issued absolute URLs such as fal's `status_url` pass through). `result` is always its own GET even when the provider returns output inside the status document, so `Generation.await` behaves the same after `start` and after `resume`. `PollContext.auth` carries only what `Auth` added or changed so protocols can hand download credentials to output assets as transient `Media.Asset.headers` (Veo) — never part of `source` or JSON. Status strings map through a per-protocol `STATUS` table via `MediaProtocol.status`; terminal generations without output fail through `output.ended` / `output.contentPolicy` with the provider document on `reason.body`; a `failed` generation maps the provider's error code through a per-protocol `FAILURE` table via `MediaProtocol.failure` so rejected inputs are not reported as retryable `ProviderInternal`. `GenerationAwaitOptions` (`AwaitOptions` in `src/generation.ts`, `{ poll?: Poll }`) is the one options type for `await`, `events`, `Video.generate`, and `Video.stream`.
+`MediaProtocol.queued` is the submit-then-poll kind every video route uses: `start` (body + decode into `{ token, snapshot }`), `status`, `result`, and optional `cancel`, each addressed by a route-owned `token` whose `Schema.Codec` makes it serializable. `MediaRoute.inline` and `MediaRoute.queued` compose the two kinds with `Endpoint` and `Auth`; the queued route decodes the token once at the boundary (`start` output or `resume` input) and closes over it in a token-free `GenerationRoute` (`status`/`result`/`cancel` are plain Effects), so `Generation` never sees the token's shape and only carries the encoded JSON for persistence. Polls reuse the route's auth and deployment headers plus the request's `http` overlay after `start`, and resolve relative paths against the route base URL (provider-issued absolute URLs such as fal's `status_url` pass through). `result` is always its own GET even when the provider returns output inside the status document, so `Generation.await` behaves the same after `start` and after `resume`. `PollContext.auth` carries only what `Auth` added or changed so protocols can hand download credentials to output assets as transient `Media.Asset.headers` (Veo) — never part of `source` or JSON. Status strings map through a per-protocol `STATUS` table via `MediaProtocol.status`; terminal generations without output fail through `output.ended` / `output.contentPolicy` with the provider document on `reason.body`. `GenerationAwaitOptions` (`AwaitOptions` in `src/generation.ts`, `{ poll?: Poll }`) is the one options type for `await`, `events`, `Video.generate`, and `Video.stream`.

 `MediaProtocol.stream` is the incremental kind every speech route uses, with the same discipline as LLM protocols. `MediaRoute.stream` submits the caller's request as `MediaProtocol.Addressed<Request>` (`{ ...request, mode }`, `mode: "generate" | "stream"`), so one provider stays one protocol: `body.from`, the endpoint path, and `frames` read `request.mode` to pick the body, path, and framing. `frames(bytes, context)` returns frames — `Framing.sse`, `Framing.lines`, `Framing.document` (a single-document response shaped like a streamed record), or the raw `bytes` for chunked audio. `initial()` is fresh per-response parser state; `step` folds each frame into it and emits modality events; `finish(state, context)` runs once after the last frame with the request, body, and observed `http` (header-only usage lives there) and emits exactly one terminal event or fails with `route.incomplete()`. Keep parser state to real accumulators and derive anything the request or body determines in `finish`. `generate` runs the same stream and folds it with the modality's `collect`. Request-derived URL parameters go on the body's `query` (array values repeat the parameter), applied before route and caller `http.query`. Decode frames with `route.decodeFrame` and raise stream-time failures with `route.frameError` (the frame stays on `reason.body`); protocols never thread HTTP context, because the route fills `reason.http` on stream errors that lack it. Speech protocols share `protocols/utils/speech-stream.ts` for deltas, timestamps, voice ids, PCM and container descriptions, and the terminal asset.

-Every modality route is the inline | stream | queued union (transcription uses all three: OpenAI and Gemini stream, Deepgram and ElevenLabs are inline, AssemblyAI is queued), every client is `MediaClient.make(Service, { modality, responseEvents })` (`src/media-client.ts`), which dispatches on the route's `kind`, and every model composes through `composeRoute`. fal queue protocols come from `protocols/utils/fal-queue.ts`, bodies are `json`, `multipart`, or `binary` (a raw upload), and a queued protocol that must upload media before submitting implements `start.prepare` (`MediaProtocol.Prepare`; AssemblyAI `/v2/upload`).
+Every modality route is the inline | stream | queued union (transcription uses all three: OpenAI and Gemini stream, Deepgram is inline, AssemblyAI is queued), every client is `MediaClient.make(Service, { modality, responseEvents })` (`src/media-client.ts`), which dispatches on the route's `kind`, and every model composes through `composeRoute`. fal queue protocols come from `protocols/utils/fal-queue.ts`, bodies are `json`, `multipart`, or `binary` (a raw upload), and a queued protocol that must upload media before submitting implements `start.prepare` (`MediaProtocol.Prepare`; AssemblyAI `/v2/upload`).

 ### URL Construction

@@ -112,7 +112,7 @@ For providers where the URL is derived from typed inputs (Azure resource name, B

 ### Provider Facades

-Provider-facing APIs are configured facades over route values. Endpoint/auth/resource/API-version setup happens before model selection, and model selectors accept only a model or deployment id. Media models use per-modality selectors on the same facade (`openai.image(id)`, `.speech(id)`, `.transcription(id)`, `google.video(id)`) that mirror `openai.responses(id)`; the one-word overlap with the request namespace is accepted over a second construction path:
+Provider-facing APIs are configured facades over route values. Endpoint/auth/resource/API-version setup happens before model selection, and model selectors accept only a model or deployment id. Media models use per-modality selectors on the same facade (`openai.image(id)`, later `.video` / `.speech` / `.transcription`) that mirror `openai.responses(id)`; the one-word overlap with the request namespace is accepted over a second construction path:

 ```ts
 const openai = OpenAI.configure({ apiKey, baseURL })
@@ -129,9 +129,8 @@ VercelAIGateway.configure().experimental.evaluation("typesafe-ai/jev")

 OpenRouter reads `OPENROUTER_API_KEY`. Vercel reads `AI_GATEWAY_API_KEY`, then `VERCEL_OIDC_TOKEN`.
 The common API uses `boolean`; System One routes lower it to native `noul`.
-Choice and score answers include `confidence` when the provider returns it, such as
-`response.answers.department.confidence`. Score legends remain available in provider metadata, and
-the provider's rounded probabilities are returned unchanged.
+Choice and score confidence plus score legends remain available in provider metadata, and the
+provider's rounded probabilities are returned unchanged.

 ## Alibaba Cloud Model Studio

@@ -476,18 +475,18 @@ const program = Effect.gen(function* () {
 Common fields are portable in shape, not in support. Unsupported fields fail with a typed `AIError` before any network
 call rather than being dropped, so check this table before swapping only the `model`:

-| Provider              | `n` | `size`    | `aspectRatio` | `seed` | `format` | `images`                         | `mask`              |
-| --------------------- | --- | --------- | ------------- | ------ | -------- | -------------------------------- | ------------------- |
-| OpenAI                | ✓¹  | ✓         | ✗             | ✗      | ✓        | ✓                                | ✓                   |
-| Google (Gemini)       | 1   | ✗         | ✓             | ✓      | ✗        | ✓ (no public URLs)               | ✗                   |
-| xAI                   | ✓   | ✗         | ✓             | ✗      | ✗        | ✓                                | ✗                   |
-| Z.ai                  | ✗   | ✓         | ✗             | ✗      | ✗        | ✗                                | ✗                   |
-| Meta                  | ✓   | ✓ (hint)  | ✗             | ✗      | ✓        | ✓                                | ✗                   |
-| Black Forest Labs     | 1   | per model | per model     | ✓      | ✓        | per model (1–8)                  | `flux-pro-1.0-fill` |
-| fal                   | ✓   | per model | per model     | ✓      | ✓        | 1 (several on `/edit`, `/multi`) | ✓                   |
-| Replicate             | ✗   | ✗         | ✗             | ✗      | ✗        | ✗ (use `providerOptions`)        | ✗                   |
-| Stability `image`     | 1   | ✗         | ✓             | ✓      | ✓        | 1 (not on `core`)                | ✗                   |
-| Stability `upscale()` | ✗   | ✗         | ✗             | ✓      | ✓        | exactly 1 (required)             | ✗                   |
+| Provider              | `n` | `size`    | `aspectRatio` | `seed` | `format` | `images`                  | `mask`              |
+| --------------------- | --- | --------- | ------------- | ------ | -------- | ------------------------- | ------------------- |
+| OpenAI                | ✓¹  | ✓         | ✗             | ✗      | ✓        | ✓                         | ✓                   |
+| Google (Gemini)       | 1   | ✗         | ✓             | ✓      | ✗        | ✓ (no public URLs)        | ✗                   |
+| xAI                   | ✓   | ✗         | ✓             | ✗      | ✗        | ✓                         | ✗                   |
+| Z.ai                  | ✗   | ✓         | ✗             | ✗      | ✗        | ✗                         | ✗                   |
+| Meta                  | ✓   | ✓ (hint)  | ✗             | ✗      | ✓        | ✓                         | ✗                   |
+| Black Forest Labs     | 1   | per model | per model     | ✓      | ✓        | per model (1–8)           | `flux-pro-1.0-fill` |
+| fal                   | ✓   | per model | per model     | ✓      | ✓        | 1 (several on `/edit`)    | ✓                   |
+| Replicate             | ✗   | ✗         | ✗             | ✗      | ✗        | ✗ (use `providerOptions`) | ✗                   |
+| Stability `image`     | 1   | ✗         | ✓             | ✓      | ✓        | 1 (not on `core`)         | ✗                   |
+| Stability `upscale()` | ✗   | ✗         | ✗             | ✓      | ✓        | exactly 1 (required)      | ✗                   |

 ✓ lowers natively; ✗ fails whenever the field is set (including `n: 1`); `1` means `n > 1` fails. ¹ `Image.stream` on OpenAI generates one image. fal
 rejects `size` and `aspectRatio` together; which one a fal or BFL model takes depends on the model.
@@ -622,7 +621,8 @@ persist the bytes promptly if they must remain available.
 ### Partial images

 OpenAI's GPT image models stream previews. `Image.stream` sends `stream: true` with `partialImages` (0–3, default 2)
-and emits `image-partial` events before each final `image`; `Image.generate` keeps the plain JSON request:
+and emits `image-partial` events before each final `image`; `Image.generate` keeps the plain JSON request.
+`dall-e-*` models do not stream and fail typed:

 ```ts
 import { Stream } from "effect"
@@ -699,7 +699,7 @@ const program = Effect.gen(function* () {
 })
 ```

-The hosted result is represented as a provider-executed tool call and a tool result whose content carries the generated image as a file. Gemini image-capable models instead emit a first-class `media` `LLMEvent` for inline image output (`response.message` then carries a `media` part). Retaining `response.message` preserves the generated image for continuation on both routes.
+The hosted result is represented as a provider-executed tool call and tool result, and the generated image is also emitted as a first-class `media` `LLMEvent` (`response.message` then carries a `media` part). Gemini image-capable models emit the same `media` event for inline image output. Retaining `response.message` preserves the generated image for continuation on both routes.

 ## Video generation

@@ -753,10 +753,7 @@ const events = Video.stream({ model: Runway.configure({ apiKey }).video("gen4.5"

 Status polls, result fetches, cancels, and asset downloads all run through the same request executor with the route's
 auth. `Generation.await` and `Generation.events` fail with a
-`Timeout` reason when `poll.timeout` (default 10 minutes) elapses. Status polls and result fetches retry transient
-failures (rate limits, provider 5xx, network errors) with backoff that honors `retry-after`, always within
-`poll.timeout`; submits and cancels never retry. Interrupting a wait (or aborting its `signal`) does not cancel the
-provider job, which keeps running and billing: call `cancel()` to stop it. Failed,
+`Timeout` reason when `poll.timeout` (default 10 minutes) elapses. Failed,
 cancelled, and expired generations fail typed with the provider's terminal document on `reason.body`; moderation
 outcomes (Veo `raiMediaFilteredReasons`, xAI `respect_moderation`, Runway `SAFETY.*` codes) surface as `notices` when
 a video is still returned and as a `ContentPolicy` reason when nothing is.
@@ -777,9 +774,7 @@ Provider notes:
 The promise client exposes the same surface: `ai.video.start(...)` resolves to a handle with `await`, `events`,
 `result`, `refresh`, `cancel`, and `token`; `ai.video.generate`, `ai.video.resume(model, token)`, and
 `ai.video.stream` mirror the Effect API. The handle's `status` and `progress` are a snapshot from when it was
-created; `refresh()` resolves to a new handle. Every promise method and stream accepts `{ signal }`: like `fetch`,
-aborting rejects the Promise or throws from the `for await` loop with `signal.reason` (an `AbortError` `DOMException`
-unless `abort(reason)` passed one), while `break` stops a stream without throwing.
+created; `refresh()` resolves to a new handle.

 ```ts
 import { ai } from "@opencode/ai/promise"
@@ -845,10 +840,9 @@ Provider notes:
 - **OpenAI** streams over SSE (`stream_format: "sse"`), which is also the only place it reports token usage; `tts-1`
  and `tts-1-hd` do not support SSE and stream the raw audio body instead. `pcm` is 24 kHz 16-bit mono. `language`
  and `timestamps` are not supported.
- **Gemini TTS** returns the provider's default output: WAV for Gemini 3.8 TTS `generate`, raw 16-bit PCM
-  (`audio/L16;codec=pcm;rate=24000`) otherwise. `pcm` is the only explicit `format` it accepts, and it fails typed on
-  Gemini 3.8 `generate`; the route never wraps PCM as WAV. Style is directed in the text, so `instructions` and
-  `speed` fail typed. Only `gemini-3.1-flash-tts-preview` and later support streaming. Two-speaker audio goes through
+- **Gemini TTS** returns raw 16-bit PCM only (`audio/L16;codec=pcm;rate=24000`), so any `format` other than `pcm`
+  fails typed; wrap the samples yourself. Style is directed in the text, so `instructions` and `speed` fail typed.
+  Only `gemini-3.1-flash-tts-preview` and later support streaming. Two-speaker audio goes through
  `providerOptions.speechConfig.multiSpeakerVoiceConfig`.
 - **ElevenLabs** requires `voice` (the path voice id) and authenticates with `xi-api-key`. `format` maps to the
  `output_format` query parameter (`mp3_44100_128`, `pcm_24000`, `wav_24000`, `opus_48000_64`);
@@ -877,12 +871,11 @@ for await (const event of ai.speech.stream({ model, text: "Hello from OpenCode."
 ## Transcription

 Transcription (speech-to-text) is the one modality whose providers use every route kind: OpenAI and Gemini stream,
-Deepgram and ElevenLabs answer inline, and AssemblyAI is queued. `Transcription.generate` and `Transcription.stream`
-work on all of them; `Transcription.start` / `resume` return a `Generation` on queued routes and fail with
-`UnsupportedOperation` elsewhere. Models come from `.transcription(...)` selectors on the `OpenAI`, `Google`,
-`Deepgram`, `ElevenLabs`, and `AssemblyAI` facades. Common fields (`language`, `prompt`,
-`timestamps: "none" | "segment" | "word"`, `diarize`, `speakers`) lower natively or fail with a typed `AIError` before
-any network call; a route may return more than asked.
+Deepgram answers inline, and AssemblyAI is queued. `Transcription.generate` and `Transcription.stream` work on all of
+them; `Transcription.start` / `resume` return a `Generation` on queued routes and fail with `UnsupportedOperation`
+elsewhere. Models come from `.transcription(...)` selectors on the `OpenAI`, `Google`, `Deepgram`, and `AssemblyAI`
+facades. Common fields (`language`, `prompt`, `timestamps: "none" | "segment" | "word"`, `diarize`, `speakers`) lower
+natively or fail with a typed `AIError` before any network call; a route may return more than asked.

 ```ts
 import { Console, Effect, Stream } from "effect"
@@ -894,7 +887,7 @@ const openai = OpenAI.configure({ apiKey: process.env.OPENAI_API_KEY })
 const program = Effect.gen(function* () {
  const audio = yield* Media.file("./call.mp3")

-  // Speaker-labelled segments; labels are provider-native strings ("A", "0", "spk:0", "speaker_0").
+  // Speaker-labelled segments; labels are provider-native strings ("A", "0", "spk:0").
  const response = yield* Transcription.generate({
    model: Deepgram.configure({ apiKey }).transcription("nova-3"),
    audio,
@@ -904,7 +897,7 @@ const program = Effect.gen(function* () {
  response.text // "Hello from OpenCode."
  response.segments // [{ text, startSeconds, endSeconds, speaker: "0" }]
  response.words // [{ text, startSeconds, endSeconds, speaker, confidence }]
-  response.language // the provider's own value, lowercased ("en", "eng", "english", "en_us")
+  response.language // the provider's own value, lowercased ("en", "english", "en_us")

  // Text deltas as the model transcribes, then one finish carrying the whole transcript.
  yield* Transcription.stream({ model: openai.transcription("gpt-4o-mini-transcribe"), audio }).pipe(
@@ -928,12 +921,7 @@ Provider notes:
 - **OpenAI** takes inline audio only; `diarize` needs `gpt-4o-transcribe-diarize`, timestamps need `whisper-1`, and `whisper-1` does not stream.
 - **Gemini** needs a transcribe model (`gemini-3.5-transcribe`); `prompt` and `speakers` fail typed.
 - **Deepgram** detects the language unless `language` is set; vocabulary goes in `providerOptions.keyterm`.
- **ElevenLabs** (`scribe_v2`) uploads inline audio as the multipart `file` and sends a URL as `source_url`. Words
-  always carry timestamps, and segments are speaker turns, so `diarize`, `timestamps: "segment"`, or `speakers` turns
-  on diarization. `speakers` is an upper bound (`num_speakers`); `prompt` fails typed (vocabulary goes in
-  `providerOptions.keyterms`), as do webhook delivery and per-channel output (`use_multi_channel` without
-  `multichannel_output_style: "combined"`).
- **AssemblyAI** uploads inline audio before submitting and treats `speakers` as the exact speaker count.
+- **AssemblyAI** uploads inline audio before submitting and is the only route that accepts `speakers`.

 The promise client mirrors the Effect API:

@@ -956,7 +944,6 @@ const transcript = await generation.await({ poll: { interval: 3_000 } })
 - **`ImageClient`** — Effect service and layer for image execution, parallel to `LLMClient`.
 - **`Media`** — the shared asset type (`Media.Asset`, `Media.Source`) and constructors used by messages, tool results, and media requests.
 - **`Generation`** — provider-neutral handle for an in-flight media generation (`await`, `refresh`, `cancel`, `events`) used by queued media routes.
- **`Video.request` / `generate` / `stream` / `start` / `resume`** — queued video generation through a provider-neutral request; `VideoClient` is its Effect service and layer.
 - **`Speech.request` / `Speech.generate` / `Speech.stream`** — text-to-speech through a provider-neutral request; `SpeechClient` is its Effect service and layer.
 - **`Transcription.request` / `generate` / `stream` / `start` / `resume`** — speech-to-text over inline, streaming, and queued routes; `TranscriptionClient` is its Effect service and layer.
 - **`AIClient.layer` / `AIClient.layerWith(executor)`** — every modality client plus the request executor in one layer.
@@ -40,7 +40,7 @@ The design below is derived from a survey of the raw provider APIs (OpenAI, Gemi

 ### Model selection

-A model value is built as `OpenAI.configure({ apiKey }).responses("gpt-5")` or `.image("gpt-image-2")`: `configure` fixes credentials, endpoint, and defaults; the selector fixes which of the provider's APIs to hit and binds the typed `providerOptions` generic. Media follows the same shape with one selector per modality — `.image(id)`, `.video(id)`, `.speech(id)`, `.transcription(id)` on the facades that offer each — mirroring `openai.responses(id)`. `Image.request` accepts `ImageModel` only, exactly as `LLM.request` accepts `LanguageModel`.
+A model value is built as `OpenAI.configure({ apiKey }).responses("gpt-5")` or `.image("gpt-image-2")`: `configure` fixes credentials, endpoint, and defaults; the selector fixes which of the provider's APIs to hit and binds the typed `providerOptions` generic. Media follows the same shape with one selector per modality — `openai.image(id)` today, `.video(id)` / `.speech(id)` / `.transcription(id)` as those modalities land — mirroring `openai.responses(id)`. `Image.request` accepts `ImageModel` only, exactly as `LLM.request` accepts `LanguageModel`.

 ```ts
 import { OpenAI, Google } from "@opencode/ai/providers"
@@ -135,8 +135,8 @@ Effect.gen(function* () {
 })
 ```

-`size` and `aspectRatio` are not interchangeable; each route rejects fields it cannot lower — see the portability table
-in the README's Image generation section.
+`size` and `aspectRatio` are not interchangeable; each route rejects fields it cannot lower — see the README's Image
+portability matrix.

 Editing is not a separate function; `images`/`mask` on the request select the edit path in the route (OpenAI `/images/edits`, Gemini multimodal parts, xAI `/images/edits`). Routes that cannot honor `mask` fail with `Unsupported`.

@@ -166,8 +166,8 @@ Effect.gen(function* () {

  // Simple: wait for it.
  const response = yield* Video.generate(request, { poll: { interval: "10 seconds", timeout: "10 minutes" } })
-  response.video                                     // Media.Asset: url (expiresAt on Veo and Runway; transient `headers` for Veo downloads)
-  response.usage                                     // credits on Runway; the other three report none (xAI's usage.cost_in_usd_ticks is not decoded)
+  response.video                                     // Media.Asset: url with expiresAt (+ transient `headers` for Veo downloads)
+  response.usage                                     // credits on Runway; the other three report none
  response.notices                                   // Veo raiMediaFilteredReasons → filtered, xAI respect_moderation → moderated
  yield* response.video.materialize()                // pull bytes before the URL expires

@@ -175,7 +175,7 @@ Effect.gen(function* () {
  const generation = yield* Video.start(request)     // Generation<VideoResponse>
  generation.id; generation.status; generation.progress; generation.position; generation.token
  yield* generation.await({ poll })                  // VideoResponse
-  yield* generation.cancel()                         // fal PUT cancel_url, Runway DELETE /tasks/{id}; Veo and xAI succeed without a request
+  yield* generation.cancel()                         // fal PUT cancel_url, Runway DELETE /tasks/{id}; no-op for Veo and xAI

  // Resume from another process. The token is validated against the route's codec and refreshed once. It carries no
  // route identity, so persist the provider and model ID alongside it: `resume` needs the model.
@@ -188,11 +188,10 @@ Effect.gen(function* () {

 Tokens are route-owned JSON: Veo `{ operation }`, xAI `{ requestID }`, Runway `{ taskID }`, fal
 `{ requestID, statusURL, responseURL, cancelURL }` (fal's follow-up URLs are authoritative and absolute). Common-field
-lowering per provider: Veo takes inline media only, rejects `audio: false` and `n > 1`, and requires `frames.first`
-when `frames.last` is set; xAI rejects `n`, `seed`, and `negativePrompt` and routes a `video` input to edits or
-(`providerOptions.mode: "extend"`) extensions; fal rejects `n`, plus `durationSeconds`, `references`, and `frames.last`
-because the field names and enums differ per model; Runway passes `aspectRatio` through as its pixel `ratio` and
-rejects `n`.
+lowering per provider: Veo takes inline media only and rejects `audio: false` and `n > 1`; xAI rejects `seed` and
+`negativePrompt` and routes a `video` input to edits or (`providerOptions.mode: "extend"`) extensions; fal rejects
+`durationSeconds`, `references`, and `frames.last` because the field names and enums differ per model; Runway passes
+`aspectRatio` through as its pixel `ratio` and rejects `n`.

 Deferred: `Video.complete(model, token, webhook)` (finish from a webhook payload without polling) and provider poll
 hints (none of the four providers emit one). Later providers: Luma, Kling, MiniMax, Replicate.
@@ -242,12 +241,10 @@ name→id resolution. Multi-speaker (Gemini `speechConfig.multiSpeakerVoiceConfi
 `opus_48000_64`, Cartesia `{ container, encoding, sample_rate }`, Deepgram `encoding`+`container`) and declares the
 asset's media type rather than sniffing, because headerless PCM can look like an MPEG frame sync. Headerless PCM
 always carries `info.encoding`, `info.sampleRate`, and `info.channels`; its media type is the provider's declaration
-(Gemini `audio/L16;codec=pcm;rate=24000`, Deepgram's `content-type`) or `audio/pcm`. Gemini's asset follows the
-provider's declared type: WAV for Gemini 3.8 TTS `generate`, headerless PCM otherwise. The route never wraps PCM as WAV,
-so `pcm` is the only explicit `format` it accepts, and not on Gemini 3.8 `generate`. Every `format` value a route cannot
-produce (unknown to it, a container on Cartesia SSE, WAV on an ElevenLabs stream, anything but `pcm` on Gemini, `pcm` on
-Gemini 3.8 `generate`) fails the same way as an unsupported field: `UnsupportedOperation` with
-`operation: "media.format"`.
+(Gemini `audio/L16;codec=pcm;rate=24000`, Deepgram's `content-type`) or `audio/pcm`. Gemini returns PCM only, so any
+other `format` is rejected rather than wrapped as WAV by the route. Every `format` value a route cannot produce (unknown
+to it, a container on Cartesia SSE, WAV on an ElevenLabs stream, anything but PCM on Gemini) fails the same way as an
+unsupported field: `UnsupportedOperation` with `operation: "media.format"`.

 **Timestamps.** `timestamps: true` on the request asks for alignment. ElevenLabs selects the `with-timestamps`
 endpoints (character-level, NDJSON when streaming); Cartesia sets `add_timestamps` on `/tts/sse` (word-level; a
@@ -270,8 +267,8 @@ Deferred: `Speech.session(...)` — input-streaming TTS where text arrives incre
 #### Transcription (STT)

 Shipped as the second half of phase 3 (`src/transcription.ts`, `src/transcription-client.ts`, protocols
-`openai-transcription`, `google-transcription`, `deepgram-transcription`, `elevenlabs-transcription`,
-`assemblyai-transcription`; new `AssemblyAI` facade).
+`openai-transcription`, `google-transcription`, `deepgram-transcription`, `assemblyai-transcription`; new `AssemblyAI`
+facade).

 ```ts
 const request = Transcription.request({
@@ -280,7 +277,7 @@ const request = Transcription.request({
  language: "en",                                  // provider-native passthrough
  timestamps: "segment",                           // none | segment | word
  diarize: true,
-  speakers: 2,                                     // speaker count (AssemblyAI exact, ElevenLabs maximum)
+  speakers: 2,                                     // expected count, hint only (AssemblyAI)
  providerOptions: { known_speaker_names: ["agent"] },
 })

@@ -294,11 +291,10 @@ yield* Transcription.resume(model, token)
 Transcription is the first modality whose providers span all three protocol kinds, and it needed no fourth kind.
 Every `MediaRoute` now carries its `kind`; `TranscriptionRoute` is the union of the inline, stream, and queued routes;
 `TranscriptionModel.fromRoute` is overloaded per protocol kind (arity picks the overload: `<Options>`,
-`<Options, Frame, State>`, `<Options, Token>`) and composes through the shared `composeRoute` (`src/media-model.ts`),
-which picks `MediaRoute.inline` / `stream` / `queued`; and `TranscriptionClient`, like every modality client, is
-`MediaClient.make` (`src/media-client.ts`), which dispatches on `route.kind`. `generate` on a queued route is `start`
-then `await`; `stream` on an inline route is the response as a single `finish`, and on a queued route it is the status
-observations followed by `finish`. `start` / `resume` on a non-queued route fail with `UnsupportedOperation` (`transcription.start`). The
+`<Options, Frame, State>`, `<Options, Token>`) and composes through `MediaRoute.inline` / `stream` / `queued`; and
+`TranscriptionClient` dispatches on `route.kind`. `generate` on a queued route is `start` then `await`; `stream` on an
+inline route is the response as a single `finish`, and on a queued route it is the status observations followed by
+`finish`. `start` / `resume` on a non-queued route fail with `UnsupportedOperation` (`transcription.start`). The
 `finish` event carries the whole transcript (text, segments, words, language, duration, usage), so the stream route's
 `collect` is just "take `finish`".

@@ -308,23 +304,16 @@ upload); `packages/ai/AGENTS.md` (Media Routes) describes both.
 Settled rules:

 - **Timestamps.** A granularity the selected route or model cannot produce fails as `UnsupportedOperation`
-  (`media.timestamps`), following Speech; a route that returns more than asked (Deepgram, ElevenLabs, and AssemblyAI
-  always return words) is not stripped. Segments always carry start and end times: Gemini times each transcription part from its
+  (`media.timestamps`), following Speech; a route that returns more than asked (Deepgram and AssemblyAI always return
+  words) is not stripped. Segments always carry start and end times: Gemini times each transcription part from its
  word offsets, so segment timestamps and diarization also request word offsets there.
 - **Diarization.** `diarize` means segments (and words, where the provider labels them) carry `speaker`. Labels are
-  provider-native strings — OpenAI `A` or a known speaker name, Deepgram `0`, Gemini `spk:0`, AssemblyAI `A`,
-  ElevenLabs `speaker_0` — with no cross-provider speaker model. `speakers` is the number of speakers to label:
-  AssemblyAI (`speakers_expected`) treats it as an exact constraint rather than a hint, and ElevenLabs
-  (`num_speakers`) as the maximum. Both turn on diarization for it; the other routes reject it.
- **Segments from words.** ElevenLabs returns only a token list (`word`, `spacing`, `audio_event`), so its segments
-  are speaker turns: consecutive words and spacing with one `speaker_id`, text joined from the provider's own spacing
-  tokens. `words` drops spacing and audio events. Segments therefore need diarization, which `timestamps: "segment"`
-  turns on, as AssemblyAI's utterances need speaker labels.
+  provider-native strings — OpenAI `A` or a known speaker name, Deepgram `0`, Gemini `spk:0`, AssemblyAI `A` — with no
+  cross-provider speaker model. `speakers` is a hint; only AssemblyAI (`speakers_expected`) accepts it.
 - **Language** is passed through (`language`, OpenAI `gpt-transcribe` `languages[]`, Gemini `languageCodes`,
-  AssemblyAI and ElevenLabs `language_code`). `response.language` is the provider's own value, lowercased but not
-  normalized: an ISO code on most routes (AssemblyAI's detection returns `en`, ElevenLabs ISO 639-3 `eng`), `english`
-  from whisper-1. Deepgram and AssemblyAI assume English unless asked to detect, so a missing `language` enables their
-  detection.
+  AssemblyAI `language_code`). `response.language` is the provider's own value, lowercased but not normalized: an
+  ISO code on most routes, `english` from whisper-1, `en_us` from AssemblyAI. Deepgram and AssemblyAI assume English
+  unless asked to detect, so a missing `language` enables their detection.
 - **Gemini** requires a transcribe model; other model ids fail with `UnsupportedOperation` before the call, because
  general models ignore `audioTranscriptionConfig` and answer conversationally. Streamed chunks carry whole speaker
  turns (one part per turn), which join with a space.
@@ -334,15 +323,14 @@ Settled rules:

 | Provider | Kind | Audio input | `timestamps` | `diarize` | Unsupported | Usage |
 |---|---|---|---|---|---|---|
-| OpenAI | stream (`stream: true` in `stream` mode; `whisper-1` ignores `stream`, so it emits only `finish`) | multipart `file` (inline only) | `whisper-1` (`verbose_json`); diarize model: `segment` | `gpt-4o-transcribe-diarize` (`diarized_json`) | `speakers`; `prompt` on the diarize model | `tokens` or `seconds` |
+| OpenAI | stream (`stream: true` in `stream` mode) | multipart `file` (inline only) | `whisper-1` (`verbose_json`); diarize model: `segment` | `gpt-4o-transcribe-diarize` (`diarized_json`) | `speakers`; `prompt` on the diarize model; streaming on `whisper-1` | `tokens` or `seconds` |
 | Gemini | stream (`generateContent` / `streamGenerateContent`) | `inlineData` or Gemini Files `fileData` | `audioTranscriptionConfig.wordTimestamp` | `audioTranscriptionConfig.diarization` | `prompt`, `speakers` | `tokens` |
 | Deepgram | inline | raw body, or JSON `{ url }` | words always; `segment` → `utterances` | `diarize_model=latest` + `utterances` | `prompt`, `speakers` | `seconds` (`metadata.duration`) |
-| ElevenLabs | inline | multipart `file`, or `source_url` | words always; `segment` → `diarize` (speaker turns) | `diarize` | `prompt`; `webhook`, per-channel `use_multi_channel` | `seconds` (`audio_duration_secs`) |
 | AssemblyAI | queued (upload → submit → poll) | `/v2/upload` then `audio_url`, or a URL | words always; `segment` → `speaker_labels` | `speaker_labels` | — | `seconds` (`audio_duration`) |

 Deferred: `Transcription.session(...)` — realtime STT over WebSocket (Deepgram live, AssemblyAI streaming, ElevenLabs
 realtime, OpenAI realtime transcription) — is the same future scoped `session` shape as input-streaming TTS and ships
-with the realtime work in phase 5.
+with the realtime work in phase 5. ElevenLabs Scribe is not implemented yet.

 ### `Generation` — shared async execution

@@ -365,11 +353,7 @@ GenerationAwaitOptions = { poll?: Poll }
 Poll = { interval?: Duration; timeout?: Duration }
 ```

-`Generation` is not video-specific. Image routes on BFL, fal, Replicate, and Stability `upscale()` are queued; `Image.start` exists for them. A route declares itself `inline` or `queued`; `generate` on a queued route is `start` then `await`.
-
-Status polls and result reads retry transient failures (rate limits, provider 5xx, and transport errors, classified by the same `isRetryable` the Session runner uses) inside `MediaRoute.queued`. Only the HTTP exchange retries, never the decoded document: a terminal `failed` generation also surfaces as `ProviderInternal` and must not be re-read. Gaps grow exponentially from 1s with jitter, up to 30s each, honoring a provider `retry-after` up to that cap, for at most 8 retries. `await`, `events`, and `Video.stream` cut retries off at `poll.timeout` and fail with `Timeout`, so retries never extend the caller's deadline; a direct `result()` or `resume` read is bounded by the retry cap alone. `start` and `cancel` never retry: a repeated submit can start and bill a second job. The policy is internal; there is no option for it.
-
-Interrupting `await`, `events`, or `Video.stream` (or aborting the promise API's `signal`) stops waiting only. The provider job keeps running and billing; call `cancel()` explicitly to stop it.
+`Generation` is not video-specific. Image routes on BFL, fal, and Replicate are queued; `Image.start` exists for them. A route declares itself `inline` or `queued`; `generate` on a queued route is `start` then `await`.

 ### Usage

@@ -412,19 +396,18 @@ for await (const event of ai.llm.stream(request)) { … }
 await ai.dispose()
 ```

-Streams become `AsyncIterable` via `Stream.toAsyncIterable`. `AIError` is thrown as-is. Aborting an `AbortSignal` interrupts the work and, like `fetch`, rejects the Promise or throws from the stream with `signal.reason` instead of ending the stream as if complete. Nothing in `src/*` except this entrypoint knows about promises.
+Streams become `AsyncIterable` via `Stream.toAsyncIterable`. `AIError` is thrown as-is. `AbortSignal` maps to interruption. Nothing in `src/*` except this entrypoint knows about promises.

 ### Providers

-Existing facades gain per-modality selectors; the modality routes each facade provides (*italics* are not
-implemented):
+Existing facades gain per-modality selectors; the modality routes each facade provides:

 | Facade | llm | image | video | speech | transcription | other |
 |---|---|---|---|---|---|---|
-| `OpenAI` | responses (default), chat | Images API (stream) | *Sora skipped (decision 8)* | ✓ | ✓ | |
+| `OpenAI` | responses (default), chat | Images API (stream) | Sora (deprecated 2026-09-24) | ✓ | ✓ | |
 | `Google` | Gemini | Gemini-native | Veo | Gemini TTS | `gemini-3.5-transcribe` | |
 | `XAI` | ✓ | ✓ | ✓ | | | |
-| `ElevenLabs` | | | | ✓ | Scribe | *soundEffect, music (phase 5)* |
+| `ElevenLabs` | | | | ✓ | Scribe | soundEffect, music |
 | `Cartesia` | | | | ✓ | | |
 | `Deepgram` | | | | Aura | ✓ | |
 | `Fal` | | ✓ (queued) | ✓ | | | |
@@ -433,7 +416,7 @@ implemented):
 | `Replicate` | | ✓ (queued) | | | | |
 | `Stability` | | `image` (inline), `upscale()` (queued) | | | | |
 | `Runway` | | | ✓ | | | |
-| `Luma`, `Kling`, `MiniMax` | | *deferred* | *deferred* | | | |
+| `Luma`, `Kling`, `MiniMax` | | per provider | | | | |

 New facades follow the existing one-file-per-provider rule. The facade selector is the public path for media models; modality-specific package entrypoints (for example `@opencode/ai/providers/openai/images`) are deferred until Core has a modality-aware model resolver.

@@ -477,7 +460,7 @@ Foundation + Image ship together as the reference implementation, serially. Vide

 1. **Foundation** — per-modality selectors, `Media`, `Generation`, `Poll`, `Usage` union, `MediaProtocol` kinds, `@opencode/ai/promise` with `llm` + `image`. Port the five existing image protocols onto it. Unify `MediaPart` and add the `media` LLM event (fixes Gemini image output being dropped).
 2. **Video** — ✅ Veo, xAI, fal, Runway shipped (`MediaProtocol.queued`, `Video.start/generate/resume/stream`, promise `ai.video`). Deferred: `Video.complete` (webhooks), Luma, Kling, MiniMax, Replicate.
-3. **Speech + Transcription** — ✅ Speech: OpenAI, Gemini TTS, ElevenLabs, Cartesia, Deepgram shipped (`MediaProtocol.stream`, `Speech.generate/stream`, promise `ai.speech`). ✅ Transcription: OpenAI, Gemini, Deepgram, ElevenLabs Scribe, AssemblyAI shipped across all three route kinds (`Transcription.generate/stream/start/resume`, promise `ai.transcription`). Deferred: `Speech.session` and `Transcription.session` (WebSocket streaming).
+3. **Speech + Transcription** — ✅ Speech: OpenAI, Gemini TTS, ElevenLabs, Cartesia, Deepgram shipped (`MediaProtocol.stream`, `Speech.generate/stream`, promise `ai.speech`). ✅ Transcription: OpenAI, Gemini, Deepgram, AssemblyAI shipped across all three route kinds (`Transcription.generate/stream/start/resume`, promise `ai.transcription`). Pending: ElevenLabs Scribe. Deferred: `Speech.session` and `Transcription.session` (WebSocket streaming).
 4. **Image queued routes and partials** — ✅ BFL, fal, Replicate, and Stability creative upscale queued; Stability generate inline; OpenAI `partial_images` streaming (`image-partial` restored). Imagen dropped: shut down on the Gemini API and discontinued on Vertex (2026-06-30). Deferred: Stability's synchronous edit and fast/conservative upscale endpoints.
 5. **Later** — ElevenLabs music/SFX, Lyria, `Speech.session` / `Transcription.session`, realtime.

@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "name": "@opencode/ai",
  "type": "module",
  "license": "MIT",
@@ -63,7 +63,6 @@ export const ChoiceAnswer = Schema.Struct({
  type: Schema.Literal("choice"),
  choice: Schema.String,
  probabilities: Schema.optional(Schema.Record(Schema.String, Probability)),
-  confidence: Schema.optional(Probability),
 })
 export type ChoiceAnswer = Schema.Schema.Type<typeof ChoiceAnswer>

@@ -71,7 +70,6 @@ export const ScoreAnswer = Schema.Struct({
  type: Schema.Literal("score"),
  score: Schema.Number,
  probabilities: Schema.optional(Schema.Record(Schema.String, Probability)),
-  confidence: Schema.optional(Probability),
 })
 export type ScoreAnswer = Schema.Schema.Type<typeof ScoreAnswer>

@@ -94,7 +92,6 @@ export type AnswerFor<Question extends EvaluationQuestion> = Question extends {
      readonly type: "choice"
      readonly choice: Extract<keyof Criteria, string>
      readonly probabilities?: Readonly<Record<Extract<keyof Criteria, string>, number>>
-      readonly confidence?: number
    }
  : Question extends { readonly type: "score" }
    ? ScoreAnswer
@@ -142,37 +142,32 @@ export const model = <Options extends EvaluationOptions = EvaluationOptions>(cfg
            Effect.mapError((cause) => fail("System One returned an invalid response", cause, text)),
          )

+          const confidence: Record<string, number> = {}
          const legend: Record<string, Record<string, Schema.Json>> = {}
          const answers = Object.fromEntries(
            Object.entries(data.answers).map(([id, answer]): [string, EvaluationAnswer] => {
              if (answer.type === "noul") return [id, { type: "boolean", probability: answer.noul }]
              if (answer.type === "choice") {
+                if (answer.confidence !== undefined) confidence[id] = answer.confidence
                return [
                  id,
                  {
                    type: "choice",
                    choice: answer.choice,
                    probabilities: answer.probabilities,
-                    ...(answer.confidence === undefined ? {} : { confidence: answer.confidence }),
                  },
                ]
              }
+              if (answer.confidence !== undefined) confidence[id] = answer.confidence
              if (answer.legend !== undefined) legend[id] = answer.legend
-              return [
-                id,
-                {
-                  type: "score",
-                  score: answer.score,
-                  probabilities: answer.probabilities,
-                  ...(answer.confidence === undefined ? {} : { confidence: answer.confidence }),
-                },
-              ]
+              return [id, { type: "score", score: answer.score, probabilities: answer.probabilities }]
            }),
          )
          const meta = {
            ...(data.id === undefined ? {} : { responseId: data.id }),
            ...(data.provider === undefined ? {} : { provider: data.provider }),
            ...data.provider_metadata?.[cfg.providerMetadataKey],
+            ...(Object.keys(confidence).length === 0 ? {} : { confidence }),
            ...(Object.keys(legend).length === 0 ? {} : { legend }),
          }
          return new EvaluationResponse({
@@ -53,8 +53,6 @@ export type Event = Observation | { readonly type: "generation-finished"; readon

 const TERMINAL: ReadonlySet<Status> = new Set(["completed", "failed", "cancelled", "expired"])

-export const isTerminal = (status: Status) => TERMINAL.has(status)
-
 export class Generation<Response> {
  readonly id: string
  readonly status: Status
@@ -83,7 +81,7 @@ export class Generation<Response> {
  }

  get terminal() {
-    return isTerminal(this.status)
+    return TERMINAL.has(this.status)
  }

  refresh(): Effect.Effect<Generation<Response>, AIError> {
@@ -102,7 +100,7 @@ export class Generation<Response> {
    return settled.pipe(
      // Non-completed terminal states also go through `result` so the route can surface its provider failure body.
      Effect.flatMap((generation) => generation.result()),
-      Effect.timeoutOrElse({ duration: timeout, orElse: () => timeoutError(this.id, timeout) }),
+      Effect.timeoutOrElse({ duration: timeout, orElse: () => this.timeoutError(timeout) }),
    )
  }

@@ -111,10 +109,9 @@ export class Generation<Response> {
  }

  /**
-   * Status observations as a stream, ending after the first terminal observation. Each poll and each sleep between polls
-   * is bounded by the time remaining until `poll.timeout`, so a hung status request or a long interval fails the stream at
-   * the deadline instead of stalling it. (`Stream.interruptWhen` would express this directly but deadlocks under
-   * `TestClock` when the source completes while the timer sleeps.)
+   * Status observations as a stream, ending after the first terminal observation. Each poll is bounded by the time
+   * remaining until `poll.timeout`, so a hung status request fails the stream instead of stalling it. (`Stream.interruptWhen`
+   * would express this directly but deadlocks under `TestClock` when the source completes while the timer sleeps.)
   */
  events(options?: AwaitOptions): Stream.Stream<Event, AIError> {
    if (this.terminal) return Stream.make(this.event())
@@ -123,13 +120,17 @@ export class Generation<Response> {
      Clock.currentTimeMillis.pipe(
        Effect.map((start) => {
          const deadline = start + Duration.toMillis(timeout)
-          const refresh = within(this.refresh(), this.id, timeout, deadline)
-          const schedule = this.schedule(options?.poll).pipe(
-            Schedule.modifyDelay((meta) =>
-              Effect.succeed(Duration.min(meta.duration, Duration.millis(Math.max(0, deadline - meta.now)))),
+          const refresh = Clock.currentTimeMillis.pipe(
+            Effect.flatMap((now) =>
+              this.refresh().pipe(
+                Effect.timeoutOrElse({
+                  duration: Duration.millis(Math.max(0, deadline - now)),
+                  orElse: () => this.timeoutError(timeout),
+                }),
+              ),
            ),
          )
-          return Stream.fromEffectSchedule(refresh, schedule).pipe(
+          return Stream.fromEffectSchedule(refresh, this.schedule(options?.poll)).pipe(
            Stream.takeUntil((generation) => generation.terminal),
            Stream.map((generation) => generation.event()),
          )
@@ -144,6 +145,15 @@ export class Generation<Response> {
    return { type: "generation-progress", id: this.id, progress: this.progress }
  }

+  private timeoutError(timeout: Duration.Duration) {
+    return new AIError({
+      reason: new TimeoutError({
+        message: `Generation ${this.id} did not finish within ${Duration.format(timeout)}`,
+        timeoutMs: Duration.toMillis(timeout),
+      }),
+    })
+  }
+
  private poll(poll: Poll | undefined) {
    return this.refresh().pipe(
      Effect.repeat({ schedule: this.schedule(poll), until: (generation) => generation.terminal }),
@@ -155,53 +165,12 @@ export class Generation<Response> {
  }
 }

-/** `events` followed by the expanded result, with the result fetch bounded by the same `poll.timeout` deadline. */
 export const resultEvents = <Response, A>(
  generation: Generation<Response>,
  expand: (response: Response) => ReadonlyArray<A>,
  options?: AwaitOptions,
-): Stream.Stream<Observation | A, AIError> => {
-  const timeout = Duration.fromInputUnsafe(options?.poll?.timeout ?? DEFAULT_POLL_TIMEOUT)
-  return Stream.unwrap(
-    Clock.currentTimeMillis.pipe(
-      Effect.map((start) =>
-        generation.events(options).pipe(
-          Stream.filter((event): event is Observation => event.type !== "generation-finished"),
-          Stream.concat(
-            Stream.fromIterableEffect(
-              within(generation.result(), generation.id, timeout, start + Duration.toMillis(timeout)).pipe(
-                Effect.map(expand),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
+): Stream.Stream<Observation | A, AIError> =>
+  generation.events(options).pipe(
+    Stream.filter((event): event is Observation => event.type !== "generation-finished"),
+    Stream.concat(Stream.fromIterableEffect(Effect.map(generation.result(), expand))),
  )
-}
-
-/**
- * Run `effect` within the time left until `deadline`. Fails before starting once the deadline has passed: a fast
- * request could otherwise win the zero-budget race and schedule another zero-delay poll.
- */
-const within = <A>(effect: Effect.Effect<A, AIError>, id: string, timeout: Duration.Duration, deadline: number) =>
-  Clock.currentTimeMillis.pipe(
-    Effect.flatMap((now) =>
-      now >= deadline
-        ? Effect.fail(timeoutError(id, timeout))
-        : effect.pipe(
-            Effect.timeoutOrElse({
-              duration: Duration.millis(deadline - now),
-              orElse: () => Effect.fail(timeoutError(id, timeout)),
-            }),
-          ),
-    ),
-  )
-
-const timeoutError = (id: string, timeout: Duration.Duration) =>
-  new AIError({
-    reason: new TimeoutError({
-      message: `Generation ${id} did not finish within ${Duration.format(timeout)}`,
-      timeoutMs: Duration.toMillis(timeout),
-    }),
-  })
@@ -4,7 +4,7 @@ export { ImageClient } from "./image-client.js"
 export { Auth } from "./route/auth.js"
 export { Provider } from "./provider.js"
 export { ProviderPackage } from "./provider-package.js"
-export { isContextOverflow, isContextOverflowFailure, isRetryable } from "./provider-error.js"
+export { isContextOverflow, isContextOverflowFailure } from "./provider-error.js"
 export type {
  RouteLanguageModelInput,
  RouteRoutedLanguageModelInput,
@@ -42,7 +42,7 @@ export type GenerationHandle<Response> = Snapshot & {
  /** Serializable JSON; pass it back to `resume` from another process. */
  readonly token: unknown
  readonly await: (options?: AwaitOptions & RunOptions) => Promise<Response>
-  /** Status observations until the first terminal one, polling like `await`; abort throws `signal.reason`. */
+  /** Status observations until the first terminal one, polling like `await`; abort ends iteration without throwing. */
  readonly events: (options?: AwaitOptions & RunOptions) => AsyncIterable<Event>
  /** The result without polling; fails when the generation has not completed. */
  readonly result: (options?: RunOptions) => Promise<Response>
@@ -50,16 +50,15 @@ export type GenerationHandle<Response> = Snapshot & {
  readonly cancel: (options?: RunOptions) => Promise<void>
 }

-// Fails with `signal.reason` so aborted calls reject and aborted streams throw like `fetch`: an `AbortError` by default.
 const abortEffect = (signal: AbortSignal | undefined) =>
  signal === undefined
    ? Effect.never
-    : Effect.callback<never, unknown>((resume) => {
+    : Effect.callback<void>((resume) => {
        if (signal.aborted) {
-          resume(Effect.fail(signal.reason))
+          resume(Effect.void)
          return
        }
-        const onAbort = () => resume(Effect.fail(signal.reason))
+        const onAbort = () => resume(Effect.void)
        signal.addEventListener("abort", onAbort, { once: true })
        return Effect.sync(() => signal.removeEventListener("abort", onAbort))
      })
@@ -69,14 +68,14 @@ export const make = (options: Options = {}) => {

  /** Run any package Effect (for example `LLMClient.compact(...)`) inside this runtime. */
  const run = <A, E>(effect: Effect.Effect<A, E, Services>, options?: RunOptions) =>
-    runtime.runPromise(Effect.raceFirst(effect, abortEffect(options?.signal)))
+    runtime.runPromise(effect, { signal: options?.signal })

  const iterate = <A, E>(stream: Stream.Stream<A, E, Services>, options?: RunOptions): AsyncIterable<A> =>
    Stream.toAsyncIterable(
      Stream.unwrap(
        runtime.contextEffect.pipe(
          Effect.map(
-            (context): Stream.Stream<A, unknown> =>
+            (context): Stream.Stream<A, E> =>
              stream.pipe(Stream.interruptWhen(abortEffect(options?.signal)), Stream.provideContext(context)),
          ),
        ),
@@ -110,11 +110,8 @@ const fromRequest = Effect.fn("AssemblyAITranscription.fromRequest")(function* (
        language_code: request.language,
        language_detection: request.language === undefined ? true : undefined,
        prompt: request.prompt,
-        // Turn-level `utterances`, the only segments AssemblyAI returns, and `speakers_expected` require speaker labels.
-        speaker_labels:
-          request.diarize === true || request.timestamps === "segment" || request.speakers !== undefined
-            ? true
-            : undefined,
+        // Turn-level `utterances`, the only segments AssemblyAI returns, require speaker labels.
+        speaker_labels: request.diarize === true || request.timestamps === "segment" ? true : undefined,
        speakers_expected: request.speakers,
      },
      request.providerOptions,
@@ -158,7 +155,8 @@ const decodeResult = Effect.fn("AssemblyAITranscription.decodeResult")(function*
  const error = transcript.error ?? undefined
  if (status === "failed")
    return yield* output.ended("failed", `${route.name} transcription failed${error === undefined ? "" : `: ${error}`}`)
-  if (status !== "completed") return yield* output.pending(context.token.transcriptID)
+  if (status !== "completed")
+    return yield* output.invalid(`${route.name} transcript ${context.token.transcriptID} has not finished`)
  const duration = transcript.audio_duration ?? undefined
  return new TranscriptionResponse({
    text: transcript.text ?? "",
@@ -31,21 +31,13 @@ export type Request = ImageRequestFor<BlackForestLabsImageOptions>
 // 2. Token and response schemas
 // ---------------------------------------------------------------------------

-/**
- * Regional clusters answer on different hosts, so the returned `polling_url` is followed verbatim. BFL reports the
- * credit cost on submit, so it rides on the token; it is optional so tokens persisted before it existed still decode.
- */
-export const Token = Schema.Struct({
-  id: Schema.String,
-  pollingURL: Schema.String,
-  cost: Schema.optionalKey(Schema.Number),
-})
+/** Regional clusters answer on different hosts, so the returned `polling_url` is followed verbatim. */
+export const Token = Schema.Struct({ id: Schema.String, pollingURL: Schema.String })
 export type Token = Schema.Schema.Type<typeof Token>

 const StartResponse = Schema.Struct({
  id: Schema.String,
  polling_url: Schema.String,
-  cost: optionalNull(Schema.Number),
 })

 const Result = Schema.Struct({
@@ -153,11 +145,7 @@ const fromRequest = Effect.fn("BlackForestLabsImages.fromRequest")(function* (re
 // ---------------------------------------------------------------------------

 const decodeStart = route.decodeStarted(StartResponse, (value) => ({
-  token: {
-    id: value.id,
-    pollingURL: value.polling_url,
-    ...(value.cost === undefined || value.cost === null ? {} : { cost: value.cost }),
-  },
+  token: { id: value.id, pollingURL: value.polling_url },
  snapshot: { id: value.id, status: "queued" },
 }))

@@ -181,16 +169,14 @@ const decodeResult = Effect.fn("BlackForestLabsImages.decodeResult")(function* (
  if (isModerated(document.status)) return yield* output.contentPolicy(`${route.name} moderated the generation`)
  if (status === "failed" || status === "expired")
    return yield* output.ended(status, `${route.name} generation ${context.token.id} ended with ${document.status}`)
-  if (status !== "completed") return yield* output.pending(context.token.id)
-  if (document.result === undefined || document.result === null)
+  if (status !== "completed" || document.result === undefined || document.result === null)
    return yield* output.invalid(`${route.name} generation ${context.token.id} has no result`)
  const { sample, seed, prompt, ...rest } = document.result
-  // A settled `cost` on the result supersedes the submit-time cost carried on the token.
-  const cost = document.cost ?? context.token.cost
  return new ImageResponse({
    // `sample` is a signed URL that expires 10 minutes after the result is ready, so it is downloaded now.
    images: [yield* context.materialize(Media.url(sample))],
-    usage: cost === undefined ? undefined : { type: "credits", credits: cost },
+    usage:
+      document.cost === undefined || document.cost === null ? undefined : { type: "credits", credits: document.cost },
    providerMetadata: {
      bfl: { id: context.token.id, seed: seed ?? undefined, prompt: prompt ?? undefined, ...rest },
    },
@@ -67,9 +67,6 @@ const queryParameters = (request: Request) => {
 }

 const fromRequest = Effect.fn("DeepgramSpeech.fromRequest")(function* (request: Request) {
-  // Not in `unsupported`: that list would also reject `timestamps: false`, which asks for nothing.
-  if (request.timestamps === true)
-    return yield* route.unsupported("media.timestamps", `${route.name} does not return timestamps`)
  if (
    request.format !== undefined &&
    FORMATS[request.format] === undefined &&
@@ -89,32 +86,24 @@ const fromRequest = Effect.fn("DeepgramSpeech.fromRequest")(function* (request:
 // 6. Stream parsing
 // ---------------------------------------------------------------------------

-/** Deepgram wraps raw encodings in WAV unless `container` is `none`, and defaults their sample rate per encoding. */
-const HEADERLESS_ENCODINGS: Readonly<
-  Record<string, { readonly encoding: SpeechStream.PcmEncoding; readonly sampleRate: number }>
-> = {
-  linear16: { encoding: "pcm_s16le", sampleRate: 24000 },
-  mulaw: { encoding: "pcm_mulaw", sampleRate: 8000 },
-  alaw: { encoding: "pcm_alaw", sampleRate: 8000 },
+const HEADERLESS_ENCODINGS: Readonly<Record<string, SpeechStream.PcmEncoding>> = {
+  linear16: "pcm_s16le",
+  mulaw: "pcm_mulaw",
+  alaw: "pcm_alaw",
 }

 const finish = (state: State, context: MediaProtocol.ResponseContext<Request>) => {
  const headers = context.http.headers
  const mediaType = headers["content-type"]
  const format = audioFormat(context.request)
-  const headerless = HEADERLESS_ENCODINGS[format.encoding ?? ""]
-  const container = format.container ?? (headerless === undefined ? undefined : "wav")
+  const encoding = HEADERLESS_ENCODINGS[format.encoding ?? ""]
  const requestID = headers["dg-request-id"]
  const modelName = headers["dg-model-name"]
  return SpeechStream.finish(route, state, {
-    ...(container === "none" && headerless !== undefined
-      ? SpeechStream.pcm(
-          headerless.encoding,
-          SpeechStream.sampleRate(mediaType) ?? context.request.providerOptions?.sampleRate ?? headerless.sampleRate,
-          mediaType,
-        )
+    ...(format.container === "none" && encoding !== undefined
+      ? SpeechStream.pcm(encoding, SpeechStream.sampleRate(mediaType), mediaType)
      : // Deepgram's default encoding is MP3; WAV is a container around any encoding.
-        { mediaType, info: { format: container === "wav" ? "wav" : (format.encoding ?? "mp3") } }),
+        { mediaType, info: { format: format.container === "wav" ? "wav" : (format.encoding ?? "mp3") } }),
    usage: SpeechStream.headerUsage("characters", headers["dg-char-count"]),
    providerMetadata:
      requestID === undefined && modelName === undefined
@@ -128,7 +117,7 @@ const finish = (state: State, context: MediaProtocol.ResponseContext<Request>) =
 // ---------------------------------------------------------------------------

 export const protocol = MediaProtocol.stream<Request, SpeechEvent, Uint8Array, State>(route, {
-  unsupported: ["voice", "language", "instructions"],
+  unsupported: ["voice", "language", "instructions", "timestamps"],
  body: { from: fromRequest },
  frames: (bytes) => bytes,
  initial: () => ({ chunks: [] }),
@@ -6,7 +6,6 @@ import { mergeJsonRecords, type OpenString } from "../schema/index.js"
 import { TranscriptionModel, TranscriptionResponse, type TranscriptionRequestFor } from "../transcription.js"
 import { ProviderShared } from "./shared.js"
 import { MediaInput } from "./utils/media-input.js"
-import { SpeakerTurns } from "./utils/speaker-turns.js"

 const route = MediaProtocol.identity({ id: "deepgram-transcription", name: "Deepgram", provider: "deepgram" })
 export const DEFAULT_BASE_URL = "https://api.deepgram.com"
@@ -116,6 +115,16 @@ const speaker = (value: number | undefined) => (value === undefined ? undefined

 const wordText = (word: typeof Word.Type) => word.punctuated_word ?? word.word

+// Utterances split on pauses, not speakers: the v2 diarizer labels a whole utterance with one speaker even when its
+// words change speaker, so segments split each utterance at speaker changes.
+const speakerTurns = (words: ReadonlyArray<typeof Word.Type>) =>
+  words.reduce<Array<Array<typeof Word.Type>>>((turns, word) => {
+    const last = turns.at(-1)
+    if (last === undefined || last[0].speaker !== word.speaker) return [...turns, [word]]
+    last.push(word)
+    return turns
+  }, [])
+
 const decodeResponse = Effect.fn("DeepgramTranscription.decodeResponse")(function* (
  response: HttpClientResponse.HttpClientResponse,
 ) {
@@ -127,8 +136,6 @@ const decodeResponse = Effect.fn("DeepgramTranscription.decodeResponse")(functio
  const requestID = output.value.metadata?.request_id
  return new TranscriptionResponse({
    text: alternative.transcript,
-    // Utterances split on pauses, not speakers: the v2 diarizer labels a whole utterance with one speaker even when
-    // its words change speaker, so segments split each utterance at speaker changes.
    segments: output.value.results.utterances?.flatMap((utterance) =>
      utterance.words === undefined || utterance.words.length === 0
        ? [
@@ -139,7 +146,7 @@ const decodeResponse = Effect.fn("DeepgramTranscription.decodeResponse")(functio
              speaker: speaker(utterance.speaker),
            },
          ]
-        : SpeakerTurns.group(utterance.words, (word) => word.speaker).map((turn) => ({
+        : speakerTurns(utterance.words).map((turn) => ({
            text: turn.map(wordText).join(" "),
            startSeconds: turn[0].start,
            endSeconds: turn[turn.length - 1].end,
@@ -1,211 +0,0 @@
-import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
-import { MediaProtocol } from "../route/media-protocol.js"
-import { MediaRoute } from "../route/media.js"
-import { mergeJsonRecords, type OpenString } from "../schema/index.js"
-import { TranscriptionModel, TranscriptionResponse, type TranscriptionRequestFor } from "../transcription.js"
-import { mediaTypeExtension } from "../utils/media-type.js"
-import { ProviderShared, optionalNull } from "./shared.js"
-import { MediaInput } from "./utils/media-input.js"
-import { SpeakerTurns } from "./utils/speaker-turns.js"
-
-const route = MediaProtocol.identity({
-  id: "elevenlabs-transcription",
-  name: "ElevenLabs Transcription",
-  provider: "elevenlabs",
-})
-export const DEFAULT_BASE_URL = "https://api.elevenlabs.io"
-export const PATH = "/v1/speech-to-text"
-
-// ---------------------------------------------------------------------------
-// 1. Public model input
-// ---------------------------------------------------------------------------
-
-export type ElevenLabsTranscriptionOptions = {
-  readonly tag_audio_events?: boolean
-  readonly timestamps_granularity?: OpenString<"none" | "word" | "character">
-  readonly diarization_threshold?: number
-  readonly file_format?: OpenString<"pcm_s16le_16" | "other">
-  readonly temperature?: number
-  readonly seed?: number
-  readonly keyterms?: ReadonlyArray<string>
-  readonly no_verbatim?: boolean
-  readonly detect_speaker_roles?: boolean
-  readonly use_speaker_library?: boolean
-  readonly entity_detection?: string | ReadonlyArray<string>
-  readonly entity_redaction?: string | ReadonlyArray<string>
-  readonly entity_redaction_mode?: OpenString<"redacted" | "entity_type" | "enumerated_entity_type">
-} & Record<string, unknown>
-
-export type Request = TranscriptionRequestFor<ElevenLabsTranscriptionOptions>
-
-// ---------------------------------------------------------------------------
-// 2. Response schema
-// ---------------------------------------------------------------------------
-
-/** `type` is `word`, `spacing` (the whitespace between words), or `audio_event` (`(laughter)`). */
-const Token = Schema.Struct({
-  text: Schema.String,
-  type: Schema.String,
-  start: optionalNull(Schema.Number),
-  end: optionalNull(Schema.Number),
-  speaker_id: optionalNull(Schema.String),
-  logprob: optionalNull(Schema.Number),
-})
-type Token = Schema.Schema.Type<typeof Token>
-
-const Transcript = Schema.Struct({
-  language_code: optionalNull(Schema.String),
-  text: Schema.String,
-  words: optionalNull(Schema.Array(Token)),
-  transcription_id: optionalNull(Schema.String),
-  audio_duration_secs: optionalNull(Schema.Number),
-})
-
-// ---------------------------------------------------------------------------
-// 5. Request body construction
-// ---------------------------------------------------------------------------
-
-/** Speaker turns are the only segments ElevenLabs can produce, and `num_speakers` only applies to diarization. */
-const diarizes = (request: Request) =>
-  request.diarize === true || request.timestamps === "segment" || request.speakers !== undefined
-
-const RESERVED_FORM_FIELDS = new Set([
-  "file",
-  "cloud_storage_url",
-  "source_url",
-  "model_id",
-  "language_code",
-  "diarize",
-  "num_speakers",
-])
-
-const validate = (request: Request, overlay: Record<string, unknown>) => {
-  // Webhook requests return 202 with no transcript; the result arrives at a configured webhook instead.
-  if (overlay.webhook === true)
-    return Effect.fail(route.unsupported("transcription.webhook", `${route.name} does not deliver to webhooks`))
-  // Separate multichannel output replaces the transcript with one transcript per channel.
-  if (overlay.use_multi_channel === true && overlay.multichannel_output_style !== "combined")
-    return Effect.fail(
-      route.unsupported(
-        "transcription.multichannel",
-        `${route.name} returns a single transcript; set multichannel_output_style: "combined" to merge channels`,
-      ),
-    )
-  if (overlay.timestamps_granularity === "none" && (request.timestamps === "word" || diarizes(request)))
-    return Effect.fail(
-      route.unsupported(
-        "media.timestamps",
-        `${route.name} cannot return word timestamps or speaker turns with timestamps_granularity: "none"`,
-      ),
-    )
-  return Effect.void
-}
-
-const fromRequest = Effect.fn("ElevenLabsTranscription.fromRequest")(function* (request: Request) {
-  const overlay = mergeJsonRecords(request.providerOptions, request.http?.body) ?? {}
-  yield* validate(request, overlay)
-  const form = new FormData()
-  const url = ProviderShared.mediaUrl(request.audio)
-  if (url === undefined) {
-    const extension = mediaTypeExtension(request.audio.mediaType)
-    const audio = yield* MediaInput.inlineBytes(route.id, request.audio)
-    form.append(
-      "file",
-      MediaInput.blob(audio, request.audio.mediaType),
-      extension === undefined ? "audio" : `audio.${extension}`,
-    )
-  }
-  MediaInput.appendFields(
-    form,
-    {
-      model_id: request.model.id,
-      // `cloud_storage_url` is deprecated in favor of `source_url`, which accepts any hosted audio or video URL.
-      source_url: url,
-      language_code: request.language,
-      diarize: diarizes(request) ? true : undefined,
-      num_speakers: request.speakers,
-    },
-    { overlay, reserved: RESERVED_FORM_FIELDS, repeatArrays: "key" },
-  )
-  return MediaProtocol.multipart(form)
-})
-
-// ---------------------------------------------------------------------------
-// 6. Response decoding
-// ---------------------------------------------------------------------------
-
-const decodeTranscript = route.decodeJson(Transcript)
-
-type TimedWord = Token & { readonly start: number; readonly end: number }
-
-const isTimedWord = (token: Token): token is TimedWord =>
-  token.type === "word" && typeof token.start === "number" && typeof token.end === "number"
-
-/** Turn text keeps the provider's own spacing tokens, so languages written without spaces are not re-spaced. */
-const speakerTurns = (tokens: ReadonlyArray<Token>) =>
-  SpeakerTurns.group(
-    tokens.filter((token) => token.type === "word" || token.type === "spacing"),
-    (token) => token.speaker_id,
-  ).flatMap((turn) => {
-    const words = turn.filter(isTimedWord)
-    if (words.length === 0) return []
-    return [
-      {
-        text: turn
-          .map((token) => token.text)
-          .join("")
-          .trim(),
-        startSeconds: words[0].start,
-        endSeconds: words[words.length - 1].end,
-        speaker: turn[0].speaker_id ?? undefined,
-      },
-    ]
-  })
-
-const decodeResponse = Effect.fn("ElevenLabsTranscription.decodeResponse")(function* (
-  response: HttpClientResponse.HttpClientResponse,
-  context: MediaProtocol.DecodeContext<Request>,
-) {
-  const output = yield* decodeTranscript(response)
-  const transcript = output.value
-  const tokens = transcript.words ?? []
-  const duration = transcript.audio_duration_secs ?? undefined
-  const transcriptionID = transcript.transcription_id ?? undefined
-  return new TranscriptionResponse({
-    text: transcript.text,
-    segments: diarizes(context.request) ? speakerTurns(tokens) : undefined,
-    words: tokens.filter(isTimedWord).map((word) => ({
-      text: word.text,
-      startSeconds: word.start,
-      endSeconds: word.end,
-      speaker: word.speaker_id ?? undefined,
-      confidence: typeof word.logprob === "number" ? Math.exp(word.logprob) : undefined,
-    })),
-    language: transcript.language_code?.toLowerCase(),
-    durationSeconds: duration,
-    usage: duration === undefined ? undefined : { type: "seconds", seconds: duration },
-    providerMetadata: transcriptionID === undefined ? undefined : { elevenlabs: { transcriptionId: transcriptionID } },
-  })
-})
-
-// ---------------------------------------------------------------------------
-// 7. Protocol and route
-// ---------------------------------------------------------------------------
-
-export const protocol = MediaProtocol.inline<Request, TranscriptionResponse>(route, {
-  unsupported: ["prompt"],
-  body: { from: fromRequest },
-  response: { decode: decodeResponse },
-})
-
-export const model = (input: MediaRoute.ModelInput) =>
-  TranscriptionModel.fromRoute<ElevenLabsTranscriptionOptions>(
-    { protocol, baseURL: DEFAULT_BASE_URL, path: PATH },
-    input,
-  )
-
-export const ElevenLabsTranscription = {
-  protocol,
-  model,
-} as const
@@ -49,7 +49,7 @@ const QueueResult = Schema.StructWithRest(
 // ---------------------------------------------------------------------------

 const sizing = (model: string) => {
-  if (/^fal-ai\/(nano-banana|flux-pro\/(v1\.1-ultra|kontext))/.test(model)) return "aspect_ratio"
+  if (/^fal-ai\/(nano-banana|flux-pro\/v1\.1-ultra)/.test(model)) return "aspect_ratio"
  if (model.startsWith("fal-ai/flux")) return "image_size"
  return undefined
 }
@@ -63,24 +63,20 @@ const validate = (request: Request) => {
    return Effect.fail(route.unsupported("media.size", `${id} sizes by aspectRatio`))
  if (request.aspectRatio !== undefined && field === "image_size")
    return Effect.fail(route.unsupported("media.aspectRatio", `${id} sizes by size (image_size)`))
-  if ((request.images?.length ?? 0) > 1 && !takesImageList(id))
+  if ((request.images?.length ?? 0) > 1 && !isEdit(id))
    return Effect.fail(
-      route.unsupported(
-        "media.images",
-        `${id} takes one image_url; use an /edit or /multi endpoint for several images`,
-      ),
+      route.unsupported("media.images", `${id} takes one image_url; use an /edit endpoint for several images`),
    )
  return Effect.void
 }

-// `/edit` and `/multi` (Kontext) endpoints take an `image_urls` list; image-to-image, fill, and Ultra take one
-// `image_url` (beside `mask_url`).
-const takesImageList = (model: string) => model.endsWith("/edit") || model.endsWith("/multi")
+// `/edit` endpoints take an `image_urls` list; image-to-image, fill, and Ultra take one `image_url` (beside `mask_url`).
+const isEdit = (model: string) => model.endsWith("/edit")

 const fromRequest = Effect.fn("FalImages.fromRequest")(function* (request: Request) {
  yield* validate(request)
  const images = yield* Effect.forEach(request.images ?? [], (image) => FalQueue.mediaUrl(image, route.name))
-  const list = takesImageList(request.model.id)
+  const edit = isEdit(request.model.id)
  return MediaProtocol.json(
    mergeJsonRecords(
      {
@@ -90,8 +86,8 @@ const fromRequest = Effect.fn("FalImages.fromRequest")(function* (request: Reque
        image_size: request.size === undefined ? undefined : MediaInput.dimensions(request.size),
        aspect_ratio: request.aspectRatio,
        output_format: request.format,
-        image_urls: list && images.length > 0 ? images : undefined,
-        image_url: list ? undefined : images[0],
+        image_urls: edit && images.length > 0 ? images : undefined,
+        image_url: edit ? undefined : images[0],
        mask_url: request.mask === undefined ? undefined : yield* FalQueue.mediaUrl(request.mask, route.name),
      },
      request.providerOptions,
@@ -116,14 +112,12 @@ const decodeResult = Effect.fn("FalImages.decodeResult")(function* (
  // With the safety checker on, flagged images come back blacked out rather than omitted.
  const flagged = (has_nsfw_concepts ?? []).flatMap((value, index) => (value ? [index] : []))
  return new ImageResponse({
-    images: images.map((image) => {
-      const info = { width: image.width ?? undefined, height: image.height ?? undefined }
-      // `sync_mode: true` returns data URIs instead of hosted URLs.
-      return (
-        Media.parseDataUrl(image.url, { info }) ??
-        Media.url(image.url, { mediaType: image.content_type ?? undefined, info })
-      )
-    }),
+    images: images.map((image) =>
+      Media.url(image.url, {
+        mediaType: image.content_type ?? undefined,
+        info: { width: image.width ?? undefined, height: image.height ?? undefined },
+      }),
+    ),
    notices:
      flagged.length === 0
        ? undefined
@@ -526,7 +526,19 @@ const mapFinishReason = (finishReason: string | undefined, hasToolCalls: boolean
  if (finishReason === undefined) return hasToolCalls ? "tool-calls" : "unknown"
  if (finishReason === "STOP") return hasToolCalls ? "tool-calls" : "stop"
  if (finishReason === "MAX_TOKENS") return "length"
-  if (GeminiGenerateContent.contentFiltered(finishReason)) return "content-filter"
+  if (
+    finishReason === "IMAGE_SAFETY" ||
+    finishReason === "RECITATION" ||
+    finishReason === "SAFETY" ||
+    finishReason === "BLOCKLIST" ||
+    finishReason === "PROHIBITED_CONTENT" ||
+    finishReason === "SPII" ||
+    finishReason === "MODEL_ARMOR" ||
+    finishReason === "IMAGE_PROHIBITED_CONTENT" ||
+    finishReason === "IMAGE_RECITATION" ||
+    finishReason === "LANGUAGE"
+  )
+    return "content-filter"
  if (
    finishReason === "MALFORMED_FUNCTION_CALL" ||
    finishReason === "UNEXPECTED_TOOL_CALL" ||
@@ -101,7 +101,7 @@ const generationConfig = (request: Request) => {
 const fromRequest = Effect.fn("GoogleImages.fromRequest")(function* (request: Request) {
  if (request.n !== undefined && request.n > 1)
    return yield* route.unsupported(
-      "media.n",
+      "image.n",
      `${route.name} generates one image per request; call it once per image instead of n=${request.n}`,
    )
  const parts = yield* Effect.forEach(request.images ?? [], (image) =>
@@ -56,9 +56,6 @@ interface State extends SpeechStream.Audio, GeminiGenerateContent.Metadata {
 // ---------------------------------------------------------------------------

 const fromRequest = Effect.fn("GoogleSpeech.fromRequest")(function* (request: MediaProtocol.Addressed<Request>) {
-  // Not in `unsupported`: that list would also reject `timestamps: false`, which asks for nothing.
-  if (request.timestamps === true)
-    return yield* route.unsupported("media.timestamps", `${route.name} does not return timestamps`)
  if (request.format === "pcm" && request.mode === "generate" && /^gemini-3\.8-.*-tts(?:-|$)/.test(request.model.id))
    return yield* route.unsupported(
      "media.format",
@@ -102,14 +99,10 @@ const step = Effect.fn("GoogleSpeech.step")(function* (state: State, frame: stri
    part.inlineData === undefined ? [] : [part.inlineData],
  )
  const next: State = { ...GeminiGenerateContent.track(state, chunk), mimeType: state.mimeType ?? audio[0]?.mimeType }
-  const events = audio.flatMap((part) => SpeechStream.delta(next, part.data)[1])
-  const withheld = next.chunks.length === 0 ? GeminiGenerateContent.withheld(route.name, chunk, frame) : undefined
-  if (withheld !== undefined) return yield* withheld
-  return [next, events] as const
+  return [next, audio.flatMap((part) => SpeechStream.delta(next, part.data)[1])] as const
 })

 const finish = (state: State, context: MediaProtocol.ResponseContext<Request>) => {
-  if (state.finishReason === undefined) return Effect.fail(route.incomplete())
  const sampleRate = SpeechStream.sampleRate(state.mimeType) ?? DEFAULT_SAMPLE_RATE
  const output =
    state.mimeType?.split(";")[0]?.toLowerCase() === "audio/wav"
@@ -122,9 +115,8 @@ const finish = (state: State, context: MediaProtocol.ResponseContext<Request>) =
  return SpeechStream.finish(route, state, {
    ...output,
    usage: GeminiGenerateContent.usage(state.usage),
-    notices: GeminiGenerateContent.notices(route.name, state),
    providerMetadata: GeminiGenerateContent.providerMetadata(state),
-    detail: `finish reason: ${state.finishReason}`,
+    detail: state.finishReason === undefined ? undefined : `finish reason: ${state.finishReason}`,
  })
 }

@@ -133,7 +125,7 @@ const finish = (state: State, context: MediaProtocol.ResponseContext<Request>) =
 // ---------------------------------------------------------------------------

 export const protocol = MediaProtocol.stream<Request, SpeechEvent, string, State>(route, {
-  unsupported: ["instructions", "speed"],
+  unsupported: ["instructions", "speed", "timestamps"],
  body: { from: fromRequest },
  frames: (bytes, context) => GeminiGenerateContent.frames(bytes, context.request.mode),
  initial: () => ({ chunks: [] }),
@@ -154,9 +154,6 @@ const step = Effect.fn("GoogleTranscription.step")(function* (state: State, fram
    .filter((item) => item.length > 0)
    .join(" ")
  const delta = text.length === 0 || state.text.length === 0 ? text : ` ${text}`
-  const withheld =
-    state.text.length + delta.length === 0 ? GeminiGenerateContent.withheld(route.name, chunk, frame) : undefined
-  if (withheld !== undefined) return yield* withheld
  const events: ReadonlyArray<TranscriptionEvent> = [
    ...(delta.length === 0 ? [] : [TranscriptionTextDeltaEvent.make({ delta })]),
    ...segments.map((segment) => TranscriptionSegmentEvent.make({ segment })),
@@ -172,7 +169,6 @@ const finish = (state: State) => {
      segments: state.segments.length === 0 ? undefined : state.segments,
      words: state.words.length === 0 ? undefined : state.words,
      usage: GeminiGenerateContent.usage(state.usage),
-      notices: GeminiGenerateContent.notices(route.name, state),
      providerMetadata: GeminiGenerateContent.providerMetadata(state),
    }),
  ])
@@ -36,9 +36,7 @@ const StartResponse = Schema.Struct({ name: Schema.String })

 const Operation = Schema.Struct({
  done: Schema.optional(Schema.Boolean),
-  error: Schema.optional(
-    Schema.Struct({ code: Schema.optional(Schema.Number), message: Schema.optional(Schema.String) }),
-  ),
+  error: Schema.optional(Schema.Struct({ message: Schema.optional(Schema.String) })),
  response: Schema.optional(
    Schema.Struct({
      generateVideoResponse: Schema.optional(
@@ -62,16 +60,6 @@ const Operation = Schema.Struct({
  metadata: Schema.optional(Schema.Unknown),
 })

-// Operation errors are `google.rpc.Status`; unlisted codes (INTERNAL, UNAVAILABLE, ...) are provider-side.
-const FAILURE = {
-  3: "InvalidRequest", // INVALID_ARGUMENT
-  7: "Authentication", // PERMISSION_DENIED
-  8: "RateLimit", // RESOURCE_EXHAUSTED
-  9: "InvalidRequest", // FAILED_PRECONDITION
-  11: "InvalidRequest", // OUT_OF_RANGE
-  16: "Authentication", // UNAUTHENTICATED
-} as const satisfies Record<number, MediaProtocol.Failure>
-
 // ---------------------------------------------------------------------------
 // 5. Request body construction
 // ---------------------------------------------------------------------------
@@ -161,12 +149,12 @@ const decodeResult = Effect.fn("GoogleVideo.decodeResult")(function* (
  const output = yield* decodeOperation(response)
  const operation = output.value
  const status = statusOf(operation)
-  if (status === "running") return yield* output.pending(context.token.operation)
+  if (status === "running")
+    return yield* output.invalid(`${route.name} operation ${context.token.operation} has not finished`)
  if (status === "failed")
    return yield* output.ended(
      "failed",
      `${route.name} operation failed${operation.error?.message === undefined ? "" : `: ${operation.error.message}`}`,
-      MediaProtocol.failure(FAILURE, operation.error?.code),
    )
  const generated = operation.response?.generateVideoResponse
  // Downloads require the same API key as the poll; the asset carries it transiently and follows the redirect.
@@ -64,14 +64,6 @@ const OpenAIChatTool = Schema.Struct({
 })
 type OpenAIChatTool = Schema.Schema.Type<typeof OpenAIChatTool>

-// Gemini's OpenAI-compatible surface carries thought signatures in tool call
-// `extra_content` and rejects replayed parallel calls without them:
-// https://ai.google.dev/gemini-api/docs/thinking#signatures
-const ExtraContent = Schema.Struct({
-  google: Schema.Struct({ thought_signature: Schema.String }),
-})
-const decodeExtraContent = (value: unknown) => Option.getOrUndefined(Schema.decodeUnknownOption(ExtraContent)(value))
-
 const OpenAIChatAssistantToolCall = Schema.Struct({
  id: Schema.String,
  type: Schema.tag("function"),
@@ -79,7 +71,6 @@ const OpenAIChatAssistantToolCall = Schema.Struct({
    name: Schema.String,
    arguments: Schema.String,
  }),
-  extra_content: Schema.optional(ExtraContent),
 })
 type OpenAIChatAssistantToolCall = Schema.Schema.Type<typeof OpenAIChatAssistantToolCall>

@@ -121,6 +112,12 @@ const decodeReasoningDetail = Schema.decodeUnknownOption(ReasoningDetail)
 const knownReasoningDetails = (details: ReadonlyArray<unknown>) =>
  details.flatMap((detail) => Option.toArray(decodeReasoningDetail(detail)))

+// Intentionally omit Gemini's provider-specific `extra_content.google.thought_signature`
+// extension until direct Google OpenAI-compatible routing is supported here:
+// https://github.com/vercel/ai/issues/11590
+// https://github.com/vercel/ai/pull/11745
+// https://ai.google.dev/gemini-api/docs/thought-signatures#openai
+
 const OpenAIChatUserContent = Schema.Union([
  Schema.Struct({
    type: Schema.Literal("text"),
@@ -245,7 +242,6 @@ const OpenAIChatToolCallDelta = Schema.Struct({
  index: optionalNull(Schema.Number),
  id: optionalNull(Schema.String),
  function: optionalNull(OpenAIChatToolCallDeltaFunction),
-  extra_content: optionalNull(Schema.Unknown),
 })
 type OpenAIChatToolCallDelta = Schema.Schema.Type<typeof OpenAIChatToolCallDelta>

@@ -298,7 +294,6 @@ interface PendingToolDelta {
  readonly id?: string
  readonly name?: string
  readonly input: string
-  readonly extraContent?: Schema.Schema.Type<typeof ExtraContent>
 }

 export interface ParserState {
@@ -352,17 +347,13 @@ const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
    tool: (name) => ({ type: "function" as const, function: { name } }),
  })

-const lowerToolCall = (
-  part: ToolCallPart,
-  options: LoweringOptions & { readonly providerMetadataKey: string },
-): OpenAIChatAssistantToolCall => ({
+const lowerToolCall = (part: ToolCallPart, options: LoweringOptions): OpenAIChatAssistantToolCall => ({
  id: options.toolCallID?.(part.id) ?? part.id,
  type: "function",
  function: {
    name: part.name,
    arguments: ProviderShared.encodeJson(part.input === undefined ? {} : part.input),
  },
-  extra_content: decodeExtraContent(part.providerMetadata?.[options.providerMetadataKey]?.extraContent),
 })

 const lowerMedia = Effect.fn("OpenAIChat.lowerMedia")(function* (part: MediaPart) {
@@ -730,9 +721,7 @@ const detectSupportsStore = (provider: string, baseURL: string | undefined): boo
    p === "vercel-ai-gateway" || url.includes("ai-gateway.vercel.sh") || url.includes("vercel.sh")
  const isAntLing = p === "ant-ling" || url.includes("api.ant-ling.com")
  const isOpencode = p === "opencode" || url.includes("opencode.ai")
-  const isGemini = url.includes("generativelanguage.googleapis.com")
  const isNonStandard =
-    isGemini ||
    isNvidia ||
    isCerebras ||
    isXai ||
@@ -1125,13 +1114,12 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
      const id = current?.id ?? pending?.id ?? (tool.id || undefined)
      const name = current?.name ?? pending?.name ?? (tool.function?.name || undefined)
      const text = `${pending?.input ?? ""}${tool.function?.arguments ?? ""}`
-      const extraContent = pending?.extraContent ?? decodeExtraContent(tool.extra_content)
      latestToolIndex = index
      nextToolIndex = Math.max(nextToolIndex, index + 1)
      if (!current && (!id || !name)) {
        pendingTools = {
          ...pendingTools,
-          [index]: { id: id || undefined, name: name || undefined, input: text, extraContent },
+          [index]: { id: id || undefined, name: name || undefined, input: text },
        }
        continue
      }
@@ -1143,12 +1131,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
        ADAPTER,
        tools,
        index,
-        {
-          id: id || undefined,
-          name: name || undefined,
-          text,
-          providerMetadata: extraContent && { [state.providerMetadataKey]: { extraContent } },
-        },
+        { id: id || undefined, name: name || undefined, text },
        "OpenAI Chat tool call delta is missing id or name",
      )
      if (ToolStream.isError(result))
@@ -48,17 +48,15 @@ const Usage = Schema.Struct({
  output_tokens_details: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
 })

-/** What the provider actually rendered; it can differ from the request when `auto` or a default applied. */
-const Settings = {
-  output_format: Schema.optional(Schema.String),
-  size: Schema.optional(Schema.String),
-  quality: Schema.optional(Schema.String),
-  background: Schema.optional(Schema.String),
-}
-
 const OpenAIImageResponse = Schema.Struct({
-  data: Schema.Array(Schema.Struct({ b64_json: Schema.String })),
-  ...Settings,
+  data: Schema.Array(
+    Schema.Struct({
+      b64_json: Schema.optional(Schema.String),
+      url: Schema.optional(Schema.String),
+      revised_prompt: Schema.optional(Schema.String),
+    }),
+  ),
+  output_format: Schema.optional(Schema.String),
  usage: Schema.optional(Usage),
 })

@@ -71,13 +69,11 @@ const StreamEvent = Schema.Union([
    type: Schema.Literals(["image_generation.partial_image", "image_edit.partial_image"]),
    b64_json: Schema.String,
    partial_image_index: Schema.Number,
-    ...Settings,
    output_format: Schema.String,
  }),
  Schema.Struct({
    type: Schema.Literals(["image_generation.completed", "image_edit.completed"]),
    b64_json: Schema.String,
-    ...Settings,
    output_format: Schema.String,
    usage: Schema.optional(Usage),
  }),
@@ -96,9 +92,6 @@ type Frame = string | { readonly document: string; readonly requested: string |
 interface State {
  readonly completed: number
  readonly format?: string
-  readonly size?: string
-  readonly quality?: string
-  readonly background?: string
  readonly usage?: MediaUsage
 }

@@ -117,6 +110,10 @@ const nativeOptions = (options: OpenAIImageOptions | undefined) => {

 const streamOptions = (request: MediaProtocol.Addressed<Request>) => {
  if (request.mode !== "stream") return Effect.succeed(undefined)
+  if (request.model.id.startsWith("dall-e"))
+    return Effect.fail(
+      route.unsupported("media.stream", `${request.model.id} does not stream; use Image.generate or a GPT image model`),
+    )
  if (request.n !== undefined && request.n > 1)
    return Effect.fail(
      route.unsupported("media.n", `${route.name} streams one image; use Image.generate for n=${request.n}`),
@@ -197,34 +194,21 @@ const usage = (value: Schema.Schema.Type<typeof Usage> | undefined): MediaUsage
        details: { openai: value },
      }

-/** `size` echoes the rendered `WIDTHxHEIGHT`; `auto` or any other value leaves the dimensions unknown. */
-const info = (format: string, size: string | undefined): Media.Info => {
-  const match = size?.match(/^(\d+)x(\d+)$/)
-  return match ? { format, width: Number(match[1]), height: Number(match[2]) } : { format }
-}
-
-const eventImage = (frame: string, label: string, data: string, format: string, size: string | undefined) =>
+const eventImage = (frame: string, label: string, data: string, format: string) =>
  MediaInput.decodedAsset((message, cause) => route.frameError(message, frame, cause), label, data, `image/${format}`, {
-    info: info(format, size),
+    info: { format },
  })

 const onEvent = Effect.fn("OpenAIImages.onEvent")(function* (state: State, frame: string) {
  const event = yield* decodeEvent(frame)
  const format = event.output_format
  if ("partial_image_index" in event) {
-    const image = yield* eventImage(frame, `${route.name} partial image`, event.b64_json, format, event.size)
+    const image = yield* eventImage(frame, `${route.name} partial image`, event.b64_json, format)
    return [state, [ImagePartialEvent.make({ index: event.partial_image_index, image })]] as const
  }
-  const image = yield* eventImage(frame, `${route.name} result ${state.completed}`, event.b64_json, format, event.size)
+  const image = yield* eventImage(frame, `${route.name} result ${state.completed}`, event.b64_json, format)
  return [
-    {
-      completed: state.completed + 1,
-      format,
-      size: event.size,
-      quality: event.quality,
-      background: event.background,
-      usage: usage(event.usage),
-    },
+    { ...state, completed: state.completed + 1, format, usage: usage(event.usage) },
    [ImageOutputEvent.make({ index: state.completed, image })],
  ] as const
 })
@@ -235,20 +219,16 @@ const onDocument = Effect.fn("OpenAIImages.onDocument")(function* (frame: Exclud
    Effect.mapError((cause) => invalid(`${route.name} returned an invalid response`, cause)),
  )
  const format = decoded.output_format ?? frame.requested ?? "png"
+  const mediaType = `image/${format}`
  const images = yield* Effect.forEach(decoded.data, (item, index) =>
-    MediaInput.decodedAsset(invalid, `${route.name} result ${index}`, item.b64_json, `image/${format}`, {
-      info: info(format, decoded.size),
+    MediaInput.imageOutput(invalid, `${route.name} result ${index}`, item, mediaType, {
+      info: { format },
+      providerMetadata:
+        item.revised_prompt === undefined ? undefined : { openai: { revisedPrompt: item.revised_prompt } },
    }),
  )
  if (images.length === 0) return yield* invalid(`${route.name} returned no images`)
-  const state: State = {
-    completed: images.length,
-    format,
-    size: decoded.size,
-    quality: decoded.quality,
-    background: decoded.background,
-    usage: usage(decoded.usage),
-  }
+  const state: State = { completed: images.length, format, usage: usage(decoded.usage) }
  return [state, images.map((image, index) => ImageOutputEvent.make({ index, image }))] as const
 })

@@ -257,17 +237,7 @@ const step = (state: State, frame: Frame) => (typeof frame === "string" ? onEven
 const finish = (state: State) => {
  if (state.completed === 0) return Effect.fail(route.incomplete())
  return Effect.succeed([
-    ImageFinishEvent.make({
-      usage: state.usage,
-      providerMetadata: {
-        openai: {
-          outputFormat: state.format,
-          size: state.size,
-          quality: state.quality,
-          background: state.background,
-        },
-      },
-    }),
+    ImageFinishEvent.make({ usage: state.usage, providerMetadata: { openai: { outputFormat: state.format } } }),
  ])
 }

@@ -143,14 +143,12 @@ const adapter = {
  restoreHostedToolItem: (item: unknown) => (Schema.is(OpenAIResponsesHostedToolItem)(item) ? item : undefined),
 } satisfies OpenResponses.ProviderAdapter

-// GPT-6 Astra, Sol, and Luna accept `configuration_update` only in standard mode (not `reasoning.mode: "pro"` or
-// `-pro` slugs), and never alongside automatic `context_management` compaction.
+// Only GPT-6 Astra accepts `configuration_update`, and never alongside automatic `context_management` compaction.
 const supportsEffortUpdates = (request: LLMRequest) => {
  if (request.providerOptions?.contextManagement !== undefined) return false
-  if (Schema.is(Schema.Struct({ mode: Schema.Literal("pro") }))(request.http?.body?.reasoning)) return false
  const override = request.model.compatibility?.supportsEffortUpdates
  if (override !== undefined) return override
-  return /(?:^|\/)gpt-6-(?:astra|sol|luna)$/i.test(request.model.id)
+  return /(?:^|\/)gpt-6-astra$/i.test(request.model.id)
 }

 const nativeImageToolInput = (tool: ToolDefinition) => {
@@ -60,17 +60,7 @@ interface State extends SpeechStream.Audio {
 // `sse` is not supported for `tts-1` or `tts-1-hd`; those models stream the raw audio body instead.
 const supportsSse = (model: string) => !/^tts-1(-hd)?(-|$)/.test(model)

-const FORMATS = new Set(["mp3", "opus", "aac", "flac", "wav", "pcm"])
-
 const fromRequest = Effect.fn("OpenAISpeech.fromRequest")(function* (request: MediaProtocol.Addressed<Request>) {
-  // Not in `unsupported`: that list would also reject `timestamps: false`, which asks for nothing.
-  if (request.timestamps === true)
-    return yield* route.unsupported("media.timestamps", `${route.name} does not return timestamps`)
-  if (request.format !== undefined && !FORMATS.has(request.format))
-    return yield* route.unsupported(
-      "media.format",
-      `${route.name} supports the mp3, opus, aac, flac, wav, and pcm formats, not "${request.format}"`,
-    )
  return MediaProtocol.json(
    mergeJsonRecords(
      {
@@ -119,9 +109,7 @@ const onEvent = Effect.fn("OpenAISpeech.onEvent")(function* (state: State, frame

 const finish = (state: State, context: MediaProtocol.ResponseContext<Request>) => {
  if (isSse(context.body) && !state.done) return Effect.fail(route.incomplete())
-  // The sent body reflects `providerOptions` and `http.body` overrides of `format`.
-  const sent = context.body.type === "json" ? context.body.value.response_format : undefined
-  const format = typeof sent === "string" ? sent : "mp3"
+  const format = context.request.format ?? "mp3"
  return SpeechStream.finish(route, state, {
    ...(format === "pcm" ? SpeechStream.pcm("pcm_s16le", PCM_SAMPLE_RATE) : SpeechStream.container(format)),
    usage: state.usage,
@@ -133,7 +121,7 @@ const finish = (state: State, context: MediaProtocol.ResponseContext<Request>) =
 // ---------------------------------------------------------------------------

 export const protocol = MediaProtocol.stream<Request, SpeechEvent, string | Uint8Array, State>(route, {
-  unsupported: ["language"],
+  unsupported: ["language", "timestamps"],
  body: { from: fromRequest },
  frames: (bytes, context) => (isSse(context.body) ? Framing.sse.frame(bytes) : bytes),
  initial: () => ({ chunks: [], done: false }),
@@ -1,9 +1,8 @@
 import { Effect, Schema, Stream } from "effect"
-import { classifyProviderFailure } from "../provider-error.js"
 import { Framing } from "../route/framing.js"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
-import { AIError, mergeJsonRecords, type MediaUsage } from "../schema/index.js"
+import { mergeJsonRecords, type MediaUsage } from "../schema/index.js"
 import {
  TranscriptionFinishEvent,
  TranscriptionModel,
@@ -60,9 +59,6 @@ const Usage = Schema.Union([
    input_tokens: Schema.optional(Schema.Number),
    output_tokens: Schema.optional(Schema.Number),
    total_tokens: Schema.optional(Schema.Number),
-    input_token_details: Schema.optional(
-      Schema.Struct({ audio_tokens: Schema.optional(Schema.Number), text_tokens: Schema.optional(Schema.Number) }),
-    ),
  }),
  Schema.Struct({ type: Schema.Literal("duration"), seconds: Schema.Number }),
 ])
@@ -79,23 +75,14 @@ const transcriptFields = {
  usage: Schema.optional(Usage),
 }

-/** OpenAI may add stream event types; frames outside `EVENT_TYPES` are ignored. */
-const EventType = Schema.Struct({ type: Schema.String })
 const Event = Schema.Union([
  Schema.Struct({ type: Schema.Literal("transcript.text.delta"), delta: Schema.String }),
  Schema.Struct({ type: Schema.Literal("transcript.text.segment"), ...Segment.fields }),
  Schema.Struct({ type: Schema.Literal("transcript.text.done"), ...transcriptFields }),
-  Schema.Struct({
-    type: Schema.Literal("error"),
-    message: Schema.optional(Schema.String),
-    error: Schema.optional(Schema.Struct({ message: Schema.optional(Schema.String) })),
-  }),
 ])
-const EVENT_TYPES = new Set(["transcript.text.delta", "transcript.text.segment", "transcript.text.done", "error"])
 const Transcript = Schema.Struct(transcriptFields)
 type Transcript = Schema.Schema.Type<typeof Transcript>

-const decodeEventType = route.decodeFrame(EventType)
 const decodeEvent = route.decodeFrame(Event)
 const decodeTranscript = route.decodeFrame(Transcript)

@@ -131,12 +118,10 @@ const capabilities = (model: string): Capabilities => {
  return TRANSCRIBE
 }

-/** whisper-1 ignores `stream`, so its `stream` mode sends a plain request and emits only `finish`. */
-const streamsEvents = (request: MediaProtocol.Addressed<Request>) =>
-  request.mode === "stream" && capabilities(request.model.id).stream
-
 const validate = (request: MediaProtocol.Addressed<Request>, model: Capabilities) => {
  const id = request.model.id
+  if (request.mode === "stream" && !model.stream)
+    return Effect.fail(route.unsupported("media.stream", `${id} does not stream; use Transcription.generate`))
  if (request.diarize === true && !model.diarize)
    return Effect.fail(route.unsupported("media.diarize", `${id} does not diarize; use gpt-4o-transcribe-diarize`))
  if (request.prompt !== undefined && model.diarize)
@@ -188,12 +173,12 @@ const fromRequest = Effect.fn("OpenAITranscription.fromRequest")(function* (requ
      timestamp_granularities: responseFormat === "verbose_json" ? [request.timestamps] : undefined,
      // Diarizing audio longer than 30 seconds requires a chunking strategy.
      chunking_strategy: model.diarize ? "auto" : undefined,
-      stream: streamsEvents(request) ? true : undefined,
+      stream: request.mode === "stream" ? true : undefined,
    },
    {
      overlay: mergeJsonRecords(request.providerOptions, request.http?.body),
      reserved: RESERVED_FORM_FIELDS,
-      repeatArrays: "key[]",
+      repeatArrays: true,
    },
  )
  return MediaProtocol.multipart(form)
@@ -211,15 +196,7 @@ const segment = (value: Schema.Schema.Type<typeof Segment>): TranscriptionSegmen
 })

 const onEvent = Effect.fn("OpenAITranscription.onEvent")(function* (state: State, frame: string) {
-  if (!EVENT_TYPES.has((yield* decodeEventType(frame)).type)) return [state, []] as const
  const event = yield* decodeEvent(frame)
-  if (event.type === "error")
-    return yield* new AIError({
-      reason: classifyProviderFailure({
-        message: `${route.name} stream failed: ${event.message ?? event.error?.message ?? "unknown error"}`,
-        rawBody: frame,
-      }),
-    })
  if (event.type === "transcript.text.done") return [{ ...state, transcript: event }, []] as const
  if (event.type === "transcript.text.delta")
    return [state, event.delta.length === 0 ? [] : [TranscriptionTextDeltaEvent.make({ delta: event.delta })]] as const
@@ -269,7 +246,7 @@ export const protocol = MediaProtocol.stream<Request, TranscriptionEvent, Frame,
  unsupported: ["speakers"],
  body: { from: fromRequest },
  frames: (bytes, context) =>
-    streamsEvents(context.request)
+    context.request.mode === "stream"
      ? Framing.sse.frame(bytes)
      : Framing.document.frame(bytes).pipe(Stream.map((document) => ({ document }))),
  initial: () => ({ segments: [] }),
@@ -132,7 +132,8 @@ const decodeResult = Effect.fn("ReplicateImages.decodeResult")(function* (
      status,
      `${route.name} prediction ${context.token.id} ${prediction.status}${typeof prediction.error === "string" ? `: ${prediction.error}` : ""}`,
    )
-  if (status !== "completed") return yield* output.pending(context.token.id)
+  if (status !== "completed")
+    return yield* output.invalid(`${route.name} prediction ${context.token.id} has not finished`)
  if (prediction.data_removed === true)
    return yield* output.ended("expired", `${route.name} removed the output of prediction ${context.token.id}`)
  if (!isOutput(prediction.output))
@@ -137,16 +137,12 @@ const decodeResult = Effect.fn("RunwayVideo.decodeResult")(function* (
    const message = `${route.name} task failed${code === undefined ? "" : ` (${code})`}${task.failure ? `: ${task.failure}` : ""}`
    // Runway failure codes are dotted paths; every moderation outcome carries a SAFETY segment.
    if (code !== undefined && /(^|\.)SAFETY(\.|$)/.test(code)) return yield* output.contentPolicy(message)
-    // ASSET.INVALID rejects the caller's input media; Runway documents it as not retryable.
-    return yield* output.ended(
-      "failed",
-      message,
-      code !== undefined && /^ASSET\.INVALID(\.|$)/.test(code) ? "InvalidRequest" : "ProviderInternal",
-    )
+    return yield* output.ended("failed", message)
  }
  if (status === "cancelled")
    return yield* output.ended("cancelled", `${route.name} task ${context.token.taskID} was cancelled`)
-  if (status !== "completed") return yield* output.pending(context.token.taskID)
+  if (status !== "completed")
+    return yield* output.invalid(`${route.name} task ${context.token.taskID} has not finished`)
  const urls = task.output ?? []
  if (urls.length === 0) return yield* output.invalid(`${route.name} task succeeded without any output`)
  return new VideoResponse({
@@ -175,7 +171,7 @@ export const protocol = MediaProtocol.queued<Request, VideoResponse, Token>(rout
  start: { body: { from: fromRequest }, decode: decodeStart },
  status: { path: taskPath, decode: decodeStatus },
  result: { path: taskPath, decode: decodeResult },
-  cancel: { method: "DELETE", path: taskPath, activeOnly: true },
+  cancel: { method: "DELETE", path: taskPath },
 })

 const startPath = (request: Request) => {
@@ -175,7 +175,7 @@ const decodeUpscaleResult = Effect.fn("StabilityImages.decodeUpscaleResult")(fun
 ) {
  if (response.status === 202) {
    const output = yield* upscaleRoute.text(response)
-    return yield* output.pending(context.token.id)
+    return yield* output.invalid(`${upscaleRoute.name} upscale ${context.token.id} has not finished`)
  }
  return yield* decodeUpscaleImage(response)
 })
@@ -72,44 +72,6 @@ export const blocked = (name: string, chunk: Chunk, frame: string) => {
  })
 }

-const CONTENT_FILTER_REASONS = new Set([
-  "IMAGE_SAFETY",
-  "RECITATION",
-  "SAFETY",
-  "BLOCKLIST",
-  "PROHIBITED_CONTENT",
-  "SPII",
-  "MODEL_ARMOR",
-  "IMAGE_PROHIBITED_CONTENT",
-  "IMAGE_RECITATION",
-  "LANGUAGE",
-])
-
-/** Finish reasons for which Gemini stops output on safety or policy grounds. */
-export const contentFiltered = (finishReason: string | undefined) =>
-  finishReason !== undefined && CONTENT_FILTER_REASONS.has(finishReason)
-
-/** Callers check that the response produced no output: a policy stop after output is a partial result instead. */
-export const withheld = (name: string, chunk: Chunk, frame: string) => {
-  const finishReason = chunk.candidates?.[0]?.finishReason
-  if (!contentFiltered(finishReason)) return undefined
-  return new AIError({
-    reason: new ContentPolicyError({ message: `${name} withheld its output (${finishReason})`, body: frame }),
-  })
-}
-
-/** Any finish reason other than `STOP` means the output may be cut short, so it is surfaced rather than dropped. */
-export const notices = (name: string, state: Metadata): ReadonlyArray<Media.Notice> | undefined =>
-  state.finishReason === undefined || state.finishReason === "STOP"
-    ? undefined
-    : [
-        {
-          type: contentFiltered(state.finishReason) ? "filtered" : "other",
-          message: `${name} finished with ${state.finishReason}`,
-          providerMetadata: { google: { finishReason: state.finishReason } },
-        },
-      ]
-
 export const usage = (usage: UsageMetadata | undefined): MediaUsage | undefined =>
  usage === undefined
    ? undefined
@@ -71,9 +71,8 @@ export const imageOutput = (
 }

 /**
- * Append multipart text fields: strings as-is, other values as JSON, or scalar arrays as one part per item with
- * `repeatArrays`, named `key[]` or `key`. `overlay` keys in `reserved` are dropped so `http.body` cannot replace
- * route-owned fields.
+ * Append multipart text fields: strings as-is, other values as JSON, or arrays as repeated `key[]` parts with
+ * `repeatArrays`. `overlay` keys in `reserved` are dropped so `http.body` cannot replace route-owned fields.
 */
 export const appendFields = (
  form: FormData,
@@ -81,13 +80,13 @@ export const appendFields = (
  options: {
    readonly overlay?: Record<string, unknown>
    readonly reserved: ReadonlySet<string>
-    readonly repeatArrays?: "key[]" | "key"
+    readonly repeatArrays?: true
  },
 ) => {
  const overlay = Object.entries(options.overlay ?? {}).filter(([key]) => !options.reserved.has(key))
  Object.entries(mergeJsonRecords(fields, Object.fromEntries(overlay)) ?? {}).forEach(([key, value]) => {
-    if (Array.isArray(value) && value.every(isScalar) && options.repeatArrays !== undefined)
-      return value.forEach((item) => form.append(options.repeatArrays === "key[]" ? `${key}[]` : key, String(item)))
+    if (Array.isArray(value) && options.repeatArrays)
+      return value.forEach((item) => form.append(`${key}[]`, String(item)))
    form.append(key, typeof value === "string" ? value : encodeJson(value))
  })
 }
@@ -1,10 +0,0 @@
-/** Split an ordered token list into runs of consecutive tokens with the same speaker. */
-export const group = <Item>(items: ReadonlyArray<Item>, speaker: (item: Item) => unknown) =>
-  items.reduce<Array<Array<Item>>>((turns, item) => {
-    const last = turns.at(-1)
-    if (last === undefined || speaker(last[0]) !== speaker(item)) return [...turns, [item]]
-    last.push(item)
-    return turns
-  }, [])
-
-export * as SpeakerTurns from "./speaker-turns.js"
@@ -85,7 +85,6 @@ export const finish = (
    readonly mediaType: string | undefined
    readonly info?: Media.Info
    readonly usage?: MediaUsage
-    readonly notices?: ReadonlyArray<Media.Notice>
    readonly providerMetadata?: ProviderMetadata
    readonly detail?: string
  },
@@ -98,7 +97,6 @@ export const finish = (
    SpeechFinishEvent.make({
      audio: Media.bytes(concatBytes(state.chunks), output.mediaType, { info: output.info }),
      usage: output.usage,
-      notices: output.notices,
      providerMetadata: output.providerMetadata,
    }),
  ])
@@ -147,12 +147,7 @@ export const appendOrStart = <K extends StreamKey>(
  route: string,
  tools: State<K>,
  key: K,
-  delta: {
-    readonly id?: string
-    readonly name?: string
-    readonly text: string
-    readonly providerMetadata?: ProviderMetadata
-  },
+  delta: { readonly id?: string; readonly name?: string; readonly text: string },
  missingToolMessage: string,
 ): AppendOutcome<K> | AIError => {
  const current = tools[key]
@@ -166,7 +161,7 @@ export const appendOrStart = <K extends StreamKey>(
    namespace: current?.namespace,
    input: `${current?.input ?? ""}${delta.text}`,
    providerExecuted: current?.providerExecuted,
-    providerMetadata: current?.providerMetadata ?? delta.providerMetadata,
+    providerMetadata: current?.providerMetadata,
  }
  if (current && delta.text.length === 0 && current.id === id && current.name === name)
    return { tools, tool: current, events: [] }
@@ -101,8 +101,7 @@ const decodeResponse = Effect.fn("XAIImages.decodeResponse")(function* (
  )
  if (images.length === 0) return yield* output.invalid(`${route.name} returned no images`)
  const usage = ProviderShared.isRecord(decoded.usage) ? decoded.usage : undefined
-  // xAI reports a USD cost (`cost_in_usd_ticks`) rather than tokens, seconds, or credits; the raw record stays in
-  // provider metadata.
+  // xAI reports image counts rather than tokens, seconds, or credits; the raw record stays in provider metadata.
  return new ImageResponse({
    images,
    providerMetadata: usage === undefined ? undefined : { xai: { usage } },
@@ -65,13 +65,6 @@ const STATUS = {
  expired: "expired",
 } as const satisfies Record<string, Status>

-// Documented video error codes; `service_unavailable`, `internal_error`, and unknown codes are provider-side.
-const FAILURE = {
-  invalid_argument: "InvalidRequest",
-  failed_precondition: "InvalidRequest",
-  permission_denied: "Authentication",
-} as const satisfies Record<string, MediaProtocol.Failure>
-
 // ---------------------------------------------------------------------------
 // 5. Request body construction
 // ---------------------------------------------------------------------------
@@ -143,14 +136,14 @@ const decodeResult = Effect.fn("XAIVideo.decodeResult")(function* (
  const output = yield* decodeVideoStatus(response)
  const decoded = output.value
  const status = yield* MediaProtocol.status(STATUS, decoded.status, output)
-  if (status === "running") return yield* output.pending(context.token.requestID)
+  if (status === "running")
+    return yield* output.invalid(`${route.name} request ${context.token.requestID} has not finished`)
  if (status === "failed") {
    const code = decoded.error?.code ?? undefined
    const message = decoded.error?.message ?? undefined
    return yield* output.ended(
      "failed",
      `${route.name} generation failed${code === undefined ? "" : ` (${code})`}${message === undefined ? "" : `: ${message}`}`,
-      MediaProtocol.failure(FAILURE, code),
    )
  }
  if (status !== "completed")
@@ -1,6 +1,7 @@
-import { Duration, Effect, Schema } from "effect"
+import { Effect, Schema } from "effect"
 import type { HttpClientResponse } from "effect/unstable/http"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
+import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
 import { mergeJsonRecords, type OpenString } from "../schema/index.js"
@@ -8,7 +9,6 @@ import { mergeJsonRecords, type OpenString } from "../schema/index.js"
 const route = MediaProtocol.identity({ id: "zai-images", name: "Z.ai Images", provider: "zai" })
 export const DEFAULT_BASE_URL = "https://api.z.ai/api/paas/v4"
 export const PATH = "/images/generations"
-const OUTPUT_RETENTION = Duration.days(30)

 // ---------------------------------------------------------------------------
 // 1. Public model input
@@ -76,7 +76,7 @@ const decodeResponse = Effect.fn("ZAIImages.decodeResponse")(function* (
  const filters = decoded.content_filter ?? []
  return new ImageResponse({
    // Z.ai returns only URLs and no content type; the media type resolves when the asset is materialized.
-    images: yield* Effect.forEach(decoded.data, (item) => MediaProtocol.expiringUrl(item.url, OUTPUT_RETENTION)),
+    images: decoded.data.map((item) => Media.url(item.url)),
    // Z.ai reports applied content filters alongside a successful result; surface them instead of dropping them.
    notices:
      filters.length === 0
@@ -58,47 +58,6 @@ export const isContextOverflowFailure = (failure: unknown) =>
    ? failure.reason._tag === "InvalidRequest" && failure.reason.classification === "context-overflow"
    : Schema.is(ProviderErrorEvent)(failure) && failure.classification === "context-overflow"

-/**
- * Whether a failed call may succeed when sent again: rate limits, provider-side failures, transport failures that did
- * not deliver an accepted write, and unrecognized failures. Callers decide which calls are safe to repeat.
- */
-export const isRetryable = (error: AIError) => {
-  const override = error.reason.http?.headers["x-should-retry"]
-  if (override === "true") return true
-  if (override === "false") return false
-  switch (error.reason._tag) {
-    case "RateLimit":
-    case "ProviderInternal":
-      return true
-    // A WebSocket acknowledgment marks delivery accepted before model output may exist.
-    // Read failures can still recover; the caller chooses retry versus continuation from durable output.
-    case "Transport":
-      return (
-        error.reason.delivery !== "rejected" &&
-        (error.reason.delivery !== "accepted" || error.reason.operation === "read")
-      )
-    case "InvalidProviderOutput":
-      return error.reason.classification === "incomplete-stream"
-    // Unrecognized failures retry: classification records affirmative
-    // deterministic evidence, and transient failures are exactly the ones
-    // that arrive in shapes no classifier anticipates.
-    case "UnknownProvider":
-      return true
-    case "Authentication":
-    case "QuotaExceeded":
-    case "ContentPolicy":
-    case "InvalidRequest":
-    case "UnsupportedOperation":
-    case "NoRoute":
-    case "Timeout":
-      return false
-    default: {
-      const exhaustive: never = error.reason
-      return exhaustive
-    }
-  }
-}
-
 const decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown))
 // OpenCode Zen reports account caps as typed 429/402 errors that are not throttles.
 const QUOTA_CODES = new Set([
@@ -3,10 +3,8 @@ import type { ProviderAuthOption } from "../route/auth-options.js"
 import { MediaRoute } from "../route/media.js"
 import { type HttpOptions, ProviderID, type ModelID } from "../schema/index.js"
 import { ElevenLabsSpeech } from "../protocols/elevenlabs-speech.js"
-import { ElevenLabsTranscription } from "../protocols/elevenlabs-transcription.js"

 export type { ElevenLabsOutputFormat, ElevenLabsSpeechOptions } from "../protocols/elevenlabs-speech.js"
-export type { ElevenLabsTranscriptionOptions } from "../protocols/elevenlabs-transcription.js"

 export const id = ProviderID.make("elevenlabs")

@@ -26,15 +24,12 @@ const auth = (options: ProviderAuthOption<"optional">) => {
 export const configure = (input: Config = {}) => {
  const media = MediaRoute.deployment(input, auth(input))
  const speech = (modelID: string | ModelID) => ElevenLabsSpeech.model({ ...media, id: modelID })
-  const transcription = (modelID: string | ModelID) => ElevenLabsTranscription.model({ ...media, id: modelID })
  return {
    id,
    speech,
-    transcription,
    configure,
  }
 }

 export const provider = configure()
 export const speech = provider.speech
-export const transcription = provider.transcription
@@ -5,14 +5,12 @@ import { Media } from "../media.js"
 import type { AuthInput } from "./auth.js"
 import {
  AIError,
-  AuthenticationError,
  ContentPolicyError,
  HttpContext,
  InvalidProviderOutputError,
  InvalidRequestError,
  ProviderID,
  ProviderInternalError,
-  RateLimitError,
  UnsupportedOperationError,
 } from "../schema/index.js"

@@ -139,11 +137,6 @@ export interface Queued<Request, Response, Token> {
  readonly cancel?: {
    readonly method: AuthInput["method"]
    readonly path: (token: Token) => string
-    /**
-     * Fetch a fresh status first and skip the call for terminal generations, for providers whose cancel endpoint
-     * destroys finished work (Runway's `DELETE /v1/tasks/{id}` deletes completed tasks and their outputs).
-     */
-    readonly activeOnly?: boolean
  }
 }

@@ -190,16 +183,6 @@ export const stream = <Request, Event, Frame, State>(
 // Response helpers
 // ---------------------------------------------------------------------------

-/** Reasons a provider can report for a `failed` generation; anything it does not classify is `ProviderInternal`. */
-const FAILURES = {
-  InvalidRequest: InvalidRequestError,
-  Authentication: AuthenticationError,
-  RateLimit: RateLimitError,
-  ProviderInternal: ProviderInternalError,
-}
-
-export type Failure = keyof typeof FAILURES
-
 const context = (response: HttpClientResponse.HttpClientResponse) =>
  new HttpContext({ url: response.request.url, status: response.status, headers: response.headers })

@@ -211,10 +194,8 @@ export const identity = (input: { readonly id: string; readonly name: string; re

  /**
   * Read a text body while retaining the original payload and HTTP context on every downstream error. `invalid` is a
-   * malformed provider document; `ended` is a generation that reached a terminal status without output (`failed`
-   * carries the provider's classification, defaulting to `ProviderInternal`; `cancelled`/`expired` mean the result
-   * will never exist); `pending` is a `result()` read before the generation finished, which is caller misuse;
-   * `contentPolicy` is a moderated result.
+   * malformed provider document; `ended` is a generation that reached a terminal status without output (`failed` is
+   * provider-side, `cancelled`/`expired` mean the result will never exist); `contentPolicy` is a moderated result.
   */
  const text = Effect.fn("MediaProtocol.text")(function* (response: HttpClientResponse.HttpClientResponse) {
    const http = context(response)
@@ -236,25 +217,13 @@ export const identity = (input: { readonly id: string; readonly name: string; re
      http,
      invalid: (message: string, cause?: unknown) =>
        new AIError({ reason: new InvalidProviderOutputError({ route: input.id, message, body, http, cause }) }),
-      ended: (
-        status: Exclude<Status, "queued" | "running" | "completed">,
-        message: string,
-        failure: Failure = "ProviderInternal",
-      ) =>
+      ended: (status: Exclude<Status, "queued" | "running" | "completed">, message: string) =>
        new AIError({
          reason:
            status === "failed"
-              ? new FAILURES[failure]({ message, body, http })
+              ? new ProviderInternalError({ message, body, http })
              : new InvalidRequestError({ message, body, http }),
        }),
-      pending: (id: string) =>
-        new AIError({
-          reason: new InvalidRequestError({
-            message: `${input.name} generation ${id} has not finished; await it before reading the result`,
-            body,
-            http,
-          }),
-        }),
      contentPolicy: (message: string) => new AIError({ reason: new ContentPolicyError({ message, body, http }) }),
    }
  })
@@ -316,14 +285,11 @@ export const status = <Table extends Record<string, Status>>(
  raw: string,
  output: Output,
 ): Effect.Effect<Status, AIError> => {
-  if (!Object.hasOwn(table, raw)) return Effect.fail(output.invalid(`Unknown generation status "${raw}"`))
-  return Effect.succeed(table[raw])
+  const normalized: Status | undefined = table[raw]
+  if (normalized === undefined) return Effect.fail(output.invalid(`Unknown generation status "${raw}"`))
+  return Effect.succeed(normalized)
 }

-/** Map a provider error code through the protocol's table; missing or unmapped codes are `ProviderInternal`. */
-export const failure = (table: Readonly<Record<string, Failure>>, code: string | number | undefined): Failure =>
-  code !== undefined && Object.hasOwn(table, code) ? table[code] : "ProviderInternal"
-
 /** A `url` asset whose provider-declared retention window starts now. */
 export const expiringUrl = (url: string, retention: Duration.Duration, options?: Parameters<typeof Media.url>[1]) =>
  Clock.currentTimeMillis.pipe(
@@ -1,13 +1,12 @@
-import { Duration, Effect, Schedule, Schema, Stream } from "effect"
+import { Effect, Schema, Stream } from "effect"
 import { Headers, HttpClientRequest, type HttpClientResponse } from "effect/unstable/http"
 import { Auth, type AuthInput } from "./auth.js"
 import { Endpoint } from "./endpoint.js"
 import { RequestExecutorService, type Interface } from "./executor-service.js"
 import { RequestExecutor } from "./executor.js"
 import { MediaProtocol } from "./media-protocol.js"
-import { Generation, isTerminal } from "../generation.js"
+import { Generation } from "../generation.js"
 import type { Media } from "../media.js"
-import { isRetryable } from "../provider-error.js"
 import {
  AIError,
  AIErrorReason,
@@ -138,32 +137,6 @@ export const inline = <Request extends MediaRequest, Response>(
  }
 }

-const READ_RETRY_MAX_DELAY = Duration.seconds(30)
-
-/**
- * Status and result reads retry transient failures; `start` and `cancel` never do. Gaps grow exponentially from 1s,
- * jittered, up to 30s each, for at most 8 retries (about two minutes when every attempt fails), so a direct
- * `Generation.result()` stays bounded; `await` and `events` also cut retries off at `poll.timeout`. A provider
- * `retryAfterMs` raises the gap, still capped at 30s.
- */
-const READ_RETRY = Schedule.max([
-  Schedule.min([Schedule.exponential("1 second"), Schedule.spaced(READ_RETRY_MAX_DELAY)]),
-  Schedule.recurs(8),
-]).pipe(
-  Schedule.jittered,
-  Schedule.setInputType<AIError>(),
-  Schedule.modifyDelay(({ input, duration }) =>
-    Effect.succeed(
-      Duration.min(
-        input.reason._tag === "RateLimit" || input.reason._tag === "ProviderInternal"
-          ? Duration.max(duration, Duration.millis(input.reason.retryAfterMs ?? 0))
-          : duration,
-        READ_RETRY_MAX_DELAY,
-      ),
-    ),
-  ),
-)
-
 /**
 * Compose a queued media protocol the same way, adding `start`/`resume` handles whose polls reuse the route's auth,
 * deployment headers, and (for `start`) the request's `http` overlay. The token is decoded once at the boundary and
@@ -181,8 +154,6 @@ export const queued = <Request extends MediaRequest, Response, Token>(
  const generationRoute = (token: Token, http: HttpOptions | undefined, execute: Execute) => {
    const materialize = (asset: Media.Asset) =>
      asset.materialize().pipe(Effect.provideService(RequestExecutorService, { execute }))
-    // Only the GET exchange retries: a decoded terminal failure (`output.ended`) can be a `ProviderInternal` too, and
-    // re-reading it would spin until the caller's deadline.
    const poll = <A>(operation: {
      readonly path: (token: Token) => string
      readonly decode: (
@@ -190,23 +161,17 @@ export const queued = <Request extends MediaRequest, Response, Token>(
        context: MediaProtocol.PollContext<Token>,
      ) => Effect.Effect<A, AIError>
    }) =>
-      transport.call("GET", operation.path(token), http, execute).pipe(
-        Effect.retry({ schedule: READ_RETRY, while: isRetryable }),
-        Effect.flatMap((sent) => operation.decode(sent.response, { token, auth: sent.auth, materialize })),
-      )
-    const status = poll(protocol.status)
+      transport
+        .call("GET", operation.path(token), http, execute)
+        .pipe(Effect.flatMap((sent) => operation.decode(sent.response, { token, auth: sent.auth, materialize })))
    const cancel = protocol.cancel
-    const send =
-      cancel === undefined
-        ? undefined
-        : transport.call(cancel.method, cancel.path(token), http, execute).pipe(Effect.asVoid)
    return {
-      status,
+      status: poll(protocol.status),
      result: poll(protocol.result),
      cancel:
-        send !== undefined && cancel?.activeOnly
-          ? status.pipe(Effect.flatMap((snapshot) => (isTerminal(snapshot.status) ? Effect.void : send)))
-          : send,
+        cancel === undefined
+          ? undefined
+          : transport.call(cancel.method, cancel.path(token), http, execute).pipe(Effect.asVoid),
    }
  }

@@ -415,11 +380,7 @@ const encode = (body: MediaProtocol.Body | undefined, headers: Headers.Headers)
  }
 }

-/**
- * Common fields are never silently dropped: a present field the protocol declared unsupported fails typed. `false`
- * counts as present because some booleans mean something when false (video `audio`); protocols reject opt-in
- * booleans such as speech `timestamps` with `=== true` in `body.from` instead of listing them.
- */
+/** Common fields are never silently dropped: a present field the protocol declared unsupported fails typed. */
 const rejectUnsupported = <Request extends object>(
  route: string,
  provider: ProviderID,
@@ -103,7 +103,7 @@ export type TranscriptionRequestInput<Model extends TranscriptionModel = Transcr
 // Response and events
 // ---------------------------------------------------------------------------

-/** Speaker labels are provider-native (`A`, `0`, `spk:0`, `speaker_0`, or a known speaker name). */
+/** Speaker labels are provider-native (`A`, `0`, `spk:0`, or a known speaker name). */
 export const TranscriptionSegment = Schema.Struct({
  text: Schema.String,
  startSeconds: Schema.Number,
@@ -351,34 +351,10 @@ describe("OpenAI Responses effort updates", () => {
    }),
  )

-  it.effect("strips markers when the body overlay selects pro reasoning mode", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: OpenAI.configure({ apiKey: "fixture", http: { body: { reasoning: { mode: "pro" } } } }).responses(
-            "gpt-6-sol",
-          ),
-          messages: conversation,
-          providerOptions: { reasoningEffort: "low" },
-        }),
-      )
-
-      expect(updates(prepared.body)).toEqual([])
-      expect(prepared.body.reasoning).toEqual({ effort: "low" })
-    }),
-  )
-
  for (const [id, supported] of [
    ["gpt-6-astra", true],
    ["openai/gpt-6-astra", true],
-    ["gpt-6-sol", true],
-    ["openai/gpt-6-sol", true],
-    ["gpt-6-luna", true],
-    ["openai/gpt-6-luna", true],
    ["gpt-6-astra-2026-09-01", false],
-    ["gpt-6-sol-pro", false],
-    ["gpt-6-luna-pro", false],
-    ["gpt-6-sol-fast", false],
    ["gpt-5.6-sol", false],
  ] as const) {
    it.effect(`${supported ? "lowers" : "strips"} markers for ${id}`, () =>
@@ -39,18 +39,17 @@ describe("experimental Evaluation", () => {
        type: "choice",
        choice: "billing",
        probabilities: { billing: 0.9, technical: 0.1 },
-        confidence: 0.8,
      })
      expect(response.answers.urgency).toEqual({
        type: "score",
        score: 1.2,
        probabilities: { "0": 0, "1": 0.8, "2": 0.2 },
-        confidence: 0.6,
      })
      expect(response.answers.refund).toEqual({ type: "boolean", probability: 0.97 })
      expect(response.usage?.totalTokens).toBe(36)
      expect(response.providerMetadata).toEqual({
        typesafe: {
+          confidence: { department: 0.8, urgency: 0.6 },
          legend: { urgency: { "0": "Can wait", "1": "Needs attention", "2": "Blocking" } },
        },
      })
@@ -26,10 +26,8 @@ const request = Evaluation.request({
 const result = EvaluationClient.evaluate(request)
 type Result = Success<typeof result>
 type Choice = Assert<Equal<Result["answers"]["topic"]["choice"], "billing" | "support">>
-type Confidence = Assert<Equal<Result["answers"]["topic"]["confidence"], number | undefined>>
 type ClientRequirements = Assert<Equal<Requirements<typeof result>, Service>>
 void (true satisfies Choice)
-void (true satisfies Confidence)
 void (true satisfies ClientRequirements)

 Effect.gen(function* () {
@@ -23,7 +23,6 @@ import { Provider as ProviderSubpath } from "@opencode/ai/provider"
 import {
  AssemblyAI,
  Baseten,
-  BlackForestLabs,
  Cartesia,
  CloudflareAIGateway,
  CloudflareWorkersAI,
@@ -33,18 +32,14 @@ import {
  Fal,
  Fireworks,
  Google,
-  Meta,
  OpenCodeZen,
  OpenAI,
  OpenAICompatible,
  OpenRouter,
-  Replicate,
  Runway,
-  Stability,
  TypeSafeAI,
  VercelAIGateway,
  XAI,
-  ZAI,
 } from "@opencode/ai/providers"
 import {
  OpenAIChat,
@@ -156,34 +151,8 @@ describe("public exports", () => {
    expect(XAI.provider.chat).toBe(XAI.chat)
    expect(XAI.configure({ apiKey: "fixture" }).responses("grok-4.3").route.id).toBe("openai-responses")
    expect(XAI.configure({ apiKey: "fixture" }).chat("grok-4.3").route.id).toBe("openai-compatible-chat")
-    expect(OpenAI.configure({ apiKey: "fixture" }).image("gpt-image-2").route.id).toBe("openai-images")
-    expect(OpenAI.provider.image).toBe(OpenAI.image)
-    expect(Google.configure({ apiKey: "fixture" }).image("imagen-4.0-generate-001").route.id).toBe("google-images")
-    expect(Google.provider.image).toBe(Google.image)
-    expect(XAI.configure({ apiKey: "fixture" }).image("grok-imagine-image").route.id).toBe("xai-images")
-    expect(XAI.provider.image).toBe(XAI.image)
-    expect(Fal.configure({ apiKey: "fixture" }).image("fal-ai/flux/dev").route.id).toBe("fal-images")
-    expect(Fal.provider.image).toBe(Fal.image)
-    expect(BlackForestLabs.configure({ apiKey: "fixture" }).image("flux-2-pro").route.id).toBe("bfl-images")
-    expect(BlackForestLabs.provider.image).toBe(BlackForestLabs.image)
-    expect(Replicate.configure({ apiKey: "fixture" }).image("black-forest-labs/flux-schnell").route.id).toBe(
-      "replicate-images",
-    )
-    expect(Replicate.provider.image).toBe(Replicate.image)
-    expect(Stability.configure({ apiKey: "fixture" }).image("sd3.5-large").route.id).toBe("stability-images")
-    expect(Stability.provider.image).toBe(Stability.image)
-    expect(Stability.configure({ apiKey: "fixture" }).upscale().route.id).toBe("stability-upscale")
-    expect(Stability.provider.upscale).toBe(Stability.upscale)
-    expect(Meta.configure({ apiKey: "fixture" }).image("muse-image").route.id).toBe("meta-images")
-    expect(Meta.provider.image).toBe(Meta.image)
-    expect(ZAI.configure({ apiKey: "fixture" }).image("glm-image").route.id).toBe("zai-images")
-    expect(ZAI.provider.image).toBe(ZAI.image)
    expect(XAI.configure({ apiKey: "fixture" }).video("grok-imagine-video-1.5").route.id).toBe("xai-video")
-    expect(XAI.provider.video).toBe(XAI.video)
-    expect(Google.configure({ apiKey: "fixture" }).video("veo-3.1-generate-preview").route.id).toBe("google-video")
-    expect(Google.provider.video).toBe(Google.video)
    expect(Fal.configure({ apiKey: "fixture" }).video("fal-ai/veo3.1").route.id).toBe("fal-video")
-    expect(Fal.provider.video).toBe(Fal.video)
    expect(Runway.configure({ apiKey: "fixture" }).video("gen4.5").route.id).toBe("runway-video")
    expect(Runway.provider.video).toBe(Runway.video)
    expect(OpenAI.configure({ apiKey: "fixture" }).speech("gpt-4o-mini-tts").route.id).toBe("openai-speech")
@@ -197,11 +166,6 @@ describe("public exports", () => {
    expect(Google.configure({ apiKey: "fixture" }).transcription("gemini-3.5-transcribe").route.kind).toBe("stream")
    expect(Deepgram.configure({ apiKey: "fixture" }).transcription("nova-3").route.kind).toBe("inline")
    expect(AssemblyAI.configure({ apiKey: "fixture" }).transcription("universal-3-5-pro").route.kind).toBe("queued")
-    expect(ElevenLabs.configure({ apiKey: "fixture" }).transcription("scribe_v2").route.id).toBe(
-      "elevenlabs-transcription",
-    )
-    expect(ElevenLabs.configure({ apiKey: "fixture" }).transcription("scribe_v2").route.kind).toBe("inline")
-    expect(ElevenLabs.provider.transcription).toBe(ElevenLabs.transcription)
  })

  test("protocol barrels expose supported low-level routes", () => {
@@ -1,32 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "tags": [
-      "prefix:elevenlabs-transcription",
-      "provider:elevenlabs",
-      "protocol:elevenlabs-transcription"
-    ],
-    "name": "elevenlabs-transcription/groups-diarized-words-into-speaker-turns",
-    "recordedAt": "2026-09-27T09:35:28.265Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.elevenlabs.io/v1/speech-to-text",
-        "headers": {
-          "content-type": "multipart/form-data; boundary=----WebKitFormBoundary356bdc14864a477dbacbfcf60d1ecceb"
-        },
-        "body": "--BOUNDARY\r\nContent-Disposition: form-data; name=\"file\"; filename=\"audio.mp3\"\r\nContent-Type: audio/mpeg\r\n\r\n[audio]\r\n--BOUNDARY\r\nContent-Disposition: form-data; name=\"model_id\"\r\n\r\nscribe_v2\r\n--BOUNDARY\r\nContent-Disposition: form-data; name=\"diarize\"\r\n\r\ntrue\r\n--BOUNDARY--\r\n"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"language_code\":\"eng\",\"language_probability\":0.9495430588722229,\"text\":\"Did the release ship? Yes, it shipped this morning\",\"words\":[{\"text\":\"Did\",\"start\":0.34,\"end\":0.44,\"type\":\"word\",\"speaker_id\":\"speaker_0\",\"logprob\":-1.7881377516459906e-6},{\"text\":\" \",\"start\":0.44,\"end\":0.48,\"type\":\"spacing\",\"speaker_id\":\"speaker_0\",\"logprob\":-1.1920928244535389e-7},{\"text\":\"the\",\"start\":0.48,\"end\":0.56,\"type\":\"word\",\"speaker_id\":\"speaker_0\",\"logprob\":-1.1920928244535389e-7},{\"text\":\" \",\"start\":0.56,\"end\":0.6,\"type\":\"spacing\",\"speaker_id\":\"speaker_0\",\"logprob\":-7.152531907195225e-6},{\"text\":\"release\",\"start\":0.6,\"end\":0.92,\"type\":\"word\",\"speaker_id\":\"speaker_0\",\"logprob\":-7.152531907195225e-6},{\"text\":\" \",\"start\":0.92,\"end\":0.94,\"type\":\"spacing\",\"speaker_id\":\"speaker_0\",\"logprob\":-8.344646857949556e-7},{\"text\":\"ship?\",\"start\":0.94,\"end\":1.26,\"type\":\"word\",\"speaker_id\":\"speaker_0\",\"logprob\":-7.414704032271402e-6},{\"text\":\" \",\"start\":1.26,\"end\":1.26,\"type\":\"spacing\",\"speaker_id\":\"speaker_0\",\"logprob\":-0.0009363081189803779},{\"text\":\"Yes,\",\"start\":1.68,\"end\":2.02,\"type\":\"word\",\"speaker_id\":\"speaker_1\",\"logprob\":-0.003542040009030245},{\"text\":\" \",\"start\":2.02,\"end\":2.48,\"type\":\"spacing\",\"speaker_id\":\"speaker_1\",\"logprob\":-3.933898824470816e-6},{\"text\":\"it\",\"start\":2.48,\"end\":2.62,\"type\":\"word\",\"speaker_id\":\"speaker_1\",\"logprob\":-3.933898824470816e-6},{\"text\":\" \",\"start\":2.62,\"end\":2.64,\"type\":\"spacing\",\"speaker_id\":\"speaker_1\",\"logprob\":-0.000013589766240329482},{\"text\":\"shipped\",\"start\":2.66,\"end\":2.9,\"type\":\"word\",\"speaker_id\":\"speaker_1\",\"logprob\":-0.000013589766240329482},{\"text\":\" \",\"start\":2.9,\"end\":2.94,\"type\":\"spacing\",\"speaker_id\":\"speaker_1\",\"logprob\":0.0},{\"text\":\"this\",\"start\":2.94,\"end\":3.12,\"type\":\"word\",\"speaker_id\":\"speaker_1\",\"logprob\":0.0},{\"text\":\" \",\"start\":3.12,\"end\":3.18,\"type\":\"spacing\",\"speaker_id\":\"speaker_1\",\"logprob\":-3.576278118089249e-7},{\"text\":\"morning\",\"start\":3.18,\"end\":3.5,\"type\":\"word\",\"speaker_id\":\"speaker_1\",\"logprob\":-3.576278118089249e-7}],\"transcription_id\":\"cs3I2282TH8hjw12brNg\",\"audio_duration_secs\":3.5526875}"
-      }
-    }
-  ]
-}
@@ -1,50 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "tags": [
-      "prefix:elevenlabs-transcription",
-      "provider:elevenlabs",
-      "protocol:elevenlabs-transcription"
-    ],
-    "name": "elevenlabs-transcription/transcribes-audio-with-word-timestamps",
-    "recordedAt": "2026-09-27T09:35:27.686Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.elevenlabs.io/v1/speech-to-text",
-        "headers": {
-          "content-type": "multipart/form-data; boundary=----WebKitFormBoundarye2be7b31e94441bbbeb35a9c890a9d74"
-        },
-        "body": "--BOUNDARY\r\nContent-Disposition: form-data; name=\"file\"; filename=\"audio.mp3\"\r\nContent-Type: audio/mpeg\r\n\r\n[audio]\r\n--BOUNDARY\r\nContent-Disposition: form-data; name=\"model_id\"\r\n\r\nscribe_v2\r\n--BOUNDARY--\r\n"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"language_code\":\"eng\",\"language_probability\":0.6618340611457825,\"text\":\"Hello from OpenCode\",\"words\":[{\"text\":\"Hello\",\"start\":0.4,\"end\":0.66,\"type\":\"word\",\"logprob\":-0.000014781842764932662},{\"text\":\" \",\"start\":0.66,\"end\":0.74,\"type\":\"spacing\",\"logprob\":-3.814689989667386e-6},{\"text\":\"from\",\"start\":0.74,\"end\":0.84,\"type\":\"word\",\"logprob\":-3.814689989667386e-6},{\"text\":\" \",\"start\":0.84,\"end\":0.9,\"type\":\"spacing\",\"logprob\":-0.018268775194883347},{\"text\":\"OpenCode\",\"start\":0.9,\"end\":1.44,\"type\":\"word\",\"logprob\":-0.1251817401498556}],\"transcription_id\":\"D4VfnANM2ArCHTujIb9q\",\"audio_duration_secs\":1.54125}"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://api.elevenlabs.io/v1/speech-to-text",
-        "headers": {
-          "content-type": "multipart/form-data; boundary=----WebKitFormBoundaryfb80d0e44d9e44d299416ed546a04056"
-        },
-        "body": "--BOUNDARY\r\nContent-Disposition: form-data; name=\"file\"; filename=\"audio.mp3\"\r\nContent-Type: audio/mpeg\r\n\r\n[audio]\r\n--BOUNDARY\r\nContent-Disposition: form-data; name=\"model_id\"\r\n\r\nscribe_v2\r\n--BOUNDARY--\r\n"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"language_code\":\"eng\",\"language_probability\":0.6618340611457825,\"text\":\"Hello from OpenCode\",\"words\":[{\"text\":\"Hello\",\"start\":0.4,\"end\":0.66,\"type\":\"word\",\"logprob\":-0.000023007127310847864},{\"text\":\" \",\"start\":0.66,\"end\":0.74,\"type\":\"spacing\",\"logprob\":-2.3841830625315197e-6},{\"text\":\"from\",\"start\":0.74,\"end\":0.84,\"type\":\"word\",\"logprob\":-2.3841830625315197e-6},{\"text\":\" \",\"start\":0.84,\"end\":0.9,\"type\":\"spacing\",\"logprob\":-0.008306833915412426},{\"text\":\"OpenCode\",\"start\":0.9,\"end\":1.44,\"type\":\"word\",\"logprob\":-0.1075385226868093}],\"transcription_id\":\"SkYplzfq1DW8Ae3bWnoy\",\"audio_duration_secs\":1.54125}"
-      }
-    }
-  ]
-}
@@ -1,54 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "model": "gemini-3.8-flash",
-    "tags": [
-      "prefix:openai-compatible-chat",
-      "provider:google",
-      "protocol:openai-chat",
-      "tool",
-      "tool-loop",
-      "continuation"
-    ],
-    "name": "gemini-parallel-tool-signatures",
-    "recordedAt": "2026-09-28T03:12:05.083Z"
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://generativelanguage.googleapis.com/v1beta/openai/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3.8-flash\",\"messages\":[{\"role\":\"system\",\"content\":\"Call get_weather for every requested city in parallel, then answer in one short sentence.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris and in Tokyo?\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": "data: {\"choices\":[{\"delta\":{\"role\":\"assistant\",\"tool_calls\":[{\"extra_content\":{\"google\":{\"thought_signature\":\"ErYCCrMCAWkUfRNGh+/Zbc8YUSzk1yfWAfROcjA4HyF1x69jz6167w8zd4n6kZQQ5FDeBZ5HZMEbEkQ4ENOpzsQL8roCR6wONkhXpiduWrTD6XwbP8KGNkf6D1tX/JlBh7G5Cl+0rdjiSOl/mdY1lcjbkfyCRFs5T8odNWMG7WD3rCrXJDFQ/5QfOl+tqVTceKGz2yyXBhOhvsQDU33ulR9tHQJo/Fmx3HNyDdwvmyKUXm+kgqHsYZnkdv6y6xZwy9zBXGUO4QwxelMw3Rrc24Mp2rNbEDZS3YEeP72Jn/hIP5a8XWOx6+zop/4/CjYxxSfN/tJRY5d48NAKRNFzUN1Az8SvAs/N5X2I3/5ZMaDnQWW/BVdS9fm2KFYJ2baqtBiRRnJxMq4ELArkKjGZzHpd97XG8YjV6g==\"}},\"function\":{\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\",\"name\":\"get_weather\"},\"id\":\"call_723181\",\"type\":\"function\"}]},\"index\":0}],\"created\":1790565123,\"id\":\"A9u5aoufBp3rz7IPke_3oAo\",\"model\":\"gemini-3.8-flash\",\"object\":\"chat.completion.chunk\",\"usage\":{\"completion_tokens\":16,\"prompt_tokens\":74,\"total_tokens\":132}}\n\ndata: {\"choices\":[{\"delta\":{\"role\":\"assistant\",\"tool_calls\":[{\"function\":{\"arguments\":\"{\\\"city\\\":\\\"Tokyo\\\"}\",\"name\":\"get_weather\"},\"id\":\"call_723184\",\"type\":\"function\"}]},\"index\":0}],\"created\":1790565123,\"id\":\"A9u5aoufBp3rz7IPke_3oAo\",\"model\":\"gemini-3.8-flash\",\"object\":\"chat.completion.chunk\",\"usage\":{\"completion_tokens\":32,\"prompt_tokens\":74,\"total_tokens\":148}}\n\ndata: {\"choices\":[{\"delta\":{\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"index\":0}],\"created\":1790565124,\"id\":\"A9u5aoufBp3rz7IPke_3oAo\",\"model\":\"gemini-3.8-flash\",\"object\":\"chat.completion.chunk\",\"usage\":{\"completion_tokens\":32,\"prompt_tokens\":74,\"total_tokens\":148}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://generativelanguage.googleapis.com/v1beta/openai/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"gemini-3.8-flash\",\"messages\":[{\"role\":\"system\",\"content\":\"Call get_weather for every requested city in parallel, then answer in one short sentence.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris and in Tokyo?\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_723181\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"},\"extra_content\":{\"google\":{\"thought_signature\":\"ErYCCrMCAWkUfRNGh+/Zbc8YUSzk1yfWAfROcjA4HyF1x69jz6167w8zd4n6kZQQ5FDeBZ5HZMEbEkQ4ENOpzsQL8roCR6wONkhXpiduWrTD6XwbP8KGNkf6D1tX/JlBh7G5Cl+0rdjiSOl/mdY1lcjbkfyCRFs5T8odNWMG7WD3rCrXJDFQ/5QfOl+tqVTceKGz2yyXBhOhvsQDU33ulR9tHQJo/Fmx3HNyDdwvmyKUXm+kgqHsYZnkdv6y6xZwy9zBXGUO4QwxelMw3Rrc24Mp2rNbEDZS3YEeP72Jn/hIP5a8XWOx6+zop/4/CjYxxSfN/tJRY5d48NAKRNFzUN1Az8SvAs/N5X2I3/5ZMaDnQWW/BVdS9fm2KFYJ2baqtBiRRnJxMq4ELArkKjGZzHpd97XG8YjV6g==\"}}},{\"id\":\"call_723184\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Tokyo\\\"}\"}}]},{\"role\":\"tool\",\"tool_call_id\":\"call_723181\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"},{\"role\":\"tool\",\"tool_call_id\":\"call_723184\",\"content\":\"{\\\"temperature\\\":0,\\\"condition\\\":\\\"unknown\\\"}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true}}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": "data: {\"choices\":[{\"delta\":{\"content\":\"It is currently sunny and 22°C in Paris,\",\"role\":\"assistant\"},\"index\":0}],\"created\":1790565125,\"id\":\"BNu5auWeB-2fz7IPxY6l4QY\",\"model\":\"gemini-3.8-flash\",\"object\":\"chat.completion.chunk\",\"usage\":{\"completion_tokens\":13,\"prompt_tokens\":150,\"total_tokens\":226}}\n\ndata: {\"choices\":[{\"delta\":{\"content\":\" while Tokyo is 0°C.\",\"role\":\"assistant\"},\"index\":0}],\"created\":1790565125,\"id\":\"BNu5auWeB-2fz7IPxY6l4QY\",\"model\":\"gemini-3.8-flash\",\"object\":\"chat.completion.chunk\",\"usage\":{\"completion_tokens\":21,\"prompt_tokens\":150,\"total_tokens\":234}}\n\ndata: {\"choices\":[{\"delta\":{\"extra_content\":{\"google\":{\"thought_signature\":\"EpcDCpQDAWkUfRM325TAUtfFiOeQIEWn/TsCU9oi2js4VPHFeeLfAu+2k8PJm0fN/OaF0y4ovau7S9QIAsuOPI2w2aIyQ2kMGj1XvUyRTvz30DOZgtq1km6W6YGzZyyTCNSeBcpwtJtziHZVVWq9xEI/HHB8Ta1Ot215xnFyDL7iUGEwgGu45/mInpk+SOCYBy9biDddpDxcDi14BGoleArY9XEFAzYLxXssl7HMWjpfee5095im7gD125Nripq1Jf3nGY/2TxqjgQAdJpQybwct63p74O1szGHQxrkBt7AwphDgbOWtLpUP/QJBRdl8qhrozqRe611NQ6V5lMSwpO7OhQ/IDRtWMwOyrrKblZfmMnnPl2/9xDfZRsYnfmWq+7PeAptJl1cDRlMBKhj5iRn31xvN43EiuvWwWPsSndiWvxrMvVBd89TR4u0+z0pYCYZcsFkYKFlPA7pZsdnh6CON24AA5WUkO4dQNoqYdik6aO5hE9jLHG5FHTdr0W69qgPNozbxnO0ptRcOtkGpB9xYUVoTxcSXXZE=\"}},\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"index\":0}],\"created\":1790565125,\"id\":\"BNu5auWeB-2fz7IPxY6l4QY\",\"model\":\"gemini-3.8-flash\",\"object\":\"chat.completion.chunk\",\"usage\":{\"completion_tokens\":21,\"prompt_tokens\":192,\"total_tokens\":276}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}
@@ -97,26 +97,6 @@ describe("Generation", () => {
    }),
  )

-  it.effect("fails an event stream at the deadline when the poll interval is longer than the timeout", () =>
-    Effect.gen(function* () {
-      const scripted = yield* scriptedRoute(["running"], "never")
-      const generation = new Generation(scripted.route, "t", { id: "gen_1", status: "queued" })
-
-      const fiber = yield* Effect.forkChild(
-        generation
-          .events({ poll: { interval: "30 seconds", timeout: "10 seconds" } })
-          .pipe(Stream.runCollect, Effect.flip),
-      )
-      yield* TestClock.adjust("9 seconds")
-      expect(fiber.pollUnsafe()).toBeUndefined()
-      yield* TestClock.adjust("1 second")
-      const error = yield* Fiber.join(fiber)
-
-      expect(error.reason._tag).toBe("Timeout")
-      expect(yield* Ref.get(scripted.polls)).toBe(1)
-    }),
-  )
-
  it.effect("surfaces the route failure body for failed generations", () =>
    Effect.gen(function* () {
      const scripted = yield* scriptedRoute(["running", "failed"], "unused")
@@ -78,11 +78,8 @@ describe("Image", () => {
        mediaType: "image/webp",
      })
      expect(yield* response.image.bytes()).toEqual(Uint8Array.from([1, 2, 3]))
-      expect(response.image.info).toEqual({ format: "webp", width: 2048, height: 2048 })
+      expect(response.image.providerMetadata).toEqual({ openai: { revisedPrompt: "A precise robot" } })
      expect(response.usage).toMatchObject({ type: "tokens", total: 12 })
-      expect(response.providerMetadata).toEqual({
-        openai: { outputFormat: "webp", size: "2048x2048", quality: "high", background: "opaque" },
-      })
    }).pipe(
      Effect.provide(
        ImageClient.layer.pipe(
@@ -110,11 +107,8 @@ describe("Image", () => {
                })
                return input.respond(
                  JSON.stringify({
-                    data: [{ b64_json: "AQID" }, { b64_json: "BAUG" }],
+                    data: [{ b64_json: "AQID", revised_prompt: "A precise robot" }, { b64_json: "BAUG" }],
                    output_format: "webp",
-                    size: "2048x2048",
-                    quality: "high",
-                    background: "opaque",
                    usage: { input_tokens: 4, output_tokens: 8, total_tokens: 12 },
                  }),
                  { headers: { "content-type": "application/json" } },
@@ -150,7 +144,6 @@ describe("Image", () => {
        ),
      )
      expect(response.image.source).toEqual({ type: "bytes", data: Uint8Array.from([1, 2, 3]), mediaType: "image/png" })
-      expect(response.image.info).toEqual({ format: "png" })
    }),
  )

@@ -732,7 +725,6 @@ describe("Image", () => {
      const errors = yield* Effect.all(
        [
          Image.start({ model: Google.configure({ apiKey: "test" }).image("gemini-3.1-flash-image"), prompt }),
-          Image.generate({ model: Google.configure({ apiKey: "test" }).image("gemini-3.1-flash-image"), prompt, n: 2 }),
          Image.start({
            model: BlackForestLabs.configure({ apiKey: "test" }).image("flux-2-pro"),
            prompt,
@@ -743,6 +735,7 @@ describe("Image", () => {
            prompt,
            size: "512x512",
          }),
+          Stream.runCollect(Image.stream({ model: openai.image("dall-e-3"), prompt })),
          Stream.runCollect(Image.stream({ model: openai.image("gpt-image-2"), prompt, n: 2 })),
          Image.start({ model: replicate, prompt, seed: 7 }),
          Image.start({
@@ -756,9 +749,9 @@ describe("Image", () => {
      expect(errors.map((error) => [error.reason._tag, "operation" in error.reason && error.reason.operation])).toEqual(
        [
          ["UnsupportedOperation", "image.start"],
-          ["UnsupportedOperation", "media.n"],
          ["UnsupportedOperation", "media.aspectRatio"],
          ["UnsupportedOperation", "media.size"],
+          ["UnsupportedOperation", "media.stream"],
          ["UnsupportedOperation", "media.n"],
          ["UnsupportedOperation", "media.seed"],
          ["InvalidRequest", false],
@@ -768,104 +761,6 @@ describe("Image", () => {
    }).pipe(Effect.provide(layer(() => Effect.die("an unsupported request reached the network")))),
  )

-  const falToken = {
-    requestID: "r1",
-    statusURL: "https://queue.fal.test/fal-ai/flux/requests/r1/status",
-    responseURL: "https://queue.fal.test/fal-ai/flux/requests/r1",
-    cancelURL: "https://queue.fal.test/fal-ai/flux/requests/r1/cancel",
-  }
-  const falSubmitted = {
-    request_id: falToken.requestID,
-    status_url: falToken.statusURL,
-    response_url: falToken.responseURL,
-    cancel_url: falToken.cancelURL,
-  }
-  const bodies: Array<unknown> = []
-  it.effect("sizes fal Kontext by aspect ratio and sends several images to /multi", () =>
-    Effect.gen(function* () {
-      const fal = Fal.configure({ apiKey: "test", baseURL: "https://queue.fal.test" })
-      const images = [Media.url("https://example.test/a.png"), Media.url("https://example.test/b.png")]
-      const rejected = yield* Image.start({
-        model: fal.image("fal-ai/flux-pro/kontext"),
-        prompt: "A lighthouse",
-        size: "512x512",
-      }).pipe(Effect.flip)
-      yield* Image.start({
-        model: fal.image("fal-ai/flux-pro/kontext"),
-        prompt: "A lighthouse",
-        images: images.slice(0, 1),
-        aspectRatio: "16:9",
-      })
-      yield* Image.start({ model: fal.image("fal-ai/flux-pro/kontext/max/multi"), prompt: "A lighthouse", images })
-
-      expect(rejected.reason).toMatchObject({ _tag: "UnsupportedOperation", operation: "media.size" })
-      expect(bodies).toEqual([
-        { prompt: "A lighthouse", aspect_ratio: "16:9", image_url: "https://example.test/a.png" },
-        { prompt: "A lighthouse", image_urls: ["https://example.test/a.png", "https://example.test/b.png"] },
-      ])
-    }).pipe(
-      Effect.provide(
-        layer((input) => {
-          bodies.push(JSON.parse(input.text))
-          return Effect.succeed(json(input, falSubmitted))
-        }),
-      ),
-    ),
-  )
-
-  it.effect("decodes fal sync_mode data URIs as inline images", () =>
-    Effect.gen(function* () {
-      const generation = yield* Image.resume(Fal.configure({ apiKey: "test" }).image("fal-ai/flux/schnell"), falToken)
-      const response = yield* generation.await()
-
-      expect(response.images.map((image) => image.source)).toEqual([
-        { type: "base64", data: "AQID", mediaType: "image/png" },
-        { type: "url", url: "https://v3.fal.media/out.jpg", mediaType: "image/jpeg" },
-      ])
-      expect(response.image.info).toEqual({ width: 512, height: 512 })
-      expect(yield* response.image.bytes()).toEqual(Uint8Array.from([1, 2, 3]))
-    }).pipe(
-      Effect.provide(
-        layer((input) =>
-          Effect.succeed(
-            input.request.url === falToken.statusURL
-              ? json(input, { status: "COMPLETED" })
-              : json(input, {
-                  images: [
-                    { url: "data:image/png;base64,AQID", width: 512, height: 512, content_type: "image/png" },
-                    { url: "https://v3.fal.media/out.jpg", width: 512, height: 512, content_type: "image/jpeg" },
-                  ],
-                }),
-          ),
-        ),
-      ),
-    ),
-  )
-
-  const falDetail = { detail: [{ loc: ["body", "prompt"], msg: "Invalid input", type: "value_error" }] }
-  it.effect(
-    "fails a fal await whose COMPLETED status carries an error with the response_url body and HTTP context",
-    () =>
-      Effect.gen(function* () {
-        const generation = yield* Image.resume(Fal.configure({ apiKey: "test" }).image("fal-ai/flux/schnell"), falToken)
-        expect(generation.status).toBe("failed")
-        const error = yield* generation.await().pipe(Effect.flip)
-        expect(error.reason._tag).toBe("InvalidRequest")
-        expect(error.reason.body).toBe(JSON.stringify(falDetail))
-        expect(error.reason.http).toMatchObject({ url: falToken.responseURL, status: 422 })
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.succeed(
-              input.request.url === falToken.statusURL
-                ? json(input, { status: "COMPLETED", error: "Invalid input", error_type: "ValidationError" })
-                : json(input, falDetail, { status: 422 }),
-            ),
-          ),
-        ),
-      ),
-  )
-
  const moderated = { id: "req_1", status: "Content Moderated" }
  const prediction = {
    id: "p_1",
@@ -873,56 +768,6 @@ describe("Image", () => {
    output: { text: "not an image" },
    urls: { get: "https://replicate.test/p_1", cancel: "https://replicate.test/p_1/cancel" },
  }
-  for (const pending of [
-    {
-      model: BlackForestLabs.configure({ apiKey: "test" }).image("flux-2-pro"),
-      token: { id: "req_1", pollingURL: "https://bfl.test/v1/get_result?id=req_1" },
-      status: 200,
-      body: { id: "req_1", status: "Pending" },
-      message: "Black Forest Labs generation req_1",
-    },
-    {
-      model: Replicate.configure({ apiKey: "test" }).image("owner/model"),
-      token: { id: "p_1", getURL: "https://replicate.test/p_1", cancelURL: "https://replicate.test/p_1/cancel" },
-      status: 200,
-      body: {
-        id: "p_1",
-        status: "processing",
-        urls: { get: "https://replicate.test/p_1", cancel: "https://replicate.test/p_1/cancel" },
-      },
-      message: "Replicate generation p_1",
-    },
-    {
-      model: Stability.configure({ apiKey: "test", baseURL: "https://stability.test" }).upscale(),
-      token: { id: "up_1" },
-      status: 202,
-      body: { id: "up_1", status: "in-progress" },
-      message: "Stability AI generation up_1",
-    },
-  ]) {
-    it.effect(`rejects reading a ${pending.model.provider} result before the generation finishes`, () =>
-      Effect.gen(function* () {
-        const generation = yield* Image.resume(pending.model, pending.token)
-        const error = yield* generation.result().pipe(Effect.flip)
-        expect(error.reason._tag).toBe("InvalidRequest")
-        expect(error.message).toBe(`${pending.message} has not finished; await it before reading the result`)
-        expect(error.reason.body).toBe(JSON.stringify(pending.body))
-        expect(error.reason.http?.status).toBe(pending.status)
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.succeed(
-              input.respond(JSON.stringify(pending.body), {
-                status: pending.status,
-                headers: { "content-type": "application/json" },
-              }),
-            ),
-          ),
-        ),
-      ),
-    )
-  }
-
  it.effect("classifies terminal outcomes the recordings never saw", () =>
    Effect.gen(function* () {
      const bfl = yield* Image.resume(BlackForestLabs.configure({ apiKey: "test" }).image("flux-2-pro"), {
@@ -3,7 +3,7 @@ import { NodeFileSystem } from "@effect/platform-node"
 import { Effect, Ref, Schema } from "effect"
 import { FileSystem } from "effect"
 import { HttpClientRequest } from "effect/unstable/http"
-import { AIError, Media, Message } from "../src/index.js"
+import { Media, Message } from "../src/index.js"
 import { it } from "./lib/effect.js"
 import { dynamicResponse, scriptedResponses } from "./lib/http.js"

@@ -161,56 +161,6 @@ describe("Media", () => {
    }),
  )

-  it.effect("keeps transient url download headers out of toJSON and AssetSchema encoding", () =>
-    Effect.sync(() => {
-      const asset = Media.url("https://cdn.example.test/video.mp4", {
-        mediaType: "video/mp4",
-        expiresAt: 42,
-        headers: { "x-goog-api-key": "secret" },
-      })
-      expect(asset.headers).toEqual({ "x-goog-api-key": "secret" })
-      const source = { type: "url", url: "https://cdn.example.test/video.mp4", mediaType: "video/mp4", expiresAt: 42 }
-
-      expect(asset.toJSON()).not.toHaveProperty("headers")
-      expect(JSON.stringify(asset)).not.toContain("secret")
-      expect(asset.toJSON().source).toEqual(source)
-
-      const encoded = Schema.encodeSync(Media.AssetSchema)(asset)
-      expect(encoded).not.toHaveProperty("headers")
-      expect(encoded.source).toEqual(source)
-
-      const codec = Schema.fromJsonString(Media.AssetSchema)
-      const json = Schema.encodeSync(codec)(asset)
-      expect(json).not.toContain("secret")
-      const restored = Schema.decodeSync(codec)(json)
-      expect(restored).toBeInstanceOf(Media.Asset)
-      expect(restored.source).toEqual(source)
-      expect(restored.expiresAt).toBe(42)
-      expect(restored.headers).toBeUndefined()
-    }),
-  )
-
-  it.effect("fails url downloads with non-2xx status as a typed AIError keeping http and body", () =>
-    Effect.gen(function* () {
-      const body = JSON.stringify({ error: { message: "file expired" } })
-      const error = yield* Media.url("https://cdn.example.test/expired.png")
-        .bytes()
-        .pipe(
-          Effect.flip,
-          Effect.provide(
-            dynamicResponse((input) =>
-              Effect.succeed(input.respond(body, { status: 404, headers: { "content-type": "application/json" } })),
-            ),
-          ),
-        )
-      expect(error).toBeInstanceOf(AIError)
-      expect(error.message).toContain("file expired")
-      expect(error.reason.http?.status).toBe(404)
-      expect(error.reason.http?.url).toBe("https://cdn.example.test/expired.png")
-      expect(error.reason.body).toBe(body)
-    }),
-  )
-
  it.effect("reads files with sniffed media types and writes materialized assets", () =>
    Effect.gen(function* () {
      const fs = yield* FileSystem.FileSystem
@@ -22,8 +22,7 @@ const chatBody = sseEvents(
 /**
 * Executor layer that answers chat completions with SSE text, image generations with one base64 PNG, Runway video
 * tasks with a queued submission that succeeds on the second poll, speech with raw audio or SSE audio deltas, OpenAI
- * transcription with JSON or SSE text deltas, AssemblyAI transcripts that complete on the first poll, and `slow.test`
- * chat completions that send one text delta and never finish.
+ * transcription with JSON or SSE text deltas, and AssemblyAI transcripts that complete on the first poll.
 */
 const executor = (seen: Array<string>) =>
  RequestExecutor.layer.pipe(
@@ -56,18 +55,6 @@ const executor = (seen: Array<string>) =>
              output: "https://replicate.test/a.webp",
              urls: { get: "https://replicate.test/p_1", cancel: "https://replicate.test/p_1/cancel" },
            })
-          if (web.url.startsWith("https://slow.test"))
-            return input.respond(
-              new ReadableStream({
-                start: (controller) =>
-                  controller.enqueue(
-                    new TextEncoder().encode(
-                      `data: ${JSON.stringify({ choices: [{ delta: { content: "Hello" } }] })}\n\n`,
-                    ),
-                  ),
-              }),
-              { headers: { "content-type": "text/event-stream" } },
-            )
          if (web.url.endsWith("/chat/completions"))
            return input.respond(chatBody, { headers: { "content-type": "text/event-stream" } })
          if (web.url.endsWith("/audio/speech"))
@@ -317,77 +304,6 @@ describe("AI promise client", () => {
    await ai.dispose()
  })

-  test("aborted calls reject and aborted streams throw with the signal's reason", async () => {
-    const ai = AI.make({ layer: executor([]) })
-    const slow = OpenAI.configure({ apiKey: "test", baseURL: "https://slow.test/v1" }).chat("gpt-4o-mini")
-    const aborted = new AbortController()
-    aborted.abort()
-    const reason = new Error("mine")
-
-    const rejected = await ai.run(Effect.never, { signal: aborted.signal }).catch((error: unknown) => error)
-    expect(rejected).toBe(aborted.signal.reason)
-    expect(rejected).toMatchObject({ name: "AbortError" })
-
-    const inFlight = new AbortController()
-    setTimeout(() => inFlight.abort(reason), 10)
-    expect(
-      await ai.llm
-        .generate({ model: slow, prompt: "Hello" }, { signal: inFlight.signal })
-        .catch((error: unknown) => error),
-    ).toBe(reason)
-
-    const preAborted = await Array.fromAsync(
-      ai.speech.stream({ model: openai.speech("gpt-4o-mini-tts"), text: "Hello" }, { signal: aborted.signal }),
-    ).catch((error: unknown) => error)
-    expect(preAborted).toBe(aborted.signal.reason)
-    expect(preAborted).toMatchObject({ name: "AbortError" })
-
-    const midStream = new AbortController()
-    const deltas: Array<string> = []
-    const midStreamFailure = await Array.fromAsync(
-      ai.llm.stream({ model: slow, prompt: "Hello" }, { signal: midStream.signal }),
-      (event) => {
-        if (!LLMEvent.is.textDelta(event)) return
-        deltas.push(event.text)
-        midStream.abort()
-      },
-    ).catch((error: unknown) => error)
-    expect(deltas).toEqual(["Hello"])
-    expect(midStreamFailure).toBe(midStream.signal.reason)
-    expect(midStreamFailure).toMatchObject({ name: "AbortError" })
-
-    const model = Runway.configure({ apiKey: "test", baseURL: "https://runway.test/v1" }).video("gen4.5")
-    const generation = await ai.video.start({ model, prompt: "A kite" })
-    const polling = new AbortController()
-    const events: Array<string> = []
-    const eventsFailure = await Array.fromAsync(
-      generation.events({ poll: { interval: 60_000 }, signal: polling.signal }),
-      (event) => {
-        events.push(event.type)
-        polling.abort(reason)
-      },
-    ).catch((error: unknown) => error)
-    expect(events).toEqual(["generation-progress"])
-    expect(eventsFailure).toBe(reason)
-
-    await ai.dispose()
-  })
-
-  test("breaking out of an abortable stream cleans up without throwing", async () => {
-    const ai = AI.make({ layer: executor([]) })
-    const slow = OpenAI.configure({ apiKey: "test", baseURL: "https://slow.test/v1" }).chat("gpt-4o-mini")
-    const controller = new AbortController()
-    const deltas: Array<string> = []
-    for await (const event of ai.llm.stream({ model: slow, prompt: "Hello" }, { signal: controller.signal })) {
-      if (!LLMEvent.is.textDelta(event)) continue
-      deltas.push(event.text)
-      break
-    }
-    controller.abort()
-    expect(deltas).toEqual(["Hello"])
-    await ai.dispose()
-  })
-
  test("the default client is created lazily and can be disposed", async () => {
    expect(typeof AI.ai.llm.generate).toBe("function")
    expect(typeof AI.ai.image.generate).toBe("function")
@@ -33,8 +33,6 @@ describe("Black Forest Labs Images recorded", () => {

        expect(response.image.source.type).toBe("bytes")
        expect(dimensions(yield* response.image.bytes())).toEqual({ width: 512, height: 512 })
-        // BFL reports cost on submit only; the Ready result omits it.
-        expect(response.usage).toEqual({ type: "credits", credits: 1.4000000000000001 })
      }),
    { timeout: 15 * 60 * 1000 },
  )
@@ -1,50 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Stream } from "effect"
-import { Transcription } from "../../src/index.js"
-import { ElevenLabs } from "../../src/providers.js"
-import { recordedTests } from "../recorded-test.js"
-import { TRANSCRIPT, audio, audioRecording, dialog } from "./transcription-recording.js"
-
-const model = ElevenLabs.configure({ apiKey: process.env.ELEVENLABS_API_KEY ?? "fixture" }).transcription("scribe_v2")
-
-const recorded = recordedTests({
-  prefix: "elevenlabs-transcription",
-  provider: "elevenlabs",
-  protocol: "elevenlabs-transcription",
-  requires: ["ELEVENLABS_API_KEY"],
-  options: audioRecording,
-})
-
-describe("ElevenLabs Transcription recorded", () => {
-  recorded.effect("transcribes audio with word timestamps", () =>
-    Effect.gen(function* () {
-      const request = Transcription.request({ model, audio: yield* audio, timestamps: "word" })
-      const response = yield* Transcription.generate(request)
-
-      expect(response.text).toMatch(TRANSCRIPT)
-      expect(response.words?.map((word) => word.text)).toEqual(["Hello", "from", "OpenCode"])
-      expect(response.words?.every((word) => word.speaker === undefined && (word.confidence ?? 0) > 0)).toBe(true)
-      expect(response.segments).toBeUndefined()
-      expect(response.language).toBe("eng")
-      expect(response.durationSeconds).toBeGreaterThan(0)
-      expect(response.usage).toEqual({ type: "seconds", seconds: response.durationSeconds })
-      expect(response.providerMetadata?.elevenlabs?.transcriptionId).toEqual(expect.any(String))
-
-      const events = Array.from(yield* Stream.runCollect(Transcription.stream(request)))
-      expect(events.map((event) => event.type)).toEqual(["finish"])
-    }),
-  )
-
-  recorded.effect("groups diarized words into speaker turns", () =>
-    Effect.gen(function* () {
-      const response = yield* Transcription.generate({ model, audio: yield* dialog, diarize: true })
-
-      expect(response.segments?.map((segment) => segment.speaker)).toEqual(["speaker_0", "speaker_1"])
-      expect(response.segments?.[0].text).toMatch(/^Did the release ship\?$/)
-      expect(response.segments?.[1].text).toMatch(/^Yes, it shipped this morning\.?$/)
-      expect(response.segments?.map((segment) => segment.text).join(" ")).toBe(response.text)
-      expect(response.words?.some((word) => word.text.trim() === "")).toBe(false)
-      expect(new Set(response.words?.map((word) => word.speaker))).toEqual(new Set(["speaker_0", "speaker_1"]))
-    }),
-  )
-})
@@ -92,6 +92,5 @@ const assertEvaluation = <Options extends EvaluationOptions>(
    expect(response.answers.refund.probability).toBeGreaterThan(0.5)
    expect(response.usage?.inputTokens).toBeGreaterThan(0)
    expect(response.usage?.outputTokens).toBeGreaterThan(0)
-    expect(response.answers.department.confidence).toBeGreaterThan(0)
-    expect(response.answers.urgency.confidence).toBeGreaterThan(0)
+    expect(response.providerMetadata?.[metadataKey]?.confidence).toBeDefined()
  })
@@ -1,68 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect } from "effect"
-import { LLM, LLMEvent, LLMRequest, Message, ToolRuntime, toDefinitions } from "../../src/index.js"
-import * as OpenAICompatible from "../../src/providers/openai-compatible.js"
-import { LLMClient } from "../../src/route.js"
-import { compileRequest } from "../../src/route/client.js"
-import { recordedTests } from "../recorded-test.js"
-import { weatherRuntimeTool, weatherToolName } from "../recorded-scenarios.js"
-
-const model = OpenAICompatible.configure({
-  provider: "google",
-  baseURL: "https://generativelanguage.googleapis.com/v1beta/openai",
-  apiKey: process.env.GOOGLE_GENERATIVE_AI_API_KEY ?? "fixture",
-}).model("gemini-3.8-flash")
-
-const recorded = recordedTests({
-  prefix: "openai-compatible-chat",
-  provider: "google",
-  protocol: "openai-chat",
-  requires: ["GOOGLE_GENERATIVE_AI_API_KEY"],
-  tags: ["tool", "tool-loop", "continuation"],
-  metadata: { model: model.id },
-})
-
-describe("Gemini OpenAI-compatible Chat recorded", () => {
-  recorded.effect.with(
-    "replays thought signatures through a parallel tool loop",
-    { cassette: "openai-compatible-chat/gemini-parallel-tool-signatures" },
-    () =>
-      Effect.gen(function* () {
-        const tools = { [weatherToolName]: weatherRuntimeTool }
-        const request = LLM.request({
-          model,
-          system: "Call get_weather for every requested city in parallel, then answer in one short sentence.",
-          prompt: "What is the weather in Paris and in Tokyo?",
-          tools: toDefinitions(tools),
-          cache: "none",
-        })
-        const first = yield* LLMClient.generate(request)
-        const calls = first.events.filter(LLMEvent.is.toolCall)
-        expect(calls.map((call) => call.input)).toEqual([{ city: "Paris" }, { city: "Tokyo" }])
-        const extraContent = calls[0]?.providerMetadata?.google?.extraContent
-        expect(extraContent).toEqual({ google: { thought_signature: expect.any(String) } })
-
-        const results = yield* Effect.forEach(calls, (call) => ToolRuntime.dispatch(tools, call))
-        const continuation = LLMRequest.update(request, {
-          messages: [
-            ...request.messages,
-            first.message,
-            ...calls.map((call, index) =>
-              Message.tool({ id: call.id, name: call.name, result: results[index]!.result }),
-            ),
-          ],
-        })
-        const prepared = yield* compileRequest(continuation)
-        const assistant = prepared.body.messages.find((message) => message.role === "assistant")
-        expect(assistant?.role === "assistant" ? assistant.tool_calls?.[0]?.extra_content : undefined).toEqual(
-          extraContent,
-        )
-
-        const second = yield* LLMClient.generate(continuation)
-        expect(second.events.filter(LLMEvent.is.toolCall)).toHaveLength(0)
-        expect(second.text).toMatch(/Paris/)
-        expect(second.text).toMatch(/Tokyo/)
-      }),
-    60_000,
-  )
-})
@@ -472,45 +472,6 @@ describe("OpenAI Chat route", () => {
    }),
  )

-  it.effect("replays Gemini thought signatures as tool call extra content", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.user("Weather in Paris and Tokyo?"),
-            Message.assistant([
-              ToolCallPart.make({
-                id: "call_1",
-                name: "lookup",
-                input: { city: "Paris" },
-                providerMetadata: { openai: { extraContent: { google: { thought_signature: "sig_1" } } } },
-              }),
-              ToolCallPart.make({ id: "call_2", name: "lookup", input: { city: "Tokyo" } }),
-            ]),
-            Message.tool({ id: "call_1", name: "lookup", result: "Sunny" }),
-            Message.tool({ id: "call_2", name: "lookup", result: "Rainy" }),
-          ],
-        }),
-      )
-
-      const assistant = prepared.body.messages[1]
-      expect(assistant?.role === "assistant" ? assistant.tool_calls : undefined).toEqual([
-        {
-          id: "call_1",
-          type: "function",
-          function: { name: "lookup", arguments: encodeJson({ city: "Paris" }) },
-          extra_content: { google: { thought_signature: "sig_1" } },
-        },
-        {
-          id: "call_2",
-          type: "function",
-          function: { name: "lookup", arguments: encodeJson({ city: "Tokyo" }) },
-        },
-      ])
-    }),
-  )
-
  it.effect("limits OpenAI and Azure Chat tool call IDs to 40 characters", () =>
    Effect.gen(function* () {
      const id = `call_${"a".repeat(48)}`
@@ -1844,78 +1805,6 @@ describe("OpenAI Chat route", () => {
    }),
  )

-  it.effect("preserves Gemini thought signatures on streamed parallel tool calls", () =>
-    Effect.gen(function* () {
-      // Gemini's OpenAI-compatible endpoint omits `index`, streams each call whole,
-      // and signs only the first call of a parallel batch.
-      const body = sseEvents(
-        deltaChunk({
-          role: "assistant",
-          tool_calls: [
-            {
-              extra_content: { google: { thought_signature: "sig_1" } },
-              id: "call_1",
-              type: "function",
-              function: { name: "lookup", arguments: '{"city":"Paris"}' },
-            },
-          ],
-        }),
-        deltaChunk({
-          role: "assistant",
-          tool_calls: [{ id: "call_2", type: "function", function: { name: "lookup", arguments: '{"city":"Tokyo"}' } }],
-        }),
-        deltaChunk({}, "stop"),
-      )
-      const response = yield* LLMClient.generate(
-        LLMRequest.update(request, {
-          tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
-        }),
-      ).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.events.filter(LLMEvent.is.toolCall)).toEqual([
-        {
-          type: "tool-call",
-          id: "call_1",
-          name: "lookup",
-          input: { city: "Paris" },
-          providerExecuted: undefined,
-          providerMetadata: { openai: { extraContent: { google: { thought_signature: "sig_1" } } } },
-        },
-        {
-          type: "tool-call",
-          id: "call_2",
-          name: "lookup",
-          input: { city: "Tokyo" },
-          providerExecuted: undefined,
-          providerMetadata: undefined,
-        },
-      ])
-    }),
-  )
-
-  it.effect("keeps extra content that arrives before the tool identity", () =>
-    Effect.gen(function* () {
-      const body = sseEvents(
-        deltaChunk({
-          tool_calls: [
-            { index: 0, extra_content: { google: { thought_signature: "sig_1" } }, function: { arguments: "{" } },
-          ],
-        }),
-        deltaChunk({ tool_calls: [{ index: 0, id: "call_1", function: { name: "lookup", arguments: "}" } }] }),
-        deltaChunk({}, "tool_calls"),
-      )
-      const response = yield* LLMClient.generate(
-        LLMRequest.update(request, {
-          tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
-        }),
-      ).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.events.filter(LLMEvent.is.toolCall).map((event) => event.providerMetadata)).toEqual([
-        { openai: { extraContent: { google: { thought_signature: "sig_1" } } } },
-      ])
-    }),
-  )
-
  it.effect("does not finalize streamed tool calls when content is filtered", () =>
    Effect.gen(function* () {
      const body = sseEvents(
@@ -29,11 +29,7 @@ describe("OpenAI Images recorded", () => {

      expect(response.images).toHaveLength(1)
      expect(response.image.mediaType).toBe("image/jpeg")
-      expect(response.image.info).toEqual({ format: "jpeg", width: 1024, height: 1024 })
      expect((yield* response.image.bytes()).length).toBeGreaterThan(0)
-      expect(response.providerMetadata).toEqual({
-        openai: { outputFormat: "jpeg", size: "1024x1024", quality: "low", background: "opaque" },
-      })
    }),
  )

@@ -80,13 +76,8 @@ describe("OpenAI Images recorded", () => {
      expect(events.map((event) => event.type)).toEqual(["image-partial", "image", "finish"])
      const image = events.find(ImageEvent.is.image)
      expect(image?.image.mediaType).toBe("image/jpeg")
-      expect(image?.image.info).toEqual({ format: "jpeg", width: 1024, height: 1024 })
      expect(dimensions(yield* image!.image.bytes())).toEqual({ width: 1024, height: 1024 })
-      const finish = events.find(ImageEvent.is.finish)
-      expect(finish?.usage).toMatchObject({ type: "tokens" })
-      expect(finish?.providerMetadata).toEqual({
-        openai: { outputFormat: "jpeg", size: "1024x1024", quality: "low", background: "opaque" },
-      })
+      expect(events.find(ImageEvent.is.finish)?.usage).toMatchObject({ type: "tokens" })
    }),
  )
 })
@@ -44,12 +44,7 @@ describe("OpenAI Transcription recorded", () => {
      expect(deltas.length).toBeGreaterThan(1)
      expect(deltas.join("")).toBe(finish.text)
      expect(finish.text).toMatch(TRANSCRIPT)
-      expect(finish.usage).toMatchObject({
-        type: "tokens",
-        input: expect.any(Number),
-        output: expect.any(Number),
-        details: { openai: { input_token_details: { audio_tokens: expect.any(Number) } } },
-      })
+      expect(finish.usage).toMatchObject({ type: "tokens", input: expect.any(Number), output: expect.any(Number) })
    }),
  )

@@ -32,12 +32,7 @@ describe("Z.ai Images", () => {

      expect(response.images).toHaveLength(1)
      expect(response.image.mediaType).toBe("application/octet-stream")
-      // Z.ai documents that output URLs expire 30 days after generation; the test clock starts at 0.
-      expect(response.image.source).toEqual({
-        type: "url",
-        url: "https://cdn.z.ai/generated.png",
-        expiresAt: 30 * 24 * 60 * 60 * 1000,
-      })
+      expect(response.image.source).toEqual({ type: "url", url: "https://cdn.z.ai/generated.png" })
      expect(response.notices).toEqual([
        {
          type: "moderated",
@@ -46,10 +46,7 @@ describe("Speech", () => {
          respond(
            JSON.stringify({
              candidates: [
-                {
-                  content: { parts: [{ inlineData: { mimeType: "audio/wav", data: Encoding.encodeBase64(bytes) } }] },
-                  finishReason: "STOP",
-                },
+                { content: { parts: [{ inlineData: { mimeType: "audio/wav", data: Encoding.encodeBase64(bytes) } }] } },
              ],
            }),
            "application/json",
@@ -63,42 +60,6 @@ describe("Speech", () => {
    }),
  )

-  it.effect("describes OpenAI audio in the format the request body actually asked for", () =>
-    Effect.gen(function* () {
-      const [pcm, wav] = yield* Effect.all([
-        Speech.generate({ model: openai, text: "Hi", format: "mp3", providerOptions: { response_format: "pcm" } }),
-        Speech.generate({ model: openai, text: "Hi", http: { body: { response_format: "wav" } } }),
-      ]).pipe(Effect.provide(respond("\u0001\u0002", "application/octet-stream")))
-      expect(pcm.audio.mediaType).toBe("audio/pcm")
-      expect(pcm.audio.info).toEqual({ format: "pcm", encoding: "pcm_s16le", sampleRate: 24000, channels: 1 })
-      expect(wav.audio.mediaType).toBe("audio/wav")
-      expect(wav.audio.info?.format).toBe("wav")
-    }),
-  )
-
-  it.effect("describes Deepgram raw encodings in their default WAV container", () =>
-    Effect.gen(function* () {
-      const response = yield* Speech.generate({ model: deepgram, text: "Hi", providerOptions: { encoding: "mulaw" } })
-      expect(response.audio.mediaType).toBe("audio/wav")
-      expect(response.audio.info?.format).toBe("wav")
-    }).pipe(Effect.provide(respond("RIFF....WAVEfmt ", "audio/wav"))),
-  )
-
-  it.effect("always gives headerless Deepgram PCM a sample rate", () =>
-    Effect.gen(function* () {
-      const [requested, defaulted] = yield* Effect.all([
-        Speech.generate({
-          model: deepgram,
-          text: "Hi",
-          providerOptions: { encoding: "mulaw", container: "none", sampleRate: 16000 },
-        }),
-        Speech.generate({ model: deepgram, text: "Hi", providerOptions: { encoding: "alaw", container: "none" } }),
-      ]).pipe(Effect.provide(respond("\u0001\u0002", "audio/basic")))
-      expect(requested.audio.info).toEqual({ format: "pcm", encoding: "pcm_mulaw", sampleRate: 16000, channels: 1 })
-      expect(defaulted.audio.info).toEqual({ format: "pcm", encoding: "pcm_alaw", sampleRate: 8000, channels: 1 })
-    }),
-  )
-
  it.effect("rejects raw PCM for Gemini 3.8 unary requests before sending", () =>
    Effect.gen(function* () {
      const errors = yield* Effect.all(
@@ -115,7 +76,6 @@ describe("Speech", () => {
      const errors = yield* Effect.all(
        [
          Speech.generate({ model: openai, text: "Hi", timestamps: true }),
-          Speech.generate({ model: openai, text: "Hi", format: "ogg" }),
          Speech.generate({ model: google, text: "Hi", format: "mp3" }),
          Speech.generate({ model: google, text: "Hi", instructions: "Warm." }),
          collect(Speech.stream({ model: elevenlabs, text: "Hi", voice, format: "wav" })),
@@ -127,57 +87,16 @@ describe("Speech", () => {
        [
          ["UnsupportedOperation", "media.timestamps"],
          ["UnsupportedOperation", "media.format"],
-          ["UnsupportedOperation", "media.format"],
          ["UnsupportedOperation", "media.instructions"],
          ["UnsupportedOperation", "media.format"],
          ["UnsupportedOperation", "media.format"],
          ["UnsupportedOperation", "media.voice"],
        ],
      )
-      expect(errors[1].reason).toMatchObject({ provider: "openai", route: "openai-speech" })
-      expect(errors[2].reason).toMatchObject({ provider: "google", route: "google-speech" })
+      expect(errors[1].reason).toMatchObject({ provider: "google", route: "google-speech" })
    }).pipe(Effect.provide(layer(() => Effect.die("an unsupported request reached the network")))),
  )

-  it.effect("treats timestamps: false as not asking for timestamps on routes that cannot return them", () =>
-    Effect.gen(function* () {
-      const bytes = Uint8Array.from([1, 2, 3])
-      const gemini = JSON.stringify({
-        candidates: [
-          {
-            content: { parts: [{ inlineData: { mimeType: "audio/L16;codec=pcm;rate=24000", data: "AQID" } }] },
-            finishReason: "STOP",
-          },
-        ],
-      })
-      const responses = yield* Effect.all([
-        Speech.generate({ model: openai, text: "Hi", timestamps: false }).pipe(
-          Effect.provide(respond(new Blob([bytes]).stream(), "audio/mpeg")),
-        ),
-        Speech.generate({ model: google, text: "Hi", timestamps: false }).pipe(
-          Effect.provide(respond(gemini, "application/json")),
-        ),
-        Speech.generate({ model: deepgram, text: "Hi", timestamps: false }).pipe(
-          Effect.provide(respond(new Blob([bytes]).stream(), "audio/mpeg")),
-        ),
-      ])
-      for (const response of responses) expect(yield* response.audio.bytes()).toEqual(bytes)
-
-      const errors = yield* Effect.all(
-        [openai, google, deepgram].map((model) =>
-          Speech.generate({ model, text: "Hi", timestamps: true }).pipe(Effect.flip),
-        ),
-      ).pipe(Effect.provide(layer(() => Effect.die("an unsupported request reached the network"))))
-      expect(errors.map((error) => [error.reason._tag, "operation" in error.reason && error.reason.operation])).toEqual(
-        [
-          ["UnsupportedOperation", "media.timestamps"],
-          ["UnsupportedOperation", "media.timestamps"],
-          ["UnsupportedOperation", "media.timestamps"],
-        ],
-      )
-    }),
-  )
-
  it.effect("classifies stream failures and keeps the provider payload and HTTP context", () =>
    Effect.gen(function* () {
      const badFrame = JSON.stringify({ type: "speech.audio.delta", audio: "not base64!" })
@@ -208,38 +127,6 @@ describe("Speech", () => {
    }),
  )

-  it.effect("surfaces Gemini speech that ended without STOP instead of returning it as complete", () =>
-    Effect.gen(function* () {
-      const document = (finishReason?: string) =>
-        JSON.stringify({
-          candidates: [
-            {
-              content: { parts: [{ inlineData: { mimeType: "audio/L16;codec=pcm;rate=24000", data: "AQI=" } }] },
-              finishReason,
-            },
-          ],
-        })
-      const withheld = JSON.stringify({ candidates: [{ finishReason: "SAFETY" }] })
-      const generate = (body: string) =>
-        Speech.generate({ model: google, text: "Hi" }).pipe(Effect.provide(respond(body, "application/json")))
-
-      const truncated = yield* generate(document()).pipe(Effect.flip)
-      const partial = yield* generate(document("MAX_TOKENS"))
-      const policy = yield* generate(withheld).pipe(Effect.flip)
-
-      expect(truncated.reason).toMatchObject({ _tag: "InvalidProviderOutput", classification: "incomplete-stream" })
-      expect(yield* partial.audio.bytes()).toEqual(Uint8Array.from([1, 2]))
-      expect(partial.notices).toEqual([
-        {
-          type: "other",
-          message: "Google Speech finished with MAX_TOKENS",
-          providerMetadata: { google: { finishReason: "MAX_TOKENS" } },
-        },
-      ])
-      expect(policy.reason).toMatchObject({ _tag: "ContentPolicy", body: withheld })
-    }),
-  )
-
  it.effect("parses ElevenLabs timestamped records split across network chunks", () =>
    Effect.gen(function* () {
      const record = (bytes: ReadonlyArray<number>, character: string, start: number) =>
@@ -2,11 +2,10 @@ import { describe, expect } from "bun:test"
 import { Effect, Fiber, Layer, Stream } from "effect"
 import * as TestClock from "effect/testing/TestClock"
 import { HttpClientRequest } from "effect/unstable/http"
-import { Media, Transcription, TranscriptionClient, type TranscriptionEvent } from "../src/index.js"
-import { AssemblyAI, Deepgram, ElevenLabs, Google, OpenAI } from "../src/providers.js"
+import { Media, Transcription, TranscriptionClient } from "../src/index.js"
+import { AssemblyAI, Deepgram, Google, OpenAI } from "../src/providers.js"
 import { it } from "./lib/effect.js"
-import { dynamicResponse, json, observe, type Call } from "./lib/http.js"
-import { sseEvents } from "./lib/sse.js"
+import { dynamicResponse } from "./lib/http.js"

 const layer = (handler: Parameters<typeof dynamicResponse>[0]) =>
  TranscriptionClient.layer.pipe(Layer.provideMerge(dynamicResponse(handler)))
@@ -17,33 +16,16 @@ const deepgram = Deepgram.configure({ apiKey: "test", baseURL: "https://deepgram
 const google = Google.configure({ apiKey: "test", baseURL: "https://google.test/v1beta" }).transcription(
  "gemini-3.5-transcribe",
 )
-/**
- * Multipart fields of a recorded request, with repeated names collected in order. The boundary comes from the body:
- * each conversion of a FormData request to a web request picks a fresh one, so the recorded headers may not match.
- */
-const formFields = (call: Call) =>
-  Effect.promise(() =>
-    new Response(call.body, {
-      headers: { "content-type": `multipart/form-data; boundary=${call.body.slice(2, call.body.indexOf("\r\n"))}` },
-    }).formData(),
-  ).pipe(
-    Effect.map((form) =>
-      Object.fromEntries([...new Set(form.keys())].map((key) => [key, form.getAll(key).map((value) => String(value))])),
-    ),
-  )
-
 const assemblyai = AssemblyAI.configure({ apiKey: "aai-key", baseURL: "https://assemblyai.test" }).transcription(
  "universal-3-5-pro",
 )
-const elevenlabs = ElevenLabs.configure({ apiKey: "test", baseURL: "https://elevenlabs.test" }).transcription(
-  "scribe_v2",
-)

 describe("Transcription", () => {
  it.effect("rejects what a route cannot honor before sending anything", () =>
    Effect.gen(function* () {
      const errors = yield* Effect.all(
        [
+          Stream.runCollect(Transcription.stream({ model: openai.transcription("whisper-1"), audio })),
          Transcription.generate({ model: openai.transcription("gpt-4o-mini-transcribe"), audio, diarize: true }),
          Transcription.generate({ model: openai.transcription("gpt-4o-mini-transcribe"), audio, timestamps: "word" }),
          Transcription.generate({ model: openai.transcription("gpt-4o-transcribe-diarize"), audio, prompt: "Names" }),
@@ -71,6 +53,7 @@ describe("Transcription", () => {
      )
      expect(errors.map((error) => [error.reason._tag, "operation" in error.reason && error.reason.operation])).toEqual(
        [
+          ["UnsupportedOperation", "media.stream"],
          ["UnsupportedOperation", "media.diarize"],
          ["UnsupportedOperation", "media.timestamps"],
          ["UnsupportedOperation", "media.prompt"],
@@ -87,259 +70,6 @@ describe("Transcription", () => {
    }).pipe(Effect.provide(layer(() => Effect.die("an unsupported request reached the network")))),
  )

-  it.effect("ignores unknown OpenAI stream events and fails on an error event with the frame", () =>
-    Effect.gen(function* () {
-      const sse = (...frames: ReadonlyArray<string>) => frames.map((frame) => `data: ${frame}\n\n`).join("")
-      const failure = `{"type":"error","error":{"type":"server_error","code":"server_error","message":"The server had an error"}}`
-      const bodies = [
-        sse(
-          `{"type":"transcript.text.delta","delta":"Hi"}`,
-          `{"type":"transcript.text.future","payload":1}`,
-          `{"type":"transcript.text.done","text":"Hi"}`,
-          "[DONE]",
-        ),
-        sse(`{"type":"transcript.text.delta","delta":"Hi"}`, failure),
-      ]
-      const model = openai.transcription("gpt-4o-mini-transcribe")
-      const program = Effect.gen(function* () {
-        const events = Array.from(yield* Stream.runCollect(Transcription.stream({ model, audio })))
-        const error = yield* Stream.runCollect(Transcription.stream({ model, audio })).pipe(Effect.flip)
-        return { events, error }
-      })
-      const { events, error } = yield* program.pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.sync(() =>
-              input.respond(bodies.shift() ?? "", { headers: { "content-type": "text/event-stream" } }),
-            ),
-          ),
-        ),
-      )
-
-      expect(events.map((event) => event.type)).toEqual(["text-delta", "finish"])
-      expect(error.reason).toMatchObject({ _tag: "ProviderInternal", body: failure })
-      expect(error.message).toContain("The server had an error")
-    }),
-  )
-
-  it.effect("streams whisper-1 as a single finish from a plain request", () =>
-    Effect.gen(function* () {
-      const bodies: Array<string> = []
-      const events = Array.from(
-        yield* Stream.runCollect(Transcription.stream({ model: openai.transcription("whisper-1"), audio })).pipe(
-          Effect.provide(
-            layer((input) =>
-              Effect.sync(() => {
-                bodies.push(input.text)
-                return input.respond(
-                  JSON.stringify({ text: "Hello there.", usage: { type: "duration", seconds: 2 } }),
-                  { headers: { "content-type": "application/json" } },
-                )
-              }),
-            ),
-          ),
-        ),
-      )
-
-      expect(bodies[0]).not.toContain('name="stream"')
-      expect(events).toEqual([
-        expect.objectContaining({ type: "finish", text: "Hello there.", usage: { type: "seconds", seconds: 2 } }),
-      ])
-    }),
-  )
-
-  it.effect("streams diarized segments and finishes with the accumulated segments", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const body = sseEvents(
-        { type: "transcript.text.segment", id: "seg_0", text: " Hello", start: 0.25, end: 0.7, speaker: "A" },
-        { type: "transcript.text.segment", id: "seg_1", text: " there.", start: 0.7, end: 1.25, speaker: "B" },
-        { type: "transcript.text.done", text: "Hello there.", usage: { type: "duration", seconds: 2 } },
-      )
-      const events = Array.from(
-        yield* Stream.runCollect(
-          Transcription.stream({ model: openai.transcription("gpt-4o-transcribe-diarize"), audio, diarize: true }),
-        ).pipe(
-          Effect.provide(
-            layer((input) =>
-              observe(calls, input).pipe(
-                Effect.as(input.respond(body, { headers: { "content-type": "text/event-stream" } })),
-              ),
-            ),
-          ),
-        ),
-      )
-
-      const form = yield* formFields(calls[0])
-      expect(form).toMatchObject({
-        model: ["gpt-4o-transcribe-diarize"],
-        response_format: ["diarized_json"],
-        chunking_strategy: ["auto"],
-        stream: ["true"],
-      })
-      const segments = [
-        { text: "Hello", startSeconds: 0.25, endSeconds: 0.7, speaker: "A" },
-        { text: "there.", startSeconds: 0.7, endSeconds: 1.25, speaker: "B" },
-      ]
-      expect(events).toEqual([
-        { type: "segment", segment: segments[0] },
-        { type: "segment", segment: segments[1] },
-        expect.objectContaining({
-          type: "finish",
-          text: "Hello there.",
-          segments,
-          usage: { type: "seconds", seconds: 2 },
-        }),
-      ])
-    }),
-  )
-
-  it.effect("requests whisper-1 segment timestamps as verbose_json", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const response = yield* Transcription.generate({
-        model: openai.transcription("whisper-1"),
-        audio,
-        timestamps: "segment",
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            observe(calls, input).pipe(
-              Effect.as(
-                json(input, {
-                  text: "Hello there.",
-                  language: "English",
-                  duration: 1.25,
-                  segments: [
-                    { id: 0, text: " Hello", start: 0.25, end: 0.7 },
-                    { id: 1, text: " there.", start: 0.7, end: 1.25 },
-                  ],
-                  usage: { type: "duration", seconds: 2 },
-                }),
-              ),
-            ),
-          ),
-        ),
-      )
-
-      const form = yield* formFields(calls[0])
-      expect(form).toMatchObject({
-        model: ["whisper-1"],
-        response_format: ["verbose_json"],
-        "timestamp_granularities[]": ["segment"],
-      })
-      expect(form.stream).toBeUndefined()
-      expect(response).toMatchObject({
-        text: "Hello there.",
-        segments: [
-          { text: "Hello", startSeconds: 0.25, endSeconds: 0.7 },
-          { text: "there.", startSeconds: 0.7, endSeconds: 1.25 },
-        ],
-        language: "english",
-        durationSeconds: 1.25,
-        usage: { type: "seconds", seconds: 2 },
-      })
-    }),
-  )
-
-  it.effect("fails an OpenAI stream that ends without transcript.text.done as incomplete", () =>
-    Effect.gen(function* () {
-      const events: Array<TranscriptionEvent> = []
-      const error = yield* Transcription.stream({ model: openai.transcription("gpt-4o-mini-transcribe"), audio }).pipe(
-        Stream.runForEach((event) => Effect.sync(() => events.push(event))),
-        Effect.flip,
-        Effect.provide(
-          layer((input) =>
-            Effect.succeed(
-              input.respond(sseEvents({ type: "transcript.text.delta", delta: "Hel" }), {
-                headers: { "content-type": "text/event-stream" },
-              }),
-            ),
-          ),
-        ),
-      )
-
-      expect(events).toEqual([{ type: "text-delta", delta: "Hel" }])
-      expect(error.reason).toMatchObject({ _tag: "InvalidProviderOutput", classification: "incomplete-stream" })
-      expect(error.reason.http?.status).toBe(200)
-    }),
-  )
-
-  it.effect("sends a Deepgram URL source as a JSON body and repeats array query parameters", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const response = yield* Transcription.generate({
-        model: deepgram,
-        audio: Media.url("https://a.test/call.mp3", { mediaType: "audio/mpeg" }),
-        language: "en",
-        providerOptions: { keyterm: ["OpenCode", "Effect"] },
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            observe(calls, input).pipe(
-              Effect.as(
-                json(input, {
-                  metadata: { request_id: "dg_1", duration: 2 },
-                  results: { channels: [{ alternatives: [{ transcript: "Hello there." }] }] },
-                }),
-              ),
-            ),
-          ),
-        ),
-      )
-
-      expect(calls).toHaveLength(1)
-      const url = new URL(calls[0].url)
-      expect(url.origin + url.pathname).toBe("https://deepgram.test/v1/listen")
-      expect([...url.searchParams]).toEqual([
-        ["model", "nova-3"],
-        ["smart_format", "true"],
-        ["language", "en"],
-        ["keyterm", "OpenCode"],
-        ["keyterm", "Effect"],
-      ])
-      expect(calls[0].headers.get("content-type")).toBe("application/json")
-      expect(JSON.parse(calls[0].body)).toEqual({ url: "https://a.test/call.mp3" })
-      expect(response).toMatchObject({
-        text: "Hello there.",
-        usage: { type: "seconds", seconds: 2 },
-        providerMetadata: { deepgram: { requestId: "dg_1" } },
-      })
-    }),
-  )
-
-  it.effect("transcribes an AssemblyAI URL source without uploading it first", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const response = yield* Transcription.generate({
-        model: assemblyai,
-        audio: Media.url("https://a.test/call.mp3", { mediaType: "audio/mpeg" }),
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call } = yield* observe(calls, input)
-              if (call.method === "POST") return json(input, { id: "tr_1", status: "queued" })
-              return json(input, { id: "tr_1", status: "completed", text: "Hello there.", audio_duration: 2 })
-            }),
-          ),
-        ),
-      )
-
-      expect(calls.map((call) => `${call.method} ${call.url}`)).toEqual([
-        "POST https://assemblyai.test/v2/transcript",
-        "GET https://assemblyai.test/v2/transcript/tr_1",
-        "GET https://assemblyai.test/v2/transcript/tr_1",
-      ])
-      expect(JSON.parse(calls[0].body)).toEqual({
-        audio_url: "https://a.test/call.mp3",
-        speech_models: ["universal-3-5-pro"],
-        language_detection: true,
-      })
-      expect(response).toMatchObject({ text: "Hello there.", usage: { type: "seconds", seconds: 2 } })
-    }),
-  )
-
  it.effect(
    "uploads inline audio to AssemblyAI, resumes polling from a persisted token, and surfaces failed transcripts",
    () =>
@@ -441,185 +171,4 @@ describe("Transcription", () => {
        expect(failure.reason).toMatchObject({ _tag: "ProviderInternal", body: failed })
      }),
  )
-
-  it.effect("enables AssemblyAI speaker labels when only an expected speaker count is given", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      yield* Transcription.start({ model: assemblyai, audio: Media.url("https://a.test/call.mp3"), speakers: 2 }).pipe(
-        Effect.provide(
-          layer((input) => observe(calls, input).pipe(Effect.as(json(input, { id: "tr_1", status: "queued" })))),
-        ),
-      )
-      expect(calls.map((call) => JSON.parse(call.body))).toEqual([
-        {
-          audio_url: "https://a.test/call.mp3",
-          speech_models: ["universal-3-5-pro"],
-          language_detection: true,
-          speaker_labels: true,
-          speakers_expected: 2,
-        },
-      ])
-    }),
-  )
-
-  it.effect("rejects ElevenLabs prompts, webhooks, per-channel transcripts, and untimed diarization", () =>
-    Effect.gen(function* () {
-      const errors = yield* Effect.all(
-        [
-          Transcription.generate({ model: elevenlabs, audio, prompt: "OpenCode" }),
-          Transcription.generate({ model: elevenlabs, audio, providerOptions: { webhook: true } }),
-          Transcription.generate({ model: elevenlabs, audio, http: { body: { use_multi_channel: true } } }),
-          Transcription.generate({
-            model: elevenlabs,
-            audio,
-            diarize: true,
-            providerOptions: { timestamps_granularity: "none" },
-          }),
-          Transcription.generate({
-            model: elevenlabs,
-            audio: Media.ref("file_1", { provider: "elevenlabs", mediaType: "audio/mpeg" }),
-          }),
-        ].map((effect) => Effect.flip(effect)),
-      )
-      expect(errors.map((error) => [error.reason._tag, "operation" in error.reason && error.reason.operation])).toEqual(
-        [
-          ["UnsupportedOperation", "media.prompt"],
-          ["UnsupportedOperation", "transcription.webhook"],
-          ["UnsupportedOperation", "transcription.multichannel"],
-          ["UnsupportedOperation", "media.timestamps"],
-          ["InvalidRequest", false],
-        ],
-      )
-    }).pipe(Effect.provide(layer(() => Effect.die("an unsupported request reached the network")))),
-  )
-
-  it.effect("sends ElevenLabs URL audio as source_url and groups diarized words into speaker turns", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const token = (text: string, type: string, start: number, end: number, speaker_id?: string) => ({
-        text,
-        type,
-        start,
-        end,
-        speaker_id,
-        logprob: 0,
-      })
-      const response = yield* Transcription.generate({
-        model: elevenlabs,
-        audio: Media.url("https://a.test/call.mp3"),
-        language: "en",
-        speakers: 2,
-        providerOptions: { keyterms: ["OpenCode", "Scribe"], tag_audio_events: true, diarize: false },
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            observe(calls, input).pipe(
-              Effect.as(
-                json(input, {
-                  language_code: "ENG",
-                  text: "Ready? (laughs) Yes. Go",
-                  words: [
-                    token("Ready?", "word", 0, 0.5, "speaker_0"),
-                    token(" ", "spacing", 0.5, 0.6, "speaker_0"),
-                    token("(laughs)", "audio_event", 0.6, 1, "speaker_0"),
-                    token(" ", "spacing", 1, 1.1, "speaker_0"),
-                    token("Yes.", "word", 1.2, 1.5, "speaker_1"),
-                    token(" ", "spacing", 1.5, 1.6, "speaker_1"),
-                    token("Go", "word", 1.6, 1.9, "speaker_0"),
-                  ],
-                  transcription_id: "tr_1",
-                  audio_duration_secs: 2,
-                }),
-              ),
-            ),
-          ),
-        ),
-      )
-
-      // `observe` re-encodes the FormData with a new boundary, so read the boundary from the sent body.
-      const boundary = /^--(\S+)/.exec(calls[0].body)?.[1]
-      const form = yield* Effect.promise(() =>
-        new Response(calls[0].body, {
-          headers: { "content-type": `multipart/form-data; boundary=${boundary}` },
-        }).formData(),
-      )
-      expect(calls[0].url).toBe("https://elevenlabs.test/v1/speech-to-text")
-      expect(calls[0].headers.get("xi-api-key")).toBe("test")
-      expect(Array.from(form.entries())).toEqual([
-        ["model_id", "scribe_v2"],
-        ["source_url", "https://a.test/call.mp3"],
-        ["language_code", "en"],
-        ["diarize", "true"],
-        ["num_speakers", "2"],
-        ["keyterms", "OpenCode"],
-        ["keyterms", "Scribe"],
-        ["tag_audio_events", "true"],
-      ])
-      expect(response.segments).toEqual([
-        { text: "Ready?", startSeconds: 0, endSeconds: 0.5, speaker: "speaker_0" },
-        { text: "Yes.", startSeconds: 1.2, endSeconds: 1.5, speaker: "speaker_1" },
-        { text: "Go", startSeconds: 1.6, endSeconds: 1.9, speaker: "speaker_0" },
-      ])
-      expect(response.words?.map((word) => [word.text, word.speaker, word.confidence])).toEqual([
-        ["Ready?", "speaker_0", 1],
-        ["Yes.", "speaker_1", 1],
-        ["Go", "speaker_0", 1],
-      ])
-      expect(response.language).toBe("eng")
-      expect(response.usage).toEqual({ type: "seconds", seconds: 2 })
-      expect(response.providerMetadata).toEqual({ elevenlabs: { transcriptionId: "tr_1" } })
-    }),
-  )
-
-  it.effect("rejects reading an AssemblyAI result before the transcript finishes", () =>
-    Effect.gen(function* () {
-      const generation = yield* Transcription.resume(assemblyai, { transcriptID: "tr_1" })
-      const error = yield* generation.result().pipe(Effect.flip)
-      expect(error.reason._tag).toBe("InvalidRequest")
-      expect(error.message).toBe("AssemblyAI generation tr_1 has not finished; await it before reading the result")
-      expect(error.reason.body).toBe(JSON.stringify({ id: "tr_1", status: "processing" }))
-      expect(error.reason.http?.status).toBe(200)
-    }).pipe(
-      Effect.provide(
-        layer((input) =>
-          Effect.succeed(
-            input.respond(JSON.stringify({ id: "tr_1", status: "processing" }), {
-              headers: { "content-type": "application/json" },
-            }),
-          ),
-        ),
-      ),
-    ),
-  )
-
-  it.effect("surfaces Gemini transcripts that ended without STOP instead of returning them as complete", () =>
-    Effect.gen(function* () {
-      const document = (finishReason?: string) =>
-        JSON.stringify({
-          candidates: [{ content: { parts: [{ audioTranscription: { text: "Hello" } }] }, finishReason }],
-        })
-      const withheld = JSON.stringify({ candidates: [{ finishReason: "SAFETY" }] })
-      const generate = (body: string) =>
-        Transcription.generate({ model: google, audio }).pipe(
-          Effect.provide(
-            layer((input) => Effect.succeed(input.respond(body, { headers: { "content-type": "application/json" } }))),
-          ),
-        )
-
-      const truncated = yield* generate(document()).pipe(Effect.flip)
-      const partial = yield* generate(document("MAX_TOKENS"))
-      const policy = yield* generate(withheld).pipe(Effect.flip)
-
-      expect(truncated.reason).toMatchObject({ _tag: "InvalidProviderOutput", classification: "incomplete-stream" })
-      expect(partial.text).toBe("Hello")
-      expect(partial.notices).toEqual([
-        {
-          type: "other",
-          message: "Google Transcription finished with MAX_TOKENS",
-          providerMetadata: { google: { finishReason: "MAX_TOKENS" } },
-        },
-      ])
-      expect(policy.reason).toMatchObject({ _tag: "ContentPolicy", body: withheld })
-    }),
-  )
 })
@@ -1,10 +1,9 @@
 import { describe, expect } from "bun:test"
-import { Effect, Fiber, Layer, Stream } from "effect"
-import * as TestClock from "effect/testing/TestClock"
-import { Media, Video, VideoClient, type GenerationEvent, type VideoEvent } from "../src/index.js"
+import { Effect, Layer, Stream } from "effect"
+import { Media, Video, VideoClient, type GenerationEvent } from "../src/index.js"
 import { Fal, Google, Runway, XAI } from "../src/providers.js"
 import { it } from "./lib/effect.js"
-import { dynamicResponse, json, observe, settle, type Call, type HandlerInput } from "./lib/http.js"
+import { dynamicResponse, json, observe, settle, type Call } from "./lib/http.js"

 const layer = (handler: Parameters<typeof dynamicResponse>[0]) =>
  VideoClient.layer.pipe(Layer.provideMerge(dynamicResponse(handler)))
@@ -163,39 +162,27 @@ describe("Video / Google Veo", () => {
    ),
  )

-  for (const terminal of [
-    { error: { code: 3, message: "Prompt violates policy", status: "INVALID_ARGUMENT" }, tag: "InvalidRequest" },
-    { error: { code: 9, message: "Unsupported resolution", status: "FAILED_PRECONDITION" }, tag: "InvalidRequest" },
-    { error: { code: 11, message: "Duration out of range", status: "OUT_OF_RANGE" }, tag: "InvalidRequest" },
-    { error: { code: 7, message: "Permission denied", status: "PERMISSION_DENIED" }, tag: "Authentication" },
-    { error: { code: 16, message: "Invalid credentials", status: "UNAUTHENTICATED" }, tag: "Authentication" },
-    { error: { code: 8, message: "Quota exceeded", status: "RESOURCE_EXHAUSTED" }, tag: "RateLimit" },
-    { error: { code: 13, message: "Internal error", status: "INTERNAL" }, tag: "ProviderInternal" },
-    { error: { code: 14, message: "Service unavailable", status: "UNAVAILABLE" }, tag: "ProviderInternal" },
-    { error: { message: "Something broke" }, tag: "ProviderInternal" },
-  ]) {
-    it.effect(
-      `surfaces ${terminal.error.status ?? "an uncoded"} operation error as ${terminal.tag} with the provider body`,
-      () =>
-        Effect.gen(function* () {
-          const failure = { name: operation, done: true, error: terminal.error }
-          const error = yield* Video.generate({ model, prompt: "nope" }).pipe(
-            Effect.flip,
-            Effect.provide(
-              layer((input) =>
-                Effect.succeed(
-                  input.request.method === "POST" ? json(input, { name: operation }) : json(input, failure),
-                ),
-              ),
-            ),
-          )
-          expect(error.reason._tag).toBe(terminal.tag)
-          expect(error.message).toBe(`Google Veo operation failed: ${terminal.error.message}`)
-          expect(error.reason.body).toBe(JSON.stringify(failure))
-          expect(error.reason.http?.status).toBe(200)
-        }),
-    )
-  }
+  it.effect("surfaces an operation error as a failed generation with the provider body", () =>
+    Effect.gen(function* () {
+      const failure = {
+        name: operation,
+        done: true,
+        error: { code: 3, message: "Prompt violates policy", status: "INVALID_ARGUMENT" },
+      }
+      const error = yield* Video.generate({ model, prompt: "nope" }).pipe(
+        Effect.flip,
+        Effect.provide(
+          layer((input) =>
+            Effect.succeed(input.request.method === "POST" ? json(input, { name: operation }) : json(input, failure)),
+          ),
+        ),
+      )
+      expect(error.reason._tag).toBe("ProviderInternal")
+      expect(error.message).toBe("Google Veo operation failed: Prompt violates policy")
+      expect(error.reason.body).toBe(JSON.stringify(failure))
+      expect(error.reason.http?.status).toBe(200)
+    }),
+  )

  it.effect("reports fully filtered output as a content policy failure", () =>
    Effect.gen(function* () {
@@ -345,37 +332,12 @@ describe("Video / xAI", () => {
  for (const terminal of [
    {
      body: { status: "failed", error: { code: "invalid_argument", message: "Prompt cannot be empty." } },
-      tag: "InvalidRequest",
+      tag: "ProviderInternal",
      message: "xAI Video generation failed (invalid_argument): Prompt cannot be empty.",
    },
-    {
-      body: { status: "failed", error: { code: "failed_precondition", message: "Extension is not supported." } },
-      tag: "InvalidRequest",
-      message: "xAI Video generation failed (failed_precondition): Extension is not supported.",
-    },
-    {
-      body: { status: "failed", error: { code: "permission_denied", message: "Team lacks access." } },
-      tag: "Authentication",
-      message: "xAI Video generation failed (permission_denied): Team lacks access.",
-    },
-    {
-      body: { status: "failed", error: { code: "service_unavailable", message: "Overloaded." } },
-      tag: "ProviderInternal",
-      message: "xAI Video generation failed (service_unavailable): Overloaded.",
-    },
-    {
-      body: { status: "failed", error: { code: "internal_error", message: "Generation failed." } },
-      tag: "ProviderInternal",
-      message: "xAI Video generation failed (internal_error): Generation failed.",
-    },
-    {
-      body: { status: "failed", error: { code: "constructor", message: "Future code." } },
-      tag: "ProviderInternal",
-      message: "xAI Video generation failed (constructor): Future code.",
-    },
    { body: { status: "expired" }, tag: "InvalidRequest", message: "xAI Video request req_1 expired" },
  ]) {
-    it.effect(`surfaces ${terminal.body.error?.code ?? terminal.body.status} generations with the provider body`, () =>
+    it.effect(`surfaces ${terminal.body.status} generations with the provider body`, () =>
      Effect.gen(function* () {
        const error = yield* Video.generate({ model, prompt: "x" }).pipe(Effect.flip)
        expect(error.reason._tag).toBe(terminal.tag)
@@ -580,45 +542,6 @@ describe("Video / fal", () => {
    ),
  )

-  for (const failure of [
-    {
-      name: "a COMPLETED status carrying an error",
-      status: { status: "COMPLETED", error: "Invalid input", error_type: "ValidationError" },
-      result: { status: 422, body: { detail: [{ loc: ["body", "prompt"], msg: "Invalid input" }] } },
-      tag: "InvalidRequest",
-    },
-    {
-      name: "a failing response_url",
-      status: { status: "COMPLETED" },
-      result: { status: 500, body: { detail: "Internal error" } },
-      tag: "ProviderInternal",
-    },
-  ]) {
-    it.effect(`fails await for ${failure.name} with the response_url body and HTTP context`, () =>
-      Effect.gen(function* () {
-        // A transient 500 on the result fetch is retried first; the body and HTTP context survive the final failure.
-        const fiber = yield* Effect.forkChild(Video.generate({ model, prompt: "x" }).pipe(Effect.flip))
-        yield* TestClock.adjust("5 minutes")
-        const error = yield* Fiber.join(fiber)
-        expect(error.reason._tag).toBe(failure.tag)
-        expect(error.reason.body).toBe(JSON.stringify(failure.result.body))
-        expect(error.reason.http).toMatchObject({ url: urls.response, status: failure.result.status })
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.succeed(
-              input.request.method === "POST"
-                ? json(input, submitted)
-                : input.request.url === urls.response
-                  ? json(input, failure.result.body, { status: failure.result.status })
-                  : json(input, failure.status),
-            ),
-          ),
-        ),
-      ),
-    )
-  }
-
  it.effect("rejects model-specific common fields and points at providerOptions", () =>
    Effect.gen(function* () {
      const errors = yield* Effect.forEach(
@@ -653,7 +576,7 @@ describe("Video / Runway", () => {
  const model = runway.video("gen4.5")
  const taskUrl = "https://runway.test/v1/tasks/task_1"

-  it.effect("submits image_to_video, polls the task, reports credits, and keeps the finished task on cancel", () =>
+  it.effect("submits image_to_video with the API version header, polls the task, and reports credits", () =>
    Effect.gen(function* () {
      const calls: Array<Call> = []
      const program = Effect.gen(function* () {
@@ -701,7 +624,7 @@ describe("Video / Runway", () => {
                return json(input, { id: "task_1", estimatedCost: { credits: 25 } })
              }
              expect(call.url).toBe(taskUrl)
-              if (call.method === "DELETE") return yield* Effect.die("cancel deleted a finished Runway task")
+              if (call.method === "DELETE") return input.respond(null, { status: 204 })
              if (nth === 1) return json(input, { id: "task_1", status: "PENDING", estimatedCost: { credits: 25 } })
              if (nth === 2) return json(input, { id: "task_1", status: "THROTTLED", estimatedCost: { credits: 25 } })
              if (nth === 3) return json(input, { id: "task_1", status: "RUNNING", progress: 0.5 })
@@ -730,32 +653,6 @@ describe("Video / Runway", () => {
        `GET ${taskUrl}`,
        `GET ${taskUrl}`,
        `GET ${taskUrl}`,
-        `GET ${taskUrl}`,
-      ])
-    }),
-  )
-
-  it.effect("cancels a task that is still running", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      yield* Effect.gen(function* () {
-        const generation = yield* Video.start({ model, prompt: "x" })
-        yield* generation.cancel()
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call } = yield* observe(calls, input)
-              if (call.method === "POST") return json(input, { id: "task_1" })
-              if (call.method === "DELETE") return input.respond(null, { status: 204 })
-              return json(input, { id: "task_1", status: "RUNNING", progress: 0.2 })
-            }),
-          ),
-        ),
-      )
-      expect(calls.map((call) => `${call.method} ${call.url}`)).toEqual([
-        "POST https://runway.test/v1/text_to_video",
-        `GET ${taskUrl}`,
        `DELETE ${taskUrl}`,
      ])
    }),
@@ -806,11 +703,6 @@ describe("Video / Runway", () => {
      tag: "ProviderInternal",
      message: "Runway task failed (INTERNAL.BAD_OUTPUT.CODE01): Something broke",
    },
-    {
-      body: { status: "FAILED", failure: "Unsupported dimensions", failureCode: "ASSET.INVALID" },
-      tag: "InvalidRequest",
-      message: "Runway task failed (ASSET.INVALID): Unsupported dimensions",
-    },
    { body: { status: "CANCELLED" }, tag: "InvalidRequest", message: "Runway task task_1 was cancelled" },
  ]) {
    it.effect(`surfaces ${terminal.body.failureCode ?? terminal.body.status} with the task body`, () =>
@@ -900,39 +792,6 @@ describe("Video / Runway", () => {
    }),
  )

-  it.effect("streams the observations of a failed task and then fails with the task body", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const events: Array<VideoEvent> = []
-      const failed = { status: "FAILED", failure: "Something broke", failureCode: "INTERNAL.BAD_OUTPUT.CODE01" }
-      const program = Video.stream({ model, prompt: "x" }, { poll: { interval: "1 second" } }).pipe(
-        Stream.runForEach((event) => Effect.sync(() => events.push(event))),
-        Effect.flip,
-      )
-      const error = yield* settle(program, 3).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call, nth } = yield* observe(calls, input)
-              if (call.method === "POST") return json(input, { id: "task_1" })
-              if (nth === 1) return json(input, { status: "PENDING" })
-              if (nth === 2) return json(input, { status: "RUNNING", progress: 0.5 })
-              return json(input, failed)
-            }),
-          ),
-        ),
-      )
-      expect(events).toEqual([
-        { type: "generation-queued", id: "task_1", position: undefined },
-        { type: "generation-progress", id: "task_1", progress: 0.5 },
-      ])
-      expect(error.reason._tag).toBe("ProviderInternal")
-      expect(error.message).toBe("Runway task failed (INTERNAL.BAD_OUTPUT.CODE01): Something broke")
-      expect(error.reason.body).toBe(JSON.stringify(failed))
-      expect(error.reason.http?.status).toBe(200)
-    }),
-  )
-
  it.effect("fails a stream with a Timeout reason once polling passes the poll deadline", () =>
    Effect.gen(function* () {
      const program = Video.stream(
@@ -953,335 +812,3 @@ describe("Video / Runway", () => {
    }),
  )
 })
-
-// ---------------------------------------------------------------------------
-// Transient read failures
-// ---------------------------------------------------------------------------
-
-describe("Video / transient read failures", () => {
-  const model = Runway.configure({ apiKey: "test", baseURL: "https://runway.test/v1" }).video("gen4.5")
-  const succeeded = { id: "task_1", status: "SUCCEEDED", output: ["https://runway.test/out.mp4"] }
-  const failure = (input: HandlerInput, status: number, headers?: Record<string, string>) =>
-    json(input, { error: `HTTP ${status}` }, { status, headers })
-  const methods = (calls: ReadonlyArray<Call>) => calls.map((call) => call.method)
-
-  it.effect("retries a 503 status poll and a 503 result read, then returns the result", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const response = yield* settle(
-        Video.generate({ model, prompt: "x" }, { poll: { interval: "1 second" } }),
-        5,
-      ).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call, nth } = yield* observe(calls, input)
-              if (call.method === "POST") return json(input, { id: "task_1" })
-              // 1: status fails, 2: status succeeds, 3: result fails, 4: result succeeds.
-              if (nth === 1 || nth === 3) return failure(input, 503)
-              return json(input, succeeded)
-            }),
-          ),
-        ),
-      )
-      expect(response.video.source).toMatchObject({ type: "url", url: "https://runway.test/out.mp4" })
-      expect(methods(calls)).toEqual(["POST", "GET", "GET", "GET", "GET"])
-    }),
-  )
-
-  it.effect("waits for a 429 retry-after before polling again", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const fiber = yield* Effect.forkChild(
-        Video.generate({ model, prompt: "x" }, { poll: { interval: "1 second" } }).pipe(
-          Effect.provide(
-            layer((input) =>
-              Effect.gen(function* () {
-                const { call, nth } = yield* observe(calls, input)
-                if (call.method === "POST") return json(input, { id: "task_1" })
-                if (nth === 1) return failure(input, 429, { "retry-after": "10" })
-                return json(input, succeeded)
-              }),
-            ),
-          ),
-        ),
-      )
-      yield* TestClock.adjust("9 seconds")
-      expect(methods(calls)).toEqual(["POST", "GET"])
-      yield* TestClock.adjust("1 second")
-      yield* Fiber.join(fiber)
-      expect(methods(calls)).toEqual(["POST", "GET", "GET", "GET"])
-    }),
-  )
-
-  it.effect("fails a 400 status poll without retrying", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const error = yield* Video.generate({ model, prompt: "x" }).pipe(
-        Effect.flip,
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call } = yield* observe(calls, input)
-              return call.method === "POST" ? json(input, { id: "task_1" }) : failure(input, 400)
-            }),
-          ),
-        ),
-      )
-      expect(error.reason._tag).toBe("InvalidRequest")
-      expect(methods(calls)).toEqual(["POST", "GET"])
-    }),
-  )
-
-  it.effect("stops retrying at poll.timeout with a Timeout reason", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const error = yield* settle(
-        Video.generate({ model, prompt: "x" }, { poll: { interval: "1 second", timeout: "5 seconds" } }).pipe(
-          Effect.flip,
-        ),
-        6,
-      ).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call } = yield* observe(calls, input)
-              return call.method === "POST" ? json(input, { id: "task_1" }) : failure(input, 503)
-            }),
-          ),
-        ),
-      )
-      expect(error.reason._tag).toBe("Timeout")
-      expect(calls.filter((call) => call.method === "GET").length).toBeGreaterThan(1)
-    }),
-  )
-
-  it.effect("bounds a streamed result read's retries by poll.timeout", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const error = yield* settle(
-        Video.stream({ model, prompt: "x" }, { poll: { interval: "1 second", timeout: "5 seconds" } }).pipe(
-          Stream.runCollect,
-          Effect.flip,
-        ),
-        6,
-      ).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call, nth } = yield* observe(calls, input)
-              if (call.method === "POST") return json(input, { id: "task_1" })
-              return nth === 1 ? json(input, succeeded) : failure(input, 503)
-            }),
-          ),
-        ),
-      )
-      expect(error.reason._tag).toBe("Timeout")
-      expect(calls.filter((call) => call.method === "GET").length).toBeGreaterThan(2)
-    }),
-  )
-
-  it.effect("never retries a failed submit", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const error = yield* Video.generate({ model, prompt: "x" }).pipe(
-        Effect.flip,
-        Effect.provide(layer((input) => observe(calls, input).pipe(Effect.map(() => failure(input, 503))))),
-      )
-      expect(error.reason._tag).toBe("ProviderInternal")
-      expect(methods(calls)).toEqual(["POST"])
-    }),
-  )
-
-  it.effect("never retries a failed cancel", () =>
-    Effect.gen(function* () {
-      const calls: Array<Call> = []
-      const error = yield* Effect.gen(function* () {
-        const generation = yield* Video.start({ model, prompt: "x" })
-        return yield* generation.cancel().pipe(Effect.flip)
-      }).pipe(
-        Effect.provide(
-          layer((input) =>
-            Effect.gen(function* () {
-              const { call } = yield* observe(calls, input)
-              if (call.method === "POST") return json(input, { id: "task_1" })
-              if (call.method === "DELETE") return failure(input, 503)
-              return json(input, { id: "task_1", status: "RUNNING" })
-            }),
-          ),
-        ),
-      )
-      expect(error.reason._tag).toBe("ProviderInternal")
-      expect(methods(calls)).toEqual(["POST", "GET", "DELETE"])
-    }),
-  )
-})
-
-// ---------------------------------------------------------------------------
-// Shared queued behavior
-// ---------------------------------------------------------------------------
-
-describe("Video / queued result", () => {
-  for (const pending of [
-    {
-      model: Google.configure({ apiKey: "test", baseURL: "https://google.test/v1beta" }).video("veo-3.1"),
-      token: { operation: "models/veo-3.1/operations/op_1" },
-      body: { name: "models/veo-3.1/operations/op_1", done: false },
-      name: "Google Veo",
-    },
-    {
-      model: XAI.configure({ apiKey: "test", baseURL: "https://xai.test/v1" }).video("grok-imagine-video-1.5"),
-      token: { requestID: "req_1" },
-      body: { status: "pending", progress: 40 },
-      name: "xAI Video",
-    },
-    {
-      model: Runway.configure({ apiKey: "test", baseURL: "https://runway.test/v1" }).video("gen4.5"),
-      token: { taskID: "task_1" },
-      body: { status: "RUNNING", progress: 0.5 },
-      name: "Runway",
-    },
-  ]) {
-    it.effect(`rejects reading a ${pending.model.provider} result before the generation finishes`, () =>
-      Effect.gen(function* () {
-        const generation = yield* Video.resume(pending.model, pending.token)
-        const error = yield* generation.result().pipe(Effect.flip)
-        expect(error.reason._tag).toBe("InvalidRequest")
-        expect(error.message).toBe(
-          `${pending.name} generation ${generation.id} has not finished; await it before reading the result`,
-        )
-        expect(error.reason.body).toBe(JSON.stringify(pending.body))
-        expect(error.reason.http?.status).toBe(200)
-      }).pipe(Effect.provide(layer((input) => Effect.succeed(json(input, pending.body))))),
-    )
-  }
-
-  const veoOperation = "models/veo-3.1/operations/op_1"
-  const falURLs = {
-    status: "https://queue.fal.test/fal-ai/veo3.1/requests/r1/status",
-    response: "https://queue.fal.test/fal-ai/veo3.1/requests/r1",
-    cancel: "https://queue.fal.test/fal-ai/veo3.1/requests/r1/cancel",
-  }
-  for (const queued of [
-    {
-      model: Google.configure({ apiKey: "test", baseURL: "https://google.test/v1beta" }).video("veo-3.1"),
-      submitted: { name: veoOperation },
-      token: { operation: veoOperation },
-      submitURL: "https://google.test/v1beta/models/veo-3.1:predictLongRunning",
-      statusURL: `https://google.test/v1beta/${veoOperation}`,
-      resultURL: `https://google.test/v1beta/${veoOperation}`,
-      running: { name: veoOperation, done: false },
-      done: {
-        name: veoOperation,
-        done: true,
-        response: { generateVideoResponse: { generatedSamples: [{ video: { uri: "https://google.test/out.mp4" } }] } },
-      },
-      result: undefined,
-      url: "https://google.test/out.mp4",
-    },
-    {
-      model: XAI.configure({ apiKey: "test", baseURL: "https://xai.test/v1" }).video("grok-imagine-video-1.5"),
-      submitted: { request_id: "req_1" },
-      token: { requestID: "req_1" },
-      submitURL: "https://xai.test/v1/videos/generations",
-      statusURL: "https://xai.test/v1/videos/req_1",
-      resultURL: "https://xai.test/v1/videos/req_1",
-      running: { status: "pending", progress: 40 },
-      done: { status: "done", video: { url: "https://vidgen.x.ai/out.mp4", respect_moderation: true } },
-      result: undefined,
-      url: "https://vidgen.x.ai/out.mp4",
-    },
-    {
-      model: Fal.configure({ apiKey: "test", baseURL: "https://queue.fal.test" }).video("fal-ai/veo3.1"),
-      submitted: {
-        request_id: "r1",
-        status_url: falURLs.status,
-        response_url: falURLs.response,
-        cancel_url: falURLs.cancel,
-      },
-      token: { requestID: "r1", statusURL: falURLs.status, responseURL: falURLs.response, cancelURL: falURLs.cancel },
-      submitURL: "https://queue.fal.test/fal-ai/veo3.1",
-      statusURL: falURLs.status,
-      resultURL: falURLs.response,
-      running: { status: "IN_PROGRESS" },
-      done: { status: "COMPLETED" },
-      result: { video: { url: "https://v3.fal.media/out.mp4" } },
-      url: "https://v3.fal.media/out.mp4",
-    },
-  ]) {
-    it.effect(`resumes a ${queued.model.provider} generation from a JSON round-tripped token`, () =>
-      Effect.gen(function* () {
-        const calls: Array<Call> = []
-        const response = yield* Effect.gen(function* () {
-          const started = yield* Video.start({ model: queued.model, prompt: "x" })
-          const resumed = yield* Video.resume(queued.model, JSON.parse(JSON.stringify(started.token)))
-          expect(resumed.status).toBe("running")
-          expect(resumed.token).toEqual(queued.token)
-          return yield* resumed.await()
-        }).pipe(
-          Effect.provide(
-            layer((input) =>
-              Effect.gen(function* () {
-                const { call, nth } = yield* observe(calls, input)
-                if (call.method === "POST") return json(input, queued.submitted)
-                if (call.url === queued.resultURL && queued.result !== undefined) return json(input, queued.result)
-                return json(input, nth === 1 ? queued.running : queued.done)
-              }),
-            ),
-          ),
-        )
-        expect(response.video.source).toEqual(expect.objectContaining({ type: "url", url: queued.url }))
-        expect(calls.map((call) => `${call.method} ${call.url}`)).toEqual([
-          `POST ${queued.submitURL}`,
-          `GET ${queued.statusURL}`,
-          `GET ${queued.statusURL}`,
-          `GET ${queued.resultURL}`,
-        ])
-      }),
-    )
-  }
-
-  for (const queued of [
-    {
-      model: Google.configure({ apiKey: "test", baseURL: "https://google.test/v1beta" }).video("veo-3.1"),
-      submitted: { name: veoOperation },
-    },
-    {
-      model: XAI.configure({ apiKey: "test", baseURL: "https://xai.test/v1" }).video("grok-imagine-video-1.5"),
-      submitted: { request_id: "req_1" },
-    },
-  ]) {
-    it.effect(`cancels a ${queued.model.provider} generation without sending a request`, () =>
-      Effect.gen(function* () {
-        const calls: Array<Call> = []
-        yield* Effect.gen(function* () {
-          const generation = yield* Video.start({ model: queued.model, prompt: "x" })
-          yield* generation.cancel()
-        }).pipe(
-          Effect.provide(
-            layer((input) =>
-              Effect.gen(function* () {
-                const { call } = yield* observe(calls, input)
-                if (call.method !== "POST") return yield* Effect.die(`cancel sent ${call.method} ${call.url}`)
-                return json(input, queued.submitted)
-              }),
-            ),
-          ),
-        )
-        expect(calls.map((call) => call.method)).toEqual(["POST"])
-      }),
-    )
-  }
-
-  it.effect("rejects a status that only matches an inherited property", () =>
-    Effect.gen(function* () {
-      const error = yield* Video.resume(
-        XAI.configure({ apiKey: "test", baseURL: "https://xai.test/v1" }).video("grok-imagine-video-1.5"),
-        { requestID: "req_1" },
-      ).pipe(Effect.flip)
-      expect(error.reason._tag).toBe("InvalidProviderOutput")
-      expect(error.message).toBe('Unknown generation status "constructor"')
-      expect(error.reason.body).toBe(JSON.stringify({ status: "constructor" }))
-    }).pipe(Effect.provide(layer((input) => Effect.succeed(json(input, { status: "constructor" }))))),
-  )
-})
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/app",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "description": "",
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/cli",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -25,7 +25,6 @@
  },
  "dependencies": {
    "@agentclientprotocol/sdk": "1.2.1",
-    "@clack/core": "1.0.0-alpha.1",
    "@clack/prompts": "1.0.0-alpha.1",
    "@effect/platform-node": "catalog:",
    "@opencode/client": "workspace:*",
@@ -42,7 +41,7 @@
    "effect": "catalog:",
    "immer": "11.1.4",
    "jsonc-parser": "3.3.1",
-    "picocolors": "1.1.1",
+    "open": "10.1.2",
    "solid-js": "catalog:",
    "tree-sitter-bash": "0.25.0",
    "tree-sitter-powershell": "0.25.10",
@@ -51,7 +51,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
    ),
    session: Flag.string("session").pipe(
      Flag.withAlias("s"),
-      Flag.withDescription("Session ID to continue, or to create if it does not exist"),
+      Flag.withDescription("Session ID to continue"),
      Flag.optional,
    ),
    prompt: Flag.string("prompt").pipe(Flag.withDescription("Prompt to use"), Flag.optional),
@@ -142,10 +142,10 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
      ],
    }),
    Spec.make("auth", {
-      description: "manage integrations and credentials",
+      description: "manage AI providers and credentials",
      commands: [
        Spec.make("list", {
-          description: "list integrations and credentials",
+          description: "list providers and credentials",
          params: {
            ...ServerParams,
            format: Flag.choice("format", ["default", "json"]).pipe(
@@ -155,7 +155,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
          },
        }),
        Spec.make("login", {
-          description: "connect an integration",
+          description: "log in to a provider",
          params: {
            ...ServerParams,
            target: Argument.string("target").pipe(
@@ -228,9 +228,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        }),
        Spec.make("auth", {
          description: "Authenticate with an OAuth-capable remote MCP server",
-          params: {
-            name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server"), Argument.optional),
-          },
+          params: { name: Argument.string("name").pipe(Argument.withDescription("Name of the MCP server")) },
        }),
        Spec.make("logout", {
          description: "Remove stored OAuth credentials for an MCP server",
@@ -328,7 +326,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        ),
        session: Flag.string("session").pipe(
          Flag.withAlias("s"),
-          Flag.withDescription("Session ID to continue, or to create if it does not exist"),
+          Flag.withDescription("Session ID to continue"),
          Flag.optional,
        ),
        fork: Flag.boolean("fork").pipe(
@@ -368,7 +366,7 @@ const Root = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCODE_CLI_NAME
        ),
        session: Flag.string("session").pipe(
          Flag.withAlias("s"),
-          Flag.withDescription("Session ID to continue, or to create if it does not exist"),
+          Flag.withDescription("Session ID to continue"),
          Flag.optional,
        ),
        fork: Flag.boolean("fork").pipe(
@@ -1,9 +1,8 @@
-import { intro, log, outro, select, spinner, text } from "@clack/prompts"
+import { autocomplete, intro, log, outro, select, spinner, text } from "@clack/prompts"
 import { Effect, Option } from "effect"
 import type { FormAnswer, IntegrationInfo, OpenCodeClient } from "@opencode/client"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
-import { selectIntegration, type IntegrationChoice } from "../../../ui/integration-picker"
 import { handlePromptErrors, openUrl, prompt, requireInteractive } from "../../../ui/prompt"
 import { answerForm, secret } from "./form"
 import {
@@ -22,8 +21,10 @@ const integrationPriority = new Map([
  ["opencode", 1],
  ["openai", 2],
  ["github-copilot", 3],
-  ["anthropic", 4],
-  ["google", 5],
+  ["google", 4],
+  ["anthropic", 5],
+  ["openrouter", 6],
+  ["vercel", 7],
 ])

 export default Runtime.handler(
@@ -73,35 +74,30 @@ const findIntegration = Effect.fn("cli.auth.login.integration")(function* (clien
  }
  const integrations = yield* loadIntegrations(client)
  if (target) return yield* resolveIntegration(integrations, target)
-  const choices = loginChoices(integrations)
-  if (choices.length === 0) return yield* Effect.fail(new Error("No authentication integrations are available"))
-  const id = yield* prompt<string>(() => selectIntegration(choices))
-  return yield* resolveIntegration(integrations, id)
-})
-
-export function loginChoices(integrations: IntegrationInfo[]): IntegrationChoice[] {
-  return integrations
+  const available = integrations
    .filter((integration) => connectMethods(integration).length > 0)
    .toSorted(
      (a, b) =>
-        Number(b.metadata?.source === "mcp") - Number(a.metadata?.source === "mcp") ||
        (integrationPriority.get(a.id) ?? integrationPriority.size) -
          (integrationPriority.get(b.id) ?? integrationPriority.size) ||
        a.name.localeCompare(b.name) ||
        a.id.localeCompare(b.id),
    )
-    .map((integration) => ({
-      value: integration.id,
-      label: integration.name,
-      category:
-        integration.metadata?.source === "mcp"
-          ? "MCP"
-          : integrationPriority.has(integration.id)
-            ? "Popular"
-            : "Services",
-      connected: integration.connections.length > 0,
-    }))
-}
+  if (available.length === 0) return yield* Effect.fail(new Error("No authentication integrations are available"))
+  const id = yield* prompt<string>(() =>
+    autocomplete({
+      message: "Select integration",
+      maxItems: 8,
+      options: available.map((integration) => {
+        const option = { value: integration.id, label: integration.name, hint: integration.id }
+        if (integration.connections.length > 0) return { ...option, hint: "connected" }
+        if (integration.id === "opencode") return { ...option, hint: "recommended" }
+        return option
+      }),
+    }),
+  )
+  return yield* resolveIntegration(available, id)
+})

 const chooseMethod = Effect.fn("cli.auth.login.method")(function* (methods: ConnectMethod[], target?: string) {
  if (target) return yield* resolveMethod(methods, target)
@@ -147,18 +143,17 @@ const keyLogin = Effect.fn("cli.auth.login.key")(function* (
  )
 })

-export const oauthLogin = Effect.fn("cli.auth.login.oauth")(function* (
+const oauthLogin = Effect.fn("cli.auth.login.oauth")(function* (
  client: OpenCodeClient,
  integration: IntegrationInfo,
  method: Extract<ConnectMethod, { type: "oauth" }>,
  answer?: FormAnswer,
-  label?: string,
 ) {
  const progress = spinner()
  progress.start("Starting authorization...")
  const started = yield* request((signal) =>
    client.integration.oauth.connect(
-      { integrationID: integration.id, methodID: method.id, answer, label, location },
+      { integrationID: integration.id, methodID: method.id, answer, location },
      { signal },
    ),
  ).pipe(Effect.tapCause(() => Effect.sync(() => progress.stop("Authentication failed", 1))))
@@ -195,14 +190,16 @@ export const oauthLogin = Effect.fn("cli.auth.login.oauth")(function* (
    return
  }

-  // Clack's spinner captures Ctrl+C and exits the process directly, which would skip the finalizer that
-  // cancels the attempt. Waits that can last minutes use plain log lines so Ctrl+C interrupts normally.
-  log.step("Waiting for authorization...")
-  const status = yield* waitForOAuth(client, integration.id, attempt.attemptID)
+  const waiting = spinner()
+  waiting.start("Waiting for authorization...")
+  const status = yield* waitForOAuth(client, integration.id, attempt.attemptID).pipe(
+    Effect.tapCause(() => Effect.sync(() => waiting.stop("Authentication failed", 1))),
+  )
  if (status.status === "complete") {
-    log.success(`Connected to ${integration.name}`)
+    waiting.stop(`Connected to ${integration.name}`)
    return
  }
+  waiting.stop("Authentication failed", 1)
  if (status.status === "failed") yield* Effect.fail(new Error(status.message))
  yield* Effect.fail(new Error("Authorization expired"))
 })
@@ -229,21 +226,14 @@ const commandLogin = Effect.fn("cli.auth.login.command")(function* (
      ),
    ).pipe(Effect.ignore),
  )
-  progress.stop("Authentication command started")
-  // The status message accumulates the command's stderr; print each completed line once.
-  let printed = 0
-  log.step("Waiting for authentication command...")
-  const status = yield* waitForCommand(client, integration.id, started.data.attemptID, (message) => {
-    const end = message.lastIndexOf("\n") + 1
-    if (end <= printed) return
-    const output = message.slice(printed, end).trim()
-    printed = end
-    if (output) log.message(output)
-  })
+  const status = yield* waitForCommand(client, integration.id, started.data.attemptID, (message) =>
+    progress.message(message.trim() || "Waiting for authentication command..."),
+  ).pipe(Effect.tapCause(() => Effect.sync(() => progress.stop("Authentication failed", 1))))
  if (status.status === "complete") {
-    log.success(`Connected to ${integration.name}`)
+    progress.stop(`Connected to ${integration.name}`)
    return
  }
+  progress.stop("Authentication failed", 1)
  if (status.status === "failed") yield* Effect.fail(new Error(status.message))
  yield* Effect.fail(new Error("Authentication expired"))
 })
@@ -11,10 +11,6 @@ import { UpdatePreflight } from "../../services/update-preflight"
 import { Npm } from "@opencode/util/npm"
 import { OPENCODE_ARTIFACT, OPENCODE_CHANNEL, OPENCODE_VERSION } from "../../version"
 import { Env } from "../../env"
-import { Service } from "@opencode/client/effect/service"
-import { OpenCode } from "@opencode/client/promise"
-import { findSession } from "../../session-target"
-import { errorMessage } from "../../util/error"

 export default Runtime.handler(Commands, (input) =>
  Effect.gen(function* () {
@@ -50,15 +46,6 @@ export default Runtime.handler(Commands, (input) =>
        Effect.promise(() => preflight.fail("OpenCode update could not start the new background service")),
      ),
    )
-    const session = Option.getOrUndefined(input.session)
-    // A missing --session ID becomes the ID of the session the first prompt creates.
-    const sessionExists =
-      session !== undefined &&
-      (yield* Effect.tryPromise({
-        try: () =>
-          findSession(OpenCode.make({ baseUrl: server.endpoint.url, headers: Service.headers(server.endpoint) }), session),
-        catch: (cause) => new Error(errorMessage(cause)),
-      })) !== undefined
    const updater = yield* Updater.Service
    let installing: string | undefined
    const updateListeners = new Set<(version: string) => void>()
@@ -94,8 +81,7 @@ export default Runtime.handler(Commands, (input) =>
      },
      args: {
        continue: input.continue,
-        sessionID: sessionExists ? session : undefined,
-        newSessionID: sessionExists ? undefined : session,
+        sessionID: Option.getOrUndefined(input.session),
        prompt: Option.getOrUndefined(input.prompt),
        auto: input.auto || input.yolo || input.dangerouslySkipPermissions,
      },
@@ -1,109 +1,65 @@
-import { confirm, intro, log, outro } from "@clack/prompts"
-import { Effect, Option } from "effect"
-import { OpenCode, type IntegrationInfo, type IntegrationOAuthMethod, type McpServer } from "@opencode/client"
+import { EOL } from "node:os"
+import { Effect } from "effect"
+import {
+  OpenCode,
+  type IntegrationAttemptStatus,
+  type IntegrationOAuthMethod,
+  type OpenCodeClient,
+} from "@opencode/client"
 import { Commands } from "../../commands"
 import { Runtime } from "../../../framework/runtime"
 import { Service } from "@opencode/client/effect/service"
 import { ServiceConfig } from "../../../services/service-config"
-import { selectIntegration, type IntegrationChoice } from "../../../ui/integration-picker"
-import { handlePromptErrors, prompt, requireInteractive } from "../../../ui/prompt"
-import { answerForm } from "../auth/form"
-import { oauthLogin } from "../auth/login"
-import { loadIntegrations, request } from "../auth/shared"
+import { resolveIntegration } from "./resolve"

 const location = { directory: process.cwd() }

 export default Runtime.handler(
  Commands.commands.mcp.commands.auth,
-  Effect.fn("cli.mcp.auth")((input) => authenticate(Option.getOrUndefined(input.name)).pipe(handlePromptErrors)),
+  Effect.fn("cli.mcp.auth")(function* (input) {
+    const endpoint = yield* Service.ensure(yield* ServiceConfig.options())
+    const client = OpenCode.make({ baseUrl: endpoint.url, headers: Service.headers(endpoint) })
+
+    const integration = yield* resolveIntegration(client, input.name, location)
+    if (!integration)
+      return yield* Effect.fail(new Error(`MCP server "${input.name}" is not an OAuth-capable remote server`))
+    const method = integration.methods.find(
+      (candidate): candidate is IntegrationOAuthMethod => candidate.type === "oauth",
+    )
+    if (!method)
+      return yield* Effect.fail(new Error(`MCP server "${input.name}" is not an OAuth-capable remote server`))
+
+    const started = yield* Effect.promise(() =>
+      client.integration.oauth.connect({ integrationID: integration.id, methodID: method.id, location }),
+    )
+    const attempt = started.data
+    if (attempt.mode === "code")
+      return yield* Effect.fail(new Error("This server requires manual code entry, which the CLI does not support"))
+
+    process.stdout.write(attempt.instructions + EOL + attempt.url + EOL)
+
+    const result = yield* poll(client, integration.id, attempt.attemptID)
+    if (result.status === "complete") {
+      process.stdout.write(`Authenticated with ${input.name}` + EOL)
+      return
+    }
+    const reason = result.status === "failed" ? `: ${result.message}` : ""
+    return yield* Effect.fail(new Error(`Authentication ${result.status}${reason}`))
+  }),
 )

-const authenticate = Effect.fn("cli.mcp.auth.run")(function* (name?: string) {
-  if (!name) yield* requireInteractive("Pass an MCP server name when running without an interactive terminal")
-  intro("Authenticate an MCP server")
-  const endpoint = yield* Service.ensure(yield* ServiceConfig.options())
-  const client = OpenCode.make({ baseUrl: endpoint.url, headers: Service.headers(endpoint) })
-  const integrations = yield* loadIntegrations(client)
-  const servers = yield* request((signal) => client.mcp.list({ location }, { signal }))
-  const choices = mcpAuthChoices(servers.data, integrations)
-  if (!name && choices.length === 0) {
-    log.warn("No OAuth-capable MCP servers configured")
-    log.info(
-      `Remote MCP servers support OAuth by default. Add one with \`opencode mcp add\` or in opencode.json:\n${exampleConfig}`,
-    )
-    outro("Done")
-    return
-  }
-
-  const server = name ? servers.data.find((item) => item.name === name) : undefined
-  if (name && !server) return yield* Effect.fail(new Error(`MCP server not found: ${name}`))
-  const integrationID = server
-    ? server.integrationID
-    : yield* prompt<string>(() => selectIntegration(choices, "MCP server"))
-  const integration = integrations.find((item) => item.id === integrationID)
-  const method = integration?.methods.find(
-    (candidate): candidate is IntegrationOAuthMethod => candidate.type === "oauth",
-  )
-  if (!integration || !method)
-    return yield* Effect.fail(new Error(`MCP server "${name}" is not an OAuth-capable remote server`))
-
-  if (integration.connections.length > 0) {
-    const status = servers.data.find((item) => item.integrationID === integration.id)?.status.status
-    if (status === "needs_auth") log.warn(`${integration.name} has expired credentials. Re-authenticating...`)
-    if (status !== "needs_auth" && process.stdin.isTTY && process.stdout.isTTY) {
-      const again = yield* prompt<boolean>(() =>
-        confirm({ message: `${integration.name} already has valid credentials. Re-authenticate?` }),
-      )
-      if (!again) {
-        outro("Cancelled")
-        return
-      }
+const poll = (
+  client: OpenCodeClient,
+  integrationID: string,
+  attemptID: string,
+): Effect.Effect<Exclude<IntegrationAttemptStatus, { status: "pending" }>> =>
+  Effect.gen(function* () {
+    const status = yield* Effect.promise(() =>
+      client.integration.oauth.status({ integrationID, attemptID, location }),
+    ).pipe(Effect.map((result) => result.data))
+    if (status.status === "pending") {
+      yield* Effect.sleep("1 second")
+      return yield* poll(client, integrationID, attemptID)
    }
-  }
-
-  // Re-authenticating replaces the previous sign-in rather than adding an account. The new credential
-  // keeps the active one's label, and the old ones are only removed once it is stored, so a failed
-  // attempt keeps them.
-  const previous = integration.connections.filter((connection) => connection.type === "credential")
-  yield* oauthLogin(client, integration, method, yield* answerForm(method.form), previous[0]?.label)
-  yield* Effect.forEach(
-    previous,
-    (connection) => request((signal) => client.credential.remove({ credentialID: connection.id }, { signal })),
-    { discard: true },
-  )
-  outro("Done")
-})
-
-const exampleConfig = `
-  "mcp": {
-    "my-server": {
-      "type": "remote",
-      "url": "https://example.com/mcp"
-    }
-  }`
-
-// Choices carry the server-owned integration ID so provider integrations with colliding names never match.
-export function mcpAuthChoices(servers: McpServer[], integrations: IntegrationInfo[]): IntegrationChoice[] {
-  const byID = new Map(integrations.map((integration) => [integration.id, integration]))
-  return servers
-    .flatMap((server) => {
-      const integration = server.integrationID ? byID.get(server.integrationID) : undefined
-      if (!integration?.methods.some((method) => method.type === "oauth")) return []
-      return [
-        {
-          value: integration.id,
-          label: server.name,
-          category: "MCP" as const,
-          connected: integration.connections.length > 0,
-          hint: statusHint(server.status),
-        },
-      ]
-    })
-    .toSorted((a, b) => a.label.localeCompare(b.label) || a.value.localeCompare(b.value))
-}
-
-function statusHint(status: McpServer["status"]) {
-  if (status.status === "needs_auth") return "needs authentication"
-  if (status.status === "failed" || status.status === "disabled") return status.status
-  return undefined
-}
+    return status
+  })
@@ -135,7 +135,6 @@ export async function runNonInteractivePrompt(input: Input) {
  const replyPermission = async (request: { id: string; action: string; resources: ReadonlyArray<string> }) => {
    if (!input.auto) {
      permissionRejected = true
-      if (input.compatibility !== "v1") process.exitCode = 1
      UI.println(
        UI.Style.TEXT_WARNING_BOLD + "!",
        UI.Style.TEXT_NORMAL +
@@ -494,8 +493,7 @@ export async function runNonInteractivePrompt(input: Input) {
      if (event.type === "session.execution.interrupted") {
        if (input.compatibility === "v1" && (permissionRejected || formCancelled)) return
        if (event.data.reason === "user" && interrupted) process.exitCode = 130
-        // A declined tool call ends the step with an interruption; it was already reported above.
-        if (event.data.reason !== "user" && !emittedError && !permissionRejected && !formCancelled) {
+        if (event.data.reason !== "user" && !emittedError) {
          emittedError = true
          process.exitCode = 1
          const error = { type: "aborted" as const, message: `Session interrupted: ${event.data.reason}` }
@@ -622,9 +620,7 @@ export async function runNonInteractivePrompt(input: Input) {
        UI.error(item.state.error.message)
      }

-      // A declined tool call ends its step with an interrupted-step error that is
-      // only a consequence of our own rejection; it was already reported above.
-      if (message.error && !emittedError && !permissionRejected && !formCancelled) {
+      if (message.error && !emittedError) {
        emittedError = true
        process.exitCode = 1
        if (!emit("error", timestamp, { error: message.error })) UI.error(message.error.message)
@@ -63,7 +63,6 @@ export async function resolveSessionTarget(input: {
    (await input.client.session
      .create(
        {
-          id: input.session,
          agent: prepared.agent,
          model: prepared.model,
          location: { directory: location.directory },
@@ -102,11 +101,14 @@ async function selectSession(input: {
  fork?: boolean
  signal?: AbortSignal
 }) {
-  const explicit = input.session ? await findSession(input.client, input.session, input.signal) : undefined
-  if (input.session && !explicit) {
-    if (input.fork) throw new Error("Session not found")
-    return { session: undefined }
-  }
+  const explicit = input.session
+    ? await input.client.session.get({ sessionID: input.session }, ...requestOptions(input.signal)).catch((error) => {
+        if (error && typeof error === "object" && "_tag" in error && error._tag === "SessionNotFoundError")
+          return undefined
+        throw error
+      })
+    : undefined
+  if (input.session && !explicit) throw new Error("Session not found")
  if (explicit)
    return {
      session: input.fork
@@ -131,13 +133,6 @@ async function selectSession(input: {
  }
 }

-export function findSession(client: OpenCodeClient, sessionID: string, signal?: AbortSignal) {
-  return client.session.get({ sessionID }, ...requestOptions(signal)).catch((error) => {
-    if (error && typeof error === "object" && "_tag" in error && error._tag === "SessionNotFoundError") return undefined
-    throw error
-  })
-}
-
 async function latestSession(
  client: OpenCodeClient,
  location: LocationGetOutput,
@@ -1,67 +0,0 @@
-import { AutocompletePrompt } from "@clack/core"
-import { S_BAR, S_BAR_END, S_RADIO_ACTIVE, S_RADIO_INACTIVE, symbol } from "@clack/prompts"
-import color from "picocolors"
-
-export type IntegrationChoice = {
-  value: string
-  label: string
-  category: "MCP" | "Popular" | "Services"
-  connected: boolean
-  hint?: string
-}
-
-export async function selectIntegration(choices: IntegrationChoice[], kind = "integration") {
-  const result = await new AutocompletePrompt<IntegrationChoice>({
-    options: choices,
-    filter: (search, choice) =>
-      [choice.label, choice.value, choice.category].some((value) => value.toLowerCase().includes(search.toLowerCase())),
-    validate: (value) => (value ? undefined : `Select an ${kind}`),
-    render() {
-      const title = `${color.gray(S_BAR)}\n${symbol(this.state)}  Select ${kind}`
-      if (this.state === "submit") {
-        const choice = choices.find((item) => item.value === this.value)
-        return `${title}\n${color.gray(S_BAR)}  ${color.dim(choice?.label ?? "")}`
-      }
-      if (this.state === "cancel")
-        return `${title}\n${color.gray(S_BAR)}  ${color.strikethrough(color.dim(this.userInput))}`
-
-      // Leave room for the category headings as well as Clack's title and footer.
-      const maxItems = Math.min(8, Math.max(2, (process.stdout.rows ?? 24) - 14 - Number(this.state === "error")))
-      const compact = (process.stdout.rows ?? 24) < 18
-      const start = Math.min(
-        Math.max(0, this.cursor - Math.min(2, maxItems - 1)),
-        Math.max(0, this.filteredOptions.length - maxItems),
-      )
-      const visible = this.filteredOptions.slice(start, start + maxItems)
-      const rows = visible.flatMap((choice, index) => [
-        ...(index === 0 || visible[index - 1].category !== choice.category
-          ? [...(compact ? [] : [`${color.cyan(S_BAR)}  `]), `${color.cyan(S_BAR)}  ${color.bold(choice.category)}`]
-          : []),
-        `${color.cyan(S_BAR)}  ${start + index === this.cursor ? color.green(S_RADIO_ACTIVE) : color.dim(S_RADIO_INACTIVE)} ${
-          start + index === this.cursor ? choice.label : color.dim(choice.label)
-        }${choice.connected ? ` ${color.green("✓")}` : ""}${choice.hint ? ` ${color.dim(`(${choice.hint})`)}` : ""}`,
-      ])
-      return [
-        title,
-        `${color.cyan(S_BAR)}  ${color.dim("Search:")} ${this.isNavigating ? color.dim(this.userInput) : this.userInputWithCursor}`,
-        ...(visible.length === 0 && this.userInput
-          ? [`${color.cyan(S_BAR)}  ${color.yellow(`No ${kind}s found`)}`]
-          : []),
-        ...(this.state === "error" && visible.length > 0
-          ? [`${color.yellow(S_BAR)}  ${color.yellow(this.error)}`]
-          : []),
-        ...(start > 0 ? [`${color.cyan(S_BAR)}  ${color.dim("…")}`] : []),
-        ...rows,
-        ...(start + maxItems < this.filteredOptions.length ? [`${color.cyan(S_BAR)}  ${color.dim("…")}`] : []),
-        `${color.cyan(S_BAR)}  ${color.dim(
-          (process.stdout.columns ?? 80) < 50
-            ? "↑/↓ navigate • Enter select"
-            : "↑/↓ to select • Enter: confirm • Type: to search",
-        )}`,
-        color.cyan(S_BAR_END),
-      ].join("\n")
-    },
-  }).prompt()
-  if (typeof result === "string" || typeof result === "symbol") return result
-  throw new Error(`No ${kind} selected`)
-}
@@ -16,13 +16,12 @@ export function requireInteractive(message: string) {
 }

 export const openUrl = Effect.fn("cli.prompt.open-url")(function* (url: string) {
-  const browser = yield* Effect.promise(() => import("@opencode/util/open"))
-  yield* Effect.promise(() => browser.openUrl(url)).pipe(Effect.ignore)
+  const { default: open } = yield* Effect.promise(() => import("open"))
+  yield* Effect.promise(() => open(url)).pipe(Effect.ignore)
 })

 export function handlePromptErrors<A, E, R>(effect: Effect.Effect<A, E, R>) {
  return effect.pipe(
-    Effect.onInterrupt(() => Effect.sync(() => cancel("Cancelled"))),
    Effect.catchIf(
      (error) => error === cancelled,
      () =>
@@ -1,30 +0,0 @@
-import { expect, test } from "bun:test"
-import type { IntegrationInfo } from "@opencode/client"
-import { loginChoices } from "../src/commands/handlers/auth/login"
-
-const integration = (value: Partial<IntegrationInfo> & Pick<IntegrationInfo, "id" | "name">): IntegrationInfo => ({
-  methods: [{ type: "key" }],
-  connections: [],
-  ...value,
-})
-
-test("groups the CLI choices like /connect while keeping stable login IDs", () => {
-  expect(
-    loginChoices([
-      integration({ id: "mistral", name: "Mistral" }),
-      integration({ id: "openai", name: "OpenAI" }),
-      integration({ id: "linear", name: "Linear", metadata: { source: "mcp" } }),
-      integration({ id: "github", name: "GitHub", metadata: { source: "mcp" } }),
-      integration({ id: "opencode", name: "OpenCode Console" }),
-      integration({ id: "opencode-go", name: "OpenCode Go", connections: [{ type: "env", name: "GO_KEY" }] }),
-      integration({ id: "unused", name: "Unused", methods: [{ type: "env", names: ["UNUSED_KEY"] }] }),
-    ]),
-  ).toEqual([
-    { value: "github", label: "GitHub", category: "MCP", connected: false },
-    { value: "linear", label: "Linear", category: "MCP", connected: false },
-    { value: "opencode-go", label: "OpenCode Go", category: "Popular", connected: true },
-    { value: "opencode", label: "OpenCode Console", category: "Popular", connected: false },
-    { value: "openai", label: "OpenAI", category: "Popular", connected: false },
-    { value: "mistral", label: "Mistral", category: "Services", connected: false },
-  ])
-})
@@ -20,12 +20,12 @@ describe("auth command", () => {
    expect(auth.stdout).toContain("list")
    expect(auth.stdout).toContain("login")
    expect(auth.stdout).toContain("logout")
-    expect(auth.stdout).toContain("manage integrations and credentials")
-    expect(auth.stdout).toContain("list integrations and credentials")
-    expect(auth.stdout).toContain("connect an integration")
+    expect(auth.stdout).toContain("manage AI providers and credentials")
+    expect(auth.stdout).toContain("list providers and credentials")
+    expect(auth.stdout).toContain("log in to a provider")
    expect(auth.stdout).toContain("log out of a saved account")
    expect(auth.stdout).toContain("switch the active account for an integration")
-    expect(auth.stdout).not.toMatch(/^  connect\s/m)
+    expect(auth.stdout).not.toContain("connect")
    expect(list.exitCode).toBe(0)
    expect(list.stdout).toContain("opencode auth list [flags]")
    expect(list.stdout).toContain("--format")
@@ -216,8 +216,7 @@ describe("auth command", () => {
    expect(requests).toContainEqual({ method: "DELETE", path: `${endpoint}/con_oauth` })
  })

-  test("reports OAuth status polling failures and cancels the attempt", async () => {
-    let cancelled = false
+  test("settles the OAuth spinner when status polling fails", async () => {
    using server = authServer((request, url) => {
      if (url.pathname === "/api/integration") {
        return Response.json(
@@ -246,7 +245,6 @@ describe("auth command", () => {
        return new Response("Unavailable", { status: 500 })
      }
      if (url.pathname === "/api/integration/openai/connect/oauth/con_oauth" && request.method === "DELETE") {
-        cancelled = true
        return new Response(null, { status: 204 })
      }
      return new Response("Not found", { status: 404 })
@@ -254,10 +252,8 @@ describe("auth command", () => {

    const result = await cli(["auth", "login", "openai", "--server", server.url.toString()])
    expect(result.exitCode).toBe(1)
-    expect(result.stdout).toContain("Waiting for authorization...")
-    expect(result.stdout).toContain("UnexpectedStatus: 500")
+    expect(result.stdout).toContain("Authentication failed")
    expect(result.stdout).toContain("Failed")
-    expect(cancelled).toBe(true)
    expect(result.stdout).not.toContain("\n    at ")
  })

@@ -1,62 +0,0 @@
-import { expect, test } from "bun:test"
-import path from "node:path"
-import type { IntegrationInfo, McpServer } from "@opencode/client"
-import { mcpAuthChoices } from "../src/commands/handlers/mcp/auth"
-
-const server = (
-  name: string,
-  integrationID?: string,
-  status: McpServer["status"] = { status: "pending" },
-): McpServer => ({ name, integrationID, status })
-
-const integration = (id: string, methods: IntegrationInfo["methods"], connected = false): IntegrationInfo => ({
-  id,
-  name: id,
-  methods,
-  connections: connected ? [{ type: "credential", method: "oauth", id: "cred_1", label: "Work" }] : [],
-})
-
-test("offers only OAuth-capable MCP servers by their server identity", () => {
-  expect(
-    mcpAuthChoices(
-      [
-        server("Linear", "mcp_linear", { status: "needs_auth", error: "expired" }),
-        server("Local"),
-        server("API key only", "mcp_key"),
-        server("GitHub", "mcp_github"),
-        server("Sentry", "mcp_sentry", { status: "failed", error: "boom" }),
-        server("Unresolved", "mcp_missing"),
-      ],
-      [
-        integration("mcp_linear", [{ type: "oauth", id: "login", label: "Linear" }], true),
-        integration("mcp_github", [{ type: "oauth", id: "login", label: "GitHub" }]),
-        integration("mcp_sentry", [{ type: "oauth", id: "login", label: "Sentry" }]),
-        integration("mcp_key", [{ type: "key" }]),
-        integration("Linear", [{ type: "oauth", id: "login", label: "A provider with a colliding name" }]),
-      ],
-    ),
-  ).toEqual([
-    { value: "mcp_github", label: "GitHub", category: "MCP", connected: false, hint: undefined },
-    { value: "mcp_linear", label: "Linear", category: "MCP", connected: true, hint: "needs authentication" },
-    { value: "mcp_sentry", label: "Sentry", category: "MCP", connected: false, hint: "failed" },
-  ])
-})
-
-test("mcp auth accepts an optional server name and rejects no-name noninteractive calls before connecting", async () => {
-  const cli = (args: string[]) =>
-    Bun.spawn([process.execPath, "run", "src/index.ts", "mcp", "auth", ...args], {
-      cwd: path.join(import.meta.dir, ".."),
-      stdout: "pipe",
-      stderr: "pipe",
-    })
-  const help = cli(["--help"])
-  expect(await new Response(help.stdout).text()).toContain("opencode mcp auth [flags] [<name>]")
-  expect(await help.exited).toBe(0)
-
-  const missing = cli([])
-  expect(await new Response(missing.stdout).text()).toContain(
-    "Pass an MCP server name when running without an interactive terminal",
-  )
-  expect(await new Response(missing.stderr).text()).toBe("")
-  expect(await missing.exited).toBe(1)
-})
@@ -42,28 +42,6 @@ describe("session target resolver", () => {
    })
  })

-  test("creates a missing explicit Session with its ID", async () => {
-    const client = OpenCode.make({ baseUrl: "https://opencode.test" })
-    spyOn(client.session, "get").mockRejectedValue({ _tag: "SessionNotFoundError" })
-    spyOn(client.location, "get").mockResolvedValue(location("/project"))
-    const create = spyOn(client.session, "create").mockResolvedValue(session("ses_chosen", "/project"))
-
-    const target = await resolveSessionTarget({ client, session: "ses_chosen", prepare })
-    expect(create).toHaveBeenCalledWith(expect.objectContaining({ id: "ses_chosen" }))
-    expect(target).toMatchObject({ session: { id: "ses_chosen" }, resume: false })
-  })
-
-  test("does not create a missing explicit Session to fork", async () => {
-    const client = OpenCode.make({ baseUrl: "https://opencode.test" })
-    spyOn(client.session, "get").mockRejectedValue({ _tag: "SessionNotFoundError" })
-    const create = spyOn(client.session, "create")
-
-    await expect(resolveSessionTarget({ client, session: "ses_chosen", fork: true, prepare })).rejects.toThrow(
-      "Session not found",
-    )
-    expect(create).not.toHaveBeenCalled()
-  })
-
  test("paginates to continue the exact directory", async () => {
    const client = OpenCode.make({ baseUrl: "https://opencode.test" })
    spyOn(client.location, "get").mockResolvedValue(location("/project"))
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/client",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -55,7 +55,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] Tagged templates: a tag applied to a template literal is called as `tag(strings, ...values)`, with the tag read
      like a callee so a member tag keeps its receiver. `strings` is an array of the cooked text with a read-only `raw`
      array of the source text; an invalid escape such as `\unicode` cooks to `undefined`. One template object per
-      site, as in JS, but it is not frozen: `strings[0] = "x"` succeeds here where JS throws.
+      site and both arrays are frozen, as in JS: `strings[0] = "x"` throws a `TypeError`.
 - [x] Regular-expression literals.
 - [x] `NaN` and `Infinity` globals.
 - [ ] BigInt literals and in-interpreter BigInt arithmetic; BigInt remains invalid at JSON-like host boundaries.
@@ -101,9 +101,11 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `for`, `while`, and `do...while`.
 - [x] `for...of` over arrays, strings, Maps, Sets, URLSearchParams, Headers, Uint8Arrays, built-in iterators, custom
      synchronous iterators, and confined synchronous generators. Abrupt completion invokes the iterator's optional `return()`.
- [x] `for...in` over own keys of plain objects, arrays, strings, and tool references. `null`, `undefined`, and other
-      non-objects iterate nothing. An un-awaited promise throws rather than iterating.
- [ ] `for...in` over inherited enumerable keys (`Object.create(proto)`), and skipping keys deleted during the loop.
+- [x] `for...in` over the enumerable keys of plain objects, arrays, strings, and tool references, following the
+      prototype chain like JS (`for (k in Object.create({ a: 1 }))` visits `a`; built-in prototype methods are
+      non-enumerable so `for (k in [])` visits nothing). A key deleted before its turn is skipped and keys added during
+      the loop are not visited. `null`, `undefined`, and other non-objects iterate nothing. An un-awaited promise
+      throws rather than iterating.
 - [x] Unlabeled `break` and `continue`.
 - [x] `try`, `catch`, optional catch bindings, and `finally`.
 - [x] `throw` with arbitrary values.
@@ -170,8 +172,11 @@ Math.floor)` is `"3"`). A detached method loses its receiver, as in JS: `values.
 - [x] Redeclaring a function in the same scope, or alongside a `var`, is allowed: the last declaration wins.
 - [x] Generator functions have their own `prototype` (inheriting the shared generator prototype), so
      `g() instanceof g` holds. Plain functions have none, since they cannot construct.
- [ ] `GeneratorFunction.prototype`: every function, generator or not, inherits directly from `Function.prototype`,
-      and a generator whose `prototype` was replaced by a non-object still creates from the shared generator prototype.
+- [x] Generator functions inherit from `GeneratorFunction.prototype` (async ones from
+      `AsyncGeneratorFunction.prototype`), an ordinary non-callable object under `Function.prototype` whose `prototype`
+      is the shared generator prototype and vice versa (`Object.getPrototypeOf(g).prototype.constructor`). Neither is
+      a global; async non-generator functions still inherit from `Function.prototype` directly. A generator whose
+      `prototype` was replaced by a non-object creates from the shared generator prototype.
 - [x] Generator and async generator functions bind parameters (defaults, destructuring) at the call and defer only the
      body to the first `next()`, so a bad argument throws synchronously from the call site, as in JS.
 - [x] Synchronous and async generator declarations/expressions, `yield`, and `yield*`, including lazy bodies,
@@ -247,9 +252,13 @@ Math.floor)` is `"3"`). A detached method loses its receiver, as in JS: `values.
      hint (`"abc".indexOf({ toString() { return "b" } })` is `1`, `(255).toString({ valueOf() { return 16 } })` is
      `"ff"`, `String.prototype.trim.call({ toString() { return " a " } })` is `"a"`). Only consumed positions
      convert; a RegExp pattern is used as is, and `includes`/`startsWith`/`endsWith` reject one before converting.
- [ ] ToPrimitive elsewhere: `Error.prototype.toString` on an object `message` and numeric arguments of the Array and
-      Uint8Array methods (`at`, `indexOf` start, `slice`) still use the built-in form (`NaN`, `"[object Object]"`) and
-      ignore own methods.
+- [x] `Error.prototype.toString` converts an object `name` or `message` through its own `toString` (`String(e)` with
+      `e.message = { toString() { return "m" } }` is `"Error: m"`); an uncaught error's report at the result boundary
+      still uses the built-in form.
+- [x] `Array.prototype.toString` calls `this.join`, so `arr.join = () => "j"` makes `arr + ""`, `String(arr)`, and
+      `${arr}` all `"j"`; a non-callable `join` gives `"[object Array]"`.
+- [ ] ToPrimitive elsewhere: numeric arguments of the Array and Uint8Array methods (`at`, `indexOf` start, `slice`)
+      still use the built-in form (`NaN`) and ignore own methods.
 - [x] Property keys follow ToPropertyKey: `x[null]` and `x[true]` become string keys, and a data object key
      converts through its own `toString`/`valueOf` (string hint) exactly once per access, in reads, writes,
      compound assignment, `++`, `delete`, `in`, object literals, and destructuring:
@@ -259,6 +268,8 @@ Math.floor)` is `"3"`). A detached method loses its receiver, as in JS: `values.
 ## Promises and tools

 - [x] Tool calls start eagerly and return supervised, run-once CodeMode promises.
+- [x] Tool references have identity: `tools.x === tools.x` and `tools.ns === tools.ns`, so they work as `Map`/`Set`
+      members and `switch` cases like any other object.
 - [x] Direct `await`, repeated awaits, and recursive thenable assimilation when a promise or thenable is returned from
      a function/program.
 - [x] `Promise.resolve` and `Promise.reject`.
@@ -335,7 +346,7 @@ reject }` object.
      `TypeError`.
 - [x] `Object.create(proto)` with an object or `null` prototype; any other prototype is a `TypeError`
      (`Object prototype may only be an Object or null`). Inherited reads, `in`, `hasOwnProperty`, and own-only
-      `Object.keys` follow the chain as in JS, but `for...in` still enumerates own keys only. A second `properties`
+      `Object.keys` follow the chain as in JS, and `for...in` enumerates inherited keys too. A second `properties`
      argument other than `undefined` throws a `TypeError`: property descriptors are not supported (there is no
      `Object.defineProperty` either).
 - [x] `Object.freeze`, `Object.seal`, and `Object.preventExtensions`, with `isFrozen`, `isSealed`, and `isExtensible`.
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/codemode",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "description": "Effect-native confined code execution over schema-described tools",
  "type": "module",
  "license": "MIT",
@@ -20,7 +20,7 @@ import {
  type Value,
 } from "./objects.js"
 import type { Interpreter } from "./interpreter.js"
-import { toPrimitiveString } from "./callback.js"
+import { toPrimitiveString, withPrimitives } from "./callback.js"
 import { formatValue } from "../stdlib/console.js"

 export const normalizeError = (error: unknown): Diagnostic => {
@@ -48,7 +48,9 @@ export const normalizeError = (error: unknown): Diagnostic => {
  if (error instanceof Throw) {
    const value = error.value
    if (value instanceof ErrorObj) {
-      return value.host ? normalizeError(value.host) : { kind: "ExecutionFailure", message: errorToString(value) }
+      return value.host
+        ? normalizeError(value.host)
+        : { kind: "ExecutionFailure", message: errorToString(get(value, "name"), get(value, "message")) }
    }
    let message: string
    if (containsRuntimeReference(value)) {
@@ -113,9 +115,7 @@ export const materialize = <R>(ctx: Interpreter<R>, thrown: unknown): Value => {
 }

 /** Error.prototype.toString: `name: message`, omitting whichever side is empty. */
-const errorToString = (self: Obj): string => {
-  const name = get(self, "name")
-  const message = get(self, "message")
+const errorToString = (name: Value, message: Value): string => {
  const shownName = name === undefined ? "Error" : coerceToString(name)
  const shownMessage = message === undefined ? "" : coerceToString(message)
  if (shownMessage === "") return shownName
@@ -179,7 +179,16 @@ export const errorGlobal = <R>(type: ErrorType, ctx: Interpreter<R>) => {
  })
  if (type === "Error") {
    methods(builtins, prototype, [
-      ["toString", 0, (thisValue) => errorToString(receiver(Obj, thisValue, "Error.prototype.toString"))],
+      [
+        "toString",
+        0,
+        (thisValue) => {
+          const self = receiver(Obj, thisValue, "Error.prototype.toString")
+          return withPrimitives(ctx, "string", [get(self, "name"), get(self, "message")], ([name, message]) =>
+            errorToString(name, message),
+          )
+        },
+      ],
    ])
    methods(builtins, ctor, [["isError", 1, (_, args) => args[0] instanceof ErrorObj]])
    return ctor
@@ -79,7 +79,8 @@ import {
  has,
  hidden,
  hasPrototype,
-  keys,
+  ownKeys,
+  enumerable,
  Native,
  parseArrayIndex,
  Arguments,
@@ -100,7 +101,7 @@ import { Pending, resolvePromise, resolvePromiseValue } from "./promises.js"
 import { describeValue, isOpaque, rejectCircularInsertion, typeofValue } from "./references.js"
 import { ScopeStack } from "./scope.js"
 import { constructRegExp } from "../stdlib/regexp.js"
-import { enumerableSource } from "../stdlib/object.js"
+import { enumerableSource, restrict } from "../stdlib/object.js"
 import { compoundOperators } from "../stdlib/value.js"

 /** The binary operators that convert object operands through ToPrimitive before acting on primitives. */
@@ -506,7 +507,7 @@ class Frame<R> {
  ): Fn {
    const builtins = this.ctx.builtins
    const fn = new Fn(
-      builtins.Function,
+      node.generator ? (node.async ? builtins.AsyncGeneratorFunction : builtins.GeneratorFunction) : builtins.Function,
      name,
      node.params,
      node.body,
@@ -955,10 +956,24 @@ class Frame<R> {
  }

  // for...in over null/undefined iterates nothing, like JS.
+  // EnumerateObjectProperties: own keys, then each prototype's, visiting a shadowed key once.
  private enumerableKeys(value: Value, node: AstNode): Array<string> {
    if (value instanceof ToolReference) return [...this.ctx.tools.keys(value.path)]
    if (value === null || value === undefined) return []
-    return keys(enumerableSource(this.ctx, "for...in", value, node))
+    const seen = new Set<string>()
+    const result: Array<string> = []
+    for (
+      let current: Obj | null = enumerableSource(this.ctx, "for...in", value, node);
+      current !== null;
+      current = current.proto
+    ) {
+      for (const key of ownKeys(current)) {
+        if (typeof key !== "string" || seen.has(key)) continue
+        seen.add(key)
+        if (enumerable(current, key)) result.push(key)
+      }
+    }
+    return result
  }

  private evaluateForInStatement(
@@ -982,6 +997,8 @@ class Frame<R> {
      const assignment = left.type === "VariableDeclaration" ? undefined : left

      for (const key of keys) {
+        // A key deleted before its turn is skipped, as in JS.
+        if (right instanceof Obj && !has(right, key)) continue
        const result = yield* Effect.gen(function* () {
          if (declared?.lexical) {
            self.scopes.push()
@@ -1710,12 +1727,15 @@ class Frame<R> {
    })
  }

-  // Built-ins throw without a location, synchronously or inside their Effect; the call site supplies it.
+  // Built-ins throw without a location, synchronously or inside their Effect; the call site supplies it. A built-in
+  // reached through `ctx.call` runs on the root frame, so the deeper of the frame and the enclosing site counts.
  private native(body: () => Effect.Effect<Value, unknown, R>, node?: AstNode): Effect.Effect<Value, unknown, R> {
-    return Effect.provideService(
-      Effect.catchDefect(Effect.suspend(body), (defect) => Effect.die(locate(defect, node))),
-      CallSite,
-      { node, depth: this.depth },
+    return Effect.flatMap(CallSite, (site) =>
+      Effect.provideService(
+        Effect.catchDefect(Effect.suspend(body), (defect) => Effect.die(locate(defect, node))),
+        CallSite,
+        { node, depth: Math.max(this.depth, site.depth) },
+      ),
    )
  }

@@ -2155,12 +2175,16 @@ class Frame<R> {
    define(
      strings,
      "raw",
-      new Arr(
-        array,
-        node.quasi.quasis.map((quasi) => quasi.value.raw),
+      restrict(
+        "freeze",
+        new Arr(
+          array,
+          node.quasi.quasis.map((quasi) => quasi.value.raw),
+        ),
      ),
      frozen,
    )
+    restrict("freeze", strings)
    this.ctx.templates.set(node, strings)
    return strings
  }
@@ -2208,7 +2232,7 @@ class Frame<R> {
      if (typeof key !== "string") {
        throw typeError("Tool paths must use string property names.", propertyNode)
      }
-      return new ToolReference([...objectValue.path, key])
+      return objectValue.child(key)
    }

    if (objectValue instanceof Obj) return { target: objectValue, key, receiver: objectValue }
@@ -1,5 +1,5 @@
 import { Effect } from "effect"
-import { define, hidden, Native, Arr, ErrorObj, Obj, type Value } from "./objects.js"
+import { Arr, define, ErrorObj, hidden, Native, Obj, readOnly, type Value } from "./objects.js"

 export const errorTypes = [
  "Error",
@@ -41,6 +41,8 @@ const builtins = [
  "AsyncIterator",
  "Generator",
  "AsyncGenerator",
+  "GeneratorFunction",
+  "AsyncGeneratorFunction",
 ] as const

 /**
@@ -79,6 +81,15 @@ export const createBuiltins = (): Builtins => {
  }
  const iterator = plain()
  const asyncIterator = plain()
+  // %GeneratorFunction.prototype% is an ordinary object linked both ways with %GeneratorPrototype%.
+  const generatorFunction = (generator: Obj) => {
+    const proto = new Obj(fn)
+    define(proto, "prototype", generator, readOnly)
+    define(generator, "constructor", proto, readOnly)
+    return proto
+  }
+  const generator = new Obj(iterator)
+  const asyncGenerator = new Obj(asyncIterator)
  return {
    Object: object,
    Function: fn,
@@ -102,8 +113,10 @@ export const createBuiltins = (): Builtins => {
    Iterator: iterator,
    IteratorHelper: new Obj(iterator),
    AsyncIterator: asyncIterator,
-    Generator: new Obj(iterator),
-    AsyncGenerator: new Obj(asyncIterator),
+    Generator: generator,
+    AsyncGenerator: asyncGenerator,
+    GeneratorFunction: generatorFunction(generator),
+    AsyncGeneratorFunction: generatorFunction(asyncGenerator),
    Error: error,
    TypeError: derived("TypeError"),
    RangeError: derived("RangeError"),
@@ -36,6 +36,7 @@ export const hidden: Attributes = { writable: true, enumerable: false, configura
 export const readonly: Attributes = { writable: false, enumerable: false, configurable: true }
 /** Constants such as `Math.PI` and a constructor's `prototype`. */
 export const frozen: Attributes = { writable: false, enumerable: false, configurable: false }
+export const readOnly: Attributes = { writable: false, enumerable: false, configurable: true }

 /**
 * An object owned by the program: own properties plus a prototype link. Subclasses answer, in one place, how a
@@ -645,7 +646,7 @@ export const ownKeys = (target: Obj): Array<string | symbol> => {
  ]
 }

-const enumerable = (target: Obj, key: string | symbol): boolean => own(target, key)?.enumerable === true
+export const enumerable = (target: Obj, key: string | symbol): boolean => own(target, key)?.enumerable === true

 /** Own enumerable keys, including the iterator symbols; what spread and `Object.assign` copy. */
 export const enumerableKeys = (target: Obj): Array<string | symbol> =>
@@ -5,6 +5,7 @@ import { invalidData, IteratorSymbol, rangeError, typeError } from "../interpret
 import {
  define,
  get,
+  Callable,
  hidden,
  Arr,
  GeneratorObj,
@@ -165,13 +166,12 @@ export const arrayGlobal = <R>(ctx: Interpreter<R>) => {
    [
      "toString",
      0,
-      (thisValue) =>
-        withPrimitives(
-          ctx,
-          "string",
-          Array.from(self(thisValue, "toString").items, (item) => item ?? ""),
-          (items) => items.map(coerceToString).join(","),
-        ),
+      (thisValue) => {
+        // Spec: delegate to this.join, so an overridden join shows up in `arr + ""` and String(arr).
+        const target = self(thisValue, "toString")
+        const join = get(target, "join")
+        return join instanceof Callable ? ctx.call(join, target, []) : `[object ${target.tag}]`
+      },
    ],
    [
      "includes",
@@ -104,7 +104,7 @@ const propertyKey = (value: Value): PropertyKey =>

 // SetIntegrityLevel: primitives pass through. A typed array's bytes cannot carry attributes, so JS throws after
 // already making it non-extensible.
-const restrict = (level: "freeze" | "seal" | "preventExtensions", value: Value): Value => {
+export const restrict = (level: "freeze" | "seal" | "preventExtensions", value: Value): Value => {
  if (!(value instanceof Obj)) return value
  value.extensible = false
  if (level === "preventExtensions") return value
@@ -113,7 +113,16 @@ export const toolExpression = (path: string) =>
    .join("")

 export class ToolReference {
+  private readonly children = new Map<string, ToolReference>()
  constructor(readonly path: ReadonlyArray<string>) {}
+  /** One reference per path, so `tools.a === tools.a` holds like any other member read. */
+  child(key: string): ToolReference {
+    const existing = this.children.get(key)
+    if (existing !== undefined) return existing
+    const created = new ToolReference([...this.path, key])
+    this.children.set(key, created)
+    return created
+  }
 }

 // Dots in tool names are namespace separators; the last tool for a canonical path wins.
@@ -178,6 +178,25 @@ describe("call depth", () => {
    expect(Date.now() - started).toBeLessThan(2000)
  })

+  test("recursion routed through nested built-ins keeps counting depth", async () => {
+    const started = Date.now()
+    expect(
+      await value(`
+        const a = [1]
+        a.join = () => a + ""
+        const o = { toString() { return [o].map(String)[0] } }
+        const e = new Error()
+        e.message = { toString() { return String(e) } }
+        const names = []
+        for (const run of [() => String(a), () => String(o), () => String(e)]) {
+          try { run() } catch (error) { names.push(error.name) }
+        }
+        return names
+      `),
+    ).toEqual(["RangeError", "RangeError", "RangeError"])
+    expect(Date.now() - started).toBeLessThan(2000)
+  })
+
  test("uncaught overflow reports the call that overflowed", async () => {
    const failure = await error(`const f = (n) => f(n + 1); return f(0)`)
    expect(failure.kind).toBe("ExecutionFailure")
@@ -1382,7 +1382,7 @@ describe("Object.getPrototypeOf and Object.create", () => {
    expect((await error(`Object.getPrototypeOf(Symbol.iterator)`)).message).toContain("cannot convert a symbol")
  })

-  test("Object.create links the prototype: inherited reads, in, and own-only keys", async () => {
+  test("Object.create links the prototype: inherited reads, in, own-only keys, and for...in", async () => {
    expect(
      await value(`
        const p = { greet(name) { return "hi " + name }, a: 1 }
@@ -1392,7 +1392,7 @@ describe("Object.getPrototypeOf and Object.create", () => {
        for (const key in c) seen.push(key)
        return ["greet" in c, Object.keys(c), c.hasOwnProperty("a"), c.a, c.greet(c.name), Object.getPrototypeOf(c) === p, Object.getPrototypeOf(Object.create(null)), seen]
      `),
-    ).toEqual([true, ["name"], false, 1, "hi x", true, null, ["name"]])
+    ).toEqual([true, ["name"], false, 1, "hi x", true, null, ["name", "greet", "a"]])
  })

  test("Object.create rejects non-object prototypes and property descriptors", async () => {
@@ -1984,3 +1984,79 @@ describe("WeakMap and WeakSet", () => {
    expect((await error(`structuredClone(new WeakSet())`)).message).toContain("DataCloneError")
  })
 })
+
+describe("small language leftovers", () => {
+  test("for...in walks the prototype chain and skips keys deleted before their turn", async () => {
+    expect(
+      await value(`
+        const o = Object.create({ a: 1, shadowed: 1 })
+        o.b = 2
+        o.shadowed = 3
+        const keys = []
+        for (const k in o) keys.push(k)
+        const live = { a: 1, b: 2, c: 3 }
+        const seen = []
+        for (const k in live) { seen.push(k); delete live.b; live.z = 1 }
+        const none = []
+        for (const k in []) none.push(k)
+        for (const k in new TypeError("x")) none.push(k)
+        return [keys, seen, none]
+      `),
+    ).toEqual([["b", "shadowed", "a"], ["a", "c"], []])
+  })
+
+  test("tagged template objects are frozen", async () => {
+    expect(
+      await value(`
+        const tag = (s) => s
+        const f = () => tag\`a\${1}b\`
+        return [f() === f(), Object.isFrozen(f()), Object.isFrozen(f().raw)]
+      `),
+    ).toEqual([true, true, true])
+    expect((await error("const tag = (s) => s; tag`a`[0] = 'x'")).message).toContain("read only")
+  })
+
+  test("Array.prototype.toString delegates to join", async () => {
+    expect(
+      await value(`
+        const a = [1, 2]
+        a.join = () => "j"
+        const b = [1]
+        b.join = 5
+        return [a + "", String(a), \`\${a}\`, b.toString(), Array.prototype.toString.call([3, [4]])]
+      `),
+    ).toEqual(["j", "j", "j", "[object Array]", "3,4"])
+  })
+
+  test("Error.prototype.toString converts object name and message", async () => {
+    expect(
+      await value(`
+        const e = new Error("m")
+        e.message = { toString() { return "obj" } }
+        e.name = { valueOf() { return "N" }, toString() { return "T" } }
+        return [String(e), Error.prototype.toString.call({ name: "", message: "m" }), Error.prototype.toString.call({})]
+      `),
+    ).toEqual(["T: obj", "m", "Error"])
+    expect(
+      (await error(`const e = new Error(); e.message = { toString() { throw new RangeError("r") } }; String(e)`))
+        .message,
+    ).toContain("r")
+  })
+
+  test("generator functions inherit from GeneratorFunction.prototype", async () => {
+    expect(
+      await value(`
+        function* g() {}
+        async function* ag() {}
+        const GFP = Object.getPrototypeOf(g)
+        g.prototype = null
+        return [
+          typeof GFP, GFP === Function.prototype, Object.getPrototypeOf(GFP) === Function.prototype,
+          GFP.prototype.constructor === GFP, Object.getPrototypeOf(ag) === GFP, typeof g.bind,
+          Object.getPrototypeOf(g()) === GFP.prototype,
+        ]
+      `),
+    ).toEqual(["object", false, true, true, false, "function", true])
+    expect((await error(`function* g() {} Object.getPrototypeOf(g)()`)).message).toContain("not a function")
+  })
+})
@@ -884,7 +884,6 @@ built-ins/AsyncGeneratorFunction/invoked-as-constructor-no-arguments.js  # TypeE
 built-ins/AsyncGeneratorFunction/invoked-as-function-multiple-arguments.js  # TypeError: The Function constructor is not supported; write the function inline.
 built-ins/AsyncGeneratorFunction/invoked-as-function-no-arguments.js  # TypeError: The Function constructor is not supported; write the function inline.
 built-ins/AsyncGeneratorFunction/invoked-as-function-single-argument.js  # TypeError: The Function constructor is not supported; write the function inline.
-built-ins/AsyncGeneratorFunction/prototype/not-callable.js  # Expected SameValue(«"function"», «"object"») to be true
 built-ins/AsyncGeneratorPrototype/next/this-val-not-async-generator.js  # TypeError: Cannot read properties of undefined (reading '…').
 built-ins/AsyncGeneratorPrototype/return/this-val-not-async-generator.js  # TypeError: Cannot read properties of undefined (reading '…').
 built-ins/AsyncGeneratorPrototype/throw/this-val-not-async-generator.js  # TypeError: Cannot read properties of undefined (reading '…').
@@ -900,7 +899,6 @@ built-ins/Date/prototype/toJSON/invoke-result.js  # TypeError: Date.prototype.to
 built-ins/Date/prototype/toJSON/to-primitive-value-of.js  # TypeError: Date.prototype.toJSON called on incompatible receiver a data object.
 built-ins/Date/prototype/toString/format.js  # Expected SameValue(«null», «null») to be false
 built-ins/Date/prototype/toString/negative-year.js  # Date.prototype.toString serializes year -1 to "-0001" Expected SameValue(«undefined», «"-0001"») to 
-built-ins/Error/prototype/toString/tostring-message-throws-toprimitive.js  # ToPrimitive(msg) called by ToString(msg) throws TypeError Expected a TypeError to be thrown but no e
 built-ins/Function/15.3.5-1gs.js  # Expected a TypeError to be thrown but no exception was thrown at all
 built-ins/Function/15.3.5-2gs.js  # Expected a TypeError to be thrown but no exception was thrown at all
 built-ins/Function/15.3.5.4_2-1gs.js  # Expected a TypeError to be thrown but no exception was thrown at all
@@ -931,7 +929,6 @@ built-ins/GeneratorFunction/invoked-as-constructor-no-arguments.js  # TypeError:
 built-ins/GeneratorFunction/invoked-as-function-multiple-arguments.js  # TypeError: The Function constructor is not supported; write the function inline.
 built-ins/GeneratorFunction/invoked-as-function-no-arguments.js  # TypeError: The Function constructor is not supported; write the function inline.
 built-ins/GeneratorFunction/invoked-as-function-single-argument.js  # TypeError: The Function constructor is not supported; write the function inline.
-built-ins/GeneratorFunction/prototype/not-callable.js  # Expected SameValue(«"function"», «"object"») to be true
 built-ins/GeneratorPrototype/throw/from-state-completed.js  # Expected a E but got a TypeError
 built-ins/GeneratorPrototype/throw/from-state-suspended-start.js  # Expected a E but got a TypeError
 built-ins/Iterator/from/return-method-returns-iterator-result.js  # Iterator next must be a function.
@@ -1468,12 +1465,10 @@ language/expressions/function/dstr/ary-init-iter-get-err-array-prototype.js  # E
 language/expressions/function/dstr/ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
 language/expressions/function/dstr/dflt-ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/expressions/function/dstr/dflt-ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
-language/expressions/generators/default-proto.js  # Expected SameValue(«object», «undefined») to be true
 language/expressions/generators/dstr/ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/expressions/generators/dstr/ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
 language/expressions/generators/dstr/dflt-ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/expressions/generators/dstr/dflt-ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
-language/expressions/generators/prototype-relation-to-function.js  # Expected SameValue(«object», «») to be true
 language/expressions/greater-than-or-equal/S11.8.4_A3.2_T1.2.js  # TypeError: Binary operators require data values.
 language/expressions/greater-than/S11.8.2_A3.2_T1.2.js  # TypeError: Binary operators require data values.
 language/expressions/in/S8.12.6_A2_T2.js  # TypeError: Robin cannot be constructed: user-defined constructors and classes are not supported. Cal
@@ -1559,7 +1554,6 @@ language/expressions/super/prop-expr-obj-key-err.js  # unsupported syntax Super
 language/expressions/super/prop-expr-obj-ref-strict.js  # unsupported syntax Super
 language/expressions/super/prop-expr-obj-unresolvable.js  # Expected SameValue(«SyntaxError», «ReferenceError») to be true
 language/expressions/tagged-template/constructor-invocation.js  # The called value cannot be constructed: user-defined constructors and classes are not supported.
-language/expressions/tagged-template/template-object-frozen-strict.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/expressions/this/11.1.1-1.js  # Expected SameValue(«undefined», «undefined») to be false
 language/expressions/unary-minus/S11.4.7_A3_T5.js  # TypeError: Unary operators require data values.
 language/expressions/unary-plus/S11.4.6_A3_T5.js  # TypeError: Unary operators require data values.
@@ -1588,7 +1582,6 @@ language/statements/async-generator/dstr/dflt-ary-ptrn-elem-id-iter-val-array-pr
 language/statements/async-generator/return-undefined-implicit-and-explicit.js  # Actual ["tick 1", "tick 2", "g1 ret", "g2 ret", "g3 ret", "g4 ret"] and expected ["tick 1", "g1 ret"
 language/statements/const/dstr/ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/statements/const/dstr/ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
-language/statements/for-in/S12.6.4_A7_T2.js  # for...in visits keys deleted during the loop
 language/statements/for-in/order-enumerable-shadowed.js  # Object.create property descriptors are not supported; assign the fields after creating the object.
 language/statements/for-in/S12.6.4_A6.1.js  # TypeError: FACTORY cannot be constructed: user-defined constructors and classes are not supported. C
 language/statements/for-in/S12.6.4_A6.js  # TypeError: FACTORY cannot be constructed: user-defined constructors and classes are not supported. C
@@ -1660,12 +1653,10 @@ language/statements/function/dstr/ary-init-iter-get-err-array-prototype.js  # Ex
 language/statements/function/dstr/ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
 language/statements/function/dstr/dflt-ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/statements/function/dstr/dflt-ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
-language/statements/generators/default-proto.js  # generator functions have no GeneratorFunction.prototype
 language/statements/generators/dstr/ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/statements/generators/dstr/ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
 language/statements/generators/dstr/dflt-ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/statements/generators/dstr/dflt-ary-ptrn-elem-id-iter-val-array-prototype.js  # Expected SameValue(«3», «42») to be true
-language/statements/generators/prototype-relation-to-function.js  # generator functions have no GeneratorFunction.prototype
 language/statements/generators/restricted-properties.js  # Expected a TypeError to be thrown but no exception was thrown at all
 language/statements/labeled/value-await-non-module.js  # Failed to parse TypeScript: Expression expected.
 language/statements/let/dstr/ary-init-iter-get-err-array-prototype.js  # Expected a TypeError to be thrown but no exception was thrown at all
@@ -368,3 +368,16 @@ describe("tool references under ==", () => {
    ).toEqual([false, false, false, 0])
  })
 })
+
+describe("tool reference identity", () => {
+  test("repeated member reads yield the same reference", async () => {
+    const runtime = CodeMode.make({ tools: { probe: echo("Probe", "ok"), "ns.inner": echo("Inner", "in") } })
+    expect(
+      await value(
+        runtime,
+        `return [tools.probe === tools.probe, tools.ns.inner === tools.ns.inner, tools.ns === tools.ns, tools["probe"] === tools.probe,
+                 tools.probe === tools.ns.inner, new Set([tools.probe, tools.probe]).size, await tools.ns.inner({})]`,
+      ),
+    ).toEqual([true, true, true, true, false, 1, "in"])
+  })
+})
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-app",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/console-core",
-  "version": "2.0.18",
+  "version": "2.0.16",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/Show More
+++ b/Show More