@opencode-ai/ai 0.0.0-dev-18195 → 0.0.0-dev-18199

package/dist/image-client.d.ts

@@ -1,7 +1,7 @@
 import { Context, Effect, Layer } from "effect";
 import { RequestExecutor } from "./route/executor.js";
+import { type AIError } from "./schema/index.js";
 import type { ImageOptions, ImageRequestFor, ImageResponse } from "./image.js";
-import type { AIError } from "./schema/index.js";
 export type Execute = RequestExecutor.Interface["execute"];
 export interface Interface {
     readonly generate: <Options extends ImageOptions>(request: ImageRequestFor<Options>) => Effect.Effect<ImageResponse, AIError>;

package/dist/image-client.js

@@ -1,5 +1,7 @@
 import { Context, Effect, Layer } from "effect";
 import { RequestExecutor } from "./route/executor.js";
+import { mergeHttpOptions } from "./schema/index.js";
+import { sanitizeSurrogates } from "./utils/sanitize.js";
 export class Service extends Context.Service()("@opencode/ImageClient") {
 }
 export const generate = (request) => Effect.gen(function* () {
@@ -9,7 +11,14 @@ export const generate = (request) => Effect.gen(function* () {
 export const layer = Layer.effect(Service, Effect.gen(function* () {
     const executor = yield* RequestExecutor.Service;
     return Service.of({
-        generate: (request) => request.model.route.generate(request, executor.execute),
+        generate: (request) => request.model.route.generate({
+            ...sanitizeSurrogates({
+                ...request,
+                model: undefined,
+                http: mergeHttpOptions(request.model.http, request.http),
+            }),
+            model: request.model,
+        }, executor.execute),
     });
 }));
 export const ImageClient = {

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

@@ -273,6 +273,14 @@ export declare const protocol: Protocol<{
         } | undefined;
         readonly metrics?: unknown;
     } | undefined;
+    readonly exception?: {
+        readonly type: string;
+        readonly details: {
+            readonly message?: string | undefined;
+            readonly originalMessage?: string | undefined;
+            readonly originalStatusCode?: number | undefined;
+        };
+    } | undefined;
     readonly messageStart?: {
         readonly role: string;
     } | undefined;
@@ -307,31 +315,6 @@ export declare const protocol: Protocol<{
         readonly stopReason: string;
         readonly additionalModelResponseFields?: unknown;
     } | 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?: {
@@ -343,6 +326,14 @@ export declare const protocol: Protocol<{
         } | undefined;
         readonly metrics?: unknown;
     } | undefined;
+    readonly exception?: {
+        readonly type: string;
+        readonly details: {
+            readonly message?: string | undefined;
+            readonly originalMessage?: string | undefined;
+            readonly originalStatusCode?: number | undefined;
+        };
+    } | undefined;
     readonly messageStart?: {
         readonly role: string;
     } | undefined;
@@ -377,31 +368,6 @@ export declare const protocol: Protocol<{
         readonly stopReason: string;
         readonly additionalModelResponseFields?: unknown;
     } | 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 ({

package/dist/protocols/bedrock-converse.js

@@ -149,11 +149,7 @@ const BedrockEvent = Schema.Struct({
         usage: Schema.optional(BedrockUsageSchema),
         metrics: Schema.optional(Schema.Unknown),
     })),
-    internalServerException: Schema.optional(BedrockStreamException),
-    modelStreamErrorException: Schema.optional(BedrockStreamException),
-    validationException: Schema.optional(BedrockStreamException),
-    throttlingException: Schema.optional(BedrockStreamException),
-    serviceUnavailableException: Schema.optional(BedrockStreamException),
+    exception: Schema.optional(Schema.Struct({ type: Schema.String, details: BedrockStreamException })),
 });
 // =============================================================================
 // Request Lowering
@@ -507,20 +503,13 @@ const step = (state, event) => Effect.gen(function* () {
             [],
         ];
     }
-    const exception = [
-        ["internalServerException", event.internalServerException],
-        ["modelStreamErrorException", event.modelStreamErrorException],
-        ["serviceUnavailableException", event.serviceUnavailableException],
-        ["throttlingException", event.throttlingException],
-        ["validationException", event.validationException],
-    ].find((entry) => entry[1] !== undefined);
-    if (exception) {
+    if (event.exception) {
         return yield* new AIError({
             module: ADAPTER,
             method: "stream",
             reason: classifyProviderFailure({
-                message: exception[1]?.message ?? exception[1]?.originalMessage ?? "Bedrock Converse stream error",
-                code: exception[0],
+                message: event.exception.details.message ?? event.exception.details.originalMessage ?? "Bedrock Converse stream error",
+                code: event.exception.type,
             }),
         });
     }

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

@@ -56,7 +56,7 @@ const consumeFrames = (route) => (state, chunk) => Effect.gen(function* () {
         // against ad-hoc `JSON.parse` calls.
         const parsed = (yield* ProviderShared.parseJson(route, payload, "Failed to parse Bedrock Converse event-stream payload"));
         delete parsed.p;
-        out.push({ [eventType]: parsed });
+        out.push(messageType === "exception" ? { exception: { type: eventType, details: parsed } } : { [eventType]: parsed });
     }
     return [cursor, out];
 });

package/dist/route/client.js

@@ -5,6 +5,7 @@ import { RequestExecutor } from "./executor.js";
 import { Framing } from "./framing.js";
 import { HttpTransport } from "./transport/index.js";
 import { applyCachePolicy } from "../cache-policy.js";
+import { sanitizeSurrogates } from "../utils/sanitize.js";
 import * as ProviderShared from "../protocols/shared.js";
 import { AIError, GenerationOptions, HttpOptions, LLMRequest, LLMResponse, LanguageModel, LLMEvent, InvalidProviderOutputReason, ProviderID, mergeGenerationOptions, mergeHttpOptions, mergeProviderOptions, } from "../schema/index.js";
 const makeRouteLanguageModel = (route, mapped) => {
@@ -159,7 +160,8 @@ export function make(input) {
     });
 }
 const compile = Effect.fn("LLM.compile")(function* (request, options) {
-    const resolved = applyCachePolicy(resolveRequestOptions(request));
+    const original = applyCachePolicy(resolveRequestOptions(request));
+    const resolved = LLMRequest.update(original, sanitizeSurrogates({ ...LLMRequest.input(original), model: undefined }));
     const route = resolved.model.route;
     const body = yield* route.body
         .from(resolved)

package/dist/utils/sanitize.d.ts

@@ -0,0 +1 @@
+export declare const sanitizeSurrogates: <T>(value: T) => T;

package/dist/utils/sanitize.js

@@ -0,0 +1,12 @@
+import { isRecord } from "./record.js";
+export const sanitizeSurrogates = (value) => {
+    if (typeof value === "string")
+        return value.toWellFormed();
+    if (Array.isArray(value))
+        return value.map(sanitizeSurrogates);
+    if (value instanceof Uint8Array || value instanceof Error)
+        return value;
+    if (isRecord(value))
+        return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key.toWellFormed(), sanitizeSurrogates(entry)]));
+    return value;
+};

package/package.json

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