@opencode-ai/ai 0.0.0-next-16162 → 0.0.0-next-16164

package/dist/protocols/bedrock-converse.d.ts

@@ -292,6 +292,7 @@ export declare const protocol: Protocol<{
             }, "Encoded"> | undefined;
             readonly reasoningContent?: {
                 readonly text?: string | undefined;
+                readonly data?: string | undefined;
                 readonly signature?: string | undefined;
                 readonly redactedContent?: string | undefined;
             } | undefined;
@@ -304,21 +305,31 @@ export declare const protocol: Protocol<{
         readonly stopReason: string;
         readonly additionalModelResponseFields?: unknown;
     } | undefined;
-    readonly internalServerException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Encoded"> | undefined;
-    readonly modelStreamErrorException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Encoded"> | undefined;
-    readonly validationException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Encoded"> | undefined;
-    readonly throttlingException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Encoded"> | undefined;
-    readonly serviceUnavailableException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Encoded"> | undefined;
+    readonly internalServerException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly modelStreamErrorException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly validationException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly throttlingException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly serviceUnavailableException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
 }, {
     readonly metadata?: {
         readonly usage?: {
@@ -351,6 +362,7 @@ export declare const protocol: Protocol<{
             }, "Type"> | undefined;
             readonly reasoningContent?: {
                 readonly text?: string | undefined;
+                readonly data?: string | undefined;
                 readonly signature?: string | undefined;
                 readonly redactedContent?: string | undefined;
             } | undefined;
@@ -363,21 +375,31 @@ export declare const protocol: Protocol<{
         readonly stopReason: string;
         readonly additionalModelResponseFields?: unknown;
     } | undefined;
-    readonly internalServerException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Type"> | undefined;
-    readonly modelStreamErrorException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Type"> | undefined;
-    readonly validationException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Type"> | undefined;
-    readonly throttlingException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Type"> | undefined;
-    readonly serviceUnavailableException?: Schema.Struct.ReadonlySide<{
-        readonly message: Schema.String;
-    }, "Type"> | undefined;
+    readonly internalServerException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly modelStreamErrorException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly validationException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly throttlingException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
+    readonly serviceUnavailableException?: {
+        readonly message?: string | undefined;
+        readonly originalMessage?: string | undefined;
+        readonly originalStatusCode?: number | undefined;
+    } | undefined;
 }, ParserState>;
 export declare const route: Route<{
     readonly messages: readonly (Schema.Struct.ReadonlySide<{

package/dist/protocols/bedrock-converse.js

@@ -107,6 +107,11 @@ const BedrockUsageSchema = Schema.Struct({
     cacheReadInputTokens: Schema.optional(Schema.Number),
     cacheWriteInputTokens: Schema.optional(Schema.Number),
 });
+const BedrockStreamException = Schema.Struct({
+    message: Schema.optional(Schema.String),
+    originalMessage: Schema.optional(Schema.String),
+    originalStatusCode: Schema.optional(Schema.Number),
+});
 // Streaming event shape — the AWS event stream wraps each JSON payload by its
 // `:event-type` header (e.g. `messageStart`, `contentBlockDelta`). We
 // reconstruct that wrapping in `decodeFrames` below so the event schema can
@@ -129,6 +134,9 @@ const BedrockEvent = Schema.Struct({
                 signature: Schema.optional(Schema.String),
                 // Blob fields in Bedrock's JSON event stream are base64 strings.
                 redactedContent: Schema.optional(Schema.String),
+                // Vercel's Bedrock provider exposes the same delta under
+                // Anthropic's shorter `data` spelling.
+                data: Schema.optional(Schema.String),
             })),
         })),
     })),
@@ -141,11 +149,11 @@ const BedrockEvent = Schema.Struct({
         usage: Schema.optional(BedrockUsageSchema),
         metrics: Schema.optional(Schema.Unknown),
     })),
-    internalServerException: Schema.optional(Schema.Struct({ message: Schema.String })),
-    modelStreamErrorException: Schema.optional(Schema.Struct({ message: Schema.String })),
-    validationException: Schema.optional(Schema.Struct({ message: Schema.String })),
-    throttlingException: Schema.optional(Schema.Struct({ message: Schema.String })),
-    serviceUnavailableException: Schema.optional(Schema.Struct({ message: Schema.String })),
+    internalServerException: Schema.optional(BedrockStreamException),
+    modelStreamErrorException: Schema.optional(BedrockStreamException),
+    validationException: Schema.optional(BedrockStreamException),
+    throttlingException: Schema.optional(BedrockStreamException),
+    serviceUnavailableException: Schema.optional(BedrockStreamException),
 });
 // =============================================================================
 // Request Lowering
