@opencode/ai 2.0.14 → 2.0.16

package/dist/protocols/meta-images.js

@@ -1,15 +1,23 @@
-import { Effect, Encoding, Schema } from "effect";
-import { Headers, HttpClientRequest } from "effect/unstable/http";
-import { GeneratedImage, ImageModel, ImageResponse } from "../image.js";
-import { Auth } from "../route/auth.js";
-import { Usage, mergeHttpOptions, mergeJsonRecords } from "../schema/index.js";
+import { Effect, Schema } from "effect";
+import { ImageModel, ImageResponse } from "../image.js";
+import { Media } from "../media.js";
+import { MediaProtocol } from "../route/media-protocol.js";
+import { MediaRoute } from "../route/media.js";
+import { ProviderID, mergeJsonRecords } from "../schema/index.js";
 import { JsonObject, ProviderShared, optionalNull } from "./shared.js";
-import { ImageInputs } from "./utils/image-input.js";
+import { MediaInput } from "./utils/media-input.js";
+const ADAPTER = "meta-images";
+const NAME = "Meta Images";
+const PROVIDER = ProviderID.make("meta");
+// ---------------------------------------------------------------------------
+// 2. Request body and response schemas
+// ---------------------------------------------------------------------------
 const Body = Schema.StructWithRest(Schema.Struct({
     model: Schema.String,
     prompt: Schema.String,
     images: Schema.optional(Schema.Array(JsonObject)),
     n: Schema.optional(Schema.Number),
+    /** Aspect ratio hint, not an exact output resolution. */
     size: Schema.optional(Schema.String),
     output_format: Schema.optional(Schema.String),
     response_format: Schema.optional(Schema.String),
@@ -25,65 +33,76 @@ const Response = Schema.Struct({
         total_tokens: Schema.optional(Schema.Number),
     })),
 });
