refactor(ai): reuse shared OpenRouter Responses implementation

refactor(ai): share OpenRouter Responses protocol
feat(ai): route OpenRouter models through native APIs
2026-10-26 02:14:43 +08:00 · 2026-09-30 11:31:02 -05:00 · 2026-09-30 11:31:01 -05:00 · 2026-09-30 11:31:01 -05:00 · 2026-09-30 11:13:34 -05:00 · 2026-09-30 11:42:23 -04:00
53 changed files with 1576 additions and 555 deletions
@@ -599,8 +599,8 @@
      },
      "peerDependencies": {
        "@opencode/theme": "workspace:*",
-        "@opentui/core": ">=0.5.13",
-        "@opentui/solid": ">=0.5.13",
+        "@opentui/core": ">=0.5.14",
+        "@opentui/solid": ">=0.5.14",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -1117,9 +1117,9 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.5.13",
-    "@opentui/keymap": "0.5.13",
-    "@opentui/solid": "0.5.13",
+    "@opentui/core": "0.5.14",
+    "@opentui/keymap": "0.5.14",
+    "@opentui/solid": "0.5.14",
    "@pierre/diffs": "1.5.1",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.71.0",
@@ -2255,25 +2255,27 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.43.0", "", {}, "sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg=="],

-    "@opentui/core": ["@opentui/core@0.5.13", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.13", "@opentui/core-darwin-x64": "0.5.13", "@opentui/core-linux-arm64": "0.5.13", "@opentui/core-linux-arm64-musl": "0.5.13", "@opentui/core-linux-x64": "0.5.13", "@opentui/core-linux-x64-musl": "0.5.13", "@opentui/core-win32-arm64": "0.5.13", "@opentui/core-win32-x64": "0.5.13" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-3XNXJx3J9I+Ce170oh7GJ3leBZZA7QYv4OAhwiMCPQtKMkhy3Wra99NM26HXcEGme0zjkkJLownwLLnxuc0U/Q=="],
+    "@opentui/core": ["@opentui/core@0.5.14", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.14", "@opentui/core-darwin-x64": "0.5.14", "@opentui/core-linux-arm64": "0.5.14", "@opentui/core-linux-arm64-musl": "0.5.14", "@opentui/core-linux-x64": "0.5.14", "@opentui/core-linux-x64-musl": "0.5.14", "@opentui/core-win32-arm64": "0.5.14", "@opentui/core-win32-x64": "0.5.14" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-tfQ+PWQyeBnYloB3diEcPqbILv14xemH5jjAEICfPuyNDtGBqrjhUtThrhbvFRuPMcj6IEeXrAk6VE8e91h0kg=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.13", "", { "os": "darwin", "cpu": "arm64" }, "sha512-5X9U2v5qn4+vKj31zpn0RMoBV3Q9ttdM4t5KN41NPg6XgtIOZgKwox5yOsvBaiQ1KGbuk5wMvXCxfWJ30Mj/nw=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.14", "", { "os": "darwin", "cpu": "arm64" }, "sha512-wWmw41wRMBoI0lN9mgyzGRwYujwwfNkBP6jYM99k4Bx2XkeSZ3sCeu5bwX9vEJPYqjiBShbDhc0NnVSP7NwzVg=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.13", "", { "os": "darwin", "cpu": "x64" }, "sha512-9IgQHLKSn3quVsU0gibkRjOPegv1QH4573KWYXQNDmSxBXw84Nd1mDNsbK9f72SblAILhOCYK685pmk3X/z0Ig=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.14", "", { "os": "darwin", "cpu": "x64" }, "sha512-7smHKDH8IhUaBsgYuAClMl2mHWu+yjpMrtdw3wEvBVtCzKMrHi/TJ5PtydO+IfUzR3BXpVubdbR1irD8BTcR/w=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.13", "", { "os": "linux", "cpu": "arm64" }, "sha512-jMXGEpB/2Ch/IR0QzYBM5eCr1tUzicxoTP1AbMCbOduJXcGRCHTWqIdQIgRErwPF92gBcDIs4JugSn/Jd0Ki7g=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-xH1hP+NaLySEJeZkl21NlkZBMddMfQ1jU8NeX1AEBc2GNBOvDXU4Ud/xw87SrAvU1xG9K7/9C4oy4AmIMEpVGg=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.13", "", { "os": "linux", "cpu": "x64" }, "sha512-7ytcKy7pQxvQer3PADGYNK+HRhSDyhZvp475GRBEhlBJIdhdL8PNU6hjd2R1dnieifiW7Mpc4EiC1kGKe69gYg=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-mnBBAuTb92NiRLAjOD755tS8/tNQemDztbg9tMvoCT90G52FtVrRb31Ge6OrYqfm0c9DkZGhEBOhunsId/4zSA=="],

-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.13", "", { "os": "linux", "cpu": "x64" }, "sha512-C2ZC7WA7YH/GS+rJnbeVGe6Kxeor0aTD2qcS6l32KmN4XuY7TXm192XJMfxxnKaTA6oKp3mW27ezolJKUcGtMw=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.14", "", { "os": "linux", "cpu": "x64" }, "sha512-Hkk4kaDGMcn9bmJFJPW3/QOGGbPuWe3sCFV/CkiVb4+bCvcTm7EXQr4QTAA63BYy2dKE5bUFUi1zZlyeMkWpnA=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.13", "", { "os": "win32", "cpu": "arm64" }, "sha512-IB6eLh6I/gYXrJ0AYxZpD+Dr+yfZJck0ZfLnIapbD+fykaT0umOtvc/BL+CtlC/aSc7jpe0q4eXdn6XIA8HtLw=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.14", "", { "os": "linux", "cpu": "x64" }, "sha512-ngJ+U2grOGEteeQvZdAJNqn09M+At5mfWInauK5aS427bea1yLo+e6hor/CRmbn9SxEEF+SwoyekaOrLPWyU7w=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.13", "", { "os": "win32", "cpu": "x64" }, "sha512-FCucDN8A4iFDPdwqLK99ISs42pcbcObkxhN1jtsnmcYM9/Ptron7Hhapx2ObQWYjSrJNnntmfZQd2ewpE8YqTQ=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.14", "", { "os": "win32", "cpu": "arm64" }, "sha512-T9kNqKXg2jysmTsyyZ1A8LBQotFBM+iPjzyRslxyexqrs8a1UcmxbApEo+COtxQuqukMTbvwyqEdAT8vcmxEkQ=="],

-    "@opentui/keymap": ["@opentui/keymap@0.5.13", "", { "dependencies": { "@opentui/core": "0.5.13" }, "peerDependencies": { "@opentui/react": "0.5.13", "@opentui/solid": "0.5.13", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-bbpQ5N8000CuvVDhptGuHxUE92sivChjUjLkvYT1VnLlDTiGbQ4mPsHfnqsaEokc7O7jBcoJXJQsLxw7rO/qkg=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.14", "", { "os": "win32", "cpu": "x64" }, "sha512-mqKSkab8VdMLSmMdocna7+BTyMoIutkVXOV9lfmPrBO2g7Np5c6c4SJ4QIVZqPvast11XyT0/7FfXOYLKAS72w=="],

-    "@opentui/solid": ["@opentui/solid@0.5.13", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.13", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-MGMYQYeoZNn9uq3zsLPqq/G+nBQXgGwpylsrYux0nJ+C+6oflDEE6t8huSTZaAUizC/3WG8sVSVFutczeRbnPg=="],
+    "@opentui/keymap": ["@opentui/keymap@0.5.14", "", { "dependencies": { "@opentui/core": "0.5.14" }, "peerDependencies": { "@opentui/react": "0.5.14", "@opentui/solid": "0.5.14", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-YGTAvRrpQTbRNV7GH0UxRuCSPxwnSooVdB+qPHHP+3ywc93+lhekljgP8dRivl32f3CiMqqm96Uj2PgwKxkC0Q=="],
+
+    "@opentui/solid": ["@opentui/solid@0.5.14", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.14", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-bBRl34mZ0wFGhjHX6y1VNiZmJ3DSm2DVPm0PNSVDpvq9qxRHuywEPTCn/Lgte0C9450tgf11cDqcE3pR9cZwVA=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -52,9 +52,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.13",
-      "@opentui/keymap": "0.5.13",
-      "@opentui/solid": "0.5.13",
+      "@opentui/core": "0.5.14",
+      "@opentui/keymap": "0.5.14",
+      "@opentui/solid": "0.5.14",
      "@tanstack/solid-virtual": "3.13.37",
      "@shikijs/stream": "4.4.3",
      "@standard-schema/spec": "1.1.0",
@@ -1203,12 +1203,22 @@ LLM.request({
 | ----------------------- | ------------------------------------------------------------------------- |
 | Anthropic Messages      | emits up to 4 `cache_control` markers (4-breakpoint cap enforced)         |
 | Bedrock Converse        | emits up to 4 `cachePoint` blocks (4-breakpoint cap enforced)             |
-| OpenRouter              | emits up to 4 `cache_control` markers                                     |
+| OpenRouter              | Anthropic/Qwen emit explicit markers; other families use upstream caching |
 | OpenAI Chat / Responses | no-op (implicit caching above 1024 tokens)                                |
 | Gemini                  | no-op (implicit caching on 2.5+; explicit `CachedContent` is out-of-band) |

 Normalized cache usage is read back into `response.usage.cacheReadInputTokens` and `cacheWriteInputTokens` across every provider.

+OpenRouter selects its wire API by model family: `openai/*`, `x-ai/*`, and `meta/*` use Responses; `anthropic/*` uses
+Anthropic Messages; other families use Chat Completions. All three Responses families share the existing OpenAI-shaped
+Responses implementation, including namespace tools and hosted-tool events; there are no per-vendor OpenRouter
+protocols. Leading-`~` model aliases follow the same routing. Explicit `openrouter.chat(id)`, `.responses(id)`, and
+`.messages(id)` selectors are available for API-specific integrations.
+Qwen retains Chat's explicit system/conversation cache markers, while Claude uses native Messages cache blocks.
+OpenRouter Responses is stateless (`store: false`); every request includes full history, not `previous_response_id`.
+Meta currently accepts only automatic tool selection on both its Chat and Responses upstreams; forced/disabled tool
+choices can be rejected by the provider.
+
 ## Providers

 Provider facades configure endpoint/auth/deployment details first, then expose model selectors that take only a model or deployment id. The selected model carries the executable route value used at runtime.
@@ -49,6 +49,7 @@ const RESPECTS_INLINE_HINTS = new Set([
  "zai-coding-messages",
  "bedrock-converse",
  "openrouter",
+  "openrouter-messages",
 ])

 // OpenRouter upstreams other than Anthropic and Alibaba Qwen cache without breakpoints. Gemini uses only the last
@@ -168,7 +169,8 @@ const countHints = (request: LLMRequest) =>
 export const applyCachePolicy = (request: LLMRequest): LLMRequest => {
  if (!RESPECTS_INLINE_HINTS.has(request.model.route.id)) return request
  const policy =
-    request.model.route.id === "openrouter" && (request.cache === undefined || request.cache === "auto")
+    (request.model.route.id === "openrouter" || request.model.route.id === "openrouter-messages") &&
+    (request.cache === undefined || request.cache === "auto")
      ? openRouterPolicy(request.model.id)
      : resolve(request.cache)
  if (!policy.tools && !policy.system && !policy.messages) return request
@@ -163,7 +163,7 @@ export const CompactionItem = Schema.Struct({
  encrypted_content: Schema.String,
 })

-// Kept out of the baseline `InputItem` union: only the OpenAI extension accepts it.
+// Kept out of the baseline `InputItem` union; extensions such as OpenAI and OpenRouter opt in.
 export const ConfigurationUpdate = Schema.Struct({
  type: Schema.Literal("configuration_update"),
  reasoning: Schema.Struct({ effort: OpenResponsesOptions.ReasoningEffort }),
@@ -298,18 +298,22 @@ const OpenResponsesBody = Schema.Struct({
 })
 export type OpenResponsesBody = Schema.Schema.Type<typeof OpenResponsesBody>

-export const OpenResponsesUsage = Schema.Struct({
-  input_tokens: Schema.optional(Schema.Number),
-  input_tokens_details: optionalNull(
-    Schema.Struct({
-      cached_tokens: Schema.optional(Schema.Number),
-      cache_write_tokens: Schema.optional(Schema.Number),
-    }),
-  ),
-  output_tokens: Schema.optional(Schema.Number),
-  output_tokens_details: optionalNull(Schema.Struct({ reasoning_tokens: Schema.optional(Schema.Number) })),
-  total_tokens: Schema.optional(Schema.Number),
-})
+// Retain gateway billing extensions in provider metadata without changing normalized token accounting.
+export const OpenResponsesUsage = Schema.StructWithRest(
+  Schema.Struct({
+    input_tokens: Schema.optional(Schema.Number),
+    input_tokens_details: optionalNull(
+      Schema.Struct({
+        cached_tokens: Schema.optional(Schema.Number),
+        cache_write_tokens: Schema.optional(Schema.Number),
+      }),
+    ),
+    output_tokens: Schema.optional(Schema.Number),
+    output_tokens_details: optionalNull(Schema.Struct({ reasoning_tokens: Schema.optional(Schema.Number) })),
+    total_tokens: Schema.optional(Schema.Number),
+  }),
+  [Schema.Record(Schema.String, Schema.Unknown)],
+)
 type OpenResponsesUsage = Schema.Schema.Type<typeof OpenResponsesUsage>

 // The spec requires `id` on every output item, but some gateways drop it from
@@ -124,7 +124,7 @@ const OpenAIResponsesCoreFields = {
  ),
 }

-const OpenAIResponsesBody = Schema.Struct({
+export const OpenAIResponsesBody = Schema.Struct({
  ...OpenAIResponsesCoreFields,
  stream: Schema.Literal(true),
 })
@@ -0,0 +1,179 @@
+export * as OpenRouterWire from "./openrouter.js"
+
+import { Option, Schema } from "effect"
+import { LLMRequest, Message, type ContentPart, type ReasoningPart } from "../../schema/index.js"
+import type { OpenAIResponses } from "../openai-responses.js"
+import { isRecord, ProviderShared } from "../shared.js"
+
+const ReplayDetail = Schema.Struct({
+  type: Schema.String,
+  text: Schema.optional(Schema.String),
+  signature: Schema.optional(Schema.NullOr(Schema.String)),
+  data: Schema.optional(Schema.String),
+  encrypted: Schema.optional(Schema.String),
+})
+const decodeReplayDetail = Schema.decodeUnknownOption(ReplayDetail)
+
+// OpenRouter's generic Responses API supports chronological effort updates only on eligible models.
+export function supportsEffortUpdates(request: LLMRequest) {
+  if (request.providerOptions?.contextManagement !== undefined) return false
+  if (request.providerOptions?.truncation === "auto" || request.http?.body?.truncation === "auto") return false
+  if (Schema.is(Schema.Struct({ mode: Schema.Literal("pro") }))(request.providerOptions?.reasoning)) return false
+  if (Schema.is(Schema.Struct({ mode: Schema.Literal("pro") }))(request.http?.body?.reasoning)) return false
+  return (
+    request.model.compatibility?.supportsEffortUpdates ??
+    /^~?openai\/(?:gpt-6-(?:astra|sol|luna)|gpt-6\.1-sol)$/i.test(request.model.id)
+  )
+}
+
+export function nativeRequest(request: LLMRequest, format: "responses" | "messages") {
+  const options = request.providerOptions ?? {}
+  const reasoning = isRecord(options.reasoning)
+    ? fitReasoning(options.reasoning, request.generation?.maxTokens)
+    : undefined
+  const disabled = reasoning?.enabled === false || reasoning?.effort === "none"
+  return LLMRequest.update(request, {
+    providerOptions:
+      format === "responses"
+        ? {
+            ...options,
+            reasoningEffort:
+              options.reasoningEffort ?? (typeof reasoning?.effort === "string" ? reasoning.effort : undefined),
+          }
+        : {
+            ...options,
+            effort:
+              options.effort ?? (typeof reasoning?.effort === "string" && !disabled ? reasoning.effort : undefined),
+            thinking:
+              options.thinking ??
+              (() => {
+                if (disabled) return { type: "disabled" }
+                if (typeof reasoning?.max_tokens === "number")
+                  return { type: "enabled", budget_tokens: reasoning.max_tokens }
+                if (reasoning?.enabled === true || typeof reasoning?.effort === "string")
+                  return { type: "adaptive", ...(reasoning.exclude === true ? { display: "omitted" } : {}) }
+              })(),
+          },
+    messages: request.messages.map((message) => {
+      if (
+        !message.content.some(
+          (part) => part.type === "reasoning" && part.providerMetadata?.openrouter?.reasoningDetails !== undefined,
+        )
+      )
+        return message
+      return Message.make({
+        ...message,
+        // Chat stores signatures in reasoning_details; native APIs require individual signed blocks/items.
+        content: message.content.flatMap<ContentPart>((part) => {
+          if (part.type !== "reasoning") return [part]
+          const details = part.providerMetadata?.openrouter?.reasoningDetails
+          if (!Array.isArray(details)) return [part]
+          const replay = details.flatMap((detail) => Option.toArray(decodeReplayDetail(detail)))
+          if (format === "responses") {
+            const encrypted = replay.find(
+              (detail) => detail.type === "reasoning.encrypted" || detail.type === "encrypted",
+            )
+            return [
+              {
+                ...part,
+                providerMetadata: {
+                  ...part.providerMetadata,
+                  openrouter: {
+                    ...part.providerMetadata?.openrouter,
+                    reasoningEncryptedContent:
+                      part.providerMetadata?.openrouter?.reasoningEncryptedContent ??
+                      encrypted?.data ??
+                      encrypted?.encrypted,
+                  },
+                },
+              },
+            ]
+          }
+          const blocks = replay.flatMap<ReasoningPart>((detail) => {
+            const metadata = (() => {
+              if (detail.type === "reasoning.text" && detail.signature) return { signature: detail.signature }
+              if (detail.type === "reasoning.encrypted" && detail.data) return { redactedData: detail.data }
+            })()
+            if (!metadata) return []
+            return [
+              {
+                ...part,
+                text: metadata.signature ? (detail.text ?? part.text) : "",
+                providerMetadata: {
+                  ...part.providerMetadata,
+                  openrouter: { ...part.providerMetadata?.openrouter, ...metadata },
+                },
+              },
+            ]
+          })
+          return blocks.length > 0 ? blocks : [part]
+        }),
+      })
+    }),
+  })
+}
+
+export function responsesOptions(request: LLMRequest, body: OpenAIResponses.OpenAIResponsesBody) {
+  const { usage: _, ...options } = bodyOptions(request.providerOptions, request.generation?.maxTokens)
+  return {
+    ...options,
+    ...body,
+    store: false as const,
+    // Native lowering may freeze effort at the history baseline; keep it instead of the current effort.
+    ...(options.reasoning || body.reasoning
+      ? {
+          reasoning: {
+            ...options.reasoning,
+            ...body.reasoning,
+            effort: body.reasoning?.effort,
+            summary:
+              body.reasoning?.summary ??
+              (typeof options.reasoning?.summary === "string" ? options.reasoning.summary : undefined),
+          },
+        }
+      : {}),
+    ...(options.text || body.text ? { text: { ...options.text, ...body.text } } : {}),
+  }
+}
+
+export const bodyOptions = (input: unknown, maxTokens: number | undefined) => {
+  const openrouter = isRecord(input) ? input : {}
+  const {
+    usage,
+    models,
+    provider,
+    plugins,
+    web_search_options,
+    debug,
+    user,
+    reasoning,
+    text,
+    promptCacheKey,
+    ...options
+  } = openrouter
+  return {
+    ...options,
+    ...(usage === undefined || usage === true
+      ? { usage: { include: true } }
+      : usage === false
+        ? { usage: { include: false } }
+        : isRecord(usage)
+          ? { usage }
+          : {}),
+    ...(Array.isArray(models) ? { models } : {}),
+    ...(isRecord(provider) ? { provider } : {}),
+    ...(Array.isArray(plugins) ? { plugins } : {}),
+    ...(isRecord(web_search_options) ? { web_search_options } : {}),
+    ...(isRecord(debug) ? { debug } : {}),
+    ...(typeof user === "string" ? { user } : {}),
+    ...(isRecord(reasoning) ? { reasoning: fitReasoning(reasoning, maxTokens) } : {}),
+    ...(isRecord(text) ? { text } : {}),
+  }
+}
+
+// Anthropic and Alibaba require the thinking budget to remain below the output limit.
+function fitReasoning(reasoning: Record<string, unknown>, maxTokens: number | undefined) {
+  return typeof reasoning.max_tokens === "number"
+    ? { ...reasoning, max_tokens: ProviderShared.fitThinkingBudget(reasoning.max_tokens, maxTokens, 1_024) }
+    : reasoning
+}
@@ -21,6 +21,8 @@ const patterns = [
  /exceeds the context window/i,
  /exceeds (?:the )?(?:model'?s )?maximum context length(?: of [\d,]+ tokens?|\s*\([\d,]+\))/i,
  /input token count.*exceeds the maximum/i,
+  // Amazon Nova on Bedrock reports this as a mid-stream validationException.
+  /number of input tokens exceeds maximum length/i,
  /tokens in request more than max tokens allowed/i,
  /maximum prompt length is \d+/i,
  /reduce the length of the messages/i,
@@ -7,8 +7,12 @@ import { HttpOptions, ProviderID, type CacheHint, type ModelID, type OpenString
 import type { ProviderPackage } from "../provider-package.js"
 import { SystemOne } from "../experimental/system-one.js"
 import { OpenAIChat } from "../protocols/openai-chat.js"
+import { OpenAIResponses } from "../protocols/openai-responses.js"
+import { AnthropicMessages } from "../protocols/anthropic-messages.js"
+import { Framing } from "../route/framing.js"
+import { JsonObject } from "../protocols/shared.js"
 import { newBreakpoints, ttlBucket } from "../protocols/utils/cache.js"
-import { isRecord, ProviderShared } from "../protocols/shared.js"
+import { OpenRouterWire } from "../protocols/utils/openrouter.js"

 export const id = ProviderID.make("openrouter")
 const baseURL = "https://openrouter.ai/api/v1"
@@ -54,6 +58,7 @@ export interface OpenRouterOptions {
  readonly plugins?: ReadonlyArray<OpenRouterPlugin>
  readonly provider?: OpenRouterProviderRouting
  readonly reasoning?: Readonly<{
+    [key: string]: unknown
    enabled?: boolean
    exclude?: boolean
    effort?: OpenString<"none" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max">
@@ -95,6 +100,18 @@ const OpenRouterBody = Schema.StructWithRest(Schema.Struct(OpenAIChat.bodyFields
 ])
 export type OpenRouterBody = Schema.Schema.Type<typeof OpenRouterBody>

+const OpenRouterResponsesBody = Schema.StructWithRest(
+  Schema.Struct({
+    ...OpenAIResponses.OpenAIResponsesBody.fields,
+    store: Schema.Literal(false),
+    reasoning: Schema.optional(JsonObject),
+    text: Schema.optional(JsonObject),
+  }),
+  [JsonObject],
+)
+const OpenRouterMessagesBody = Schema.StructWithRest(AnthropicMessages.AnthropicMessagesBody, [JsonObject])
+type OpenRouterMessagesBody = Schema.Schema.Type<typeof OpenRouterMessagesBody>
+
 export const protocol = Protocol.make({
  id: "openrouter-chat",
  body: {
@@ -123,7 +140,7 @@ export const protocol = Protocol.make({
          return {
            ...body,
            messages,
-            ...bodyOptions(request.providerOptions, request.generation?.maxTokens),
+            ...OpenRouterWire.bodyOptions(request.providerOptions, request.generation?.maxTokens),
          } as OpenRouterBody
        }),
      ),
@@ -131,6 +148,37 @@ export const protocol = Protocol.make({
  stream: OpenAIChat.protocol.stream,
 })

+const responsesProtocol = Protocol.make({
+  ...OpenAIResponses.protocol,
+  id: "openrouter-responses",
+  supportsEffortUpdates: OpenRouterWire.supportsEffortUpdates,
+  body: {
+    schema: OpenRouterResponsesBody,
+    from: (request) =>
+      OpenAIResponses.protocol.body
+        .from(OpenRouterWire.nativeRequest(request, "responses"))
+        .pipe(Effect.map((body) => OpenRouterWire.responsesOptions(request, body))),
+  },
+})
+const messagesProtocol = Protocol.make({
+  ...AnthropicMessages.protocol,
+  id: "openrouter-messages",
+  body: {
+    schema: OpenRouterMessagesBody,
+    from: (request) =>
+      AnthropicMessages.protocol.body.from(OpenRouterWire.nativeRequest(request, "messages")).pipe(
+        Effect.map((body) => {
+          const {
+            reasoning: _,
+            usage: _usage,
+            ...options
+          } = OpenRouterWire.bodyOptions(request.providerOptions, body.max_tokens)
+          return { ...options, ...body }
+        }),
+      ),
+  },
+})
+
 const cacheControl = () => {
  const breakpoints = newBreakpoints(4)
  return (cache: CacheHint | undefined) => {
@@ -143,36 +191,6 @@ const cacheControl = () => {
  }
 }

-// OpenRouter forwards `reasoning.max_tokens` as the upstream thinking budget. Upstreams such as Anthropic and Alibaba
-// reject one that is not below the output limit; 1,024 is Anthropic's minimum budget.
-const fitReasoning = (reasoning: Record<string, unknown>, maxTokens: number | undefined) =>
-  typeof reasoning.max_tokens === "number"
-    ? { ...reasoning, max_tokens: ProviderShared.fitThinkingBudget(reasoning.max_tokens, maxTokens, 1_024) }
-    : reasoning
-
-const bodyOptions = (input: unknown, maxTokens: number | undefined) => {
-  const openrouter = isRecord(input) ? input : {}
-  const { usage, models, provider, plugins, web_search_options, debug, user, reasoning, promptCacheKey, ...options } =
-    openrouter
-  return {
-    ...options,
-    ...(usage === undefined || usage === true
-      ? { usage: { include: true } }
-      : usage === false
-        ? { usage: { include: false } }
-        : isRecord(usage)
-          ? { usage }
-          : {}),
-    ...(Array.isArray(models) ? { models } : {}),
-    ...(isRecord(provider) ? { provider } : {}),
-    ...(Array.isArray(plugins) ? { plugins } : {}),
-    ...(isRecord(web_search_options) ? { web_search_options } : {}),
-    ...(isRecord(debug) ? { debug } : {}),
-    ...(typeof user === "string" ? { user } : {}),
-    ...(isRecord(reasoning) ? { reasoning: fitReasoning(reasoning, maxTokens) } : {}),
-  }
-}
-
 export const route = Route.make({
  id: ADAPTER,
  provider: id,
@@ -182,19 +200,45 @@ export const route = Route.make({
  framing: OpenAIChat.framing,
 })

-export const routes = [route]
+const responsesRoute = Route.make({
+  id: "openrouter-responses",
+  provider: id,
+  providerMetadataKey: "openrouter",
+  protocol: responsesProtocol,
+  endpoint: Endpoint.path("/responses", { baseURL }),
+  framing: Framing.sse,
+  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
+})
+const messagesRoute = Route.make({
+  id: "openrouter-messages",
+  provider: id,
+  providerMetadataKey: "openrouter",
+  protocol: messagesProtocol,
+  endpoint: Endpoint.path("/messages", { baseURL }),
+  transport: AnthropicMessages.transport<OpenRouterMessagesBody>(),
+})

-const configuredRoute = (input: LanguageModelOptions) => {
+export const routes = [route, responsesRoute, messagesRoute]
+
+const routeOptions = (input: LanguageModelOptions) => {
  const { apiKey: _, auth: _auth, baseURL: endpoint, ...rest } = input
-  return route.with({
+  return {
    ...rest,
    endpoint: { baseURL: endpoint ?? baseURL },
    auth: AuthOptions.bearer(input, "OPENROUTER_API_KEY"),
-  })
+  }
 }

 export const configure = (input: LanguageModelOptions = {}) => {
-  const route = configuredRoute(input)
+  const options = routeOptions(input)
+  const chatRoute = route.with(options)
+  const openResponses = responsesRoute.with(options)
+  const anthropicMessages = messagesRoute.with(options)
+  const chat = (modelID: string | ModelID) =>
+    chatRoute.model<OpenRouterProviderOptionsInput>({ id: modelID, compatibility: { supportsPromptCacheKey: true } })
+  const responses = (modelID: string | ModelID) => openResponses.model<OpenRouterProviderOptionsInput>({ id: modelID })
+  const messages = (modelID: string | ModelID) =>
+    anthropicMessages.model<OpenRouterProviderOptionsInput>({ id: modelID })
  const evaluation = (modelID: string | ModelID) =>
    SystemOne.model<OpenRouterEvaluationOptions>({
      id: modelID,
@@ -207,14 +251,24 @@ export const configure = (input: LanguageModelOptions = {}) => {
    })
  return {
    id,
-    model: (modelID: string | ModelID) =>
-      route.model<OpenRouterProviderOptionsInput>({ id: modelID, compatibility: { supportsPromptCacheKey: true } }),
+    model: (modelID: string | ModelID) => {
+      const model = String(modelID).replace(/^~/, "")
+      if (model.startsWith("anthropic/")) return messages(modelID)
+      if (["openai/", "x-ai/", "meta/"].some((prefix) => model.startsWith(prefix))) return responses(modelID)
+      return chat(modelID)
+    },
+    chat,
+    responses,
+    messages,
    experimental: { evaluation },
    configure,
  }
 }

 export const provider = configure()
+export const chat = provider.chat
+export const responses = provider.responses
+export const messages = provider.messages
 export const experimental = provider.experimental
 export const model: ProviderPackage.Definition<Settings, OpenRouterProviderOptionsInput>["model"] = (
  modelID,
@@ -227,3 +281,5 @@ export const model: ProviderPackage.Definition<Settings, OpenRouterProviderOptio
    http: body === undefined ? undefined : { body: { ...body } },
    providerOptions,
  }).model(modelID)
+
+export * as OpenRouter from "./openrouter.js"
@@ -1,54 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "name": "openai-compatible-chat/openrouter-claude-opus-4-7-drives-a-tool-loop",
-    "recordedAt": "2026-05-06T01:35:14.282Z",
-    "tags": [
-      "prefix:openai-compatible-chat",
-      "protocol:openai-compatible-chat",
-      "provider:openrouter",
-      "tool",
-      "tool-loop",
-      "golden",
-      "flagship"
-    ]
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://openrouter.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"anthropic/claude-opus-4.7\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once, then answer in one short sentence.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": ": OPENROUTER PROCESSING\n\n: OPENROUTER PROCESSING\n\n: OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"id\":\"toolu_bdrk_01AVRkzbigpMbNJ3zjnuQ6ZE\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"{\\\"city\\\": \\\"P\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"ari\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"s\\\"}\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"service_tier\":\"standard\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"tool_use\"}]}\n\ndata: {\"id\":\"gen-1778031311-S3NlfYGRwAnOoPoNrThK\",\"object\":\"chat.completion.chunk\",\"created\":1778031311,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"service_tier\":\"standard\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"tool_use\"}],\"usage\":{\"prompt_tokens\":802,\"completion_tokens\":66,\"total_tokens\":868,\"cost\":0.00566,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.00566,\"upstream_inference_prompt_cost\":0.00401,\"upstream_inference_completions_cost\":0.00165},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://openrouter.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"anthropic/claude-opus-4.7\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once, then answer in one short sentence.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"toolu_bdrk_01AVRkzbigpMbNJ3zjnuQ6ZE\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"}}]},{\"role\":\"tool\",\"tool_call_id\":\"toolu_bdrk_01AVRkzbigpMbNJ3zjnuQ6ZE\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": ": OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1778031313-XM4XZGmFyt6jg3GZ772w\",\"object\":\"chat.completion.chunk\",\"created\":1778031313,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"It\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031313-XM4XZGmFyt6jg3GZ772w\",\"object\":\"chat.completion.chunk\",\"created\":1778031313,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"'s sunny and\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031313-XM4XZGmFyt6jg3GZ772w\",\"object\":\"chat.completion.chunk\",\"created\":1778031313,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\" 22°C in\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031313-XM4XZGmFyt6jg3GZ772w\",\"object\":\"chat.completion.chunk\",\"created\":1778031313,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\" Paris.\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031313-XM4XZGmFyt6jg3GZ772w\",\"object\":\"chat.completion.chunk\",\"created\":1778031313,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"service_tier\":\"standard\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"end_turn\"}]}\n\ndata: {\"id\":\"gen-1778031313-XM4XZGmFyt6jg3GZ772w\",\"object\":\"chat.completion.chunk\",\"created\":1778031313,\"model\":\"anthropic/claude-4.7-opus-20260416\",\"provider\":\"Amazon Bedrock\",\"service_tier\":\"standard\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"end_turn\"}],\"usage\":{\"prompt_tokens\":899,\"completion_tokens\":19,\"total_tokens\":918,\"cost\":0.00497,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.00497,\"upstream_inference_prompt_cost\":0.004495,\"upstream_inference_completions_cost\":0.000475},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}
@@ -1,54 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "name": "openai-compatible-chat/openrouter-gpt-5-5-drives-a-tool-loop",
-    "recordedAt": "2026-05-06T01:35:11.662Z",
-    "tags": [
-      "prefix:openai-compatible-chat",
-      "protocol:openai-compatible-chat",
-      "provider:openrouter",
-      "tool",
-      "tool-loop",
-      "golden",
-      "flagship"
-    ]
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://openrouter.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"openai/gpt-5.5\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once, then answer in one short sentence.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": ": OPENROUTER PROCESSING\n\n: OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"id\":\"call_4A7V7UN36HXCUUn8qAOQaKGw\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"{\\\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"city\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\\\":\\\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"Paris\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\\\"}\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"service_tier\":\"default\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"completed\"}]}\n\ndata: {\"id\":\"gen-1778031308-dVa9axcHcOlG9GcilZkz\",\"object\":\"chat.completion.chunk\",\"created\":1778031308,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"service_tier\":\"default\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"completed\"}],\"usage\":{\"prompt_tokens\":69,\"completion_tokens\":18,\"total_tokens\":87,\"cost\":0.000885,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.000885,\"upstream_inference_prompt_cost\":0.000345,\"upstream_inference_completions_cost\":0.00054},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
-      }
-    },
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://openrouter.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"openai/gpt-5.5\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once, then answer in one short sentence.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_4A7V7UN36HXCUUn8qAOQaKGw\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"}}]},{\"role\":\"tool\",\"tool_call_id\":\"call_4A7V7UN36HXCUUn8qAOQaKGw\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": ": OPENROUTER PROCESSING\n\n: OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Paris\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\" is\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\" sunny\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\" and\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\" \",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"22\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"°C\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\".\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"service_tier\":\"default\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"completed\"}]}\n\ndata: {\"id\":\"gen-1778031310-JUYfFzDbun699uUYoA4N\",\"object\":\"chat.completion.chunk\",\"created\":1778031310,\"model\":\"openai/gpt-5.5-20260423\",\"provider\":\"OpenAI\",\"service_tier\":\"default\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"completed\"}],\"usage\":{\"prompt_tokens\":108,\"completion_tokens\":12,\"total_tokens\":120,\"cost\":0.0009,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.0009,\"upstream_inference_prompt_cost\":0.00054,\"upstream_inference_completions_cost\":0.00036},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "name": "openai-compatible-chat/openrouter-streams-text",
-    "recordedAt": "2026-05-06T01:35:06.767Z",
-    "tags": ["prefix:openai-compatible-chat", "protocol:openai-compatible-chat", "provider:openrouter"]
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://openrouter.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"openai/gpt-4o-mini\",\"messages\":[{\"role\":\"system\",\"content\":\"You are concise.\"},{\"role\":\"user\",\"content\":\"Reply with exactly: Hello!\"}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":20,\"temperature\":0}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": ": OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1778031306-UD7bR0I1JNCsPvVzlXat\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"Azure\",\"system_fingerprint\":\"fp_eb37e061ec\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hello\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-UD7bR0I1JNCsPvVzlXat\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"Azure\",\"system_fingerprint\":\"fp_eb37e061ec\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"!\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-UD7bR0I1JNCsPvVzlXat\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"Azure\",\"system_fingerprint\":\"fp_eb37e061ec\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"stop\"}]}\n\ndata: {\"id\":\"gen-1778031306-UD7bR0I1JNCsPvVzlXat\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"Azure\",\"system_fingerprint\":\"fp_eb37e061ec\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":21,\"completion_tokens\":3,\"total_tokens\":24,\"cost\":0.00000495,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.00000495,\"upstream_inference_prompt_cost\":0.00000315,\"upstream_inference_completions_cost\":0.0000018},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}
@@ -1,28 +0,0 @@
-{
-  "version": 1,
-  "metadata": {
-    "name": "openai-compatible-chat/openrouter-streams-tool-call",
-    "recordedAt": "2026-05-06T01:35:07.466Z",
-    "tags": ["prefix:openai-compatible-chat", "protocol:openai-compatible-chat", "provider:openrouter", "tool"]
-  },
-  "interactions": [
-    {
-      "transport": "http",
-      "request": {
-        "method": "POST",
-        "url": "https://openrouter.ai/api/v1/chat/completions",
-        "headers": {
-          "content-type": "application/json"
-        },
-        "body": "{\"model\":\"openai/gpt-4o-mini\",\"messages\":[{\"role\":\"system\",\"content\":\"Call tools exactly as requested.\"},{\"role\":\"user\",\"content\":\"Call get_weather with city exactly Paris.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"tool_choice\":{\"type\":\"function\",\"function\":{\"name\":\"get_weather\"}},\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
-      },
-      "response": {
-        "status": 200,
-        "headers": {
-          "content-type": "text/event-stream"
-        },
-        "body": ": OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"id\":\"call_L7mHMq49ZSUTBHjLJfBIP2eT\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"{\\\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"city\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\\\":\\\"\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"Paris\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":null,\"role\":\"assistant\",\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"\\\"}\"}}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"stop\"}]}\n\ndata: {\"id\":\"gen-1778031306-HYzOq04JIk1hZQ4iaNjD\",\"object\":\"chat.completion.chunk\",\"created\":1778031306,\"model\":\"openai/gpt-4o-mini\",\"provider\":\"OpenAI\",\"system_fingerprint\":\"fp_b6580bbee1\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"tool_calls\",\"native_finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":67,\"completion_tokens\":5,\"total_tokens\":72,\"cost\":0.00001305,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.00001305,\"upstream_inference_prompt_cost\":0.00001005,\"upstream_inference_completions_cost\":0.000003},\"completion_tokens_details\":{\"reasoning_tokens\":0,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
-      }
-    }
-  ]
-}
@@ -0,0 +1,57 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "openrouter",
+    "route": "openrouter-messages",
+    "transport": "http",
+    "model": "anthropic/claude-opus-4.7",
+    "tags": [
+      "prefix:openrouter-messages",
+      "provider:openrouter",
+      "flagship",
+      "tool",
+      "tool-loop",
+      "golden"
+    ],
+    "name": "openrouter-messages/openrouter-claude-opus-4-7-tool-loop",
+    "recordedAt": "2026-09-30T03:26:16.603Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://openrouter.ai/api/v1/messages",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"anthropic/claude-opus-4.7\",\"system\":[{\"type\":\"text\",\"text\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"}],\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"What is the weather in Paris?\"}]}],\"tools\":[{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"input_schema\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}],\"stream\":true,\"max_tokens\":80,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream"
+        },
+        "body": "event: message_start\ndata: {\"type\":\"message_start\",\"message\":{\"id\":\"gen-1790738774-LwBI9xYpi0PJ3zyXvhBe\",\"type\":\"message\",\"role\":\"assistant\",\"container\":null,\"content\":[],\"model\":\"anthropic/claude-opus-4.7\",\"stop_reason\":null,\"stop_details\":null,\"stop_sequence\":null,\"usage\":{\"input_tokens\":812,\"output_tokens\":1,\"output_tokens_details\":null,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"inference_geo\":\"global\",\"server_tool_use\":null,\"service_tier\":\"standard\",\"speed\":\"standard\"},\"provider\":\"Claude Platform on AWS\"}}\n\nevent: content_block_start\ndata: {\"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"tool_use\",\"id\":\"toolu_01SvA3dpQ3bwgAKjQB1d9rL5\",\"caller\":{\"type\":\"direct\"},\"name\":\"get_weather\",\"input\":{}}}\n\nevent: content_block_delta\ndata: {\"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"input_json_delta\",\"partial_json\":\"{\\\"city\\\": \\\"Paris\"}}\n\nevent: content_block_delta\ndata: {\"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"input_json_delta\",\"partial_json\":\"\\\"}\"}}\n\nevent: content_block_stop\ndata: {\"type\":\"content_block_stop\",\"index\":0}\n\nevent: message_delta\ndata: {\"type\":\"message_delta\",\"delta\":{\"container\":null,\"stop_details\":null,\"stop_reason\":\"tool_use\",\"stop_sequence\":null},\"usage\":{\"input_tokens\":812,\"output_tokens\":66,\"output_tokens_details\":{\"thinking_tokens\":0},\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"server_tool_use\":null,\"service_tier\":\"standard\",\"speed\":\"standard\",\"cost\":0.00571,\"is_byok\":false,\"cost_details\":{\"upstream_inference_cost\":0.00571,\"upstream_inference_prompt_cost\":0.00406,\"upstream_inference_completions_cost\":0.00165}},\"context_management\":null}\n\nevent: message_stop\ndata: {\"type\":\"message_stop\"}\n\nevent: data\ndata: [DONE]\n\n"
+      }
+    },
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://openrouter.ai/api/v1/messages",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"anthropic/claude-opus-4.7\",\"system\":[{\"type\":\"text\",\"text\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"}],\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"What is the weather in Paris?\"}]},{\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_01SvA3dpQ3bwgAKjQB1d9rL5\",\"name\":\"get_weather\",\"input\":{\"city\":\"Paris\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"tool_result\",\"tool_use_id\":\"toolu_01SvA3dpQ3bwgAKjQB1d9rL5\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}]}],\"tools\":[{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"input_schema\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}],\"stream\":true,\"max_tokens\":80,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream"
+        },
+        "body": "event: message_start\ndata: {\"type\":\"message_start\",\"message\":{\"id\":\"gen-1790738775-mOcJ0PIOdQqPcuWboQoJ\",\"type\":\"message\",\"role\":\"assistant\",\"container\":null,\"content\":[],\"model\":\"anthropic/claude-opus-4.7\",\"stop_reason\":null,\"stop_details\":null,\"stop_sequence\":null,\"usage\":{\"input_tokens\":909,\"output_tokens\":9,\"output_tokens_details\":null,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"inference_geo\":\"global\",\"server_tool_use\":null,\"service_tier\":\"standard\",\"speed\":\"standard\"},\"provider\":\"Claude Platform on AWS\"}}\n\nevent: content_block_start\ndata: {\"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"text\",\"text\":\"\",\"citations\":[]}}\n\nevent: content_block_delta\ndata: {\"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\"Paris is sunny.\"}}\n\nevent: content_block_stop\ndata: {\"type\":\"content_block_stop\",\"index\":0}\n\nevent: message_delta\ndata: {\"type\":\"message_delta\",\"delta\":{\"container\":null,\"stop_details\":null,\"stop_reason\":\"end_turn\",\"stop_sequence\":null},\"usage\":{\"input_tokens\":909,\"output_tokens\":12,\"output_tokens_details\":{\"thinking_tokens\":0},\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"server_tool_use\":null,\"service_tier\":\"standard\",\"speed\":\"standard\",\"cost\":0.004845,\"is_byok\":false,\"cost_details\":{\"upstream_inference_cost\":0.004845,\"upstream_inference_prompt_cost\":0.004545,\"upstream_inference_completions_cost\":0.0003}},\"context_management\":null}\n\nevent: message_stop\ndata: {\"type\":\"message_stop\"}\n\nevent: data\ndata: [DONE]\n\n"
+      }
+    }
+  ]
+}
@@ -2,9 +2,14 @@
  "version": 1,
  "metadata": {
    "model": "anthropic/claude-sonnet-4.6",
-    "tags": ["prefix:openai-compatible-chat", "provider:openrouter", "protocol:openai-chat", "reasoning"],
+    "tags": [
+      "prefix:openai-compatible-chat",
+      "provider:openrouter",
+      "protocol:openai-chat",
+      "reasoning"
+    ],
    "name": "openrouter-reasoning",
-    "recordedAt": "2026-09-29T16:19:02.835Z"
+    "recordedAt": "2026-09-30T03:26:02.917Z"
  },
  "interactions": [
    {
@@ -22,7 +27,7 @@
        "headers": {
          "content-type": "text/event-stream"
        },
-        "body": "data: {\"id\":\"gen-1790698739-Acm5E9n2uVTO14sqrick\",\"object\":\"chat.completion.chunk\",\"created\":1790698739,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning\":\"173\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"173\",\"format\":\"anthropic-claude-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\n: OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1790698739-Acm5E9n2uVTO14sqrick\",\"object\":\"chat.completion.chunk\",\"created\":1790698739,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning\":\" × 219\\n\\n173 × 200 = 34,600\\n173 × 19 = 173 × 20 - 173 = 3,460 - 173 = 3,287\\n\\n34,600 + 3,287 = 37,887\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\" × 219\\n\\n173 × 200 = 34,600\\n173 × 19 = 173 × 20 - 173 = 3,460 - 173 = 3,287\\n\\n34,600 + 3,287 = 37,887\",\"format\":\"anthropic-claude-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790698739-Acm5E9n2uVTO14sqrick\",\"object\":\"chat.completion.chunk\",\"created\":1790698739,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"signature\":\"Ev8CCrIBCBIYAipA0W4viH3kgBs43Cl5ewwVBPXTQElvzfbA2TLF4iSbKy9ZZDCSDjjAlF3Bs4ELEnP3vrrTuTioC6OB380lXQdyIDIRY2xhdWRlLXNvbm5ldC00LTY4AEIIdGhpbmtpbmdaJDRjMGYwNDZmLTI1ZmQtNDVmYi1iZmIzLWEwOGE4ZTI0OWNhN3oedXByb2ZfMDExQ2VkSE1TN0tEcTM4Z2JkUkp0bXN3qAH2ye/VBhIMhjcPOnE2wLhs0P05GgwA3z9luwbhnSyRMSQiMDYeIIThirdkJb/n2s2TxUk5EOMrSc1xejAb0RN7BIl66P5KhtwXvcZTiyCkBS8+7Cp6MOinWi+I8U7DhWskSA0pHZqaAncbV7qCIHkoZ5aT8jiPWplAOnlciDo2tLkGsLnzXrnfhI11GTF0kcfyhbrt3tjEDSiPstBbT2u19LJ5IqwV2VKl0pWVdl4PTsDwC09ClbnJj1y0A3AM9gEh4B9mEo4BvT0XVEncux4YAQ==.eyJlbmRwb2ludF9zbHVnIjoiYW50aHJvcGljL2NsYXVkZS00LjYtc29ubmV0LTIwMjYwMjE3fGNsYXVkZS1vbi1hd3MifQ\",\"format\":\"anthropic-claude-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790698739-Acm5E9n2uVTO14sqrick\",\"object\":\"chat.completion.chunk\",\"created\":1790698739,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"37\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790698739-Acm5E9n2uVTO14sqrick\",\"object\":\"chat.completion.chunk\",\"created\":1790698739,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"887\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790698739-Acm5E9n2uVTO14sqrick\",\"object\":\"chat.completion.chunk\",\"created\":1790698739,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning\":null},\"finish_reason\":\"stop\",\"native_finish_reason\":\"end_turn\"}]}\n\ndata: {\"id\":\"gen-1790698739-Acm5E9n2uVTO14sqrick\",\"object\":\"chat.completion.chunk\",\"created\":1790698739,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"service_tier\":\"default\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"end_turn\"}],\"usage\":{\"prompt_tokens\":61,\"completion_tokens\":80,\"total_tokens\":141,\"cost\":0.001383,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.001383,\"upstream_inference_prompt_cost\":0.000183,\"upstream_inference_completions_cost\":0.0012},\"completion_tokens_details\":{\"reasoning_tokens\":73,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
+        "body": "data: {\"id\":\"gen-1790738761-YbCA1TN8srf01M309CrM\",\"object\":\"chat.completion.chunk\",\"created\":1790738761,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning\":\"173\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"173\",\"format\":\"anthropic-claude-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790738761-YbCA1TN8srf01M309CrM\",\"object\":\"chat.completion.chunk\",\"created\":1790738761,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning\":\" × 219\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\" × 219\",\"format\":\"anthropic-claude-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\n: OPENROUTER PROCESSING\n\ndata: {\"id\":\"gen-1790738761-YbCA1TN8srf01M309CrM\",\"object\":\"chat.completion.chunk\",\"created\":1790738761,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning\":\"\\n\\n173 × 200 = 34,600\\n173 × 19 = 173 × 20 - 173 = 3,460 - 173 = 3,287\\n\\n34,600 + 3,287 = 37,887\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"\\n\\n173 × 200 = 34,600\\n173 × 19 = 173 × 20 - 173 = 3,460 - 173 = 3,287\\n\\n34,600 + 3,287 = 37,887\",\"format\":\"anthropic-claude-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790738761-YbCA1TN8srf01M309CrM\",\"object\":\"chat.completion.chunk\",\"created\":1790738761,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"signature\":\"EpUDCsgBCBIYAipA0W4viH3kgBs43Cl5ewwVBPXTQElvzfbA2TLF4iSbKy9ZZDCSDjjAlF3Bs4ELEnP3vrrTuTioC6OB380lXQdyIDIRY2xhdWRlLXNvbm5ldC00LTY4AEIIdGhpbmtpbmdaJDRjMGYwNDZmLTI1ZmQtNDVmYi1iZmIzLWEwOGE4ZTI0OWNhN3oedXByb2ZfMDExQ2VkSE1TN0tEcTM4Z2JkUkp0bXN3mgETChFjbGF1ZGUtc29ubmV0LTQtNqgByoLy1QYSDPcyAL64+muA2ku9uxoM4jS27X6iJtqcbymQIjCyOPIBbqmb8CRfcLBCI42CRACGhf+ApKDRPkGhPEDctIGeeo2QaGy8WGT6kEX2zYsqeuExYES4JaCt7xyC+1GYlUhbEFMRVPeV0gdkE72yBcl9rhbnK3S9Zs3u1pETV9E50s3tGIF+AP2UShvzdbsB7qDfr2xaUyE6/LgyGndMsxZprhW/nZqxt0YtXzJa4n5+pMMxJW+uv9BrleRRHdmyqpGGEduiZW2WQ4WgGAE=.eyJlbmRwb2ludF9zbHVnIjoiYW50aHJvcGljL2NsYXVkZS00LjYtc29ubmV0LTIwMjYwMjE3fGNsYXVkZS1vbi1hd3MifQ\",\"format\":\"anthropic-claude-v1\",\"index\":0}]},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790738761-YbCA1TN8srf01M309CrM\",\"object\":\"chat.completion.chunk\",\"created\":1790738761,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"37887\",\"role\":\"assistant\"},\"finish_reason\":null,\"native_finish_reason\":null}]}\n\ndata: {\"id\":\"gen-1790738761-YbCA1TN8srf01M309CrM\",\"object\":\"chat.completion.chunk\",\"created\":1790738761,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\",\"reasoning\":null},\"finish_reason\":\"stop\",\"native_finish_reason\":\"end_turn\"}]}\n\ndata: {\"id\":\"gen-1790738761-YbCA1TN8srf01M309CrM\",\"object\":\"chat.completion.chunk\",\"created\":1790738761,\"model\":\"anthropic/claude-sonnet-4.6\",\"provider\":\"Claude Platform on AWS\",\"service_tier\":\"default\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\",\"role\":\"assistant\"},\"finish_reason\":\"stop\",\"native_finish_reason\":\"end_turn\"}],\"usage\":{\"prompt_tokens\":61,\"completion_tokens\":80,\"total_tokens\":141,\"cost\":0.001383,\"is_byok\":false,\"prompt_tokens_details\":{\"cached_tokens\":0,\"cache_write_tokens\":0,\"audio_tokens\":0,\"video_tokens\":0},\"cost_details\":{\"upstream_inference_cost\":0.001383,\"upstream_inference_prompt_cost\":0.000183,\"upstream_inference_completions_cost\":0.0012},\"completion_tokens_details\":{\"reasoning_tokens\":73,\"image_tokens\":0,\"audio_tokens\":0}}}\n\ndata: [DONE]\n\n"
      }
    }
  ]
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "openrouter",
+    "route": "openrouter-responses",
+    "transport": "http",
+    "model": "openai/gpt-4o-mini",
+    "tags": [
+      "prefix:openrouter-responses",
+      "provider:openrouter",
+      "text",
+      "golden"
+    ],
+    "name": "openrouter-responses/openrouter-gpt-4o-mini-text",
+    "recordedAt": "2026-09-30T16:23:26.190Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://openrouter.ai/api/v1/responses",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"openai/gpt-4o-mini\",\"input\":[{\"type\":\"message\",\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly with: Hello!\"}]}],\"instructions\":\"You are concise.\",\"store\":false,\"include\":[\"reasoning.encrypted_content\"],\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream"
+        },
+        "body": "data: {\"type\":\"response.created\",\"response\":{\"id\":\"gen-1790785405-TibUw8IxcUdeh1aIMexG\",\"object\":\"response\",\"created_at\":1790785405,\"model\":\"openai/gpt-4o-mini\",\"status\":\"in_progress\",\"completed_at\":null,\"output\":[],\"error\":null,\"incomplete_details\":null,\"tools\":[],\"tool_choice\":\"auto\",\"parallel_tool_calls\":true,\"max_output_tokens\":40,\"temperature\":0,\"top_p\":1,\"presence_penalty\":0,\"frequency_penalty\":0,\"top_logprobs\":0,\"max_tool_calls\":null,\"metadata\":{},\"background\":false,\"previous_response_id\":null,\"service_tier\":\"auto\",\"truncation\":\"disabled\",\"store\":false,\"instructions\":\"You are concise.\",\"text\":{\"format\":{\"type\":\"text\"}},\"reasoning\":null,\"safety_identifier\":null,\"prompt_cache_key\":null,\"prompt_cache_options\":null,\"usage\":null},\"sequence_number\":0}\n\ndata: {\"type\":\"response.in_progress\",\"response\":{\"id\":\"gen-1790785405-TibUw8IxcUdeh1aIMexG\",\"object\":\"response\",\"created_at\":1790785405,\"model\":\"openai/gpt-4o-mini\",\"status\":\"in_progress\",\"completed_at\":null,\"output\":[],\"error\":null,\"incomplete_details\":null,\"tools\":[],\"tool_choice\":\"auto\",\"parallel_tool_calls\":true,\"max_output_tokens\":40,\"temperature\":0,\"top_p\":1,\"presence_penalty\":0,\"frequency_penalty\":0,\"top_logprobs\":0,\"max_tool_calls\":null,\"metadata\":{},\"background\":false,\"previous_response_id\":null,\"service_tier\":\"auto\",\"truncation\":\"disabled\",\"store\":false,\"instructions\":\"You are concise.\",\"text\":{\"format\":{\"type\":\"text\"}},\"reasoning\":null,\"safety_identifier\":null,\"prompt_cache_key\":null,\"prompt_cache_options\":null,\"usage\":null},\"sequence_number\":1}\n\ndata: {\"type\":\"response.output_item.added\",\"output_index\":0,\"item\":{\"id\":\"msg_tmp_2aq1aouoqhw\",\"type\":\"message\",\"status\":\"in_progress\",\"role\":\"assistant\",\"content\":[]},\"sequence_number\":2}\n\ndata: {\"type\":\"response.content_part.added\",\"output_index\":0,\"item_id\":\"msg_tmp_2aq1aouoqhw\",\"content_index\":0,\"part\":{\"type\":\"output_text\",\"text\":\"\",\"annotations\":[],\"logprobs\":[]},\"sequence_number\":3}\n\ndata: {\"type\":\"response.output_text.delta\",\"output_index\":0,\"item_id\":\"msg_tmp_2aq1aouoqhw\",\"content_index\":0,\"delta\":\"Hello\",\"logprobs\":[],\"sequence_number\":4}\n\ndata: {\"type\":\"response.output_text.delta\",\"output_index\":0,\"item_id\":\"msg_tmp_2aq1aouoqhw\",\"content_index\":0,\"delta\":\"!\",\"logprobs\":[],\"sequence_number\":5}\n\ndata: {\"type\":\"response.output_text.done\",\"output_index\":0,\"item_id\":\"msg_tmp_2aq1aouoqhw\",\"content_index\":0,\"text\":\"Hello!\",\"logprobs\":[],\"sequence_number\":6}\n\ndata: {\"type\":\"response.content_part.done\",\"output_index\":0,\"item_id\":\"msg_tmp_2aq1aouoqhw\",\"content_index\":0,\"part\":{\"type\":\"output_text\",\"text\":\"Hello!\",\"annotations\":[],\"logprobs\":[]},\"sequence_number\":7}\n\ndata: {\"type\":\"response.output_item.done\",\"output_index\":0,\"item\":{\"id\":\"msg_tmp_2aq1aouoqhw\",\"type\":\"message\",\"status\":\"completed\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Hello!\",\"annotations\":[],\"logprobs\":[]}]},\"sequence_number\":8}\n\ndata: {\"type\":\"response.completed\",\"response\":{\"id\":\"gen-1790785405-TibUw8IxcUdeh1aIMexG\",\"object\":\"response\",\"created_at\":1790785405,\"model\":\"openai/gpt-4o-mini\",\"status\":\"completed\",\"completed_at\":1790785406,\"output\":[{\"id\":\"msg_tmp_2aq1aouoqhw\",\"type\":\"message\",\"role\":\"assistant\",\"status\":\"completed\",\"content\":[{\"type\":\"output_text\",\"text\":\"Hello!\",\"annotations\":[],\"logprobs\":[]}]}],\"error\":null,\"incomplete_details\":null,\"tools\":[],\"tool_choice\":\"auto\",\"parallel_tool_calls\":true,\"max_output_tokens\":40,\"temperature\":0,\"top_p\":1,\"presence_penalty\":0,\"frequency_penalty\":0,\"top_logprobs\":0,\"max_tool_calls\":null,\"metadata\":{},\"background\":false,\"previous_response_id\":null,\"service_tier\":\"default\",\"truncation\":\"disabled\",\"store\":false,\"instructions\":\"You are concise.\",\"text\":{\"format\":{\"type\":\"text\"}},\"reasoning\":null,\"safety_identifier\":null,\"prompt_cache_key\":null,\"prompt_cache_options\":null,\"usage\":{\"input_tokens\":21,\"input_tokens_details\":{\"cached_tokens\":0},\"output_tokens\":2,\"output_tokens_details\":{\"reasoning_tokens\":0},\"total_tokens\":23,\"cost\":0.00000435,\"is_byok\":false,\"cost_details\":{\"upstream_inference_cost\":0.00000435,\"upstream_inference_input_cost\":0.00000315,\"upstream_inference_output_cost\":0.0000012}}},\"sequence_number\":9}\n\ndata: [DONE]\n\n"
+      }
+    }
+  ]
+}
@@ -366,6 +366,23 @@ describe("provider error rawBody classification", () => {
    expect(reason._tag === "InvalidRequest" ? reason.classification : reason._tag).toBe("context-overflow")
  })

+  test("classifies Amazon Nova input token rejections as context overflow", () => {
+    const message =
+      "The model returned the following errors: Input Tokens Exceeded: Number of input tokens exceeds maximum length. Please update the input to try again."
+    const reason = classifyProviderFailure({
+      message,
+      rawBody: JSON.stringify({
+        headers: {
+          ":exception-type": { type: "string", value: "validationException" },
+          ":content-type": { type: "string", value: "application/json" },
+          ":message-type": { type: "string", value: "exception" },
+        },
+        body: JSON.stringify({ message }),
+      }),
+    })
+    expect(reason._tag === "InvalidRequest" ? reason.classification : reason._tag).toBe("context-overflow")
+  })
+
  test("classifies Google invalid API keys as authentication failures", () => {
    const rawBody = JSON.stringify({
      error: {
@@ -242,14 +242,14 @@ describeRecordedGoldenScenarios([
  },
  {
    name: "OpenRouter gpt-4o-mini",
-    prefix: "openai-compatible-chat",
+    prefix: "openrouter-responses",
    model: openrouter,
    requires: ["OPENROUTER_API_KEY"],
    scenarios: ["text", "tool-call", "tool-loop"],
  },
  {
    name: "OpenRouter gpt-5.5",
-    prefix: "openai-compatible-chat",
+    prefix: "openrouter-responses",
    model: openrouterGpt55,
    requires: ["OPENROUTER_API_KEY"],
    tags: ["flagship"],
@@ -257,10 +257,20 @@ describeRecordedGoldenScenarios([
  },
  {
    name: "OpenRouter Claude Opus 4.7",
-    prefix: "openai-compatible-chat",
+    prefix: "openrouter-messages",
    model: openrouterOpus,
    requires: ["OPENROUTER_API_KEY"],
    tags: ["flagship"],
    scenarios: ["tool-loop"],
  },
+  {
+    name: "OpenRouter Grok 4.3",
+    prefix: "openrouter-responses",
+    model: OpenRouter.configure({
+      apiKey: process.env.OPENROUTER_API_KEY ?? "fixture",
+      providerOptions: { reasoning: { effort: "none" } },
+    }).model("x-ai/grok-4.3"),
+    requires: ["OPENROUTER_API_KEY"],
+    scenarios: ["tool-loop"],
+  },
 ])
@@ -16,7 +16,7 @@ const cases = [
      OpenRouter.configure({
        apiKey: process.env.OPENROUTER_API_KEY ?? "fixture",
        providerOptions: { reasoning: { max_tokens: 1024 } },
-      }).model("anthropic/claude-sonnet-4.6"),
+      }).chat("anthropic/claude-sonnet-4.6"),
      { compatibility: { reasoningField: "reasoning" } },
    ),
    requires: ["OPENROUTER_API_KEY"],
@@ -0,0 +1,83 @@
+import { expect } from "bun:test"
+import { Effect } from "effect"
+import { LLM, LLMRequest, Message } from "../../src/index.js"
+import { OpenRouter } from "../../src/providers/openrouter.js"
+import { LLMClient } from "../../src/route.js"
+import { recordedTests } from "../recorded-test.js"
+
+const recorded = recordedTests({
+  prefix: "openrouter-responses",
+  provider: "openrouter",
+  protocol: "openrouter-responses",
+  requires: ["OPENROUTER_API_KEY"],
+})
+
+recorded.effect.with(
+  "continues Meta reasoning through a namespaced tool loop",
+  { cassette: "openrouter-responses/openrouter-muse-spark-1-3-tool-loop", tags: ["reasoning", "tool-loop"] },
+  () =>
+    Effect.gen(function* () {
+      const tool = {
+        name: "lookup",
+        description: "Look up a reference value",
+        inputSchema: {
+          type: "object",
+          properties: { query: { type: "string" } },
+          required: ["query"],
+        },
+      }
+      const request = LLM.request({
+        model: OpenRouter.configure({
+          apiKey: process.env.OPENROUTER_API_KEY ?? "fixture",
+          providerOptions: { reasoning: { effort: "minimal" } },
+        }).model("meta/muse-spark-1.3"),
+        prompt: "Call only crm.lookup once with query ping. Do not call inventory.lookup. Wait for the result.",
+        tools: ["crm", "inventory"].map((name) => ({ type: "namespace", name, tools: [tool] })),
+        generation: { maxTokens: 1536 },
+      })
+      const first = yield* LLMClient.generate(request)
+      expect(first.toolCalls).toMatchObject([{ name: "lookup", namespace: "crm", input: { query: "ping" } }])
+      const call = first.toolCalls[0]
+      if (!call) throw new Error("Expected a namespaced tool call")
+      const second = yield* LLMClient.generate(
+        LLMRequest.update(request, {
+          messages: [
+            ...request.messages,
+            first.message,
+            Message.tool({ id: call.id, name: call.name, namespace: call.namespace, result: "pong" }),
+            Message.user("Do not call tools again. Reply exactly pong."),
+          ],
+        }),
+      )
+
+      expect(second.toolCalls).toHaveLength(0)
+      expect(second.text.trim()).toBe("pong")
+    }),
+  60_000,
+)
+
+recorded.effect(
+  "preserves native hosted-search events",
+  () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(
+        LLM.request({
+          model: OpenRouter.configure({
+            apiKey: process.env.OPENROUTER_API_KEY ?? "fixture",
+            providerOptions: { reasoning: { effort: "low" } },
+          }).model("x-ai/grok-4.3"),
+          prompt:
+            "Use web search once to find the official OpenRouter Responses API documentation. Reply with its URL.",
+          generation: { maxTokens: 1536 },
+          http: { body: { tools: [{ type: "web_search_preview", engine: "native", max_uses: 1 }], max_tool_calls: 1 } },
+        }),
+      )
+
+      expect(response.toolCalls).toContainEqual(expect.objectContaining({ name: "web_search", providerExecuted: true }))
+      expect(response.message.content).toContainEqual(
+        expect.objectContaining({ type: "tool-result", name: "web_search", providerExecuted: true }),
+      )
+      expect(response.text.trim().length).toBeGreaterThan(0)
+    }),
+  60_000,
+)
@@ -3,32 +3,79 @@ import { Effect } from "effect"
 import { CacheHint, LLM, Message } from "../../src/index.js"
 import { LLMClient } from "../../src/route.js"
 import { compileRequest } from "../../src/route/client.js"
-import * as OpenRouter from "../../src/providers/openrouter.js"
+import { OpenRouter } from "../../src/providers/openrouter.js"
 import { it } from "../lib/effect.js"
 import { fixedResponse } from "../lib/http.js"
 import { sseEvents } from "../lib/sse.js"

 describe("OpenRouter", () => {
-  it.effect("prepares OpenRouter models through the OpenAI-compatible Chat route", () =>
+  it.effect("routes OpenAI, xAI, and Meta models through the same namespace-aware Responses protocol", () =>
+    Effect.forEach(["openai/gpt-4o-mini", "x-ai/grok-4.3", "meta/muse-spark-1.3", "~x-ai/grok-latest"], (id) =>
+      Effect.gen(function* () {
+        const model = OpenRouter.configure({
+          apiKey: "test-key",
+          providerOptions: {
+            reasoning: { effort: "low", exclude: true, summary: "detailed" },
+            text: { verbosity: "low", format: { type: "json_schema", name: "result", schema: { type: "object" } } },
+            provider: { allow_fallbacks: false },
+          },
+        }).model(id)
+        const prepared = yield* compileRequest(
+          LLM.request({
+            model,
+            prompt: "Say hello.",
+            tools: [
+              {
+                type: "namespace",
+                name: "crm",
+                tools: [
+                  {
+                    type: "namespace",
+                    name: "contacts",
+                    tools: [
+                      {
+                        name: "lookup",
+                        description: "Look up a contact",
+                        inputSchema: { type: "object", properties: {} },
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          }),
+        )
+
+        expect(model.route.endpoint.baseURL).toBe("https://openrouter.ai/api/v1")
+        expect(prepared.route).toBe("openrouter-responses")
+        expect(model.route.protocol).toBe(OpenRouter.responses("openai/gpt-4o-mini").route.protocol)
+        expect(prepared.body).toMatchObject({
+          model: id,
+          input: [{ role: "user", content: [{ type: "input_text", text: "Say hello." }] }],
+          stream: true,
+          store: false,
+          include: ["reasoning.encrypted_content"],
+          reasoning: { effort: "low", exclude: true, summary: "detailed" },
+          text: { verbosity: "low", format: { type: "json_schema", name: "result", schema: { type: "object" } } },
+          tools: [{ type: "namespace", name: "crm", tools: [{ type: "function", name: "contacts_lookup" }] }],
+          provider: { allow_fallbacks: false },
+        })
+      }),
+    ),
+  )
+
+  it.effect("exposes exactly three API routes and leaves other families on Chat", () =>
    Effect.gen(function* () {
-      const model = OpenRouter.configure({ apiKey: "test-key" }).model("openai/gpt-4o-mini")
-
-      expect(model).toMatchObject({
-        id: "openai/gpt-4o-mini",
-        provider: "openrouter",
-        route: { id: "openrouter" },
-      })
-      expect(model.route.endpoint.baseURL).toBe("https://openrouter.ai/api/v1")
-
-      const prepared = yield* compileRequest(LLM.request({ model, prompt: "Say hello." }))
-
-      expect(prepared.route).toBe("openrouter")
-      expect(prepared.body).toMatchObject({
-        model: "openai/gpt-4o-mini",
-        messages: [{ role: "user", content: "Say hello." }],
-        stream: true,
-        usage: { include: true },
-      })
+      expect(OpenRouter.routes.map((route) => route.endpoint.path)).toEqual([
+        "/chat/completions",
+        "/responses",
+        "/messages",
+      ])
+      const openrouter = OpenRouter.configure({ apiKey: "test-key" })
+      const chat = openrouter.model("meta-llama/llama-3.3-70b-instruct")
+      expect(chat.route.id).toBe("openrouter")
+      expect(openrouter.model("qwen/qwen3-coder-plus").route.protocol).toBe(chat.route.protocol)
+      expect(openrouter.messages("anthropic/claude-sonnet-4.6").route.id).toBe("openrouter-messages")
    }),
  )

@@ -51,23 +98,90 @@ describe("OpenRouter", () => {
      )

      expect(prepared.body.tools?.map((tool) => tool.cache_control)).toEqual([undefined, { type: "ephemeral" }])
+      expect(prepared.route).toBe("openrouter-messages")
+      expect(prepared.body.system).toMatchObject([
+        { text: "Base agent", cache_control: { type: "ephemeral" } },
+        { text: "Model details" },
+        { text: "Project instructions", cache_control: { type: "ephemeral" } },
+      ])
      expect(prepared.body.messages).toMatchObject([
-        {
-          role: "system",
-          content: [
-            { text: "Base agent", cache_control: { type: "ephemeral" } },
-            { text: "Model details" },
-            { text: "Project instructions", cache_control: { type: "ephemeral" } },
-          ],
-        },
        { role: "user", content: [{ text: "Hello", cache_control: { type: "ephemeral" } }] },
      ])
-      expect(prepared.body.messages[0]?.content).not.toContainEqual(
+      expect(prepared.body.system).not.toContainEqual(
        expect.objectContaining({ text: "Model details", cache_control: expect.anything() }),
      )
    }),
  )

+  it.effect("preserves gateway routing and lowers native effort updates without changing the baseline", () =>
+    Effect.gen(function* () {
+      const openrouter = OpenRouter.configure({
+        apiKey: "test-key",
+        providerOptions: { provider: { allow_fallbacks: false }, reasoning: { effort: "low", summary: "detailed" } },
+      })
+      const messages = [Message.effort({ previous: "high", effort: "low" }), Message.user("Hello")]
+      const response = yield* compileRequest(LLM.request({ model: openrouter.model("openai/gpt-6.1-sol"), messages }))
+      const message = yield* compileRequest(
+        LLM.request({ model: openrouter.model("anthropic/claude-fable-5.1"), messages }),
+      )
+
+      expect(response.body).toMatchObject({
+        provider: { allow_fallbacks: false },
+        reasoning: { effort: "high", summary: "detailed" },
+        input: [{ type: "configuration_update", reasoning: { effort: "low" } }, { role: "user" }],
+      })
+      expect(message.body).toMatchObject({
+        provider: { allow_fallbacks: false },
+        output_config: { effort: "high" },
+        thinking: { type: "adaptive", block_binding: { prefix_mismatch_behavior: "drop_block" } },
+        messages: [{ role: "system", content: [], output_config: { effort: "low" } }, { role: "user" }],
+      })
+    }),
+  )
+
+  it.effect("replays saved Chat reasoning details through the native APIs", () =>
+    Effect.gen(function* () {
+      const openrouter = OpenRouter.configure({ apiKey: "test-key" })
+      const message = yield* compileRequest(
+        LLM.request({
+          model: openrouter.model("anthropic/claude-sonnet-4.6"),
+          messages: [
+            Message.assistant({
+              type: "reasoning",
+              text: "AB",
+              providerMetadata: {
+                openrouter: {
+                  reasoningDetails: [
+                    { type: "reasoning.text", text: "A", signature: "first" },
+                    { type: "reasoning.text", text: "B", signature: "second" },
+                  ],
+                },
+              },
+            }),
+          ],
+        }),
+      )
+      const response = yield* compileRequest(
+        LLM.request({
+          model: openrouter.model("meta/muse-spark-1.3"),
+          messages: [
+            Message.assistant({
+              type: "reasoning",
+              text: "Summary",
+              providerMetadata: { openrouter: { reasoningDetails: [{ type: "reasoning.encrypted", data: "opaque" }] } },
+            }),
+          ],
+        }),
+      )
+
+      expect(message.body.messages[0]?.content).toMatchObject([
+        { type: "thinking", thinking: "A", signature: "first" },
+        { type: "thinking", thinking: "B", signature: "second" },
+      ])
+      expect(response.body.input[0]).toMatchObject({ type: "reasoning", encrypted_content: "opaque" })
+    }),
+  )
+
  it.effect("places default cache breakpoints on OpenRouter latest-model aliases", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -80,8 +194,8 @@ describe("OpenRouter", () => {
      )

      expect(prepared.body.tools?.[0]?.cache_control).toEqual({ type: "ephemeral" })
+      expect(prepared.body.system).toMatchObject([{ text: "Base agent", cache_control: { type: "ephemeral" } }])
      expect(prepared.body.messages).toMatchObject([
-        { role: "system", content: [{ text: "Base agent", cache_control: { type: "ephemeral" } }] },
        { role: "user", content: [{ text: "Hello", cache_control: { type: "ephemeral" } }] },
      ])
    }),
@@ -143,10 +257,7 @@ describe("OpenRouter", () => {

      bodies.forEach((body) => {
        expect(body.tools?.[0]?.cache_control).toBeUndefined()
-        expect(body.messages).toMatchObject([
-          { role: "system", content: "Base agent" },
-          { role: "user", content: "Hello" },
-        ])
+        expect(JSON.stringify(body)).not.toContain("cache_control")
      })
    }),
  )
@@ -168,14 +279,11 @@ describe("OpenRouter", () => {

      expect(prepared.body).toMatchObject({
        tools: [{ cache_control: { type: "ephemeral" } }],
+        system: [
+          { text: "Base agent", cache_control: { type: "ephemeral", ttl: "1h" } },
+          { text: "Project instructions", cache_control: { type: "ephemeral" } },
+        ],
        messages: [
-          {
-            role: "system",
-            content: [
-              { text: "Base agent", cache_control: { type: "ephemeral", ttl: "1h" } },
-              { text: "Project instructions", cache_control: { type: "ephemeral" } },
-            ],
-          },
          {
            role: "user",
            content: [{ text: "Hello", cache_control: { type: "ephemeral" } }],
@@ -189,7 +297,7 @@ describe("OpenRouter", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6"),
+          model: OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6"),
          cache: "none",
          messages: [
            Message.user("Call the tool"),
@@ -238,13 +346,7 @@ describe("OpenRouter", () => {
        }),
      )

-      const system = prepared.body.messages[0]
-      expect(system?.role).toBe("system")
-      expect(
-        system && Array.isArray(system.content)
-          ? system.content.filter((part) => "cache_control" in part && part.cache_control !== undefined)
-          : [],
-      ).toHaveLength(4)
+      expect(prepared.body.system?.filter((part) => part.cache_control !== undefined)).toHaveLength(4)
    }),
  )

@@ -252,7 +354,7 @@ describe("OpenRouter", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6"),
+          model: OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6"),
          cache: { messages: "latest-assistant" },
          messages: [Message.user("Think"), Message.assistant([{ type: "reasoning", text: "Reasoning" }])],
        }),
@@ -270,7 +372,7 @@ describe("OpenRouter", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6"),
+          model: OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6"),
          system: [
            { type: "text", text: "Base agent" },
            { type: "text", text: "Project instructions" },
@@ -302,7 +404,7 @@ describe("OpenRouter", () => {
          model: OpenRouter.configure({
            apiKey: "test-key",
            providerOptions: { usage: false },
-          }).model("openai/gpt-4o-mini"),
+          }).chat("openai/gpt-4o-mini"),
          cache: "none",
          prompt: "Hello",
        }),
@@ -350,7 +452,7 @@ describe("OpenRouter", () => {
              user: "user_123",
              future_option: { enabled: true },
            },
-          }).model("anthropic/claude-3.7-sonnet:thinking"),
+          }).chat("anthropic/claude-3.7-sonnet:thinking"),
          prompt: "Think briefly.",
          promptCacheKey: "session_123",
        }),
@@ -425,7 +527,7 @@ describe("OpenRouter", () => {

  it.effect("preserves the upstream provider finish reason", () =>
    Effect.gen(function* () {
-      const model = OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6")
+      const model = OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6")
      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Say hello." })).pipe(
        Effect.provide(
          fixedResponse(
@@ -442,7 +544,7 @@ describe("OpenRouter", () => {

  it.effect("fails on a mid-stream provider error", () =>
    Effect.gen(function* () {
-      const model = OpenRouter.configure({ apiKey: "test-key" }).model("openai/gpt-4o-mini")
+      const model = OpenRouter.configure({ apiKey: "test-key" }).chat("openai/gpt-4o-mini")
      const error = yield* LLMClient.generate(LLM.request({ model, prompt: "Say hello." })).pipe(
        Effect.provide(
          fixedResponse(
@@ -469,7 +571,7 @@ describe("OpenRouter", () => {
      ]
      const prepared = yield* compileRequest(
        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6"),
+          model: OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6"),
          cache: "none",
          messages: [
            Message.assistant([
@@ -504,7 +606,7 @@ describe("OpenRouter", () => {
      ]
      const prepared = yield* compileRequest(
        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6"),
+          model: OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6"),
          cache: "none",
          messages: [
            Message.assistant({
@@ -545,7 +647,7 @@ describe("OpenRouter", () => {
      ]
      const prepared = yield* compileRequest(
        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6"),
+          model: OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6"),
          cache: "none",
          messages: [
            Message.assistant({
@@ -574,7 +676,7 @@ describe("OpenRouter", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("anthropic/claude-sonnet-4.6"),
+          model: OpenRouter.configure({ apiKey: "test-key" }).chat("anthropic/claude-sonnet-4.6"),
          cache: "none",
          messages: [Message.assistant({ type: "reasoning", text: "Thinking" })],
        }),
@@ -0,0 +1,139 @@
+import type { CommandInfo, ModelInfo, ModelRef, OpenCodeClient, OpenCodeEvent } from "@opencode/client/promise"
+import { FSUtil } from "@opencode/util/fs-util"
+import type { ConfigOptionProvider } from "./config-option"
+
+export type Catalog = {
+  readonly providers: ConfigOptionProvider[]
+  readonly models: ModelInfo[]
+  readonly defaultModel: ModelRef
+  readonly modes: Array<{ id: string; name: string; description?: string }>
+  readonly defaultModeID: string
+  readonly commands: CommandInfo[]
+}
+
+export type Live = {
+  readonly cwd: string
+  current: Catalog
+}
+
+// Provider, integration, and credential changes reach the catalog through model.updated.
+const reloadOn = new Set<OpenCodeEvent["type"]>(["model.updated", "agent.updated", "command.updated"])
+
+export function make(input: {
+  readonly client: OpenCodeClient
+  readonly signal?: AbortSignal
+  readonly changed: (live: Live, previous: Catalog) => Promise<unknown>
+}) {
+  const entries = new Map<string, Promise<Live>>()
+  const running = new Map<Live, Promise<void>>()
+  const queued = new Set<Live>()
+  let subscribed: Promise<void> | undefined
+
+  const get = (cwd: string) => {
+    const key = FSUtil.resolve(cwd)
+    const cached = entries.get(key)
+    if (cached) return cached
+    // Subscribe before the first read so an update between the read and the subscription is not lost.
+    const loaded = subscribe()
+      .then(() => load(input.client, cwd))
+      .then((current): Live => ({ cwd, current }))
+      .catch((error) => {
+        entries.delete(key)
+        throw error
+      })
+    entries.set(key, loaded)
+    return loaded
+  }
+
+  const reload = (live: Live) => {
+    const current = running.get(live)
+    if (current) {
+      queued.add(live)
+      return current
+    }
+    const run = (async () => {
+      do {
+        queued.delete(live)
+        const next = await load(input.client, live.cwd).catch(() => undefined)
+        if (!next) break
+        const previous = live.current
+        live.current = next
+        await input.changed(live, previous).catch(() => {})
+      } while (queued.has(live))
+      running.delete(live)
+    })()
+    running.set(live, run)
+    return run
+  }
+
+  const subscribe = () =>
+    (subscribed ??= new Promise<void>((ready) => {
+      void (async () => {
+        for await (const event of input.client.event.subscribe({ signal: input.signal })) {
+          if (event.type === "server.connected") ready()
+          if (!reloadOn.has(event.type)) continue
+          const directory = event.location?.directory
+          const targets = directory === undefined ? [...entries.values()] : [entries.get(FSUtil.resolve(directory))]
+          targets.forEach((entry) => void entry?.then(reload, () => {}))
+        }
+      })()
+        .catch(() => {})
+        .finally(ready)
+    }))
+
+  return { get, reload }
+}
+
+async function load(client: OpenCodeClient, cwd: string): Promise<Catalog> {
+  const location = { directory: cwd }
+  // Some providers discover models in the background after plugin startup begins.
+  const deadline = Date.now() + 5_000
+  let missing = "No models are available"
+  while (Date.now() < deadline) {
+    const [modelResult, defaultResult, agentResult, commandResult] = await Promise.all([
+      client.model.list({ location }),
+      client.model.default({ location }),
+      client.agent.list({ location }),
+      client.command.list({ location }),
+    ])
+    const models = modelResult.data.filter((model) => model.enabled)
+    const preferred = defaultResult.data
+    // Parallel reads can straddle initialization; select only from this model list.
+    const defaultModel = preferred
+      ? models.find((model) => model.providerID === preferred.providerID && model.id === preferred.id)
+      : models[0]
+    const agents = agentResult.data.filter((agent) => agent.mode !== "subagent" && !agent.hidden)
+    const defaultAgent = agents.find((agent) => agent.mode === "primary") ?? agents[0]
+    if (defaultModel && defaultAgent) {
+      return {
+        providers: providers(models),
+        models,
+        defaultModel: {
+          providerID: defaultModel.providerID,
+          id: defaultModel.id,
+          variant: defaultModel.variants.find((variant) => variant.id === "default")?.id,
+        },
+        modes: agents.map((agent) => ({ id: agent.id, name: agent.name, description: agent.description })),
+        defaultModeID: defaultAgent.id,
+        commands: commandResult.data,
+      }
+    }
+    missing = defaultModel ? "No primary agents are available" : "No models are available"
+    await Bun.sleep(25)
+  }
+  throw new Error(missing)
+}
+
+function providers(models: readonly ModelInfo[]): ConfigOptionProvider[] {
+  return Array.from(new Set(models.map((model) => model.providerID)))
+    .toSorted()
+    .map((providerID) => ({
+      id: providerID,
+      name: providerID,
+      models: models
+        .filter((model) => model.providerID === providerID)
+        .map((model) => ({ id: model.id, name: model.name, variants: model.variants.map((variant) => variant.id) })),
+    }))
+}
+
+export * as ACPCatalog from "./catalog"
@@ -1,7 +1,7 @@
+import { isDeepStrictEqual } from "node:util"
 import {
  isSessionNotFoundError,
  type CommandInfo,
-  type ModelInfo,
  type ModelRef,
  type OpenCodeClient,
  type SessionInfo,
@@ -40,12 +40,8 @@ import type {
 } from "@agentclientprotocol/sdk"
 import { OPENCODE_VERSION } from "../version"
 import { SessionMessage } from "@opencode/schema/session-message"
-import {
-  buildConfigOptions,
-  DEFAULT_VARIANT_VALUE,
-  parseModelSelection,
-  type ConfigOptionProvider,
-} from "./config-option"
+import { ACPCatalog, type Catalog } from "./catalog"
+import { buildConfigOptions, DEFAULT_VARIANT_VALUE, parseModelSelection } from "./config-option"
 import type { ACPConnection } from "./connection"
 import { promptContentToParts } from "./content"
 import {
@@ -61,22 +57,14 @@ import { ACPError } from "./error"

 export const AuthMethodID = "opencode-login"

-type Catalog = {
-  readonly providers: ConfigOptionProvider[]
-  readonly models: ModelInfo[]
-  readonly defaultModel: ModelRef
-  readonly modes: Array<{ id: string; name: string; description?: string }>
-  readonly defaultModeID: string
-  readonly commands: CommandInfo[]
-}
-
+// Model and mode are unset while the session follows the server defaults.
 type Attached = {
  readonly id: string
  readonly cwd: string
  readonly abort: AbortController
-  catalog: Catalog
-  model: ModelRef
-  modeID: string
+  readonly catalog: ACPCatalog.Live
+  model?: ModelRef
+  modeID?: string
 }

 type PreparedPrompt = {
@@ -109,21 +97,55 @@ export function make(input: {
  readonly connection: ACPConnection.Connection
 }): Interface {
  const sessions = new Map<string, Attached>()
-  const catalogs = new Map<string, Promise<Catalog>>()
  const registeredMcp = new Map<string, Set<string>>()
  const active = new Map<string, { readonly control: TurnControl; readonly turn: Promise<PromptResponse> }>()
  const capabilities = { writeTextFile: false, childSessionUpdates: false }

-  const catalog = (cwd: string) => {
-    const cached = catalogs.get(cwd)
-    if (cached) return cached
-    const loaded = loadCatalog(input.client, cwd).catch((error) => {
-      catalogs.delete(cwd)
-      throw error
+  const catalogs = ACPCatalog.make({
+    client: input.client,
+    signal: input.connection.signal,
+    changed: (live, previous) =>
+      Promise.all(
+        Array.from(sessions.values())
+          .filter((state) => state.catalog === live)
+          .map(async (state) => {
+            const options = configOptions(state)
+            if (!isDeepStrictEqual(options, configOptions(state, previous))) {
+              await input.connection.sessionUpdate({
+                sessionId: state.id,
+                update: { sessionUpdate: "config_option_update", configOptions: options },
+              })
+            }
+            if (!isDeepStrictEqual(live.current.commands, previous.commands)) await sendCommands(state)
+          }),
+      ),
+  })
+
+  const sendCommands = (state: Attached) =>
+    input.connection.sessionUpdate({
+      sessionId: state.id,
+      update: {
+        sessionUpdate: "available_commands_update",
+        availableCommands: state.catalog.current.commands.map((command) => ({
+          name: command.name,
+          description: command.description ?? "",
+        })),
+      },
+    })
+
+  const withReload = <A>(state: Attached, select: () => Promise<A>) =>
+    select().catch(async (error: unknown) => {
+      if (
+        !(
+          error instanceof ACPError.InvalidModelError ||
+          error instanceof ACPError.InvalidModeError ||
+          error instanceof ACPError.InvalidEffortError
+        )
+      )
+        throw error
+      await catalogs.reload(state.catalog)
+      return select()
    })
-    catalogs.set(cwd, loaded)
-    return loaded
-  }

  const requireSession = async (sessionID: string) => {
    const current = sessions.get(sessionID)
@@ -147,27 +169,19 @@ export function make(input: {
  }

  const attach = async (session: SessionInfo, cwd: string, mcpServers: readonly McpServer[]) => {
-    const currentCatalog = await catalog(cwd)
+    const catalog = await catalogs.get(cwd)
    sessions.get(session.id)?.abort.abort()
    const state: Attached = {
      id: session.id,
      cwd,
      abort: new AbortController(),
-      catalog: currentCatalog,
-      model: session.model ?? currentCatalog.defaultModel,
-      modeID: session.agent ?? currentCatalog.defaultModeID,
+      catalog,
+      model: session.model,
+      modeID: session.agent,
    }
    sessions.set(session.id, state)
    await registerMcpServers(input.client, registeredMcp, state, mcpServers)
-    await input.connection.sessionUpdate({
-      sessionId: state.id,
-      update: {
-        sessionUpdate: "available_commands_update",
-        availableCommands: [
-          ...state.catalog.commands.map((command) => ({ name: command.name, description: command.description ?? "" })),
-        ],
-      },
-    })
+    await sendCommands(state)
    return state
  }

@@ -175,14 +189,16 @@ export function make(input: {
    await replayMessages(input.connection, state.id, state.cwd, await messages(input.client, state.id))
  }

-  const configOptions = (state: Attached) =>
-    buildConfigOptions({
-      providers: state.catalog.providers,
-      currentModel: { providerID: state.model.providerID, modelID: state.model.id },
-      currentVariant: state.model.variant,
-      modes: state.catalog.modes,
-      currentModeId: state.modeID,
+  const configOptions = (state: Attached, catalog = state.catalog.current) => {
+    const model = currentModel(state, catalog)
+    return buildConfigOptions({
+      providers: catalog.providers,
+      currentModel: { providerID: model.providerID, modelID: model.id },
+      currentVariant: model.variant,
+      modes: catalog.modes,
+      currentModeId: state.modeID ?? catalog.defaultModeID,
    })
+  }

  return {
    initialize: async (params) => {
@@ -216,12 +232,10 @@ export function make(input: {
      return {}
    },
    newSession: async (params) => {
-      const currentCatalog = await catalog(params.cwd)
-      const created = await input.client.session.create({
-        location: { directory: params.cwd },
-        agent: currentCatalog.defaultModeID,
-        model: currentCatalog.defaultModel,
-      })
+      // Load before creating so a catalog failure leaves no session behind. Agent and model stay unset
+      // so the server resolves its defaults after plugins activate.
+      await catalogs.get(params.cwd)
+      const created = await input.client.session.create({ location: { directory: params.cwd } })
      const state = await attach(created, params.cwd, params.mcpServers)
      return { sessionId: state.id, configOptions: configOptions(state) }
    },
@@ -279,37 +293,38 @@ export function make(input: {
    },
    setSessionConfigOption: async (params) => {
      const state = await requireSession(params.sessionId)
-      if (typeof params.value !== "string") throw new ACPError.InvalidConfigOptionError({ configId: params.configId })
-      switch (params.configId) {
-        case "model": {
-          const selected = requireModel(state.catalog, params.value, state.model)
-          state.model = selected
-          await input.client.session.switchModel({ sessionID: state.id, model: selected })
-          break
+      const value = params.value
+      if (typeof value !== "string") throw new ACPError.InvalidConfigOptionError({ configId: params.configId })
+      await withReload(state, async () => {
+        switch (params.configId) {
+          case "model": {
+            const selected = requireModel(state.catalog.current, value, currentModel(state))
+            state.model = selected
+            await input.client.session.switchModel({ sessionID: state.id, model: selected })
+            return
+          }
+          case "effort": {
+            const current = currentModel(state)
+            const model = state.catalog.current.models.find(
+              (item) => item.providerID === current.providerID && item.id === current.id,
+            )
+            if (!model || (value !== DEFAULT_VARIANT_VALUE && !model.variants.some((variant) => variant.id === value)))
+              throw new ACPError.InvalidEffortError({ effort: value })
+            state.model = { ...current, variant: value }
+            await input.client.session.switchModel({ sessionID: state.id, model: state.model })
+            return
+          }
+          case "mode":
+            return selectMode(input.client, state, value)
+          default:
+            throw new ACPError.InvalidConfigOptionError({ configId: params.configId })
        }
-        case "effort": {
-          const model = state.catalog.models.find(
-            (item) => item.providerID === state.model.providerID && item.id === state.model.id,
-          )
-          if (
-            !model ||
-            (params.value !== DEFAULT_VARIANT_VALUE && !model.variants.some((variant) => variant.id === params.value))
-          )
-            throw new ACPError.InvalidEffortError({ effort: params.value })
-          state.model = { ...state.model, variant: params.value }
-          await input.client.session.switchModel({ sessionID: state.id, model: state.model })
-          break
-        }
-        case "mode":
-          await selectMode(input.client, state, params.value)
-          break
-        default:
-          throw new ACPError.InvalidConfigOptionError({ configId: params.configId })
-      }
+      })
      return { configOptions: configOptions(state) }
    },
    setSessionMode: async (params) => {
-      await selectMode(input.client, await requireSession(params.sessionId), params.modeId)
+      const state = await requireSession(params.sessionId)
+      await withReload(state, () => selectMode(input.client, state, params.modeId))
      return {}
    },
    prompt: async (params, signal) => {
@@ -321,7 +336,7 @@ export function make(input: {
        })
      }
      const messageID = SessionMessage.ID.create()
-      const prepared = preparePrompt(state.catalog, params.prompt, messageID)
+      const prepared = preparePrompt(state.catalog.current, params.prompt, messageID)
      const control: TurnControl = { cancelled: false, admission: new AbortController() }
      const extNotification = input.connection.extNotification
      const childSessionUpdate =
@@ -410,58 +425,6 @@ function turnStart(messageID: string, slash: PreparedPrompt["slash"]): TurnStart
  return { type: "input", id: messageID }
 }

-async function loadCatalog(client: OpenCodeClient, cwd: string): Promise<Catalog> {
-  const location = { directory: cwd }
-  // Some providers discover models in the background after plugin startup begins.
-  const deadline = Date.now() + 5_000
-  let missing = "No models are available"
-  while (Date.now() < deadline) {
-    const [modelResult, defaultResult, agentResult, commandResult] = await Promise.all([
-      client.model.list({ location }),
-      client.model.default({ location }),
-      client.agent.list({ location }),
-      client.command.list({ location }),
-    ])
-    const models = modelResult.data.filter((model) => model.enabled)
-    const preferred = defaultResult.data
-    // Parallel reads can straddle initialization; select only from this model list.
-    const defaultModel = preferred
-      ? models.find((model) => model.providerID === preferred.providerID && model.id === preferred.id)
-      : models[0]
-    const agents = agentResult.data.filter((agent) => agent.mode !== "subagent" && !agent.hidden)
-    const defaultAgent = agents.find((agent) => agent.mode === "primary") ?? agents[0]
-    if (defaultModel && defaultAgent) {
-      return {
-        providers: providers(models),
-        models,
-        defaultModel: {
-          providerID: defaultModel.providerID,
-          id: defaultModel.id,
-          variant: defaultModel.variants.find((variant) => variant.id === "default")?.id,
-        },
-        modes: agents.map((agent) => ({ id: agent.id, name: agent.name, description: agent.description })),
-        defaultModeID: defaultAgent.id,
-        commands: commandResult.data,
-      }
-    }
-    missing = defaultModel ? "No primary agents are available" : "No models are available"
-    await Bun.sleep(25)
-  }
-  throw new Error(missing)
-}
-
-function providers(models: readonly ModelInfo[]): ConfigOptionProvider[] {
-  return Array.from(new Set(models.map((model) => model.providerID)))
-    .toSorted()
-    .map((providerID) => ({
-      id: providerID,
-      name: providerID,
-      models: models
-        .filter((model) => model.providerID === providerID)
-        .map((model) => ({ id: model.id, name: model.name, variants: model.variants.map((variant) => variant.id) })),
-    }))
-}
-
 function requireModel(catalog: Catalog, modelID: string, current: ModelRef): ModelRef {
  const selected = parseModelSelection(modelID, catalog.providers)
  const model = catalog.models.find(
@@ -480,8 +443,13 @@ function requireModel(catalog: Catalog, modelID: string, current: ModelRef): Mod
  return { providerID: model.providerID, id: model.id, variant }
 }

+function currentModel(state: Attached, catalog = state.catalog.current) {
+  return state.model ?? catalog.defaultModel
+}
+
 async function selectMode(client: OpenCodeClient, state: Attached, modeID: string) {
-  if (!state.catalog.modes.some((mode) => mode.id === modeID)) throw new ACPError.InvalidModeError({ mode: modeID })
+  if (!state.catalog.current.modes.some((mode) => mode.id === modeID))
+    throw new ACPError.InvalidModeError({ mode: modeID })
  state.modeID = modeID
  await client.session.switchAgent({ sessionID: state.id, agent: modeID })
 }
@@ -567,8 +535,9 @@ async function sendUsageUpdate(
  used?: number,
 ) {
  if (!used) return
-  const model = session.catalog.models.find(
-    (item) => item.providerID === session.model.providerID && item.id === session.model.id,
+  const current = currentModel(session)
+  const model = session.catalog.current.models.find(
+    (item) => item.providerID === current.providerID && item.id === current.id,
  )
  if (!model?.limit.context) return
  const info = await client.session.get({ sessionID: session.id })
@@ -67,6 +67,9 @@ type FormRequest = Extract<V2Event, { type: "form.created" }>["data"]["form"]
 // attached client must not cancel input that may belong to another session.
 const GLOBAL_FORM_SESSION_ID = "global"

+const QUESTION_CANCELLED_FEEDBACK =
+  "This non-interactive run cannot ask the user questions, so the question was cancelled. Continue without an answer; make reasonable assumptions and state them."
+
 const PERMISSION_REJECTED_FEEDBACK =
  "This non-interactive run cannot ask the user for permission, so the request was rejected. Continue without this action."

@@ -182,15 +185,23 @@ export async function runNonInteractivePrompt(input: Input) {
    }
  }

-  const cancelForm = async (request: Pick<FormRequest, "id" | "sessionID">) => {
+  const cancelForm = async (request: Pick<FormRequest, "id" | "sessionID" | "metadata">) => {
+    // Nobody can answer a question here. Outside V1 compatibility, cancel it with a message so the
+    // question tool fails as ordinary model-visible output and the model continues without an answer.
+    const continuing = request.metadata?.kind === "question" && input.compatibility !== "v1"
    try {
      await input.client.session.form.cancel(
-        { sessionID: request.sessionID, formID: request.id },
+        {
+          sessionID: request.sessionID,
+          formID: request.id,
+          ...(continuing ? { message: QUESTION_CANCELLED_FEEDBACK } : {}),
+        },
        ...formRequestOptions(request.sessionID === GLOBAL_FORM_SESSION_ID ? input.location : undefined),
      )
    } catch (error) {
      if (!formAlreadySettled(error)) throw error
    }
+    if (continuing) return
    formCancelled = true
    if (input.compatibility !== "v1") process.exitCode = 1
  }
@@ -1,6 +1,14 @@
 import { describe, expect, test } from "bun:test"
 import type { McpServer, SessionConfigOption } from "@agentclientprotocol/sdk"
-import { makeACPFixture, makeSession, secondModel, testModel } from "./service-fixture"
+import {
+  buildAgent,
+  makeACPFixture,
+  makeSession,
+  planAgent,
+  reviewCommand,
+  secondModel,
+  testModel,
+} from "./service-fixture"
 import { flattenSelectOptions, requireSelectOption } from "./subprocess"

 describe("acp service directory behavior", () => {
@@ -27,12 +35,7 @@ describe("acp service directory behavior", () => {
    expect(currentValue(first[0], "model")).toBe("test/test-model")
    expect(currentValue(first[0], "mode")).toBe("build")
    expect(
-      [
-        "/api/model",
-        "/api/model/default",
-        "/api/agent",
-        "/api/command",
-      ].map((path) =>
+      ["/api/model", "/api/model/default", "/api/agent", "/api/command"].map((path) =>
        fixture.requests
          .filter((request) => request.path === path)
          .map((request) => request.query["location[directory]"]),
@@ -48,21 +51,9 @@ describe("acp service directory behavior", () => {
        .filter((request) => request.method === "POST" && request.path === "/api/session")
        .map((request) => request.body),
    ).toEqual([
-      {
-        agent: "build",
-        model: { providerID: "test", id: "test-model", variant: "default" },
-        location: { directory: "/workspace" },
-      },
-      {
-        agent: "build",
-        model: { providerID: "test", id: "test-model", variant: "default" },
-        location: { directory: "/workspace" },
-      },
-      {
-        agent: "build",
-        model: { providerID: "test", id: "test-model", variant: "default" },
-        location: { directory: "/other" },
-      },
+      { location: { directory: "/workspace" } },
+      { location: { directory: "/workspace" } },
+      { location: { directory: "/other" } },
    ])
    expect(
      fixture.updates.map((item) =>
@@ -70,11 +61,116 @@ describe("acp service directory behavior", () => {
          ? item.update.availableCommands.map((command) => command.name)
          : [],
      ),
-    ).toEqual([
-      ["review"],
-      ["review"],
-      ["review"],
-    ])
+    ).toEqual([["review"], ["review"], ["review"]])
+  })
+
+  test("follows server defaults and refreshes the catalog when location plugins finish activating", async () => {
+    const configured = { ...buildAgent, id: "copilot-build", name: "copilot-build" }
+    const catalog = { agents: [buildAgent, planAgent], commands: [reviewCommand] }
+    let created = 0
+    await using fixture = makeACPFixture({
+      fetch(request) {
+        const location = { directory: request.query["location[directory]"] ?? "/workspace" }
+        if (request.path === "/api/agent") return Response.json({ location, data: catalog.agents })
+        if (request.path === "/api/command") return Response.json({ location, data: catalog.commands })
+        if (request.method !== "POST" || request.path !== "/api/session") return undefined
+        created++
+        return Response.json({ data: { ...makeSession(`ses_${created}`), agent: undefined, model: undefined } })
+      },
+    })
+
+    const first = await fixture.service.newSession({ cwd: "/workspace", mcpServers: [] })
+    expect(currentValue(first, "mode")).toBe("build")
+    expect(currentValue(first, "model")).toBe("test/test-model")
+
+    const agentReads = () => fixture.requests.filter((request) => request.path === "/api/agent").length
+    const reads = agentReads()
+    fixture.send({ id: "evt_other", created: 1, type: "agent.updated", location: { directory: "/other" }, data: {} })
+    catalog.agents = [configured, buildAgent, planAgent]
+    catalog.commands = [reviewCommand, { name: "ship", description: "Ship it" }]
+    fixture.send({
+      id: "evt_agent",
+      created: 2,
+      type: "agent.updated",
+      location: { directory: "/workspace" },
+      data: {},
+    })
+
+    const update = await until(() =>
+      fixture.updates.find(
+        (item) => item.sessionId === first.sessionId && item.update.sessionUpdate === "config_option_update",
+      ),
+    )
+    expect(update.update.sessionUpdate === "config_option_update" && modeOption(update.update.configOptions)).toEqual({
+      currentValue: "copilot-build",
+      options: ["copilot-build", "build", "plan"],
+    })
+    const commands = await until(() =>
+      fixture.updates.findLast(
+        (item) =>
+          item.sessionId === first.sessionId &&
+          item.update.sessionUpdate === "available_commands_update" &&
+          item.update.availableCommands.length === 2,
+      ),
+    )
+    expect(
+      commands.update.sessionUpdate === "available_commands_update" &&
+        commands.update.availableCommands.map((command) => command.name),
+    ).toEqual(["review", "ship"])
+    expect(agentReads()).toBe(reads + 1)
+
+    const second = await fixture.service.newSession({ cwd: "/workspace", mcpServers: [] })
+    expect(currentValue(second, "mode")).toBe("copilot-build")
+    expect(
+      fixture.requests
+        .filter((request) => request.method === "POST" && request.path === "/api/session")
+        .map((request) => request.body),
+    ).toEqual([{ location: { directory: "/workspace" } }, { location: { directory: "/workspace" } }])
+  })
+
+  test("reloads the catalog before rejecting a model or mode it has not seen", async () => {
+    const configured = { ...planAgent, id: "copilot-build", name: "copilot-build" }
+    const catalog = { models: [testModel], agents: [buildAgent, planAgent] }
+    await using fixture = makeACPFixture({
+      defaultModel: testModel,
+      fetch(request) {
+        const location = { directory: request.query["location[directory]"] ?? "/workspace" }
+        if (request.path === "/api/model") return Response.json({ location, data: catalog.models })
+        if (request.path === "/api/agent") return Response.json({ location, data: catalog.agents })
+        if (request.method === "POST" && request.path === "/api/session") {
+          return Response.json({ data: makeSession("ses_reload") })
+        }
+        if (
+          request.method === "POST" &&
+          (request.path === "/api/session/ses_reload/model" || request.path === "/api/session/ses_reload/agent")
+        ) {
+          return new Response(null, { status: 204 })
+        }
+        return undefined
+      },
+    })
+    const session = await fixture.service.newSession({ cwd: "/workspace", mcpServers: [] })
+    catalog.models = [testModel, secondModel]
+    catalog.agents = [buildAgent, planAgent, configured]
+
+    const model = await fixture.service.setSessionConfigOption({
+      sessionId: session.sessionId,
+      configId: "model",
+      value: "test/second-model",
+    })
+    await fixture.service.setSessionMode({ sessionId: session.sessionId, modeId: "copilot-build" })
+    const missing = await fixture.service
+      .setSessionConfigOption({ sessionId: session.sessionId, configId: "mode", value: "missing" })
+      .catch((error: unknown) => error)
+
+    expect(currentValue(model, "model")).toBe("test/second-model")
+    expect(
+      fixture.requests
+        .filter((request) => request.path === "/api/session/ses_reload/agent")
+        .map((request) => request.body),
+    ).toEqual([{ agent: "copilot-build" }])
+    expect(missing).toMatchObject({ _tag: "ACPInvalidModeError" })
+    expect(fixture.requests.filter((request) => request.path === "/api/agent")).toHaveLength(3)
  })

  test.each(["empty", "missing the default"])(
@@ -300,6 +396,21 @@ describe("acp service directory behavior", () => {
  })
 })

+function modeOption(options: SessionConfigOption[]) {
+  const mode = requireSelectOption(options, "mode")
+  return { currentValue: mode.currentValue, options: flattenSelectOptions(mode).map((option) => option.value) }
+}
+
+async function until<Value>(read: () => Value | undefined) {
+  const deadline = Date.now() + 2_000
+  while (Date.now() < deadline) {
+    const value = read()
+    if (value !== undefined) return value
+    await Bun.sleep(5)
+  }
+  throw new Error("timed out waiting for ACP update")
+}
+
 function currentValue(
  result: { readonly configOptions?: readonly SessionConfigOption[] | null } | undefined,
  id: string,
@@ -184,6 +184,7 @@ export function makeACPFixture(options: FixtureOptions = {}) {
    service,
    requests,
    updates,
+    send: context.send,
    async [Symbol.asyncDispose]() {
      eventController?.close()
      await server.stop(true)
@@ -26,11 +26,7 @@ describe("acp service lifecycle", () => {
      method: "POST",
      path: "/api/session",
      query: {},
-      body: {
-        location: { directory: "/workspace" },
-        agent: "build",
-        model: { providerID: "test", id: "second-model" },
-      },
+      body: { location: { directory: "/workspace" } },
    })
    expect(currentValue(created, "effort")).toBe("default")
  })
@@ -1414,7 +1414,11 @@ export type SessionFormReplyOperation<E = never> = (
  input: SessionFormReplyInput,
 ) => Effect.Effect<SessionFormReplyOutput, E>

-export type SessionFormCancelInput = { readonly sessionID: string; readonly formID: Form.ID }
+export type SessionFormCancelInput = {
+  readonly sessionID: string
+  readonly formID: Form.ID
+  readonly message?: string | undefined
+}
 export type SessionFormCancelOutput = void
 export type SessionFormCancelOperation<E = never> = (
  input: SessionFormCancelInput,
@@ -735,9 +735,10 @@ const EndpointSessionFormReply = (raw: RawClient["server.session"]) => (input: S

 const EndpointSessionFormCancel = (raw: RawClient["server.session"]) => (input: SessionFormCancelInput) =>
  preserveEffect<SessionFormCancelOutput>()(
-    raw["session.form.cancel"]({ params: { sessionID: input["sessionID"], formID: input["formID"] } }).pipe(
-      Effect.mapError(mapClientError),
-    ),
+    raw["session.form.cancel"]({
+      params: { sessionID: input["sessionID"], formID: input["formID"] },
+      query: { message: input["message"] },
+    }).pipe(Effect.mapError(mapClientError)),
  )

 const EndpointSessionEnvironment = (raw: RawClient["server.session"]) => (input: SessionEnvironmentInput) =>
@@ -1058,6 +1058,7 @@ export function make(options: ClientOptions) {
            {
              method: "DELETE",
              path: `/api/session/${encodeURIComponent(input.sessionID)}/form/${encodeURIComponent(input.formID)}`,
+              query: { message: input["message"] },
              successStatus: 204,
              declaredStatuses: [400, 401, 404, 409],
              empty: true,
@@ -1897,7 +1897,10 @@ export type FormField =
  | FormMultiselectField
  | FormExternalField

-export type FormState = { status: "pending" } | { status: "answered"; answer: FormAnswer } | { status: "cancelled" }
+export type FormState =
+  | { status: "pending" }
+  | { status: "answered"; answer: FormAnswer }
+  | { status: "cancelled"; message?: string }

 export type CredentialKey = {
  type: "key"
@@ -5460,6 +5463,7 @@ export type SessionFormReplyOutput = void
 export type SessionFormCancelInput = {
  readonly sessionID: { readonly sessionID: string; readonly formID: string }["sessionID"]
  readonly formID: { readonly sessionID: string; readonly formID: string }["formID"]
+  readonly message?: { readonly message?: string | undefined }["message"]
 }

 export type SessionFormCancelOutput = void
@@ -74,6 +74,10 @@ export interface ReplyInput {
  readonly answer: Answer
 }

+export interface CancelOptions {
+  readonly message?: string
+}
+
 export interface ListInput {
  readonly sessionID?: Form.Info["sessionID"]
 }
@@ -86,7 +90,7 @@ export interface Interface {
  readonly list: (input?: ListInput) => Effect.Effect<ReadonlyArray<Info>>
  readonly state: (id: ID) => Effect.Effect<State, NotFoundError>
  readonly reply: (input: ReplyInput) => Effect.Effect<void, AlreadySettledError | InvalidAnswerError | NotFoundError>
-  readonly cancel: (id: ID) => Effect.Effect<void, AlreadySettledError | NotFoundError>
+  readonly cancel: (id: ID, options?: CancelOptions) => Effect.Effect<void, AlreadySettledError | NotFoundError>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/Form") {}
@@ -192,12 +196,15 @@ export const layer = Layer.effect(
      ),
    )

-    const cancel = Effect.fn("Form.cancel")((id: ID) =>
+    const cancel = Effect.fn("Form.cancel")((id: ID, options?: CancelOptions) =>
      Effect.uninterruptible(
        Effect.gen(function* () {
          const entry = yield* requireEntry(id)
          if (entry.state.status !== "pending") return yield* new AlreadySettledError({ id })
-          const next: TerminalState = { status: "cancelled" }
+          const next: TerminalState = {
+            status: "cancelled",
+            ...(options?.message === undefined ? {} : { message: options.message }),
+          }
          yield* bus.publish(Form.Event.Cancelled, { id, sessionID: entry.form.sessionID })
          yield* Cache.set(forms, id, { ...entry, state: next })
          yield* Deferred.succeed(entry.deferred, next)
@@ -213,7 +213,6 @@ export type InternalPlugin = Plugin<Requirements | Scope.Scope>
 const pre = [
  ToolInputRepairPlugin.Plugin,
  ConfigWorktreePlugin.Plugin,
-  BrowserPlugin,
  ConfigMcpPlugin.Plugin,
  McpCodeModeDefaultsPlugin.Plugin,
  WellKnownPlugin.Plugin,
@@ -251,6 +250,7 @@ const post = [
  ConfigInstructionPlugin.Plugin,
  ConfigReferencePlugin.Plugin,
  ConfigAgentPlugin.Plugin,
+  BrowserPlugin,
  ConfigCommandPlugin.Plugin,
  ConfigCompactionPlugin.Plugin,
  ConfigFormatterPlugin.Plugin,
@@ -90,6 +90,10 @@ export const Plugin = {
                  // Deliberate defect tunnel (see Permission.assert): a dismissal must dodge
                  // leaf `mapError` blankets so it never becomes model-facing tool output; it
                  // resurfaces as a typed failure at SessionModelRequest.executeTool.
+                  // A dismissal with a message (e.g. from a non-interactive client) is ordinary
+                  // model-facing feedback: the model continues instead of the step ending.
+                  if (state.status === "cancelled" && state.message !== undefined)
+                    return Effect.fail(new ToolFailure({ message: state.message }))
                  if (state.status === "cancelled") return Effect.die(new CancelledError())
                  const output = {
                    answers: input.questions.map((_, index): Question.Answer => {
@@ -19,9 +19,38 @@ type Attachment = {
 export type Connection = Effect.Success<ReturnType<typeof make>>

 export const make = Effect.fn("BrowserConnection.make")(function* (
-  ctx: Pick<Context, "rpc" | "session" | "location" | "event">,
+  ctx: Pick<Context, "agent" | "rpc" | "session" | "location" | "event">,
 ) {
  const browsers = new Map<Session.ID, Attachment>()
+  // Appended after config, so every agent hides the browser until an attachment allows it.
+  yield* ctx.agent.transform((editor) =>
+    editor.list().forEach((agent) => agent.permissions.push({ action: "browser", resource: "*", effect: "deny" })),
+  )
+  // Each attachment adds and removes its own allow, so a replaced attachment keeps the new one's.
+  const grant = (sessionID: Session.ID) =>
+    Effect.acquireRelease(
+      ctx.session.get({ sessionID }).pipe(
+        Effect.flatMap((session) =>
+          ctx.session.update({
+            sessionID,
+            permissions: [...(session.permissions ?? []), { action: "browser", resource: "*", effect: "allow" }],
+          }),
+        ),
+        Effect.orDie,
+      ),
+      () =>
+        ctx.session.get({ sessionID }).pipe(
+          Effect.flatMap((session) => {
+            const permissions = session.permissions ?? []
+            const index = permissions.findIndex(
+              (rule) => rule.action === "browser" && rule.resource === "*" && rule.effect === "allow",
+            )
+            if (index === -1) return Effect.void
+            return ctx.session.update({ sessionID, permissions: permissions.toSpliced(index, 1) })
+          }),
+          Effect.ignore,
+        ),
+    )
  let active = true
  const close = (sessionID: Session.ID, reason: "closed" | "replaced" = "closed") =>
    Effect.gen(function* () {
@@ -69,6 +98,7 @@ export const make = Effect.fn("BrowserConnection.make")(function* (
            }),
            (browser) => (browsers.get(input.sessionID) === browser ? close(input.sessionID) : Effect.void),
          )
+          yield* grant(input.sessionID)
          yield* rpc.events
            .emit("control", { type: "attached", connectionID: input.connectionID, version: 4 })
            .pipe(Effect.orDie)
@@ -39,8 +39,8 @@
  },
  "peerDependencies": {
    "@opencode/theme": "workspace:*",
-    "@opentui/core": ">=0.5.13",
-    "@opentui/solid": ">=0.5.13",
+    "@opentui/core": ">=0.5.14",
+    "@opentui/solid": ">=0.5.14",
    "solid-js": ">=1.9.0"
  },
  "peerDependenciesMeta": {
@@ -4566,7 +4566,7 @@
            }
          }
        },
-        "description": "Cancel a pending form.",
+        "description": "Cancel a pending form, optionally telling the asker why it was not answered.",
        "summary": "Cancel form"
      }
    },
@@ -4591,6 +4591,21 @@
              "pattern": "^frm_"
            },
            "required": true
+          },
+          {
+            "name": "message",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
          }
        ],
        "security": [],
@@ -14170,6 +14185,9 @@
              "status": {
                "type": "string",
                "enum": ["cancelled"]
+              },
+              "message": {
+                "type": "string"
              }
            },
            "required": ["status"],
@@ -855,6 +855,7 @@ export const makeSessionGroup = <
    .add(
      HttpApiEndpoint.delete("session.form.cancel", "/api/session/:sessionID/form/:formID", {
        params: { sessionID: Schema.String, formID: Form.ID },
+        query: Schema.Struct({ message: Schema.optional(Schema.String) }),
        success: HttpApiSchema.NoContent,
        error: [SessionNotFoundError, FormAlreadySettledError, FormNotFoundError],
      })
@@ -863,7 +864,7 @@ export const makeSessionGroup = <
          OpenApi.annotations({
            identifier: "session.form.cancel",
            summary: "Cancel form",
-            description: "Cancel a pending form.",
+            description: "Cancel a pending form, optionally telling the asker why it was not answered.",
          }),
        ),
    )
@@ -149,7 +149,8 @@ export type Answer = typeof Answer.Type
 export const State = Schema.Union([
  Schema.Struct({ status: Schema.Literal("pending") }),
  Schema.Struct({ status: Schema.Literal("answered"), answer: Answer }),
-  Schema.Struct({ status: Schema.Literal("cancelled") }),
+  // A message tells the asker why nobody answered, e.g. a non-interactive client.
+  Schema.Struct({ status: Schema.Literal("cancelled"), message: Schema.String.pipe(optional) }),
 ])
  .pipe(Schema.toTaggedUnion("status"))
  .annotate({ identifier: "Form.State" })
@@ -692,7 +692,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
        "session.form.cancel",
        Effect.fn(function* (ctx) {
          const owned = yield* requireOwnedForm(ctx.params.sessionID, ctx.params.formID)
-          yield* owned.form.cancel(ctx.params.formID).pipe(
+          yield* owned.form.cancel(ctx.params.formID, { message: ctx.query.message }).pipe(
            Effect.catchTags({
              "Form.AlreadySettledError": (error) =>
                new FormAlreadySettledError({ id: error.id, message: error.message }),
@@ -260,9 +260,7 @@ function InstructionsGroup(props: GroupProps) {
        Instructions: {files()} {files() === 1 ? "file" : "files"}
      </InlineToolRow>
      <Show when={disclosure.expanded()}>
-        <box flexDirection="column" gap={1} marginTop={1}>
-          <Children {...props} nodes={props.node.children} mode="normal" />
-        </box>
+        <Children {...props} nodes={props.node.children} mode="normal" />
      </Show>
    </GroupAnchor>
  )
@@ -153,6 +153,55 @@ test("retains nested expansion state and registers exact headers and parts", asy
  expect(anchors.list()).toEqual([])
 })

+test("expanded instructions stay adjacent to their summary and each other", async () => {
+  const anchors = createTimelineAnchors()
+  const [expanded, setExpanded] = createStore<Record<string, boolean>>({})
+  const messages: SessionMessageInfo[] = ["AGENTS.md", "packages/tui/AGENTS.md"].map((path) => ({
+    type: "synthetic",
+    id: path,
+    text: "Instructions",
+    description: `Loaded ${path}`,
+    metadata: { instruction: { paths: [path] } },
+    time: { created: 1 },
+  }))
+  const row: SessionGroup = {
+    type: "group",
+    kind: "instructions",
+    size: messages.length,
+    completed: true,
+    children: messages.map((message) => ({
+      type: "entry",
+      size: 1,
+      entry: { type: "message", messageID: message.id },
+    })),
+  }
+  const app = await mount({
+    row,
+    anchors,
+    config: createTuiResolvedConfig({ animations: false }),
+    expanded: (id) => expanded[id],
+    setExpanded: (id, value) => setExpanded(id, value),
+    message: (id) => messages.find((message) => message.id === id),
+    entry: (entry) => <text>{entry.type === "message" ? `Loaded ${entry.messageID}` : ""}</text>,
+  })
+  try {
+    app.renderer.start()
+    await app.waitForFrame((frame) => frame.includes("Instructions: 2 files"))
+    expect(app.captureCharFrame()).not.toContain("Loaded AGENTS.md")
+    await app.mockMouse.click(4, anchors.get({ type: "group", groupID: groupID(row, 0)! })?.node.y ?? -1)
+    await app.renderOnce()
+    expect(
+      app
+        .captureCharFrame()
+        .split("\n")
+        .map((line) => line.trim())
+        .join("\n"),
+    ).toContain("◈ Instructions: 2 files\nLoaded AGENTS.md\nLoaded packages/tui/AGENTS.md")
+  } finally {
+    app.renderer.destroy()
+  }
+})
+
 test("a low activity group with nothing finished stays collapsed behind a status", async () => {
  const config = createTuiResolvedConfig({ animations: false })
  const shell = (id: string) => ({
@@ -4566,7 +4566,7 @@
            }
          }
        },
-        "description": "Cancel a pending form.",
+        "description": "Cancel a pending form, optionally telling the asker why it was not answered.",
        "summary": "Cancel form"
      }
    },
@@ -4591,6 +4591,21 @@
              "pattern": "^frm_"
            },
            "required": true
+          },
+          {
+            "name": "message",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
          }
        ],
        "security": [],
@@ -14170,6 +14185,9 @@
              "status": {
                "type": "string",
                "enum": ["cancelled"]
+              },
+              "message": {
+                "type": "string"
              }
            },
            "required": ["status"],
@@ -4566,7 +4566,7 @@
            }
          }
        },
-        "description": "Cancel a pending form.",
+        "description": "Cancel a pending form, optionally telling the asker why it was not answered.",
        "summary": "Cancel form"
      }
    },
@@ -4591,6 +4591,21 @@
              "pattern": "^frm_"
            },
            "required": true
+          },
+          {
+            "name": "message",
+            "in": "query",
+            "schema": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
+            },
+            "required": false
          }
        ],
        "security": [],
@@ -14170,6 +14185,9 @@
              "status": {
                "type": "string",
                "enum": ["cancelled"]
+              },
+              "message": {
+                "type": "string"
              }
            },
            "required": ["status"],
Author	SHA1	Message	Date
Aiden Cline	95ca8a2aaf	refactor(ai): reuse shared OpenRouter Responses implementation	2026-09-30 11:31:02 -05:00
Aiden Cline	25d302d02c	refactor(ai): share OpenRouter Responses protocol	2026-09-30 11:31:01 -05:00
Aiden Cline	4ec4f274bd	feat(ai): route OpenRouter models through native APIs	2026-09-30 11:31:01 -05:00
Aiden Cline	599bdc982e	fix(ai): classify Amazon Nova input token rejections as context overflow (#52131 )	2026-09-30 11:13:34 -05:00
James Long	82bb5ff88a	fix(browser): hide browser tools unless a desktop is attached (#52309 )	2026-09-30 11:42:23 -04:00
Simon Klee	0159356be6	tui: upgrade OpenTUI to 0.5.14 (#52316 )	2026-09-30 15:16:51 +00:00
OpeOginni	9388b94a97	fix(tui): tighten expanded instruction group spacing (#52311 )	2026-09-30 15:08:01 +00:00
James Long	02c3891d9b	feat(core): let form cancellation carry a message (#52137 )	2026-09-30 09:20:26 -04:00
Shoubhit Dash	1844c11104	fix(acp): follow server defaults and refresh the session catalog (#52286 )	2026-09-30 18:36:56 +05:30
opencode-agent[bot]	c0285b457a	chore(core): refresh bundled models.dev snapshot	2026-09-30 12:25:26 +00:00