@@ -412,11 +420,15 @@ const step = (state, event) => Effect.gen(function* () {
         const index = event.contentBlockDelta.contentBlockIndex;
         const reasoning = event.contentBlockDelta.delta.reasoningContent;
         const events = [];
-        const lifecycle = reasoning.text
-            ? Lifecycle.reasoningDelta(state.lifecycle, events, `reasoning-${index}`, reasoning.text)
-            : reasoning.redactedContent !== undefined
-                ? Lifecycle.reasoningStart(state.lifecycle, events, `reasoning-${index}`, bedrockMetadata({ redactedData: reasoning.redactedContent }))
-                : state.lifecycle;
+        const redactedData = reasoning.redactedContent ?? reasoning.data;
+        const providerMetadata = reasoning.signature
+            ? bedrockMetadata({ signature: reasoning.signature })
+            : redactedData !== undefined
+                ? bedrockMetadata({ redactedData })
+                : undefined;
+        const lifecycle = reasoning.text !== undefined || providerMetadata !== undefined
+            ? Lifecycle.reasoningDelta(state.lifecycle, events, `reasoning-${index}`, reasoning.text ?? "", providerMetadata)
+            : state.lifecycle;
         return [
             {
                 ...state,
@@ -477,7 +489,7 @@ const step = (state, event) => Effect.gen(function* () {
         ];
     }
     if (event.metadata) {
-        const usage = mapUsage(event.metadata.usage);
+        const usage = mapUsage(event.metadata.usage) ?? state.pendingFinish?.usage;
         return [
             {
                 ...state,
@@ -501,7 +513,7 @@ const step = (state, event) => Effect.gen(function* () {
             module: ADAPTER,
             method: "stream",
             reason: classifyProviderFailure({
-                message: exception[1]?.message ?? "Bedrock Converse stream error",
+                message: exception[1]?.message ?? exception[1]?.originalMessage ?? "Bedrock Converse stream error",
                 code: exception[0],
             }),
         });

package/dist/protocols/bedrock-event-stream.js

@@ -33,9 +33,18 @@ const consumeFrames = (route) => (state, chunk) => Effect.gen(function* () {
             catch: (error) => ProviderShared.eventError(route, `Failed to decode Bedrock Converse event-stream frame: ${error instanceof Error ? error.message : String(error)}`),
         });
         cursor = { buffer: cursor.buffer, offset: cursor.offset + totalLength };
-        if (decoded.headers[":message-type"]?.value !== "event")
-            continue;
-        const eventType = decoded.headers[":event-type"]?.value;
+        const messageType = decoded.headers[":message-type"]?.value;
+        if (messageType === "error") {
+            const code = decoded.headers[":error-code"]?.value;
+            const message = decoded.headers[":error-message"]?.value;
+            return yield* ProviderShared.eventError(route, [code, message].filter((value) => typeof value === "string").join(": ") ||
+                "Bedrock Converse event-stream error");
+        }
+        const eventType = messageType === "event"
+            ? decoded.headers[":event-type"]?.value
+            : messageType === "exception"
+                ? decoded.headers[":exception-type"]?.value
+                : undefined;
         if (typeof eventType !== "string")
             continue;
         const payload = utf8.decode(decoded.body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.0-next-16162",
+  "version": "0.0.0-next-16164",
   "name": "@opencode-ai/ai",
   "type": "module",
   "license": "MIT",
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@clack/prompts": "1.0.0-alpha.1",
     "@effect/platform-node": "4.0.0-beta.98",
-    "@opencode-ai/http-recorder": "0.0.0-next-16162",
+    "@opencode-ai/http-recorder": "0.0.0-next-16164",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.3.13",
     "@typescript/native-preview": "7.0.0-dev.20251207.1",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@smithy/eventstream-codec": "4.2.14",
     "@smithy/util-utf8": "4.2.2",
-    "@opencode-ai/schema": "0.0.0-next-16162",
+    "@opencode-ai/schema": "0.0.0-next-16164",
     "aws4fetch": "1.0.20",
     "effect": "4.0.0-beta.98",
     "google-auth-library": "10.5.0"