-export const model = (input) => {
-    const route = {
-        id: "meta-images",
-        generate: Effect.fn("MetaImages.generate")(function* (request, execute) {
-            const http = mergeHttpOptions(request.model.http, request.http);
-            const images = yield* Effect.forEach(request.images ?? [], (image) => {
-                if (image.type === "bytes")
-                    return Effect.succeed({ image_url: ImageInputs.dataUrl(image) });
-                if (image.type === "url")
-                    return Effect.succeed({ image_url: image.url });
-                return ImageInputs.invalid("Meta Images accepts image bytes and URLs");
-            });
-            const { outputFormat, responseFormat, reasoningStrength, toolEnablement, ...native } = request.options ?? {};
-            const payload = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Body))(mergeJsonRecords({
-                model: request.model.id,
-                prompt: request.prompt,
-                images: images.length === 0 ? undefined : images,
-                output_format: outputFormat,
-                response_format: responseFormat,
-                reasoning_strength: reasoningStrength,
-                tool_enablement: toolEnablement,
-            }, native, http?.body));
-            const body = ProviderShared.encodeJson(payload);
-            const url = new URL(`${input.baseURL.replace(/\/$/, "")}/images/${images.length === 0 ? "generations" : "edits"}`);
-            Object.entries(http?.query ?? {}).forEach(([key, value]) => url.searchParams.set(key, value));
-            const headers = yield* Auth.toEffect(input.auth)({
-                request,
-                method: "POST",
-                url: url.toString(),
-                body,
-                headers: Headers.fromInput({ ...input.headers, ...http?.headers }),
-            });
-            const response = yield* execute(HttpClientRequest.post(url.toString()).pipe(HttpClientRequest.setHeaders(headers), HttpClientRequest.bodyText(body, "application/json")));
-            const output = yield* ProviderShared.imageResponse("meta-images", "Meta Images", response);
-            const decoded = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Response))(output.body).pipe(Effect.mapError((cause) => output.invalid("Meta Images returned an invalid response", cause)));
-            const format = decoded.output_format ?? payload.output_format ?? "webp";
-            const generated = yield* Effect.forEach(decoded.data, (item, index) => {
-                if (item.b64_json)
-                    return Effect.fromResult(Encoding.decodeBase64(item.b64_json)).pipe(Effect.mapError((cause) => output.invalid(`Meta Images result ${index} contains invalid base64`, cause)), Effect.map((data) => new GeneratedImage({ mediaType: `image/${format}`, data })));
-                if (item.url)
-                    return Effect.succeed(new GeneratedImage({ mediaType: `image/${format}`, data: item.url }));
-                return output.invalid(`Meta Images result ${index} has neither image data nor a URL`);
-            });
-            if (generated.length === 0)
-                return yield* output.invalid("Meta Images returned no images");
-            return new ImageResponse({
-                images: generated,
-                usage: decoded.usage === undefined
-                    ? undefined
-                    : new Usage({
-                        inputTokens: decoded.usage.input_tokens,
-                        outputTokens: decoded.usage.output_tokens,
-                        totalTokens: decoded.usage.total_tokens,
-                        providerMetadata: { meta: decoded.usage },
-                    }),
-                providerMetadata: { meta: { outputFormat: format } },
+// ---------------------------------------------------------------------------
+// 5. Request body construction
+// ---------------------------------------------------------------------------
+const isEdit = (request) => (request.images?.length ?? 0) > 0;
+// Meta has no file handles: refs are rejected even when they name this provider.
+const reference = (asset) => ProviderShared.mediaReference(asset, undefined, NAME).pipe(Effect.map((item) => ({ image_url: item.value })));
+const fromRequest = Effect.fn("MetaImages.fromRequest")(function* (request) {
+    const images = yield* Effect.forEach(request.images ?? [], reference);
+    const { responseFormat, reasoningStrength, toolEnablement, ...native } = request.providerOptions ?? {};
+    const payload = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Body))(mergeJsonRecords({
+        model: request.model.id,
+        prompt: request.prompt,
+        images: images.length === 0 ? undefined : images,
+        n: request.n,
+        size: request.size,
+        output_format: request.format,
+        response_format: responseFormat,
+        reasoning_strength: reasoningStrength,
+        tool_enablement: toolEnablement,
+    }, native, request.http?.body));
+    return MediaProtocol.json(payload);
+});
+// ---------------------------------------------------------------------------
+// 6. Response decoding
+// ---------------------------------------------------------------------------
+const decodeResponse = Effect.fn("MetaImages.decodeResponse")(function* (response, context) {
+    const output = yield* MediaProtocol.decodeJson(ADAPTER, NAME, Response)(response);
+    const decoded = output.value;
+    const requested = context.body.type === "json" ? context.body.value.output_format : undefined;
+    const format = decoded.output_format ?? (typeof requested === "string" ? requested : "webp");
+    const mediaType = `image/${format}`;
+    const images = yield* Effect.forEach(decoded.data, (item, index) => {
+        if (item.b64_json)
+            return MediaInput.decodedAsset(output.invalid, `${NAME} result ${index}`, item.b64_json, mediaType, {
+                info: { format },
             });
-        }),
-    };
-    return ImageModel.make({ id: input.id, provider: "meta", route, http: input.http });
-};
+        if (item.url)
+            return Effect.succeed(Media.url(item.url, { mediaType, info: { format } }));
+        return Effect.fail(output.invalid(`${NAME} result ${index} has neither image data nor a URL`));
+    });
+    if (images.length === 0)
+        return yield* output.invalid(`${NAME} returned no images`);
+    return new ImageResponse({
+        images,
+        usage: decoded.usage === undefined
+            ? undefined
+            : {
+                type: "tokens",
+                input: decoded.usage.input_tokens,
+                output: decoded.usage.output_tokens,
+                total: decoded.usage.total_tokens,
+                details: { meta: decoded.usage },
+            },
+        providerMetadata: { meta: { outputFormat: format } },
+    });
+});
+// ---------------------------------------------------------------------------
+// 7. Protocol and route
+// ---------------------------------------------------------------------------
+export const protocol = MediaProtocol.inline({
+    id: ADAPTER,
+    name: NAME,
+    unsupported: ["mask", "aspectRatio", "seed"],
+    body: { from: fromRequest },
+    response: { decode: decodeResponse },
+});
+export const model = (input) => ImageModel.fromRoute({
+    id: ADAPTER,
+    provider: PROVIDER,
+    protocol,
+    path: ({ request }) => `/images/${isEdit(request) ? "edits" : "generations"}`,
+}, input);
 export * as MetaImages from "./meta-images.js";

package/dist/protocols/meta-responses.d.ts

@@ -92,8 +92,8 @@ export declare const protocol: Protocol<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -129,8 +129,8 @@ export declare const protocol: Protocol<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -338,8 +338,8 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -375,8 +375,8 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";

package/dist/protocols/meta-responses.js

