fix(ai): replay function call item ids

fix(ai): keep response ids provider-owned
fix(ai): stop generating response item ids
2026-08-08 10:09:52 -04:00 · 2026-08-07 22:30:52 -05:00 · 2026-08-07 17:15:00 -05:00 · 2026-08-07 14:26:50 -05:00 · 2026-08-07 14:04:15 -05:00 · 2026-08-07 12:57:48 -05:00
248 changed files with 1259 additions and 13597 deletions
@@ -571,20 +571,6 @@
        "@typescript/native-preview": "catalog:",
      },
    },
-    "packages/merman": {
-      "name": "@opencode-ai/merman",
-      "version": "0.0.0",
-      "dependencies": {
-        "@opencode-ai/plugin": "workspace:*",
-        "@opentui/core": "catalog:",
-        "string-width": "catalog:",
-      },
-      "devDependencies": {
-        "@tsconfig/bun": "catalog:",
-        "@types/bun": "catalog:",
-        "@typescript/native-preview": "catalog:",
-      },
-    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
      "version": "1.18.8",
@@ -693,7 +679,6 @@
        "@opencode-ai/util": "workspace:*",
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
-        "modal": "0.9.0",
      },
      "devDependencies": {
        "@tsconfig/bun": "catalog:",
@@ -896,7 +881,6 @@
      "dependencies": {
        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/core": "workspace:*",
-        "@opencode-ai/merman": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
        "@opencode-ai/schema": "workspace:*",
        "@opencode-ai/simulation": "workspace:*",
@@ -1528,18 +1512,6 @@

    "@capsizecss/unpack": ["@capsizecss/unpack@2.4.0", "", { "dependencies": { "blob-to-buffer": "^1.2.8", "cross-fetch": "^3.0.4", "fontkit": "^2.0.2" } }, "sha512-GrSU71meACqcmIUxPYOJvGKF0yryjN/L1aCuE9DViCTJI7bfkjgYDPD1zbNDcINJwSSP6UaBZY9GAbYDO7re0Q=="],

-    "@cbor-extract/cbor-extract-darwin-arm64": ["@cbor-extract/cbor-extract-darwin-arm64@2.2.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ZKZ/F8US7JR92J4DMct6cLW/Y66o2K576+zjlEN/MevH70bFIsB10wkZEQPLzl2oNh2SMGy55xpJ9JoBRl5DOA=="],
-
-    "@cbor-extract/cbor-extract-darwin-x64": ["@cbor-extract/cbor-extract-darwin-x64@2.2.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-32b1mgc+P61Js+KW9VZv/c+xRw5EfmOcPx990JbCBSkYJFY0l25VinvyyWfl+3KjibQmAcYwmyzKF9J4DyKP/Q=="],
-
-    "@cbor-extract/cbor-extract-linux-arm": ["@cbor-extract/cbor-extract-linux-arm@2.2.2", "", { "os": "linux", "cpu": "arm" }, "sha512-tNg0za41TpQfkhWjptD+0gSD2fggMiDCSacuIeELyb2xZhr7PrhPe5h66Jc67B/5dmpIhI2QOUtv4SBsricyYQ=="],
-
-    "@cbor-extract/cbor-extract-linux-arm64": ["@cbor-extract/cbor-extract-linux-arm64@2.2.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-wfqgzqCAy/Vn8i6WVIh7qZd0DdBFaWBjPdB6ma+Wihcjv0gHqD/mw3ouVv7kbbUNrab6dKEx/w3xQZEdeXIlzg=="],
-
-    "@cbor-extract/cbor-extract-linux-x64": ["@cbor-extract/cbor-extract-linux-x64@2.2.2", "", { "os": "linux", "cpu": "x64" }, "sha512-rpiLnVEsqtPJ+mXTdx1rfz4RtUGYIUg2rUAZgd1KjiC1SehYUSkJN7Yh+aVfSjvCGtVP0/bfkQkXpPXKbmSUaA=="],
-
-    "@cbor-extract/cbor-extract-win32-x64": ["@cbor-extract/cbor-extract-win32-x64@2.2.2", "", { "os": "win32", "cpu": "x64" }, "sha512-dI+9P7cfWxkTQ+oE+7Aa6onEn92PHgfWXZivjNheCRmTBDBf2fx6RyTi0cmgpYLnD1KLZK9ZYrMxaPZ4oiXhGA=="],
-
    "@chevrotain/types": ["@chevrotain/types@11.1.2", "", {}, "sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw=="],

    "@clack/core": ["@clack/core@1.0.0-alpha.1", "", { "dependencies": { "picocolors": "^1.0.0", "sisteransi": "^1.0.5" } }, "sha512-rFbCU83JnN7l3W1nfgCqqme4ZZvTTgsiKQ6FM0l+r0P+o2eJpExcocBUWUIwnDzL76Aca9VhUdWmB2MbUv+Qyg=="],
@@ -1748,10 +1720,6 @@

    "@graphql-typed-document-node/core": ["@graphql-typed-document-node/core@3.2.0", "", { "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ=="],

-    "@grpc/grpc-js": ["@grpc/grpc-js@1.14.4", "", { "dependencies": { "@grpc/proto-loader": "^0.8.0", "@js-sdsl/ordered-map": "^4.4.2" } }, "sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ=="],
-
-    "@grpc/proto-loader": ["@grpc/proto-loader@0.8.1", "", { "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", "protobufjs": "^7.5.5", "yargs": "^17.7.2" }, "bin": { "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" } }, "sha512-wtF6h+DY6M3YaDBPAmvuuA6jV8Sif9MjtOI5euKFWRgCDl5PeDpPsHR9u2l6St5ceY8AZgoNDww5+HvEsXFsGg=="],
-
    "@happy-dom/global-registrator": ["@happy-dom/global-registrator@20.0.11", "", { "dependencies": { "@types/node": "^20.0.0", "happy-dom": "^20.0.11" } }, "sha512-GqNqiShBT/lzkHTMC/slKBrvN0DsD4Di8ssBk4aDaVgEn+2WMzE6DXxq701ndSXj7/0cJ8mNT71pM7Bnrr6JRw=="],

    "@hono/node-server": ["@hono/node-server@1.19.15", "", { "peerDependencies": { "hono": "^4" } }, "sha512-Za2ai6TLdKjUvnur+eenO6nuYYipVAEhyCAdaV8IRvmU9kK8crOZUSYvIXn72E4f8fJqyAbpcJuTsYYmZp9Deg=="],
@@ -1846,8 +1814,6 @@

    "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],

-    "@js-sdsl/ordered-map": ["@js-sdsl/ordered-map@4.4.2", "", {}, "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw=="],
-
    "@js-temporal/polyfill": ["@js-temporal/polyfill@0.5.1", "", { "dependencies": { "jsbi": "^4.3.0" } }, "sha512-hloP58zRVCRSpgDxmqCWJNlizAlUgJFqG2ypq79DCvyv9tHjRYMDOcPFjzfl/A1/YxDvRCZz8wvZvmapQnKwFQ=="],

    "@jsx-email/all": ["@jsx-email/all@2.2.3", "", { "dependencies": { "@jsx-email/body": "1.0.2", "@jsx-email/button": "1.0.4", "@jsx-email/column": "1.0.3", "@jsx-email/container": "1.0.2", "@jsx-email/font": "1.0.3", "@jsx-email/head": "1.0.2", "@jsx-email/heading": "1.0.2", "@jsx-email/hr": "1.0.2", "@jsx-email/html": "1.0.2", "@jsx-email/img": "1.0.2", "@jsx-email/link": "1.0.2", "@jsx-email/markdown": "2.0.4", "@jsx-email/preview": "1.0.2", "@jsx-email/render": "1.1.1", "@jsx-email/row": "1.0.2", "@jsx-email/section": "1.0.2", "@jsx-email/tailwind": "2.4.4", "@jsx-email/text": "1.0.2" }, "peerDependencies": { "react": "^18.2.0" } }, "sha512-OBvLe/hVSQc0LlMSTJnkjFoqs3bmxcC4zpy/5pT5agPCSKMvAKQjzmsc2xJ2wO73jSpRV1K/g38GmvdCfrhSoQ=="],
@@ -2098,8 +2064,6 @@

    "@opencode-ai/httpapi-codegen": ["@opencode-ai/httpapi-codegen@workspace:packages/httpapi-codegen"],

-    "@opencode-ai/merman": ["@opencode-ai/merman@workspace:packages/merman"],
-
    "@opencode-ai/plugin": ["@opencode-ai/plugin@workspace:packages/plugin"],

    "@opencode-ai/protocol": ["@opencode-ai/protocol@workspace:packages/protocol"],
@@ -3334,8 +3298,6 @@

    "abort-controller": ["abort-controller@3.0.0", "", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="],

-    "abort-controller-x": ["abort-controller-x@0.5.0", "", {}, "sha512-yTt9CI0x+nRfX6BFMenEGP8ooPvErGH6AbFz20C2IeOLIlDsrw/VHpgne3GsCEuTA410IiFiaLVFKmgM4bKEPQ=="],
-
    "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],

    "acorn": ["acorn@8.15.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
@@ -3576,10 +3538,6 @@

    "caniuse-lite": ["caniuse-lite@1.0.30001806", "", {}, "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw=="],

-    "cbor-extract": ["cbor-extract@2.2.2", "", { "dependencies": { "node-gyp-build-optional-packages": "5.1.1" }, "optionalDependencies": { "@cbor-extract/cbor-extract-darwin-arm64": "2.2.2", "@cbor-extract/cbor-extract-darwin-x64": "2.2.2", "@cbor-extract/cbor-extract-linux-arm": "2.2.2", "@cbor-extract/cbor-extract-linux-arm64": "2.2.2", "@cbor-extract/cbor-extract-linux-x64": "2.2.2", "@cbor-extract/cbor-extract-win32-x64": "2.2.2" }, "bin": { "download-cbor-prebuilds": "bin/download-prebuilds.js" } }, "sha512-hlSxxI9XO2yQfe9g6msd3g4xCfDqK5T5P0fRMLuaLHhxn4ViPrm+a+MUfhrvH2W962RGxcBwEGzLQyjbDG1gng=="],
-
-    "cbor-x": ["cbor-x@1.6.5", "", { "optionalDependencies": { "cbor-extract": "^2.2.2" } }, "sha512-yO64CxnSh6kp+pHNRK9IfwnMvCB+c8HvmUjQY/9l9YRF0/cAPka/tUHLwS64QqUpFCq3/OtbKziVJYXH2EaRig=="],
-
    "ccount": ["ccount@2.0.1", "", {}, "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="],

    "chai": ["chai@5.3.3", "", { "dependencies": { "assertion-error": "^2.0.1", "check-error": "^2.1.1", "deep-eql": "^5.0.1", "loupe": "^3.1.0", "pathval": "^2.0.0" } }, "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw=="],
@@ -4612,8 +4570,6 @@

    "lodash-es": ["lodash-es@4.18.1", "", {}, "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A=="],

-    "lodash.camelcase": ["lodash.camelcase@4.3.0", "", {}, "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="],
-
    "lodash.escaperegexp": ["lodash.escaperegexp@4.1.2", "", {}, "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="],

    "lodash.includes": ["lodash.includes@4.3.0", "", {}, "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="],
@@ -4840,8 +4796,6 @@

    "mkdirp": ["mkdirp@0.5.6", "", { "dependencies": { "minimist": "^1.2.6" }, "bin": { "mkdirp": "bin/cmd.js" } }, "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="],

-    "modal": ["modal@0.9.0", "", { "dependencies": { "cbor-x": "^1.6.0", "long": "^5.3.1", "nice-grpc": "^2.1.12", "protobufjs": "^7.5.0", "smol-toml": "^1.3.3", "uuid": "^11.1.0" } }, "sha512-kCXcdJkhbJorf/q/6T9Wdlg6in9JmRnCNQnV6rVBMyeqNV/iXI6BYk4IzY4cvZ6dbauNeDMjk/Q08cbxvoIaXg=="],
-
    "morphdom": ["morphdom@2.7.8", "", {}, "sha512-D/fR4xgGUyVRbdMGU6Nejea1RFzYxYtyurG4Fbv2Fi/daKlWKuXGLOdXtl+3eIwL110cI2hz1ZojGICjjFLgTg=="],

    "motion": ["motion@12.34.5", "", { "dependencies": { "framer-motion": "^12.34.5", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-N06NLJ9IeBHeielRqIvYvjPfXuRdyTxa+9++BgpGa+hY2D7TcMkI6QzV3jaRuv0aZRXgMa7cPy9YcBUBisPzAQ=="],
@@ -4880,10 +4834,6 @@

    "nf3": ["nf3@0.1.12", "", {}, "sha512-qbMXT7RTGh74MYWPeqTIED8nDW70NXOULVHpdWcdZ7IVHVnAsMV9fNugSNnvooipDc1FMOzpis7T9nXJEbJhvQ=="],

-    "nice-grpc": ["nice-grpc@2.1.16", "", { "dependencies": { "@grpc/grpc-js": "^1.14.0", "abort-controller-x": "^0.5.0", "nice-grpc-common": "^2.0.3" } }, "sha512-Cl3Pn00212Hl8/U6bpgMxmhZj5lyv3nWoJov4cd3FjWarktrMHP4DNvSjCnDwkMWYx4W1tyscEia4JX6Y4GVCQ=="],
-
-    "nice-grpc-common": ["nice-grpc-common@2.0.3", "", { "dependencies": { "ts-error": "^1.0.6" } }, "sha512-MEhnD3JMah0mgyivpb9hpRDbOBuXBxI/TVO+OK1h6rC97WM42HsPMR+zzRNQ0C5BqYJTw1nyWiQRD0DucO+pjQ=="],
-
    "nitro": ["nitro@3.0.1-alpha.1", "", { "dependencies": { "consola": "^3.4.2", "crossws": "^0.4.1", "db0": "^0.3.4", "h3": "2.0.1-rc.5", "jiti": "^2.6.1", "nf3": "^0.1.10", "ofetch": "^2.0.0-alpha.3", "ohash": "^2.0.11", "oxc-minify": "^0.96.0", "oxc-transform": "^0.96.0", "srvx": "^0.9.5", "undici": "^7.16.0", "unenv": "^2.0.0-rc.24", "unstorage": "^2.0.0-alpha.4" }, "peerDependencies": { "rolldown": "*", "rollup": "^4", "vite": "^7", "xml2js": "^0.6.2" }, "optionalPeers": ["rolldown", "rollup", "vite", "xml2js"], "bin": { "nitro": "dist/cli/index.mjs" } }, "sha512-U4AxIsXxdkxzkFrK0XAw0e5Qbojk8jQ50MjjRBtBakC4HurTtQoiZvF+lSe382jhuQZCfAyywGWOFa9QzXLFaw=="],

    "nlcst-to-string": ["nlcst-to-string@4.0.0", "", { "dependencies": { "@types/nlcst": "^2.0.0" } }, "sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA=="],
@@ -5682,8 +5632,6 @@

    "ts-dedent": ["ts-dedent@2.3.0", "", {}, "sha512-JfJeIHke7y2egdGGgRAvpCwYFUsHlM2gPcrVOxFkznt/4uzQ7HFmvE63iFHVLBJNDuyDOQgijDK/tXH/f6Msjg=="],

-    "ts-error": ["ts-error@1.0.6", "", {}, "sha512-tLJxacIQUM82IR7JO1UUkKlYuUTmoY9HBJAmNWFzheSlDS5SPMcNIepejHJa4BpPQLAcbRhRf3GDJzyj6rbKvA=="],
-
    "ts-interface-checker": ["ts-interface-checker@0.1.13", "", {}, "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="],

    "tsconfck": ["tsconfck@3.1.6", "", { "peerDependencies": { "typescript": "^5.0.0" }, "optionalPeers": ["typescript"], "bin": { "tsconfck": "bin/tsconfck.js" } }, "sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w=="],
@@ -6642,8 +6590,6 @@

    "builder-util/js-yaml": ["js-yaml@4.3.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q=="],

-    "cbor-extract/node-gyp-build-optional-packages": ["node-gyp-build-optional-packages@5.1.1", "", { "dependencies": { "detect-libc": "^2.0.1" }, "bin": { "node-gyp-build-optional-packages": "bin.js", "node-gyp-build-optional-packages-test": "build-test.js", "node-gyp-build-optional-packages-optional": "optional.js" } }, "sha512-+P72GAjVAbTxjjwUmwjVrqrdZROD4nf8KgpBoDxqXXTiYZZt/ud60dE5yvCSr9lRO8e8yv6kgJIC0K0PfZFVQw=="],
-
    "cliui/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=="],

    "cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
@@ -6788,8 +6734,6 @@

    "minipass-pipeline/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="],

-    "modal/uuid": ["uuid@11.1.1", "", { "bin": { "uuid": "dist/esm/bin/uuid" } }, "sha512-vIYxrBCC/N/K+Js3qSN88go7kIfNPssr/hHCesKCQNAjmgvYS2oqr69kIufEG+O4+PfezOH4EbIeHCfFov8ZgQ=="],
-
    "motion/framer-motion": ["framer-motion@12.42.2", "", { "dependencies": { "motion-dom": "^12.42.2", "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-5XY9luDiu0oHfHBjpDthFMh0ES+122w6p/papSJBweMkO8Sn+PW2QaEgRblQBpWFnuvZS5qvarpt/hO2pjGmnw=="],

    "nitro/h3": ["h3@2.0.1-rc.5", "", { "dependencies": { "rou3": "^0.7.9", "srvx": "^0.9.1" }, "peerDependencies": { "crossws": "^0.4.1" }, "optionalPeers": ["crossws"] }, "sha512-qkohAzCab0nLzXNm78tBjZDvtKMTmtygS8BJLT3VPczAQofdqlFXDPkXdLMJN4r05+xqneG8snZJ0HgkERCZTg=="],
@@ -368,12 +368,11 @@ Other provider exports listed above remain direct facades until they explicitly

 ## Provider options & HTTP overlays

-Request options in order of stability:
+Three escape hatches in order of stability:

 1. **`generation`** — portable knobs (`maxTokens`, `temperature`, `topP`, `topK`, penalties, seed, stop).
-2. **`promptCacheKey`** — stable cache affinity lowered by every protocol that supports it.
-3. **`providerOptions: { <provider>: {...} }`** — typed-at-the-facade provider-specific knobs (OpenAI `store`, Anthropic `thinking`, Gemini `thinkingConfig`, OpenRouter routing).
-4. **`http: { body, headers, query }`** — last-resort serializable overlays merged into the final HTTP request. Reach for this only when a stable typed path doesn't yet exist.
+2. **`providerOptions: { <provider>: {...} }`** — typed-at-the-facade provider-specific knobs (OpenAI `promptCacheKey`, Anthropic `thinking`, Gemini `thinkingConfig`, OpenRouter routing).
+3. **`http: { body, headers, query }`** — last-resort serializable overlays merged into the final HTTP request. Reach for this only when a stable typed path doesn't yet exist.

 Route/provider defaults are overridden by request-level values for each axis.

@@ -33,10 +33,9 @@ const model = OpenAI.configure({
 //
 //   - `generation`: common controls such as max tokens, temperature, topP/topK,
 //     penalties, seed, and stop sequences.
-//   - `promptCacheKey`: stable cache affinity for protocols that support it.
 //   - `providerOptions`: namespaced provider-native behavior. For example,
-//     OpenAI store behavior, Anthropic thinking, Gemini thinking config, or
-//     OpenRouter routing/reasoning.
+//     OpenAI cache keys and store behavior, Anthropic thinking, Gemini thinking
+//     config, or OpenRouter routing/reasoning.
 //   - `http`: last-resort serializable overlays for final request body, headers,
 //     and query params. Prefer typed `providerOptions` when a field is stable.
 //
@@ -46,7 +45,9 @@ const request = LLM.request({
  system: "You are concise and practical.",
  prompt: "Tell me a joke",
  generation: { maxTokens: 80, temperature: 0.7 },
-  promptCacheKey: "tutorial-joke",
+  providerOptions: {
+    openai: { promptCacheKey: "tutorial-joke" },
+  },
 })

 // 3. `generate` sends the request and collects the event stream into one
@@ -90,10 +90,15 @@ const OpenResponsesFunctionCallOutput = Schema.Union([
 ])

 export const InputItem = Schema.Union([
-  Schema.Struct({ role: Schema.tag("system"), content: Schema.String }),
-  Schema.Struct({ role: Schema.tag("user"), content: Schema.Array(OpenResponsesInputContent) }),
+  Schema.Struct({ role: Schema.tag("system"), id: Schema.optionalKey(Schema.String), content: Schema.String }),
+  Schema.Struct({
+    role: Schema.tag("user"),
+    id: Schema.optionalKey(Schema.String),
+    content: Schema.Array(OpenResponsesInputContent),
+  }),
  Schema.Struct({
    role: Schema.tag("assistant"),
+    id: Schema.optionalKey(Schema.String),
    content: Schema.Array(OpenResponsesOutputText),
    phase: Schema.optionalKey(MessagePhase),
  }),
@@ -101,19 +106,23 @@ export const InputItem = Schema.Union([
  OpenResponsesItemReference,
  Schema.Struct({
    type: Schema.tag("function_call"),
+    id: Schema.optionalKey(Schema.String),
    call_id: Schema.String,
    name: Schema.String,
    arguments: Schema.String,
  }),
  Schema.Struct({
    type: Schema.tag("function_call_output"),
+    id: Schema.optionalKey(Schema.String),
    call_id: Schema.String,
    output: OpenResponsesFunctionCallOutput,
  }),
 ])
 type OpenResponsesInputItem = Schema.Schema.Type<typeof InputItem>
+type ProviderInputItem = Readonly<Record<string, unknown>> & { readonly type: string; readonly id?: string }
 type LoweredInputItem =
  | OpenResponsesInputItem
+  | ProviderInputItem
  | {
      readonly role: "assistant"
      readonly content: ReadonlyArray<{ readonly type: "output_text"; readonly text: string }>
@@ -128,7 +137,7 @@ type OpenResponsesReasoningInput = {
  summary: Array<{ type: "summary_text"; text: string }>
  encrypted_content?: string | null
 }
-type OpenResponsesReasoningReplay = Omit<OpenResponsesReasoningInput, "id">
+type OpenResponsesReasoningReplay = Omit<OpenResponsesReasoningInput, "id"> & { id?: string }

 export const Tool = Schema.Struct({
  type: Schema.tag("function"),
@@ -254,6 +263,11 @@ export interface Extension {
    readonly request: LLMRequest
  }) => MediaInput | undefined
  readonly messagePhase?: (value: unknown) => MessagePhase | null | undefined
+  readonly lowerProviderItem?: (
+    part: ToolResultPart,
+    providerMetadataKey: string,
+    store: boolean | undefined,
+  ) => ProviderInputItem | undefined
 }

 const BASE: Extension = { id: ADAPTER, name: NAME }
@@ -310,36 +324,48 @@ export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable<LL
    tool: (toolName) => ({ type: "function" as const, name: toolName }),
  })

-const lowerToolCall = (part: ToolCallPart): OpenResponsesInputItem => ({
-  type: "function_call",
-  call_id: part.id,
-  name: part.name,
-  arguments: ProviderShared.encodeJson(part.input),
-})
-
-const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => {
-  const metadata = part.providerMetadata?.[providerMetadataKey]
-  if (!ProviderShared.isRecord(metadata) || typeof metadata.itemId !== "string" || metadata.itemId.length === 0)
-    return undefined
-  const encryptedContent =
-    typeof metadata.reasoningEncryptedContent === "string" || metadata.reasoningEncryptedContent === null
-      ? metadata.reasoningEncryptedContent
-      : undefined
-  return {
-    type: "reasoning",
-    id: metadata.itemId,
-    summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
-    encrypted_content: encryptedContent,
-  }
-}
-
-const hostedToolItemID = (part: ToolResultPart, providerMetadataKey: string) => {
+const metadataItemID = (
+  part: { readonly itemId?: string; readonly providerMetadata?: ProviderMetadata },
+  providerMetadataKey: string,
+) => {
+  if (part.itemId) return part.itemId
  const metadata = part.providerMetadata?.[providerMetadataKey]
  return ProviderShared.isRecord(metadata) && typeof metadata.itemId === "string" && metadata.itemId.length > 0
    ? metadata.itemId
    : undefined
 }

+const lowerToolCall = (part: ToolCallPart, providerMetadataKey: string): OpenResponsesInputItem => {
+  const itemId = metadataItemID(part, providerMetadataKey)
+  return {
+    type: "function_call",
+    ...(itemId === undefined ? {} : { id: itemId }),
+    call_id: part.id,
+    name: part.name,
+    arguments: ProviderShared.encodeJson(part.input),
+  }
+}
+
+const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => {
+  const metadata = part.providerMetadata?.[providerMetadataKey]
+  const itemId = metadataItemID(part, providerMetadataKey)
+  if (!itemId) return undefined
+  const encryptedContent =
+    ProviderShared.isRecord(metadata) &&
+    (typeof metadata.reasoningEncryptedContent === "string" || metadata.reasoningEncryptedContent === null)
+      ? metadata.reasoningEncryptedContent
+      : undefined
+  return {
+    type: "reasoning",
+    id: itemId,
+    summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
+    encrypted_content: encryptedContent,
+  }
+}
+
+const hostedToolItemID = (part: ToolResultPart, providerMetadataKey: string) =>
+  metadataItemID(part, providerMetadataKey)
+
 const lowerMedia = Effect.fn("OpenResponses.lowerMedia")(function* (
  part: MediaPart,
  request: LLMRequest,
@@ -397,17 +423,18 @@ const lowerToolResultOutput = Effect.fn("OpenResponses.lowerToolResultOutput")(f
 })

 const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (request: LLMRequest, extension: Extension) {
+  const options = OpenResponsesOptions.resolve(request)
  const system: LoweredInputItem[] =
    request.system.length === 0 ? [] : [{ role: "system", content: ProviderShared.joinText(request.system) }]
  const input: LoweredInputItem[] = [...system]
-  const store = OpenResponsesOptions.resolve(request).store
+  const store = options.store
  const providerMetadataKey = request.model.route.providerMetadataKey ?? "openresponses"

  for (const message of request.messages) {
    if (message.role === "system") {
      const part = yield* ProviderShared.wrappedSystemUpdate(extension.name, message)
      const previous = input.at(-1)
-      if (previous && "role" in previous && previous.role === "user")
+      if (previous && "role" in previous && previous.role === "user" && Array.isArray(previous.content))
        input[input.length - 1] = {
          role: "user",
          content: [...previous.content, { type: "input_text", text: part.text }],
@@ -427,24 +454,24 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
    if (message.role === "assistant") {
      const content: TextPart[] = []
      const reasoningItems: Record<string, OpenResponsesReasoningReplay> = {}
-      const reasoningReferences = new Set<string>()
-      const hostedToolReferences = new Set<string>()
+      const hostedToolItems = new Set<string>()
      const flushText = () => {
        if (content.length === 0) return
-        const groups = content.reduce<Array<{ phase: MessagePhase | null | undefined; parts: TextPart[] }>>(
-          (groups, part) => {
-            const metadata = part.providerMetadata?.[providerMetadataKey]
-            const phase = ProviderShared.isRecord(metadata) ? messagePhase(metadata.phase, extension) : undefined
-            const group = groups.at(-1)
-            if (group && group.phase === phase) group.parts.push(part)
-            else groups.push({ phase, parts: [part] })
-            return groups
-          },
-          [],
-        )
+        const groups = content.reduce<
+          Array<{ phase: MessagePhase | null | undefined; itemId: string | undefined; parts: TextPart[] }>
+        >((groups, part) => {
+          const metadata = part.providerMetadata?.[providerMetadataKey]
+          const phase = ProviderShared.isRecord(metadata) ? messagePhase(metadata.phase, extension) : undefined
+          const itemId = metadataItemID(part, providerMetadataKey)
+          const group = groups.at(-1)
+          if (group && group.phase === phase && group.itemId === itemId) group.parts.push(part)
+          else groups.push({ phase, itemId, parts: [part] })
+          return groups
+        }, [])
        input.push(
          ...groups.map((group) => ({
            role: "assistant" as const,
+            ...(group.itemId === undefined ? {} : { id: group.itemId }),
            content: group.parts.map((part) => ({ type: "output_text" as const, text: part.text })),
            ...(group.phase === undefined ? {} : { phase: group.phase }),
          })),
@@ -460,11 +487,6 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
          flushText()
          const reasoning = lowerReasoning(part, providerMetadataKey)
          if (!reasoning) continue
-          if (store !== false) {
-            if (!reasoningReferences.has(reasoning.id)) input.push({ type: "item_reference", id: reasoning.id })
-            reasoningReferences.add(reasoning.id)
-            continue
-          }
          const existing = reasoningItems[reasoning.id]
          if (existing) {
            existing.summary.push(...reasoning.summary)
@@ -474,6 +496,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
          }
          const replay = {
            type: reasoning.type,
+            id: reasoning.id,
            summary: reasoning.summary,
            encrypted_content: reasoning.encrypted_content,
          }
@@ -484,22 +507,24 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
        if (part.type === "tool-call") {
          flushText()
          if (part.providerExecuted === true) continue
-          input.push(lowerToolCall(part))
+          input.push(lowerToolCall(part, providerMetadataKey))
          continue
        }
        if (part.type === "tool-result" && part.providerExecuted === true) {
          flushText()
          const itemID = hostedToolItemID(part, providerMetadataKey)
-          if (store !== false && itemID && !hostedToolReferences.has(itemID))
+          const providerItem = extension.lowerProviderItem?.(part, providerMetadataKey, store)
+          if (providerItem && itemID && !hostedToolItems.has(itemID)) input.push(providerItem)
+          if (!providerItem && store !== false && itemID && !hostedToolItems.has(itemID))
            input.push({ type: "item_reference", id: itemID })
-          if (store === false && part.result.type === "content") {
+          if (!providerItem && store === false && part.result.type === "content") {
            const content: ReadonlyArray<Content> = part.result.value
            input.push({
              role: "user",
              content: yield* Effect.forEach(content, (item) => lowerToolResultContentItem(item, request, extension)),
            })
          }
-          if (itemID) hostedToolReferences.add(itemID)
+          if (itemID) hostedToolItems.add(itemID)
          continue
        }
        return yield* ProviderShared.unsupportedContent(extension.name, "assistant", [
@@ -539,7 +564,7 @@ const lowerOptions = (request: LLMRequest) => {
  return {
    ...(options.instructions ? { instructions: options.instructions } : {}),
    ...(options.store !== undefined ? { store: options.store } : {}),
-    ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
+    ...(options.promptCacheKey ? { prompt_cache_key: options.promptCacheKey } : {}),
    ...(options.include ? { include: options.include } : {}),
    ...(options.reasoningEffort || options.reasoningSummary
      ? { reasoning: { effort: options.reasoningEffort, summary: options.reasoningSummary } }
@@ -641,9 +666,9 @@ const onOutputTextDelta = (state: ParserState, event: Event, id: string): StepRe
  if (!event.delta) return [state, NO_EVENTS]
  const events: LLMEvent[] = []
  const phase = state.messagePhases[id]
-  const metadata = phase === undefined ? undefined : providerMetadata(state, { phase })
-  const lifecycle = Lifecycle.textStart(state.lifecycle, events, id, metadata)
-  return [{ ...state, lifecycle: Lifecycle.textDelta(lifecycle, events, id, event.delta) }, events]
+  const metadata = providerMetadata(state, { itemId: id, ...(phase === undefined ? {} : { phase }) })
+  const lifecycle = Lifecycle.textStart(state.lifecycle, events, id, metadata, id)
+  return [{ ...state, lifecycle: Lifecycle.textDelta(lifecycle, events, id, event.delta, metadata, id) }, events]
 }

 const onOutputTextDone = (state: ParserState, event: Event, id: string): StepResult => {
@@ -652,7 +677,13 @@ const onOutputTextDone = (state: ParserState, event: Event, id: string): StepRes
    return onOutputTextDelta(state, { ...event, delta: event.text }, id)
  }
  const events: LLMEvent[] = []
-  return [{ ...state, lifecycle: Lifecycle.textEnd(state.lifecycle, events, id) }, events]
+  return [
+    {
+      ...state,
+      lifecycle: Lifecycle.textEnd(state.lifecycle, events, id, providerMetadata(state, { itemId: id }), id),
+    },
+    events,
+  ]
 }

 export const onReasoningDelta = (state: ParserState, event: Event, itemID: string): StepResult => {
@@ -663,7 +694,14 @@ export const onReasoningDelta = (state: ParserState, event: Event, itemID: strin
  return [
    {
      ...state,
-      lifecycle: Lifecycle.reasoningDelta(state.lifecycle, events, id, event.delta),
+      lifecycle: Lifecycle.reasoningDelta(
+        state.lifecycle,
+        events,
+        id,
+        event.delta,
+        providerMetadata(state, { itemId: itemID }),
+        itemID,
+      ),
    },
    events,
  ]
@@ -705,7 +743,13 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
    return [
      {
        ...state,
-        lifecycle: Lifecycle.reasoningStart(state.lifecycle, events, `${item.id}:0`, reasoningMetadata(state, item)),
+        lifecycle: Lifecycle.reasoningStart(
+          state.lifecycle,
+          events,
+          `${item.id}:0`,
+          reasoningMetadata(state, item),
+          item.id,
+        ),
        reasoningItems: {
          ...state.reasoningItems,
          [item.id]: { encryptedContent: item.encrypted_content, summaryParts: { 0: "active" } },
@@ -724,6 +768,7 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
      lifecycle,
      tools: ToolStream.start(state.tools, item.id, {
        id: item.call_id ?? item.id,
+        itemId: item.id,
        name: item.name ?? "",
        input: item.arguments ?? "",
        providerMetadata: metadata,
@@ -731,7 +776,12 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
    },
    [
      ...events,
-      LLMEvent.toolInputStart({ id: item.call_id ?? item.id, name: item.name ?? "", providerMetadata: metadata }),
+      LLMEvent.toolInputStart({
+        id: item.call_id ?? item.id,
+        itemId: item.id,
+        name: item.name ?? "",
+        providerMetadata: metadata,
+      }),
    ],
  ]
 }
@@ -750,6 +800,7 @@ const onReasoningSummaryPartAdded = (state: ParserState, event: Event): StepResu
          events,
          `${event.item_id}:0`,
          providerMetadata(state, { itemId: event.item_id, reasoningEncryptedContent: null }),
+          event.item_id,
        ),
        reasoningItems: {
          ...state.reasoningItems,
@@ -770,6 +821,7 @@ const onReasoningSummaryPartAdded = (state: ParserState, event: Event): StepResu
          events,
          `${event.item_id}:${entry[0]}`,
          providerMetadata(state, { itemId: event.item_id }),
+          event.item_id,
        ),
      state.lifecycle,
    )
@@ -781,6 +833,7 @@ const onReasoningSummaryPartAdded = (state: ParserState, event: Event): StepResu
        events,
        `${event.item_id}:${event.summary_index}`,
        providerMetadata(state, { itemId: event.item_id, reasoningEncryptedContent: item.encryptedContent ?? null }),
+        event.item_id,
      ),
      reasoningItems: {
        ...state.reasoningItems,
@@ -816,6 +869,7 @@ const onReasoningSummaryPartDone = (state: ParserState, event: Event): StepResul
              events,
              `${event.item_id}:${event.summary_index}`,
              providerMetadata(state, { itemId: event.item_id }),
+              event.item_id,
            )
          : state.lifecycle,
      reasoningItems: {
@@ -870,7 +924,8 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
          state.lifecycle,
          events,
          item.id,
-          phase === undefined ? undefined : providerMetadata(state, { phase }),
+          providerMetadata(state, { itemId: item.id, ...(phase === undefined ? {} : { phase }) }),
+          item.id,
        ),
        messageItems,
        messagePhases,
@@ -881,9 +936,15 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (

  if (item.type === "function_call") {
    if (!item.id || !item.call_id || !item.name) return [state, NO_EVENTS] satisfies StepResult
+    const metadata = providerMetadata(state, { itemId: item.id })
    const tools = state.tools[item.id]
      ? state.tools
-      : ToolStream.start(state.tools, item.id, { id: item.call_id, name: item.name })
+      : ToolStream.start(state.tools, item.id, {
+          id: item.call_id,
+          itemId: item.id,
+          name: item.name,
+          providerMetadata: metadata,
+        })
    const result =
      item.arguments === undefined
        ? yield* ToolStream.finish(state.id, tools, item.id)
@@ -913,7 +974,7 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
      const lifecycle = Object.entries(reasoningItem.summaryParts)
        .filter((entry) => entry[1] === "active" || entry[1] === "can-conclude")
        .reduce(
-          (lifecycle, entry) => Lifecycle.reasoningEnd(lifecycle, events, `${item.id}:${entry[0]}`, metadata),
+          (lifecycle, entry) => Lifecycle.reasoningEnd(lifecycle, events, `${item.id}:${entry[0]}`, metadata, item.id),
          state.lifecycle,
        )
      const { [item.id]: _removed, ...reasoningItems } = state.reasoningItems
@@ -921,12 +982,12 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
    }
    if (!state.lifecycle.reasoning.has(item.id)) {
      const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
-      events.push(LLMEvent.reasoningStart({ id: item.id, providerMetadata: metadata }))
-      events.push(LLMEvent.reasoningEnd({ id: item.id, providerMetadata: metadata }))
+      events.push(LLMEvent.reasoningStart({ id: item.id, itemId: item.id, providerMetadata: metadata }))
+      events.push(LLMEvent.reasoningEnd({ id: item.id, itemId: item.id, providerMetadata: metadata }))
      return [{ ...state, lifecycle }, events] satisfies StepResult
    }
    return [
-      { ...state, lifecycle: Lifecycle.reasoningEnd(state.lifecycle, events, item.id, metadata) },
+      { ...state, lifecycle: Lifecycle.reasoningEnd(state.lifecycle, events, item.id, metadata, item.id) },
      events,
    ] satisfies StepResult
  }
@@ -132,7 +132,6 @@ export const bodyFields = {
  stream: Schema.Literal(true),
  stream_options: Schema.optional(Schema.Struct({ include_usage: Schema.Boolean })),
  store: Schema.optional(Schema.Boolean),
-  prompt_cache_key: Schema.optional(Schema.String),
  reasoning_effort: Schema.optional(OpenAIOptions.OpenAIReasoningEffort),
  max_completion_tokens: Schema.optional(Schema.Number),
  max_tokens: Schema.optional(Schema.Number),
@@ -510,7 +509,6 @@ const lowerOptions = (request: LLMRequest) => {
  const options = OpenAIOptions.resolve(request)
  return {
    ...(options.store !== undefined ? { store: options.store } : {}),
-    ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
    ...(options.reasoningEffort ? { reasoning_effort: options.reasoningEffort } : {}),
  }
 }
@@ -38,10 +38,14 @@ const OpenAIResponsesToolChoice = Schema.Union([
 const OpenAIResponsesInputItem = Schema.Union([
  Schema.Struct({
    role: Schema.tag("assistant"),
+    id: Schema.optionalKey(Schema.String),
    content: Schema.Array(Schema.Struct({ type: Schema.tag("output_text"), text: Schema.String })),
    phase: Schema.optionalKey(Schema.NullOr(OpenResponses.MessagePhase)),
  }),
  OpenResponses.InputItem,
+  Schema.StructWithRest(Schema.Struct({ type: Schema.String, id: Schema.optionalKey(Schema.String) }), [
+    Schema.Record(Schema.String, Schema.Unknown),
+  ]),
 ])

 const OpenAIResponsesCoreFields = {
@@ -80,6 +84,25 @@ const extension = {
      mime_type: media.mime,
    }
  },
+  lowerProviderItem: (part, providerMetadataKey, store) => {
+    const metadata = part.providerMetadata?.[providerMetadataKey]
+    if (!ProviderShared.isRecord(metadata) || !ProviderShared.isRecord(metadata.item)) return undefined
+    if (typeof metadata.item.type !== "string") return undefined
+    const id = typeof metadata.item.id === "string" ? metadata.item.id : undefined
+    // The public API requires stored state to replay image-generation items. In
+    // stateless mode, lower the generated file through the existing user-image fallback.
+    if (metadata.item.type === "image_generation_call" && store === false) return undefined
+    if (metadata.item.type === "image_generation_call")
+      return {
+        type: metadata.item.type,
+        ...(id === undefined ? {} : { id }),
+        ...(typeof metadata.item.status === "string" ? { status: metadata.item.status } : {}),
+        ...(typeof metadata.item.revised_prompt === "string" ? { revised_prompt: metadata.item.revised_prompt } : {}),
+        ...(typeof metadata.item.result === "string" ? { result: metadata.item.result } : {}),
+      }
+    const item: Record<string, unknown> & { type: string } = { ...metadata.item, type: metadata.item.type }
+    return item
+  },
 } satisfies OpenResponses.Extension

 const nativeImageToolInput = (tool: ToolDefinition) => {
@@ -195,23 +218,29 @@ const onHostedToolDone = Effect.fn("OpenAIResponses.onHostedToolDone")(function*
  item: HostedToolItem,
 ) {
  const tool = HOSTED_TOOLS[item.type]
-  const providerMetadata = OpenResponses.providerMetadata(state, { itemId: item.id })
+  const callMetadata = OpenResponses.providerMetadata(state, { itemId: item.id })
+  const resultMetadata = OpenResponses.providerMetadata(
+    state,
+    item.type === "image_generation_call" ? { itemId: item.id } : { itemId: item.id, item },
+  )
  const events: LLMEvent[] = []
  const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
  events.push(
    LLMEvent.toolCall({
      id: item.id,
+      itemId: item.id,
      name: tool.name,
      input: tool.input(item),
      providerExecuted: true,
-      providerMetadata,
+      providerMetadata: callMetadata,
    }),
    LLMEvent.toolResult({
      id: item.id,
+      itemId: item.id,
      name: tool.name,
      result: yield* hostedToolResult(item),
      providerExecuted: true,
-      providerMetadata,
+      providerMetadata: resultMetadata,
    }),
  )
  return [{ ...state, lifecycle }, events] satisfies OpenResponses.StepResult
@@ -1,4 +1,10 @@
-import { LLMEvent, type FinishReasonDetails, type ProviderMetadata, type Usage } from "../../schema"
+import {
+  LLMEvent,
+  type FinishReasonDetails,
+  type ProviderMetadata,
+  type ResponseItemID,
+  type Usage,
+} from "../../schema"

 export interface State {
  readonly stepStarted: boolean
@@ -14,16 +20,29 @@ export const stepStart = (state: State, events: LLMEvent[]): State => {
  return { ...state, stepStarted: true }
 }

-export const textStart = (state: State, events: LLMEvent[], id: string, providerMetadata?: ProviderMetadata): State => {
+export const textStart = (
+  state: State,
+  events: LLMEvent[],
+  id: string,
+  providerMetadata?: ProviderMetadata,
+  itemId?: ResponseItemID,
+): State => {
  if (state.text.has(id)) return state
  const stepped = stepStart(state, events)
-  events.push(LLMEvent.textStart({ id, providerMetadata }))
+  events.push(LLMEvent.textStart({ id, ...(itemId === undefined ? {} : { itemId }), providerMetadata }))
  return { ...stepped, text: new Set([...stepped.text, id]) }
 }

-export const textDelta = (state: State, events: LLMEvent[], id: string, text: string): State => {
-  const started = textStart(state, events, id)
-  events.push(LLMEvent.textDelta({ id, text }))
+export const textDelta = (
+  state: State,
+  events: LLMEvent[],
+  id: string,
+  text: string,
+  providerMetadata?: ProviderMetadata,
+  itemId?: ResponseItemID,
+): State => {
+  const started = textStart(state, events, id, providerMetadata, itemId)
+  events.push(LLMEvent.textDelta({ id, ...(itemId === undefined ? {} : { itemId }), text, providerMetadata }))
  return started
 }

@@ -32,10 +51,11 @@ export const reasoningStart = (
  events: LLMEvent[],
  id: string,
  providerMetadata?: ProviderMetadata,
+  itemId?: ResponseItemID,
 ): State => {
  if (state.reasoning.has(id)) return state
  const stepped = stepStart(state, events)
-  events.push(LLMEvent.reasoningStart({ id, providerMetadata }))
+  events.push(LLMEvent.reasoningStart({ id, ...(itemId === undefined ? {} : { itemId }), providerMetadata }))
  return { ...stepped, reasoning: new Set([...stepped.reasoning, id]) }
 }

@@ -45,9 +65,10 @@ export const reasoningDelta = (
  id: string,
  text: string,
  providerMetadata?: ProviderMetadata,
+  itemId?: ResponseItemID,
 ): State => {
-  const started = reasoningStart(state, events, id, providerMetadata)
-  events.push(LLMEvent.reasoningDelta({ id, text, providerMetadata }))
+  const started = reasoningStart(state, events, id, providerMetadata, itemId)
+  events.push(LLMEvent.reasoningDelta({ id, ...(itemId === undefined ? {} : { itemId }), text, providerMetadata }))
  return started
 }

@@ -56,19 +77,26 @@ export const reasoningEnd = (
  events: LLMEvent[],
  id: string,
  providerMetadata?: ProviderMetadata,
+  itemId?: ResponseItemID,
 ): State => {
  if (!state.reasoning.has(id)) return state
  const stepped = stepStart(state, events)
-  events.push(LLMEvent.reasoningEnd({ id, providerMetadata }))
+  events.push(LLMEvent.reasoningEnd({ id, ...(itemId === undefined ? {} : { itemId }), providerMetadata }))
  const reasoning = new Set(stepped.reasoning)
  reasoning.delete(id)
  return { ...stepped, reasoning }
 }

-export const textEnd = (state: State, events: LLMEvent[], id: string, providerMetadata?: ProviderMetadata): State => {
+export const textEnd = (
+  state: State,
+  events: LLMEvent[],
+  id: string,
+  providerMetadata?: ProviderMetadata,
+  itemId?: ResponseItemID,
+): State => {
  if (!state.text.has(id)) return state
  const stepped = stepStart(state, events)
-  events.push(LLMEvent.textEnd({ id, providerMetadata }))
+  events.push(LLMEvent.textEnd({ id, ...(itemId === undefined ? {} : { itemId }), providerMetadata }))
  const text = new Set(stepped.text)
  text.delete(id)
  return { ...stepped, text }
@@ -33,6 +33,7 @@ export const ServiceTierSchema = Schema.Literals(ServiceTiers)
 export interface Resolved {
  readonly instructions?: string
  readonly store?: boolean
+  readonly promptCacheKey?: string
  readonly reasoningEffort?: string
  readonly reasoningSummary?: "auto" | "concise" | "detailed"
  readonly include?: ReadonlyArray<ResponseIncludable>
@@ -49,6 +50,7 @@ export const resolve = (request: LLMRequest): Resolved => {
  return {
    instructions: typeof input?.instructions === "string" ? input.instructions : undefined,
    store: typeof input?.store === "boolean" ? input.store : undefined,
+    promptCacheKey: typeof input?.promptCacheKey === "string" ? input.promptCacheKey : undefined,
    reasoningEffort: typeof input?.reasoningEffort === "string" ? input.reasoningEffort : undefined,
    reasoningSummary:
      reasoningSummary === "auto" || reasoningSummary === "concise" || reasoningSummary === "detailed"
@@ -1,5 +1,12 @@
 import { Effect } from "effect"
-import { AIError, LLMEvent, type ProviderMetadata, type ToolCall, type ToolInputError } from "../../schema"
+import {
+  AIError,
+  LLMEvent,
+  type ProviderMetadata,
+  type ResponseItemID,
+  type ToolCall,
+  type ToolInputError,
+} from "../../schema"
 import { eventError, parseToolInput, type ToolAccumulator } from "../shared"

 type StreamKey = string | number
@@ -10,6 +17,7 @@ type StreamKey = string | number
 * so far, not the parsed object.
 */
 export interface PendingTool extends ToolAccumulator {
+  readonly itemId?: ResponseItemID
  readonly providerExecuted?: boolean
  readonly providerMetadata?: ProviderMetadata
 }
@@ -52,6 +60,7 @@ const withoutTool = <K extends StreamKey>(tools: State<K>, key: K): State<K> =>
 const inputStart = (tool: PendingTool) =>
  LLMEvent.toolInputStart({
    id: tool.id,
+    ...(tool.itemId === undefined ? {} : { itemId: tool.itemId }),
    name: tool.name,
    providerExecuted: tool.providerExecuted ? true : undefined,
    providerMetadata: tool.providerMetadata,
@@ -60,6 +69,7 @@ const inputStart = (tool: PendingTool) =>
 const inputDelta = (tool: PendingTool, text: string) =>
  LLMEvent.toolInputDelta({
    id: tool.id,
+    ...(tool.itemId === undefined ? {} : { itemId: tool.itemId }),
    name: tool.name,
    text,
  })
@@ -70,6 +80,7 @@ const toolCall = (route: string, tool: PendingTool, inputOverride?: string) => {
    Effect.map((input): ToolCall | ToolInputError =>
      LLMEvent.toolCall({
        id: tool.id,
+        ...(tool.itemId === undefined ? {} : { itemId: tool.itemId }),
        name: tool.name,
        input,
        providerExecuted: tool.providerExecuted ? true : undefined,
@@ -82,6 +93,7 @@ const toolCall = (route: string, tool: PendingTool, inputOverride?: string) => {
        : Effect.succeed(
            LLMEvent.toolInputError({
              id: tool.id,
+              ...(tool.itemId === undefined ? {} : { itemId: tool.itemId }),
              name: tool.name,
              raw,
            }),
@@ -93,7 +105,15 @@ const toolCall = (route: string, tool: PendingTool, inputOverride?: string) => {
 const finishEvents = (tool: PendingTool, event: ToolCall | ToolInputError): ReadonlyArray<LLMEvent> =>
  event.type === "tool-input-error"
    ? [event]
-    : [LLMEvent.toolInputEnd({ id: tool.id, name: tool.name, providerMetadata: tool.providerMetadata }), event]
+    : [
+        LLMEvent.toolInputEnd({
+          id: tool.id,
+          ...(tool.itemId === undefined ? {} : { itemId: tool.itemId }),
+          name: tool.name,
+          providerMetadata: tool.providerMetadata,
+        }),
+        event,
+      ]

 /** Store the updated tool and produce the optional public delta event. */
 const appendTool = <K extends StreamKey>(
@@ -148,6 +168,7 @@ export const appendOrStart = <K extends StreamKey>(
    id,
    name,
    input: `${current?.input ?? ""}${delta.text}`,
+    itemId: current?.itemId,
    providerExecuted: current?.providerExecuted,
    providerMetadata: current?.providerMetadata,
  }
@@ -5,6 +5,7 @@ export interface OpenResponsesOptionsInput {
  readonly [key: string]: unknown
  readonly instructions?: string
  readonly store?: boolean
+  readonly promptCacheKey?: string
  readonly reasoningEffort?: ReasoningEffort
  readonly reasoningSummary?: "auto" | "concise" | "detailed"
  readonly include?: ReadonlyArray<ResponseIncludable>
@@ -17,6 +17,7 @@ const openAIProviderOptions = (options: OpenAIOptionsInput | undefined): Provide
  const openai = Object.fromEntries(
    definedEntries({
      store: options?.store,
+      promptCacheKey: options?.promptCacheKey,
      reasoningEffort: options?.reasoningEffort,
      reasoningSummary: options?.reasoningSummary,
      include: options?.include,
@@ -55,6 +55,7 @@ export interface OpenRouterOptions {
  readonly debug?: Readonly<{ echo_upstream_body?: boolean }>
  readonly models?: ReadonlyArray<string>
  readonly plugins?: ReadonlyArray<OpenRouterPlugin>
+  readonly promptCacheKey?: string
  readonly provider?: OpenRouterProviderRouting
  readonly reasoning?: Readonly<{
    enabled?: boolean
@@ -121,7 +122,6 @@ export const protocol = Protocol.make({
            ...body,
            messages,
            ...bodyOptions(request.providerOptions?.openrouter),
-            ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
          } as OpenRouterBody
        }),
      ),
@@ -161,6 +161,7 @@ const bodyOptions = (input: unknown) => {
    ...(isRecord(debug) ? { debug } : {}),
    ...(typeof user === "string" ? { user } : {}),
    ...(isRecord(reasoning) ? { reasoning } : {}),
+    ...(typeof promptCacheKey === "string" ? { prompt_cache_key: promptCacheKey } : {}),
  }
 }

@@ -47,8 +47,6 @@ const chatRoute = Route.make({
  protocol: OpenAIChat.protocol,
  endpoint: Endpoint.path("/chat/completions", { baseURL: OpenAICompatibleProfiles.profiles.xai.baseURL }),
  transport: OpenAICompatibleChat.route.transport,
-  headers: ({ request }): Record<string, string> =>
-    request.promptCacheKey ? { "x-grok-conv-id": request.promptCacheKey } : {},
 })

 export const routes = [responsesRoute, chatRoute]
@@ -1,4 +1,4 @@
-import { Cause, Context, Effect, Layer, Option, Schema } from "effect"
+import { Cause, Context, Effect, Layer } from "effect"
 import {
  FetchHttpClient,
  Headers,
@@ -198,20 +198,8 @@ const responseBody = (body: string | void, request: HttpClientRequest.HttpClient
  return { body: redacted.slice(0, BODY_LIMIT), bodyTruncated: true }
 }

-const decodeProviderBody = Schema.decodeUnknownOption(
-  Schema.fromJsonString(
-    Schema.Struct({
-      message: Schema.optionalKey(Schema.String),
-      error: Schema.optionalKey(Schema.Struct({ message: Schema.optionalKey(Schema.String) })),
-    }),
-  ),
-)
-
 const providerMessage = (status: number, body: { readonly body?: string }) => {
-  if (body.body && body.body.length <= 500) {
-    const decoded = Option.getOrUndefined(decodeProviderBody(body.body))
-    return `Provider request failed with HTTP ${status}: ${decoded?.error?.message ?? decoded?.message ?? body.body}`
-  }
+  if (body.body && body.body.length <= 500) return `Provider request failed with HTTP ${status}: ${body.body}`
  return `Provider request failed with HTTP ${status}`
 }

@@ -1,5 +1,5 @@
 import { Schema } from "effect"
-import { ContentBlockID, FinishReason, ProviderMetadata, ToolCallID } from "./ids"
+import { ContentBlockID, FinishReason, ProviderMetadata, ResponseItemID, ToolCallID } from "./ids"
 import { Message, ToolCallPart, ToolOutput, ToolResultPart, ToolResultValue, type ContentPart } from "./messages"
 import { ProviderFailureClassification } from "./errors"

@@ -84,6 +84,7 @@ export type StepStart = Schema.Schema.Type<typeof StepStart>
 export const TextStart = Schema.Struct({
  type: Schema.tag("text-start"),
  id: ContentBlockID,
+  itemId: Schema.optional(ResponseItemID),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.TextStart" })
 export type TextStart = Schema.Schema.Type<typeof TextStart>
@@ -92,6 +93,7 @@ export const TextDelta = Schema.Struct({
  type: Schema.tag("text-delta"),
  id: ContentBlockID,
  text: Schema.String,
+  itemId: Schema.optional(ResponseItemID),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.TextDelta" })
 export type TextDelta = Schema.Schema.Type<typeof TextDelta>
@@ -99,6 +101,7 @@ export type TextDelta = Schema.Schema.Type<typeof TextDelta>
 export const TextEnd = Schema.Struct({
  type: Schema.tag("text-end"),
  id: ContentBlockID,
+  itemId: Schema.optional(ResponseItemID),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.TextEnd" })
 export type TextEnd = Schema.Schema.Type<typeof TextEnd>
@@ -106,6 +109,7 @@ export type TextEnd = Schema.Schema.Type<typeof TextEnd>
 export const ReasoningStart = Schema.Struct({
  type: Schema.tag("reasoning-start"),
  id: ContentBlockID,
+  itemId: Schema.optional(ResponseItemID),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.ReasoningStart" })
 export type ReasoningStart = Schema.Schema.Type<typeof ReasoningStart>
@@ -114,6 +118,7 @@ export const ReasoningDelta = Schema.Struct({
  type: Schema.tag("reasoning-delta"),
  id: ContentBlockID,
  text: Schema.String,
+  itemId: Schema.optional(ResponseItemID),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.ReasoningDelta" })
 export type ReasoningDelta = Schema.Schema.Type<typeof ReasoningDelta>
@@ -121,6 +126,7 @@ export type ReasoningDelta = Schema.Schema.Type<typeof ReasoningDelta>
 export const ReasoningEnd = Schema.Struct({
  type: Schema.tag("reasoning-end"),
  id: ContentBlockID,
+  itemId: Schema.optional(ResponseItemID),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.ReasoningEnd" })
 export type ReasoningEnd = Schema.Schema.Type<typeof ReasoningEnd>
@@ -129,6 +135,7 @@ export const ToolInputStart = Schema.Struct({
  type: Schema.tag("tool-input-start"),
  id: ToolCallID,
  name: Schema.String,
+  itemId: Schema.optional(ResponseItemID),
  providerExecuted: Schema.optional(Schema.Boolean),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.ToolInputStart" })
@@ -137,6 +144,7 @@ export type ToolInputStart = Schema.Schema.Type<typeof ToolInputStart>
 export const ToolInputDelta = Schema.Struct({
  type: Schema.tag("tool-input-delta"),
  id: ToolCallID,
+  itemId: Schema.optional(ResponseItemID),
  name: Schema.String,
  text: Schema.String,
 }).annotate({ identifier: "LLM.Event.ToolInputDelta" })
@@ -146,6 +154,7 @@ export const ToolInputEnd = Schema.Struct({
  type: Schema.tag("tool-input-end"),
  id: ToolCallID,
  name: Schema.String,
+  itemId: Schema.optional(ResponseItemID),
  providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.ToolInputEnd" })
 export type ToolInputEnd = Schema.Schema.Type<typeof ToolInputEnd>
@@ -154,6 +163,7 @@ export type ToolInputEnd = Schema.Schema.Type<typeof ToolInputEnd>
 export const ToolInputError = Schema.Struct({
  type: Schema.tag("tool-input-error"),
  id: ToolCallID,
+  itemId: Schema.optional(ResponseItemID),
  name: Schema.String,
  raw: Schema.String,
 }).annotate({ identifier: "LLM.Event.ToolInputError" })
@@ -162,6 +172,7 @@ export type ToolInputError = Schema.Schema.Type<typeof ToolInputError>
 export const ToolCall = Schema.Struct({
  type: Schema.tag("tool-call"),
  id: ToolCallID,
+  itemId: Schema.optional(ResponseItemID),
  name: Schema.String,
  input: Schema.Unknown,
  providerExecuted: Schema.optional(Schema.Boolean),
@@ -172,6 +183,7 @@ export type ToolCall = Schema.Schema.Type<typeof ToolCall>
 export const ToolResult = Schema.Struct({
  type: Schema.tag("tool-result"),
  id: ToolCallID,
+  itemId: Schema.optional(ResponseItemID),
  name: Schema.String,
  result: ToolResultValue,
  output: Schema.optional(ToolOutput),
@@ -183,6 +195,7 @@ export type ToolResult = Schema.Schema.Type<typeof ToolResult>
 export const ToolError = Schema.Struct({
  type: Schema.tag("tool-error"),
  id: ToolCallID,
+  itemId: Schema.optional(ResponseItemID),
  name: Schema.String,
  message: Schema.String,
  error: Schema.optional(Schema.Defect()),
@@ -334,12 +347,14 @@ const responseUsage = (events: ReadonlyArray<LLMEvent>) =>
 interface ContentAssembly {
  readonly contentIndex: number
  readonly text: string
+  readonly itemId?: ResponseItemID
  readonly providerMetadata?: ProviderMetadata
 }

 interface ToolInputAssembly {
  readonly name: string
  readonly text: string
+  readonly itemId?: ResponseItemID
  readonly providerMetadata?: ProviderMetadata
 }

@@ -385,11 +400,27 @@ const appendEvent = (state: ResponseState, event: LLMEvent): ResponseState => {
  }
 }

-const textContent = (text: string, providerMetadata: ProviderMetadata | undefined): ContentPart =>
-  providerMetadata === undefined ? { type: "text", text } : { type: "text", text, providerMetadata }
+const textContent = (
+  text: string,
+  itemId: ResponseItemID | undefined,
+  providerMetadata: ProviderMetadata | undefined,
+): ContentPart => ({
+  type: "text",
+  text,
+  ...(itemId === undefined ? {} : { itemId }),
+  ...(providerMetadata === undefined ? {} : { providerMetadata }),
+})

-const reasoningContent = (text: string, providerMetadata: ProviderMetadata | undefined): ContentPart =>
-  providerMetadata === undefined ? { type: "reasoning", text } : { type: "reasoning", text, providerMetadata }
+const reasoningContent = (
+  text: string,
+  itemId: ResponseItemID | undefined,
+  providerMetadata: ProviderMetadata | undefined,
+): ContentPart => ({
+  type: "reasoning",
+  text,
+  ...(itemId === undefined ? {} : { itemId }),
+  ...(providerMetadata === undefined ? {} : { providerMetadata }),
+})

 const contentWith = (state: ResponseState, content: ReadonlyArray<ContentPart>): ResponseState => ({
  ...state,
@@ -404,26 +435,32 @@ const replaceContent = (state: ResponseState, index: number, part: ContentPart)
    state.message.content.map((item, itemIndex) => (itemIndex === index ? part : item)),
  )

-const ensureText = (state: ResponseState, id: string, providerMetadata?: ProviderMetadata): ResponseState => {
+const ensureText = (
+  state: ResponseState,
+  id: string,
+  itemId?: ResponseItemID,
+  providerMetadata?: ProviderMetadata,
+): ResponseState => {
  if (state.textParts[id]) return state
  return {
-    ...appendContent(state, textContent("", providerMetadata)),
+    ...appendContent(state, textContent("", itemId, providerMetadata)),
    textParts: {
      ...state.textParts,
-      [id]: { contentIndex: state.message.content.length, text: "", providerMetadata },
+      [id]: { contentIndex: state.message.content.length, text: "", itemId, providerMetadata },
    },
  }
 }

 const reduceTextDelta = (state: ResponseState, event: TextDelta): ResponseState => {
-  const started = ensureText(state, event.id, event.providerMetadata)
+  const started = ensureText(state, event.id, event.itemId, event.providerMetadata)
  const current = started.textParts[event.id]
  if (!current) return started
  const text = current.text + event.text
+  const itemId = event.itemId ?? current.itemId
  const providerMetadata = event.providerMetadata ?? current.providerMetadata
  return {
-    ...replaceContent(started, current.contentIndex, textContent(text, providerMetadata)),
-    textParts: { ...started.textParts, [event.id]: { ...current, text, providerMetadata } },
+    ...replaceContent(started, current.contentIndex, textContent(text, itemId, providerMetadata)),
+    textParts: { ...started.textParts, [event.id]: { ...current, text, itemId, providerMetadata } },
  }
 }

@@ -431,32 +468,39 @@ const reduceTextEnd = (state: ResponseState, event: TextEnd): ResponseState => {
  const current = state.textParts[event.id]
  if (!current) return state
  const providerMetadata = event.providerMetadata ?? current.providerMetadata
+  const itemId = event.itemId ?? current.itemId
  return {
-    ...replaceContent(state, current.contentIndex, textContent(current.text, providerMetadata)),
-    textParts: { ...state.textParts, [event.id]: { ...current, providerMetadata } },
+    ...replaceContent(state, current.contentIndex, textContent(current.text, itemId, providerMetadata)),
+    textParts: { ...state.textParts, [event.id]: { ...current, itemId, providerMetadata } },
  }
 }

-const ensureReasoning = (state: ResponseState, id: string, providerMetadata?: ProviderMetadata): ResponseState => {
+const ensureReasoning = (
+  state: ResponseState,
+  id: string,
+  itemId?: ResponseItemID,
+  providerMetadata?: ProviderMetadata,
+): ResponseState => {
  if (state.reasoningParts[id]) return state
  return {
-    ...appendContent(state, reasoningContent("", providerMetadata)),
+    ...appendContent(state, reasoningContent("", itemId, providerMetadata)),
    reasoningParts: {
      ...state.reasoningParts,
-      [id]: { contentIndex: state.message.content.length, text: "", providerMetadata },
+      [id]: { contentIndex: state.message.content.length, text: "", itemId, providerMetadata },
    },
  }
 }

 const reduceReasoningDelta = (state: ResponseState, event: ReasoningDelta): ResponseState => {
-  const started = ensureReasoning(state, event.id, event.providerMetadata)
+  const started = ensureReasoning(state, event.id, event.itemId, event.providerMetadata)
  const current = started.reasoningParts[event.id]
  if (!current) return started
  const text = current.text + event.text
+  const itemId = event.itemId ?? current.itemId
  const providerMetadata = event.providerMetadata ?? current.providerMetadata
  return {
-    ...replaceContent(started, current.contentIndex, reasoningContent(text, providerMetadata)),
-    reasoningParts: { ...started.reasoningParts, [event.id]: { ...current, text, providerMetadata } },
+    ...replaceContent(started, current.contentIndex, reasoningContent(text, itemId, providerMetadata)),
+    reasoningParts: { ...started.reasoningParts, [event.id]: { ...current, text, itemId, providerMetadata } },
  }
 }

@@ -464,9 +508,10 @@ const reduceReasoningEnd = (state: ResponseState, event: ReasoningEnd): Response
  const current = state.reasoningParts[event.id]
  if (!current) return state
  const providerMetadata = event.providerMetadata ?? current.providerMetadata
+  const itemId = event.itemId ?? current.itemId
  return {
-    ...replaceContent(state, current.contentIndex, reasoningContent(current.text, providerMetadata)),
-    reasoningParts: { ...state.reasoningParts, [event.id]: { ...current, providerMetadata } },
+    ...replaceContent(state, current.contentIndex, reasoningContent(current.text, itemId, providerMetadata)),
+    reasoningParts: { ...state.reasoningParts, [event.id]: { ...current, itemId, providerMetadata } },
  }
 }

@@ -474,7 +519,7 @@ const reduceToolInputStart = (state: ResponseState, event: ToolInputStart): Resp
  ...state,
  toolInputs: {
    ...state.toolInputs,
-    [event.id]: { name: event.name, text: "", providerMetadata: event.providerMetadata },
+    [event.id]: { name: event.name, text: "", itemId: event.itemId, providerMetadata: event.providerMetadata },
  },
 })

@@ -495,6 +540,7 @@ const reduceToolInputEnd = (state: ResponseState, event: ToolInputEnd): Response
      [event.id]: {
        ...current,
        name: event.name,
+        itemId: event.itemId ?? current.itemId,
        providerMetadata: event.providerMetadata ?? current.providerMetadata,
      },
    },
@@ -504,6 +550,7 @@ const reduceToolInputEnd = (state: ResponseState, event: ToolInputEnd): Response
 const toolCallContent = (event: ToolCall): ContentPart =>
  ToolCallPart.make({
    id: event.id,
+    ...(event.itemId === undefined ? {} : { itemId: event.itemId }),
    name: event.name,
    input: event.input,
    ...(event.providerExecuted === undefined ? {} : { providerExecuted: event.providerExecuted }),
@@ -513,6 +560,7 @@ const toolCallContent = (event: ToolCall): ContentPart =>
 const toolResultContent = (event: ToolResult): ContentPart =>
  ToolResultPart.make({
    id: event.id,
+    ...(event.itemId === undefined ? {} : { itemId: event.itemId }),
    name: event.name,
    result: event.result,
    ...(event.providerExecuted === undefined ? {} : { providerExecuted: event.providerExecuted }),
@@ -528,13 +576,13 @@ const reduceResponseState = (state: ResponseState, event: LLMEvent): ResponseSta
  const next = appendEvent(state, event)
  switch (event.type) {
    case "text-start":
-      return ensureText(next, event.id, event.providerMetadata)
+      return ensureText(next, event.id, event.itemId, event.providerMetadata)
    case "text-delta":
      return reduceTextDelta(next, event)
    case "text-end":
      return reduceTextEnd(next, event)
    case "reasoning-start":
-      return ensureReasoning(next, event.id, event.providerMetadata)
+      return ensureReasoning(next, event.id, event.itemId, event.providerMetadata)
    case "reasoning-delta":
      return reduceReasoningDelta(next, event)
    case "reasoning-end":
@@ -21,6 +21,9 @@ export type ProviderID = typeof ProviderID.Type
 export const ResponseID = Schema.String
 export type ResponseID = Schema.Schema.Type<typeof ResponseID>

+export const ResponseItemID = Schema.String
+export type ResponseItemID = Schema.Schema.Type<typeof ResponseItemID>
+
 export const ContentBlockID = Schema.String
 export type ContentBlockID = Schema.Schema.Type<typeof ContentBlockID>

@@ -1,6 +1,6 @@
 import { Schema } from "effect"
 import { Tool } from "@opencode-ai/schema/tool"
-import { JsonSchema, MessageRole, ProviderMetadata } from "./ids"
+import { JsonSchema, MessageRole, ProviderMetadata, ResponseItemID } from "./ids"
 import { CacheHint, CachePolicy, GenerationOptions, HttpOptions, LanguageModelSchema, ProviderOptions } from "./options"
 import { isRecord } from "../utils/record"

@@ -25,6 +25,7 @@ export const SystemPart = Object.assign(systemPartSchema, {
 export const TextPart = Schema.Struct({
  type: Schema.Literal("text"),
  text: Schema.String,
+  itemId: Schema.optional(ResponseItemID),
  cache: Schema.optional(CacheHint),
  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
  providerMetadata: Schema.optional(ProviderMetadata),
@@ -121,6 +122,7 @@ export const ToolCallPart = Object.assign(
  Schema.Struct({
    type: Schema.Literal("tool-call"),
    id: Schema.String,
+    itemId: Schema.optional(ResponseItemID),
    name: Schema.String,
    input: Schema.Unknown,
    providerExecuted: Schema.optional(Schema.Boolean),
@@ -138,6 +140,7 @@ export const ToolResultPart = Object.assign(
  Schema.Struct({
    type: Schema.Literal("tool-result"),
    id: Schema.String,
+    itemId: Schema.optional(ResponseItemID),
    name: Schema.String,
    result: ToolResultValue,
    providerExecuted: Schema.optional(Schema.Boolean),
@@ -154,6 +157,7 @@ export const ToolResultPart = Object.assign(
    ): ToolResultPart => ({
      type: "tool-result",
      id: input.id,
+      ...(input.itemId === undefined ? {} : { itemId: input.itemId }),
      name: input.name,
      result: ToolResultValue.make(input.result, input.resultType),
      providerExecuted: input.providerExecuted,
@@ -168,6 +172,7 @@ export type ToolResultPart = Schema.Schema.Type<typeof ToolResultPart>
 export const ReasoningPart = Schema.Struct({
  type: Schema.Literal("reasoning"),
  text: Schema.String,
+  itemId: Schema.optional(ResponseItemID),
  encrypted: Schema.optional(Schema.String),
  cache: Schema.optional(CacheHint),
  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
@@ -181,7 +186,7 @@ export const ContentPart = Schema.Union([TextPart, MediaPart, ToolCallPart, Tool
 export type ContentPart = Schema.Schema.Type<typeof ContentPart>

 export class Message extends Schema.Class<Message>("LLM.Message")({
-  id: Schema.optional(Schema.String),
+  id: Schema.optional(ResponseItemID),
  role: MessageRole,
  content: Schema.Array(ContentPart),
  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
@@ -272,8 +277,6 @@ export class LLMRequest extends Schema.Class<LLMRequest>("LLM.Request")({
  providerOptions: Schema.optional(ProviderOptions),
  http: Schema.optional(HttpOptions),
  cache: Schema.optional(CachePolicy),
-  // Stable cache affinity for protocols that support provider-managed prompt caching.
-  promptCacheKey: Schema.optional(Schema.String),
  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
 }) {}

@@ -291,7 +294,6 @@ export namespace LLMRequest {
    providerOptions: request.providerOptions,
    http: request.http,
    cache: request.cache,
-    promptCacheKey: request.promptCacheKey,
    metadata: request.metadata,
  })

@@ -79,7 +79,7 @@ const result = (call: ToolCallPart, value: ToolResultValueType | ToolSettlement,
              id: call.id,
              name: call.name,
              result: settlement.result,
-              providerMetadata: call.providerMetadata,
+              ...(call.providerMetadata === undefined ? {} : { providerMetadata: call.providerMetadata }),
            }),
          ]
        : [
@@ -88,7 +88,7 @@ const result = (call: ToolCallPart, value: ToolResultValueType | ToolSettlement,
              name: call.name,
              result: settlement.result,
              output: settlement.output,
-              providerMetadata: call.providerMetadata,
+              ...(call.providerMetadata === undefined ? {} : { providerMetadata: call.providerMetadata }),
            }),
          ],
  }
@@ -8,7 +8,6 @@ import {
  type ProviderMetadata,
  type ToolCallPart,
  ToolResultPart,
-  type ToolResultValue,
  type Usage,
 } from "../../src/schema"
 import { type Tools, toDefinitions } from "../../src/tool"
@@ -61,9 +60,10 @@ export const runTools = <T extends Tools>(options: RunOptions<T>) =>
            ...dispatched.map(([call, dispatched]) =>
              Message.tool({
                id: call.id,
+                itemId: dispatched.events.find(LLMEvent.is.toolResult)?.itemId,
                name: call.name,
                result: dispatched.result,
-                providerMetadata: call.providerMetadata,
+                providerMetadata: dispatched.events.find(LLMEvent.is.toolResult)?.providerMetadata,
              }),
            ),
          ],
@@ -89,9 +89,15 @@ const stepState = (events: ReadonlyArray<LLMEvent>) => {

  for (const event of events) {
    if (event.type === "text-delta" || event.type === "reasoning-delta") {
-      appendText(assistantContent, event.type === "text-delta" ? "text" : "reasoning", event.text)
+      appendText(assistantContent, event.type === "text-delta" ? "text" : "reasoning", event.text, event.itemId)
    } else if (event.type === "text-end" || event.type === "reasoning-end") {
-      appendText(assistantContent, event.type === "text-end" ? "text" : "reasoning", "", event.providerMetadata)
+      appendText(
+        assistantContent,
+        event.type === "text-end" ? "text" : "reasoning",
+        "",
+        event.itemId,
+        event.providerMetadata,
+      )
    } else if (event.type === "tool-call") {
      assistantContent.push(event)
      if (!event.providerExecuted) toolCalls.push(event)
@@ -99,6 +105,7 @@ const stepState = (events: ReadonlyArray<LLMEvent>) => {
      assistantContent.push(
        ToolResultPart.make({
          id: event.id,
+          itemId: event.itemId,
          name: event.name,
          result: event.result,
          providerExecuted: true,
@@ -118,6 +125,7 @@ const appendText = (
  content: ContentPart[],
  type: "text" | "reasoning",
  text: string,
+  itemId?: string,
  providerMetadata?: ProviderMetadata,
 ) => {
  const last = content.at(-1)
@@ -125,11 +133,12 @@ const appendText = (
    content[content.length - 1] = {
      ...last,
      text: `${last.text}${text}`,
+      itemId: itemId ?? last.itemId,
      providerMetadata: providerMetadata ?? last.providerMetadata,
    }
    return
  }
-  content.push({ type, text, providerMetadata })
+  content.push({ type, text, itemId, providerMetadata })
 }

 const addUsage = (left: Usage | undefined, right: Usage | undefined): Usage | undefined => {
@@ -3,11 +3,11 @@ import { CloudflareWorkersAI } from "../../src/providers"

 const model = CloudflareWorkersAI.configure({ accountId: "account", apiKey: "test" }).model("model")

-LLM.request({ model, prompt: "Hello", promptCacheKey: "cache" })
+LLM.request({ model, prompt: "Hello", providerOptions: { openai: { promptCacheKey: "cache" } } })

 LLM.request({
  model,
  prompt: "Hello",
-  // @ts-expect-error Prompt cache keys must be strings.
-  promptCacheKey: 1,
+  // @ts-expect-error Cloudflare's OpenAI-compatible prompt cache key must be a string.
+  providerOptions: { openai: { promptCacheKey: 1 } },
 })
@@ -15,8 +15,6 @@ import {
 } from "../../src"
 import * as Azure from "../../src/providers/azure"
 import * as OpenAI from "../../src/providers/openai"
-import * as OpenAICompatible from "../../src/providers/openai-compatible"
-import * as XAI from "../../src/providers/xai"
 import * as OpenAIChat from "../../src/protocols/openai-chat"
 import { ProviderShared } from "../../src/protocols/shared"
 import { Auth, LLMClient } from "../../src/route"
@@ -156,47 +154,6 @@ describe("OpenAI Chat route", () => {
    }),
  )

-  it.effect("maps the request prompt cache key", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: OpenAICompatible.configure({
-            baseURL: "https://api.compatible.test/v1",
-            apiKey: "test",
-          }).model("compatible-model"),
-          prompt: "Hello",
-          promptCacheKey: "session_123",
-        }),
-      )
-
-      expect(prepared.body.prompt_cache_key).toBe("session_123")
-    }),
-  )
-
-  it.effect("maps the xAI Chat prompt cache key to conversation affinity", () =>
-    LLMClient.generate(
-      LLM.request({
-        model: XAI.configure({ apiKey: "test", baseURL: "https://api.x.ai/v1" }).chat("grok-4.5"),
-        prompt: "Hello",
-        promptCacheKey: "session_123",
-      }),
-    ).pipe(
-      Effect.provide(
-        dynamicResponse((input) =>
-          Effect.gen(function* () {
-            const web = yield* HttpClientRequest.toWeb(input.request).pipe(Effect.orDie)
-            expect(web.headers.get("x-grok-conv-id")).toBe("session_123")
-            const body = decodeJson(yield* Effect.promise(() => web.text()))
-            expect(ProviderShared.isRecord(body) ? body.prompt_cache_key : undefined).toBe("session_123")
-            return input.respond(sseEvents(deltaChunk({}, "stop")), {
-              headers: { "content-type": "text/event-stream" },
-            })
-          }),
-        ),
-      ),
-    ),
-  )
-
  it.effect("passes through custom OpenAI-compatible reasoning effort strings", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -45,7 +45,7 @@ describe("Open Responses-compatible route", () => {
          },
        },
      })
-      expect(prepared.body).toEqual({
+      expect(prepared.body).toMatchObject({
        model: "example-model",
        input: [
          { role: "system", content: "You are concise." },
@@ -53,6 +53,8 @@ describe("Open Responses-compatible route", () => {
        ],
        stream: true,
      })
+      expect(prepared.body.input[0]).not.toHaveProperty("id")
+      expect(prepared.body.input[1]).not.toHaveProperty("id")
    }),
  )

@@ -20,7 +20,7 @@ const cacheRequest = LLM.request({
  system: LARGE_CACHEABLE_SYSTEM,
  prompt: "Say hi.",
  generation: { maxTokens: 16, temperature: 0 },
-  promptCacheKey: "recorded-cache-test",
+  providerOptions: { openai: { promptCacheKey: "recorded-cache-test" } },
 })

 const recorded = recordedTests({
@@ -69,6 +69,9 @@ describe("OpenAI Responses route", () => {
        stream: true,
        max_output_tokens: 20,
        temperature: 0,
+        tool_choice: undefined,
+        tools: undefined,
+        top_p: undefined,
      })
    }),
  )
@@ -329,7 +332,7 @@ describe("OpenAI Responses route", () => {
      yield* LLMClient.generate(
        LLMRequest.update(request, {
          model: Azure.configure({
-            baseURL: "https://opencode-test.openai.azure.com/openai/v1/",
+            baseURL: "https://opencode-test.openai.azure.com/openai/",
            apiKey: "azure-key",
            headers: { authorization: "Bearer stale" },
          }).responses("gpt-4.1-mini"),
@@ -410,7 +413,7 @@ describe("OpenAI Responses route", () => {
        }),
      )

-      expect(prepared.body).toEqual({
+      expect(prepared.body).toMatchObject({
        model: "gpt-4.1-mini",
        input: [
          { role: "user", content: [{ type: "input_text", text: "What is the weather?" }] },
@@ -425,6 +428,65 @@ describe("OpenAI Responses route", () => {
        tools: undefined,
        top_p: undefined,
      })
+      const call = prepared.body.input.find((item) => "type" in item && item.type === "function_call")
+      const output = prepared.body.input.find((item) => "type" in item && item.type === "function_call_output")
+      expect(call?.id).toBeUndefined()
+      expect(output?.id).toBeUndefined()
+    }),
+  )
+
+  it.effect("does not generate response item ids for client-created history", () =>
+    Effect.sync(() => {
+      const canonical = LLM.request({
+        model,
+        messages: [
+          Message.assistant([
+            { type: "text", text: "Working." },
+            { type: "reasoning", text: "Thinking." },
+            ToolCallPart.make({ id: "call_1", name: "lookup", input: {} }),
+          ]),
+          Message.tool({ id: "call_1", name: "lookup", result: "done" }),
+        ],
+      })
+
+      expect(canonical.messages[0]?.id).toBeUndefined()
+      expect(canonical.messages[1]?.id).toBeUndefined()
+      expect(canonical.messages[0]?.content.every((part) => part.type === "media" || part.itemId === undefined)).toBe(
+        true,
+      )
+      expect(canonical.messages[1]?.content[0]).not.toHaveProperty("itemId")
+    }),
+  )
+
+  it.effect("replays provider function call item ids without assigning output ids", () =>
+    Effect.gen(function* () {
+      const canonical = LLM.request({
+        model,
+        messages: [
+          Message.assistant([
+            { type: "text", text: "Calling.", itemId: "plain-text" },
+            ToolCallPart.make({
+              id: "call_1",
+              name: "lookup",
+              input: {},
+              providerMetadata: { openai: { itemId: "plain-call" } },
+            }),
+          ]),
+          Message.tool({ id: "call_1", itemId: "plain-output", name: "lookup", result: "done" }),
+        ],
+      })
+      const prepared = yield* compileRequest(canonical)
+
+      expect(canonical.messages[0]?.content.map((part) => (part.type === "media" ? undefined : part.itemId))).toEqual([
+        "plain-text",
+        undefined,
+      ])
+      expect(canonical.messages[1]?.content[0]).toMatchObject({ itemId: "plain-output" })
+      expect(prepared.body.input).toEqual([
+        { role: "assistant", id: "plain-text", content: [{ type: "output_text", text: "Calling." }] },
+        { type: "function_call", id: "plain-call", call_id: "call_1", name: "lookup", arguments: "{}" },
+        { type: "function_call_output", call_id: "call_1", output: '"done"' },
+      ])
    }),
  )

@@ -682,9 +744,9 @@ describe("OpenAI Responses route", () => {
        LLM.request({
          model: OpenAI.configure({ baseURL: "https://api.openai.test/v1/", apiKey: "test" }).model("gpt-5.2"),
          prompt: "think",
-          promptCacheKey: "session_123",
          providerOptions: {
            openai: {
+              promptCacheKey: "session_123",
              reasoningEffort: "high",
              reasoningSummary: "auto",
              include: ["reasoning.encrypted_content"],
@@ -803,16 +865,17 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("maps the request prompt cache key", () =>
+  it.effect("request OpenAI provider options override route defaults", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLM.request({
          model: OpenAI.configure({
            baseURL: "https://api.openai.test/v1/",
            apiKey: "test",
+            providerOptions: { openai: { promptCacheKey: "model_cache" } },
          }).model("gpt-4.1-mini"),
          prompt: "no cache",
-          promptCacheKey: "request_cache",
+          providerOptions: { openai: { promptCacheKey: "request_cache" } },
        }),
      )

@@ -863,9 +926,21 @@ describe("OpenAI Responses route", () => {
      expect(response.text).toBe("Hello!")
      expect(response.events).toEqual([
        { type: "step-start", index: 0 },
-        { type: "text-start", id: "msg_1" },
-        { type: "text-delta", id: "msg_1", text: "Hello" },
-        { type: "text-delta", id: "msg_1", text: "!" },
+        { type: "text-start", id: "msg_1", itemId: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
+        {
+          type: "text-delta",
+          id: "msg_1",
+          itemId: "msg_1",
+          text: "Hello",
+          providerMetadata: { openai: { itemId: "msg_1" } },
+        },
+        {
+          type: "text-delta",
+          id: "msg_1",
+          itemId: "msg_1",
+          text: "!",
+          providerMetadata: { openai: { itemId: "msg_1" } },
+        },
        { type: "text-end", id: "msg_1" },
        {
          type: "step-finish",
@@ -922,17 +997,20 @@ describe("OpenAI Responses route", () => {
        {
          type: "text",
          text: "Checking.",
-          providerMetadata: { openai: { phase: "commentary" } },
+          itemId: "msg_commentary",
+          providerMetadata: { openai: { itemId: "msg_commentary", phase: "commentary" } },
        },
        {
          type: "text",
          text: "Finished.",
-          providerMetadata: { openai: { phase: "final_answer" } },
+          itemId: "msg_final",
+          providerMetadata: { openai: { itemId: "msg_final", phase: "final_answer" } },
        },
        {
          type: "text",
          text: "Unclassified.",
-          providerMetadata: { openai: { phase: null } },
+          itemId: "msg_null",
+          providerMetadata: { openai: { itemId: "msg_null", phase: null } },
        },
      ])

@@ -940,16 +1018,19 @@ describe("OpenAI Responses route", () => {
      expect(prepared.body.input).toEqual([
        {
          role: "assistant",
+          id: "msg_commentary",
          content: [{ type: "output_text", text: "Checking." }],
          phase: "commentary",
        },
        {
          role: "assistant",
+          id: "msg_final",
          content: [{ type: "output_text", text: "Finished." }],
          phase: "final_answer",
        },
        {
          role: "assistant",
+          id: "msg_null",
          content: [{ type: "output_text", text: "Unclassified." }],
          phase: null,
        },
@@ -1042,12 +1123,24 @@ describe("OpenAI Responses route", () => {
      )

      expect(response.events.filter((event) => event.type.startsWith("text-"))).toEqual([
-        { type: "text-start", id: "msg_1" },
-        { type: "text-delta", id: "msg_1", text: "First" },
-        { type: "text-end", id: "msg_1" },
-        { type: "text-start", id: "msg_2" },
-        { type: "text-delta", id: "msg_2", text: "Second" },
-        { type: "text-end", id: "msg_2" },
+        { type: "text-start", id: "msg_1", itemId: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
+        {
+          type: "text-delta",
+          id: "msg_1",
+          itemId: "msg_1",
+          text: "First",
+          providerMetadata: { openai: { itemId: "msg_1" } },
+        },
+        { type: "text-end", id: "msg_1", itemId: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
+        { type: "text-start", id: "msg_2", itemId: "msg_2", providerMetadata: { openai: { itemId: "msg_2" } } },
+        {
+          type: "text-delta",
+          id: "msg_2",
+          itemId: "msg_2",
+          text: "Second",
+          providerMetadata: { openai: { itemId: "msg_2" } },
+        },
+        { type: "text-end", id: "msg_2", itemId: "msg_2", providerMetadata: { openai: { itemId: "msg_2" } } },
      ])
    }),
  )
@@ -1067,9 +1160,15 @@ describe("OpenAI Responses route", () => {
      expect(response.text).toBe("Hello")
      expect(response.events).toMatchObject([
        { type: "step-start", index: 0 },
-        { type: "reasoning-start", id: "rs_1" },
-        { type: "reasoning-delta", id: "rs_1", text: "thinking" },
-        { type: "text-start", id: "msg_1" },
+        { type: "reasoning-start", id: "rs_1", itemId: "rs_1", providerMetadata: { openai: { itemId: "rs_1" } } },
+        {
+          type: "reasoning-delta",
+          id: "rs_1",
+          itemId: "rs_1",
+          text: "thinking",
+          providerMetadata: { openai: { itemId: "rs_1" } },
+        },
+        { type: "text-start", id: "msg_1", itemId: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
        { type: "text-delta", id: "msg_1", text: "Hello" },
        { type: "reasoning-end", id: "rs_1" },
        { type: "text-end", id: "msg_1" },
@@ -1078,8 +1177,8 @@ describe("OpenAI Responses route", () => {
      ])
      expect(response.events.filter((event) => event.type === "finish")).toHaveLength(1)
      expect(response.message.content).toEqual([
-        { type: "reasoning", text: "thinking" },
-        { type: "text", text: "Hello" },
+        { type: "reasoning", text: "thinking", itemId: "rs_1", providerMetadata: { openai: { itemId: "rs_1" } } },
+        { type: "text", text: "Hello", itemId: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
      ])
    }),
  )
@@ -1110,6 +1209,7 @@ describe("OpenAI Responses route", () => {
        expect.objectContaining({
          type: "reasoning-end",
          id: "rs_1",
+          itemId: "rs_1",
          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: "encrypted-state" } },
        }),
      )
@@ -1150,19 +1250,34 @@ describe("OpenAI Responses route", () => {
        {
          type: "reasoning-start",
          id: "rs_1:0",
+          itemId: "rs_1",
          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: null } },
        },
-        { type: "reasoning-delta", id: "rs_1:0", text: "First" },
-        { type: "reasoning-end", id: "rs_1:0", providerMetadata: { openai: { itemId: "rs_1" } } },
+        {
+          type: "reasoning-delta",
+          id: "rs_1:0",
+          itemId: "rs_1",
+          text: "First",
+          providerMetadata: { openai: { itemId: "rs_1" } },
+        },
+        { type: "reasoning-end", id: "rs_1:0", itemId: "rs_1", providerMetadata: { openai: { itemId: "rs_1" } } },
        {
          type: "reasoning-start",
          id: "rs_1:1",
+          itemId: "rs_1",
          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: null } },
        },
-        { type: "reasoning-delta", id: "rs_1:1", text: "Second" },
+        {
+          type: "reasoning-delta",
+          id: "rs_1:1",
+          itemId: "rs_1",
+          text: "Second",
+          providerMetadata: { openai: { itemId: "rs_1" } },
+        },
        {
          type: "reasoning-end",
          id: "rs_1:1",
+          itemId: "rs_1",
          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: "encrypted-state" } },
        },
        { type: "step-finish", index: 0, reason: { normalized: "stop", raw: undefined } },
@@ -1200,8 +1315,8 @@ describe("OpenAI Responses route", () => {
      )

      expect(response.events.filter((event) => event.type === "reasoning-end")).toEqual([
-        { type: "reasoning-end", id: "rs_1:0", providerMetadata: { openai: { itemId: "rs_1" } } },
-        { type: "reasoning-end", id: "rs_1:1", providerMetadata: { openai: { itemId: "rs_1" } } },
+        { type: "reasoning-end", id: "rs_1:0", itemId: "rs_1", providerMetadata: { openai: { itemId: "rs_1" } } },
+        { type: "reasoning-end", id: "rs_1:1", itemId: "rs_1", providerMetadata: { openai: { itemId: "rs_1" } } },
      ])
    }),
  )
@@ -1249,7 +1364,7 @@ describe("OpenAI Responses route", () => {
                  { role: "user", content: [{ type: "input_text", text: "Summarize it." }] },
                ],
              })
-              expect(body.input[1]).not.toHaveProperty("id")
+              expect(body.input[1]).toHaveProperty("id", "rs_1")
              return input.respond(
                sseEvents(
                  { type: "response.output_text.delta", item_id: "msg_1", delta: "Parser now round-trips reasoning." },
@@ -1296,6 +1411,7 @@ describe("OpenAI Responses route", () => {
        { role: "assistant", content: [{ type: "output_text", text: "Before." }] },
        {
          type: "reasoning",
+          id: "rs_1",
          encrypted_content: "encrypted-state",
          summary: [{ type: "summary_text", text: "Checked order." }],
        },
@@ -1304,7 +1420,7 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("references stored reasoning items by id", () =>
+  it.effect("replays complete stored reasoning items with their id", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLM.request({
@@ -1322,7 +1438,14 @@ describe("OpenAI Responses route", () => {
        }),
      )

-      expect(prepared.body.input).toEqual([{ type: "item_reference", id: "rs_1" }])
+      expect(prepared.body.input).toEqual([
+        {
+          type: "reasoning",
+          id: "rs_1",
+          summary: [{ type: "summary_text", text: "Checked the previous diff." }],
+          encrypted_content: undefined,
+        },
+      ])
    }),
  )

@@ -1431,6 +1554,7 @@ describe("OpenAI Responses route", () => {
      expect(prepared.body.input).toEqual([
        {
          type: "reasoning",
+          id: "rs_1",
          encrypted_content: "encrypted-state",
          summary: [
            { type: "summary_text", text: "First" },
@@ -1510,6 +1634,7 @@ describe("OpenAI Responses route", () => {
        outputTokens: 1,
        nonCachedInputTokens: 5,
        cacheReadInputTokens: undefined,
+        cacheWriteInputTokens: undefined,
        reasoningTokens: undefined,
        totalTokens: 6,
        providerMetadata: { openai: { input_tokens: 5, output_tokens: 1 } },
@@ -1520,30 +1645,35 @@ describe("OpenAI Responses route", () => {
        {
          type: "tool-input-start",
          id: "call_1",
+          itemId: "item_1",
          name: "lookup",
          providerMetadata: { openai: { itemId: "item_1" } },
        },
        {
          type: "tool-input-delta",
          id: "call_1",
+          itemId: "item_1",
          name: "lookup",
          text: '{"query"',
        },
        {
          type: "tool-input-delta",
          id: "call_1",
+          itemId: "item_1",
          name: "lookup",
          text: ':"weather"}',
        },
        {
          type: "tool-input-end",
          id: "call_1",
+          itemId: "item_1",
          name: "lookup",
          providerMetadata: { openai: { itemId: "item_1" } },
        },
        {
          type: "tool-call",
          id: "call_1",
+          itemId: "item_1",
          name: "lookup",
          input: { query: "weather" },
          providerExecuted: undefined,
@@ -1563,6 +1693,17 @@ describe("OpenAI Responses route", () => {
          usage,
        },
      ])
+      expect(response.message.content).toEqual([
+        {
+          type: "tool-call",
+          id: "call_1",
+          itemId: "item_1",
+          name: "lookup",
+          input: { query: "weather" },
+          providerExecuted: undefined,
+          providerMetadata: { openai: { itemId: "item_1" } },
+        },
+      ])
    }),
  )

@@ -1595,6 +1736,7 @@ describe("OpenAI Responses route", () => {
      expect(response.events.find(LLMEvent.is.toolInputError)).toEqual({
        type: "tool-input-error",
        id: "call_1",
+        itemId: "item_1",
        name: "lookup",
        raw: '{"query":"partial',
      })
@@ -1651,6 +1793,7 @@ describe("OpenAI Responses route", () => {
        {
          type: "tool-call",
          id: "ws_1",
+          itemId: "ws_1",
          name: "web_search",
          input: { type: "search", query: "effect 4" },
          providerExecuted: true,
@@ -1659,11 +1802,35 @@ describe("OpenAI Responses route", () => {
        {
          type: "tool-result",
          id: "ws_1",
+          itemId: "ws_1",
          name: "web_search",
          result: { type: "json", value: item },
          providerExecuted: true,
+          providerMetadata: { openai: { itemId: "ws_1", item } },
+          output: undefined,
+        },
+      ])
+      expect(response.message.content).toEqual([
+        {
+          type: "tool-call",
+          id: "ws_1",
+          itemId: "ws_1",
+          name: "web_search",
+          input: { type: "search", query: "effect 4" },
+          providerExecuted: true,
          providerMetadata: { openai: { itemId: "ws_1" } },
        },
+        {
+          type: "tool-result",
+          id: "ws_1",
+          itemId: "ws_1",
+          name: "web_search",
+          result: { type: "json", value: item },
+          providerExecuted: true,
+          providerMetadata: { openai: { itemId: "ws_1", item } },
+          metadata: undefined,
+          cache: undefined,
+        },
      ])
    }),
  )
@@ -1741,6 +1908,7 @@ describe("OpenAI Responses route", () => {
      expect(toolCall).toEqual({
        type: "tool-call",
        id: "ci_1",
+        itemId: "ci_1",
        name: "code_interpreter",
        input: { code: "print(1+1)", container_id: "cnt_xyz" },
        providerExecuted: true,
@@ -1750,10 +1918,12 @@ describe("OpenAI Responses route", () => {
      expect(toolResult).toEqual({
        type: "tool-result",
        id: "ci_1",
+        itemId: "ci_1",
        name: "code_interpreter",
        result: { type: "json", value: item },
        providerExecuted: true,
-        providerMetadata: { openai: { itemId: "ci_1" } },
+        providerMetadata: { openai: { itemId: "ci_1", item } },
+        output: undefined,
      })
    }),
  )
@@ -162,6 +162,7 @@ describe("OpenRouter", () => {
              openrouter: {
                usage: true,
                reasoning: { effort: "high" },
+                promptCacheKey: "session_123",
                models: ["anthropic/claude-sonnet-4.6", "google/gemini-3.1-pro"],
                provider: { order: ["anthropic", "google"], require_parameters: true },
                plugins: [{ id: "response-healing" }],
@@ -173,7 +174,6 @@ describe("OpenRouter", () => {
            },
          }).model("anthropic/claude-3.7-sonnet:thinking"),
          prompt: "Think briefly.",
-          promptCacheKey: "session_123",
        }),
      )

@@ -49,6 +49,43 @@ describe("LLMResponse reducer", () => {
    expect(state.message.content).toEqual([{ type: "text", text: "partial" }])
  })

+  test("assembles response item identity and provider metadata", () => {
+    const response = LLMResponse.fromEvents([
+      LLMEvent.textStart({ id: "text-block", itemId: "msg_existing" }),
+      LLMEvent.textDelta({
+        id: "text-block",
+        itemId: "msg_existing",
+        text: "Answer",
+        providerMetadata: { openai: { itemId: "msg_existing" } },
+      }),
+      LLMEvent.textEnd({ id: "text-block", itemId: "msg_existing" }),
+      LLMEvent.reasoningStart({ id: "reasoning-block", itemId: "rs_existing" }),
+      LLMEvent.reasoningDelta({
+        id: "reasoning-block",
+        itemId: "rs_existing",
+        text: "Thought",
+        providerMetadata: { openai: { itemId: "rs_existing" } },
+      }),
+      LLMEvent.reasoningEnd({ id: "reasoning-block", itemId: "rs_existing" }),
+      LLMEvent.finish({ reason: { normalized: "stop" } }),
+    ])
+
+    expect(response?.message.content).toEqual([
+      {
+        type: "text",
+        text: "Answer",
+        itemId: "msg_existing",
+        providerMetadata: { openai: { itemId: "msg_existing" } },
+      },
+      {
+        type: "reasoning",
+        text: "Thought",
+        itemId: "rs_existing",
+        providerMetadata: { openai: { itemId: "rs_existing" } },
+      },
+    ])
+  })
+
  test("does not complete ended content without a terminal finish", () => {
    const state = reduce([
      LLMEvent.textStart({ id: "t1" }),
@@ -172,7 +172,7 @@ describe("LLMClient tools", () => {
      expect(calls).toEqual([{ id: "call_projected", parameters: { prefix: "count" }, output: { count: "2" } }])
      expect(dispatched.result).toEqual({ type: "text", value: "count:2" })
      expect(dispatched.output).toEqual({ structured: { count: "2" }, content: [{ type: "text", text: "count:2" }] })
-      expect(dispatched.events).toEqual([
+      expect(dispatched.events).toMatchObject([
        LLMEvent.toolResult({
          id: "call_projected",
          name: "projected",
@@ -180,6 +180,7 @@ describe("LLMClient tools", () => {
          output: { structured: { count: "2" }, content: [{ type: "text", text: "count:2" }] },
        }),
      ])
+      expect(dispatched.events[0]?.itemId).toBeUndefined()
    }),
  )

@@ -197,7 +198,7 @@ describe("LLMClient tools", () => {
        LLMEvent.toolCall({ id: "call_1", name: "tool", input: {}, providerMetadata }),
      )

-      expect(dispatched.events).toEqual([
+      expect(dispatched.events).toMatchObject([
        LLMEvent.toolResult({
          id: "call_1",
          name: "tool",
@@ -206,12 +207,13 @@ describe("LLMClient tools", () => {
          providerMetadata,
        }),
      ])
+      expect(dispatched.events[0]?.itemId).toBeUndefined()

      const failed = yield* ToolRuntime.dispatch(
        {},
-        LLMEvent.toolCall({ id: "call_2", name: "missing", input: {}, providerMetadata }),
+        LLMEvent.toolCall({ id: "call_2", itemId: "fc_failed", name: "missing", input: {}, providerMetadata }),
      )
-      expect(failed.events).toEqual([
+      expect(failed.events).toMatchObject([
        LLMEvent.toolError({
          id: "call_2",
          name: "missing",
@@ -225,6 +227,27 @@ describe("LLMClient tools", () => {
          providerMetadata,
        }),
      ])
+      const errorItemID = failed.events.find(LLMEvent.is.toolError)?.itemId
+      const resultItemID = failed.events.find(LLMEvent.is.toolResult)?.itemId
+      expect(errorItemID).toBeUndefined()
+      expect(resultItemID).toBeUndefined()
+    }),
+  )
+
+  it.effect("does not derive a function output item id from the function call item id", () =>
+    Effect.gen(function* () {
+      const tool = Tool.make({
+        description: "Return text.",
+        parameters: Schema.Struct({}),
+        success: Schema.String,
+        execute: () => Effect.succeed("hello"),
+      })
+      const dispatched = yield* ToolRuntime.dispatch(
+        { tool },
+        LLMEvent.toolCall({ id: "call_1", itemId: "fc_existing", name: "tool", input: {} }),
+      )
+
+      expect(dispatched.events.find(LLMEvent.is.toolResult)?.itemId).toBeUndefined()
    }),
  )

@@ -437,7 +460,7 @@ describe("LLMClient tools", () => {
      )

      expect(dispatched.result).toEqual(callerOwned)
-      expect(dispatched.events).toEqual([
+      expect(dispatched.events).toMatchObject([
        LLMEvent.toolResult({
          id: "call_1",
          name: "eventful",
@@ -445,6 +468,7 @@ describe("LLMClient tools", () => {
          output: { structured: { ok: true }, content: [] },
        }),
      ])
+      expect(dispatched.events[0]?.itemId).toBeUndefined()
    }),
  )

@@ -22,6 +22,5 @@
    }
  },
  "include": ["src", "package.json"],
-  "exclude": ["dist", "ts-dist"],
-  "references": [{ "path": "../core" }]
+  "exclude": ["dist", "ts-dist"]
 }
@@ -180,7 +180,6 @@ export type Endpoint5_12Input = {
  readonly text: string
  readonly files?: ReadonlyArray<PromptInput.FileAttachment> | undefined
  readonly agents?: ReadonlyArray<AgentAttachment> | undefined
-  readonly skills?: ReadonlyArray<PromptInput.SkillAttachment> | undefined
  readonly metadata?: { readonly [x: string]: unknown } | undefined
  readonly delivery?: "steer" | "queue" | undefined
  readonly resume?: boolean | undefined
@@ -197,7 +196,6 @@ export type Endpoint5_13Input = {
  readonly model?: Model.Ref | undefined
  readonly files?: ReadonlyArray<PromptInput.FileAttachment> | undefined
  readonly agents?: ReadonlyArray<AgentAttachment> | undefined
-  readonly skills?: ReadonlyArray<PromptInput.SkillAttachment> | undefined
  readonly delivery?: "steer" | "queue" | undefined
  readonly resume?: boolean | undefined
 }
@@ -412,7 +412,6 @@ const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12I
        text: input["text"],
        files: input["files"],
        agents: input["agents"],
-        skills: input["skills"],
        metadata: input["metadata"],
        delivery: input["delivery"],
        resume: input["resume"],
@@ -435,7 +434,6 @@ const Endpoint5_13 = (raw: RawClient["server.session"]) => (input: Endpoint5_13I
        model: input["model"],
        files: input["files"],
        agents: input["agents"],
-        skills: input["skills"],
        delivery: input["delivery"],
        resume: input["resume"],
      },
@@ -615,7 +615,6 @@ export function make(options: ClientOptions) {
              text: input["text"],
              files: input["files"],
              agents: input["agents"],
-              skills: input["skills"],
              metadata: input["metadata"],
              delivery: input["delivery"],
              resume: input["resume"],
@@ -639,7 +638,6 @@ export function make(options: ClientOptions) {
              model: input["model"],
              files: input["files"],
              agents: input["agents"],
-              skills: input["skills"],
              delivery: input["delivery"],
              resume: input["resume"],
            },
@@ -1080,8 +1080,6 @@ export type PromptFileAttachment = {

 export type PromptAgentAttachment = { name: string; mention?: PromptMention }

-export type PromptSkillAttachment = { id: string; name: string; text: string; mention?: PromptMention }
-
 export type SessionMessageAssistantText = { type: "text"; text: string; state?: SessionMessageProviderState }

 export type SessionMessageAssistantReasoning = {
@@ -1567,7 +1565,6 @@ export type SessionMessageUser = {
  text: string
  files?: Array<PromptFileAttachment>
  agents?: Array<PromptAgentAttachment>
-  skills?: Array<PromptSkillAttachment>
  type: "user"
 }

@@ -1575,7 +1572,6 @@ export type SessionPendingUserData = {
  text: string
  files?: Array<PromptFileAttachment>
  agents?: Array<PromptAgentAttachment>
-  skills?: Array<PromptSkillAttachment>
  metadata?: { [x: string]: JsonValue }
 }

@@ -1583,7 +1579,6 @@ export type SessionPendingUserData1 = {
  text: string
  files?: Array<PromptFileAttachment>
  agents?: Array<PromptAgentAttachment>
-  skills?: Array<PromptSkillAttachment>
  metadata?: { [x: string]: any }
 }

@@ -2584,12 +2579,6 @@ export type SessionImportInput = {
            readonly name: string
            readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
          }>
-          readonly skills?: ReadonlyArray<{
-            readonly id: string
-            readonly name: string
-            readonly text: string
-            readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
          readonly type: "user"
        }
      | {
@@ -2835,12 +2824,6 @@ export type SessionImportInput = {
            readonly name: string
            readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
          }>
-          readonly skills?: ReadonlyArray<{
-            readonly id: string
-            readonly name: string
-            readonly text: string
-            readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
          readonly type: "user"
        }
      | {
@@ -3086,12 +3069,6 @@ export type SessionImportInput = {
            readonly name: string
            readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
          }>
-          readonly skills?: ReadonlyArray<{
-            readonly id: string
-            readonly name: string
-            readonly text: string
-            readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-          }>
          readonly type: "user"
        }
      | {
@@ -3343,10 +3320,6 @@ export type SessionPromptInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly metadata?: { readonly [x: string]: JsonValue }
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
@@ -3364,10 +3337,6 @@ export type SessionPromptInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly metadata?: { readonly [x: string]: JsonValue }
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
@@ -3385,10 +3354,6 @@ export type SessionPromptInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly metadata?: { readonly [x: string]: JsonValue }
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
@@ -3406,35 +3371,10 @@ export type SessionPromptInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly metadata?: { readonly [x: string]: JsonValue }
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["agents"]
-  readonly skills?: {
-    readonly id?: string | null
-    readonly text: string
-    readonly files?: ReadonlyArray<{
-      readonly uri: string
-      readonly name?: string
-      readonly description?: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly agents?: ReadonlyArray<{
-      readonly name: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly metadata?: { readonly [x: string]: JsonValue }
-    readonly delivery?: "steer" | "queue" | null
-    readonly resume?: boolean | null
-  }["skills"]
  readonly metadata?: {
    readonly id?: string | null
    readonly text: string
@@ -3448,10 +3388,6 @@ export type SessionPromptInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly metadata?: { readonly [x: string]: JsonValue }
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
@@ -3469,10 +3405,6 @@ export type SessionPromptInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly metadata?: { readonly [x: string]: JsonValue }
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
@@ -3490,10 +3422,6 @@ export type SessionPromptInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly metadata?: { readonly [x: string]: JsonValue }
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
@@ -3520,10 +3448,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["id"]
@@ -3543,10 +3467,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["command"]
@@ -3566,10 +3486,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["arguments"]
@@ -3589,10 +3505,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["agent"]
@@ -3612,10 +3524,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["model"]
@@ -3635,10 +3543,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["files"]
@@ -3658,36 +3562,9 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["agents"]
-  readonly skills?: {
-    readonly id?: string | null
-    readonly command: string
-    readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
-    readonly files?: ReadonlyArray<{
-      readonly uri: string
-      readonly name?: string
-      readonly description?: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly agents?: ReadonlyArray<{
-      readonly name: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly delivery?: "steer" | "queue" | null
-    readonly resume?: boolean | null
-  }["skills"]
  readonly delivery?: {
    readonly id?: string | null
    readonly command: string
@@ -3704,10 +3581,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["delivery"]
@@ -3727,10 +3600,6 @@ export type SessionCommandInput = {
      readonly name: string
      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
    readonly delivery?: "steer" | "queue" | null
    readonly resume?: boolean | null
  }["resume"]
@@ -1,21 +0,0 @@
-import type { APIEvent } from "@solidjs/start/server"
-import { Workspace } from "@opencode-ai/console-core/workspace.js"
-import { safeEqual } from "@opencode-ai/console-core/util/crypto.js"
-import { Resource } from "@opencode-ai/console-resource"
-import z from "zod"
-
-const Body = z.object({ workspaceID: z.string().startsWith("wrk_") })
-
-export async function POST(event: APIEvent) {
-  if (!safeEqual(event.request.headers.get("authorization") ?? "", `Bearer ${Resource.SUPPORT_API_KEY.value}`)) {
-    return Response.json({ error: "Unauthorized" }, { status: 401 })
-  }
-
-  const body = Body.safeParse(await event.request.json().catch(() => undefined))
-  if (!body.success) {
-    return Response.json({ error: "Invalid request", issues: body.error.issues }, { status: 400 })
-  }
-  return Workspace.unblock(body.data.workspaceID)
-    .then(() => Response.json({ success: true, message: "Workspace unblocked" }))
-    .catch((error) => Response.json({ error: error instanceof Error ? error.message : String(error) }, { status: 400 }))
-}
@@ -103,16 +103,4 @@ export namespace Workspace {
        .where(eq(WorkspaceTable.id, Actor.workspace())),
    )
  })
-
-  export const unblock = fn(z.string().startsWith("wrk_"), async (workspaceID) => {
-    await Database.transaction(async (tx) => {
-      const workspace = await tx
-        .select({ id: WorkspaceTable.id })
-        .from(WorkspaceTable)
-        .where(eq(WorkspaceTable.id, workspaceID))
-        .then((rows) => rows[0])
-      if (!workspace) throw new Error("Workspace not found")
-      await tx.update(WorkspaceTable).set({ is_blocked: false }).where(eq(WorkspaceTable.id, workspaceID))
-    })
-  })
 }
@@ -11,14 +11,13 @@
    "fix-node-pty": "bun run script/fix-node-pty.ts",
    "benchmark:location": "bun run script/benchmark-location.ts",
    "test": "bun test --only-failures",
-    "typecheck": "tsgo -b tsconfig.json tsconfig.tests.json"
+    "typecheck": "tsgo --noEmit"
  },
  "bin": {
    "opencode": "./bin/opencode"
  },
  "exports": {
    "./environment": "./src/environment/index.ts",
-    "./testing/environment-conformance": "./test/lib/environment-conformance.ts",
    "./session/runner": "./src/session/runner/index.ts",
    "./instructions": "./src/instructions/index.ts",
    "./*": "./src/*.ts"
@@ -132,16 +132,14 @@ function renderMigration(name: string, sql: string) {
  return `import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: ${JSON.stringify(name)},
  up(tx) {
    return Effect.gen(function* () {
 ${renderStatements(sql)}
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
 `
 }

@@ -149,15 +147,13 @@ function renderSchema(sql: string) {
  return `import { Effect } from "effect"
 import type { DatabaseMigration } from "./migration"

-const schema: Omit<DatabaseMigration.Migration, "id"> = {
+export default {
  up(tx) {
    return Effect.gen(function* () {
 ${renderStatements(sql)}
    })
  },
-}
-
-export default schema
+} satisfies Omit<DatabaseMigration.Migration, "id">
 `
 }

@@ -195,10 +191,10 @@ async function formatTypescript(input: string) {
 function renderRegistry(names: string[]) {
  return `import type { DatabaseMigration } from "./migration"

-export const migrations: DatabaseMigration.Migration[] = (
+export const migrations = (
  await Promise.all([
 ${names.map((name) => `    import("./migration/${name}"),`).join("\n")}
  ])
-).map((module) => module.default)
+).map((module) => module.default) satisfies DatabaseMigration.Migration[]
 `
 }
@@ -0,0 +1,101 @@
+export * as Account from "./account"
+
+import { Schema } from "effect"
+import type { HttpClientError } from "effect/unstable/http"
+
+export const ID = Schema.String.pipe(Schema.brand("AccountID"))
+export type ID = Schema.Schema.Type<typeof ID>
+
+export const OrgID = Schema.String.pipe(Schema.brand("OrgID"))
+export type OrgID = Schema.Schema.Type<typeof OrgID>
+
+export const AccessToken = Schema.String.pipe(Schema.brand("AccessToken"))
+export type AccessToken = Schema.Schema.Type<typeof AccessToken>
+
+export const RefreshToken = Schema.String.pipe(Schema.brand("RefreshToken"))
+export type RefreshToken = Schema.Schema.Type<typeof RefreshToken>
+
+export const DeviceCode = Schema.String.pipe(Schema.brand("DeviceCode"))
+export type DeviceCode = Schema.Schema.Type<typeof DeviceCode>
+
+export const UserCode = Schema.String.pipe(Schema.brand("UserCode"))
+export type UserCode = Schema.Schema.Type<typeof UserCode>
+
+export class Info extends Schema.Class<Info>("Account")({
+  id: ID,
+  email: Schema.String,
+  url: Schema.String,
+  active_org_id: Schema.NullOr(OrgID),
+}) {}
+
+export class Org extends Schema.Class<Org>("Org")({
+  id: OrgID,
+  name: Schema.String,
+}) {}
+
+export class AccountRepoError extends Schema.TaggedErrorClass<AccountRepoError>()("AccountRepoError", {
+  message: Schema.String,
+  cause: Schema.optional(Schema.Defect()),
+}) {}
+
+export class AccountServiceError extends Schema.TaggedErrorClass<AccountServiceError>()("AccountServiceError", {
+  message: Schema.String,
+  cause: Schema.optional(Schema.Defect()),
+}) {}
+
+export class AccountTransportError extends Schema.TaggedErrorClass<AccountTransportError>()("AccountTransportError", {
+  method: Schema.String,
+  url: Schema.String,
+  description: Schema.optional(Schema.String),
+  cause: Schema.optional(Schema.Defect()),
+}) {
+  static fromHttpClientError(error: HttpClientError.TransportError): AccountTransportError {
+    return new AccountTransportError({
+      method: error.request.method,
+      url: error.request.url,
+      description: error.description,
+      cause: error.cause,
+    })
+  }
+
+  override get message(): string {
+    return [
+      `Could not reach ${this.method} ${this.url}.`,
+      `This failed before the server returned an HTTP response.`,
+      this.description,
+      `Check your network, proxy, or VPN configuration and try again.`,
+    ]
+      .filter(Boolean)
+      .join("\n")
+  }
+}
+
+export type AccountError = AccountRepoError | AccountServiceError | AccountTransportError
+
+export class Login extends Schema.Class<Login>("Login")({
+  code: DeviceCode,
+  user: UserCode,
+  url: Schema.String,
+  server: Schema.String,
+  expiry: Schema.Duration,
+  interval: Schema.Duration,
+}) {}
+
+export class PollSuccess extends Schema.TaggedClass<PollSuccess>()("PollSuccess", {
+  email: Schema.String,
+}) {}
+
+export class PollPending extends Schema.TaggedClass<PollPending>()("PollPending", {}) {}
+
+export class PollSlow extends Schema.TaggedClass<PollSlow>()("PollSlow", {}) {}
+
+export class PollExpired extends Schema.TaggedClass<PollExpired>()("PollExpired", {}) {}
+
+export class PollDenied extends Schema.TaggedClass<PollDenied>()("PollDenied", {}) {}
+
+export class PollError extends Schema.TaggedClass<PollError>()("PollError", {
+  cause: Schema.Defect(),
+}) {}
+
+export const PollResult = Schema.Union([PollSuccess, PollPending, PollSlow, PollExpired, PollDenied, PollError])
+export type PollResult = Schema.Schema.Type<typeof PollResult>
@@ -1,21 +1,24 @@
 import { sqliteTable, text, integer, primaryKey } from "drizzle-orm/sqlite-core"

+import { Account } from "../account"
 import { Timestamps } from "../database/schema.sql"

 export const AccountTable = sqliteTable("account", {
-  id: text().primaryKey(),
+  id: text().$type<Account.ID>().primaryKey(),
  email: text().notNull(),
  url: text().notNull(),
-  access_token: text().notNull(),
-  refresh_token: text().notNull(),
+  access_token: text().$type<Account.AccessToken>().notNull(),
+  refresh_token: text().$type<Account.RefreshToken>().notNull(),
  token_expiry: integer(),
  ...Timestamps,
 })

 export const AccountStateTable = sqliteTable("account_state", {
  id: integer().primaryKey(),
-  active_account_id: text().references(() => AccountTable.id, { onDelete: "set null" }),
-  active_org_id: text(),
+  active_account_id: text()
+    .$type<Account.ID>()
+    .references(() => AccountTable.id, { onDelete: "set null" }),
+  active_org_id: text().$type<Account.OrgID>(),
 })

 // LEGACY
@@ -24,8 +27,8 @@ export const ControlAccountTable = sqliteTable(
  {
    email: text().notNull(),
    url: text().notNull(),
-    access_token: text().notNull(),
-    refresh_token: text().notNull(),
+    access_token: text().$type<Account.AccessToken>().notNull(),
+    refresh_token: text().$type<Account.RefreshToken>().notNull(),
    token_expiry: integer(),
    active: integer({ mode: "boolean" })
      .notNull()
@@ -263,7 +263,6 @@ function mapOpenRouterOptions(settings: Readonly<Record<string, unknown>>) {
          "extraBody",
          "fetch",
          "headers",
-          "promptCacheKey",
          "timeout",
        ].includes(key),
    ),
@@ -280,6 +279,7 @@ function mapXAIOptions(settings: Readonly<Record<string, unknown>>) {
  const options = {
    ...(typeof settings.reasoningEffort === "string" ? { reasoningEffort: settings.reasoningEffort } : {}),
    ...(typeof settings.store === "boolean" ? { store: settings.store } : {}),
+    ...(typeof settings.promptCacheKey === "string" ? { promptCacheKey: settings.promptCacheKey } : {}),
  }
  if (Object.keys(options).length === 0) return {}
  return { providerOptions: { xai: options } }
@@ -126,7 +126,7 @@ ${render(current)}`
 const key = Instructions.Key.make("core/codemode")
 const codec = Schema.toCodecJson(CodeModeCatalog.Summary)

-export const make = (entries?: ReadonlyArray<CodeModeCatalog.Entry>): Instructions.List => {
+export const make = (entries?: ReadonlyArray<CodeModeCatalog.Entry>): Instructions.Instructions => {
  const catalog = entries === undefined ? Instructions.removed : CodeModeCatalog.summarize(entries)
  return Instructions.make({
    key,
@@ -1,6 +1,6 @@
 import type { DatabaseMigration } from "./migration"

-export const migrations: DatabaseMigration.Migration[] = (
+export const migrations = (
  await Promise.all([
    import("./migration/20260127222353_familiar_lady_ursula"),
    import("./migration/20260211171708_add_project_commands"),
@@ -43,4 +43,4 @@ export const migrations: DatabaseMigration.Migration[] = (
    import("./migration/20260804233008_loose_psylocke"),
    import("./migration/20260805200742_import_legacy_credentials"),
  ])
-).map((module) => module.default)
+).map((module) => module.default) satisfies DatabaseMigration.Migration[]
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260127222353_familiar_lady_ursula",
  up(tx) {
    return Effect.gen(function* () {
@@ -104,6 +104,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`CREATE INDEX \`todo_session_idx\` ON \`todo\` (\`session_id\`);`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,13 +1,11 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260211171708_add_project_commands",
  up(tx) {
    return Effect.gen(function* () {
      yield* tx.run(`ALTER TABLE \`project\` ADD \`commands\` text;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260213144116_wakeful_the_professor",
  up(tx) {
    return Effect.gen(function* () {
@@ -20,6 +20,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260225215848_workspace",
  up(tx) {
    return Effect.gen(function* () {
@@ -16,6 +16,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260227213759_add_session_workspace_id",
  up(tx) {
    return Effect.gen(function* () {
@@ -9,6 +9,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`CREATE INDEX \`session_workspace_idx\` ON \`session\` (\`workspace_id\`);`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260228203230_blue_harpoon",
  up(tx) {
    return Effect.gen(function* () {
@@ -27,6 +27,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260303231226_add_workspace_fields",
  up(tx) {
    return Effect.gen(function* () {
@@ -12,6 +12,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`ALTER TABLE \`workspace\` DROP COLUMN \`config\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260309230000_move_org_to_state",
  up(tx) {
    return Effect.gen(function* () {
@@ -12,6 +12,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`ALTER TABLE \`account\` DROP COLUMN \`selected_org_id\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260312043431_session_message_cursor",
  up(tx) {
    return Effect.gen(function* () {
@@ -13,6 +13,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`CREATE INDEX \`part_message_id_id_idx\` ON \`part\` (\`message_id\`,\`id\`);`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260323234822_events",
  up(tx) {
    return Effect.gen(function* () {
@@ -23,6 +23,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260410174513_workspace-name",
  up(tx) {
    return Effect.gen(function* () {
@@ -26,6 +26,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`PRAGMA foreign_keys=ON;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260413175956_chief_energizer",
  up(tx) {
    return Effect.gen(function* () {
@@ -21,6 +21,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`CREATE INDEX \`session_entry_time_created_idx\` ON \`session_entry\` (\`time_created\`);`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260423070820_add_icon_url_override",
  up(tx) {
    return Effect.gen(function* () {
@@ -11,6 +11,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260427172553_slow_nightmare",
  up(tx) {
    return Effect.gen(function* () {
@@ -27,6 +27,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`DROP TABLE \`session_entry\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,13 +1,11 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260428004200_add_session_path",
  up(tx) {
    return Effect.gen(function* () {
      yield* tx.run(`ALTER TABLE \`session\` ADD \`path\` text;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260501142318_next_venus",
  up(tx) {
    return Effect.gen(function* () {
@@ -9,6 +9,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`ALTER TABLE \`session\` ADD \`model\` text;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,13 +1,11 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260504145000_add_sync_owner",
  up(tx) {
    return Effect.gen(function* () {
      yield* tx.run(`ALTER TABLE \`event_sequence\` ADD \`owner_id\` text;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,13 +1,11 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260507164347_add_workspace_time",
  up(tx) {
    return Effect.gen(function* () {
      yield* tx.run(`ALTER TABLE \`workspace\` ADD \`time_used\` integer NOT NULL DEFAULT 0;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260510033149_session_usage",
  up(tx) {
    return Effect.gen(function* () {
@@ -53,6 +53,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260511000411_data_migration_state",
  up(tx) {
    return Effect.gen(function* () {
@@ -13,6 +13,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260511173437_session-metadata",
  up(tx) {
    return Effect.gen(function* () {
@@ -13,6 +13,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`ALTER TABLE \`session\` ADD \`metadata\` text;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260601010001_normalize_storage_paths",
  up(tx) {
    return Effect.gen(function* () {
@@ -19,6 +19,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,13 +1,11 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260601202201_amazing_prowler",
  up(tx) {
    return Effect.gen(function* () {
      yield* tx.run(`DROP TABLE \`permission\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260602002951_lowly_union_jack",
  up(tx) {
    return Effect.gen(function* () {
@@ -21,6 +21,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260602182828_add_project_directories",
  up(tx) {
    return Effect.gen(function* () {
@@ -17,6 +17,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260603001617_session_message_projection_indexes",
  up(tx) {
    return Effect.gen(function* () {
@@ -16,6 +16,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260603040000_session_message_projection_order",
  up(tx) {
    return Effect.gen(function* () {
@@ -16,6 +16,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260603141458_session_input_inbox",
  up(tx) {
    return Effect.gen(function* () {
@@ -22,6 +22,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260603160727_jittery_ezekiel_stane",
  up(tx) {
    return Effect.gen(function* () {
@@ -17,6 +17,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260604172448_event_sourced_session_input",
  up(tx) {
    return Effect.gen(function* () {
@@ -44,6 +44,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260605003541_add_session_context_snapshot",
  up(tx) {
    return Effect.gen(function* () {
@@ -18,6 +18,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,13 +1,11 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260605042240_add_context_epoch_agent",
  up(tx) {
    return Effect.gen(function* () {
      yield* tx.run(`ALTER TABLE \`session_context_epoch\` ADD \`agent\` text DEFAULT 'build' NOT NULL;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260611035744_credential",
  up(tx) {
    return Effect.gen(function* () {
@@ -22,6 +22,4 @@ const migration: DatabaseMigration.Migration = {
      )
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260611192811_lush_chimera",
  up(tx) {
    return Effect.gen(function* () {
@@ -22,6 +22,4 @@ const migration: DatabaseMigration.Migration = {
      `)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260612174303_project_dir_strategy",
  up(tx) {
    return Effect.gen(function* () {
@@ -26,6 +26,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`PRAGMA foreign_keys=ON;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260622142730_simplify_session_context_epoch",
  up(tx) {
    return Effect.gen(function* () {
@@ -10,6 +10,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`ALTER TABLE \`session_context_epoch\` DROP COLUMN \`revision\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260622170816_reset_v2_session_state",
  up(tx) {
    return Effect.gen(function* () {
@@ -12,6 +12,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`DELETE FROM \`event_sequence\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260622202450_simplify_session_input",
  up(tx) {
    return Effect.gen(function* () {
@@ -14,6 +14,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`DELETE FROM \`workspace\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "../migration"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260804233008_loose_psylocke",
  up(tx) {
    return Effect.gen(function* () {
@@ -135,6 +135,4 @@ const migration: DatabaseMigration.Migration = {
      yield* tx.run(`DROP TABLE \`session_input\`;`)
    })
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration
@@ -30,14 +30,12 @@ const decodeJson = Schema.decodeUnknownOption(Schema.UnknownFromJsonString)
 const decodeValue = Schema.decodeUnknownOption(LegacyValue)
 const wellKnownSourcesKey = "wellknown:sources"

-const migration: DatabaseMigration.Migration = {
+export default {
  id: "20260805200742_import_legacy_credentials",
  up(tx) {
    return importLegacyCredentials(tx, path.join(Global.Path.data, "auth.json"))
  },
-}
-
-export default migration
+} satisfies DatabaseMigration.Migration

 export function importLegacyCredentials(tx: Parameters<DatabaseMigration.Migration["up"]>[0], filepath: string) {
  return Effect.gen(function* () {
@@ -1,7 +1,7 @@
 import { Effect } from "effect"
 import type { DatabaseMigration } from "./migration"

-const schema: Omit<DatabaseMigration.Migration, "id"> = {
+export default {
  up(tx) {
    return Effect.gen(function* () {
      yield* tx.run(`
@@ -248,6 +248,4 @@ const schema: Omit<DatabaseMigration.Migration, "id"> = {
      )
    })
  },
-}
-
-export default schema
+} satisfies Omit<DatabaseMigration.Migration, "id">
@@ -18,7 +18,7 @@ const Files = Schema.Array(File)
 const key = Instructions.Key.make("core/instructions")

 export interface Interface {
-  readonly load: () => Effect.Effect<Instructions.List>
+  readonly load: () => Effect.Effect<Instructions.Instructions>
 }

 export const Options = Schema.Struct({
@@ -8,7 +8,7 @@ import { SessionSchema } from "../session/schema"
 import { Instructions } from "./index"

 export interface Interface {
-  readonly load: (sessionID: SessionSchema.ID) => Effect.Effect<Instructions.List>
+  readonly load: (sessionID: SessionSchema.ID) => Effect.Effect<Instructions.Instructions>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/InstructionBuiltIns") {}
@@ -53,7 +53,7 @@ export declare namespace Source {
 }

 /** Ordered sources; identical values render identical bytes. */
-export type List = ReadonlyArray<Source>
+export type Instructions = ReadonlyArray<Source>

 export type ReadResult = ReadonlyArray<{
  readonly key: Key
@@ -82,10 +82,10 @@ export class DuplicateKeyError extends Schema.TaggedErrorClass<DuplicateKeyError
  }
 }

-export const empty: List = []
+export const empty: Instructions = []

 /** Closes a typed definition into one `Source`, so differently typed sources compose. */
-export function make<A>(source: Source.Definition<A>): List {
+export function make<A>(source: Source.Definition<A>): Instructions {
  const decode = Schema.decodeUnknownOption(source.codec)
  const encode = Schema.encodeSync(source.codec)
  const initial = (value: A) => requireText(source.key, "initial", source.render.initial(value))
@@ -121,7 +121,7 @@ export function make<A>(source: Source.Definition<A>): List {
  ]
 }

-export function combine(values: ReadonlyArray<List>): List {
+export function combine(values: ReadonlyArray<Instructions>): Instructions {
  const sources = values.flat()
  const keys = new Set<Key>()
  for (const source of sources) {
@@ -131,7 +131,7 @@ export function combine(values: ReadonlyArray<List>): List {
  return sources
 }

-export function read(value: List): Effect.Effect<ReadResult> {
+export function read(value: Instructions): Effect.Effect<ReadResult> {
  return Effect.forEach(
    value,
    (source) => source.read.pipe(Effect.map((observed) => ({ key: source.key, value: observed }))),
@@ -158,7 +158,7 @@ export function diff(observed: ReadResult, previous?: Values): Effect.Effect<Adm
  return Effect.succeed({ delta, blobs })
 }

-export function renderInitial(value: List, values: Readonly<Record<string, Schema.Json>>) {
+export function renderInitial(value: Instructions, values: Readonly<Record<string, Schema.Json>>) {
  return render(
    value.flatMap((source) => {
      if (!Object.hasOwn(values, source.key)) return []
@@ -169,7 +169,7 @@ export function renderInitial(value: List, values: Readonly<Record<string, Schem
 }

 export function renderUpdate(
-  value: List,
+  value: Instructions,
  previous: Readonly<Record<string, Schema.Json>>,
  delta: Readonly<Record<string, Option.Option<Schema.Json>>>,
 ) {
@@ -55,7 +55,7 @@ const update = (previous: ReadonlyArray<Summary>, current: ReadonlyArray<Summary
 }

 export interface Interface {
-  readonly load: (agent: Agent.Selection) => Effect.Effect<Instructions.List>
+  readonly load: (agent: Agent.Selection) => Effect.Effect<Instructions.Instructions>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/McpInstructions") {}
@@ -11,7 +11,6 @@ import { Provider } from "@opencode-ai/schema/provider"
 import { AbsolutePath } from "@opencode-ai/schema/schema"
 import { Session } from "@opencode-ai/schema/session"
 import { SessionMessage } from "@opencode-ai/schema/session-message"
-import { Skill } from "@opencode-ai/schema/skill"
 import { Workspace } from "@opencode-ai/schema/workspace"
 import { WebSearch } from "@opencode-ai/schema/websearch"
 import { DateTime, Effect, Scope, Stream } from "effect"
@@ -297,7 +296,6 @@ export function fromPromise(plugin: Plugin) {
                  ...input,
                  sessionID: Session.ID.make(input.sessionID),
                  id: input.id == null ? undefined : SessionMessage.ID.make(input.id),
-                  skills: input.skills?.map((skill) => ({ ...skill, id: Skill.ID.make(skill.id) })),
                  delivery: input.delivery ?? undefined,
                  resume: input.resume ?? undefined,
                }),
@@ -312,7 +310,6 @@ export function fromPromise(plugin: Plugin) {
                  id: input.id == null ? undefined : SessionMessage.ID.make(input.id),
                  agent: input.agent == null ? undefined : Agent.ID.make(input.agent),
                  model: input.model == null ? undefined : model(input.model),
-                  skills: input.skills?.map((skill) => ({ ...skill, id: Skill.ID.make(skill.id) })),
                  arguments: input.arguments ?? undefined,
                  delivery: input.delivery ?? undefined,
                  resume: input.resume ?? undefined,
@@ -54,7 +54,7 @@ const update = (previous: ReadonlyArray<typeof Summary.Type>, current: ReadonlyA
 }

 export interface Interface {
-  readonly load: () => Effect.Effect<Instructions.List>
+  readonly load: () => Effect.Effect<Instructions.Instructions>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/ReferenceInstructions") {}
@@ -218,11 +218,10 @@ export interface Interface {
    text: string
    files?: PromptInput.Prompt["files"]
    agents?: PromptInput.Prompt["agents"]
-    skills?: PromptInput.Prompt["skills"]
    metadata?: Record<string, unknown>
    delivery?: SessionPending.Delivery
    resume?: boolean
-  }) => Effect.Effect<SessionPending.User, NotFoundError | PromptConflictError | AttachmentError | SkillNotFoundError>
+  }) => Effect.Effect<SessionPending.User, NotFoundError | PromptConflictError | AttachmentError>
  /** Generates text from current Session context without admitting input or mutating history. */
  readonly generate: (input: {
    sessionID: SessionSchema.ID
@@ -237,17 +236,11 @@ export interface Interface {
    model?: Model.Ref
    files?: PromptInput.Prompt["files"]
    agents?: PromptInput.Prompt["agents"]
-    skills?: PromptInput.Prompt["skills"]
    delivery?: SessionPending.Delivery
    resume?: boolean
  }) => Effect.Effect<
    SessionPending.User,
-    | NotFoundError
-    | PromptConflictError
-    | AttachmentError
-    | SkillNotFoundError
-    | Command.NotFoundError
-    | Command.EvaluationError
+    NotFoundError | PromptConflictError | AttachmentError | Command.NotFoundError | Command.EvaluationError
  >
  readonly shell: (input: {
    id?: Event.ID
@@ -574,11 +567,9 @@ const layer = Layer.effect(
            // Resolved lazily so prompt admission only boots location services when an
            // image attachment actually needs the resizer.
            const image = Image.Service.pipe(Effect.provide(locations.get(session.location)))
-            const skills = Skill.Service.pipe(Effect.provide(locations.get(session.location)))
            const prompt = yield* resolvePrompt(
-              { text: input.text, files: input.files, agents: input.agents, skills: input.skills },
+              { text: input.text, files: input.files, agents: input.agents },
              image,
-              skills,
            ).pipe(Effect.provideService(FSUtil.Service, fs))
            const messageID = input.id ?? SessionMessage.ID.create()
            const admittedInput = SessionPending.Message.make({
@@ -644,7 +635,6 @@ const layer = Layer.effect(
          text: evaluated.text,
          files: input.files,
          agents: input.agents,
-          skills: input.skills,
          delivery: input.delivery,
          resume: input.resume,
        })
@@ -907,28 +897,12 @@ function synthesizeTerminalShellInfo(started: ShellSchema.Info): ShellSchema.Inf
 const resolvePrompt = Effect.fn("Session.resolvePrompt")(function* (
  input: PromptInput.Prompt,
  image: Effect.Effect<Image.Interface>,
-  skills: Effect.Effect<Skill.Interface>,
 ) {
  const fs = yield* FSUtil.Service
  const files = input.files
    ? yield* Effect.forEach(input.files, (file) => materializeAttachment(fs, file, image), { concurrency: 8 })
    : undefined
-  const requested = input.skills
-  const selected = yield* Effect.gen(function* () {
-    if (!requested?.length) return undefined
-    const available = yield* (yield* skills).list()
-    return yield* Effect.forEach(requested, (attachment) => {
-      const skill = available.find((item) => item.id === attachment.id)
-      if (!skill) return Effect.fail(new SkillNotFoundError({ skill: attachment.id }))
-      return Effect.succeed({
-        id: skill.id,
-        name: skill.name,
-        text: Skill.toModelOutput(skill, []),
-        mention: attachment.mention,
-      })
-    })
-  })
-  return Prompt.make({ text: input.text, agents: input.agents, files, skills: selected?.length ? selected : undefined })
+  return Prompt.make({ text: input.text, agents: input.agents, files })
 })

 const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aiden Cline	ab03b05c00	fix(ai): replay function call item ids	2026-08-07 22:30:52 -05:00
Aiden Cline	0f67def34d	fix(ai): keep response ids provider-owned	2026-08-07 17:15:00 -05:00
Aiden Cline	0657dcbad2	fix(ai): stop generating response item ids	2026-08-07 14:26:50 -05:00
Aiden Cline	82afcfd4e0	fix(ai): generate uuidv7 item ids	2026-08-07 14:04:15 -05:00
Aiden Cline	a1cbcc8641	fix(ai): preserve responses item ids	2026-08-07 12:57:48 -05:00