fix(ai): never fail decoding on Responses error frames

feat(plugin): add experimental WebSocket send and receive hooks (#49136 )
fix(core): skip session warming for subagents (#49387 )
2026-09-16 22:06:23 +00:00 · 2026-09-16 14:19:23 -05:00 · 2026-09-16 14:13:33 -05:00 · 2026-09-16 13:58:40 -05:00 · 2026-09-16 14:25:43 -04:00 · 2026-09-16 14:25:00 -04:00
70 changed files with 539 additions and 356 deletions
@@ -32,7 +32,7 @@
    },
    "packages/ai": {
      "name": "@opencode/ai",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode/schema": "workspace:*",
@@ -54,7 +54,7 @@
    },
    "packages/app": {
      "name": "@opencode/app",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -113,7 +113,7 @@
    },
    "packages/cli": {
      "name": "@opencode/cli",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "bin": {
        "opencode2": "./bin/opencode2.cjs",
      },
@@ -177,7 +177,7 @@
    },
    "packages/client": {
      "name": "@opencode/client",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/protocol": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -203,7 +203,7 @@
    },
    "packages/codemode": {
      "name": "@opencode/codemode",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -217,7 +217,7 @@
    },
    "packages/console/app": {
      "name": "@opencode/console-app",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -253,7 +253,7 @@
    },
    "packages/console/core": {
      "name": "@opencode/console-core",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -280,7 +280,7 @@
    },
    "packages/console/function": {
      "name": "@opencode/console-function",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@openauthjs/openauth": "0.0.0-20250322224806",
        "@opencode/console-core": "workspace:*",
@@ -297,7 +297,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode/console-mail",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -321,7 +321,7 @@
    },
    "packages/console/support": {
      "name": "@opencode/console-support",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode/console-core": "workspace:*",
@@ -341,7 +341,7 @@
    },
    "packages/core": {
      "name": "@opencode/core",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@ai-sdk/cohere": "3.0.27",
        "@ai-sdk/gateway": "3.0.104",
@@ -409,7 +409,7 @@
    },
    "packages/desktop": {
      "name": "@opencode/desktop",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "electron-context-menu": "4.1.2",
@@ -461,7 +461,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode/enterprise",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/sdk": "1.18.21",
@@ -498,7 +498,7 @@
    },
    "packages/function": {
      "name": "@opencode/function",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -514,7 +514,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode/http-recorder",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@effect/platform-node-shared": "4.0.0-rc.112",
      },
@@ -533,7 +533,7 @@
    },
    "packages/httpapi-codegen": {
      "name": "@opencode/httpapi-codegen",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "effect": "catalog:",
        "prettier": "3.6.2",
@@ -546,7 +546,7 @@
    },
    "packages/latex": {
      "name": "@opencode/latex",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -560,7 +560,7 @@
    },
    "packages/merman": {
      "name": "@opencode/merman",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -575,7 +575,7 @@
    },
    "packages/plugin": {
      "name": "@opencode/plugin",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode/ai": "workspace:*",
@@ -614,7 +614,7 @@
    },
    "packages/plugin-browser": {
      "name": "@opencode/plugin-browser",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -644,7 +644,7 @@
    },
    "packages/protocol": {
      "name": "@opencode/protocol",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/schema": "workspace:*",
        "effect": "catalog:",
@@ -659,7 +659,7 @@
    },
    "packages/schema": {
      "name": "@opencode/schema",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@standard-schema/spec": "catalog:",
        "effect": "catalog:",
@@ -683,7 +683,7 @@
    },
    "packages/sdk": {
      "name": "@opencode/sdk",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -704,7 +704,7 @@
    },
    "packages/server": {
      "name": "@opencode/server",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@effect/platform-node-shared": "catalog:",
@@ -726,7 +726,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode/session-ui",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode/client": "workspace:*",
@@ -761,7 +761,7 @@
    },
    "packages/simulation": {
      "name": "@opencode/simulation",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/ai": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -781,7 +781,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode/stats-app",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -815,7 +815,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode/stats-core",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -834,7 +834,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode/stats-server",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -880,7 +880,7 @@
    },
    "packages/theme": {
      "name": "@opencode/theme",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opentui/core": "catalog:",
        "effect": "catalog:",
@@ -894,7 +894,7 @@
    },
    "packages/tui": {
      "name": "@opencode/tui",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -929,7 +929,7 @@
    },
    "packages/ui": {
      "name": "@opencode/ui",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -964,7 +964,7 @@
    },
    "packages/util": {
      "name": "@opencode/util",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -997,7 +997,7 @@
    },
    "packages/web": {
      "name": "@opencode/web",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1038,7 +1038,7 @@
    },
    "services/update": {
      "name": "@opencode/update",
-      "version": "2.0.4",
+      "version": "2.0.5",
      "dependencies": {
        "jose": "6.0.11",
        "semver": "catalog:",
@@ -2,7 +2,7 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.4.2",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "name": "@opencode/ai",
  "type": "module",
  "license": "MIT",
@@ -73,11 +73,6 @@ const driver = (options: Options, body: string): WebSocketChannelDriver => {
          )
        if (event.type === "error") {
          terminal = true
-          yield* OpenResponses.decodeKnownErrorEvent(event).pipe(
-            Effect.mapError((cause) =>
-              ProviderShared.eventError(options.id, `${options.name} returned a malformed error event`, frame, cause),
-            ),
-          )
          return {
            type: "provider-failure",
            error: OpenResponses.providerFailure(event, `${options.name} stream error`, frame),
@@ -108,7 +108,7 @@ const incremental = (
  return input.slice(baseline.length)
 }

-const code = (event: OpenResponses.Event) => event.code || event.error?.code || event.response?.error?.code || undefined
+const code = (event: OpenResponses.Event) => OpenResponses.errorDetail(event).code

 const rejected = (
  observation: Extract<ChannelObservation, { readonly type: "provider-failure" }>,
@@ -1,4 +1,4 @@
-import { Effect, Option, Schema, SchemaGetter } from "effect"
+import { Effect, Option, Schema } from "effect"
 import type { Content } from "@opencode/schema/tool"
 import { HttpTransport } from "../route/transport/index.js"
 import { Protocol } from "../route/protocol.js"
@@ -333,47 +333,13 @@ export const StreamItem = Schema.StructWithRest(
 export type StreamItem = Schema.Schema.Type<typeof StreamItem>
 export type OutputItem = StreamItem & { readonly id: string }

-// Responses-compatible providers put streaming error details at the top level or
-// under `error`, and response failures under `response.error`. Accept all three shapes.
+// Responses-compatible providers put error details at the top level, under `error`, or under
+// `response.error`, and gateways reshape them freely: strings, numeric codes, extra fields. Those
+// fields decode as opaque values and `errorDetail` reads them defensively, so an error frame can
+// only fail on invalid JSON and otherwise always classifies with the raw body as the fallback.
 // https://www.openresponses.org/specification
-const OpenResponsesErrorPayload = Schema.Struct({
-  type: optionalNull(Schema.String),
-  code: optionalNull(Schema.String),
-  message: optionalNull(Schema.String),
-  param: optionalNull(Schema.String),
-})
-type OpenResponsesErrorPayload = Schema.Schema.Type<typeof OpenResponsesErrorPayload>
-
-const WebSocketErrorHeader = Schema.Union([Schema.String, Schema.Number, Schema.Boolean])
-export const WebSocketErrorEvent = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("error"),
-    status: Schema.optional(Schema.Number),
-    status_code: Schema.optional(Schema.Number),
-    code: optionalNull(Schema.String),
-    message: Schema.optional(Schema.String),
-    param: optionalNull(Schema.String),
-    error: optionalNull(OpenResponsesErrorPayload),
-    headers: Schema.optional(Schema.Record(Schema.String, WebSocketErrorHeader)),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
-const decodeWebSocketErrorEvent = Schema.decodeUnknownEffect(WebSocketErrorEvent)
-
-export const decodeKnownErrorEvent = (event: Event) =>
-  decodeWebSocketErrorEvent({
-    ...event,
-    status: typeof event.status === "number" ? event.status : undefined,
-    status_code: typeof event.status_code === "number" ? event.status_code : undefined,
-    headers: ProviderShared.isRecord(event.headers)
-      ? Object.fromEntries(
-          Object.entries(event.headers).filter(
-            (entry): entry is [string, string | number | boolean] =>
-              typeof entry[1] === "string" || typeof entry[1] === "number" || typeof entry[1] === "boolean",
-          ),
-        )
-      : undefined,
-  })
+const asText = (value: unknown) =>
+  typeof value === "string" && value.length > 0 ? value : typeof value === "number" ? String(value) : undefined

 export const Event = Schema.StructWithRest(
  Schema.Struct({
@@ -394,31 +360,18 @@ export const Event = Schema.StructWithRest(
          incomplete_details: optionalNull(Schema.Struct({ reason: Schema.optional(Schema.String) })),
          output: Schema.optional(Schema.Array(StreamItem)),
          usage: optionalNull(OpenResponsesUsage),
-          error: optionalNull(OpenResponsesErrorPayload),
+          error: Schema.optional(Schema.Unknown),
        }),
        [Schema.Record(Schema.String, Schema.Unknown)],
      ),
    ),
-    code: optionalNull(Schema.String),
-    message: Schema.optional(Schema.String),
-    param: optionalNull(Schema.String),
-    error: optionalNull(OpenResponsesErrorPayload),
+    code: Schema.optional(Schema.Unknown),
+    message: Schema.optional(Schema.Unknown),
+    error: Schema.optional(Schema.Unknown),
    status: Schema.optional(Schema.Unknown),
    status_code: Schema.optional(Schema.Unknown),
-    headers: Schema.optional(Schema.Unknown),
  }),
  [Schema.Record(Schema.String, Schema.Unknown)],
-).pipe(
-  Schema.decode({
-    decode: SchemaGetter.transform((event) => {
-      if (event.type !== "error" || event.error != null) return event
-      const { code, message, param, ...rest } = event
-      if (code === undefined && message === undefined && param === undefined) return event
-      // Flat errors (for example, Meta's) can also arrive through generic Responses endpoints.
-      return { ...rest, error: { code, message, param } }
-    }),
-    encode: SchemaGetter.passthrough(),
-  }),
 )
 export type Event = Schema.Schema.Type<typeof Event>
 export type NormalizedEvent = Event & { readonly item?: OutputItem | null }
@@ -427,14 +380,15 @@ const decodeEventValue = Schema.decodeUnknownEffect(Event)
 const decodeFrame = Schema.decodeUnknownEffect(ProviderShared.Json)

 /**
- * Decodes one WebSocket frame. xAI answers a rejected `response.create` with `{ "error": { "message", "type" } }` and no
- * event type; that envelope reads as an error event so the failure classifies instead of failing decoding.
+ * Decodes one WebSocket frame. Some providers and gateways answer a rejected `response.create` with a bare
+ * `{ "error": ... }` envelope and no event type; that reads as an error event so it classifies instead of
+ * failing decoding.
 */
 export const decodeChannelEvent = (frame: string) =>
  decodeFrame(frame).pipe(
    Effect.flatMap((value) =>
      decodeEventValue(
-        ProviderShared.isRecord(value) && value.type === undefined && ProviderShared.isRecord(value.error)
+        ProviderShared.isRecord(value) && value.type === undefined && value.error != null
          ? { ...value, type: "error" }
          : value,
      ),
@@ -1414,22 +1368,21 @@ const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (
  return [{ ...current, lifecycle }, events] satisfies StepResult
 })

-// Build the prettiest summary available from whatever the provider supplied.
-// When both code and message are present, prefix the code so consumers see
-// the failure mode (e.g. `rate_limit_exceeded: Slow down`) instead of just
-// the bare message — production rate limits and context-length failures used
-// to be indistinguishable from generic stream drops. Returns undefined when
-// the payload carries no usable summary.
-const providerErrorMessage = (event: Event, nested: OpenResponsesErrorPayload | undefined): string | undefined => {
-  const message = event.message || nested?.message || undefined
-  const code = event.code || nested?.code || undefined
-  if (message && code) return `${code}: ${message}`
-  return message || code
+/** Error code and message from wherever the frame put them; top-level fields win over nested ones. */
+export const errorDetail = (event: Event) => {
+  const raw = event.error ?? event.response?.error
+  const nested = typeof raw === "string" ? { message: raw } : ProviderShared.isRecord(raw) ? raw : undefined
+  return {
+    message: asText(event.message) ?? asText(nested?.message),
+    code: asText(event.code) ?? asText(nested?.code),
+  }
 }

+// Prefix the code when both are present (`rate_limit_exceeded: Slow down`) so the failure mode is
+// visible; fall back to the raw frame rather than a generic message when neither decodes.
 export const providerFailure = (event: Event, fallback: string, body = ProviderShared.encodeJson(event)) => {
-  const nested = event.error ?? event.response?.error ?? undefined
-  const summary = providerErrorMessage(event, nested)
+  const detail = errorDetail(event)
+  const summary = detail.message && detail.code ? `${detail.code}: ${detail.message}` : (detail.message ?? detail.code)
  const message = summary ?? (body === "{}" ? fallback : body)
  const status =
    typeof event.status === "number"
@@ -1512,18 +1465,7 @@ export const step = (state: ParserState, event: NormalizedEvent) => {
  if (event.type === "response.output_item.done") return onOutputItemDone(state, event.item)
  if (event.type === "response.completed" || event.type === "response.incomplete") return onResponseFinish(state, event)
  if (event.type === "response.failed") return providerFailure(event, `${state.name} response failed`)
-  if (event.type === "error")
-    return decodeKnownErrorEvent(event).pipe(
-      Effect.mapError((cause) =>
-        ProviderShared.eventError(
-          state.id,
-          `${state.name} returned a malformed error event`,
-          ProviderShared.encodeJson(event),
-          cause,
-        ),
-      ),
-      Effect.flatMap(() => providerFailure(event, `${state.name} stream error`)),
-    )
+  if (event.type === "error") return providerFailure(event, `${state.name} stream error`)
  return Effect.succeed<StepResult>([state, NO_EVENTS])
 }

@@ -1,8 +1,9 @@
 import { expect } from "bun:test"
-import { Effect, Schema } from "effect"
+import { Effect, Schema, Stream } from "effect"
 import { LLM, LLMClient } from "../../src/index.js"
 import { OpenResponses } from "../../src/protocols/open-responses.js"
-import { Meta } from "../../src/providers/index.js"
+import { Azure, Meta, OpenAI, XAI } from "../../src/providers/index.js"
+import { WebSocketTransport } from "../../src/route.js"
 import { configure } from "../../src/providers/openai-compatible-responses.js"
 import { it } from "../lib/effect.js"
 import { fixedResponse } from "../lib/http.js"
@@ -10,45 +11,105 @@ import { sseEvents } from "../lib/sse.js"

 const decodeEvent = Schema.decodeUnknownEffect(OpenResponses.protocol.stream.event)

-it.effect("normalizes flat errors in shared SSE and WebSocket decoding", () =>
+it.effect("decodes error frames verbatim in shared SSE and WebSocket decoding", () =>
  Effect.gen(function* () {
-    const frame = {
-      type: "error",
-      sequence_number: 4,
-      code: "server_shutting_down",
-      message: "Server is shutting down. Please retry your request.",
-      param: null,
-    }
    for (const decode of [decodeEvent, OpenResponses.decodeChannelEvent]) {
-      const event = yield* decode(JSON.stringify(frame))
-      expect(event).toEqual({
-        type: "error",
-        sequence_number: 4,
-        error: { code: frame.code, message: frame.message, param: null },
-      })
-
-      for (const unchanged of [
-        event,
+      for (const frame of [
+        { type: "error", sequence_number: 4, code: "server_shutting_down", message: "Shutting down", param: null },
        { type: "error" },
+        { type: "error", error: "Gateway failed" },
+        { type: "error", error: { code: 429, message: "slow down" } },
+        { type: "error", error: 42 },
+        { type: "error", code: 500, message: ["not", "a", "string"] },
+        { type: "response.failed", response: { id: "resp_failed", error: "Gateway failed" } },
+        { type: "response.failed", response: { id: "resp_failed", error: ["weird"] } },
        {
          type: "response.failed",
          response: { id: "resp_failed", error: { code: "server_error", message: "Internal server error" } },
        },
        { type: "response.output_text.delta", item_id: "msg_text", delta: "Hello" },
      ]) {
-        expect(yield* decode(JSON.stringify(unchanged))).toEqual(unchanged)
+        expect(yield* decode(JSON.stringify(frame))).toEqual(frame)
      }
    }
  }),
 )

-it.effect("continues to normalize untyped xAI WebSocket errors", () =>
+it.effect("reads bare WebSocket error envelopes as error events", () =>
  Effect.gen(function* () {
-    const frame = { error: { type: "api_error", message: "gRPC error: Response with id=resp_missing not found" } }
-    expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame))).toEqual({ ...frame, type: "error" })
+    const message = "gRPC error: Response with id=resp_missing not found"
+    for (const error of [{ type: "api_error", message }, message, 42]) {
+      expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify({ error }))).toEqual({ type: "error", error })
+    }
+    for (const frame of [{ error: null }, { message }]) {
+      expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame)).pipe(Effect.flip)).toBeDefined()
+    }
  }),
 )

+it.effect("extracts error details from every shape and falls back to the raw frame", () =>
+  Effect.gen(function* () {
+    const cases: Array<[frame: Record<string, unknown>, message: string, tag: string]> = [
+      [
+        { type: "error", code: "server_shutting_down", message: "Shutting down" },
+        "server_shutting_down: Shutting down",
+        "UnknownProvider",
+      ],
+      [{ type: "error", error: "Gateway failed" }, "Gateway failed", "UnknownProvider"],
+      [{ type: "error", error: { code: 429, message: "slow down" } }, "429: slow down", "UnknownProvider"],
+      [{ type: "error", error: { message: "slow down" }, status: 429 }, "slow down", "RateLimit"],
+      [{ type: "error", code: 500, message: ["not", "a", "string"] }, "500", "UnknownProvider"],
+      [
+        { type: "response.failed", response: { id: "resp_failed", error: "Gateway failed" } },
+        "Gateway failed",
+        "UnknownProvider",
+      ],
+    ]
+    for (const [frame, message, tag] of cases) {
+      const event = yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame))
+      const error = OpenResponses.providerFailure(event, "fallback", JSON.stringify(frame))
+      expect(error.message).toBe(message)
+      expect(error.reason._tag).toBe(tag)
+      expect(error.reason.body).toBe(JSON.stringify(frame))
+    }
+    for (const frame of [
+      { type: "error", error: 42 },
+      { type: "response.failed", response: { id: "resp_failed", error: ["weird"] } },
+    ]) {
+      const event = yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame))
+      const error = OpenResponses.providerFailure(event, "fallback", JSON.stringify(frame))
+      expect(error.message).toBe(JSON.stringify(frame))
+      expect(error.reason._tag).toBe("UnknownProvider")
+    }
+    expect(OpenResponses.providerFailure({ type: "error" }, "fallback", "{}").message).toBe("fallback")
+    expect(OpenResponses.providerFailure({ type: "error" }, "fallback", "{}").reason._tag).toBe("ProviderInternal")
+  }),
+)
+
+for (const model of [
+  OpenAI.configure({ apiKey: "fixture" }).responses("gpt-5.6-sol"),
+  XAI.configure({ apiKey: "fixture" }).responses("grok-4.6"),
+  Azure.configure({ apiKey: "fixture", resourceName: "fixture" }).responses("deployment"),
+]) {
+  it.effect(`preserves string error messages and raw bodies through ${model.provider} Responses`, () =>
+    Effect.gen(function* () {
+      const raw = '{ "type": "error", "error": "Gateway rejected the request", "trace": "original" }'
+      const webSocket = WebSocketTransport.makeDirect({
+        open: () => Effect.succeed({ sendText: () => Effect.void, messages: Stream.make(raw), close: Effect.void }),
+      })
+      for (const options of [{ webSocket }, {}]) {
+        const error = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" }), options).pipe(
+          Effect.provide(fixedResponse(sseEvents(raw))),
+          Effect.flip,
+        )
+        expect(error.reason._tag).toBe("UnknownProvider")
+        expect(error.message).toBe("Gateway rejected the request")
+        expect(error.reason.body).toBe(raw)
+      }
+    }),
+  )
+}
+
 it.effect("retains classification and original error bodies through Meta and generic Responses routes", () =>
  Effect.gen(function* () {
    const raw = `{
@@ -122,35 +122,6 @@ story("does not mask or pad controls when they fit", async ({ mount }) => {
  await expect(controls).toHaveCSS("padding-inline-end", "0px")
 })

-story("grows suggestions while preserving visible timeline context", async ({ mount }) => {
-  const component = await mount("opencode-composer-flow--constrained-command-suggestions")
-  const boundary = component.locator('[data-slot="composer-suggestion-boundary-story"]')
-  const suggestions = component.locator('[data-component="composer-suggestions"]')
-
-  await expect(suggestions).toHaveCSS("max-height", "166px")
-  await expect(suggestions).toHaveCSS("scroll-padding-bottom", "18px")
-  await expect.poll(() => suggestions.evaluate((element) => element.scrollHeight > element.clientHeight)).toBe(true)
-  await expect
-    .poll(async () => {
-      const menu = await suggestions.boundingBox()
-      const items = await suggestions.locator("[data-suggestion-id]").evaluateAll((elements) =>
-        elements.map((element) => {
-          const rect = element.getBoundingClientRect()
-          return { top: rect.top, bottom: rect.bottom }
-        }),
-      )
-      if (!menu) return false
-      const bottom = menu.y + menu.height
-      return items.some((item) => item.top < bottom && item.bottom > bottom)
-    })
-    .toBe(true)
-
-  await boundary.evaluate((element) => {
-    element.style.height = "400px"
-  })
-  await expect(suggestions).toHaveCSS("max-height", "306px")
-})
-
 // ThemeProvider writes resolved token values into a <style> block, so toggling data-color-scheme by hand
 // leaves every --v2-* variable at its previous value. Switch themes through the Storybook global instead.
 for (const [theme, background] of [
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/app",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "description": "",
  "type": "module",
  "exports": {
@@ -57,8 +57,6 @@ function ComposerStory(props: {
  continueOnStop?: boolean
  longLabels?: boolean
  alternate?: "queue" | "steer"
-  manySuggestions?: boolean
-  suggestionBoundary?: () => HTMLElement | undefined
 }) {
  const [draft, setDraft] = createStore<ComposerPersistedState>({
    prompt: props.prompt ?? [{ type: "text", content: "", start: 0, end: 0 }],
@@ -95,15 +93,6 @@ function ComposerStory(props: {
  const commands: ComposerSuggestion[] = [
    { id: "command.test", kind: "command", label: "/test", trigger: "test", title: "Run tests" },
    { id: "command.review", kind: "command", label: "/review", trigger: "review", title: "Review changes" },
-    ...(props.manySuggestions
-      ? Array.from({ length: 12 }, (_, index) => ({
-          id: `command.example-${index}`,
-          kind: "command" as const,
-          label: `/example-${index}`,
-          trigger: `example-${index}`,
-          title: `Run example ${index}`,
-        }))
-      : []),
  ]
  const context: ComposerSuggestion[] = [
    {
@@ -217,7 +206,7 @@ function ComposerStory(props: {
      <output class="text-12-regular text-text-weak" aria-live="polite">
        {story.activity}
      </output>
-      <Composer model={model} borderUnderlay suggestionBoundary={props.suggestionBoundary} />
+      <Composer model={model} borderUnderlay />
    </div>
  )
 }
@@ -284,18 +273,6 @@ export const SlashSuggestions = { render: () => <ComposerStory suggestions="comm

 export const ContextSuggestions = { render: () => <ComposerStory suggestions="context" /> }

-function ConstrainedCommandSuggestionsStory() {
-  let boundary: HTMLDivElement | undefined
-  return (
-    <div class="mx-auto w-full max-w-200">
-      <div ref={boundary} data-slot="composer-suggestion-boundary-story" class="h-60" />
-      <ComposerStory suggestions="command" manySuggestions suggestionBoundary={() => boundary} />
-    </div>
-  )
-}
-
-export const ConstrainedCommandSuggestions = { render: () => <ConstrainedCommandSuggestionsStory /> }
-
 export const RunningAndStopping = { render: () => <ComposerStory working stopping label="Session is running" /> }

 export const SteeringFollowUp = {
@@ -12,12 +12,7 @@ import { formatKeybind, useCommand } from "@/shell/commands/command"
 import { useLanguage } from "@/runtime/i18n/language"
 import type { ComposerModel } from "./model"

-export function Composer(props: {
-  class?: string
-  model: ComposerModel
-  borderUnderlay?: boolean
-  suggestionBoundary?: () => HTMLElement | undefined
-}) {
+export function Composer(props: { class?: string; model: ComposerModel; borderUnderlay?: boolean }) {
  const dialog = useDialog()
  const command = useCommand()
  const language = useLanguage()
@@ -33,7 +28,6 @@ export function Composer(props: {
        attachShortcut={command.keybind("file.attach")}
        alternateKeybind={[formatKeybind("mod", language.t), "↵"]}
        exitShellKeybind={[formatKeybind("esc", language.t)]}
-        suggestionBoundary={props.suggestionBoundary}
        modelControl={
          <ComposerModelControl
            loading={props.model.model.loading}
@@ -1,6 +1,5 @@
 import { createEffect, createMemo, createSignal, For, onCleanup, onMount, Show, type JSX } from "solid-js"
 import { createStore } from "solid-js/store"
-import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { FileIcon } from "@opencode/ui/file-icon"
 import { Icon } from "@opencode/ui/icon"
 import { IconButton } from "@opencode/ui/icon-button"
@@ -37,12 +36,6 @@ export type {
 } from "../types"

 export type ComposerMode = "normal" | "shell"
-const COMPOSER_SUGGESTION_MAX_HEIGHT = 320
-const COMPOSER_SUGGESTION_ROW_HEIGHT = 28
-const COMPOSER_SUGGESTION_ROW_PEEK = 18
-const COMPOSER_SUGGESTION_TOP_PADDING = 8
-const COMPOSER_SUGGESTION_SEARCH_HEIGHT = 28
-const COMPOSER_SUGGESTION_CONTEXT_RESERVE = 80

 export type ComposerEditorProps = {
  controller: ComposerEditorModel
@@ -56,7 +49,6 @@ export type ComposerEditorProps = {
  attachShortcut?: string
  alternateKeybind?: string[]
  exitShellKeybind?: string[]
-  suggestionBoundary?: () => HTMLElement | undefined
 }

 export function ComposerEditor(props: ComposerEditorProps) {
@@ -122,7 +114,6 @@ export function ComposerEditor(props: ComposerEditorProps) {
        <ComposerEditorPopover
          emptyLabel={i18n.t("ui.promptInput.noMatchingItems")}
          items={props.controller.suggestions()}
-          boundary={props.suggestionBoundary}
          activeID={state.popover.type === "closed" ? undefined : state.popover.activeID}
          search={
            state.popover.type === "command-menu"
@@ -726,29 +717,18 @@ export function ComposerEditorPopover(props: {
    onValueChange: (value: string) => void
    onKeyDown: (event: KeyboardEvent) => void
  }
-  boundary?: () => HTMLElement | undefined
  onActiveChange: (item: ComposerSuggestion) => void
  onSelect: (item: ComposerSuggestion) => void
 }) {
-  const [store, setStore] = createStore({ maxHeight: COMPOSER_SUGGESTION_MAX_HEIGHT })
-  const resize = (height: number) =>
-    setStore("maxHeight", composerSuggestionMaxHeight(height, props.search !== undefined))
-  createEffect(() => resize(props.boundary?.()?.clientHeight ?? COMPOSER_SUGGESTION_MAX_HEIGHT * 2))
-  createResizeObserver(
-    props.boundary ?? (() => undefined),
-    (rect) => resize(rect.height),
-  )
-
  return (
    <div
      data-component="composer-suggestions"
-      class="absolute inset-x-0 -top-2 z-40 flex -translate-y-full scroll-pb-[18px] flex-col overflow-auto rounded-xl bg-v2-background-bg-base p-2 shadow-[var(--v2-elevation-raised)] no-scrollbar"
-      style={{ "max-height": `${store.maxHeight}px` }}
+      class="absolute inset-x-0 -top-2 z-40 flex max-h-80 -translate-y-full flex-col overflow-auto rounded-xl bg-v2-background-bg-base p-2 shadow-[var(--v2-elevation-raised)] no-scrollbar"
      onMouseDown={(event) => event.preventDefault()}
    >
      <Show when={props.search}>
        {(search) => (
-          <div class="shrink-0 px-2 py-1">
+          <div class="px-2 py-1">
            <input
              ref={(element) => requestAnimationFrame(() => element.focus())}
              value={search().value}
@@ -772,7 +752,7 @@ export function ComposerEditorPopover(props: {
              type="button"
              data-suggestion-id={item.id}
              data-active={props.activeID === item.id ? "" : undefined}
-              class="flex h-7 w-full shrink-0 items-center gap-2 rounded-md px-2 py-1 text-start hover:bg-v2-overlay-simple-overlay-hover"
+              class="flex w-full items-center gap-2 rounded-md px-2 py-1 text-start hover:bg-v2-overlay-simple-overlay-hover"
              classList={{ "bg-v2-overlay-simple-overlay-hover": props.activeID === item.id }}
              onPointerMove={() => props.onActiveChange(item)}
              onClick={() => props.onSelect(item)}
@@ -797,19 +777,6 @@ export function ComposerEditorPopover(props: {
  )
 }

-function composerSuggestionMaxHeight(boundaryHeight: number, search: boolean) {
-  const reserve = Math.min(COMPOSER_SUGGESTION_CONTEXT_RESERVE, boundaryHeight / 4)
-  const limit = Math.min(COMPOSER_SUGGESTION_MAX_HEIGHT, boundaryHeight - reserve)
-  const chrome = COMPOSER_SUGGESTION_TOP_PADDING + (search ? COMPOSER_SUGGESTION_SEARCH_HEIGHT : 0)
-  if (limit < chrome + COMPOSER_SUGGESTION_ROW_HEIGHT + COMPOSER_SUGGESTION_ROW_PEEK) return limit
-  return (
-    chrome +
-    Math.floor((limit - chrome - COMPOSER_SUGGESTION_ROW_PEEK) / COMPOSER_SUGGESTION_ROW_HEIGHT) *
-      COMPOSER_SUGGESTION_ROW_HEIGHT +
-    COMPOSER_SUGGESTION_ROW_PEEK
-  )
-}
-
 // "Steer ⌘⏎" / "Queue ⌘⏎" hint next to the submit button: submits with the
 // delivery opposite to what plain Enter does. Visible only while the queue
 // exposes an alternate (turn running and composer holding a value), so it
@@ -213,10 +213,7 @@ export function createActiveSessionRegion(input: {

 export type ActiveSessionRegionModel = ReturnType<typeof createActiveSessionRegion>

-export function ActiveSessionComposerRegion(props: {
-  model: SessionComposerController
-  suggestionBoundary: () => HTMLElement | undefined
-}) {
+export function ActiveSessionComposerRegion(props: { model: SessionComposerController }) {
  return (
    <SessionComposerRegion
      controller={props.model.region}
@@ -224,7 +221,7 @@ export function ActiveSessionComposerRegion(props: {
        <div class="relative">
          <SessionQueuePanel queue={props.model.queue} />
          <div class="relative z-10">
-            <Composer model={props.model.composer} borderUnderlay suggestionBoundary={props.suggestionBoundary} />
+            <Composer model={props.model.composer} borderUnderlay />
          </div>
        </div>
      }
@@ -325,7 +325,7 @@ export function SessionScreen(props: { session: SessionModel }) {
      </div>

      <Show when={composer.active()} keyed>
-        {(model) => <ActiveSessionComposerRegion model={model} suggestionBoundary={timeline.scroller} />}
+        {(model) => <ActiveSessionComposerRegion model={model} />}
      </Show>
    </>
  )
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/cli",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/client",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/codemode",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "description": "Effect-native confined code execution over schema-described tools",
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-app",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/console-core",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-function",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-mail",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-support",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "name": "@opencode/core",
  "type": "module",
  "license": "MIT",
@@ -167,7 +167,8 @@ export const AzurePlugin = define({
                draft.settings.baseURL,
                resolveResourceName(draft.settings, resourceName) ?? resourceName,
              )
-            if (responsesWebSocketCapable(item.provider, draft)) draft.transport = "websocket"
+            if (responsesWebSocketCapable(item.provider, draft))
+              draft.transport = item.provider.transport ?? "websocket"
          })
        }
      }
@@ -270,7 +270,7 @@ export const OpenAIPlugin = define({
        // ChatGPT-plan tokens only authorize codex-eligible models, and the
        // subscription covers usage, so hide the rest and zero the cost.
        models.update(model.providerID, model.id, (draft) => {
-          draft.transport = "websocket"
+          draft.transport = models.provider.get(model.providerID)?.provider.transport ?? "websocket"
          if (!chatgpt) return
          if (Schema.is(Schema.Struct({ mode: Schema.Literal("pro") }))(draft.body?.reasoning)) {
            draft.enabled = false
@@ -98,7 +98,7 @@ export const XAIPlugin = define({
    yield* ctx.model.transform((models) => {
      for (const model of models.list(providerID)) {
        models.update(providerID, model.id, (draft) => {
-          draft.transport = "websocket"
+          draft.transport = models.provider.get(providerID)?.provider.transport ?? "websocket"
        })
      }
    })
@@ -57,6 +57,9 @@ export const Plugin = define({

    const hook = (event: SessionHooks["context"]) =>
      Effect.gen(function* () {
+        const session = yield* ctx.session.get({ sessionID: event.sessionID }).pipe(Effect.orDie)
+        if (session.parentID) return
+
        const active = sessions.get(event.sessionID)
        const settings = yield* loadSettings()
        if (!settings) {
@@ -100,7 +100,6 @@ export const layer = (options?: Options) =>
      const recoverShell = Effect.fnUntraced(function* (
        background: Job.Background,
        recovery: Extract<Job.Recovery, { kind: "shell" }>,
-        suspended: ReadonlySet<SessionSchema.ID>,
      ) {
        const state = background.status === "running" ? "cancelled" : background.status
        const text =
@@ -124,7 +123,9 @@ export const layer = (options?: Options) =>
              state,
              text,
            }),
-            ...(suspended.has(recovery.sessionID) ? { resume: false } : {}),
+            // Restart notices must not revive idle owners of long-lived shells.
+            // Interrupted executions resume separately after their notices are admitted.
+            resume: false,
          })
          .pipe(
            Effect.catchTag("Session.NotFoundError", () => Effect.void),
@@ -208,7 +209,7 @@ export const layer = (options?: Options) =>
              if ((yield* jobs.get(background.id))?.status === "running") return
              const recovery = background.recovery
              yield* recovery.kind === "shell"
-                ? recoverShell(background, recovery, suspended)
+                ? recoverShell(background, recovery)
                : recoverSubagent(background, recovery, suspended)
            }),
            { discard: true },
@@ -320,15 +320,24 @@ export const layer = Layer.effect(
      // which transport actually carries the request, so both hook families are always offered.
      const webSocket =
        input.webSocket === "session" && model.transport === "websocket"
-          ? transport.bind(session.id, (connect) =>
-              hooks
-                .trigger("session", "experimental.ws.handshake", {
-                  ...scope,
-                  url: connect.url,
-                  headers: connect.headers,
-                })
-                .pipe(Effect.map((event) => ({ url: event.url, headers: event.headers }))),
-            )
+          ? transport.bind(session.id, {
+              handshake: (connect) =>
+                hooks
+                  .trigger("session", "experimental.ws.handshake", {
+                    ...scope,
+                    url: connect.url,
+                    headers: connect.headers,
+                  })
+                  .pipe(Effect.map((event) => ({ url: event.url, headers: event.headers }))),
+              send: (frame) =>
+                hooks
+                  .trigger("session", "experimental.ws.send", { ...scope, frame })
+                  .pipe(Effect.map((event) => event.frame)),
+              receive: (frame) =>
+                hooks
+                  .trigger("session", "experimental.ws.receive", { ...scope, frame })
+                  .pipe(Effect.map((event) => event.frame)),
+            })
          : undefined

      return {
@@ -59,11 +59,18 @@ export interface Handshake {
  readonly headers: Record<string, string>
 }

+/**
+ * Per-exchange taps. `handshake` runs before the connection is selected; `send` sees each outbound
+ * frame after the driver builds it; `receive` sees each inbound frame before the driver observes it.
+ */
+export interface Interceptor {
+  readonly handshake?: (connect: Handshake) => Effect.Effect<Handshake>
+  readonly send?: (frame: string) => Effect.Effect<string>
+  readonly receive?: (frame: string) => Effect.Effect<string>
+}
+
 export interface Interface {
-  readonly bind: (
-    sessionID: SessionSchema.ID,
-    handshake?: (connect: Handshake) => Effect.Effect<Handshake>,
-  ) => WebSocketChannelExecutor
+  readonly bind: (sessionID: SessionSchema.ID, interceptor?: Interceptor) => WebSocketChannelExecutor
  readonly close: (sessionID: SessionSchema.ID) => Effect.Effect<void>
  readonly closeAll: Effect.Effect<void>
 }
@@ -278,7 +285,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
      const start = Effect.fn("SessionModelTransport.start")(function* (
        owner: State,
        input: WebSocketChannelExchange,
-        handshake?: (connect: Handshake) => Effect.Effect<Handshake>,
+        interceptor?: Interceptor,
      ) {
        if (owner.closed)
          return yield* transportError("Session WebSocket owner is closed", {
@@ -288,8 +295,8 @@ export const makeLayer = (connector: WebSocketConnector) =>
            delivery: "not-sent",
          })
        if (owner.httpFallback) return fallback(input)
-        const selected = handshake
-          ? yield* handshake({ url: input.connect.url, headers: { ...input.connect.headers } })
+        const selected = interceptor?.handshake
+          ? yield* interceptor.handshake({ url: input.connect.url, headers: { ...input.connect.headers } })
          : undefined
        const exchange: WebSocketChannelExchange = selected
          ? { ...input, connect: { ...input.connect, url: selected.url, headers: Headers.fromInput(selected.headers) } }
@@ -354,6 +361,9 @@ export const makeLayer = (connector: WebSocketConnector) =>
          Effect.onInterrupt(() => closeChannel(owner, channel)),
        )
        if (create.mode === "full") channel.checkpoint = undefined
+        const message = interceptor?.send
+          ? yield* interceptor.send(create.message).pipe(Effect.onInterrupt(() => closeChannel(owner, channel)))
+          : create.message
        yield* Effect.logDebug("session websocket sending", {
          sessionTransport: "websocket",
          phase: "send",
@@ -364,7 +374,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
          delivery: "send-attempted",
        }
        channel.active = active
-        const sent = yield* channel.connection.sendText(create.message).pipe(
+        const sent = yield* channel.connection.sendText(message).pipe(
          Effect.withSpan("SessionModelTransport.send"),
          Effect.onInterrupt(() => closeChannel(owner, channel)),
          Effect.result,
@@ -405,6 +415,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
                }),
              ),
          }),
+          Stream.mapEffect((frame) => (interceptor?.receive ? interceptor.receive(frame) : Effect.succeed(frame))),
          Stream.mapEffect((frame) => exchange.driver.observe(create, frame)),
          Stream.tap((observation) =>
            Effect.sync(() => {
@@ -482,10 +493,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
        return { frames, complete, http: channel.connection.http }
      })

-      const bind = (
-        sessionID: SessionSchema.ID,
-        handshake?: (connect: Handshake) => Effect.Effect<Handshake>,
-      ): WebSocketChannelExecutor => ({
+      const bind = (sessionID: SessionSchema.ID, interceptor?: Interceptor): WebSocketChannelExecutor => ({
        execute: (exchange) => {
          const owner = state(sessionID)
          let execution: WebSocketChannelExecution | undefined
@@ -495,7 +503,7 @@ export const makeLayer = (connector: WebSocketConnector) =>
            },
            frames: Stream.unwrap(
              Effect.acquireRelease(owner.lock.take(1), () => owner.lock.release(1), { interruptible: true }).pipe(
-                Effect.andThen(start(owner, exchange, handshake)),
+                Effect.andThen(start(owner, exchange, interceptor)),
                Effect.tap((started) =>
                  Effect.sync(() => {
                    execution = started
@@ -10,6 +10,9 @@ import { Model } from "@opencode/core/model"
 import { ModelResolver } from "@opencode/core/model-resolver"
 import { Plugin } from "@opencode/core/plugin"
 import { PluginHost } from "@opencode/core/plugin/host"
+import { AzurePlugin } from "@opencode/core/plugin/provider/azure"
+import { OpenAIPlugin } from "@opencode/core/plugin/provider/openai"
+import { XAIPlugin } from "@opencode/core/plugin/provider/xai"
 import { Provider } from "@opencode/core/provider"
 import { withEnv } from "../fixture/env"
 import { testEffect } from "../lib/effect"
@@ -106,6 +109,50 @@ describe("ConfigProviderPlugin.Plugin", () => {
    }),
  )

+  for (const builtin of [
+    { id: "openai", model: "gpt-5.6-sol", package: "@opencode/ai/providers/openai/responses", plugin: OpenAIPlugin },
+    { id: "xai", model: "grok-4.6", package: "@opencode/ai/providers/xai", plugin: XAIPlugin },
+    { id: "azure", model: "gpt-5.6-sol", package: "@opencode/ai/providers/azure/responses", plugin: AzurePlugin },
+    { id: "custom-azure", model: "deployment", package: "@opencode/ai/providers/azure/responses", plugin: AzurePlugin },
+  ]) {
+    it.live(`provider transport overrides ${builtin.id} defaults while model overrides still win`, () =>
+      Effect.gen(function* () {
+        const providers = yield* Provider.Service
+        const models = yield* Model.Service
+        const plugin = yield* Plugin.Service
+        const host = yield* PluginHost.make(plugin)
+        const providerID = Provider.ID.make(builtin.id)
+        const modelID = Model.ID.make(builtin.model)
+        yield* providers.transform((editor) => {
+          editor.update(providerID, (provider) => {
+            provider.activation = "enabled"
+            provider.package = builtin.package
+          })
+          editor.models.update(providerID, modelID, () => {})
+        })
+        yield* builtin.plugin.effect(host)
+        expect((yield* models.get(providerID, modelID))?.transport).toBe("websocket")
+
+        yield* addPlugin([
+          new Document({
+            type: "document",
+            info: decode({
+              providers: {
+                [builtin.id]: {
+                  transport: "http",
+                  models: { override: { modelID: builtin.model, transport: "websocket" } },
+                },
+              },
+            }),
+          }),
+        ])
+
+        expect((yield* models.get(providerID, modelID))?.transport).toBe("http")
+        expect((yield* models.get(providerID, Model.ID.make("override")))?.transport).toBe("websocket")
+      }),
+    )
+  }
+
  it.effect("adds key auth for custom providers without env credentials", () =>
    Effect.gen(function* () {
      const integrations = yield* Integration.Service
@@ -379,7 +379,7 @@ describe("SessionExecution lifecycle", () => {
 })

 describe("SessionRestart background recovery", () => {
-  it.effect("wakes idle shell owners and delivers recovered notices exactly once", () =>
+  it.effect("keeps shell owners idle until a user prompt delivers recovered notices exactly once", () =>
    Effect.gen(function* () {
      const database = yield* Database.Service
      const store = yield* SessionStore.Service
@@ -416,6 +416,20 @@ describe("SessionRestart background recovery", () => {
      yield* restart.resumeSuspendedSessions
      yield* Effect.forEach([parent, child], execution.awaitIdle, { discard: true })

+      expect(drained).toEqual([])
+      expect(yield* SessionInbox.list(database.db, parent)).toHaveLength(1)
+      expect(yield* SessionInbox.list(database.db, child)).toHaveLength(1)
+      expect(yield* restarted.pendingBackground).toEqual([])
+      yield* restart.resumeSuspendedSessions
+      expect(drained).toEqual([])
+      expect(yield* SessionInbox.list(database.db, parent)).toHaveLength(1)
+      expect(yield* SessionInbox.list(database.db, child)).toHaveLength(1)
+
+      yield* seedInbox(database, parent, ["steer"])
+      yield* seedInbox(database, child, ["steer"])
+      yield* execution.wake(parent)
+      yield* execution.wake(child)
+      yield* Effect.forEach([parent, child], execution.awaitIdle, { discard: true })
      expect(drained.toSorted()).toEqual([parent, child].toSorted())
      expect((yield* store.context(parent)).filter((message) => message.type === "synthetic")).toMatchObject([
        {
@@ -509,7 +523,7 @@ describe("SessionRestart background recovery", () => {
      yield* Context.get(context, SessionRestart.Service).resumeSuspendedSessions
      yield* Context.get(context, SessionExecution.Service).awaitIdle(sessionID)

-      expect(drained).toEqual([sessionID])
+      expect(drained).toEqual([])
      const inbox = yield* SessionInbox.list(database.db, sessionID)
      expect(inbox).toMatchObject([
        {
@@ -561,7 +575,6 @@ describe("SessionRestart background recovery", () => {
        expect(yield* restarted.pendingBackground).toEqual([])
        expect(yield* SessionInbox.list(database.db, sessionID)).toHaveLength(delivered ? 0 : 1)
        yield* SessionInbox.promote(database.db, bus, sessionID, "steer")
-        // Recovery ends a busy period, so an idle marker follows the notification.
        const messages = (yield* sessions.messages({ sessionID })).filter((message) => message.type !== "idle")
        expect(messages).toMatchObject([
          {
@@ -80,7 +80,7 @@ describe("SessionModelRequest HTTP hooks", () => {
    }).pipe(Effect.provideService(SessionModelTransport.Service, transport)),
  )

-  it.effect("offers the WebSocket executor alongside HTTP hooks and routes the handshake hook", () =>
+  it.effect("offers the WebSocket executor alongside HTTP hooks and routes the WebSocket hooks", () =>
    Effect.gen(function* () {
      const hooks = yield* PluginHooks.Service
      const seen: string[] = []
@@ -92,13 +92,31 @@ describe("SessionModelRequest HTTP hooks", () => {
          delete event.headers["api-key"]
        }),
      )
+      yield* hooks.register("session", "experimental.ws.send", (event) =>
+        Effect.sync(() => {
+          seen.push(`send:${event.kind}:${event.frame}`)
+          event.frame = `${event.frame}+plugin`
+        }),
+      )
+      yield* hooks.register("session", "experimental.ws.receive", (event) =>
+        Effect.sync(() => {
+          seen.push(`receive:${event.kind}:${event.frame}`)
+          event.frame = event.frame.toUpperCase()
+        }),
+      )
      const bound: Array<{ url: string; headers: Record<string, string> }> = []
+      const frames: string[] = []
      const websocketTransport = SessionModelTransport.Service.of({
-        bind: (_sessionID, handshake) => ({
+        bind: (_sessionID, interceptor) => ({
          execute: () =>
            Effect.gen(function* () {
-              if (!handshake) throw new Error("Expected a handshake interceptor")
-              bound.push(yield* handshake({ url: "wss://example.test/v1/responses", headers: { "api-key": "k" } }))
+              if (!interceptor?.handshake || !interceptor.send || !interceptor.receive)
+                throw new Error("Expected a full WebSocket interceptor")
+              bound.push(
+                yield* interceptor.handshake({ url: "wss://example.test/v1/responses", headers: { "api-key": "k" } }),
+              )
+              frames.push(yield* interceptor.send("create"))
+              frames.push(yield* interceptor.receive("created"))
              return { frames: Stream.empty, complete: Effect.void }
            }),
        }),
@@ -127,7 +145,12 @@ describe("SessionModelRequest HTTP hooks", () => {
      expect(prepared.options.webSocket).toBeDefined()
      yield* prepared.options.webSocket!.execute({} as never)
      expect(bound).toEqual([{ url: "wss://example.test/v1/responses", headers: { authorization: "Bearer minted" } }])
-      expect(seen).toEqual(["handshake:primary:wss://example.test/v1/responses"])
+      expect(frames).toEqual(["create+plugin", "CREATED"])
+      expect(seen).toEqual([
+        "handshake:primary:wss://example.test/v1/responses",
+        "send:primary:create",
+        "receive:primary:created",
+      ])
    }),
  )
 })
@@ -178,12 +178,13 @@ describe("SessionModelTransport", () => {
      fixture.connector,
      Effect.gen(function* () {
        const transport = yield* SessionModelTransport.Service
-        const executor = transport.bind(session, (connect) =>
-          Effect.succeed({
-            url: connect.url,
-            headers: { ...connect.headers, authorization: `Bearer ${tokens.shift()}` },
-          }),
-        )
+        const executor = transport.bind(session, {
+          handshake: (connect) =>
+            Effect.succeed({
+              url: connect.url,
+              headers: { ...connect.headers, authorization: `Bearer ${tokens.shift()}` },
+            }),
+        })
        yield* collect(executor, exchange("first", { headers: { "api-key": "k" } }))
        yield* collect(executor, exchange("second", { headers: { "api-key": "k" } }))
        yield* collect(executor, exchange("third", { headers: { "api-key": "k" } }))
@@ -196,6 +197,36 @@ describe("SessionModelTransport", () => {
    )
  })

+  test("sends the frame the send tap returns and observes the frame the receive tap returns", async () => {
+    const fixture = automatic()
+    const seen: Array<{ tap: "send" | "receive"; frame: string }> = []
+    await run(
+      fixture.connector,
+      Effect.gen(function* () {
+        const transport = yield* SessionModelTransport.Service
+        const executor = transport.bind(session, {
+          send: (frame) => {
+            seen.push({ tap: "send", frame })
+            return Effect.succeed(`${frame}:rewritten`)
+          },
+          receive: (frame) => {
+            seen.push({ tap: "receive", frame })
+            return Effect.succeed(`${frame}:observed`)
+          },
+        })
+        const frames = yield* collect(executor, exchange("first"))
+
+        // The wire carries the rewritten outbound frame; the driver sees the rewritten inbound frame.
+        expect(fixture.connections.map((item) => item.sent)).toEqual([["first:rewritten"]])
+        expect(frames).toEqual(["completed:first:rewritten:observed"])
+        expect(seen).toEqual([
+          { tap: "send", frame: "first" },
+          { tap: "receive", frame: "completed:first:rewritten" },
+        ])
+      }),
+    )
+  })
+
  test("does not carry a checkpoint across physical connection rotation", async () => {
    const fixture = automatic()
    const checkpoints: Array<unknown> = []
@@ -1,7 +1,7 @@
 {
  "name": "@opencode/desktop",
  "private": true,
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/enterprise",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/function",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "name": "@opencode/http-recorder",
  "description": "Record and replay Effect HTTP and WebSocket traffic with deterministic cassettes",
  "type": "module",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/httpapi-codegen",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/latex",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/merman",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "exports": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/plugin-browser",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "description": "OpenCode's desktop browser plugin",
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/plugin",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -99,6 +99,31 @@ export interface SessionWebSocketHandshake {
  headers: Record<string, string>
 }

+/**
+ * Outbound frame about to be written to the Session's socket, after the provider driver has built
+ * it. Replacing `frame` sends the replacement verbatim; the driver still tracks state from the
+ * provider's replies, so a rewrite that changes protocol meaning is on the plugin. Experimental.
+ */
+export interface SessionWebSocketSend {
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
+  readonly model: Model.Ref
+  readonly kind: SessionRequestKind
+  frame: string
+}
+
+/**
+ * Inbound frame read from the Session's socket, before the provider driver observes it. Replacing
+ * `frame` hands the replacement to the driver verbatim. Experimental.
+ */
+export interface SessionWebSocketReceive {
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
+  readonly model: Model.Ref
+  readonly kind: SessionRequestKind
+  frame: string
+}
+
 export type SessionRetryDecision = { retry: false } | { retry: true; delay: number }

 export interface SessionRetry {
@@ -120,6 +145,8 @@ export interface SessionHooks {
  readonly "http.request": SessionHttpRequest
  readonly "http.response": SessionHttpResponse
  readonly "experimental.ws.handshake": SessionWebSocketHandshake
+  readonly "experimental.ws.send": SessionWebSocketSend
+  readonly "experimental.ws.receive": SessionWebSocketReceive
  readonly retry: SessionRetry
 }

@@ -99,6 +99,31 @@ export interface SessionWebSocketHandshake {
  headers: Record<string, string>
 }

+/**
+ * Outbound frame about to be written to the Session's socket, after the provider driver has built
+ * it. Replacing `frame` sends the replacement verbatim; the driver still tracks state from the
+ * provider's replies, so a rewrite that changes protocol meaning is on the plugin. Experimental.
+ */
+export interface SessionWebSocketSend {
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
+  readonly model: Model.Ref
+  readonly kind: SessionRequestKind
+  frame: string
+}
+
+/**
+ * Inbound frame read from the Session's socket, before the provider driver observes it. Replacing
+ * `frame` hands the replacement to the driver verbatim. Experimental.
+ */
+export interface SessionWebSocketReceive {
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
+  readonly model: Model.Ref
+  readonly kind: SessionRequestKind
+  frame: string
+}
+
 export type SessionRetryDecision = { retry: false } | { retry: true; delay: number }

 export interface SessionRetry {
@@ -120,6 +145,8 @@ export interface SessionHooks {
  readonly "http.request": SessionHttpRequest
  readonly "http.response": SessionHttpResponse
  readonly "experimental.ws.handshake": SessionWebSocketHandshake
+  readonly "experimental.ws.send": SessionWebSocketSend
+  readonly "experimental.ws.receive": SessionWebSocketReceive
  readonly retry: SessionRetry
 }

@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/protocol",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/schema",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "name": "@opencode/sdk",
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/server",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/session-ui",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/simulation",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/stats-app",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/stats-core",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { toGeoAggregate, toModelAggregate, toProviderAggregate } from "./inference"
+import { buildStatsQuery, toGeoAggregate, toModelAggregate, toProviderAggregate } from "./inference"
 import { modelAuthor, normalizeInferenceModel, statModel, statProvider } from "./model-normalization"

 describe("inference stat normalization", () => {
@@ -38,6 +38,22 @@ describe("inference stat normalization", () => {
    expect(statProvider("unknown", "", "custom-provider")).toBe("custom-provider")
  })

+  test("merges union alpha routes without exposing the provider", () => {
+    ;["opencode-go/union-alpha", "opencode/union-alpha"].forEach((model) => {
+      expect(statModel(model, "")).toBe("union-alpha")
+      expect(statProvider(model, "gpt-test-model", "test-provider")).toBe("unknown")
+      expect(
+        toModelAggregate({ ...aggregate(model, "test-provider"), provider_model: "gpt-test-model" }),
+      ).toMatchObject([{ model: "union-alpha", provider: "unknown", requests: 1 }])
+      expect(toProviderAggregate(aggregate(model, "test-provider"))).toMatchObject([
+        { provider: "unknown", requests: 1 },
+      ])
+      expect(toGeoAggregate({ ...aggregate(model, "test-provider"), country: "US" })).toMatchObject([
+        { model: "union-alpha", provider: "unknown", country: "US", requests: 1 },
+      ])
+    })
+  })
+
  test("merges renamed models under their current name", () => {
    expect(statModel("deepseek-flash", "")).toBe("deepseek-v4.1-flash")
    expect(statModel("x-preview-f", "")).toBe("ox-alpha")
@@ -94,6 +110,20 @@ describe("inference stat normalization", () => {
      }),
    ).toMatchObject([{ period_key: "2026-W20" }])
  })
+
+  test("normalizes union alpha routes in stat queries", () => {
+    process.env.SST_RESOURCE_InferenceEvent = JSON.stringify({
+      catalog: "inference",
+      database: "events",
+      table: "generation",
+    })
+    process.env.SST_RESOURCE_StatsSyncConfig = JSON.stringify({ dataset: "zen" })
+    const query = buildStatsQuery(new Date("2026-05-20T00:00:00.000Z"), new Date("2026-05-21T00:00:00.000Z"))
+
+    expect(query).toContain("WHEN lower(model) = 'opencode-go/union-alpha' THEN 'union-alpha'")
+    expect(query).toContain("WHEN lower(model) = 'opencode/union-alpha' THEN 'union-alpha'")
+    expect(query).toContain("WHEN lower(model) IN ('omen-alpha', 'union-alpha') THEN 'unknown'")
+  })
 })

 function aggregate(model: string, provider: string) {
@@ -7,6 +7,7 @@ import {
  MODEL_AUTHOR_RULES,
  MODEL_NAME_ALIASES,
  RETIRED_STAT_PROVIDERS,
+  STEALTH_MODELS,
  statModel,
  statProvider,
 } from "./model-normalization"
@@ -263,6 +264,7 @@ ${Object.entries(MODEL_NAME_ALIASES)

 function statProviderSql(model: string, providerModel: string, provider: string) {
  return `CASE
+      WHEN lower(${model}) IN (${[...STEALTH_MODELS].map(sqlString).join(", ")}) THEN 'unknown'
 ${MODEL_AUTHOR_RULES.map((item) => `      WHEN strpos(lower(${providerModel}), ${sqlString(item.match)}) > 0 THEN ${sqlString(item.author)}`).join("\n")}
 ${MODEL_AUTHOR_RULES.map((item) => `      WHEN strpos(lower(${model}), ${sqlString(item.match)}) > 0 THEN ${sqlString(item.author)}`).join("\n")}
      WHEN ${provider} <> '' AND lower(${provider}) NOT IN (${RETIRED_STAT_PROVIDERS.map(sqlString).join(", ")}) THEN ${provider}
@@ -13,8 +13,11 @@ export const MODEL_AUTHOR_RULES = [
  { match: "qwen", author: "qwen" },
 ] as const
 export const EXCLUDED_MODELS = new Set(["alpha-gpt-next"])
+export const STEALTH_MODELS = new Set(["omen-alpha", "union-alpha"])
 export const MODEL_NAME_ALIASES: Record<string, string> = {
  "deepseek-flash": "deepseek-v4.1-flash",
+  "opencode-go/union-alpha": "union-alpha",
+  "opencode/union-alpha": "union-alpha",
  "x-preview-f": "ox-alpha",
  "xiaomi/mimo-v2.5": "mimo-v2.5",
 }
@@ -45,7 +48,10 @@ export function statProvider(
  providerModel: string | undefined,
  provider: string | undefined,
 ) {
-  const modelAuthorValue = modelAuthor(statModel(model, providerModel))
+  const normalized = statModel(model, providerModel)
+  if (STEALTH_MODELS.has(normalized.toLowerCase())) return "unknown"
+
+  const modelAuthorValue = modelAuthor(normalized)
  if (!modelAuthorValue) return undefined

  const providerModelAuthor = modelAuthor(providerModel)
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/stats-server",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/theme",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/tui",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -128,7 +128,7 @@ export function createTuiAttention(input: {
  return {
    async notify(request) {
      try {
-        if (!input.config.attention.enabled) return skipped("attention_disabled")
+        if (!input.config.attention.notifications && !input.config.attention.sound) return skipped("attention_disabled")
        if (disposed || input.renderer.isDestroyed) return skipped("renderer_destroyed")

        const message = normalizeText(request.message, "", MESSAGE_LIMIT)
@@ -253,20 +253,11 @@ export const settings: Setting[] = [
    format: (value) => `${value} ms`,
    keywords: ["leader key", "shortcut timeout"],
  },
-  {
-    title: "Attention",
-    category: "Alerts",
-    path: ["attention", "enabled"],
-    default: false,
-    values: [false, true],
-    labels: ["off", "on"],
-    keywords: ["alerts"],
-  },
  {
    title: "Notifications",
    category: "Alerts",
    path: ["attention", "notifications"],
-    default: true,
+    default: false,
    values: [false, true],
    labels: ["off", "on"],
    keywords: ["system notifications", "desktop notifications", "alerts"],
@@ -275,10 +266,10 @@ export const settings: Setting[] = [
    title: "Sounds",
    category: "Alerts",
    path: ["attention", "sound"],
-    default: true,
+    default: false,
    values: [false, true],
    labels: ["off", "on"],
-    keywords: ["audio", "sound effects"],
+    keywords: ["audio", "sound effects", "alerts"],
  },
  {
    title: "Volume",
@@ -95,7 +95,6 @@ export const Info = Schema.Struct({
  ).annotate({ description: "Scrolling behavior" }),
  attention: Schema.optional(
    Schema.Struct({
-      enabled: Schema.optional(Schema.Boolean).annotate({ description: "Enable attention alerts" }),
      notifications: Schema.optional(Schema.Boolean).annotate({ description: "Show system notifications" }),
      sound: Schema.optional(Schema.Boolean).annotate({ description: "Play attention sounds" }),
      volume: Schema.optional(
@@ -242,7 +241,6 @@ export type Info = Schema.Schema.Type<typeof Info>

 export type Resolved = Omit<Info, "attention" | "cursor" | "keybinds" | "leader" | "mouse" | "session" | "tabs"> & {
  attention: {
-    enabled: boolean
    notifications: boolean
    sound: boolean
    volume: number
@@ -285,9 +283,8 @@ export function resolve(input: Info, options: { terminalSuspend: boolean }): Res
  return {
    ...input,
    attention: {
-      enabled: input.attention?.enabled ?? false,
-      notifications: input.attention?.notifications ?? true,
-      sound: input.attention?.sound ?? true,
+      notifications: input.attention?.notifications ?? false,
+      sound: input.attention?.sound ?? false,
      volume: input.attention?.volume ?? 0.4,
      sound_pack: input.attention?.sound_pack ?? "opencode.default",
      sounds: input.attention?.sounds ?? {},
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/ui",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/util",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -2,7 +2,7 @@
  "name": "@opencode/web",
  "type": "module",
  "license": "MIT",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "scripts": {
    "dev": "astro dev",
    "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
@@ -2,7 +2,7 @@
  "name": "opencode",
  "displayName": "opencode",
  "description": "opencode for VS Code",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "publisher": "sst-dev",
  "repository": {
    "type": "git",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/update",
-  "version": "2.0.4",
+  "version": "2.0.5",
  "private": true,
  "type": "module",
  "scripts": {
@@ -1277,6 +1277,26 @@ effect: (ctx) =>
  }),
 ```

+`experimental.ws.send` and `experimental.ws.receive` expose the frames themselves: `send` runs after the provider
+driver builds an outbound frame, `receive` runs on each inbound frame before the driver observes it. Whatever `frame` holds when the hook returns is what crosses the wire or reaches the driver;
+OpenCode does not validate it.
+
+```ts
+effect: (ctx) =>
+  Effect.gen(function* () {
+    yield* ctx.session.hook(
+      "experimental.ws.send",
+      (event) =>
+        Effect.sync(() => {
+          const body = JSON.parse(event.frame)
+          if (body.type === "response.create") body.metadata = { ...body.metadata, session: event.sessionID }
+          event.frame = JSON.stringify(body)
+        }),
+      { providerID: "openai" },
+    )
+  }),
+```
+
 Override the retry decision for a provider failure or replace its delay in milliseconds. The hook runs after OpenCode
 classifies the failure and proposes its policy, but before any retry is scheduled. It does not expose how OpenCode
 internally performs the next attempt.
@@ -1317,6 +1337,9 @@ interface SessionHooks {
  readonly "model.request": SessionModelRequest
  readonly "http.request": SessionHttpRequest
  readonly "http.response": SessionHttpResponse
+  readonly "experimental.ws.handshake": SessionWebSocketHandshake
+  readonly "experimental.ws.send": SessionWebSocketSend
+  readonly "experimental.ws.receive": SessionWebSocketReceive
  readonly retry: SessionRetry
 }

@@ -1410,7 +1410,31 @@ await ctx.session.hook(
 )
 ```

-This hook is experimental and its name or shape may change.
+`experimental.ws.send` and `experimental.ws.receive` expose the frames themselves, the WebSocket counterpart of
+editing an HTTP request or response body. `send` runs after the provider driver builds an outbound frame and before it
+is written; `receive` runs on each inbound frame before the driver observes it. Both carry the frame as a string and
+send whatever `frame` holds when the hook returns.
+
+OpenCode does not validate rewritten frames. The driver tracks state from the provider's replies, so a rewrite that
+changes protocol meaning is the plugin's responsibility, just as a rewritten HTTP body is.
+
+```ts
+await ctx.session.hook(
+  "experimental.ws.send",
+  (event) => {
+    const body = JSON.parse(event.frame)
+    if (body.type === "response.create") body.metadata = { ...body.metadata, session: event.sessionID }
+    event.frame = JSON.stringify(body)
+  },
+  { providerID: "openai" },
+)
+
+await ctx.session.hook("experimental.ws.receive", (event) => {
+  if (event.frame.includes('"type":"error"')) console.error(event.frame)
+})
+```
+
+These hooks are experimental and their names or shapes may change.

 #### Retry policy

@@ -1458,6 +1482,8 @@ interface SessionHooks {
  "http.request": SessionHttpRequestHook
  "http.response": SessionHttpResponseHook
  "experimental.ws.handshake": SessionWebSocketHandshakeHook
+  "experimental.ws.send": SessionWebSocketSendHook
+  "experimental.ws.receive": SessionWebSocketReceiveHook
  retry: SessionRetryHook
 }

@@ -1470,6 +1496,22 @@ interface SessionWebSocketHandshakeHook {
  headers: Record<string, string>
 }

+interface SessionWebSocketSendHook {
+  readonly sessionID: string
+  readonly agent: string
+  readonly model: { providerID: string; id: string; variant?: string }
+  readonly kind: "primary" | "compaction" | "title" | "generate"
+  frame: string
+}
+
+interface SessionWebSocketReceiveHook {
+  readonly sessionID: string
+  readonly agent: string
+  readonly model: { providerID: string; id: string; variant?: string }
+  readonly kind: "primary" | "compaction" | "title" | "generate"
+  frame: string
+}
+
 type RetryDecision = { retry: false } | { retry: true; delay: number }

 interface SessionRetryHook {
@@ -108,12 +108,11 @@ Set scroll speed and acceleration:

 ## Attention

-Configure notifications and sounds:
+Configure notifications and sounds. Both are off by default and can be enabled independently:

 ```json title="cli.json"
 {
  "attention": {
-    "enabled": true,
    "notifications": true,
    "sound": true,
    "volume": 0.4,
@@ -127,8 +126,7 @@ Configure notifications and sounds:

 | Field           | Values                 | Description                                                                                          |
 | --------------- | ---------------------- | ---------------------------------------------------------------------------------------------------- |
-| `enabled`       | boolean                | Enables attention alerts.                                                                            |
-| `notifications` | boolean                | Shows system notifications.                                                                          |
+| `notifications` | boolean                | Shows system notifications when the terminal is not focused.                                         |
 | `sound`         | boolean                | Plays attention sounds.                                                                              |
 | `volume`        | number from `0` to `1` | Sets sound volume.                                                                                   |
 | `sound_pack`    | string                 | Selects the active sound pack.                                                                       |
Author	SHA1	Message	Date
Aiden Cline	b53b3d3635	fix(ai): never fail decoding on Responses error frames	2026-09-16 14:19:23 -05:00
Aiden Cline	9073c522ef	feat(plugin): add experimental WebSocket send and receive hooks (#49136 )	2026-09-16 14:13:33 -05:00
opencode-agent[bot]andrekram1-node	04c296310e	fix(core): skip session warming for subagents (#49387 ) Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>	2026-09-16 13:58:40 -05:00
Kit Langton	79d657b8fe	fix(core): keep recovered shell notices from waking idle sessions (#49378 )	2026-09-16 14:25:43 -04:00
Kit Langton	606ec4fa38	fix(core): keep recovered shell notices from waking idle sessions (#49378 )	2026-09-16 14:25:00 -04:00
Shoubhit Dash	2cdd938152	fix: honor provider transport overrides and preserve errors (#49350 )	2026-09-16 22:42:23 +05:30
opencode	4d73b40e59	sync release versions for v2.0.5	2026-09-16 16:35:05 +00:00
opencode-agent[bot]andadamdotdevin	276f2eef3e	fix(stats): hide Union Alpha provider (#49355 ) Co-authored-by: adamdotdevin <2363879+adamdotdevin@users.noreply.github.com>	2026-09-16 10:58:41 -05:00
Dax Raad	8806d34ed4	feat(tui): make notification and sound alerts independent toggles Remove the attention.enabled master switch. Notifications and sounds are now enabled independently and both default to off. Existing enabled keys are ignored; there is no migration.	2026-09-16 11:39:09 -04:00