@@ -82,7 +82,7 @@ const fromRequest = Effect.fn("MetaResponses.fromRequest")(function* (request) {
             ? undefined
             : yield* Effect.forEach(projected.tools, (tool) => Effect.gen(function* () {
                 if (tool.native === undefined)
-                    return yield* OpenResponses.lowerTool(NAME, tool, ToolSchemaProjection.modelCompatibility(tool.inputSchema, request.model.compatibility?.toolSchema));
+                    return yield* OpenResponses.lowerTool(NAME, tool, ToolSchemaProjection.modelCompatibility(tool.inputSchema, request.model));
                 return yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(NativeTool))(tool.native.meta);
             })),
         tool_choice: OpenResponses.allowedToolChoice(request) ??

package/dist/protocols/mistral-chat.js

@@ -141,13 +141,14 @@ const MistralEvent = Schema.StructWithRest(Schema.Struct({
 }), [Schema.Record(Schema.String, Schema.Unknown)]);
 const MistralStreamEvent = Schema.Union([Schema.Literal(DONE), Protocol.jsonEvent(MistralEvent)]);
 const lowerMedia = Effect.fn("MistralChat.lowerMedia")(function* (part) {
-    const media = ProviderShared.normalizeMedia(part);
-    const url = typeof part.data === "string" && /^(?:https?:|data:)/.test(part.data) ? part.data : media.dataUrl;
-    if (media.mime.startsWith("image/"))
+    const mime = part.media.mediaType.toLowerCase();
+    const url = ProviderShared.mediaUrl(part.media) ??
+        (yield* ProviderShared.requireInlineMedia("Mistral Chat", part.media)).dataUrl;
+    if (mime.startsWith("image/"))
         return { type: "image_url", image_url: url };
-    if (media.mime === "application/pdf")
+    if (mime === "application/pdf")
         return { type: "document_url", document_url: url };
-    return yield* ProviderShared.invalidRequest(`Mistral Chat does not support media type ${part.mediaType}`);
+    return yield* ProviderShared.invalidRequest(`Mistral Chat does not support media type ${part.media.mediaType}`);
 });
 const lowerUser = Effect.fn("MistralChat.lowerUser")(function* (message) {
     const content = [];
@@ -227,7 +228,7 @@ const lowerToolResults = Effect.fn("MistralChat.lowerToolResults")(function* (me
                 content.push({ type: "text", text: item.text });
                 continue;
             }
-            content.push(yield* lowerMedia({ type: "media", mediaType: item.mime, data: item.uri, filename: item.name }));
+            content.push(yield* lowerMedia(ProviderShared.toolFileMedia(item)));
         }
         output.push({
             role: "tool",

package/dist/protocols/open-responses.d.ts

@@ -2,7 +2,7 @@ import { Effect, Schema } from "effect";
 import { HttpTransport } from "../route/transport/index.js";
 import { Protocol } from "../route/protocol.js";
 import { AIError, LLMEvent, Usage, type LLMRequest, type MediaPart, type ProviderMetadata, type ToolDefinition } from "../schema/index.js";
-import { ProviderShared } from "./shared.js";
+import type { Media } from "../media.js";
 import { OpenResponsesOptions } from "./utils/open-responses-options.js";
 import { Lifecycle } from "./utils/lifecycle.js";
 import { ToolStream } from "./utils/tool-stream.js";
@@ -689,7 +689,7 @@ export interface ProviderAdapter {
     }, AIError>;
     readonly lowerMedia?: (input: {
         readonly part: MediaPart;
-        readonly media: ProviderShared.NormalizedMedia;
+        readonly media: Media.Inline | undefined;
         readonly request: LLMRequest;
     }) => MediaInput | undefined;
     readonly restoreHostedToolItem?: (item: unknown) => HostedToolReplayItem | undefined;
@@ -895,8 +895,8 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -932,8 +932,8 @@ export declare const fromRequest: (request: LLMRequest<import("../schema/options
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -1177,6 +1177,14 @@ export declare const step: (state: ParserState, event: NormalizedEvent) => AIErr
         };
     } | undefined;
     readonly namespace?: string | undefined;
+} | {
+    readonly type: "media";
+    readonly media: Media.Asset;
+    readonly providerMetadata?: {
+        readonly [x: string]: {
+            readonly [x: string]: unknown;
+        };
+    } | undefined;
 } | {
     readonly type: "step-finish";
     readonly reason: {
@@ -1205,12 +1213,12 @@ export declare const step: (state: ParserState, event: NormalizedEvent) => AIErr
 } | {
     readonly type: "provider-error";
     readonly message: string;
+    readonly classification?: "context-overflow" | "payload-too-large" | undefined;
     readonly providerMetadata?: {
         readonly [x: string]: {
             readonly [x: string]: unknown;
         };
     } | undefined;
-    readonly classification?: "context-overflow" | "payload-too-large" | undefined;
 })[]], AIError, never> | Effect.Effect<StepResult, never, never>;
 /**
  * The provider-neutral Open Responses protocol. Provider-specific Responses
@@ -1284,8 +1292,8 @@ export declare const protocol: Protocol<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -1321,8 +1329,8 @@ export declare const protocol: Protocol<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -1505,8 +1513,8 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";
@@ -1542,8 +1550,8 @@ export declare const httpTransport: HttpTransport.HttpJsonTransport<{
         } | {
             readonly type: "input_file";
             readonly filename: string;
-            readonly detail?: string | undefined;
             readonly file_data?: string | undefined;
+            readonly detail?: string | undefined;
             readonly file_url?: string | undefined;
         } | {
             readonly type: "input_text";

package/dist/protocols/open-responses.js

@@ -335,27 +335,27 @@ const lowerReasoning = (part, providerMetadataKey) => {
     };
 };
 const lowerMedia = Effect.fn("OpenResponses.lowerMedia")(function* (part, request, adapter, target) {
-    const media = ProviderShared.normalizeMedia(part);
+    const media = part.media.inline();
     const providerMedia = adapter.lowerMedia?.({ part, media, request });
     if (providerMedia)
         return providerMedia;
     const detail = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(OpenResponsesInputImage.fields.detail))(part.providerMetadata?.[metadataKey(request.model)]?.detail);
-    const url = typeof part.data === "string" && (part.data.startsWith("https://") || part.data.startsWith("http://"))
-        ? part.data
-        : undefined;
-    if (!media.mime.startsWith("image/")) {
-        if (target === "tool-result" && media.mime.startsWith("video/"))
-            return { type: "input_video", video_url: url ?? media.dataUrl };
+    const mime = part.media.mediaType.toLowerCase();
+    const url = ProviderShared.mediaUrl(part.media);
+    const location = url ?? (yield* ProviderShared.requireInlineMedia(adapter.name, part.media)).dataUrl;
+    if (part.media.kind !== "image") {
+        if (target === "tool-result" && part.media.kind === "video")
+            return { type: "input_video", video_url: location };
         return {
             type: "input_file",
-            filename: part.filename ?? (media.mime === "application/pdf" ? "document.pdf" : "file"),
+            filename: part.filename ?? (mime === "application/pdf" ? "document.pdf" : "file"),
             detail,
-            ...(url ? { file_url: url } : { file_data: media.dataUrl }),
+            ...(url ? { file_url: url } : { file_data: location }),
         };
     }
     return {
         type: "input_image",
-        image_url: url ?? media.dataUrl,
+        image_url: location,
         detail,
     };
 });
@@ -377,12 +377,12 @@ const lowerMessageMedia = Effect.fnUntraced(function* (part, request, adapter) {
 const lowerToolResultContentItem = Effect.fnUntraced(function* (item, request, adapter) {
     if (item.type === "text")
         return { type: "input_text", text: item.text };
-    return yield* lowerMedia({ type: "media", mediaType: item.mime, data: item.uri, filename: item.name }, request, adapter, "tool-result");
+    return yield* lowerMedia(ProviderShared.toolFileMedia(item), request, adapter, "tool-result");
 });
 const lowerHostedToolResultContentItem = Effect.fnUntraced(function* (item, request, adapter) {
     if (item.type === "text")
         return { type: "input_text", text: item.text };
-    return yield* lowerMessageMedia({ type: "media", mediaType: item.mime, data: item.uri, filename: item.name }, request, adapter);
+    return yield* lowerMessageMedia(ProviderShared.toolFileMedia(item), request, adapter);
 });
 const lowerToolResultOutput = Effect.fnUntraced(function* (part, request, adapter) {
     // Text/json/error results are encoded as a plain string for backward
@@ -513,11 +513,22 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
                     });
                     continue;
                 }
+                if (part.type === "media") {
+                    flushText();
+                    // Responses has no assistant-authored image item; replay generated media (e.g. from Gemini) as user input.
+                    input.push({
+                        type: "message",
+                        role: "user",
+                        content: [yield* lowerMessageMedia(part, request, adapter)],
+                    });
+                    continue;
+                }
                 return yield* ProviderShared.unsupportedContent(adapter.name, "assistant", [
                     "text",
                     "reasoning",
                     "tool-call",
                     "tool-result",
+                    "media",
                 ]);
             }
             flushText();
@@ -592,7 +603,6 @@ export const allowedToolChoice = (request) => {
 };
 export const fromRequestWithAdapter = Effect.fn("OpenResponses.fromRequestWithAdapter")(function* (request, adapter) {
     const projected = ProviderShared.flattenToolRequest(request);
-    const toolSchemaCompatibility = request.model.compatibility?.toolSchema;
     return {
         ...(yield* lowerConversation(projected.request, adapter)),
         ...lowerGeneration(request),
@@ -600,7 +610,7 @@ export const fromRequestWithAdapter = Effect.fn("OpenResponses.fromRequestWithAd
             ? undefined
             : yield* Effect.forEach(projected.tools, (tool) => tool.native !== undefined && adapter.nativeTool
                 ? adapter.nativeTool(tool.native)
-                : lowerTool(adapter.name, tool, ToolSchemaProjection.modelCompatibility(tool.inputSchema, toolSchemaCompatibility))),
+                : lowerTool(adapter.name, tool, ToolSchemaProjection.modelCompatibility(tool.inputSchema, request.model))),
         tool_choice: allowedToolChoice(request) ??
             (request.toolChoice ? yield* lowerToolChoice(adapter.name, request.toolChoice) : undefined),
     };