chore: upgrade Effect to 4.0 stable

2026-10-05 15:06:16 +00:00 · 2026-10-02 01:46:49 +00:00
1444 changed files with 21604 additions and 44620 deletions
@@ -18,20 +18,9 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-        with:
-          # A pull request checks out its merge into the current base; the first parent is that base.
-          fetch-depth: 2

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

      - name: Run checks
        run: bun run check
-
-      # Every GUI package file (app, desktop, gui-extensions, ui, session-ui) a pull request adds or edits must be free of
-      # oxlint problems, warn-level rules (anti-slop) included. Other packages are not affected.
-      - name: Lint changed files
-        if: github.event_name == 'pull_request'
-        # Against the merge's first parent, so base-branch commits the pull request has not merged are not counted as its
-        # changes (the event's base SHA can predate them).
-        run: bun run lint:changed HEAD^1
@@ -2,9 +2,9 @@ name: nix-eval

 on:
  push:
-    branches: [dev, v2]
+    branches: [dev]
  pull_request:
-    branches: [dev, v2]
+    branches: [dev]
  workflow_dispatch:

 concurrency:
@@ -252,13 +252,6 @@ jobs:
          CI: true
        timeout-minutes: 15

-      - name: Run app component tests
-        if: ${{ !cancelled() && env.E2E_ENABLED == 'true' }}
-        run: bun --cwd packages/app test:components
-        env:
-          CI: true
-        timeout-minutes: 15
-
      - name: Upload Playwright artifacts
        if: always() && env.E2E_ENABLED == 'true'
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -271,5 +264,3 @@ jobs:
            packages/app/e2e/playwright-report
            packages/session-ui/component-tests/test-results
            packages/session-ui/component-tests/playwright-report
-            packages/app/component-tests/test-results
-            packages/app/component-tests/playwright-report
@@ -63,60 +63,8 @@
        "anti-slop-effect/prefer-effect-match": "warn"
      }
    },
-    {
-      "files": ["packages/gui-extensions/src/*.ts", "packages/gui-extensions/src/*.tsx"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "solid-js",
-                "importNames": ["createEffect", "createRenderEffect", "createComputed"],
-                "message": "Extension code runs side effects through the SDK: createKeyed(source, fn, { otherwise }) per provider generation or value, createMemo or a plain function for derived values, createLatest for async data, createVisitState for per-visit state, and the handler for logic a user action causes. An escape hatch needs an oxlint-disable comment with a reason."
-              }
-            ]
-          }
-        ]
-      }
-    },
    {
      "files": ["packages/gui-extensions/src/*/**"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": [
-              {
-                "name": "solid-js",
-                "importNames": ["createEffect", "createRenderEffect", "createComputed"],
-                "message": "Extension code runs side effects through the SDK: createKeyed(source, fn, { otherwise }) per provider generation or value, createMemo or a plain function for derived values, createLatest for async data, createVisitState for per-visit state, and the handler for logic a user action causes. An escape hatch needs an oxlint-disable comment with a reason."
-              }
-            ],
-            "patterns": [
-              {
-                "regex": "^@opencode/(app|desktop)(/|$)",
-                "message": "GUI extensions never import the app or desktop packages. Use the SDK."
-              },
-              {
-                "regex": "^@/",
-                "message": "GUI extensions never import app internals. Use the SDK."
-              },
-              {
-                "group": ["../*/*", "!../*/contract", "!../sdk/*"],
-                "message": "Import another extension only through its contract.ts."
-              },
-              {
-                "regex": "\\.css$",
-                "message": "Import CSS with ?inline and contribute it with ctx.add(Style, css)."
-              }
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "files": ["packages/gui-extensions/src/sdk/**"],
      "rules": {
        "no-restricted-imports": [
          "error",
@@ -33,7 +33,7 @@
    },
    "packages/ai": {
      "name": "@opencode/ai",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode/schema": "workspace:*",
@@ -55,7 +55,7 @@
    },
    "packages/app": {
      "name": "@opencode/app",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -112,7 +112,7 @@
    },
    "packages/cli": {
      "name": "@opencode/cli",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "bin": {
        "opencode": "./bin/opencode.cjs",
        "opencode2": "./bin/opencode2.cjs",
@@ -122,7 +122,7 @@
        "@clack/core": "1.0.0-alpha.1",
        "@clack/prompts": "1.0.0-alpha.1",
        "@effect/platform-node": "catalog:",
-        "@opencode-ai/pty": "0.2.0",
+        "@opencode-ai/pty": "0.1.13",
        "@opencode/client": "workspace:*",
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -133,7 +133,6 @@
        "@opentui/solid": "catalog:",
        "@parcel/watcher": "2.5.1",
        "@silvia-odwyer/photon-node": "0.3.4",
-        "diff": "catalog:",
        "effect": "catalog:",
        "immer": "11.1.4",
        "jsonc-parser": "3.3.1",
@@ -179,7 +178,7 @@
    },
    "packages/client": {
      "name": "@opencode/client",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/protocol": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -195,7 +194,7 @@
        "zod": "catalog:",
      },
      "peerDependencies": {
-        "effect": "4.0.0-rc.112",
+        "effect": "4.0.0",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -205,7 +204,7 @@
    },
    "packages/codemode": {
      "name": "@opencode/codemode",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -218,7 +217,7 @@
    },
    "packages/console/app": {
      "name": "@opencode/console-app",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -254,7 +253,7 @@
    },
    "packages/console/core": {
      "name": "@opencode/console-core",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -281,7 +280,7 @@
    },
    "packages/console/function": {
      "name": "@opencode/console-function",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@openauthjs/openauth": "0.0.0-20250322224806",
        "@opencode/console-core": "workspace:*",
@@ -298,7 +297,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode/console-mail",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -322,7 +321,7 @@
    },
    "packages/console/support": {
      "name": "@opencode/console-support",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode/console-core": "workspace:*",
@@ -342,7 +341,7 @@
    },
    "packages/core": {
      "name": "@opencode/core",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@ai-sdk/cohere": "3.0.27",
        "@ai-sdk/gateway": "3.0.104",
@@ -355,7 +354,7 @@
        "@lydell/node-pty": "catalog:",
        "@modelcontextprotocol/client": "2.0.0",
        "@modelcontextprotocol/core": "2.0.0",
-        "@opencode-ai/pty": "0.2.0",
+        "@opencode-ai/pty": "0.1.13",
        "@opencode/ai": "workspace:*",
        "@opencode/codemode": "workspace:*",
        "@opencode/plugin": "workspace:*",
@@ -365,7 +364,7 @@
        "@parcel/watcher": "2.5.1",
        "@silvia-odwyer/photon-node": "0.3.4",
        "@standard-schema/spec": "catalog:",
-        "bun-pty": "0.4.9",
+        "bun-pty": "0.4.8",
        "diff": "catalog:",
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -383,6 +382,7 @@
        "mime-types": "3.0.2",
        "tree-sitter-bash": "0.25.0",
        "tree-sitter-powershell": "0.25.10",
+        "venice-ai-sdk-provider": "2.1.1",
        "web-tree-sitter": "0.25.10",
        "which": "6.0.1",
        "zod": "catalog:",
@@ -406,11 +406,12 @@
        "@types/node": "catalog:",
        "@types/which": "3.0.4",
        "drizzle-kit": "catalog:",
+        "fast-check": "4.9.0",
      },
    },
    "packages/desktop": {
      "name": "@opencode/desktop",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "electron-context-menu": "5.0.0",
@@ -441,7 +442,7 @@
        "electron-builder": "26.15.7",
        "electron-vite": "6.0.0-beta.1",
        "solid-js": "catalog:",
-        "typescript": "~5.6.2",
+        "typescript": "catalog:",
        "vite": "8.2.2",
      },
      "optionalDependencies": {
@@ -455,7 +456,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode/enterprise",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/sdk": "1.18.21",
@@ -492,7 +493,7 @@
    },
    "packages/function": {
      "name": "@opencode/function",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -508,7 +509,7 @@
    },
    "packages/gui-extensions": {
      "name": "@opencode/gui-extensions",
-      "version": "2.0.22",
+      "version": "2.0.20",
      "dependencies": {
        "@dnd-kit/abstract": "0.5.0",
        "@dnd-kit/dom": "0.5.0",
@@ -553,9 +554,9 @@
    },
    "packages/http-recorder": {
      "name": "@opencode/http-recorder",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
-        "@effect/platform-node-shared": "4.0.0-rc.112",
+        "@effect/platform-node-shared": "4.0.0",
      },
      "devDependencies": {
        "@effect/platform-node": "catalog:",
@@ -572,7 +573,7 @@
    },
    "packages/httpapi-codegen": {
      "name": "@opencode/httpapi-codegen",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "effect": "catalog:",
        "prettier": "3.6.2",
@@ -585,7 +586,7 @@
    },
    "packages/latex": {
      "name": "@opencode/latex",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -599,7 +600,7 @@
    },
    "packages/merman": {
      "name": "@opencode/merman",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -614,7 +615,7 @@
    },
    "packages/plugin": {
      "name": "@opencode/plugin",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode/ai": "workspace:*",
@@ -653,7 +654,7 @@
    },
    "packages/plugin-browser": {
      "name": "@opencode/plugin-browser",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -683,7 +684,7 @@
    },
    "packages/protocol": {
      "name": "@opencode/protocol",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/schema": "workspace:*",
        "effect": "catalog:",
@@ -698,7 +699,7 @@
    },
    "packages/schema": {
      "name": "@opencode/schema",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@standard-schema/spec": "catalog:",
        "effect": "catalog:",
@@ -722,7 +723,7 @@
    },
    "packages/sdk": {
      "name": "@opencode/sdk",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -743,7 +744,7 @@
    },
    "packages/server": {
      "name": "@opencode/server",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@effect/platform-node-shared": "catalog:",
@@ -765,7 +766,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode/session-ui",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode/client": "workspace:*",
@@ -800,7 +801,7 @@
    },
    "packages/simulation": {
      "name": "@opencode/simulation",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/ai": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -820,7 +821,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode/stats-app",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -854,7 +855,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode/stats-core",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -873,7 +874,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode/stats-server",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -919,7 +920,7 @@
    },
    "packages/theme": {
      "name": "@opencode/theme",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opentui/core": "catalog:",
        "effect": "catalog:",
@@ -933,7 +934,7 @@
    },
    "packages/tui": {
      "name": "@opencode/tui",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -967,7 +968,7 @@
    },
    "packages/ui": {
      "name": "@opencode/ui",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -1002,7 +1003,7 @@
    },
    "packages/util": {
      "name": "@opencode/util",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -1040,7 +1041,7 @@
    },
    "packages/web": {
      "name": "@opencode/web",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1081,7 +1082,7 @@
    },
    "services/update": {
      "name": "@opencode/update",
-      "version": "2.0.22",
+      "version": "2.0.21",
      "dependencies": {
        "jose": "6.0.11",
        "semver": "catalog:",
@@ -1147,10 +1148,10 @@
  "catalog": {
    "@cloudflare/workers-types": "4.20251008.0",
    "@corvu/drawer": "0.2.4",
-    "@effect/opentelemetry": "4.0.0-rc.112",
-    "@effect/platform-node": "4.0.0-rc.112",
-    "@effect/platform-node-shared": "4.0.0-rc.112",
-    "@effect/sql-sqlite-bun": "4.0.0-rc.112",
+    "@effect/opentelemetry": "4.0.0",
+    "@effect/platform-node": "4.0.0",
+    "@effect/platform-node-shared": "4.0.0",
+    "@effect/sql-sqlite-bun": "4.0.0",
    "@hono/standard-validator": "0.2.0",
    "@hono/zod-validator": "0.4.2",
    "@kobalte/core": "0.13.13",
@@ -1190,7 +1191,7 @@
    "dompurify": "3.4.14",
    "drizzle-kit": "1.0.0-rc.5-ab785fc",
    "drizzle-orm": "1.0.0-rc.5-169397b",
-    "effect": "4.0.0-rc.112",
+    "effect": "4.0.0",
    "fuzzysort": "3.1.0",
    "get-east-asian-width": "1.6.0",
    "hono": "4.10.7",
@@ -1209,7 +1210,7 @@
    "sst": "4.13.1",
    "string-width": "7.2.0",
    "tailwindcss": "4.1.11",
-    "typescript": "5.8.2",
+    "typescript": "5.9.3",
    "ulid": "3.0.1",
    "vite": "7.3.6",
    "vite-plugin-solid": "2.11.10",
@@ -1722,13 +1723,13 @@

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

-    "@effect/opentelemetry": ["@effect/opentelemetry@4.0.0-rc.112", "", { "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <2.0.0", "@opentelemetry/api-logs": ">=0.203.0 <0.300.0", "@opentelemetry/resources": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-logs": ">=0.203.0 <0.300.0", "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-node": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-web": ">=2.0.0 <3.0.0", "@opentelemetry/semantic-conventions": ">=1.33.0 <2.0.0", "effect": "^4.0.0-rc.112" }, "optionalPeers": ["@opentelemetry/api", "@opentelemetry/api-logs", "@opentelemetry/resources", "@opentelemetry/sdk-logs", "@opentelemetry/sdk-metrics", "@opentelemetry/sdk-trace-base", "@opentelemetry/sdk-trace-node", "@opentelemetry/sdk-trace-web"] }, "sha512-OTRv1DxTHUmnakgJ6XVM8wVgF1KgZH4UXnOemwSLUwUjXO+RCikzF8oR/rlVmOGq81KtQzj1URM4M4nchlQOuQ=="],
+    "@effect/opentelemetry": ["@effect/opentelemetry@4.0.0", "", { "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <2.0.0", "@opentelemetry/api-logs": ">=0.203.0 <0.300.0", "@opentelemetry/resources": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-logs": ">=0.203.0 <0.300.0", "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-node": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-web": ">=2.0.0 <3.0.0", "@opentelemetry/semantic-conventions": ">=1.33.0 <2.0.0", "effect": "^4.0.0" }, "optionalPeers": ["@opentelemetry/api", "@opentelemetry/api-logs", "@opentelemetry/resources", "@opentelemetry/sdk-logs", "@opentelemetry/sdk-metrics", "@opentelemetry/sdk-trace-base", "@opentelemetry/sdk-trace-node", "@opentelemetry/sdk-trace-web"] }, "sha512-vXVhqlcADHtmKlw2gIqRRlXFve4ms4JJ5ykAqzNe37QQ/5N5A5gJ9VOXkMBORHZC5O4gdHZwxhAzGZb0zvFf/Q=="],

-    "@effect/platform-node": ["@effect/platform-node@4.0.0-rc.112", "", { "dependencies": { "@effect/platform-node-shared": "^4.0.0-rc.112", "mime": "^4.1.0", "undici": "^8.10.0" }, "peerDependencies": { "effect": "^4.0.0-rc.112", "redis": ">=5.0.0 <7.0.0" } }, "sha512-/BMAcdNGQQskLmI0Zoa95KfTZkr9HV9N4NSxaSrusG6GeW6Ulp9KvZ+Rlaiw8lnOt43CXjFLdfll5/k5rxL4hQ=="],
+    "@effect/platform-node": ["@effect/platform-node@4.0.0", "", { "dependencies": { "@effect/platform-node-shared": "^4.0.0", "undici": "^8.11.2" }, "peerDependencies": { "effect": "^4.0.0", "redis": ">=5.0.0 <7.0.0" } }, "sha512-/L+4MUbl8FejPKLHLROYSOebvHnfixkP8KiblSD/DE5uH5xENZBHaux4nH6XMnRP+lr8ajpEJFS8sUrmmxFJeQ=="],

-    "@effect/platform-node-shared": ["@effect/platform-node-shared@4.0.0-rc.112", "", { "dependencies": { "@types/ws": "^8.18.1", "ws": "^8.21.3" }, "peerDependencies": { "effect": "^4.0.0-rc.112" } }, "sha512-ttjz0xKamFN7vL8pNDYVwddJLjZvqKePc05djlz2VcdaKbLsnYbtMnL1rbOfHgEnIUSHGh7FkjaN4DM1Ov81sQ=="],
+    "@effect/platform-node-shared": ["@effect/platform-node-shared@4.0.0", "", { "dependencies": { "@types/ws": "^8.18.1", "ws": "^8.22.0" }, "peerDependencies": { "effect": "^4.0.0" } }, "sha512-VBXHJU9UXVZPdQGGDRjGXpo+TpOzRwZuMrdKAtIxi1qwcRftmacZ1zTgIrzBa0Z2RA2KVkoOecQUsTlt/nJZhw=="],

-    "@effect/sql-sqlite-bun": ["@effect/sql-sqlite-bun@4.0.0-rc.112", "", { "peerDependencies": { "effect": "^4.0.0-rc.112" } }, "sha512-EqR8pWZo3VzedRvP6qo5HcfqNmFvSa+sQLWQl3oBMx2KY1FCc8NYjep79wYjNkW0qABnffrPUXCMTOncd1A+5g=="],
+    "@effect/sql-sqlite-bun": ["@effect/sql-sqlite-bun@4.0.0", "", { "peerDependencies": { "effect": "^4.0.0" } }, "sha512-tUDqqNq4lZMLQkp8YDQej2uuy8BBjmqfMXcJU/KOmrK/WWbzudC8oabZ1TEs1lLSuKzhBEPhnE0cRtAOYe05ew=="],

    "@electron-internal/extract-zip": ["@electron-internal/extract-zip@1.0.5", "", {}, "sha512-+bqFCP98pLI0Tt0XQo1TmlXtwjWchISndDOxCkEcIuUgXWpBnLyRI+2DU+mesvnMMX6L1XDqYNA0lXNDHd/yiA=="],

@@ -2062,18 +2063,6 @@

    "@motionone/utils": ["@motionone/utils@10.18.0", "", { "dependencies": { "@motionone/types": "^10.17.1", "hey-listen": "^1.0.8", "tslib": "^2.3.1" } }, "sha512-3XVF7sgyTSI2KWvTf6uLlBJ5iAgRgmvp3bpuOiQJvInd4nZ19ET8lX5unn30SlmRH7hXbBbH+Gxd0m0klJ3Xtw=="],

-    "@msgpackr-extract/msgpackr-extract-darwin-arm64": ["@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-LCkGo6JDfaBhgST7UpPWgNgLINpcpabaHfyz5OBx75nUYxBsaEPxjnyNjWpeb/xBup/682QnBfRBy2/LvPutZQ=="],
-
-    "@msgpackr-extract/msgpackr-extract-darwin-x64": ["@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-zExlW9zUJKZH/tOtVMttwjKa4Xm/3KcNjnE3dPN92uCktwavMxpgCA3MoJK/DOnTWsQgo224OaST27/mPNAf+w=="],
-
-    "@msgpackr-extract/msgpackr-extract-linux-arm": ["@msgpackr-extract/msgpackr-extract-linux-arm@3.0.4", "", { "os": "linux", "cpu": "arm" }, "sha512-Tg3yX65f5GbtXLkrYEHE5oibZG9epyYWas7FogTTEJeDEF9JlXJzKgXaNhT3UXlTOeA+AfZpYZYZ0uPj7Cfquw=="],
-
-    "@msgpackr-extract/msgpackr-extract-linux-arm64": ["@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-dgX0P/9wGPJeHFBG+ZmhgE6bmtMt7NP5CRBGyyktpopdk/mW4POnrpQsSLtKI1dwpc+pPLuXHDh6vvskyQE/sw=="],
-
-    "@msgpackr-extract/msgpackr-extract-linux-x64": ["@msgpackr-extract/msgpackr-extract-linux-x64@3.0.4", "", { "os": "linux", "cpu": "x64" }, "sha512-8TNXMEjJc3QEy7R/x1INhgiU+XakDAFUzBhaz7+Rbrs8NH5UQeHQxxmzsSBJGyV6I1jW79undiQm8tOI+D+8FQ=="],
-
-    "@msgpackr-extract/msgpackr-extract-win32-x64": ["@msgpackr-extract/msgpackr-extract-win32-x64@3.0.4", "", { "os": "win32", "cpu": "x64" }, "sha512-CmCXPQrkbwExx3j946/PtHWHbYJiCRBRDl4BlkRQcJB/YOwQxJRTpoo7aTsortjgoJ1x7opzTSxn7C+ASSLVjQ=="],
-
    "@napi-rs/lzma-linux-x64-gnu": ["@napi-rs/lzma-linux-x64-gnu@1.5.1", "", { "os": "linux", "cpu": "x64" }, "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ=="],

    "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.2.3", "", { "dependencies": { "@tybys/wasm-util": "^0.10.3" }, "peerDependencies": { "@emnapi/core": "^1.7.1 || ^2.0.0-alpha.4", "@emnapi/runtime": "^1.7.1 || ^2.0.0-alpha.4" } }, "sha512-UMduMbqO5s5zF2NkNacMT/yK5Y5QiKvWr2+50bzIIxFDwVJ2h49b+oyjaCGPhJxd2/gC2x39EHv/gHVuu36x2Q=="],
@@ -2166,19 +2155,19 @@

    "@opencode-ai/protocol": ["@opencode-ai/protocol@0.0.0-beta-18050", "", { "dependencies": { "@opencode-ai/schema": "0.0.0-beta-18050", "effect": "4.0.0-rc.111" } }, "sha512-HDQMnvGp8IU0MdBRbEuydX1WQm09BZ4HJm9iSMQwzweJuQ2HNscgzHJPIH6P02BsbbtfJ8J7sZGPItrz1tWSgw=="],

-    "@opencode-ai/pty": ["@opencode-ai/pty@0.2.0", "", { "optionalDependencies": { "@opencode-ai/pty-darwin-arm64": "0.2.0", "@opencode-ai/pty-darwin-x64": "0.2.0", "@opencode-ai/pty-linux-arm64-gnu": "0.2.0", "@opencode-ai/pty-linux-arm64-musl": "0.2.0", "@opencode-ai/pty-linux-x64-gnu": "0.2.0", "@opencode-ai/pty-linux-x64-musl": "0.2.0" }, "bin": { "opencode-pty": "bin/opencode-pty.js" } }, "sha512-pV86urAwinpwFXX8AJlOf8S9CVJhGsV+11I/J6TcxMW0c7u6LgeODzdj/BVBC6jUhsG2aKDxg8rACMcDCy3HiA=="],
+    "@opencode-ai/pty": ["@opencode-ai/pty@0.1.13", "", { "optionalDependencies": { "@opencode-ai/pty-darwin-arm64": "0.1.13", "@opencode-ai/pty-darwin-x64": "0.1.13", "@opencode-ai/pty-linux-arm64-gnu": "0.1.13", "@opencode-ai/pty-linux-arm64-musl": "0.1.13", "@opencode-ai/pty-linux-x64-gnu": "0.1.13", "@opencode-ai/pty-linux-x64-musl": "0.1.13" }, "bin": { "opencode-pty": "bin/opencode-pty.js" } }, "sha512-WPCN8h8HaZhhUcrMG0zu+4D9vco0EZiEg/gCF1K3JPRN6UsHMiXq1HVIy5IlyfcoyjfViRmQmXYE4AuU3laBjA=="],

-    "@opencode-ai/pty-darwin-arm64": ["@opencode-ai/pty-darwin-arm64@0.2.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-2y6xrktb2J7rRk+mzAJHA8cCbWhC4Lo2zJ66t9ad59qFhL5nzAPfpEOwnyvvFqhxebHNvL08Mp64M9IHnM0aiA=="],
+    "@opencode-ai/pty-darwin-arm64": ["@opencode-ai/pty-darwin-arm64@0.1.13", "", { "os": "darwin", "cpu": "arm64" }, "sha512-fVtQZqVLBuJx/aB+5ojfmQifS1KMc9gxlxpFQ6bxEFU8tn8xHQTiFPaNroZgOtaw7I4ceGyx/eXieK1wp68yAA=="],

-    "@opencode-ai/pty-darwin-x64": ["@opencode-ai/pty-darwin-x64@0.2.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-XVQwK9+KgVGYunCYPCCBf1Or0z6zSkzjgfdJd7dEe/LOFg5vmMkOfSB9dCXnoRCWGviWYk7xd07iFIFOgyj5Ig=="],
+    "@opencode-ai/pty-darwin-x64": ["@opencode-ai/pty-darwin-x64@0.1.13", "", { "os": "darwin", "cpu": "x64" }, "sha512-b/tAEm0hCMXraPM9cxR8Rg7X1UBZInRTaxWAS4Ht9eH1nWj1rANOLvHWiWX/vVh5TB0Ubg8bWPu4B0nZkEHROQ=="],

-    "@opencode-ai/pty-linux-arm64-gnu": ["@opencode-ai/pty-linux-arm64-gnu@0.2.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-TPVGCQk5E65IY3ipcpd17rwKehdvXcXEYRhhGzok/6Dske69ei2S+ERz7NXZ8cKFAvbiiT771HHM+XyVYAl+7A=="],
+    "@opencode-ai/pty-linux-arm64-gnu": ["@opencode-ai/pty-linux-arm64-gnu@0.1.13", "", { "os": "linux", "cpu": "arm64" }, "sha512-I124aSYBBjpGZnYExHfIajkvVK1FiK+//OJBGdqqFp5pas2Oruq4O8tv+pMoxomZIYh2ce/QhOOYLHRwXsthTg=="],

-    "@opencode-ai/pty-linux-arm64-musl": ["@opencode-ai/pty-linux-arm64-musl@0.2.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-iH6/liY7xN1OXVD9eGzdH11BVGvnpPsH5Z1Unz0Pn9EzkPFf28oDNKNyeXV0xIAP53oiYp8gpRq2PADNwbVsTg=="],
+    "@opencode-ai/pty-linux-arm64-musl": ["@opencode-ai/pty-linux-arm64-musl@0.1.13", "", { "os": "linux", "cpu": "arm64" }, "sha512-feWsfKpaDytGJzutoK43GqQwVghG2vHZt6BE/ydPZNuqIrySQ/6JfliUAMwn5BWs/Ky7ouSwKHCyAVeukusSvg=="],

-    "@opencode-ai/pty-linux-x64-gnu": ["@opencode-ai/pty-linux-x64-gnu@0.2.0", "", { "os": "linux", "cpu": "x64" }, "sha512-GhdrmbUzxGHRfWvt1qutgVD4HLb7aSBsgWGjFsc6k8HjO5ZbdaC3ScRyd512YAAG5KAROLKZ6+0SEBsm5xFYlA=="],
+    "@opencode-ai/pty-linux-x64-gnu": ["@opencode-ai/pty-linux-x64-gnu@0.1.13", "", { "os": "linux", "cpu": "x64" }, "sha512-jliNgsevGuxfIeX7eyzjHhrJkF8uEUPnDLbF2v16uv69FhEHrraf7jyWkxazMP6rNvn2CGtwMMc4BXPS5pzjhg=="],

-    "@opencode-ai/pty-linux-x64-musl": ["@opencode-ai/pty-linux-x64-musl@0.2.0", "", { "os": "linux", "cpu": "x64" }, "sha512-EbHchDsMmL5aOReIoo8NvQkKnyhyKmoL2RleF2JYF76va3FKuksmwsOBgQJh54i+QA4Fd0+9x54Q+2fJOzPiRQ=="],
+    "@opencode-ai/pty-linux-x64-musl": ["@opencode-ai/pty-linux-x64-musl@0.1.13", "", { "os": "linux", "cpu": "x64" }, "sha512-rXDpidW66gz2b2M/NbUN8ZKmAxaJcASnuHATeXevlrFdiPUv8uJwvkRd6Pla1fp01Q65MkBmgRa7Q9c+H1PlzA=="],

    "@opencode-ai/schema": ["@opencode-ai/schema@0.0.0-beta-18050", "", { "dependencies": { "@standard-schema/spec": "1.1.0", "effect": "4.0.0-rc.111" } }, "sha512-/D6VXaWlytTXR3IOiMLIKuPcfp7FQNUzRPm9z3K7UBFd1Bw4q/WZksaf5RVcBGz+0YRxYMc1V4D7MFlceSgtyg=="],

@@ -3326,6 +3315,8 @@

    "@webgpu/types": ["@webgpu/types@0.1.54", "", {}, "sha512-81oaalC8LFrXjhsczomEQ0u3jG+TqE6V9QHLA8GNZq/Rnot0KDugu3LhSYSlie8tSdooAN1Hov05asrUUp9qgg=="],

+    "@workflow/serde": ["@workflow/serde@4.1.0", "", {}, "sha512-pav4F2BoirECWR7Nf1TKt+2eETcBj7jj4cBefQ8VXQCA6NPkaKeLfj/zMgi+3zYV5ZIBT4GuUiphsj0/b9hPQQ=="],
+
    "@xmldom/xmldom": ["@xmldom/xmldom@0.8.14", "", {}, "sha512-T4EDRUBVZYRldYApjEJiU0e1stYWaRAX7CuSnKzrpwdZKo53zGV8/pqfzV6FfwNl9YThD2OumQYvqtvjvgG7aQ=="],

    "@yuuang/ffi-rs-android-arm64": ["@yuuang/ffi-rs-android-arm64@1.3.7", "", { "os": "android", "cpu": "arm64" }, "sha512-t6Wx3Xll6c07Nuk0k3xnZsxKFxlshm92i0U/BiTHc6kQbvu+fMJF+gKsj4yEj886jH51CM3EqZT9Xdhq9CdUVw=="],
@@ -3366,6 +3357,8 @@

    "agentkeepalive": ["agentkeepalive@4.6.0", "", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="],

+    "ai": ["ai@7.0.66", "", { "dependencies": { "@ai-sdk/gateway": "4.0.52", "@ai-sdk/provider": "4.0.7", "@ai-sdk/provider-utils": "5.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-wBUyoCYF3GVr+62nelBgR8YbpTSsMZrzFyOOjiwijylNSM2TFCW35C+Pml2vc59/WLMpyhS/LWZ55M+B9DAcSg=="],
+
    "ajv": ["ajv@8.20.0", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA=="],

    "ajv-draft-04": ["ajv-draft-04@1.0.0", "", { "peerDependencies": { "ajv": "^8.5.0" }, "optionalPeers": ["ajv"] }, "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw=="],
@@ -3544,7 +3537,7 @@

    "bun-ffi-structs": ["bun-ffi-structs@0.3.1", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-3gM7PpVWLyrwxWjcilSiGuhWanhZivvo6l0u573NziPH6f/gwk6McbaYgn7oJWov6pKGRTDbrg94W5DcJsKTtQ=="],

-    "bun-pty": ["bun-pty@0.4.9", "", {}, "sha512-IUF/B3FANo8vIQ775Zt7Er7lphMpYMhLkes45am2WE8FaVI7KRYtj1rQwliZ18b6GpNzBNWcl7sz9QT5wDFBeQ=="],
+    "bun-pty": ["bun-pty@0.4.8", "", {}, "sha512-rO70Mrbr13+jxHHHu2YBkk2pNqrJE5cJn29WE++PUr+GFA0hq/VgtQPZANJ8dJo6d7XImvBk37Innt8GM7O28w=="],

    "bun-types": ["bun-types@1.4.2", "", { "dependencies": { "@types/node": "*" } }, "sha512-bxV1FgK7yBIzjRe5zBozIM4Bem11ZJcCXSrjWRG3YWLt8yFDePu4cLjpebO8OvPeIE9trbyPF4fuj3Cia4Fj3w=="],

@@ -3908,7 +3901,7 @@

    "editorconfig": ["editorconfig@1.0.7", "", { "dependencies": { "@one-ini/wasm": "0.1.1", "commander": "^10.0.0", "minimatch": "^9.0.1", "semver": "^7.5.3" }, "bin": { "editorconfig": "bin/editorconfig" } }, "sha512-e0GOtq/aTQhVdNyDU9e02+wz9oDDM+SIOQxWME2QRjzRX5yyLAuHDE+0aE8vHb9XRC8XD37eO2u57+F09JqFhw=="],

-    "effect": ["effect@4.0.0-rc.112", "", { "dependencies": { "fast-check": "^4.9.0", "msgpackr": "^2.0.5" } }, "sha512-wXxwuh1Ywnv4cPRM3Wfa0vDwuOHnZ1TsTgHJkG9XgzND6inhBH9n1vBxhg3iIXOia/OrpmvVmd3lrD4vq6bF3A=="],
+    "effect": ["effect@4.0.0", "", {}, "sha512-ooc1TG5t+FfzgYnFz2ff6BBKyZ7EwBRVXC7c4RhQUAD6/TZ2gTXXMeb4WX7a19ozQo4J73/QW+S00YAIresoMQ=="],

    "ejs": ["ejs@3.1.10", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="],

@@ -4746,7 +4739,7 @@

    "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="],

-    "mime": ["mime@4.1.0", "", { "bin": { "mime": "bin/cli.js" } }, "sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw=="],
+    "mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],

    "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],

@@ -4794,10 +4787,6 @@

    "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],

-    "msgpackr": ["msgpackr@2.0.5", "", { "optionalDependencies": { "msgpackr-extract": "^3.0.4" } }, "sha512-cef05H/dSYpLpqp3sj/qyZh5vhUYCalnaLO7j1yOmpsR0y/XwLVtK7r5gn+U/F7CTEfMowcGhlUQJDLcLf7jcA=="],
-
-    "msgpackr-extract": ["msgpackr-extract@3.0.4", "", { "dependencies": { "node-gyp-build-optional-packages": "5.2.2" }, "optionalDependencies": { "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.4", "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.4", "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.4" }, "bin": { "download-msgpackr-prebuilds": "bin/download-prebuilds.js" } }, "sha512-4kmO/MdyUIkLIvTPr8VHLil4AtoKIoniWPIEk5+CDy0xnWC84azhSFmuJ7PxZdsYtiP5kEeQsORAVIeMgxT+Hw=="],
-
    "muggle-string": ["muggle-string@0.4.1", "", {}, "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="],

    "mustache": ["mustache@4.2.0", "", { "bin": { "mustache": "bin/mustache" } }, "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ=="],
@@ -4840,8 +4829,6 @@

    "node-gyp-build": ["node-gyp-build@4.8.4", "", { "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", "node-gyp-build-test": "build-test.js" } }, "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ=="],

-    "node-gyp-build-optional-packages": ["node-gyp-build-optional-packages@5.2.2", "", { "dependencies": { "detect-libc": "^2.0.1" }, "bin": { "node-gyp-build-optional-packages": "bin.js", "node-gyp-build-optional-packages-optional": "optional.js", "node-gyp-build-optional-packages-test": "build-test.js" } }, "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw=="],
-
    "node-html-parser": ["node-html-parser@7.1.0", "", { "dependencies": { "css-select": "^5.1.0", "he": "1.2.0" } }, "sha512-iJo8b2uYGT40Y8BTyy5ufL6IVbN8rbm/1QK2xffXU/1a/v3AAa0d1YAoqBNYqaS4R/HajkWIpIfdE6KcyFh1AQ=="],

    "node-int64": ["node-int64@0.4.0", "", {}, "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="],
@@ -5624,7 +5611,7 @@

    "typesafe-path": ["typesafe-path@0.2.2", "", {}, "sha512-OJabfkAg1WLZSqJAJ0Z6Sdt3utnbzr/jh+NAHoyWHJe8CMSy79Gm085094M9nvTPy22KzTVn5Zq5mbapCI/hPA=="],

-    "typescript": ["typescript@5.8.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="],
+    "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],

    "typescript-auto-import-cache": ["typescript-auto-import-cache@0.3.6", "", { "dependencies": { "semver": "^7.3.8" } }, "sha512-RpuHXrknHdVdK7wv/8ug3Fr0WNsNi5l5aB8MYYuXhq2UH5lnEB1htJ1smhtD5VeCsGr2p8mUDtd83LCQDFVgjQ=="],

@@ -5638,7 +5625,7 @@

    "uncrypto": ["uncrypto@0.1.3", "", {}, "sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q=="],

-    "undici": ["undici@8.10.0", "", {}, "sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ=="],
+    "undici": ["undici@8.11.2", "", {}, "sha512-u4UB2/IrKdU6lFxumHmmo1a3fCQO5tzQllRorfoRS63txhrB7xTpSn1PftwC4qEHkOaqP95fCWW4lJzwErwzhQ=="],

    "undici-types": ["undici-types@7.16.0", "", {}, "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw=="],

@@ -5718,6 +5705,8 @@

    "validate-npm-package-name": ["validate-npm-package-name@7.0.2", "", {}, "sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A=="],

+    "venice-ai-sdk-provider": ["venice-ai-sdk-provider@2.1.1", "", { "dependencies": { "@ai-sdk/openai-compatible": "^2.0.51", "@ai-sdk/provider": "^3.0.10", "@ai-sdk/provider-utils": "^4.0.30" }, "peerDependencies": { "ai": "^6.0.90" } }, "sha512-w3OHkuzzKZ3r2TOxER6myBYzZJNoDqol+DUHu3NnfBN/GETnUVxecZJab0CHQQ8GZc0jjzpFymepjcLDPS4SQg=="],
+
    "vfile": ["vfile@6.0.3", "", { "dependencies": { "@types/unist": "^3.0.0", "vfile-message": "^4.0.0" } }, "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q=="],

    "vfile-location": ["vfile-location@5.0.3", "", { "dependencies": { "@types/unist": "^3.0.0", "vfile": "^6.0.0" } }, "sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg=="],
@@ -6088,15 +6077,13 @@

    "@bufbuild/protoplugin/typescript": ["typescript@5.4.5", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="],

-    "@cloudflare/kv-asset-handler/mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],
-
    "@cloudflare/vite-plugin/vite": ["vite@7.3.6", "", { "dependencies": { "esbuild": "^0.27.0 || ^0.28.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-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg=="],

    "@cloudflare/vite-plugin/ws": ["ws@8.18.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="],

    "@cspotcode/source-map-support/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="],

-    "@effect/platform-node-shared/ws": ["ws@8.21.3", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw=="],
+    "@effect/platform-node-shared/ws": ["ws@8.22.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-Ydggc987+RO0AnWtZ/7Wq9FtNvcrL1b/RO0ud9mWjUPgDrsAAwQSF51sm2hm1XofbU/4jkpGEsLFsZZxU+1DOg=="],

    "@electron/asar/commander": ["commander@5.1.0", "", {}, "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="],

@@ -6228,8 +6215,6 @@

    "@opencode/console-support/vite": ["vite@7.3.6", "", { "dependencies": { "esbuild": "^0.27.0 || ^0.28.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-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg=="],

-    "@opencode/desktop/typescript": ["typescript@5.6.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw=="],
-
    "@opencode/enterprise/@tailwindcss/vite": ["@tailwindcss/vite@4.1.11", "", { "dependencies": { "@tailwindcss/node": "4.1.11", "@tailwindcss/oxide": "4.1.11", "tailwindcss": "4.1.11" }, "peerDependencies": { "vite": "^5.2.0 || ^6 || ^7" } }, "sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw=="],

    "@opencode/enterprise/tailwindcss": ["tailwindcss@4.1.11", "", {}, "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA=="],
@@ -6386,6 +6371,12 @@

    "@vscode/emmet-helper/jsonc-parser": ["jsonc-parser@2.3.1", "", {}, "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="],

+    "ai/@ai-sdk/gateway": ["@ai-sdk/gateway@4.0.52", "", { "dependencies": { "@ai-sdk/provider": "4.0.7", "@ai-sdk/provider-utils": "5.0.27", "@vercel/oidc": "3.2.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-SXUM8jzzuTUJRq+EOgPd5to6DSx0EKslVn+IVZHbUEX6k/3vCPNrvjckbK26HnNxHU/STxm+zTSJteqrO+7Z0w=="],
+
+    "ai/@ai-sdk/provider": ["@ai-sdk/provider@4.0.7", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6or44XprPzKbr8zkmzosowSE0pxkvJcoojBL+mCZvPUt3kvXp3XSNqeVun9golb1acEfSo6yaEBRT18h2VU+1Q=="],
+
+    "ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@5.0.27", "", { "dependencies": { "@ai-sdk/provider": "4.0.7", "@standard-schema/spec": "^1.1.0", "@workflow/serde": "4.1.0", "eventsource-parser": "^3.0.8", "undici": "^7.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-EzAn4pdgG5g0xXtH6lE2zyNmfjDQIDjATkfqzuidEI35g++hh4+07vnjzkT/RmGmIClPZiRj/Q2GMPV2V7mkHw=="],
+
    "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],

    "anymatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],
@@ -6682,6 +6673,8 @@

    "tw-to-css/tailwindcss": ["tailwindcss@3.3.2", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.5.3", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.18.2", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", "postcss": "^8.4.23", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.1", "postcss-nested": "^6.0.1", "postcss-selector-parser": "^6.0.11", "postcss-value-parser": "^4.2.0", "resolve": "^1.22.2", "sucrase": "^3.32.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w=="],

+    "unifont/undici": ["undici@8.10.0", "", {}, "sha512-HvltHd7avK13QIw/oLe4qoOLyoVSoafqJ2jYOrtMRBkbYT31eiBQ8O0ehRKZiEZCMEyLFQNIADpgCWC5fALvYQ=="],
+
    "unplugin/acorn": ["acorn@8.18.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="],

    "unused-filename/escape-string-regexp": ["escape-string-regexp@5.0.0", "", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="],
@@ -6690,6 +6683,12 @@

    "unzipper/fs-extra": ["fs-extra@11.3.1", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g=="],

+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.69", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@ai-sdk/provider-utils": "4.0.46" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-C99M0T0SpRkcCClmJxbQkpSqGmxLfh3NhTsNF3aNaUQZZ7oXN5sPWi9LGs49X5Q/r9FWxBYeZARXs15xxtGIig=="],
+
+    "venice-ai-sdk-provider/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
+
+    "venice-ai-sdk-provider/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.40", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-OL5IrpUm9Y8Dwy+w/vvFwPotS6m52O9W0op2oXgXdCROMJIBalBI0oro6OIBYkPxvm5Xg02GSkoQN25RlR0bnw=="],
+
    "vite-plugin-dynamic-import/acorn": ["acorn@8.18.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="],

    "vite-plugin-icons-spritesheet/chalk": ["chalk@5.6.2", "", {}, "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="],
@@ -7238,6 +7237,8 @@

    "@vitest/expect/@vitest/utils/@vitest/pretty-format": ["@vitest/pretty-format@3.2.4", "", { "dependencies": { "tinyrainbow": "^2.0.0" } }, "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA=="],

+    "ai/@ai-sdk/provider-utils/undici": ["undici@7.29.0", "", {}, "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw=="],
+
    "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

    "ansi-align/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
@@ -7536,6 +7537,10 @@

    "tw-to-css/tailwindcss/postcss": ["postcss@8.5.26", "", { "dependencies": { "nanoid": "^3.3.17", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ=="],

+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider": ["@ai-sdk/provider@3.0.15", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-XeZW1CcDF2GMbH4wejW6xBRI2QCOgnkVYUnxoeDadB1mf85riL2bMUeDoh+6gJ/r4mjNfzUPW8OjLjvwTP0u1Q=="],
+
+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.46", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8", "undici": "^6.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-tEtld97plCFiYevsJuOkGkeuhQndeMWFBVrJS4AjnbD5AqrNSXRCe0p+BZ3Cju/sxDeeZ9ym3q9YUV8fASA7aQ=="],
+
    "vitest/@vitest/expect/chai": ["chai@6.2.2", "", {}, "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg=="],

    "vscode-languageserver/vscode-languageserver-protocol/vscode-jsonrpc": ["vscode-jsonrpc@8.2.0", "", {}, "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="],
@@ -8414,6 +8419,8 @@

    "tw-to-css/tailwindcss/chokidar/readdirp": ["readdirp@3.6.0", "", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="],

+    "venice-ai-sdk-provider/@ai-sdk/openai-compatible/@ai-sdk/provider-utils/undici": ["undici@6.28.0", "", {}, "sha512-LIY910g9TI13YS95lrMFrs8Rm/u/irgHeTWoKCoteeJ04CUJ92eEfj0rVn+7VKMPBpUPiUoBKfhNyLI23EE/KA=="],
+
    "yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],

    "@astrojs/cloudflare/@cloudflare/vite-plugin/miniflare/sharp/@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.35.2", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.3.1" }, "os": "darwin", "cpu": "arm64" }, "sha512-eEieHsMksAW4IiO5NzauESRl2D2qz3J/kwUxUrSfV06A93eEaRfMpHXyUb1mAqrR7i8U9A0GRqE9pjn6u1Jjpg=="],
@@ -13,12 +13,7 @@
  opencode,
 }:
 let
-  electronPin =
-    (lib.pipe ../packages/desktop/package.json [
-      builtins.readFile
-      builtins.fromJSON
-    ]).devDependencies.electron;
-  electron = callPackage ./electron.nix { inherit electronPin; };
+  electron = callPackage ./electron.nix { };
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "opencode-desktop";
@@ -40,8 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
    copyDesktopItems
  ]
  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.cctools
-    darwin.sigtool
    # Ad-hoc sign the .app: --config.mac.identity=null below skips signing.
    darwin.autoSignDarwinBinariesHook
  ];
@@ -73,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
    ''
    # https://github.com/electron/electron/issues/31121
    # mac builds use a .app bundle which doesnt have this issue
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
+    + lib.optionalString stdenv.isLinux ''
      substituteInPlace \
        packages/desktop/src/main/windows/appearance.ts \
        packages/desktop/src/main/service/desktop-cli.ts \
@@ -81,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
    '';

  preBuild = ''
-    echo "electron ${electron.version} from nixpkgs ${lib.version}, package.json pins ${electronPin}"
    cp -r "${electron.dist}" $HOME/.electron-dist
    chmod -R u+w $HOME/.electron-dist

@@ -97,15 +89,8 @@ stdenv.mkDerivation (finalAttrs: {

    export OPENCODE_CLI_DIST="$TMPDIR/desktop-cli"
    cli_package=$(bun -e 'import { getCurrentCli } from "./scripts/utils.ts"; console.log(getCurrentCli().package.replace("@opencode/", ""))')
-    # copyBuiltCliToResources joins this dist with the npm package name getCurrentCli()
-    # reports, not the Nix build's name. It reads only .version from the manifest and
-    # writes it as opencode-cli.version beside the binary.
    mkdir -p "$OPENCODE_CLI_DIST/$cli_package/bin"
    cp ${lib.getExe opencode} "$OPENCODE_CLI_DIST/$cli_package/bin/opencode"
-    # OPENCODE_VERSION is what the bundled CLI prints for --version, so the manifest
-    # and the executable cannot drift.
-    bun -e 'await Bun.write(process.argv[1], JSON.stringify({ version: process.env.OPENCODE_VERSION }) + "\n")' \
-      "$OPENCODE_CLI_DIST/$cli_package/package.json"

    bun run build
    npx electron-builder --dir \
@@ -153,13 +138,6 @@ stdenv.mkDerivation (finalAttrs: {
    "libc.musl-x86_64.so.1"
  ];

-  passthru = {
-    # electronVersion is what ships; electronPin is what packages/desktop/package.json
-    # asks for. They differ whenever nixpkgs carries no release of the pinned minor.
-    electronVersion = electron.version;
-    inherit electronPin;
-  };
-
  meta = {
    description = "OpenCode Desktop App";
    mainProgram = "opencode-desktop";
@@ -1,10 +1,12 @@
-{ lib, pkgs, electronPin }:
+{ callPackage, path }:
 let
-  # Nixpkgs owns the release hashes, so bumping the pin no longer means editing this repo. Only the
-  # major is delegated, so what gets built trails the pin whenever nixpkgs has not shipped it yet.
-  # That is safe: the bundle ships one native addon, node-pty's Node-API prebuild, and
-  # only the win32 WSL runtime loads it, so nothing in the main process binds the
-  # Electron ABI.
-  major = lib.versions.major electronPin;
+  version = (builtins.fromJSON (builtins.readFile ../packages/desktop/package.json)).devDependencies.electron;
 in
-pkgs."electron_${major}-bin" or (throw "nixpkgs ${lib.version} carries no prebuilt electron ${major}: run `nix flake update nixpkgs`, or pin a major nixpkgs still carries")
+(callPackage (path + "/pkgs/development/tools/electron/binary/generic.nix") { }) version {
+  # Electron 42.10.1 SHASUMS256.txt; update with the desktop package version.
+  aarch64-linux = "20e68d6c4e47f3ebf59de7c6b1f8b8bec6a6ebda6a451132f9b465f3f13ce467";
+  x86_64-linux = "2452b27112d92387471fa2488aafac85d79ea3f2ee1216c0abd5150d6c12362b";
+  aarch64-darwin = "ac7194a3dfd81930ba35355c01620262c1254752859b42dcb8f4b9e4d174a871";
+  # fetchzip hashes the unpacked headers, not the release tarball.
+  headers = "sha256-4eUy3BZVvxTl7KUOsxio7769lL6ag/ecbeK+qLURWMI=";
+}
@@ -1,7 +1,7 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-4AqU8dPEwo0ukoyEX1SuDVzsXQ7G/fIPnxoL400zH4M=",
-    "aarch64-linux": "sha256-p75sJYtR8a4oVKb1+Dgp8Kl+1onSmUw5NRv95bbV1+E=",
-    "aarch64-darwin": "sha256-Psyvbw/lGulysQlhK/MqcHVIwx2aCDTr+Pfr+gRWsG4="
+    "x86_64-linux": "sha256-g3k0cAFGqzmRYlcIkg1NDvlx1WxHYhnYPL0/a8E+qTg=",
+    "aarch64-linux": "sha256-a+3ymqdxOONGe2Tpq4GUccl1b+Dwzxlb9LFXgE1gZ+0=",
+    "aarch64-darwin": "sha256-h8xIzuMmaWfJqjHCO74xUDCWNKQLFrIGoKYZ+2TauYc="
  }
 }
@@ -12,7 +12,7 @@
  installShellFiles,
  versionCheckHook,
  writableTmpDirAsHomeHook,
-  node_modules ? callPackage ./node_modules.nix { },
+  node_modules ? callPackage ./node-modules.nix { },
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "opencode";
@@ -85,30 +85,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  '';

  postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
-    # v2 dropped the `completion` subcommand; --completions is the global flag.
-    # --completions also accepts sh, which emits the same script as bash.
-    # staged to files, substitute below rejects anything that is not a regular file
-    $out/bin/opencode --completions bash > opencode.bash
-    $out/bin/opencode --completions zsh > _opencode
-    $out/bin/opencode --completions fish > opencode.fish
-
+    # trick yargs into also generating zsh completions
    installShellCompletion --cmd opencode \
-      --bash opencode.bash \
-      --fish opencode.fish \
-      --zsh _opencode
-
-    # OPENCODE_CLI_NAME is a build-time define, so the opencode2 copies are
-    # renamed rather than regenerated. --replace-fail is a global literal
-    # substitution, so any lowercase opencode that later appears in a
-    # description or help text ships as opencode2 in the opencode2 copy.
-    substitute opencode.bash opencode2.bash --replace-fail opencode opencode2
-    substitute _opencode _opencode2 --replace-fail opencode opencode2
-    substitute opencode.fish opencode2.fish --replace-fail opencode opencode2
+      --bash <($out/bin/opencode completion) \
+      --zsh <(SHELL=/bin/zsh $out/bin/opencode completion)

    installShellCompletion --cmd opencode2 \
-      --bash opencode2.bash \
-      --fish opencode2.fish \
-      --zsh _opencode2
+      --bash <($out/bin/opencode2 completion) \
+      --zsh <(SHELL=/bin/zsh $out/bin/opencode2 completion)
  '';

  nativeInstallCheckInputs = [
@@ -2,7 +2,7 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "2.0.22",
+  "version": "2.0.21",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.4.2",
@@ -18,8 +18,7 @@
    "dev:www": "bun run --cwd services/www dev",
    "dev:storybook": "bun --cwd packages/storybook storybook",
    "bench:devex": "bun run --cwd packages/app test:bench:devex",
-    "lint": "oxlint && ast-grep scan -c script/ast-grep/gui-extensions/sgconfig.yml && bun script/sdk-docs.ts",
-    "lint:changed": "bun script/lint-changed.ts",
+    "lint": "oxlint && ast-grep scan -c script/ast-grep/gui-extensions/sgconfig.yml",
    "lint:effect-patterns": "ast-grep scan -c script/ast-grep/sgconfig.yml packages/util/src packages/core/src packages/server/src packages/protocol/src packages/cli/src",
    "lint:effect-simplifications": "ast-grep scan -c script/ast-grep/effect-simplifications/sgconfig.yml --off=unused-suppression packages",
    "test:lint-rules": "ast-grep test -c script/ast-grep/sgconfig.yml",
@@ -43,10 +42,10 @@
      "packages/stats/*"
    ],
    "catalog": {
-      "@effect/opentelemetry": "4.0.0-rc.112",
-      "@effect/platform-node": "4.0.0-rc.112",
-      "@effect/platform-node-shared": "4.0.0-rc.112",
-      "@effect/sql-sqlite-bun": "4.0.0-rc.112",
+      "@effect/opentelemetry": "4.0.0",
+      "@effect/platform-node": "4.0.0",
+      "@effect/platform-node-shared": "4.0.0",
+      "@effect/sql-sqlite-bun": "4.0.0",
      "@npmcli/arborist": "9.4.0",
      "@types/bun": "1.4.0",
      "@types/cross-spawn": "6.0.6",
@@ -80,7 +79,7 @@
      "dompurify": "3.4.14",
      "drizzle-kit": "1.0.0-rc.5-ab785fc",
      "drizzle-orm": "1.0.0-rc.5-169397b",
-      "effect": "4.0.0-rc.112",
+      "effect": "4.0.0",
      "ai": "6.0.168",
      "cross-spawn": "7.0.6",
      "hono": "4.10.7",
@@ -93,7 +92,7 @@
      "remend": "1.3.1",
      "@playwright/test": "1.59.1",
      "semver": "7.7.4",
-      "typescript": "5.8.2",
+      "typescript": "5.9.3",
      "@typescript/native-preview": "7.0.0-dev.20251207.1",
      "zod": "4.1.8",
      "remeda": "2.26.0",
@@ -27,31 +27,6 @@ Run `LLM.stream(...)` instead of `generate` when you want incremental `LLMEvent`
 `LLM.request(...)`. The event stream is provider-neutral — same shape across OpenAI Chat, OpenAI Responses,
 Anthropic Messages, Gemini, Bedrock Converse, and any OpenAI-compatible deployment.

-### Google Interactions
-
-`Google.configure({ apiKey }).interactions(modelID)` selects the Interactions API; `.model(modelID)` still selects
-GenerateContent. The package entrypoint is `@opencode/ai/providers/google/interactions`.
-
-```ts
-const model = Google.configure({ apiKey }).interactions("gemini-3.8-flash")
-const response = yield* LLM.generate({
-  model,
-  prompt: "Say hello.",
-  providerOptions: { thinkingLevel: "low", thinkingSummaries: "auto", store: true },
-})
-```
-
-Interactions supports text output, streamed function calls, native tool results, thought signatures, and multimodal
-input. Full-history replay is the default (`store: false`); implicit caching works without retained interactions.
-For server-side continuation, set `store: true` on the predecessor, read `interactionId` from the final event's
-`providerMetadata.google`, and pass `previousInteractionId` on the next request with **only new messages**. Repeat
-the system instructions and tool declarations on each request. Set `store: true` on each response you intend to
-continue from. The package does not automatically select or persist continuation IDs.
-
-Raw usage is preserved in `usage.providerMetadata.google`. `inputTokens` follows Google's top-level accounting;
-`contextTokens` uses its full `raw_prompt_token` count when supplied. These can differ substantially with server-side
-continuation. Explicit caches, hosted tools, and generated media are not supported by this initial protocol.
-
 The same configured facade names image, video, speech, and transcription models. `Image.generate` resolves the
 provider's image route from the model and returns `Media.Asset`s with lazily decoded bytes:

@@ -106,41 +81,6 @@ for await (const event of ai.llm.stream(ai.llm.request(input))) {
 await ai.dispose()
 ```

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

 Evaluation models compare shared state with typed choice, score, and boolean questions. The API is
@@ -1283,7 +1223,7 @@ const gateway = CloudflareAIGateway.configure({
 }).model("workers-ai/@cf/meta/llama-3.1-8b-instruct")
 ```

-Included LLM providers: OpenAI, Anthropic, Google (Gemini), Google Vertex, Amazon Bedrock, Azure OpenAI, Baseten, Cerebras, Cohere, Cloudflare AI Gateway, Cloudflare Workers AI, DeepInfra, DeepSeek, Fireworks, Groq, Mistral, OpenRouter, TogetherAI, and xAI. Z.ai currently exposes image generation. Generic Chat Completions, Responses, and Anthropic Messages-compatible entrypoints support custom endpoints.
+Included LLM providers: OpenAI, Anthropic, Google (Gemini), Google Vertex, Amazon Bedrock, Azure OpenAI, Baseten, Cerebras, Cloudflare AI Gateway, Cloudflare Workers AI, DeepInfra, DeepSeek, Fireworks, Groq, Mistral, OpenRouter, TogetherAI, and xAI. Z.ai currently exposes image generation. Generic Chat Completions, Responses, and Anthropic Messages-compatible entrypoints support custom endpoints.

 Each named provider owns its module, endpoint, authentication, and route setup. Providers with the same wire format compose the shared protocol directly:

@@ -15,7 +15,7 @@ import { OpenAI } from "@opencode/ai/providers"
 * hover imports and local values to see how the public API is typed.
 */

-const apiKey = Config.redacted("OPENAI_API_KEY")
+const apiKey = Config.Redacted("OPENAI_API_KEY")

 // 1. Configure a provider. The configured facade records provider identity,
 // deployment options, authentication, and defaults. Per-modality selectors pick
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.22",
+  "version": "2.0.21",
  "name": "@opencode/ai",
  "type": "module",
  "license": "MIT",
@@ -5,7 +5,7 @@ import * as path from "node:path"
 import * as prompts from "@clack/prompts"
 import { AwsV4Signer } from "aws4fetch"
 import { Config, ConfigProvider, Effect, FileSystem, PlatformError, Redacted } from "effect"
-import { FetchHttpClient, HttpClient, HttpClientRequest, type HttpClientResponse } from "effect/unstable/http"
+import { FetchHttpClient, HttpClient, HttpClientRequest, type HttpClientResponse } from "effect/http"
 import * as ProviderShared from "../src/protocols/shared"
 import { CloudflareAIGateway } from "../src/providers/cloudflare-ai-gateway.js"
 import { CloudflareWorkersAI } from "../src/providers/cloudflare-workers-ai.js"
@@ -383,7 +383,7 @@ const readEnvFile = Effect.fn("RecordingEnv.readFile")(function* () {
 })

 const readConfigString = (provider: ConfigProvider.ConfigProvider, name: string) =>
-  Config.string(name)
+  Config.String(name)
    .parse(provider)
    .pipe(
      Effect.match({
@@ -38,11 +38,9 @@ const resolve = (policy: CachePolicy | undefined): CachePolicyObject => {
 // prefix caching, Gemini's implicit + out-of-band CachedContent). Skip the
 // whole policy pass for these — emitting hints would be harmless but pointless.
 const RESPECTS_INLINE_HINTS = new Set([
-  "alibaba-chat",
  "alibaba-messages",
  "anthropic-messages",
  "anthropic-compatible-messages",
-  "bedrock-mantle-messages",
  "cloudflare-ai-gateway-messages",
  "google-vertex-messages",
  "meta-messages",
@@ -57,12 +55,11 @@ const RESPECTS_INLINE_HINTS = new Set([
 // OpenRouter upstreams other than Anthropic and Alibaba Qwen cache without breakpoints. Gemini uses only the last
 // breakpoint, so a conversation-tail breakpoint writes a new cache every step and costs more than none. Qwen ignores
 // breakpoints on tool definitions and caches tools with the system prompt.
-const QWEN: CachePolicyObject = { system: true, messages: { tail: 1 } }
 const openRouterPolicy = (modelID: string): CachePolicyObject => {
  // `~anthropic/claude-sonnet-latest` style IDs are OpenRouter aliases for the latest model in a family.
  const id = modelID.replace(/^~/, "")
  if (id.startsWith("anthropic/")) return AUTO
-  if (id.startsWith("qwen/")) return QWEN
+  if (id.startsWith("qwen/")) return { system: true, messages: { tail: 1 } }
  return NONE
 }

@@ -174,11 +171,7 @@ export const applyCachePolicy = (request: LLMRequest): LLMRequest => {
  const policy =
    request.model.route.id === "openrouter" && (request.cache === undefined || request.cache === "auto")
      ? openRouterPolicy(request.model.id)
-      : request.model.route.id === "alibaba-chat" && (request.cache === undefined || request.cache === "auto")
-        ? request.model.id.toLowerCase().startsWith("qwen")
-          ? QWEN
-          : NONE
-        : resolve(request.cache)
+      : resolve(request.cache)
  if (!policy.tools && !policy.system && !policy.messages) return request

  const hint = makeHint(policy.ttlSeconds)
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import { Headers, HttpClientRequest } from "effect/unstable/http"
+import { Headers, HttpClientRequest } from "effect/http"
 import {
  ChoiceQuestion,
  EvaluationInput,
@@ -1,4 +1,5 @@
 import { Effect, Schema, Stream } from "effect"
+import { extendSchema } from "@opencode/schema/schema"
 import { Generation, ProgressEvent, QueuedEvent, type AwaitOptions } from "./generation.js"
 import { Media } from "./media.js"
 import { MediaModel, composeRoute, tryRequest } from "./media-model.js"
@@ -142,7 +143,7 @@ const imageEventTagged = Schema.Union([
  ImageOutputEvent,
  ImageFinishEvent,
 ]).pipe(Schema.toTaggedUnion("type"))
-export const ImageEvent = Object.assign(imageEventTagged, {
+export const ImageEvent = extendSchema(imageEventTagged, {
  is: {
    generationQueued: imageEventTagged.guards["generation-queued"],
    generationProgress: imageEventTagged.guards["generation-progress"],
@@ -1,7 +1,8 @@
 export * as Media from "./media.js"

-import { Effect, Encoding, FileSystem, Schema, SchemaGetter } from "effect"
-import { HttpClientRequest } from "effect/unstable/http"
+import { Effect, FileSystem, Schema, SchemaGetter } from "effect"
+import { Base64 } from "effect/encoding"
+import { HttpClientRequest } from "effect/http"
 import { ProviderID } from "./schema/ids.js"
 import { AIError, HttpContext, InvalidProviderOutputError, InvalidRequestError } from "./schema/errors.js"
 import { ProviderMetadata } from "./schema/options.js"
@@ -140,7 +141,7 @@ export class Asset {
  inline(): Inline | undefined {
    const source = this.source
    if (source.type !== "bytes" && source.type !== "base64") return undefined
-    const base64 = source.type === "base64" ? source.data : (this.#base64 ??= Encoding.encodeBase64(source.data))
+    const base64 = source.type === "base64" ? source.data : (this.#base64 ??= Base64.encode(source.data))
    const mime = this.mediaType.toLowerCase()
    return { mime, base64, dataUrl: `data:${mime};base64,${base64}` }
  }
@@ -155,7 +156,7 @@ export class Asset {
        return Effect.fail(invalid(`Cannot materialize provider ref ${source.provider}:${source.id}`))
      const decoded =
        source.type === "base64"
-          ? Effect.fromResult(Encoding.decodeBase64(source.data)).pipe(
+          ? Effect.fromResult(Base64.decode(source.data)).pipe(
              Effect.mapError((cause) => invalid(`Media asset contains invalid base64 data`, cause)),
            )
          : download(source, this.headers)
@@ -168,7 +169,7 @@ export class Asset {
      const source = this.source
      if (source.type === "base64") return Effect.succeed(source.data)
      if (this.#base64 !== undefined) return Effect.succeed(this.#base64)
-      return this.bytes().pipe(Effect.map((data) => (this.#base64 = Encoding.encodeBase64(data))))
+      return this.bytes().pipe(Effect.map((data) => (this.#base64 = Base64.encode(data))))
    })
  }

@@ -183,7 +184,7 @@ export class Asset {
  toJSON() {
    const source = this.source
    return {
-      source: source.type === "bytes" ? { ...source, data: Encoding.encodeBase64(source.data) } : source,
+      source: source.type === "bytes" ? { ...source, data: Base64.encode(source.data) } : source,
      info: this.info,
      providerMetadata: this.providerMetadata,
    }
@@ -3,7 +3,6 @@ import { Protocol } from "../route/protocol.js"
 import type { LanguageModelCompatibility } from "../schema/index.js"
 import { OpenAIChat } from "./openai-chat.js"
 import { JsonObject, ProviderShared } from "./shared.js"
-import { cacheControl } from "./utils/cache.js"
 import { OpenResponsesOptions } from "./utils/open-responses-options.js"

 export type ReasoningEffort = OpenResponsesOptions.ReasoningEffort
@@ -69,7 +68,7 @@ export const protocol = Protocol.make({
    from: Effect.fn("AlibabaChat.fromRequest")(function* (req) {
      const opts = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Options))(req.providerOptions ?? {})
      return {
-        ...(yield* OpenAIChat.fromRequest(req, { cacheControl: cacheControl() })),
+        ...(yield* OpenAIChat.protocol.body.from(req)),
        enable_thinking: opts.enableThinking,
        // Alibaba also rejects an explicit budget that is not below `max_completion_tokens`.
        thinking_budget:
@@ -1,7 +1,7 @@
 import { Effect, Schema } from "effect"
 import { Protocol } from "../route/protocol.js"
 import { OpenResponses } from "./open-responses.js"
-import { JsonObject, ProviderShared } from "./shared.js"
+import { JsonObject, optionalArray, ProviderShared } from "./shared.js"
 import { OpenResponsesOptions } from "./utils/open-responses-options.js"
 import { ResponsesHostedTools } from "./utils/responses-hosted-tools.js"

@@ -25,6 +25,8 @@ const WebExtractorItem = Schema.StructWithRest(
 )
 const Body = Schema.Struct({
  ...OpenResponses.coreFields,
+  input: Schema.Array(Schema.Union([OpenResponses.InputItem, WebExtractorItem])),
+  tools: optionalArray(Schema.Union([OpenResponses.Tool, NativeTool])),
  enable_thinking: Options.fields.enableThinking,
  previous_response_id: Options.fields.previousResponseId,
  conversation: Options.fields.conversation,
@@ -50,7 +52,7 @@ export const protocol = Protocol.make({
      const opts = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Options))(req.providerOptions ?? {})
      const body = yield* OpenResponses.fromRequestWithAdapter(req, adapter)
      const choice = body.tool_choice
-      return {
+      return yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Body))({
        ...body,
        enable_thinking: opts.enableThinking,
        previous_response_id: opts.previousResponseId,
@@ -60,7 +62,7 @@ export const protocol = Protocol.make({
          typeof choice === "object" && choice.type === "function"
            ? { type: "allowed_tools" as const, mode: "required" as const, tools: [choice] }
            : choice,
-      }
+      })
    }),
  },
  stream: {
@@ -6,7 +6,7 @@ import { Auth } from "../route/auth.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Framing } from "../route/framing.js"
 import { Protocol } from "../route/protocol.js"
-import { Headers } from "effect/unstable/http"
+import { Headers } from "effect/http"
 import { HttpTransport } from "../route/transport/index.js"
 import {
  AIError,
@@ -584,7 +584,10 @@ const serverToolResultType = (name: string): AnthropicServerToolResultType | und
  return undefined
 }

-const lowerServerToolResult = Effect.fnUntraced(function* (part: ToolResultPart, providerMetadataKey: string) {
+const lowerServerToolResult = Effect.fn("AnthropicMessages.lowerServerToolResult")(function* (
+  part: ToolResultPart,
+  providerMetadataKey: string,
+) {
  const wireType = serverToolResultType(part.name)
  if (!wireType)
    return yield* invalid(`Anthropic Messages does not know how to round-trip server tool result for ${part.name}`)
@@ -654,7 +657,10 @@ const citationsFromMetadata = (metadata: MediaPart["metadata"]): AnthropicDocume

 const isHttpUrl = (value: string) => /^https?:\/\//i.test(value.trim())

-const lowerMedia = Effect.fnUntraced(function* (part: MediaPart, breakpoints?: Cache.Breakpoints) {
+const lowerMedia = Effect.fn("AnthropicMessages.lowerMedia")(function* (
+  part: MediaPart,
+  breakpoints?: Cache.Breakpoints,
+) {
  const mime = part.media.mediaType.toLowerCase()
  const cacheControlValue = breakpoints ? cacheControl(breakpoints, part.cache) : undefined
  const fileId = fileIdFromMetadata(part.metadata)
@@ -798,6 +804,9 @@ const requireThinkingSignature = (request: LLMRequest) => {
  return true
 }

+// Mid-conversation system messages became available with Opus 4.8 and version
+// 5 of the other supported Claude families. Treat later family versions as
+// compatible without assuming that every Anthropic Messages model is Claude.
 // Opus 4.8 and every Claude 5 model accept mid-conversation system messages; later versions inherit support.
 const supportsNativeSystemUpdates = (request: LLMRequest) => {
  const version = claudeVersion(String(request.model.id))
@@ -806,9 +815,25 @@ const supportsNativeSystemUpdates = (request: LLMRequest) => {
  return version.major >= 5
 }

-// Native system messages must follow a user turn (tool results count) or a paused server-tool turn.
-const acceptsNativeSystemAfter = (message: AnthropicMessage | undefined) =>
-  message?.role === "user" || (message?.role === "assistant" && message.content.at(-1)?.type === "server_tool_use")
+const endsInServerToolUse = (message: LLMRequest["messages"][number]) => {
+  const last = message.content.at(-1)
+  return message.role === "assistant" && last?.type === "tool-call" && last.providerExecuted === true
+}
+
+const canUseNativeSystemUpdate = (request: LLMRequest, index: number) => {
+  const previous = request.messages[index - 1]
+  const next = request.messages[index + 1]
+  // Vertex currently rejects/404s for a system message after local tool results,
+  // so fold it into the user tool-result turn across continuations and history.
+  if (request.model.route.id === "google-vertex-messages" && previous?.role === "tool") return false
+  return (
+    previous !== undefined &&
+    previous.role !== "system" &&
+    (previous.role === "user" || previous.role === "tool" || endsInServerToolUse(previous)) &&
+    next?.role !== "system" &&
+    (next === undefined || next.role === "assistant")
+  )
+}

 const splitsLocalToolResults = (messages: LLMRequest["messages"], index: number) => {
  const pending = new Set<string>()
@@ -822,7 +847,7 @@ const splitsLocalToolResults = (messages: LLMRequest["messages"], index: number)
  return pending.size > 0
 }

-const lowerNativeSystemUpdate = Effect.fnUntraced(function* (
+const lowerNativeSystemUpdate = Effect.fn("AnthropicMessages.lowerNativeSystemUpdate")(function* (
  message: LLMRequest["messages"][number],
  breakpoints: Cache.Breakpoints,
 ) {
@@ -837,34 +862,12 @@ const lowerNativeSystemUpdate = Effect.fnUntraced(function* (
  }
 })

-const lowerWrappedSystemUpdate = Effect.fnUntraced(function* (
-  message: LLMRequest["messages"][number],
+const lowerMessages = Effect.fn("AnthropicMessages.lowerMessages")(function* (
+  request: LLMRequest,
  breakpoints: Cache.Breakpoints,
 ) {
-  const part = yield* ProviderShared.wrappedSystemUpdate("Anthropic Messages", message)
-  return { type: "text" as const, text: part.text, cache_control: cacheControl(breakpoints, part.cache) }
-})
-
-const appendToUserTurn = (messages: AnthropicMessage[], block: AnthropicUserBlock) => {
-  const last = messages.at(-1)
-  if (last?.role === "user") messages[messages.length - 1] = { role: "user", content: [...last.content, block] }
-  else messages.push({ role: "user", content: [block] })
-}
-
-const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoints: Cache.Breakpoints) {
  const messages: AnthropicMessage[] = []
  const providerMetadataKey = request.model.route.providerMetadataKey ?? String(request.model.provider)
-  // Text updates stay where they are unless a user turn follows them; then they move after the latest
-  // user turn, the nearest spot where Anthropic accepts a native system message.
-  const holdUpdates = supportsNativeSystemUpdates(request)
-  const held: Array<LLMRequest["messages"][number]> = []
-  const releaseHeld = Effect.fnUntraced(function* () {
-    const native = acceptsNativeSystemAfter(messages.findLast((message) => message.role !== "system"))
-    for (const update of held.splice(0)) {
-      if (native) messages.push(yield* lowerNativeSystemUpdate(update, breakpoints))
-      else appendToUserTurn(messages, yield* lowerWrappedSystemUpdate(update, breakpoints))
-    }
-  })

  for (const [index, message] of request.messages.entries()) {
    if (message.role === "system") {
@@ -876,8 +879,16 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi
      }
      if (splitsLocalToolResults(request.messages, index))
        return yield* invalid("Anthropic Messages system updates cannot split a local tool call from its tool result")
-      if (holdUpdates) held.push(message)
-      else appendToUserTurn(messages, yield* lowerWrappedSystemUpdate(message, breakpoints))
+      if (supportsNativeSystemUpdates(request) && canUseNativeSystemUpdate(request, index)) {
+        messages.push(yield* lowerNativeSystemUpdate(message, breakpoints))
+        continue
+      }
+      const part = yield* ProviderShared.wrappedSystemUpdate("Anthropic Messages", message)
+      const block = { type: "text" as const, text: part.text, cache_control: cacheControl(breakpoints, part.cache) }
+      const previous = messages.at(-1)
+      if (previous?.role === "user")
+        messages[messages.length - 1] = { role: "user", content: [...previous.content, block] }
+      else messages.push({ role: "user", content: [block] })
      continue
    }

@@ -953,9 +964,7 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi
          `Anthropic Messages assistant messages only support text, reasoning, and tool-call content for now`,
        )
      }
-      if (content.length === 0) continue
-      yield* releaseHeld()
-      messages.push({ role: "assistant", content })
+      if (content.length > 0) messages.push({ role: "assistant", content })
      continue
    }

@@ -976,14 +985,10 @@ const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, breakpoi
      messages[messages.length - 1] = { role: "user", content: [...previous.content, ...content] }
    else messages.push({ role: "user", content })
  }
-  yield* releaseHeld()

  return messages
 })

-// TODO: Move per-model capability heuristics (`supportsEffortUpdates`, `supportsNativeSystemUpdates`,
-// `supportsThinkingBlockBinding`) into explicit model/provider `compatibility` metadata so the protocol
-// only reads `request.model.compatibility`.
 // Per-turn effort started with Claude Opus 5 and every Claude 5.1 model; later versions of any family inherit it.
 const supportsEffortUpdates = (model: LLMRequest["model"]) => {
  const override = model.compatibility?.supportsEffortUpdates
@@ -1295,7 +1300,7 @@ const onContentBlockStart = (
  return [{ ...state, lifecycle: Lifecycle.stepStart(state.lifecycle, events) }, [...events, result]]
 }

-const onContentBlockDelta = Effect.fnUntraced(function* (
+const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(function* (
  state: ParserState,
  event: AnthropicEvent & { readonly delta: AnthropicStreamDelta },
 ) {
@@ -1363,7 +1368,7 @@ const onContentBlockDelta = Effect.fnUntraced(function* (
  return [state, NO_EVENTS] satisfies StepResult
 })

-const onContentBlockStop = Effect.fnUntraced(function* (
+const onContentBlockStop = Effect.fn("AnthropicMessages.onContentBlockStop")(function* (
  state: ParserState,
  event: AnthropicEvent,
 ) {
@@ -1434,7 +1439,7 @@ const onMessageDelta = (
  ]
 }

-const onMessageStop = Effect.fnUntraced(function* (state: ParserState) {
+const onMessageStop = Effect.fn("AnthropicMessages.onMessageStop")(function* (state: ParserState) {
  if (Object.keys(state.compactions).length)
    return yield* ProviderShared.eventError(ADAPTER, "Response ended with an incomplete compaction block")
  const result = yield* ToolStream.finishAll(ADAPTER, state.tools)
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import type { Status } from "../generation.js"
 import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
@@ -1,4 +1,5 @@
-import { Effect, Encoding, Schema } from "effect"
+import { Effect, Schema } from "effect"
+import { Base64 } from "effect/encoding"
 import { Route } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Protocol } from "../route/protocol.js"
@@ -285,7 +286,7 @@ const lowerToolCall = (part: ToolCallPart, normalizeID: (id: string) => string):
  },
 })

-const lowerToolResultContent = Effect.fnUntraced(function* (
+const lowerToolResultContent = Effect.fn("BedrockConverse.lowerToolResultContent")(function* (
  part: ToolResultPart,
  documentNames: Set<string>,
 ) {
@@ -305,7 +306,7 @@ const lowerToolResultContent = Effect.fnUntraced(function* (
  return content
 })

-const lowerToolResult = Effect.fnUntraced(function* (
+const lowerToolResult = Effect.fn("BedrockConverse.lowerToolResult")(function* (
  part: ToolResultPart,
  documentNames: Set<string>,
  normalizeID: (id: string) => string,
@@ -322,7 +323,7 @@ const lowerToolResult = Effect.fnUntraced(function* (
 // Keep Claude and Nova tool-result images inline; put other models' images beside the result.
 const keepToolImagesInline = (id: string) => id.includes("anthropic.claude-") || id.includes("amazon.nova-")

-const lowerMessages = Effect.fnUntraced(function* (
+const lowerMessages = Effect.fn("BedrockConverse.lowerMessages")(function* (
  request: LLMRequest,
  breakpoints: BedrockCache.Breakpoints,
 ) {
@@ -610,7 +611,7 @@ interface ParserState {
  readonly reasoningRedactedContent: Readonly<Record<number, Uint8Array[]>>
 }

-const encodeRedactedContent = (chunks: ReadonlyArray<Uint8Array>) => Encoding.encodeBase64(concatBytes(chunks))
+const encodeRedactedContent = (chunks: ReadonlyArray<Uint8Array>) => Base64.encode(concatBytes(chunks))

 const step = (state: ParserState, event: BedrockEvent) =>
  Effect.gen(function* () {
@@ -659,7 +660,7 @@ const step = (state: ParserState, event: BedrockEvent) =>
      const events: LLMEvent[] = []
      const redactedChunk = yield* (() => {
        if (reasoning.redactedContent === undefined) return Effect.succeed(undefined)
-        return Effect.fromResult(Encoding.decodeBase64(reasoning.redactedContent)).pipe(
+        return Effect.fromResult(Base64.decode(reasoning.redactedContent)).pipe(
          Effect.mapError((cause) =>
            ProviderShared.eventError(
              ADAPTER,
@@ -1,6 +1,7 @@
 import { EventStreamCodec } from "@smithy/eventstream-codec"
 import { fromUtf8, toUtf8 } from "@smithy/util-utf8"
-import { Effect, Encoding, Stream } from "effect"
+import { Effect, Stream } from "effect"
+import { Base64 } from "effect/encoding"
 import { AIError, AIErrorReason, InvalidProviderOutputError } from "../schema/index.js"
 import { Framing } from "../route/framing.js"
 import { ProviderShared } from "./shared.js"
@@ -47,7 +48,7 @@ const consumeFrames = (route: string) => (state: FrameBufferState, input: FrameI
            route,
            classification: "incomplete-stream",
            message: `Incomplete Bedrock Converse event-stream frame: ${remaining.length} buffered bytes remain at end of stream`,
-            body: Encoding.encodeBase64(remaining),
+            body: Base64.encode(remaining),
          }),
        })
      return [state, []] as const
@@ -68,7 +69,7 @@ const consumeFrames = (route: string) => (state: FrameBufferState, input: FrameI
            `Failed to decode Bedrock Converse event-stream frame: ${
              error instanceof Error ? error.message : String(error)
            }`,
-            Encoding.encodeBase64(view.subarray(0, totalLength)),
+            Base64.encode(view.subarray(0, totalLength)),
            error,
          ),
      })
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import type { Status } from "../generation.js"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
 import { Media } from "../media.js"
@@ -75,7 +75,7 @@ const usesSse = (request: MediaProtocol.Addressed<Request>) => request.mode ===

 const CONTAINERS: Readonly<Record<string, "raw" | "wav" | "mp3">> = { pcm: "raw", wav: "wav", mp3: "mp3" }

-const outputFormat = Effect.fnUntraced(function* (request: MediaProtocol.Addressed<Request>) {
+const outputFormat = Effect.fn("CartesiaSpeech.outputFormat")(function* (request: MediaProtocol.Addressed<Request>) {
  const sse = usesSse(request)
  const format = request.format ?? (sse ? "pcm" : "mp3")
  const container = CONTAINERS[format]
@@ -121,7 +121,7 @@ const fromRequest = Effect.fn("CartesiaSpeech.fromRequest")(function* (request:
 // 6. Stream parsing
 // ---------------------------------------------------------------------------

-const onEvent = Effect.fnUntraced(function* (state: State, frame: string) {
+const onEvent = Effect.fn("CartesiaSpeech.onEvent")(function* (state: State, frame: string) {
  const event = yield* decodeEvent(frame)
  if (event.type === "chunk" && event.data !== undefined) return SpeechStream.delta(state, event.data)
  if (event.type === "timestamps" && event.word_timestamps !== undefined) {
@@ -140,7 +140,7 @@ const onEvent = Effect.fnUntraced(function* (state: State, frame: string) {
  return [state, []] as const
 })

-const finish = Effect.fnUntraced(function* (
+const finish = Effect.fn("CartesiaSpeech.finish")(function* (
  state: State,
  context: MediaProtocol.ResponseContext<Request>,
 ) {
@@ -1,334 +0,0 @@
-import { Effect, Schema } from "effect"
-import { Route } from "../route/client.js"
-import { Endpoint } from "../route/endpoint.js"
-import { Framing } from "../route/framing.js"
-import { Protocol } from "../route/protocol.js"
-import { LLMEvent, Usage, type FinishReasonDetails, type LLMRequest } from "../schema/index.js"
-import { ProviderShared } from "./shared.js"
-import { Lifecycle } from "./utils/lifecycle.js"
-import { ToolStream } from "./utils/tool-stream.js"
-
-const ADAPTER = "cohere-chat"
-export const DEFAULT_BASE_URL = "https://api.cohere.com/v2"
-
-const Options = Schema.Struct({
-  thinking: Schema.optional(
-    Schema.Struct({
-      type: Schema.optional(Schema.Literals(["enabled", "disabled"])),
-      tokenBudget: Schema.optional(Schema.Int.check(Schema.isGreaterThan(0))),
-    }),
-  ),
-})
-export type ProviderOptionsInput = Schema.Schema.Type<typeof Options>
-
-const Content = Schema.Union([
-  Schema.Struct({ type: Schema.Literal("text"), text: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("thinking"), thinking: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("image_url"), image_url: Schema.Struct({ url: Schema.String }) }),
-])
-const ToolCall = Schema.Struct({
-  id: Schema.String,
-  type: Schema.Literal("function"),
-  function: Schema.Struct({ name: Schema.String, arguments: Schema.String }),
-})
-const Message = Schema.Struct({
-  role: Schema.Literals(["system", "user", "assistant", "tool"]),
-  content: Schema.optional(Schema.Union([Schema.String, Schema.Array(Content)])),
-  tool_calls: Schema.optional(Schema.Array(ToolCall)),
-  tool_call_id: Schema.optional(Schema.String),
-  tool_plan: Schema.optional(Schema.String),
-})
-const Body = Schema.Struct({
-  model: Schema.String,
-  messages: Schema.Array(Message),
-  stream: Schema.Literal(true),
-  tools: Schema.optional(
-    Schema.Array(
-      Schema.Struct({
-        type: Schema.Literal("function"),
-        function: Schema.Struct({
-          name: Schema.String,
-          description: Schema.optional(Schema.String),
-          parameters: Schema.Unknown,
-        }),
-      }),
-    ),
-  ),
-  tool_choice: Schema.optional(Schema.Literals(["NONE", "REQUIRED"])),
-  thinking: Schema.optional(Schema.Struct({ type: Schema.String, token_budget: Schema.optional(Schema.Number) })),
-  max_tokens: Schema.optional(Schema.Number),
-  temperature: Schema.optional(Schema.Number),
-  p: Schema.optional(Schema.Number),
-  k: Schema.optional(Schema.Number),
-  seed: Schema.optional(Schema.Number),
-  stop_sequences: Schema.optional(Schema.Array(Schema.String)),
-  frequency_penalty: Schema.optional(Schema.Number),
-  presence_penalty: Schema.optional(Schema.Number),
-})
-const TokenCounts = Schema.Struct({
-  input_tokens: Schema.optional(Schema.Number),
-  output_tokens: Schema.optional(Schema.Number),
-  reasoning_tokens: Schema.optional(Schema.Number),
-})
-const NativeUsage = Schema.Struct({
-  tokens: Schema.optional(TokenCounts),
-  billed_units: Schema.optional(TokenCounts),
-  cached_tokens: Schema.optional(Schema.Number),
-})
-const Event = Schema.Union([
-  Schema.Struct({ type: Schema.Literal("message-start") }),
-  Schema.Struct({
-    type: Schema.Literals(["content-start", "content-delta"]),
-    index: Schema.Number,
-    delta: Schema.Struct({
-      message: Schema.Struct({
-        content: Schema.Struct({ text: Schema.optional(Schema.String), thinking: Schema.optional(Schema.String) }),
-      }),
-    }),
-  }),
-  Schema.Struct({ type: Schema.Literal("content-end"), index: Schema.Number }),
-  Schema.Struct({
-    type: Schema.Literal("tool-plan-delta"),
-    delta: Schema.Struct({ message: Schema.Struct({ tool_plan: Schema.String }) }),
-  }),
-  Schema.Struct({
-    type: Schema.Literals(["tool-call-start", "tool-call-delta"]),
-    index: Schema.Number,
-    delta: Schema.Struct({
-      message: Schema.Struct({
-        tool_calls: Schema.Struct({
-          id: Schema.optional(Schema.String),
-          function: Schema.Struct({ name: Schema.optional(Schema.String), arguments: Schema.optional(Schema.String) }),
-        }),
-      }),
-    }),
-  }),
-  Schema.Struct({ type: Schema.Literal("tool-call-end"), index: Schema.Number }),
-  Schema.Struct({
-    type: Schema.Literal("message-end"),
-    delta: Schema.Struct({ finish_reason: Schema.String, usage: Schema.optional(NativeUsage) }),
-  }),
-  // Citation output is outside this basic chat surface.
-  Schema.Struct({ type: Schema.Literals(["citation-start", "citation-end"]) }),
-])
-type Event = typeof Event.Type
-type State = {
-  readonly lifecycle: Lifecycle.State
-  readonly tools: ToolStream.State<number>
-  readonly finished: boolean
-}
-
-const TOOL_CHOICE = { auto: undefined, none: "NONE", required: "REQUIRED", tool: "REQUIRED" } as const
-
-const fromRequest = Effect.fn("CohereChat.fromRequest")(function* (request: LLMRequest) {
-  const options = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Options))(request.providerOptions ?? {})
-  const flattened = ProviderShared.flattenToolRequest(request)
-  const messages: (typeof Message.Type)[] = request.system.length
-    ? [
-        {
-          role: "system",
-          content:
-            request.system.length === 1
-              ? request.system[0].text
-              : request.system.map((part) => ({ type: "text", text: part.text })),
-        },
-      ]
-    : []
-  for (const message of flattened.request.messages) {
-    if (message.role === "system") {
-      messages.push({ role: "user", content: (yield* ProviderShared.wrappedSystemUpdate("Cohere Chat", message)).text })
-      continue
-    }
-    if (message.role === "tool") {
-      for (const part of message.content) {
-        if (part.type !== "tool-result")
-          return yield* ProviderShared.unsupportedContent("Cohere Chat", "tool", ["tool-result"])
-        if (part.result.type === "content" && part.result.value.some((item) => item.type === "file"))
-          return yield* ProviderShared.invalidRequest("Cohere Chat does not support file content in tool results")
-        messages.push({ role: "tool", tool_call_id: part.id, content: ProviderShared.toolResultText(part) })
-      }
-      continue
-    }
-    const content: (typeof Content.Type)[] = []
-    const calls: (typeof ToolCall.Type)[] = []
-    const plans: string[] = []
-    for (const part of message.content) {
-      if (part.type === "text") {
-        content.push({ type: "text", text: part.text })
-        continue
-      }
-      if (message.role === "assistant" && part.type === "reasoning") {
-        if (part.providerMetadata?.cohere?.toolPlan === true) plans.push(part.text)
-        else content.push({ type: "thinking", thinking: part.text })
-        continue
-      }
-      if (message.role === "assistant" && part.type === "tool-call") {
-        const args = ProviderShared.encodeJson(part.input)
-        calls.push({ id: part.id, type: "function", function: { name: part.name, arguments: args } })
-        continue
-      }
-      if (message.role === "user" && part.type === "media" && part.media.mediaType.startsWith("image/")) {
-        const url =
-          ProviderShared.mediaUrl(part.media) ??
-          (yield* ProviderShared.requireInlineMedia("Cohere Chat", part.media)).dataUrl
-        content.push({ type: "image_url", image_url: { url } })
-        continue
-      }
-      return yield* ProviderShared.unsupportedContent(
-        "Cohere Chat",
-        message.role,
-        message.role === "user" ? ["text", "media"] : ["text", "reasoning", "tool-call"],
-      )
-    }
-    messages.push({
-      role: message.role,
-      content: content.length ? content : undefined,
-      tool_calls: calls.length ? calls : undefined,
-      tool_plan: plans.length ? plans.join("") : undefined,
-    })
-  }
-  const selected = request.toolChoice?.type === "tool" ? request.toolChoice.name : undefined
-  const tools = selected === undefined ? flattened.tools : flattened.tools.filter((tool) => tool.name === selected)
-  if (selected !== undefined && tools.length === 0)
-    return yield* ProviderShared.invalidRequest("Cohere Chat tool choice must name an available tool")
-  if (tools.some((tool) => tool.native !== undefined))
-    return yield* ProviderShared.invalidRequest("Cohere Chat does not support provider-defined tools")
-  return {
-    model: request.model.id,
-    messages,
-    stream: true as const,
-    tools: tools.length
-      ? tools.map((tool) => ({
-          type: "function" as const,
-          function: { name: tool.name, description: tool.description, parameters: tool.inputSchema },
-        }))
-      : undefined,
-    tool_choice: TOOL_CHOICE[request.toolChoice?.type ?? "auto"],
-    thinking: options.thinking && {
-      type: options.thinking.type ?? "enabled",
-      // Cohere rejects budgets above max_tokens; fitting also leaves room for the answer.
-      token_budget:
-        options.thinking.tokenBudget === undefined
-          ? undefined
-          : ProviderShared.fitThinkingBudget(options.thinking.tokenBudget, request.generation?.maxTokens),
-    },
-    max_tokens: request.generation?.maxTokens,
-    temperature: request.generation?.temperature,
-    p: request.generation?.topP,
-    k: request.generation?.topK,
-    seed: request.generation?.seed,
-    stop_sequences: request.generation?.stop,
-    frequency_penalty: request.generation?.frequencyPenalty,
-    presence_penalty: request.generation?.presencePenalty,
-  }
-})
-
-const finishReason = (raw: string): FinishReasonDetails => {
-  switch (raw) {
-    case "COMPLETE":
-    case "STOP_SEQUENCE":
-      return { normalized: "stop", raw }
-    case "MAX_TOKENS":
-      return { normalized: "length", raw }
-    case "TOOL_CALL":
-      return { normalized: "tool-calls", raw }
-    case "ERROR":
-    case "TIMEOUT":
-      return { normalized: "error", raw }
-    default:
-      return { normalized: "unknown", raw }
-  }
-}
-
-const mapUsage = (usage: typeof NativeUsage.Type) =>
-  new Usage({
-    inputTokens: usage.tokens?.input_tokens,
-    outputTokens: usage.tokens?.output_tokens,
-    nonCachedInputTokens: ProviderShared.subtractTokens(usage.tokens?.input_tokens, usage.cached_tokens),
-    cacheReadInputTokens: usage.cached_tokens,
-    reasoningTokens: usage.tokens?.reasoning_tokens,
-    totalTokens: ProviderShared.totalTokens(usage.tokens?.input_tokens, usage.tokens?.output_tokens, undefined),
-    providerMetadata: { cohere: usage },
-  })
-
-// Lifecycle deltas open blocks on demand and ends are no-ops for closed blocks, so content-start needs no handling.
-const step = Effect.fnUntraced(function* (state: State, event: Event) {
-  const events: LLMEvent[] = []
-  switch (event.type) {
-    case "message-start":
-      return [{ ...state, lifecycle: Lifecycle.stepStart(state.lifecycle, events) }, events] as const
-    case "content-delta": {
-      const id = String(event.index)
-      const content = event.delta.message.content
-      const lifecycle =
-        content.thinking !== undefined
-          ? Lifecycle.reasoningDelta(state.lifecycle, events, id, content.thinking)
-          : Lifecycle.textDelta(state.lifecycle, events, id, content.text ?? "")
-      return [{ ...state, lifecycle }, events] as const
-    }
-    case "content-end": {
-      const id = String(event.index)
-      const lifecycle = Lifecycle.textEnd(Lifecycle.reasoningEnd(state.lifecycle, events, id), events, id)
-      return [{ ...state, lifecycle }, events] as const
-    }
-    case "tool-plan-delta": {
-      const plan = event.delta.message.tool_plan
-      const lifecycle = Lifecycle.reasoningDelta(state.lifecycle, events, "tool-plan", plan, {
-        cohere: { toolPlan: true },
-      })
-      return [{ ...state, lifecycle }, events] as const
-    }
-    case "tool-call-start":
-    case "tool-call-delta": {
-      const call = event.delta.message.tool_calls
-      const result = ToolStream.appendOrStart(
-        ADAPTER,
-        state.tools,
-        event.index,
-        { id: call.id, name: call.function.name, text: call.function.arguments ?? "" },
-        "Cohere tool call is missing id or name",
-      )
-      if (ToolStream.isError(result)) return yield* result
-      return [{ ...state, tools: result.tools }, result.events] as const
-    }
-    case "tool-call-end": {
-      const result = yield* ToolStream.finish(ADAPTER, state.tools, event.index)
-      return [{ ...state, tools: result.tools }, result.events ?? []] as const
-    }
-    case "message-end": {
-      const pending = yield* ToolStream.finishAll(ADAPTER, state.tools)
-      events.push(...pending.events)
-      const lifecycle = Lifecycle.finish(state.lifecycle, events, {
-        reason: finishReason(event.delta.finish_reason),
-        usage: event.delta.usage && mapUsage(event.delta.usage),
-      })
-      return [{ tools: pending.tools, lifecycle, finished: true }, events] as const
-    }
-    default:
-      return [state, events] as const
-  }
-})
-
-export const protocol = Protocol.make({
-  id: ADAPTER,
-  body: { schema: Body, from: fromRequest },
-  stream: {
-    event: Protocol.jsonEvent(Event),
-    initial: (): State => ({ lifecycle: Lifecycle.initial(), tools: ToolStream.empty(), finished: false }),
-    step,
-    terminal: (event) => event.type === "message-end",
-    onHalt: (state) =>
-      state.finished
-        ? Effect.succeed([])
-        : Effect.fail(ProviderShared.eventError(ADAPTER, "Cohere stream ended without message-end")),
-  },
-})
-export const route = Route.make({
-  id: ADAPTER,
-  provider: "cohere",
-  providerMetadataKey: "cohere",
-  protocol,
-  endpoint: Endpoint.path("/chat", { baseURL: DEFAULT_BASE_URL }),
-  framing: Framing.sse,
-})
-export * as CohereChat from "./cohere-chat.js"
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
 import { mergeJsonRecords, type OpenString } from "../schema/index.js"
@@ -95,7 +95,7 @@ const OUTPUT_FORMATS: Readonly<Record<string, string>> = {
 }

 /** WAV is served only by the non-streaming endpoints. */
-const outputFormat = Effect.fnUntraced(function* (request: MediaProtocol.Addressed<Request>) {
+const outputFormat = Effect.fn("ElevenLabsSpeech.outputFormat")(function* (request: MediaProtocol.Addressed<Request>) {
  const format = request.providerOptions?.outputFormat ?? OUTPUT_FORMATS[request.format ?? "mp3"]
  if (format === undefined)
    return yield* route.unsupported(
@@ -138,7 +138,7 @@ const path = (request: MediaProtocol.Addressed<Request>) =>
 // 6. Stream parsing
 // ---------------------------------------------------------------------------

-const onRecord = Effect.fnUntraced(function* (state: State, frame: string) {
+const onRecord = Effect.fn("ElevenLabsSpeech.onRecord")(function* (state: State, frame: string) {
  const record = yield* decodeRecord(frame)
  const [next, events] = SpeechStream.delta(state, record.audio_base64)
  const alignment = record.alignment
@@ -169,7 +169,7 @@ const describeOutput = (format: string) => {
  return encoding === undefined ? SpeechStream.container(codec, sampleRate) : SpeechStream.pcm(encoding, sampleRate)
 }

-const finish = Effect.fnUntraced(function* (
+const finish = Effect.fn("ElevenLabsSpeech.finish")(function* (
  state: State,
  context: MediaProtocol.ResponseContext<Request>,
 ) {
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
 import { mergeJsonRecords, type OpenString } from "../schema/index.js"
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
 import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
@@ -283,7 +283,7 @@ const lowerToolConfig = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
    tool: (name) => ({ functionCallingConfig: { mode: "ANY" as const, allowedFunctionNames: [name] } }),
  })

-const lowerContentPart = Effect.fnUntraced(function* (part: TextPart | MediaPart) {
+const lowerContentPart = Effect.fn("Gemini.lowerContentPart")(function* (part: TextPart | MediaPart) {
  if (part.type === "text") return { text: part.text }
  return yield* GeminiGenerateContent.mediaPart("Gemini", part.media)
 })
@@ -302,7 +302,7 @@ const lowerToolCall = (part: ToolCallPart, omitIds: boolean, metadataKey: string
  thoughtSignature: thoughtSignature(part.providerMetadata, metadataKey),
 })

-const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) {
+const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request: LLMRequest) {
  const contents: GeminiContent[] = []
  const metadataKey = request.model.route.providerMetadataKey ?? String(request.model.provider)
  const omitCallIds = omitsFunctionCallIds(request.model.id)
@@ -475,7 +475,7 @@ const fromRequest = Effect.fn("Gemini.fromRequest")(function* (request: LLMReque
    safetySettings: options.safetySettings,
    serviceTier: options.serviceTier,
    systemInstruction:
-      request.system.length === 0 ? undefined : { parts: request.system.map((part) => ({ text: part.text })) },
+      request.system.length === 0 ? undefined : { parts: [{ text: ProviderShared.joinText(request.system) }] },
    tools: hasTools
      ? [
          {
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
@@ -1,561 +0,0 @@
-import { Effect, Schema } from "effect"
-import { Route } from "../route/client.js"
-import { Auth } from "../route/auth.js"
-import { Endpoint } from "../route/endpoint.js"
-import { Framing } from "../route/framing.js"
-import { Protocol } from "../route/protocol.js"
-import {
-  AIError,
-  LLMEvent,
-  ProviderID,
-  Usage,
-  type LLMRequest,
-  type ProviderMetadata,
-  type ToolResultPart,
-} from "../schema/index.js"
-import { Media } from "../media.js"
-import { classifyProviderFailure, providerErrorMessage } from "../provider-error.js"
-import { encodeJson } from "../utils/json.js"
-import { JsonObject, knownString, lenient, optionalNull, ProviderShared } from "./shared.js"
-import { Lifecycle } from "./utils/lifecycle.js"
-import { MediaInput } from "./utils/media-input.js"
-import { ToolStream } from "./utils/tool-stream.js"
-
-const ADAPTER = "google-interactions"
-export const DEFAULT_BASE_URL = "https://generativelanguage.googleapis.com/v1beta"
-
-// =============================================================================
-// Public Model Input
-// =============================================================================
-const ThinkingLevel = knownString<"minimal" | "low" | "medium" | "high">()
-const Options = Schema.Struct({
-  previousInteractionId: lenient(Schema.String),
-  store: lenient(Schema.Boolean),
-  thinkingLevel: lenient(ThinkingLevel),
-  thinkingSummaries: lenient(knownString<"auto" | "none">()),
-  serviceTier: lenient(knownString<"standard" | "flex" | "priority">()),
-})
-export type OptionsInput = typeof Options.Encoded
-export type ProviderOptionsInput = OptionsInput
-const decodeOptions = ProviderShared.validateWith(Schema.decodeUnknownEffect(Options))
-
-// =============================================================================
-// Request Body Schema
-// =============================================================================
-const Text = Schema.Struct({ type: Schema.Literal("text"), text: Schema.String })
-const MediaContent = Schema.Struct({
-  type: Schema.Literals(["image", "audio", "video", "document"]),
-  data: Schema.optional(Schema.String),
-  uri: Schema.optional(Schema.String),
-  mime_type: Schema.String,
-})
-const Content = Schema.Union([Text, MediaContent])
-const InputStep = Schema.Union([
-  Schema.Struct({ type: Schema.Literals(["user_input", "model_output"]), content: Schema.Array(Content) }),
-  Schema.Struct({
-    type: Schema.Literal("thought"),
-    signature: Schema.optional(Schema.String),
-    summary: Schema.optional(Schema.Array(Text)),
-  }),
-  Schema.Struct({
-    type: Schema.Literal("function_call"),
-    id: Schema.String,
-    name: Schema.String,
-    arguments: Schema.Unknown,
-    signature: Schema.optional(Schema.String),
-  }),
-  Schema.Struct({
-    type: Schema.Literal("function_result"),
-    call_id: Schema.String,
-    name: Schema.String,
-    result: Schema.Unknown,
-    is_error: Schema.optional(Schema.Boolean),
-  }),
-])
-type InputStep = typeof InputStep.Type
-const ToolChoice = Schema.Union([
-  Schema.Literals(["auto", "any", "none"]),
-  Schema.Struct({ allowed_tools: Schema.Struct({ mode: Schema.Literal("any"), tools: Schema.Array(Schema.String) }) }),
-])
-const Body = Schema.Struct({
-  model: Schema.String,
-  input: Schema.Array(InputStep),
-  stream: Schema.Literal(true),
-  store: Schema.Boolean,
-  previous_interaction_id: Schema.optional(Schema.String),
-  system_instruction: Schema.optional(Schema.String),
-  service_tier: Schema.optional(Schema.String),
-  tools: Schema.optional(
-    Schema.Array(
-      Schema.Struct({
-        type: Schema.Literal("function"),
-        name: Schema.String,
-        description: Schema.String,
-        parameters: JsonObject,
-      }),
-    ),
-  ),
-  generation_config: Schema.Struct({
-    max_output_tokens: Schema.optional(Schema.Number),
-    temperature: Schema.optional(Schema.Number),
-    top_p: Schema.optional(Schema.Number),
-    seed: Schema.optional(Schema.Number),
-    stop_sequences: Schema.optional(Schema.Array(Schema.String)),
-    thinking_level: Schema.optional(ThinkingLevel),
-    thinking_summaries: Schema.optional(Schema.String),
-    tool_choice: Schema.optional(ToolChoice),
-  }),
-})
-
-// =============================================================================
-// Streaming Event Schema
-// =============================================================================
-const RawUsage = Schema.StructWithRest(
-  Schema.Struct({
-    total_input_tokens: optionalNull(Schema.Number),
-    total_cached_tokens: optionalNull(Schema.Number),
-    total_output_tokens: optionalNull(Schema.Number),
-    total_thought_tokens: optionalNull(Schema.Number),
-    total_tokens: optionalNull(Schema.Number),
-    raw_prompt_token: optionalNull(Schema.Number),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-type RawUsage = typeof RawUsage.Type
-const OutputStep = Schema.Struct({
-  type: Schema.String,
-  id: Schema.optional(Schema.String),
-  name: Schema.optional(Schema.String),
-  arguments: Schema.optional(JsonObject),
-  signature: Schema.optional(Schema.String),
-  summary: Schema.optional(Schema.Array(Text)),
-  content: Schema.optional(Schema.Array(Schema.Struct({ type: Schema.String, text: Schema.optional(Schema.String) }))),
-})
-type OutputStep = typeof OutputStep.Type
-const Delta = Schema.Union([
-  Schema.Struct({ type: Schema.Literal("text"), text: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("arguments_delta"), arguments: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("thought_signature"), signature: Schema.String }),
-  Schema.Struct({ type: Schema.Literal("thought_summary"), content: Text }),
-  // Unknown output modalities must fail explicitly rather than disappearing from a successful response.
-  Schema.Struct({ type: Schema.String }),
-])
-const Interaction = Schema.StructWithRest(
-  Schema.Struct({
-    id: Schema.optional(Schema.String),
-    status: Schema.String,
-    usage: Schema.optional(RawUsage),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-const Event = Schema.Union([
-  Schema.Struct({ event_type: Schema.Literal("step.start"), index: Schema.Number, step: OutputStep }),
-  Schema.Struct({ event_type: Schema.Literal("step.delta"), index: Schema.Number, delta: Delta }),
-  Schema.Struct({ event_type: Schema.Literal("step.stop"), index: Schema.Number }),
-  Schema.Struct({
-    event_type: Schema.Literal("interaction.created"),
-    interaction: Schema.Struct({ id: Schema.optional(Schema.String) }),
-  }),
-  Schema.Struct({
-    event_type: Schema.Literal("interaction.status_update"),
-    interaction_id: Schema.optional(Schema.String),
-    status: Schema.String,
-  }),
-  Schema.Struct({ event_type: Schema.Literal("interaction.completed"), interaction: Interaction }),
-  Schema.Struct({ event_type: Schema.Literal("error"), error: Schema.Unknown }),
-])
-type Event = typeof Event.Type
-
-// =============================================================================
-// Parser State
-// =============================================================================
-interface ParserState {
-  readonly route: string
-  readonly metadataKey: string
-  readonly lifecycle: Lifecycle.State
-  readonly steps: Partial<Record<number, OutputStep>>
-  readonly tools: ToolStream.State<number>
-  readonly completed: boolean
-}
-type StepResult = readonly [ParserState, ReadonlyArray<LLMEvent>]
-
-// =============================================================================
-// Request Body Construction
-// =============================================================================
-const mediaContent = Effect.fnUntraced(function* (asset: Media.Asset) {
-  if (
-    asset.kind !== "image" &&
-    asset.kind !== "audio" &&
-    asset.kind !== "video" &&
-    asset.mediaType !== "application/pdf" &&
-    asset.mediaType !== "text/csv"
-  )
-    return yield* ProviderShared.invalidRequest(
-      `Google Interactions does not support ${asset.mediaType} document input`,
-    )
-  const type: (typeof MediaContent.Type)["type"] =
-    asset.kind === "image" || asset.kind === "audio" || asset.kind === "video" ? asset.kind : "document"
-  const uri = MediaInput.refID(asset, ProviderID.make("google"))
-  if (uri !== undefined) return { type, uri, mime_type: asset.mediaType }
-  const inline = yield* ProviderShared.requireInlineMedia("Google Interactions", asset)
-  return { type, data: inline.base64, mime_type: inline.mime }
-})
-
-const signature = (metadata: ProviderMetadata | undefined, key: string) => {
-  const value = metadata?.[key]
-  return ProviderShared.isRecord(value) && typeof value.interactionSignature === "string"
-    ? value.interactionSignature
-    : undefined
-}
-
-const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) {
-  const steps: InputStep[] = []
-  const key = request.model.route.providerMetadataKey ?? String(request.model.provider)
-  for (const message of request.messages) {
-    if (message.role === "system") {
-      const part = yield* ProviderShared.wrappedSystemUpdate("Google Interactions", message)
-      steps.push({ type: "user_input", content: [{ type: "text", text: part.text }] })
-      continue
-    }
-    const start = steps.length
-    // Consecutive ordinary content remains one native message; tools and thoughts retain their chronology.
-    const append = (content: typeof Content.Type) => {
-      const type = message.role === "assistant" ? "model_output" : "user_input"
-      const last = steps.at(-1)
-      if (steps.length > start && last?.type === type)
-        steps[steps.length - 1] = { type, content: [...last.content, content] }
-      else steps.push({ type, content: [content] })
-    }
-    for (const part of message.content) {
-      if (message.role === "tool") {
-        if (part.type !== "tool-result")
-          return yield* ProviderShared.unsupportedContent(ADAPTER, "tool", ["tool-result"])
-        steps.push({
-          type: "function_result",
-          call_id: part.id,
-          name: part.name,
-          result: yield* lowerToolResult(part),
-          is_error: part.result.type === "error" || undefined,
-        })
-        continue
-      }
-      if (part.type === "text") {
-        append({ type: "text", text: part.text })
-        continue
-      }
-      if (part.type === "media") {
-        append(yield* mediaContent(part.media))
-        continue
-      }
-      if (message.role === "assistant" && part.type === "reasoning") {
-        steps.push({
-          type: "thought",
-          signature: signature(part.providerMetadata, key),
-          summary: part.text ? [{ type: "text", text: part.text }] : undefined,
-        })
-        continue
-      }
-      if (message.role === "assistant" && part.type === "tool-call") {
-        steps.push({
-          type: "function_call",
-          id: part.id,
-          name: part.name,
-          arguments: part.input,
-          signature: signature(part.providerMetadata, key),
-        })
-        continue
-      }
-      return yield* ProviderShared.unsupportedContent(
-        ADAPTER,
-        message.role,
-        message.role === "user" ? ["text", "media"] : ["text", "media", "reasoning", "tool-call"],
-      )
-    }
-  }
-  return steps
-})
-
-const lowerToolResult = Effect.fnUntraced(function* (part: ToolResultPart) {
-  if (part.result.type === "json" && ProviderShared.isRecord(part.result.value)) return part.result.value
-  if (part.result.type !== "content") return ProviderShared.toolResultText(part)
-
-  return yield* Effect.forEach(part.result.value, (item): Effect.Effect<typeof Content.Type, AIError> => {
-    if (item.type === "text") return Effect.succeed({ type: "text", text: item.text })
-    return mediaContent(ProviderShared.toolFileMedia(item).media)
-  })
-})
-
-const fromRequest = Effect.fn("GoogleInteractions.fromRequest")(function* (request: LLMRequest) {
-  const options = yield* decodeOptions(request.providerOptions ?? {})
-  const flattened = ProviderShared.flattenToolRequest(request)
-  if (flattened.tools.some((tool) => tool.native !== undefined))
-    return yield* ProviderShared.invalidRequest("Google Interactions hosted tools are not supported")
-  if (
-    request.generation?.topK !== undefined ||
-    request.generation?.frequencyPenalty !== undefined ||
-    request.generation?.presencePenalty !== undefined
-  )
-    return yield* ProviderShared.invalidRequest(
-      "Google Interactions does not support topK, frequencyPenalty, or presencePenalty",
-    )
-  const choice =
-    request.toolChoice === undefined
-      ? undefined
-      : yield* ProviderShared.matchToolChoice(ADAPTER, request.toolChoice, {
-          auto: () => "auto" as const,
-          none: () => "none" as const,
-          required: () => "any" as const,
-          tool: (name) => ({ allowed_tools: { mode: "any" as const, tools: [name] } }),
-        })
-  return {
-    model: request.model.id,
-    input: yield* lowerMessages(flattened.request),
-    stream: true as const,
-    // Full-history replay need not create retained provider resources. Continuation callers opt in to storage.
-    store: options.store ?? false,
-    previous_interaction_id: options.previousInteractionId,
-    system_instruction: request.system.length ? ProviderShared.joinText(request.system) : undefined,
-    service_tier: options.serviceTier,
-    tools: flattened.tools.length
-      ? flattened.tools.map((tool) => ({
-          type: "function" as const,
-          name: tool.name,
-          description: tool.description,
-          parameters: tool.inputSchema,
-        }))
-      : undefined,
-    generation_config: {
-      max_output_tokens: request.generation?.maxTokens,
-      temperature: request.generation?.temperature,
-      top_p: request.generation?.topP,
-      seed: request.generation?.seed,
-      stop_sequences: request.generation?.stop,
-      thinking_level: options.thinkingLevel,
-      thinking_summaries: options.thinkingSummaries,
-      tool_choice: choice,
-    },
-  }
-})
-
-// =============================================================================
-// Stream Parsing
-// =============================================================================
-const metadata = (state: ParserState, step: OutputStep): ProviderMetadata => ({
-  [state.metadataKey]: { interactionSignature: step.signature },
-})
-const mapUsage = (usage: RawUsage | undefined, key: string) => {
-  if (!usage) return undefined
-  const input = usage.total_input_tokens ?? undefined
-  const cached = usage.total_cached_tokens ?? undefined
-  const reasoning = usage.total_thought_tokens ?? undefined
-  const output =
-    usage.total_output_tokens === undefined || usage.total_output_tokens === null
-      ? undefined
-      : usage.total_output_tokens + (reasoning ?? 0)
-  return new Usage({
-    contextTokens: usage.raw_prompt_token ?? input,
-    inputTokens: input,
-    outputTokens: output,
-    nonCachedInputTokens: ProviderShared.subtractTokens(input, cached),
-    cacheReadInputTokens: cached,
-    reasoningTokens: reasoning,
-    totalTokens: usage.total_tokens ?? undefined,
-    providerMetadata: { [key]: usage },
-  })
-}
-
-const onStart = Effect.fnUntraced(function* (
-  state: ParserState,
-  index: number,
-  step: OutputStep,
-) {
-  const events: LLMEvent[] = []
-  let lifecycle = Lifecycle.stepStart(state.lifecycle, events)
-  let tools = state.tools
-  const id = String(index)
-  if (step.type === "thought") {
-    lifecycle = Lifecycle.reasoningStart(lifecycle, events, id, metadata(state, step))
-    for (const part of step.summary ?? []) lifecycle = Lifecycle.reasoningDelta(lifecycle, events, id, part.text)
-  } else if (step.type === "model_output") {
-    lifecycle = Lifecycle.textStart(lifecycle, events, id)
-    for (const part of step.content ?? []) {
-      if (part.type !== "text")
-        return yield* ProviderShared.eventError(
-          ADAPTER,
-          `Unsupported Interactions output: ${part.type}`,
-          encodeJson(step),
-        )
-      if (part.text) lifecycle = Lifecycle.textDelta(lifecycle, events, id, part.text)
-    }
-  } else if (step.type === "function_call") {
-    if (!step.id || !step.name)
-      return yield* ProviderShared.eventError(ADAPTER, "Interactions function call lacks id or name", encodeJson(step))
-    tools = ToolStream.start(tools, index, {
-      id: step.id,
-      name: step.name,
-      providerMetadata: metadata(state, step),
-      input: step.arguments && Object.keys(step.arguments).length ? encodeJson(step.arguments) : "",
-    })
-    events.push(LLMEvent.toolInputStart({ id: step.id, name: step.name, providerMetadata: metadata(state, step) }))
-  } else
-    return yield* ProviderShared.eventError(ADAPTER, `Unsupported Interactions step: ${step.type}`, encodeJson(step))
-  return [{ ...state, lifecycle, tools, steps: { ...state.steps, [index]: step } }, events] satisfies StepResult
-})
-
-const onDelta = Effect.fnUntraced(function* (
-  state: ParserState,
-  index: number,
-  delta: typeof Delta.Type,
-) {
-  const step = state.steps[index]
-  if (!step)
-    return yield* ProviderShared.eventError(ADAPTER, "Interactions delta without step.start", encodeJson(delta))
-  const events: LLMEvent[] = []
-  if (delta.type === "text" && "text" in delta && step.type === "model_output")
-    return [
-      { ...state, lifecycle: Lifecycle.textDelta(state.lifecycle, events, String(index), delta.text) },
-      events,
-    ] satisfies StepResult
-  if (delta.type === "thought_summary" && "content" in delta && step.type === "thought")
-    return [
-      { ...state, lifecycle: Lifecycle.reasoningDelta(state.lifecycle, events, String(index), delta.content.text) },
-      events,
-    ] satisfies StepResult
-  if (delta.type === "thought_signature" && "signature" in delta) {
-    const next = { ...step, signature: delta.signature }
-    const tool = state.tools[index]
-    return [
-      {
-        ...state,
-        steps: { ...state.steps, [index]: next },
-        tools: tool ? { ...state.tools, [index]: { ...tool, providerMetadata: metadata(state, next) } } : state.tools,
-      },
-      events,
-    ] satisfies StepResult
-  }
-  if (delta.type === "arguments_delta" && "arguments" in delta && step.type === "function_call") {
-    const result = ToolStream.appendExisting(
-      ADAPTER,
-      state.tools,
-      index,
-      delta.arguments,
-      "Interactions arguments without function call",
-    )
-    if (ToolStream.isError(result)) return yield* result
-    return [{ ...state, tools: result.tools }, result.events] satisfies StepResult
-  }
-  return yield* ProviderShared.eventError(ADAPTER, `Unsupported Interactions delta: ${delta.type}`, encodeJson(delta))
-})
-
-const onStop = Effect.fnUntraced(function* (state: ParserState, index: number) {
-  const step = state.steps[index]
-  if (!step) return yield* ProviderShared.eventError(ADAPTER, "Interactions step.stop without step.start")
-  const events: LLMEvent[] = []
-  if (step.type === "thought")
-    return [
-      { ...state, lifecycle: Lifecycle.reasoningEnd(state.lifecycle, events, String(index), metadata(state, step)) },
-      events,
-    ] satisfies StepResult
-  if (step.type === "model_output")
-    return [
-      { ...state, lifecycle: Lifecycle.textEnd(state.lifecycle, events, String(index)) },
-      events,
-    ] satisfies StepResult
-  const result = yield* ToolStream.finish(ADAPTER, state.tools, index)
-  return [{ ...state, tools: result.tools }, result.events ?? []] satisfies StepResult
-})
-
-const step = Effect.fnUntraced(function* (state: ParserState, event: Event) {
-  switch (event.event_type) {
-    case "step.start":
-      return yield* onStart(state, event.index, event.step)
-    case "step.delta":
-      return yield* onDelta(state, event.index, event.delta)
-    case "step.stop":
-      return yield* onStop(state, event.index)
-    case "interaction.created":
-    case "interaction.status_update":
-      return [state, []] satisfies StepResult
-    case "error":
-      return yield* new AIError({
-        reason: classifyProviderFailure({
-          message: providerErrorMessage(encodeJson(event)) ?? "Google Interactions stream error",
-          data: event.error,
-          rawBody: encodeJson(event),
-        }),
-      })
-    case "interaction.completed": {
-      const interaction = event.interaction
-      if (interaction.status === "failed" || interaction.status === "cancelled")
-        return yield* new AIError({
-          reason: classifyProviderFailure({
-            message: `Google Interactions ${interaction.status}`,
-            data: interaction,
-            rawBody: encodeJson(event),
-          }),
-        })
-      if (!["completed", "requires_action", "incomplete"].includes(interaction.status))
-        return yield* ProviderShared.eventError(
-          ADAPTER,
-          `Unexpected terminal Interactions status: ${interaction.status}`,
-          encodeJson(event),
-        )
-      const pending = yield* ToolStream.finishAll(ADAPTER, state.tools)
-      const events = [...pending.events]
-      const lifecycle = Lifecycle.finish(state.lifecycle, events, {
-        reason: {
-          normalized:
-            interaction.status === "requires_action"
-              ? "tool-calls"
-              : interaction.status === "incomplete"
-                ? "length"
-                : "stop",
-          raw: interaction.status,
-        },
-        usage: mapUsage(interaction.usage, state.metadataKey),
-        providerMetadata: { [state.metadataKey]: { interactionId: interaction.id } },
-      })
-      return [{ ...state, lifecycle, tools: pending.tools, completed: true }, events] satisfies StepResult
-    }
-  }
-})
-
-// =============================================================================
-// Protocol And Route
-// =============================================================================
-export const protocol = Protocol.make({
-  id: ADAPTER,
-  sanitizer: "gemini",
-  body: { schema: Body, from: fromRequest },
-  stream: {
-    event: Protocol.jsonEvent(Event),
-    initial: (request): ParserState => ({
-      route: `${request.model.provider}/${ADAPTER}`,
-      metadataKey: request.model.route.providerMetadataKey ?? String(request.model.provider),
-      lifecycle: Lifecycle.initial(),
-      steps: {},
-      tools: ToolStream.empty<number>(),
-      completed: false,
-    }),
-    step,
-    terminal: (event) => event.event_type === "interaction.completed",
-    onHalt: (state) =>
-      state.completed
-        ? Effect.succeed([])
-        : Effect.fail(
-            ProviderShared.eventError(ADAPTER, "Google Interactions stream ended before interaction.completed"),
-          ),
-  },
-})
-
-export const route = Route.make({
-  id: ADAPTER,
-  provider: "google",
-  providerMetadataKey: "google",
-  protocol,
-  endpoint: Endpoint.path("/interactions", { baseURL: DEFAULT_BASE_URL }),
-  auth: Auth.none,
-  framing: Framing.sse,
-})
-
-export * as GoogleInteractions from "./google-interactions.js"
@@ -94,7 +94,7 @@ const fromRequest = Effect.fn("GoogleSpeech.fromRequest")(function* (request: Me
 // 6. Stream parsing
 // ---------------------------------------------------------------------------

-const step = Effect.fnUntraced(function* (state: State, frame: string) {
+const step = Effect.fn("GoogleSpeech.step")(function* (state: State, frame: string) {
  const chunk = yield* decodeChunk(frame)
  const blocked = GeminiGenerateContent.blocked(route.name, chunk, frame)
  if (blocked !== undefined) return yield* blocked
@@ -138,7 +138,7 @@ const turn = (part: Schema.Schema.Type<typeof AudioTranscription>) => {
  }
 }

-const step = Effect.fnUntraced(function* (state: State, frame: string) {
+const step = Effect.fn("GoogleTranscription.step")(function* (state: State, frame: string) {
  const chunk = yield* decodeChunk(frame)
  const blocked = GeminiGenerateContent.blocked(route.name, chunk, frame)
  if (blocked !== undefined) return yield* blocked
@@ -1,5 +1,5 @@
 import { Duration, Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import type { Status } from "../generation.js"
 import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
@@ -1,8 +1,6 @@
 export * as AnthropicMessages from "./anthropic-messages.js"
 export * as BedrockConverse from "./bedrock-converse.js"
-export * as CohereChat from "./cohere-chat.js"
 export * as Gemini from "./gemini.js"
-export * as GoogleInteractions from "./google-interactions.js"
 export * as MistralChat from "./mistral-chat.js"
 export * as OpenAIChat from "./openai-chat.js"
 export * as OpenAIImages from "./openai-images.js"
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
 import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
@@ -1,5 +1,7 @@
-import { Effect, Encoding, Schema } from "effect"
+import { Effect, Schema } from "effect"
+import { Base64 } from "effect/encoding"
 import { Protocol } from "../route/protocol.js"
+import { HttpTransport } from "../route/transport/index.js"
 import { LLMEvent, LLMRequest, Message, ToolResultPart } from "../schema/index.js"
 import { OpenResponses } from "./open-responses.js"
 import { JsonObject, optionalArray, optionalNull, ProviderShared } from "./shared.js"
@@ -43,6 +45,13 @@ const ImageItem = Schema.Struct({
  error: Schema.optional(Schema.Unknown),
 })

+const Body = Schema.Struct({
+  ...OpenResponses.coreFields,
+  input: Schema.Array(Schema.Union([OpenResponses.InputItem, ImageItem])),
+  tools: optionalArray(Schema.Union([OpenResponses.Tool, NativeTool])),
+  stream: Schema.Literal(true),
+})
+
 const MessageAnnotations = Schema.Struct({
  content: Schema.Array(Schema.Struct({ annotations: optionalArray(JsonObject) })),
 })
@@ -54,13 +63,12 @@ interface ParserState extends OpenResponses.ParserState {
 const adapter = {
  id: ADAPTER,
  name: NAME,
-  nativeTool: (native) => ProviderShared.validateWith(Schema.decodeUnknownEffect(NativeTool))(native.meta),
  restoreHostedToolItem: (item: unknown) => (Schema.is(ImageItem)(item) ? item : undefined),
 } satisfies OpenResponses.ProviderAdapter

 const fromRequest = Effect.fn("MetaResponses.fromRequest")(function* (request: LLMRequest) {
  const key = request.model.route.providerMetadataKey ?? String(request.model.provider)
-  return yield* OpenResponses.fromRequestWithAdapter(
+  const projected = ProviderShared.flattenToolRequest(
    LLMRequest.update(request, {
      messages: request.messages.map((message) =>
        Message.make({
@@ -86,8 +94,23 @@ const fromRequest = Effect.fn("MetaResponses.fromRequest")(function* (request: L
        }),
      ),
    }),
-    adapter,
  )
+  return yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Body))({
+    ...(yield* OpenResponses.lowerConversation(projected.request, adapter)),
+    ...OpenResponses.lowerGeneration(request),
+    tools:
+      projected.tools.length === 0
+        ? undefined
+        : yield* Effect.forEach(projected.tools, (tool) =>
+            Effect.gen(function* () {
+              if (tool.native === undefined) return yield* OpenResponses.lowerTool(NAME, tool)
+              return yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(NativeTool))(tool.native.meta)
+            }),
+          ),
+    tool_choice:
+      OpenResponses.allowedToolChoice(request) ??
+      (request.toolChoice ? yield* OpenResponses.lowerToolChoice(NAME, request.toolChoice) : undefined),
+  })
 })

 const HOSTED_TOOLS = {
@@ -95,7 +118,7 @@ const HOSTED_TOOLS = {
  image_generation_call: {
    name: "image_generation",
    input: () => ({}),
-    result: Effect.fnUntraced(function* (raw: ResponsesHostedTools.Item) {
+    result: Effect.fn("MetaResponses.imageResult")(function* (raw: ResponsesHostedTools.Item) {
      const item = yield* Schema.decodeUnknownEffect(ImageItem)(raw).pipe(
        Effect.mapError((cause) =>
          ProviderShared.eventError(
@@ -113,7 +136,7 @@ const HOSTED_TOOLS = {
          "Meta returned an image without data",
          ProviderShared.encodeJson(raw),
        )
-      const data = yield* Effect.fromResult(Encoding.decodeBase64(item.result)).pipe(
+      const data = yield* Effect.fromResult(Base64.decode(item.result)).pipe(
        Effect.mapError((cause) =>
          ProviderShared.eventError(
            ADAPTER,
@@ -136,7 +159,7 @@ const HOSTED_TOOLS = {
  },
 } satisfies ResponsesHostedTools.Definitions

-const onEvent = Effect.fnUntraced(function* (
+const onEvent = Effect.fn("MetaResponses.onEvent")(function* (
  state: OpenResponses.ParserState,
  input: OpenResponses.Event,
 ) {
@@ -173,7 +196,7 @@ const onEvent = Effect.fnUntraced(function* (
  ] satisfies OpenResponses.StepResult
 })

-const step = Effect.fnUntraced(function* (state: ParserState, input: OpenResponses.Event) {
+const step = Effect.fn("MetaResponses.step")(function* (state: ParserState, input: OpenResponses.Event) {
  const completedItems = new Set(state.completedItems)
  const event = OpenResponses.normalize(state, input)
  if (event.type === "response.output_item.done" && event.item && completedItems.has(event.item.id))
@@ -200,7 +223,7 @@ const step = Effect.fnUntraced(function* (state: ParserState, input: OpenRespons

 export const protocol = Protocol.make({
  id: ADAPTER,
-  body: { schema: OpenResponses.OpenResponsesBody, from: fromRequest },
+  body: { schema: Body, from: fromRequest },
  stream: {
    event: OpenResponses.protocol.stream.event,
    initial: (request): ParserState => ({ ...OpenResponses.initial(request, adapter), completedItems: new Set() }),
@@ -209,6 +232,6 @@ export const protocol = Protocol.make({
  },
 })

-export const httpTransport = OpenResponses.httpTransport
+export const httpTransport = HttpTransport.sseJson.with<Schema.Schema.Type<typeof Body>>()

 export * as MetaResponses from "./meta-responses.js"
@@ -68,10 +68,7 @@ const MistralAssistantToolCall = Schema.Struct({
 type MistralAssistantToolCall = Schema.Schema.Type<typeof MistralAssistantToolCall>

 const MistralMessage = Schema.Union([
-  Schema.Struct({
-    role: Schema.Literal("system"),
-    content: Schema.Union([Schema.String, Schema.Array(MistralTextContent)]),
-  }),
+  Schema.Struct({ role: Schema.Literal("system"), content: Schema.String }),
  Schema.Struct({
    role: Schema.Literal("user"),
    content: Schema.Union([Schema.String, Schema.Array(MistralUserContent)]),
@@ -226,7 +223,7 @@ const MistralEvent = Schema.StructWithRest(
 type MistralEvent = Schema.Schema.Type<typeof MistralEvent>
 const MistralStreamEvent = Schema.Union([Schema.Literal(DONE), Protocol.jsonEvent(MistralEvent)])

-const lowerMedia = Effect.fnUntraced(function* (part: MediaPart) {
+const lowerMedia = Effect.fn("MistralChat.lowerMedia")(function* (part: MediaPart) {
  const mime = part.media.mediaType.toLowerCase()
  const url =
    ProviderShared.mediaUrl(part.media) ??
@@ -236,7 +233,7 @@ const lowerMedia = Effect.fnUntraced(function* (part: MediaPart) {
  return yield* ProviderShared.invalidRequest(`Mistral Chat does not support media type ${part.media.mediaType}`)
 })

-const lowerUser = Effect.fnUntraced(function* (message: LLMRequest["messages"][number]) {
+const lowerUser = Effect.fn("MistralChat.lowerUser")(function* (message: LLMRequest["messages"][number]) {
  const content: MistralUserContent[] = []
  for (const part of message.content) {
    if (part.type === "text") {
@@ -260,7 +257,7 @@ const lowerToolCall = (part: ToolCallPart, normalizeID: (id: string) => string):
  function: { name: part.name, arguments: ProviderShared.encodeJson(part.input) },
 })

-const lowerAssistant = Effect.fnUntraced(function* (
+const lowerAssistant = Effect.fn("MistralChat.lowerAssistant")(function* (
  message: LLMRequest["messages"][number],
  normalizeID: (id: string) => string,
  prefix: boolean,
@@ -298,7 +295,7 @@ const lowerAssistant = Effect.fnUntraced(function* (
  }
 })

-const lowerToolResults = Effect.fnUntraced(function* (
+const lowerToolResults = Effect.fn("MistralChat.lowerToolResults")(function* (
  message: LLMRequest["messages"][number],
  normalizeID: (id: string) => string,
 ) {
@@ -335,20 +332,10 @@ const lowerToolResults = Effect.fnUntraced(function* (
  return output
 })

-const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest) {
+const lowerMessages = Effect.fn("MistralChat.lowerMessages")(function* (request: LLMRequest) {
  const normalizeID = MistralToolID.normalizer(request)
  const messages: MistralMessage[] =
-    request.system.length === 0
-      ? []
-      : [
-          {
-            role: "system",
-            content:
-              request.system.length === 1
-                ? request.system[0].text
-                : request.system.map((part) => ({ type: "text", text: part.text })),
-          },
-        ]
+    request.system.length === 0 ? [] : [{ role: "system", content: ProviderShared.joinText(request.system) }]
  for (const message of request.messages) {
    if (message.role === "system") {
      const update = yield* ProviderShared.wrappedSystemUpdate("Mistral Chat", message)
@@ -596,7 +583,7 @@ const toolText = (tool: MistralToolDelta) => {
  return value === null || value === undefined ? "" : ProviderShared.encodeJson(value)
 }

-const appendTools = Effect.fnUntraced(function* (
+const appendTools = Effect.fn("MistralChat.appendTools")(function* (
  initial: ParserState,
  events: LLMEvent[],
  deltas: ReadonlyArray<MistralToolDelta>,
@@ -662,7 +649,7 @@ const hasLateContent = (event: MistralEvent) => {
  )
 }

-const step = Effect.fnUntraced(function* (state: ParserState, event: MistralEvent) {
+const step = Effect.fn("MistralChat.step")(function* (state: ParserState, event: MistralEvent) {
  if (event.error) {
    const body = ProviderShared.encodeJson(event)
    return yield* new AIError({
@@ -726,7 +713,7 @@ const step = Effect.fnUntraced(function* (state: ParserState, event: MistralEven
  ] as const
 })

-const finishEvents = Effect.fnUntraced(function* (state: ParserState) {
+const finishEvents = Effect.fn("MistralChat.finishEvents")(function* (state: ParserState) {
  if (!state.finishReason)
    return yield* new AIError({
      reason: new InvalidProviderOutputError({
@@ -1,5 +1,5 @@
 import { Effect, Schema, Stream } from "effect"
-import { Headers } from "effect/unstable/http"
+import { Headers } from "effect/http"
 import { Framing } from "../route/framing.js"
 import type { HttpContext } from "../schema/index.js"
 import {
@@ -168,20 +168,10 @@ export const ConfigurationUpdate = Schema.Struct({
  type: Schema.Literal("configuration_update"),
  reasoning: Schema.Struct({ effort: OpenResponsesOptions.ReasoningEffort }),
 })
-export type ConfigurationUpdate = Schema.Schema.Type<typeof ConfigurationUpdate>
-
-export const HostedToolReplay = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.String,
-    id: Schema.String,
-  }),
-  [JsonObject],
-)
-export type HostedToolReplayItem = Schema.Schema.Type<typeof HostedToolReplay>
+type ConfigurationUpdate = Schema.Schema.Type<typeof ConfigurationUpdate>

 export const InputItem = Schema.Union([
  CompactionItem,
-  ConfigurationUpdate,
  Schema.Struct({ type: Schema.tag("message"), role: Schema.tag("system"), content: Schema.String }),
  Schema.Struct({ type: Schema.tag("message"), role: Schema.tag("developer"), content: Schema.String }),
  Schema.Struct({
@@ -214,9 +204,24 @@ export const InputItem = Schema.Union([
    output: OpenResponsesFunctionCallOutput,
  }),
  HostedToolItem,
-  HostedToolReplay,
 ])
 type OpenResponsesInputItem = Schema.Schema.Type<typeof InputItem>
+export type HostedToolReplayItem = {
+  readonly type: string
+  readonly id: string
+  readonly [key: string]: unknown
+}
+type LoweredInputItem =
+  | OpenResponsesInputItem
+  | HostedToolReplayItem
+  | ConfigurationUpdate
+  | {
+      readonly type: "message"
+      readonly id?: string
+      readonly role: "assistant"
+      readonly content: ReadonlyArray<{ readonly type: "output_text"; readonly text: string }>
+      readonly phase?: MessagePhase | null
+    }

 // Mutable counterpart of the schema reasoning item so `lowerMessages` can fold
 // multiple streamed summary parts into the same item before flushing.
@@ -234,14 +239,6 @@ export const Tool = Schema.Struct({
  strict: Schema.optional(Schema.Boolean),
 })

-export const HostedTool = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.String,
-  }),
-  [JsonObject],
-)
-export type HostedTool = Schema.Schema.Type<typeof HostedTool>
-
 export const ToolChoice = Schema.Union([
  Schema.Literals(["auto", "none", "required"]),
  Schema.Struct({ type: Schema.tag("function"), name: Schema.String }),
@@ -260,7 +257,7 @@ export const coreFields = {
  model: Schema.String,
  input: Schema.Array(InputItem),
  instructions: Schema.optional(Schema.String),
-  tools: optionalArray(Schema.Union([Tool, HostedTool])),
+  tools: optionalArray(Tool),
  tool_choice: Schema.optional(ToolChoice),
  store: Schema.optional(Schema.Boolean),
  metadata: Schema.optional(Schema.Record(Schema.String, Schema.String)),
@@ -295,7 +292,7 @@ export const coreFields = {
  frequency_penalty: Schema.optional(Schema.Number),
 }

-export const OpenResponsesBody = Schema.Struct({
+const OpenResponsesBody = Schema.Struct({
  ...coreFields,
  stream: Schema.Literal(true),
 })
@@ -400,7 +397,9 @@ export const decodeChannelEvent = (frame: string) =>
 export interface ProviderAdapter {
  readonly id: string
  readonly name: string
-  readonly nativeTool?: (native: NonNullable<ToolDefinition["native"]>) => Effect.Effect<HostedTool, AIError>
+  readonly nativeTool?: (
+    native: NonNullable<ToolDefinition["native"]>,
+  ) => Effect.Effect<{ readonly type: string }, AIError>
  readonly lowerMedia?: (input: {
    readonly part: MediaPart
    readonly media: Media.Inline | undefined
@@ -442,7 +441,7 @@ interface ReasoningStreamItem {
 // =============================================================================
 // Request Lowering
 // =============================================================================
-export const lowerTool = Effect.fnUntraced(function* (protocolName: string, tool: ToolDefinition) {
+export const lowerTool = Effect.fn("OpenResponses.lowerTool")(function* (protocolName: string, tool: ToolDefinition) {
  if (tool.native !== undefined)
    return yield* ProviderShared.invalidRequest(`${protocolName} does not support provider-native tool ${tool.name}`)
  return {
@@ -456,10 +455,8 @@ export const lowerTool = Effect.fnUntraced(function* (protocolName: string, tool
 })

 export const lowerTools = (tools: ReadonlyArray<ToolDefinition>, adapter: ProviderAdapter) =>
-  Effect.forEach(
-    tools,
-    (tool): Effect.Effect<Schema.Schema.Type<typeof Tool> | HostedTool, AIError> =>
-      tool.native !== undefined && adapter.nativeTool ? adapter.nativeTool(tool.native) : lowerTool(adapter.name, tool),
+  Effect.forEach(tools, (tool) =>
+    tool.native !== undefined && adapter.nativeTool ? adapter.nativeTool(tool.native) : lowerTool(adapter.name, tool),
  )

 export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
@@ -507,10 +504,7 @@ const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenR
  }
 }

-const decodeImageDetail = ProviderShared.validateWith(Schema.decodeUnknownEffect(OpenResponsesInputImage.fields.detail))
-const decodeMessageMetadata = ProviderShared.validateWith(Schema.decodeUnknownEffect(MessageMetadata))
-
-const lowerMedia = Effect.fnUntraced(function* (
+const lowerMedia = Effect.fn("OpenResponses.lowerMedia")(function* (
  part: MediaPart,
  request: LLMRequest,
  adapter: ProviderAdapter,
@@ -519,8 +513,9 @@ const lowerMedia = Effect.fnUntraced(function* (
  const media = part.media.inline()
  const providerMedia = adapter.lowerMedia?.({ part, media, request })
  if (providerMedia) return providerMedia
-  const rawDetail = part.providerMetadata?.[metadataKey(request.model)]?.detail
-  const detail = rawDetail === undefined ? undefined : yield* decodeImageDetail(rawDetail)
+  const detail = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(OpenResponsesInputImage.fields.detail))(
+    part.providerMetadata?.[metadataKey(request.model)]?.detail,
+  )
  const mime = part.media.mediaType.toLowerCase()
  const url = ProviderShared.mediaUrl(part.media)
  const location = url ?? (yield* ProviderShared.requireInlineMedia(adapter.name, part.media)).dataUrl
@@ -593,16 +588,17 @@ const lowerToolResultOutput = Effect.fnUntraced(function* (

 const DEFAULT_EFFORT = "medium"

-const lowerMessages = Effect.fnUntraced(function* (
+const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (
  request: LLMRequest,
  adapter: ProviderAdapter,
 ) {
-  const input: OpenResponsesInputItem[] = []
+  const input: LoweredInputItem[] = []
  const providerMetadataKey = metadataKey(request.model)

  for (const message of request.messages) {
-    const rawMetadata = message.providerMetadata?.[providerMetadataKey]
-    const metadata = rawMetadata === undefined ? undefined : yield* decodeMessageMetadata(rawMetadata)
+    const metadata = yield* ProviderShared.validateWith(
+      Schema.decodeUnknownEffect(Schema.UndefinedOr(MessageMetadata)),
+    )(message.providerMetadata?.[providerMetadataKey])
    if (message.role === "system") {
      const update = effortUpdate(message)
      if (update) {
@@ -756,7 +752,7 @@ const lowerMessages = Effect.fnUntraced(function* (
  return input
 })

-export const lowerConversation = Effect.fnUntraced(function* (
+export const lowerConversation = Effect.fn("OpenResponses.lowerConversation")(function* (
  request: LLMRequest,
  adapter: ProviderAdapter,
 ) {
@@ -831,7 +827,11 @@ export const fromRequestWithAdapter = Effect.fn("OpenResponses.fromRequestWithAd
  }
 })

-export const fromRequest = (request: LLMRequest) => fromRequestWithAdapter(request, BASE_ADAPTER)
+const decodeBody = ProviderShared.validateWith(Schema.decodeUnknownEffect(OpenResponsesBody))
+
+export const fromRequest = Effect.fn("OpenResponses.fromRequest")(function* (request: LLMRequest) {
+  return yield* decodeBody(yield* fromRequestWithAdapter(request, BASE_ADAPTER))
+})

 // =============================================================================
 // Stream Parsing
@@ -1143,7 +1143,7 @@ const onReasoningSummaryPartDone = (state: ParserState, event: Event): StepResul
  ]
 }

-const onFunctionCallArgumentsDelta = Effect.fnUntraced(function* (
+const onFunctionCallArgumentsDelta = Effect.fn("OpenResponses.onFunctionCallArgumentsDelta")(function* (
  state: ParserState,
  event: Event,
 ) {
@@ -1174,7 +1174,7 @@ const onFunctionCallArgumentsDelta = Effect.fnUntraced(function* (
  return [{ ...state, lifecycle, tools: result.tools }, events] satisfies StepResult
 })

-const onOutputItemDone = Effect.fnUntraced(function* (
+const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
  state: ParserState,
  item: NormalizedEvent["item"],
 ) {
@@ -1310,7 +1310,7 @@ const onOutputItemDone = Effect.fnUntraced(function* (
  return [state, NO_EVENTS] satisfies StepResult
 })

-const onResponseFinish = Effect.fnUntraced(function* (state: ParserState, event: Event) {
+const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (state: ParserState, event: Event) {
  let current = state
  const events: LLMEvent[] = []
  if (event.type === "response.completed") {
@@ -14,6 +14,7 @@ import {
  ProviderInternalError,
  UnknownProviderError,
  Usage,
+  type FinishReason,
  type FinishReasonDetails,
  type CacheHint,
  type LLMRequest,
@@ -45,6 +46,12 @@ const OpenAIChatCacheControl = Schema.Struct({
 })
 type OpenAIChatCacheControl = Schema.Schema.Type<typeof OpenAIChatCacheControl>

+const OpenAIChatFunction = Schema.Struct({
+  name: Schema.String,
+  description: Schema.String,
+  parameters: JsonObject,
+})
+
 const OpenAIChatTool = Schema.Struct({
  type: Schema.tag("function"),
  function: Schema.Struct({
@@ -65,7 +72,7 @@ const ExtraContent = Schema.Struct({
 })
 const decodeExtraContent = (value: unknown) => Option.getOrUndefined(Schema.decodeUnknownOption(ExtraContent)(value))

-export const OpenAIChatAssistantToolCall = Schema.Struct({
+const OpenAIChatAssistantToolCall = Schema.Struct({
  id: Schema.String,
  type: Schema.tag("function"),
  function: Schema.Struct({
@@ -134,7 +141,7 @@ const OpenAIChatUserContent = Schema.Union([
 ])
 type OpenAIChatUserContent = Schema.Schema.Type<typeof OpenAIChatUserContent>

-export const OpenAIChatMessage = Schema.Union([
+const OpenAIChatMessage = Schema.Union([
  Schema.Struct({
    role: Schema.Literal("system"),
    content: Schema.Union([Schema.String, Schema.Array(OpenAIChatUserContent)]),
@@ -200,7 +207,7 @@ export type OpenAIChatBody = Schema.Schema.Type<typeof OpenAIChatBody>
 // The event schema is one decoded SSE `data:` payload. `Framing.sse` splits the
 // byte stream into strings, then `Protocol.jsonEvent` decodes each string into
 // this provider-native event shape.
-export const OpenAIChatUsage = Schema.StructWithRest(
+const OpenAIChatUsage = Schema.StructWithRest(
  Schema.Struct({
    prompt_tokens: optionalNull(Schema.Number),
    completion_tokens: optionalNull(Schema.Number),
@@ -238,7 +245,7 @@ const OpenAIChatToolCallDeltaFunction = Schema.Struct({
  arguments: optionalNull(Schema.String),
 })

-export const OpenAIChatToolCallDelta = Schema.Struct({
+const OpenAIChatToolCallDelta = Schema.Struct({
  index: optionalNull(Schema.Number),
  id: optionalNull(Schema.String),
  function: optionalNull(OpenAIChatToolCallDeltaFunction),
@@ -246,7 +253,7 @@ export const OpenAIChatToolCallDelta = Schema.Struct({
 })
 type OpenAIChatToolCallDelta = Schema.Schema.Type<typeof OpenAIChatToolCallDelta>

-export const OpenAIChatDelta = Schema.StructWithRest(
+const OpenAIChatDelta = Schema.StructWithRest(
  Schema.Struct({
    content: optionalNull(Schema.String),
    refusal: optionalNull(Schema.String),
@@ -259,7 +266,7 @@ export const OpenAIChatDelta = Schema.StructWithRest(
  [Schema.Record(Schema.String, Schema.Unknown)],
 )

-export const OpenAIChatChoice = Schema.StructWithRest(
+const OpenAIChatChoice = Schema.StructWithRest(
  Schema.Struct({
    delta: optionalNull(OpenAIChatDelta),
    finish_reason: optionalNull(Schema.String),
@@ -326,8 +333,6 @@ export interface ParserState {
 interface LoweringOptions {
  readonly cacheControl?: (cache: CacheHint | undefined) => OpenAIChatCacheControl | undefined
  readonly toolCallID?: (id: string) => string
-  /** Project provider-specific fields from the exact source, even when other messages are dropped during lowering. */
-  readonly assistant?: (source: LLMRequest["messages"][number], message: OpenAIChatMessage) => OpenAIChatMessage
 }

 const lowerTool = (tool: ToolDefinition, options: LoweringOptions, supportsStrictMode: boolean): OpenAIChatTool => ({
@@ -362,7 +367,7 @@ const lowerToolCall = (
  extra_content: decodeExtraContent(part.providerMetadata?.[options.providerMetadataKey]?.extraContent),
 })

-const lowerMedia = Effect.fnUntraced(function* (part: MediaPart) {
+const lowerMedia = Effect.fn("OpenAIChat.lowerMedia")(function* (part: MediaPart) {
  // Chat Completions accepts PDFs, and no other documents, as inline `file` parts; file URLs are not supported.
  if (part.media.mediaType.toLowerCase() === "application/pdf")
    return {
@@ -408,7 +413,7 @@ const lowerReasoningDetail = (detail: ReasoningDetail) => {

 const isKimiDetail = (detail: { readonly type: string }) => detail.type === "summary" || detail.type === "encrypted"

-const lowerUserMessage = Effect.fnUntraced(function* (
+const lowerUserMessage = Effect.fn("OpenAIChat.lowerUserMessage")(function* (
  message: OpenAIChatRequestMessage,
  options: LoweringOptions,
 ) {
@@ -432,7 +437,7 @@ const lowerUserMessage = Effect.fnUntraced(function* (
  return { role: "user" as const, content }
 })

-const lowerAssistantMessage = Effect.fnUntraced(function* (
+const lowerAssistantMessage = Effect.fn("OpenAIChat.lowerAssistantMessage")(function* (
  message: OpenAIChatRequestMessage,
  configuredField: string | undefined,
  requireReasoning: boolean,
@@ -497,7 +502,7 @@ const lowerAssistantMessage = Effect.fnUntraced(function* (
  return { ...result, [field]: reasoningText }
 })

-const lowerToolMessages = Effect.fnUntraced(function* (
+const lowerToolMessages = Effect.fn("OpenAIChat.lowerToolMessages")(function* (
  message: OpenAIChatRequestMessage,
  options: LoweringOptions,
 ) {
@@ -534,21 +539,19 @@ const toolMessage = (toolCallID: string, text: string, cacheControl: OpenAIChatC
  content: cacheControl === undefined ? text : [{ type: "text" as const, text, cache_control: cacheControl }],
 })

-const lowerMessage = Effect.fnUntraced(function* (
+const lowerMessage = Effect.fn("OpenAIChat.lowerMessage")(function* (
  message: OpenAIChatRequestMessage,
  reasoningField: string | undefined,
  requireReasoning: boolean,
  options: LoweringOptions & { readonly providerMetadataKey: string },
 ) {
  if (message.role === "user") return [yield* lowerUserMessage(message, options)]
-  if (message.role === "assistant") {
-    const lowered = yield* lowerAssistantMessage(message, reasoningField, requireReasoning, options)
-    return [options.assistant?.(message, lowered) ?? lowered]
-  }
+  if (message.role === "assistant")
+    return [yield* lowerAssistantMessage(message, reasoningField, requireReasoning, options)]
  return (yield* lowerToolMessages(message, options)).messages
 })

-const lowerMessages = Effect.fnUntraced(function* (request: LLMRequest, options: LoweringOptions) {
+const lowerMessages = Effect.fn("OpenAIChat.lowerMessages")(function* (request: LLMRequest, options: LoweringOptions) {
  const system: OpenAIChatMessage[] =
    request.system.length === 0
      ? []
@@ -859,7 +862,7 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
 // Streaming parsers are small state machines: every event returns a new state
 // plus the common `LLMEvent`s produced by that event. Tool calls are accumulated
 // because OpenAI streams JSON arguments across multiple deltas.
-const mapFinishReason = Effect.fnUntraced(function* (event: OpenAIChatEvent, reason: string) {
+const mapFinishReason = Effect.fn("OpenAIChat.mapFinishReason")(function* (event: OpenAIChatEvent, reason: string) {
  switch (reason) {
    case "error":
      return yield* new AIError({
@@ -1218,7 +1221,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
    ] as const
  })

-export const finishEvents = Effect.fnUntraced(function* (state: ParserState) {
+const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: ParserState) {
  if (state.finishReason === undefined && state.requireFinishReason)
    return yield* new AIError({
      reason: new InvalidProviderOutputError({
@@ -208,7 +208,7 @@ const eventImage = (frame: string, label: string, data: string, format: string,
    info: info(format, size),
  })

-const onEvent = Effect.fnUntraced(function* (state: State, frame: string) {
+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) {
@@ -229,7 +229,7 @@ const onEvent = Effect.fnUntraced(function* (state: State, frame: string) {
  ] as const
 })

-const onDocument = Effect.fnUntraced(function* (frame: Exclude<Frame, string>) {
+const onDocument = Effect.fn("OpenAIImages.onDocument")(function* (frame: Exclude<Frame, string>) {
  const invalid = (message: string, cause?: unknown) => route.frameError(message, frame.document, cause)
  const decoded = yield* decodeDocument(frame.document).pipe(
    Effect.mapError((cause) => invalid(`${route.name} returned an invalid response`, cause)),
@@ -1,5 +1,6 @@
-import { Effect, Encoding, Schema } from "effect"
-import { Headers } from "effect/unstable/http"
+import { Effect, Schema } from "effect"
+import { Base64 } from "effect/encoding"
+import { Headers } from "effect/http"
 import { Route } from "../route/client.js"
 import { Auth } from "../route/auth.js"
 import { Endpoint } from "../route/endpoint.js"
@@ -103,8 +104,15 @@ const OpenAIResponsesToolChoice = Schema.Union([
  Schema.Struct({ type: Schema.tag("image_generation") }),
 ])

+const OpenAIResponsesInputItem = Schema.Union([
+  OpenResponses.InputItem,
+  OpenAIResponsesHostedToolItem,
+  OpenResponses.ConfigurationUpdate,
+])
+
 const OpenAIResponsesCoreFields = {
  ...OpenResponses.coreFields,
+  input: Schema.Array(OpenAIResponsesInputItem),
  tools: optionalArray(OpenAIResponsesTools),
  tool_choice: Schema.optional(OpenAIResponsesToolChoice),
  context_management: Schema.optional(
@@ -127,7 +135,7 @@ export type OpenAIResponsesBody = Schema.Schema.Type<typeof OpenAIResponsesBody>
 export const CompactionTrigger = Schema.Struct({ type: Schema.Literal("compaction_trigger") })
 const CheckpointBody = Schema.Struct({
  ...OpenAIResponsesBody.fields,
-  input: Schema.Array(Schema.Union([OpenResponses.InputItem, CompactionTrigger])),
+  input: Schema.Array(Schema.Union([OpenAIResponsesInputItem, CompactionTrigger])),
 })

 const adapter = {
@@ -157,7 +165,7 @@ const nativeImageTool = (tool: ToolDefinition) => {
  return Schema.is(OpenAIResponsesImageGenerationTool)(native) ? native : undefined
 }

-const lowerTool = Effect.fnUntraced(function* (tool: ToolDefinition) {
+const lowerTool = Effect.fn("OpenAIResponses.lowerTool")(function* (tool: ToolDefinition) {
  const native = nativeImageToolInput(tool)
  if (native !== undefined) {
    if (Schema.is(OpenAIResponsesImageGenerationTool)(native)) return native
@@ -168,7 +176,7 @@ const lowerTool = Effect.fnUntraced(function* (tool: ToolDefinition) {

 // Native namespaces hold only function tools, so deeper levels flatten into
 // the leaf names the same way non-native protocols flatten the whole tree.
-const lowerToolEntry = Effect.fnUntraced(function* (tool: ToolEntry) {
+const lowerToolEntry = Effect.fn("OpenAIResponses.lowerToolEntry")(function* (tool: ToolEntry) {
  if (tool.type === "tool") return yield* lowerTool(tool)
  // OpenAI requires a namespace description; fall back to a generic one so a
  // missing description never blocks the request.
@@ -195,13 +203,15 @@ const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>, tool
        : { type: "function" as const, name },
  })

+const decodeBody = ProviderShared.validateWith(Schema.decodeUnknownEffect(OpenAIResponsesBody))
+
 const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request: LLMRequest) {
  const management = yield* ProviderShared.validateWith(
    Schema.decodeUnknownEffect(Schema.UndefinedOr(ContextManagement)),
  )(request.providerOptions?.contextManagement)
  const options = OpenResponsesOptions.resolve(request)
  const updates = resolveEffortUpdates(request, options.reasoningEffort)
-  return {
+  return yield* decodeBody({
    ...(yield* OpenResponses.lowerConversation(updates.request, adapter)),
    ...OpenResponses.lowerGeneration(request, { ...options, reasoningEffort: updates.effort }),
    context_management: management?.map((edit) => ({ type: edit.type, compact_threshold: edit.compactThreshold })),
@@ -211,7 +221,7 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
        ? undefined
        : (OpenResponses.allowedToolChoice(request) ??
          (request.toolChoice ? yield* lowerToolChoice(request.toolChoice, request.tools) : undefined)),
-  }
+  })
 })

 const checkpointBody = {
@@ -237,10 +247,10 @@ const checkpointBody = {
  }),
 }

-const hostedToolResult = Effect.fnUntraced(function* (item: ResponsesHostedTools.Item) {
+const hostedToolResult = Effect.fn("OpenAIResponses.hostedToolResult")(function* (item: ResponsesHostedTools.Item) {
  const isError = item.error !== undefined && item.error !== null
  if (item.type === "image_generation_call" && item.result) {
-    yield* Effect.fromResult(Encoding.decodeBase64(item.result)).pipe(
+    yield* Effect.fromResult(Base64.decode(item.result)).pipe(
      Effect.mapError((cause) =>
        ProviderShared.eventError(ADAPTER, "OpenAI Responses returned invalid image base64", undefined, cause),
      ),
@@ -94,7 +94,7 @@ const fromRequest = Effect.fn("OpenAISpeech.fromRequest")(function* (request: Me

 const isSse = (body: MediaProtocol.Body) => body.type === "json" && body.value.stream_format === "sse"

-const onEvent = Effect.fnUntraced(function* (state: State, frame: string) {
+const onEvent = Effect.fn("OpenAISpeech.onEvent")(function* (state: State, frame: string) {
  const event = yield* decodeEvent(frame)
  if (event.type === "speech.audio.delta") return SpeechStream.delta(state, event.audio)
  const usage = event.usage
@@ -210,7 +210,7 @@ const segment = (value: Schema.Schema.Type<typeof Segment>): TranscriptionSegmen
  speaker: value.speaker,
 })

-const onEvent = Effect.fnUntraced(function* (state: State, frame: string) {
+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")
@@ -1,5 +1,5 @@
 import { Duration, Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import type { Status } from "../generation.js"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
 import { Media } from "../media.js"
@@ -1,5 +1,5 @@
 import { Duration, Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import type { Status } from "../generation.js"
 import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
@@ -1,6 +1,6 @@
 import { Tool } from "@opencode/schema/tool"
 import { Effect, Option, Schema } from "effect"
-import { Headers, HttpClientRequest } from "effect/unstable/http"
+import { Headers, HttpClientRequest } from "effect/http"
 import { Media } from "../media.js"
 import {
  InvalidProviderOutputError,
@@ -154,7 +154,7 @@ export const wrapSystemUpdate = (parts: ReadonlyArray<{ readonly text: string }>
 * raw retrieved, tool, or web content into privileged updates: keep untrusted
 * data in ordinary user/tool messages instead.
 */
-export const systemUpdateText = Effect.fnUntraced(function* (
+export const systemUpdateText = Effect.fn("ProviderShared.systemUpdateText")(function* (
  route: string,
  message: LLMRequest["messages"][number],
 ) {
@@ -167,7 +167,7 @@ export const systemUpdateText = Effect.fnUntraced(function* (
 })

 /** Lower an unsupported privileged update into visible, in-order user text. */
-export const wrappedSystemUpdate = Effect.fnUntraced(function* (
+export const wrappedSystemUpdate = Effect.fn("ProviderShared.wrappedSystemUpdate")(function* (
  route: string,
  message: LLMRequest["messages"][number],
 ) {
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
@@ -82,7 +82,7 @@ const endpoint = (model: string) => (model.startsWith("sd3") ? "sd3" : model)

 const RESERVED_FORM_FIELDS = new Set(["image", "prompt", "mode", "model"])

-const form = Effect.fnUntraced(function* (
+const form = Effect.fn("StabilityImages.form")(function* (
  identity: MediaProtocol.Identity,
  fields: Record<string, unknown>,
  native: Record<string, unknown> | undefined,
@@ -1,6 +1,6 @@
 import { AwsV4Signer } from "aws4fetch"
 import { Effect } from "effect"
-import { Headers } from "effect/unstable/http"
+import { Headers } from "effect/http"
 import { Auth, type AuthInput } from "../../route/auth.js"
 import { AIError, AuthenticationError } from "../../schema/index.js"
 import { ProviderShared } from "../shared.js"
@@ -1,4 +1,5 @@
-import { Effect, Encoding, Schema } from "effect"
+import { Effect, Schema } from "effect"
+import { Base64 } from "effect/encoding"
 import type { MediaPart } from "../../schema/index.js"
 import { ProviderShared } from "../shared.js"

@@ -76,14 +77,14 @@ function documentName(filename: string | undefined, names: Set<string>) {
  return name
 }

-const mediaBase64 = Effect.fnUntraced(function* (part: MediaPart) {
+const mediaBase64 = Effect.fn("BedrockMedia.mediaBase64")(function* (part: MediaPart) {
  const media = yield* ProviderShared.requireInlineMedia("Bedrock Converse", part.media)
-  const bytes = yield* Effect.fromResult(Encoding.decodeBase64(media.base64)).pipe(
+  const bytes = yield* Effect.fromResult(Base64.decode(media.base64)).pipe(
    Effect.mapError((cause) =>
      ProviderShared.invalidRequest("Bedrock Converse media data must be valid base64", cause),
    ),
  )
-  return Encoding.encodeBase64(bytes)
+  return Base64.encode(bytes)
 })

 // Route by MIME. Known image/document formats lower into a typed block; anything
@@ -91,7 +92,7 @@ const mediaBase64 = Effect.fnUntraced(function* (part: MediaPart) {
 // document block. Image MIME types not in `IMAGE_FORMATS` (e.g. `image/svg+xml`)
 // get an image-specific error so the caller knows it's a format-support issue,
 // not a kind-detection issue.
-export const lower = Effect.fnUntraced(function* (part: MediaPart, documentNames: Set<string>) {
+export const lower = Effect.fn("BedrockMedia.lower")(function* (part: MediaPart, documentNames: Set<string>) {
  const mime = part.media.mediaType.toLowerCase()
  const imageFormat = IMAGE_FORMATS[mime as keyof typeof IMAGE_FORMATS]
  if (imageFormat) {
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import type { Status } from "../../generation.js"
 import type { Media } from "../../media.js"
 import { MediaProtocol } from "../../route/media-protocol.js"
@@ -1,4 +1,5 @@
-import { Effect, Encoding } from "effect"
+import { Effect } from "effect"
+import { Base64 } from "effect/encoding"
 import { Media } from "../../media.js"
 import type { MediaProtocol } from "../../route/media-protocol.js"
 import { mergeJsonRecords, type AIError, type ProviderID } from "../../schema/index.js"
@@ -10,7 +11,7 @@ export const inlineBytes = (route: string, asset: Media.Asset): Effect.Effect<Ui
  if (asset.source.type === "bytes") return Effect.succeed(asset.source.data)
  const inline = asset.inline()
  if (!inline) return Effect.fail(ProviderShared.inlineRequired(route, asset))
-  return Effect.fromResult(Encoding.decodeBase64(inline.base64)).pipe(
+  return Effect.fromResult(Base64.decode(inline.base64)).pipe(
    Effect.mapError((cause) => ProviderShared.invalidRequest(`${route} media contains invalid base64 data`, cause)),
  )
 }
@@ -52,7 +53,7 @@ export const decodedAsset = (
  mediaType: string | undefined,
  options?: Media.AssetOptions,
 ) =>
-  Effect.fromResult(Encoding.decodeBase64(data)).pipe(
+  Effect.fromResult(Base64.decode(data)).pipe(
    Effect.mapError((cause) => invalid(`${label} contains invalid base64 data`, cause)),
    Effect.map((bytes) => Media.bytes(bytes, mediaType, options)),
  )
@@ -11,7 +11,7 @@ interface State {
  readonly responseID?: string
 }

-const onOutputItem = Effect.fnUntraced(function* (
+const onOutputItem = Effect.fn("ResponsesCheckpoint.onOutputItem")(function* (
  state: State,
  input: OpenResponses.Event,
 ) {
@@ -63,7 +63,7 @@ export const make = <Body>(body: RouteBody<Body>): TriggerCompactOperation =>
          checkpoints: {},
        }),
        terminal: OpenResponses.terminal,
-        step: Effect.fnUntraced(function* (state: State, event: OpenResponses.Event) {
+        step: Effect.fn("ResponsesCheckpoint.step")(function* (state: State, event: OpenResponses.Event) {
          if (event.response?.id && state.responseID && event.response.id !== state.responseID)
            return yield* ProviderShared.eventError(source.id, "Compaction response ID changed during execution")
          if (event.type === "response.created") return [{ ...state, responseID: event.response?.id }, []] as const
@@ -33,7 +33,7 @@ export const onDone: (
  state: OpenResponses.ParserState,
  item: Item,
  tools: Definitions,
-) => Effect.Effect<OpenResponses.StepResult, AIError> = Effect.fnUntraced(
+) => Effect.Effect<OpenResponses.StepResult, AIError> = Effect.fn("ResponsesHostedTools.onDone")(
  function* (state, item, tools) {
    const tool = tools[item.type]
    if (!tool) return [state, []] satisfies OpenResponses.StepResult
@@ -63,6 +63,9 @@ const objectRoot = (schema: JsonSchema): JsonSchema => {
    schema.anyOf.some((branch) => isRecord(branch) && branch.type === "object" && Object.keys(branch).length === 1)
  )
    return { type: "object", ...Object.fromEntries(Object.entries(schema).filter(([key]) => key !== "anyOf")) }
+  // Effect 4 represents an empty Struct as `not: { type: "null" }`; an object root already excludes null.
+  if (isRecord(schema.not) && schema.not.type === "null" && Object.keys(schema.not).length === 1)
+    return { type: "object", ...Object.fromEntries(Object.entries(schema).filter(([key]) => key !== "not")) }
  return { type: "object", ...schema }
 }

@@ -60,21 +60,14 @@ const inputStart = (tool: PendingTool) =>
    providerMetadata: tool.providerMetadata,
  })

-const inputDelta = (tool: PendingTool, text: string): LLMEvent => {
-  const raw = tool.input
-  let parsed: unknown
-  return {
-    ...LLMEvent.toolInputDelta({
-      id: tool.id,
-      name: tool.name,
-      namespace: tool.namespace,
-      text,
-    }),
-    get input() {
-      return (parsed ??= Option.getOrElse(parsePartialInput(raw), () => ({})))
-    },
-  }
-}
+const inputDelta = (tool: PendingTool, text: string) =>
+  LLMEvent.toolInputDelta({
+    id: tool.id,
+    name: tool.name,
+    namespace: tool.namespace,
+    text,
+    input: Option.getOrElse(parsePartialInput(tool.input), () => ({})),
+  })

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

+const XAIResponsesBody = Schema.Struct({
+  ...OpenResponses.coreFields,
+  input: Schema.Array(Schema.Union([OpenResponses.InputItem, XAIResponsesHostedToolItem])),
+  stream: Schema.Literal(true),
+})
+
 const adapter = {
  id: ADAPTER,
  name: NAME,
  restoreHostedToolItem: (item: unknown) => (Schema.is(XAIResponsesHostedToolItem)(item) ? item : undefined),
 } satisfies OpenResponses.ProviderAdapter

+const decodeBody = ProviderShared.validateWith(Schema.decodeUnknownEffect(XAIResponsesBody))
 const fromRequest = Effect.fn("XAIResponses.fromRequest")(function* (request: LLMRequest) {
  if (request.providerOptions?.contextManagement !== undefined)
    return yield* ProviderShared.unsupportedOperation({
@@ -46,7 +53,7 @@ const fromRequest = Effect.fn("XAIResponses.fromRequest")(function* (request: LL
      message:
        "xAI requires explicit compaction through LLMClient.compact; automatic context management is not supported",
    })
-  return yield* OpenResponses.fromRequestWithAdapter(request, adapter)
+  return yield* decodeBody(yield* OpenResponses.fromRequestWithAdapter(request, adapter))
 })

 const HOSTED_TOOLS = {
@@ -76,7 +83,7 @@ const step = (state: OpenResponses.ParserState, input: OpenResponses.Event) => {
 export const protocol = Protocol.make({
  id: ADAPTER,
  body: {
-    schema: OpenResponses.OpenResponsesBody,
+    schema: XAIResponsesBody,
    from: fromRequest,
  },
  stream: {
@@ -1,5 +1,5 @@
 import { Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import type { Status } from "../generation.js"
 import { Media } from "../media.js"
 import { MediaProtocol } from "../route/media-protocol.js"
@@ -1,5 +1,5 @@
 import { Duration, Effect, Schema } from "effect"
-import type { HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientResponse } from "effect/http"
 import { ImageModel, ImageResponse, type ImageRequestFor } from "../image.js"
 import { MediaProtocol } from "../route/media-protocol.js"
 import { MediaRoute } from "../route/media.js"
@@ -55,13 +55,7 @@ const patterns = [

 const payloadPatterns = [/request entity too large/i, /payload too large/i, /request too large/i]

-const exclusions = [
-  /^(throttling error|service unavailable):/i,
-  /rate limit/i,
-  /too many requests/i,
-  // Cohere reports an output limit above the model maximum as "too many tokens"; compaction cannot fix it.
-  /max[_ ]tokens must be less than/i,
-]
+const exclusions = [/^(throttling error|service unavailable):/i, /rate limit/i, /too many requests/i]

 export const isContextOverflow = (message: string) =>
  !exclusions.some((pattern) => pattern.test(message)) &&
@@ -1,20 +1,15 @@
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import type { ProviderPackage } from "../provider-package.js"
-import { AnthropicMessages } from "../protocols/anthropic-messages.js"
 import { OpenAIChat } from "../protocols/openai-chat.js"
 import { OpenResponses } from "../protocols/open-responses.js"
 import { BedrockAuth, type Credentials } from "../protocols/utils/bedrock-auth.js"
-import { claudeVersion } from "../protocols/utils/claude-model.js"
 import { ProviderConfigurationError, ProviderID, type ModelID } from "../schema/index.js"
 import { withOpenAIOptions, type OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("amazon-bedrock")

-export type OpenAIOptionsInput = OpenAIProviderOptionsInput
-export type MessagesOptionsInput = AnthropicMessages.ProviderOptionsInput
-
-export type Config = Omit<RouteDefaultsInput, "providerOptions"> & {
+export type Config = RouteDefaultsInput & {
  /** Bedrock API key. Falls back to `AWS_BEARER_TOKEN_BEDROCK`; bearer auth takes precedence over SigV4. */
  readonly apiKey?: string
  /** `sigv4` ignores `apiKey` fallbacks from the environment; `bearer` requires a token. */
@@ -25,11 +20,11 @@ export type Config = Omit<RouteDefaultsInput, "providerOptions"> & {
  /** Shared config profile for the default credential chain. */
  readonly profile?: string
  readonly region?: string
-  readonly providerOptions?: OpenAIProviderOptionsInput | AnthropicMessages.ProviderOptionsInput
+  readonly providerOptions?: OpenAIProviderOptionsInput
 }

-export type Settings<Options = OpenAIProviderOptionsInput> = ProviderPackage.Settings &
-  Options & {
+export type Settings = ProviderPackage.Settings &
+  OpenAIProviderOptionsInput & {
    readonly apiKey?: string
    readonly auth?: "bearer" | "sigv4"
    readonly baseURL?: string
@@ -39,8 +34,6 @@ export type Settings<Options = OpenAIProviderOptionsInput> = ProviderPackage.Set
    readonly topP?: number
  }

-export type MessagesSettings = Settings<AnthropicMessages.ProviderOptionsInput>
-
 const responsesRoute = Route.make({
  id: "bedrock-mantle-responses",
  provider: id,
@@ -57,35 +50,12 @@ const chatRoute = OpenAIChat.route.with({
  providerMetadataKey: "mantle",
 })

-const messagesRoute = Route.make({
-  id: "bedrock-mantle-messages",
-  provider: id,
-  providerMetadataKey: "mantle",
-  protocol: {
-    ...AnthropicMessages.protocol,
-    // Mantle rejects mid-conversation `output_config` on Opus 5.0; support starts at 5.1+.
-    supportsEffortUpdates: (request) => {
-      const override = request.model.compatibility?.supportsEffortUpdates
-      if (override !== undefined) return override
-      const version = claudeVersion(request.model.id)
-      return version !== undefined && (version.major > 5 || (version.major === 5 && version.minor >= 1))
-    },
-  },
-  endpoint: Endpoint.path(AnthropicMessages.PATH),
-  transport: AnthropicMessages.transport<AnthropicMessages.AnthropicMessagesBody>(),
-  headers: () => ({ "anthropic-version": "2023-06-01" }),
-})
+export const routes = [responsesRoute, chatRoute]

-export const routes = [responsesRoute, chatRoute, messagesRoute]
-
-const configuredRoute = <Body, Prepared>(
-  route: Route<Body, Prepared>,
-  input: Config,
-  defaultBaseURL = (region: string) => `https://bedrock-mantle.${region}.api.aws/v1`,
-) => {
+const configuredRoute = <Body, Prepared>(route: Route<Body, Prepared>, input: Config) => {
  const region = BedrockAuth.resolveRegion(input)
  return route.with({
-    endpoint: { baseURL: input.baseURL ?? defaultBaseURL(region) },
+    endpoint: { baseURL: input.baseURL ?? `https://bedrock-mantle.${region}.api.aws/v1` },
    auth: BedrockAuth.resolveAuth(input, region, {
      service: "bedrock-mantle",
      name: "Bedrock Mantle",
@@ -117,11 +87,6 @@ export const configure = (input: Config = {}) => {
    })
  const configuredResponsesRoute = configuredRoute(responsesRoute, input)
  const configuredChatRoute = configuredRoute(chatRoute, input)
-  const configuredMessagesRoute = configuredRoute(
-    messagesRoute,
-    input,
-    (region) => `https://bedrock-mantle.${region}.api.aws/anthropic/v1`,
-  )
  const modelDefaults = defaults(input)
  const responses = (modelID: string | ModelID) =>
    configuredResponsesRoute
@@ -131,14 +96,11 @@ export const configure = (input: Config = {}) => {
    configuredChatRoute
      .with(withOpenAIOptions(modelID, modelDefaults))
      .model<OpenAIProviderOptionsInput>({ id: modelID })
-  const messages = (modelID: string | ModelID) =>
-    configuredMessagesRoute.with(modelDefaults).model<AnthropicMessages.ProviderOptionsInput>({ id: modelID })

  return {
    id,
    model: responses,
    chat,
-    messages,
    responses,
    configure,
  }
@@ -157,7 +119,7 @@ const fromSettings = ({
  region,
  topP,
  ...providerOptions
-}: Settings<Config["providerOptions"]>) =>
+}: Settings) =>
  configure({
    apiKey,
    auth,
@@ -175,10 +137,6 @@ export const chatModel: ProviderPackage.Definition<Settings, OpenAIProviderOptio
  modelID,
  settings,
 ) => fromSettings(settings).chat(modelID)
-export const messagesModel: ProviderPackage.Definition<
-  MessagesSettings,
-  AnthropicMessages.ProviderOptionsInput
->["model"] = (modelID, settings) => fromSettings(settings).messages(modelID)
 export const responsesModel: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (
  modelID,
  settings,
@@ -1,2 +0,0 @@
-export { messagesModel as model } from "../../amazon-bedrock-mantle.js"
-export type { MessagesSettings as Settings } from "../../amazon-bedrock-mantle.js"
@@ -1,66 +0,0 @@
-import { CohereChat } from "../protocols/cohere-chat.js"
-import { OpenAIChat } from "../protocols/openai-chat.js"
-import { Route, type RouteDefaultsInput } from "../route/client.js"
-import { Endpoint } from "../route/endpoint.js"
-import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
-import { ProviderID, type ModelID, type OpenString } from "../schema/index.js"
-import type { ProviderPackage } from "../provider-package.js"
-
-export const id = ProviderID.make("cohere")
-const COMPATIBILITY_BASE_URL = "https://api.cohere.ai/compatibility/v1"
-export type ChatOptionsInput = { readonly reasoningEffort?: OpenString<"none" | "high"> }
-export type ProviderOptions = CohereChat.ProviderOptionsInput & ChatOptionsInput
-export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
-  ProviderAuthOption<"optional"> & {
-    readonly baseURL?: string
-    readonly providerOptions?: ProviderOptions
-  }
-export type Settings<Options = CohereChat.ProviderOptionsInput> = ProviderPackage.Settings &
-  Options & { readonly apiKey?: string; readonly baseURL?: string }
-
-export const route = CohereChat.route
-export const chatRoute = Route.make({
-  id: "cohere-chat-completions",
-  provider: id,
-  providerMetadataKey: "cohere",
-  protocol: OpenAIChat.protocol,
-  endpoint: Endpoint.path("/chat/completions", { baseURL: COMPATIBILITY_BASE_URL }),
-  framing: OpenAIChat.framing,
-})
-export const routes = [route, chatRoute]
-
-export const configure = (input: LanguageModelOptions = {}) => {
-  const { apiKey: _apiKey, auth: _auth, baseURL, ...defaults } = input
-  const auth = AuthOptions.bearer(input, "COHERE_API_KEY")
-  const native = route.with({ ...defaults, auth, endpoint: { baseURL: baseURL ?? CohereChat.DEFAULT_BASE_URL } })
-  const chat = chatRoute.with({ ...defaults, auth, endpoint: { baseURL: baseURL ?? COMPATIBILITY_BASE_URL } })
-  return {
-    id,
-    model: (modelID: string | ModelID) => native.model<CohereChat.ProviderOptionsInput>({ id: modelID }),
-    chat: (modelID: string | ModelID) =>
-      chat.model<ChatOptionsInput>({
-        id: modelID,
-        compatibility: {
-          maxTokensField: "max_tokens",
-          supportsStore: false,
-          supportsUsageInStreaming: true,
-          reasoningField: "reasoning_content",
-          supportsStrictMode: false,
-        },
-      }),
-    configure,
-  }
-}
-export const provider = configure()
-export const model: ProviderPackage.Definition<Settings, CohereChat.ProviderOptionsInput>["model"] = (
-  modelID,
-  { apiKey, baseURL, body, headers, ...providerOptions },
-) =>
-  configure({
-    apiKey,
-    baseURL,
-    headers,
-    http: body === undefined ? undefined : { body: { ...body } },
-    providerOptions,
-  }).model(modelID)
-export * as Cohere from "./cohere.js"
@@ -1,16 +0,0 @@
-import type { ProviderPackage } from "../../provider-package.js"
-import { Cohere } from "../cohere.js"
-
-export type Settings = Cohere.Settings<Cohere.ChatOptionsInput>
-
-export const model: ProviderPackage.Definition<Settings, Cohere.ChatOptionsInput>["model"] = (
-  modelID,
-  { apiKey, baseURL, body, headers, ...providerOptions },
-) =>
-  Cohere.configure({
-    apiKey,
-    baseURL,
-    headers,
-    http: body === undefined ? undefined : { body: { ...body } },
-    providerOptions,
-  }).chat(modelID)
@@ -5,7 +5,6 @@ import { MediaRoute } from "../route/media.js"
 import type { ProviderPackage } from "../provider-package.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
 import { Gemini } from "../protocols/gemini.js"
-import { GoogleInteractions } from "../protocols/google-interactions.js"
 import { GoogleImages } from "../protocols/google-images.js"
 import { GoogleSpeech } from "../protocols/google-speech.js"
 import { GoogleTranscription } from "../protocols/google-transcription.js"
@@ -17,16 +16,15 @@ export type { GoogleTranscriptionOptions } from "../protocols/google-transcripti
 export type { GoogleVideoOptions } from "../protocols/google-video.js"
 export type GeminiOptionsInput = Gemini.OptionsInput
 export type GeminiProviderOptionsInput = Gemini.ProviderOptionsInput
-export type GoogleInteractionsOptionsInput = GoogleInteractions.OptionsInput

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

-export const routes = [Gemini.route, GoogleInteractions.route]
+export const routes = [Gemini.route]

 export type Config = RouteDefaultsInput &
  ProviderAuthOption<"optional"> & {
    readonly baseURL?: string
-    readonly providerOptions?: Gemini.ProviderOptionsInput & GoogleInteractions.ProviderOptionsInput
+    readonly providerOptions?: Gemini.ProviderOptionsInput
  }

 export type Settings = ProviderPackage.Settings &
@@ -47,19 +45,12 @@ const configuredRoute = (input: Config) => {
  return Gemini.route.with({ ...rest, endpoint: { baseURL }, auth: auth(input) })
 }

-const interactionsRoute = (input: Config) => {
-  const { apiKey: _, auth: _auth, baseURL, ...rest } = input
-  return GoogleInteractions.route.with({ ...rest, endpoint: { baseURL }, auth: auth(input) })
-}
-
 export const configure = (input: Config = {}) => {
  const route = configuredRoute(input)
  const media = MediaRoute.deployment(input, auth(input))
  return {
    id,
    model: (modelID: string | ModelID) => route.model<Gemini.ProviderOptionsInput>({ id: modelID }),
-    interactions: (modelID: string | ModelID) =>
-      interactionsRoute(input).model<GoogleInteractions.ProviderOptionsInput>({ id: modelID }),
    image: (modelID: string | ModelID) => GoogleImages.model({ ...media, id: modelID }),
    video: (modelID: string | ModelID) => GoogleVideo.model({ ...media, id: modelID }),
    speech: (modelID: string | ModelID) => GoogleSpeech.model({ ...media, id: modelID }),
@@ -82,7 +73,6 @@ export const model: ProviderPackage.Definition<Settings, Gemini.ProviderOptionsI
  }).model(modelID)

 export const image = provider.image
-export const interactions = provider.interactions
 export const video = provider.video
 export const speech = provider.speech
 export const transcription = provider.transcription
@@ -1,21 +0,0 @@
-import { configure } from "../google.js"
-import type { ProviderPackage } from "../../provider-package.js"
-import type { GoogleInteractions } from "../../protocols/google-interactions.js"
-
-export type Settings = ProviderPackage.Settings &
-  GoogleInteractions.ProviderOptionsInput & {
-    readonly apiKey?: string
-    readonly baseURL?: string
-  }
-
-export const model: ProviderPackage.Definition<Settings, GoogleInteractions.ProviderOptionsInput>["model"] = (
-  modelID,
-  { apiKey, baseURL, body, headers, ...providerOptions },
-) =>
-  configure({
-    apiKey,
-    baseURL,
-    headers: headers === undefined ? undefined : { ...headers },
-    http: body === undefined ? undefined : { body: { ...body } },
-    providerOptions,
-  }).interactions(modelID)
@@ -9,7 +9,6 @@ export * as Baseten from "./baseten.js"
 export * as BlackForestLabs from "./black-forest-labs.js"
 export * as Cartesia from "./cartesia.js"
 export * as Cerebras from "./cerebras.js"
-export * as Cohere from "./cohere.js"
 export * as CloudflareAIGateway from "./cloudflare-ai-gateway.js"
 export * as CloudflareWorkersAI from "./cloudflare-workers-ai.js"
 export * as DeepInfra from "./deepinfra.js"
@@ -40,7 +39,6 @@ export * as Stability from "./stability.js"
 export * as TogetherAI from "./togetherai.js"
 export * as TypeSafeAI from "./typesafe-ai.js"
 export * as VercelAIGateway from "./vercel-ai-gateway.js"
-export * as Venice from "./venice.js"
 export * as XAI from "./xai.js"
 export * as ZAI from "./zai.js"
 export * as ZAICodingPlan from "./zai-coding-plan.js"
@@ -50,7 +50,7 @@ export const gpt5DefaultOptions = (modelID: string): ProviderOptions | undefined
 export const openAIDefaultOptions = (modelID: string): ProviderOptions | undefined =>
  mergeProviderOptions(openAIProviderOptions({ store: false }), gpt5DefaultOptions(modelID))

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

 export class MissingCredentialError extends Error {
@@ -95,7 +95,7 @@ export const optional = (secret: Secret | undefined, source = "optional value")
 export const config = (name: string) =>
  credential(
    Effect.gen(function* () {
-      const secret = yield* Config.option(Config.redacted(name))
+      const secret = yield* Config.option(Config.Redacted(name))
      if (Option.isSome(secret) && Redacted.value(secret.value) !== "") return secret.value
      return yield* Effect.fail(new MissingCredentialError(name, `${name} is not set`))
    }),
@@ -358,6 +358,7 @@ function makeFromTransport<Body, Prepared, Frame, Event, State>(
  input: MakeTransportInput<Body, Prepared, Frame, Event, State>,
 ): Route<Body, Prepared> {
  const protocol = input.protocol
+  const encodeBody = Schema.encodeSync(Schema.fromJsonString(protocol.body.schema))
  const decodeEventEffect = Schema.decodeUnknownEffect(protocol.stream.event)
  const decodeEvent = (route: string) => (frame: Frame) =>
    decodeEventEffect(frame).pipe(
@@ -416,7 +417,7 @@ function makeFromTransport<Body, Prepared, Frame, Event, State>(
          request,
          endpoint: routeInput.endpoint,
          auth: routeInput.auth ?? Auth.none,
-          encodeBody: ProviderShared.encodeJson,
+          encodeBody,
          middleware: options?.http,
          webSocket: options?.webSocket,
        }),
@@ -575,7 +576,9 @@ const compile = Effect.fn("LLM.compile")(function* (request: LLMRequest, options
  const resolved = prepareRequest(request)
  const route = resolved.model.route

-  const body = yield* route.body.from(resolved)
+  const body = yield* route.body
+    .from(resolved)
+    .pipe(Effect.flatMap(ProviderShared.validateWith(Schema.decodeUnknownEffect(route.body.schema))))
  const prepared = yield* route.prepareTransport(body, resolved, options)

  return {
@@ -1,5 +1,5 @@
 import { Context, type Effect } from "effect"
-import type { HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
+import type { HttpClientRequest, HttpClientResponse } from "effect/http"
 import type { AIError } from "../schema/errors.js"

 // The service tag lives in its own leaf module so `Media.Asset` (imported by the schema layer) can require the
@@ -6,7 +6,7 @@ import {
  HttpClientError,
  HttpClientRequest,
  HttpClientResponse,
-} from "effect/unstable/http"
+} from "effect/http"
 import { HttpContext, HttpRateLimitDetails, AIError, TransportError } from "../schema/index.js"
 import { classifyProviderFailure, providerErrorMessage } from "../provider-error.js"
 import { Service, type HttpMiddleware, type Interface } from "./executor-service.js"
@@ -159,15 +159,6 @@ const nativeTransportFailure = (error: unknown) => {
  return failure
 }

-// HTTP hooks re-wrap response bodies, so a read failure can arrive as an HttpClientError caused by
-// another HttpClientError. The innermost cause carries the native failure.
-const rootCause = (error: unknown): unknown =>
-  HttpClientError.isHttpClientError(error) && "cause" in error.reason && error.reason.cause !== undefined
-    ? rootCause(error.reason.cause)
-    : error
-
-const CONNECTION_LOST = "Connection lost while reading the response"
-
 const httpError = (input: {
  readonly error: unknown
  readonly request: HttpClientRequest.HttpClientRequest
@@ -188,21 +179,20 @@ const httpError = (input: {
      }),
    })

-  const source = rootCause(input.error)
+  const source =
+    HttpClientError.isHttpClientError(input.error) && "cause" in input.error.reason
+      ? (input.error.reason.cause ?? input.error)
+      : input.error
  const native = nativeTransportFailure(source)
  const code = native?.code
-  const detail =
-    code && native?.message && !native.message.includes(code) ? `${code}: ${native.message}` : native?.message
-  const message = detail ?? (input.error instanceof Error ? input.error.message : undefined)
+  const raw = native?.message ?? (input.error instanceof Error ? input.error.message : undefined)
+  const detail = raw
+  const message = code && detail && !detail.includes(code) ? `${code}: ${detail}` : detail

  if (Cause.isTimeoutError(input.error) || Cause.isTimeoutError(source))
    return transportError({ message: message ?? "HTTP transport timed out", code: code ?? "Timeout" })
  if (!HttpClientError.isHttpClientError(input.error))
    return transportError({ message: message ?? "HTTP transport failed", code })
-  // Effect reports every response body read failure as a DecodeError, but the raw byte stream decodes
-  // nothing: provider output parsing happens later and fails as InvalidProviderOutput.
-  if (input.operation === "read" && input.error.reason._tag === "DecodeError")
-    return transportError({ message: detail ? `${CONNECTION_LOST}: ${detail}` : CONNECTION_LOST, code })
  if (input.error.reason._tag === "TransportError") {
    return transportError({
      message: message ?? input.error.reason.description ?? "HTTP transport failed",
@@ -1,5 +1,5 @@
 import { Effect, Stream } from "effect"
-import { makeParser } from "effect/unstable/encoding/Sse"
+import { makeParser, type Event } from "effect/encoding/Sse"
 import { AIError, InvalidProviderOutputError } from "../schema/index.js"

 /**
@@ -42,39 +42,43 @@ export const sseFraming = (
    Stream.decodeText(),
    Stream.mapAccumEffect(
      () => {
-        const output: string[] = []
+        const output: Event[] = []
        return {
          output,
          parser: makeParser((event) => {
-            if (
-              event._tag === "Event" &&
-              (events === undefined || events.has(event.event)) &&
-              event.data.length > 0 &&
-              // Some OpenAI-compatible proxies serialize an empty flush as a bare
-              // `data: null`, between events or after `[DONE]`. No protocol has a
-              // null event, so it carries nothing and must not abort the stream.
-              event.data !== "null" &&
-              // Vertex AI partner models (e.g. `xai/grok-4.6`) send their SSE
-              // keepalive comment as `data: : keepalive` while reasoning.
-              event.data !== ": keepalive" &&
-              (event.data !== "[DONE]" || includeDone || (events !== undefined && event.event !== "message"))
-            )
-              output.push(event.data)
+            if (event._tag === "Event") output.push(event)
          }),
        }
      },
-      (state, chunk) => {
-        const error = state.parser.feed(chunk)
-        if (!error) return Effect.succeed([state, state.output.splice(0)] as const)
-        const reason = new InvalidProviderOutputError({
-          route: "sse",
-          message: error.message,
-          body: chunk,
-          cause: error,
-        })
-        return Effect.fail(new AIError({ reason }))
-      },
+      (state, chunk) =>
+        Effect.gen(function* () {
+          const error = state.parser.feed(chunk)
+          if (error)
+            return yield* new AIError({
+              reason: new InvalidProviderOutputError({
+                route: "sse",
+                message: error.message,
+                body: chunk,
+                cause: error,
+              }),
+            })
+          return [state, state.output.splice(0)] as const
+        }),
    ),
+    Stream.filter(
+      (event) =>
+        (events === undefined || events.has(event.event)) &&
+        event.data.length > 0 &&
+        // Some OpenAI-compatible proxies serialize an empty flush as a bare
+        // `data: null`, between events or after `[DONE]`. No protocol has a
+        // null event, so it carries nothing and must not abort the stream.
+        event.data !== "null" &&
+        // Vertex AI partner models (e.g. `xai/grok-4.6`) send their SSE
+        // keepalive comment as `data: : keepalive` while reasoning.
+        event.data !== ": keepalive" &&
+        (event.data !== "[DONE]" || includeDone || (events !== undefined && event.event !== "message")),
+    ),
+    Stream.map((event) => event.data),
  )

 /** Server-Sent Events framing. Used by every JSON-streaming HTTP provider. */
@@ -1,5 +1,5 @@
 import { Clock, Duration, Effect, Schema, type Stream } from "effect"
-import { HttpClientResponse } from "effect/unstable/http"
+import { HttpClientResponse } from "effect/http"
 import type { Snapshot, Status } from "../generation.js"
 import { Media } from "../media.js"
 import type { AuthInput } from "./auth.js"
@@ -1,5 +1,5 @@
 import { Duration, Effect, Schedule, Schema, Stream } from "effect"
-import { Headers, HttpClientRequest, type HttpClientResponse } from "effect/unstable/http"
+import { Headers, HttpClientRequest, type HttpClientResponse } from "effect/http"
 import { Auth, type AuthInput } from "./auth.js"
 import { Endpoint } from "./endpoint.js"
 import { RequestExecutorService, type Interface } from "./executor-service.js"
@@ -1,19 +1,11 @@
-import { Clock, Duration, Effect, Stream } from "effect"
-import { Headers, HttpClientRequest } from "effect/unstable/http"
+import { Effect } from "effect"
+import { Headers, HttpClientRequest } from "effect/http"
 import { Auth } from "../auth.js"
 import { render as renderEndpoint } from "../endpoint.js"
 import { Framing } from "../framing.js"
 import type { HttpMiddleware, Transport, TransportPrepareInput } from "./index.js"
 import * as ProviderShared from "../../protocols/shared.js"
-import {
-  AIError,
-  DEFAULT_HTTP_TIMEOUT_MS,
-  mergeJsonRecords,
-  TransportError,
-  type HttpContext,
-  type HttpTimeout,
-  type LLMRequest,
-} from "../../schema/index.js"
+import { mergeJsonRecords, type LLMRequest } from "../../schema/index.js"
 import { RequestExecutor } from "../executor.js"

 export type JsonRequestInput<Body> = TransportPrepareInput<Body>
@@ -95,53 +87,17 @@ export const httpJson = <Body, Frame>(input: HttpJsonInput<Body, Frame>): HttpJs
        middleware: prepareInput.middleware,
      }
    }),
-  execute: (prepared, request, runtime) =>
+  execute: (prepared, _request, runtime) =>
    Effect.gen(function* () {
-      const timeout = (operation: "request" | "read", message: string, http?: HttpContext) =>
-        new AIError({
-          reason: new TransportError({
-            message,
-            transport: "http",
-            operation,
-            code: "Timeout",
-            url: prepared.request.url,
-            http,
-          }),
-        })
-      const started = yield* Clock.currentTimeMillis
-      // Unlike the header and chunk limits, the whole-request budget has no default.
-      const total = request.http?.timeout ? Duration.millis(request.http.timeout) : Duration.infinity
-      const response = yield* runtime.http.execute(prepared.request, prepared.middleware).pipe(
-        Effect.timeoutOrElse({
-          duration: Duration.min(timeoutDuration(request.http?.headerTimeout), total),
-          orElse: () => timeout("request", "Timed out waiting for response headers"),
-        }),
-      )
-      const http = RequestExecutor.responseHttp(response)
-      const remaining = Duration.subtract(total, Duration.millis((yield* Clock.currentTimeMillis) - started))
+      const response = yield* runtime.http.execute(prepared.request, prepared.middleware)
      return {
-        frames: prepared.framing.frame(
-          RequestExecutor.responseStream(response).pipe(
-            Stream.timeoutOrElse({
-              duration: timeoutDuration(request.http?.chunkTimeout),
-              orElse: () => Stream.fail(timeout("read", "Timed out waiting for response data", http)),
-            }),
-            Stream.interruptWhen(
-              Effect.sleep(remaining).pipe(
-                Effect.andThen(Effect.fail(timeout("read", "Timed out waiting for the response to complete", http))),
-              ),
-            ),
-          ),
-        ),
-        http,
+        frames: prepared.framing.frame(RequestExecutor.responseStream(response)),
+        http: RequestExecutor.responseHttp(response),
        body: prepared.framing.body,
      }
    }),
 })

-const timeoutDuration = (value: HttpTimeout | undefined) =>
-  value === false ? Duration.infinity : Duration.millis(value ?? DEFAULT_HTTP_TIMEOUT_MS)
-
 export const sseJson = {
  id: "http-json/sse",
  with: <Body>() => httpJson<Body, string>({ framing: Framing.sse }),
@@ -1,5 +1,5 @@
 import type { Effect, Scope, Stream } from "effect"
-import type { Headers } from "effect/unstable/http"
+import type { Headers } from "effect/http"
 import type { AIError, HttpContext } from "../../schema/index.js"

 export interface WebSocketChannelExecutor {
@@ -1,6 +1,6 @@
 import { Cause, Effect, Queue, Stream } from "effect"
-import { Headers } from "effect/unstable/http"
-import { Socket } from "effect/unstable/socket"
+import { Headers } from "effect/http"
+import { Socket } from "effect/socket"
 import {
  AIError,
  AIErrorReason,
@@ -1,4 +1,5 @@
 import { Schema } from "effect"
+import { extendSchema } from "@opencode/schema/schema"
 import { LLM } from "@opencode/schema/llm"
 import { ContentBlockID, ToolCallID } from "./ids.js"
 import {
@@ -339,7 +340,7 @@ const toolCallID = (value: ToolCallID | string) => ToolCallID.make(value)
 * Lets consumers write `events.filter(LLMEvent.is.toolCall)` instead of
 * `events.filter(LLMEvent.guards["tool-call"])`.
 */
-export const LLMEvent = Object.assign(llmEventTagged, {
+export const LLMEvent = extendSchema(llmEventTagged, {
  compaction: CompactionPart.make,
  stepStart: StepStart.make,
  textStart: (input: WithID<TextStart, ContentBlockID>) => TextStart.make({ ...input, id: contentBlockID(input.id) }),
@@ -1,4 +1,5 @@
 import { Schema } from "effect"
+import { extendSchema } from "@opencode/schema/schema"
 import { Tool } from "@opencode/schema/tool"
 import {
  CacheHint,
@@ -28,7 +29,7 @@ export type SystemPart = Schema.Schema.Type<typeof systemPartSchema>

 const makeSystemPart = (text: string): SystemPart => ({ type: "text", text })

-export const SystemPart = Object.assign(systemPartSchema, {
+export const SystemPart = extendSchema(systemPartSchema, {
  make: makeSystemPart,
  content: (input?: string | SystemPart | ReadonlyArray<SystemPart>) => {
    if (input === undefined) return []
@@ -76,7 +77,7 @@ const toolResultValueSchema = Schema.Union([
 export type ToolResultValue = Schema.Schema.Type<typeof toolResultValueSchema>
 const isToolResultValue = Schema.is(toolResultValueSchema)

-export const ToolResultValue = Object.assign(toolResultValueSchema, {
+export const ToolResultValue = extendSchema(toolResultValueSchema, {
  is: isToolResultValue,
  make: (value: unknown, type: ToolResultValue["type"] = "json"): ToolResultValue => {
    if (isToolResultValue(value)) return value
@@ -90,7 +91,7 @@ export interface ToolOutput {
  readonly content: ReadonlyArray<Tool.Content>
 }

-export const ToolOutput = Object.assign(
+export const ToolOutput = extendSchema(
  Schema.Struct({
    structured: Schema.Unknown,
    content: Schema.Array(Tool.Content),
@@ -127,7 +128,7 @@ const toolResultText = (value: unknown) => {
  }
 }

-export const ToolCallPart = Object.assign(
+export const ToolCallPart = extendSchema(
  Schema.Struct({
    type: Schema.Literal("tool-call"),
    id: Schema.String,
@@ -145,7 +146,7 @@ export const ToolCallPart = Object.assign(
 )
 export type ToolCallPart = Schema.Schema.Type<typeof ToolCallPart>

-export const ToolResultPart = Object.assign(
+export const ToolResultPart = extendSchema(
  Schema.Struct({
    type: Schema.Literal("tool-result"),
    id: Schema.String,
@@ -209,7 +210,7 @@ const compactionPartSchema = Schema.Struct({
  )
  .annotate({ identifier: "LLM.Content.Compaction" })
 export type CompactionPart = typeof compactionPartSchema.Type
-export const CompactionPart = Object.assign(compactionPartSchema, {
+export const CompactionPart = extendSchema(compactionPartSchema, {
  make: (input: Omit<CompactionPart, "type" | "encrypted" | "text"> & CompactionContent): CompactionPart =>
    Schema.decodeUnknownSync(compactionPartSchema)({ type: "compaction", ...input }),
 })
@@ -326,7 +327,7 @@ export type ToolNamespaceEntryInput = ToolNamespaceInput & { readonly type: "nam

 export const ToolNamespace: Schema.Codec<ToolNamespace> & {
  readonly make: (input: ToolNamespace | ToolNamespaceInput) => ToolNamespace
-} = Object.assign(
+} = extendSchema(
  Schema.Struct({
    type: Schema.Literal("namespace"),
    name: Schema.String,
@@ -346,7 +347,7 @@ export type ToolEntry = ToolDefinition | ToolNamespace
 export type ToolEntryInput = ToolDefinition.Input | ToolNamespaceEntryInput
 export const ToolEntry: Schema.Codec<ToolEntry> & {
  readonly make: (input: ToolEntryInput) => ToolEntry
-} = Object.assign(
+} = extendSchema(
  Schema.Union([ToolDefinition, ToolNamespace]).pipe(
    Schema.toTaggedUnion("type"),
    Schema.annotate({ identifier: "LLM.ToolEntry" }),
@@ -48,23 +48,10 @@ export const mergeProviderOptions = (
  ...items: ReadonlyArray<ProviderOptions | undefined>
 ): ProviderOptions | undefined => mergeJsonRecords(...items)

-/** Milliseconds for an HTTP timeout, or `false` to disable it. */
-export const HttpTimeout = Schema.Union([Schema.Number.check(Schema.isGreaterThan(0)), Schema.Literal(false)])
-export type HttpTimeout = Schema.Schema.Type<typeof HttpTimeout>
-
-/** Applied to `headerTimeout` and `chunkTimeout` when a request leaves them unset. */
-export const DEFAULT_HTTP_TIMEOUT_MS = 300_000
-
 export class HttpOptions extends Schema.Class<HttpOptions>("AI.HttpOptions")({
  body: Schema.optional(JsonSchema),
  headers: Schema.optional(Schema.Record(Schema.String, Schema.String)),
  query: Schema.optional(Schema.Record(Schema.String, Schema.String)),
-  /** Time allowed for the whole request, from send until the response completes. Unbounded when unset. */
-  timeout: Schema.optional(HttpTimeout),
-  /** Time allowed for response headers to arrive. */
-  headerTimeout: Schema.optional(HttpTimeout),
-  /** Time allowed between streamed response chunks once headers have arrived. */
-  chunkTimeout: Schema.optional(HttpTimeout),
 }) {}

 export namespace HttpOptions {
@@ -83,12 +70,8 @@ export const mergeHttpOptions = (...items: ReadonlyArray<HttpOptions | undefined
  const body = mergeJsonRecords(...items.map((item) => item?.body))
  const headers = mergeStringRecords(...items.map((item) => item?.headers))
  const query = mergeStringRecords(...items.map((item) => item?.query))
-  const timeout = items.findLast((item) => item?.timeout !== undefined)?.timeout
-  const headerTimeout = items.findLast((item) => item?.headerTimeout !== undefined)?.headerTimeout
-  const chunkTimeout = items.findLast((item) => item?.chunkTimeout !== undefined)?.chunkTimeout
-  if (!body && !headers && !query && timeout === undefined && headerTimeout === undefined && chunkTimeout === undefined)
-    return undefined
-  return new HttpOptions({ body, headers, query, timeout, headerTimeout, chunkTimeout })
+  if (!body && !headers && !query) return undefined
+  return new HttpOptions({ body, headers, query })
 }

 export class GenerationOptions extends Schema.Class<GenerationOptions>("LLM.GenerationOptions")({
@@ -1,4 +1,5 @@
 import { Effect, Schema, Stream } from "effect"
+import { extendSchema } from "@opencode/schema/schema"
 import { ProgressEvent, QueuedEvent } from "./generation.js"
 import { Media } from "./media.js"
 import { MediaModel, composeRoute, tryRequest } from "./media-model.js"
@@ -141,7 +142,7 @@ const speechEventTagged = Schema.Union([
  SpeechTimestampsEvent,
  SpeechFinishEvent,
 ]).pipe(Schema.toTaggedUnion("type"))
-export const SpeechEvent = Object.assign(speechEventTagged, {
+export const SpeechEvent = extendSchema(speechEventTagged, {
  is: {
    generationQueued: speechEventTagged.guards["generation-queued"],
    generationProgress: speechEventTagged.guards["generation-progress"],
@@ -231,7 +231,8 @@ export const toDefinitions = (tools: Tools): ReadonlyArray<ToolDefinitionClass>
  )

 const toJsonSchema = (schema: Schema.Top): JsonSchema.JsonSchema => {
-  const document = Schema.toJsonSchemaDocument(schema)
+  // Keep provider-facing tool schemas closed; Effect 4's default now emits additionalProperties: true.
+  const document = Schema.toJsonSchemaDocument(schema, { onExcessProperty: "error" })
  if (Object.keys(document.definitions).length === 0) return document.schema
  return { ...document.schema, $defs: document.definitions }
 }
@@ -1,4 +1,5 @@
 import { Effect, Schema, Stream } from "effect"
+import { extendSchema } from "@opencode/schema/schema"
 import { Generation, ProgressEvent, QueuedEvent, type AwaitOptions } from "./generation.js"
 import { Media } from "./media.js"
 import { MediaModel, composeRoute, tryRequest } from "./media-model.js"
@@ -159,7 +160,7 @@ const transcriptionEventTagged = Schema.Union([
  TranscriptionSegmentEvent,
  TranscriptionFinishEvent,
 ]).pipe(Schema.toTaggedUnion("type"))
-export const TranscriptionEvent = Object.assign(transcriptionEventTagged, {
+export const TranscriptionEvent = extendSchema(transcriptionEventTagged, {
  is: {
    generationQueued: transcriptionEventTagged.guards["generation-queued"],
    generationProgress: transcriptionEventTagged.guards["generation-progress"],
@@ -1,4 +1,5 @@
 import { Effect, Schema, Stream } from "effect"
+import { extendSchema } from "@opencode/schema/schema"
 import { Generation, ProgressEvent, QueuedEvent, type AwaitOptions } from "./generation.js"
 import { Media } from "./media.js"
 import { MediaModel, composeRoute, tryRequest } from "./media-model.js"
@@ -136,7 +137,7 @@ export const VideoFinishEvent = Schema.Struct({
 const videoEventTagged = Schema.Union([QueuedEvent, ProgressEvent, VideoOutputEvent, VideoFinishEvent]).pipe(
  Schema.toTaggedUnion("type"),
 )
-export const VideoEvent = Object.assign(videoEventTagged, {
+export const VideoEvent = extendSchema(videoEventTagged, {
  is: {
    generationQueued: videoEventTagged.guards["generation-queued"],
    generationProgress: videoEventTagged.guards["generation-progress"],
@@ -14,6 +14,7 @@ import * as GoogleVertexChat from "../src/providers/google-vertex-chat.js"
 import * as GoogleVertexMessages from "../src/providers/google-vertex-messages.js"
 import * as GoogleVertexResponses from "../src/providers/google-vertex-responses.js"
 import * as OpenAI from "../src/providers/openai.js"
+import * as OpenAICompatible from "../src/providers/openai-compatible.js"
 import * as OpenRouter from "../src/providers/openrouter.js"
 import * as XAI from "../src/providers/xai.js"

@@ -29,7 +30,7 @@ type LanguageModel = {
 declare const auth: Auth.Definition
 declare const optionalAuthModel: LanguageModelFactory<BaseOptions, "optional", LanguageModel>
 declare const requiredAuthModel: LanguageModelFactory<BaseOptions, "required", LanguageModel>
-const configApiKey = Config.redacted("OPENAI_API_KEY")
+const configApiKey = Config.Redacted("OPENAI_API_KEY")

 OpenAIChat.route.model({ id: "gpt-4.1-mini" })

@@ -1,6 +1,6 @@
 import { describe, expect } from "bun:test"
 import { ConfigProvider, Effect } from "effect"
-import { Headers } from "effect/unstable/http"
+import { Headers } from "effect/http"
 import { LLM } from "../src/index.js"
 import { Auth } from "../src/route/auth.js"
 import * as OpenAIChat from "../src/protocols/openai-chat.js"
@@ -145,59 +145,6 @@ describe("applyCachePolicy", () => {
    }),
  )

-  it.effect("Alibaba chat caches the system and conversation tail without marking tools", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: Alibaba.configure({ region: "ap-southeast-1", apiKey: "test" }).chat("qwen3.8-max"),
-          system: "You are concise.",
-          tools: [{ name: "lookup", description: "Look up a value", inputSchema: { type: "object", properties: {} } }],
-          prompt: "hi",
-        }),
-      )
-
-      expect(prepared.body).toMatchObject({
-        tools: [{ type: "function", function: { name: "lookup" } }],
-        messages: [
-          {
-            role: "system",
-            content: [{ text: "You are concise.", cache_control: { type: "ephemeral" } }],
-          },
-          { role: "user", content: [{ text: "hi", cache_control: { type: "ephemeral" } }] },
-        ],
-      })
-      expect(prepared.body.tools?.[0]?.cache_control).toBeUndefined()
-    }),
-  )
-
-  it.effect("Alibaba chat omits automatic cache markers when cache is none", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: Alibaba.configure({ region: "ap-southeast-1", apiKey: "test" }).chat("qwen3.8-max"),
-          system: "You are concise.",
-          prompt: "hi",
-          cache: "none",
-        }),
-      )
-
-      expect(JSON.stringify(prepared.body)).not.toContain("cache_control")
-    }),
-  )
-
-  it.effect("Alibaba chat does not assume non-Qwen models support cache markers", () =>
-    Effect.gen(function* () {
-      const alibaba = Alibaba.configure({ region: "ap-southeast-1", apiKey: "test" })
-      for (const modelID of ["kimi-k3", "glm-5.2", "deepseek-v4-flash-0731", "MiniMax-M2.5"]) {
-        const prepared = yield* compileRequest(
-          LLM.request({ model: alibaba.chat(modelID), system: "You are concise.", prompt: "hi" }),
-        )
-
-        expect(JSON.stringify(prepared.body)).not.toContain("cache_control")
-      }
-    }),
-  )
-
  it.effect("'auto' emits Anthropic cache markers on Anthropic-compatible routes", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -1,6 +1,6 @@
 import { expect } from "bun:test"
 import { Effect } from "effect"
-import { FetchHttpClient } from "effect/unstable/http"
+import { FetchHttpClient } from "effect/http"
 import { LLM, LLMRequest, Message } from "../src/index.js"
 import { LLMClient } from "../src/route/client.js"
 import { OpenAI } from "../src/providers.js"
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import { Effect, Ref, Schema } from "effect"
-import { HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
+import { HttpClientRequest, HttpClientResponse } from "effect/http"
 import {
  LLM,
  LLMRequest,
@@ -1,12 +1,13 @@
 import { describe, expect, test } from "bun:test"
 import { Effect } from "effect"
-import { LLM, Message, ToolCallPart } from "../src/index.js"
+import { LLM, LLMRequest, Message, ToolCallPart } from "../src/index.js"
 import { Auth, LLMClient } from "../src/route.js"
 import { compileRequest } from "../src/route/client.js"
 import { AnthropicMessages } from "../src/protocols/anthropic-messages.js"
 import { OpenAIResponses } from "../src/protocols/openai-responses.js"
 import { Gemini } from "../src/protocols/gemini.js"
-import { AmazonBedrockMantle, GoogleVertexMessages, OpenAI } from "../src/providers.js"
+import { GoogleVertexMessages, OpenAI } from "../src/providers.js"
+import { applyCachePolicy } from "../src/cache-policy.js"
 import { applyEffortUpdates } from "../src/effort-updates.js"
 import { it, testEffect } from "./lib/effect.js"
 import { dynamicResponse } from "./lib/http.js"
@@ -171,33 +172,6 @@ describe("Anthropic Messages effort updates", () => {
    }),
  )

-  it.effect("releases a held system update next to an effort marker as one valid section", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: opus5,
-          messages: [
-            Message.user("Fix it."),
-            Message.assistant("Done."),
-            lowFromHigh,
-            Message.system("Update."),
-            Message.user("Next."),
-          ],
-          providerOptions: { effort: "low" },
-          cache: "none",
-        }),
-      )
-
-      expect(prepared.body.messages).toEqual([
-        { role: "user", content: [{ type: "text", text: "Fix it." }] },
-        { role: "assistant", content: [{ type: "text", text: "Done." }] },
-        { role: "system", content: [], output_config: { effort: "low" } },
-        { role: "user", content: [{ type: "text", text: "Next." }] },
-        { role: "system", content: [{ type: "text", text: "Update.", cache_control: undefined }] },
-      ])
-    }),
-  )
-
  it.effect("falls back to a plain top-level effort when history drifted from the current effort", () =>
    Effect.gen(function* () {
      const drifted = yield* compileRequest(
@@ -268,31 +242,6 @@ describe("Anthropic Messages effort updates", () => {
    }),
  )

-  it.effect("strips markers for Opus 5.0 on Bedrock Mantle Messages while lowering Opus 5.5", () =>
-    Effect.gen(function* () {
-      const mantle = AmazonBedrockMantle.configure({ apiKey: "test", region: "us-east-1" })
-      const opus50 = yield* compileRequest(
-        LLM.request({
-          model: mantle.messages("anthropic.claude-opus-5"),
-          messages: conversation,
-          providerOptions: { effort: "low" },
-        }),
-      )
-      const opus55 = yield* compileRequest(
-        LLM.request({
-          model: mantle.messages("anthropic.claude-opus-5-5"),
-          messages: conversation,
-          providerOptions: { effort: "low" },
-        }),
-      )
-
-      expect(systemMessages(opus50.body)).toHaveLength(0)
-      expect(opus50.body.output_config).toEqual({ effort: "low" })
-      expect(systemMessages(opus55.body)).toEqual([{ role: "system", content: [], output_config: { effort: "low" } }])
-      expect(opus55.body.output_config).toEqual({ effort: "high" })
-    }),
-  )
-
  it.effect("strips markers on the Vertex Anthropic route, whose protocol wrapper does not forward support", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(