@opencode/ai 0.0.0-dev-19544 → 0.0.0-dev-19550

package/dist/protocols/bedrock-converse.js

@@ -10,6 +10,7 @@ import { BedrockAuth } from "./utils/bedrock-auth.js";
 import { BedrockCache } from "./utils/bedrock-cache.js";
 import { BedrockMedia } from "./utils/bedrock-media.js";
 import { Lifecycle } from "./utils/lifecycle.js";
+import { MistralToolID } from "./utils/mistral-tool-id.js";
 import { ToolSchemaProjection } from "./utils/tool-schema.js";
 import { ToolStream } from "./utils/tool-stream.js";
 const ADAPTER = "bedrock-converse";
@@ -201,15 +202,15 @@ const removeEmptyToolInputKeys = (input) => {
         return input;
     return Object.fromEntries(Object.entries(input).flatMap(([key, value]) => (key === "" ? [] : [[key, removeEmptyToolInputKeys(value)]])));
 };
-const lowerToolCall = (part) => ({
+const lowerToolCall = (part, normalizeID) => ({
     toolUse: {
-        toolUseId: part.id,
+        toolUseId: normalizeID(part.id),
         // Models can emit names that Converse rejects when replayed in history.
         name: part.name.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 64) || "_",
         input: removeEmptyToolInputKeys(part.input),
     },
 });
-const lowerToolResultContent = Effect.fn("BedrockConverse.lowerToolResultContent")(function* (part) {
+const lowerToolResultContent = Effect.fn("BedrockConverse.lowerToolResultContent")(function* (part, documentNames) {
     if (part.result.type === "text" || part.result.type === "error")
         return [{ text: ProviderShared.toolResultText(part) }];
     if (part.result.type === "json")
@@ -225,22 +226,25 @@ const lowerToolResultContent = Effect.fn("BedrockConverse.lowerToolResultContent
             mediaType: item.mime,
             data: item.uri,
             filename: item.name,
-        });
-        content.push(media);
+        }, documentNames);
+        content.push(...media);
     }
     return content;
 });
-const lowerToolResult = Effect.fn("BedrockConverse.lowerToolResult")(function* (part) {
+const lowerToolResult = Effect.fn("BedrockConverse.lowerToolResult")(function* (part, documentNames, normalizeID) {
     return {
         toolResult: {
-            toolUseId: part.id,
-            content: yield* lowerToolResultContent(part),
+            toolUseId: normalizeID(part.id),
+            content: yield* lowerToolResultContent(part, documentNames),
             status: part.result.type === "error" ? "error" : "success",
         },
     };
 });
 const lowerMessages = Effect.fn("BedrockConverse.lowerMessages")(function* (request, breakpoints) {
     const messages = [];
+    const documentNames = new Set();
+    // Mistral can reject replay IDs even when they satisfy Converse's broader ID syntax.
+    const normalizeID = request.model.id.includes("mistral.") ? MistralToolID.normalizer(request) : (id) => id;
     const providerMetadataKey = request.model.route.providerMetadataKey ?? String(request.model.provider);
     for (const message of request.messages) {
         if (message.role === "system") {
@@ -263,7 +267,7 @@ const lowerMessages = Effect.fn("BedrockConverse.lowerMessages")(function* (requ
                     continue;
                 }
                 if (part.type === "media") {
-                    content.push(yield* BedrockMedia.lower(part));
+                    content.push(...(yield* BedrockMedia.lower(part, documentNames)));
                     continue;
                 }
             }
@@ -305,7 +309,7 @@ const lowerMessages = Effect.fn("BedrockConverse.lowerMessages")(function* (requ
                     continue;
                 }
                 if (part.type === "tool-call") {
-                    content.push(lowerToolCall(part));
+                    content.push(lowerToolCall(part, normalizeID));
                     continue;
                 }
             }
@@ -317,7 +321,7 @@ const lowerMessages = Effect.fn("BedrockConverse.lowerMessages")(function* (requ
         for (const part of message.content) {
             if (!ProviderShared.supportsContent(part, ["tool-result"]))
                 return yield* ProviderShared.unsupportedContent("Bedrock Converse", "tool", ["tool-result"]);
-            content.push(yield* lowerToolResult(part));
+            content.push(yield* lowerToolResult(part, documentNames, normalizeID));
             const cachePoint = BedrockCache.block(breakpoints, part.cache);
             if (cachePoint)
                 content.push(cachePoint);

package/dist/protocols/mistral-chat.js

@@ -9,10 +9,10 @@ import { AIError, InvalidProviderOutputError, LLMEvent, ProviderInternalError, U
 import { classifyProviderFailure } from "../provider-error.js";
 import { JsonObject, optionalArray, optionalNull, ProviderShared } from "./shared.js";
 import { Lifecycle } from "./utils/lifecycle.js";
+import { MistralToolID } from "./utils/mistral-tool-id.js";
 import { ToolStream } from "./utils/tool-stream.js";
 const ADAPTER = "mistral-chat";
 const DONE = "[DONE]";
-const TOOL_ID = /^[A-Za-z0-9]{9}$/;
 export const DEFAULT_BASE_URL = "https://api.mistral.ai/v1";
 export const PATH = "/chat/completions";
 const MistralTextContent = Schema.Struct({
@@ -140,34 +140,6 @@ const MistralEvent = Schema.StructWithRest(Schema.Struct({
     error: optionalNull(MistralError),
 }), [Schema.Record(Schema.String, Schema.Unknown)]);
 const MistralStreamEvent = Schema.Union([Schema.Literal(DONE), Protocol.jsonEvent(MistralEvent)]);
-const hashID = (value) => {
-    const hash = (seed) => {
-        let result = seed;
-        for (const char of value)
-            result = Math.imul(result ^ char.charCodeAt(0), 16777619);
-        return (result >>> 0).toString(36);
-    };
-    return `${hash(2166136261).padStart(7, "0")}${hash(2246822519).padStart(7, "0")}`.slice(-9);
-};
-const toolIDNormalizer = (request) => {
-    const ids = request.messages.flatMap((message) => message.content.flatMap((part) => (part.type === "tool-call" || part.type === "tool-result" ? [part.id] : [])));
-    const used = new Set(ids.filter((id) => TOOL_ID.test(id)));
-    const normalized = new Map();
-    return (id) => {
-        if (TOOL_ID.test(id))
-            return id;
-        const previous = normalized.get(id);
-        if (previous)
-            return previous;
-        let attempt = 0;
-        let candidate = hashID(id);
-        while (used.has(candidate))
-            candidate = hashID(`${id}:${++attempt}`);
-        used.add(candidate);
-        normalized.set(id, candidate);
-        return candidate;
-    };
-};
 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;
@@ -269,7 +241,7 @@ const lowerToolResults = Effect.fn("MistralChat.lowerToolResults")(function* (me
     return output;
 });
 const lowerMessages = Effect.fn("MistralChat.lowerMessages")(function* (request) {
-    const normalizeID = toolIDNormalizer(request);
+    const normalizeID = MistralToolID.normalizer(request);
     const messages = request.system.length === 0 ? [] : [{ role: "system", content: ProviderShared.joinText(request.system) }];
     for (const message of request.messages) {
         if (message.role === "system") {
@@ -439,15 +411,15 @@ const appendContent = (state, events, content) => {
     }, state);
 };
 const normalizeStreamToolID = (state, source) => {
-    if (TOOL_ID.test(source))
+    if (MistralToolID.valid.test(source))
         return { id: source, state: { ...state, usedToolIDs: new Set([...state.usedToolIDs, source]) } };
     const previous = state.toolIDs.get(source);
     if (previous)
         return { id: previous, state };
     let attempt = 0;
-    let id = hashID(source);
+    let id = MistralToolID.hash(source);
     while (state.usedToolIDs.has(id))
-        id = hashID(`${source}:${++attempt}`);
+        id = MistralToolID.hash(`${source}:${++attempt}`);
     return {
         id,
         state: {

package/dist/protocols/utils/bedrock-media.d.ts

@@ -36,7 +36,14 @@ export declare const lower: (part: {
         };
     } | undefined;
     readonly filename?: string | undefined;
-}) => Effect.Effect<{
+}, documentNames: Set<string>) => Effect.Effect<{
+    image: {
+        format: "png" | "jpeg" | "gif" | "webp";
+        source: {
+            bytes: string;
+        };
+    };
+}[] | ({
     readonly document: {
         readonly format: "pdf" | "csv" | "doc" | "docx" | "xls" | "xlsx" | "html" | "txt" | "md";
         readonly name: string;
@@ -45,11 +52,6 @@ export declare const lower: (part: {
         };
     };
 } | {
-    image: {
-        format: "png" | "jpeg" | "gif" | "webp";
-        source: {
-            bytes: string;
-        };
-    };
-}, import("../../schema/errors.js").AIError, never>;
+    text: string;
+})[], import("../../schema/errors.js").AIError, never>;
 export * as BedrockMedia from "./bedrock-media.js";

package/dist/protocols/utils/bedrock-media.js

@@ -44,6 +44,23 @@ const documentBlock = (name, format, bytes) => ({
         source: { bytes },
     },
 });
+function documentName(filename, names) {
+    const base = (filename ?? "")
+        .replace(/\.[^.]*$/, "")
+        .replace(/[^a-zA-Z0-9 ()[\]-]/g, " ")
+        .replace(/\s+/g, " ")
+        .trim()
+        .slice(0, 200)
+        .trim() || "document";
+    let name = base;
+    // Converse requires labels to be unique across the entire request, including tool results.
+    for (let index = 2; names.has(name); index++) {
+        const suffix = ` ${index}`;
+        name = `${base.slice(0, 200 - suffix.length).trimEnd()}${suffix}`;
+    }
+    names.add(name);
+    return name;
+}
 const mediaBase64 = Effect.fn("BedrockMedia.mediaBase64")(function* (part) {
     const media = ProviderShared.normalizeMedia(part);
     const bytes = yield* Effect.fromResult(Encoding.decodeBase64(media.base64)).pipe(Effect.mapError((cause) => ProviderShared.invalidRequest("Bedrock Converse media data must be valid base64", cause)));
@@ -54,19 +71,26 @@ const mediaBase64 = Effect.fn("BedrockMedia.mediaBase64")(function* (part) {
 // document block. Image MIME types not in `IMAGE_FORMATS` (e.g. `image/svg+xml`)
 // get an image-specific error so the caller knows it's a format-support issue,
 // not a kind-detection issue.
-export const lower = Effect.fn("BedrockMedia.lower")(function* (part) {
+export const lower = Effect.fn("BedrockMedia.lower")(function* (part, documentNames) {
     const mime = part.mediaType.toLowerCase();
     const imageFormat = IMAGE_FORMATS[mime];
     if (imageFormat) {
-        return { image: { format: imageFormat, source: { bytes: yield* mediaBase64(part) } } };
+        return [{ image: { format: imageFormat, source: { bytes: yield* mediaBase64(part) } } }];
     }
     if (mime.startsWith("image/"))
         return yield* ProviderShared.invalidRequest(`Bedrock Converse does not support image media type ${part.mediaType}`);
     const documentFormat = DOCUMENT_FORMATS[mime];
     if (documentFormat) {
-        if (!part.filename)
-            return yield* ProviderShared.invalidRequest("Bedrock Converse document media requires a filename");
-        return documentBlock(part.filename, documentFormat, yield* mediaBase64(part));
+        const name = documentName(part.filename, documentNames);
+        const block = documentBlock(name, documentFormat, yield* mediaBase64(part));
+        return part.filename !== undefined && part.filename !== name
+            ? [
+                {
+                    text: `Attached file ${ProviderShared.encodeJson(part.filename)} has document label ${ProviderShared.encodeJson(name)}.`,
+                },
+                block,
+            ]
+            : [block];
     }
     return yield* ProviderShared.invalidRequest(`Bedrock Converse does not support media type ${part.mediaType}`);
 });

package/dist/protocols/utils/mistral-tool-id.d.ts

@@ -0,0 +1,5 @@
+import type { LLMRequest } from "../../schema/index.js";
+export declare const valid: RegExp;
+export declare const hash: (value: string) => string;
+export declare const normalizer: (request: LLMRequest) => (id: string) => string;
+export * as MistralToolID from "./mistral-tool-id.js";

package/dist/protocols/utils/mistral-tool-id.js

@@ -0,0 +1,31 @@
+export const valid = /^[A-Za-z0-9]{9}$/;
+export const hash = (value) => {
+    const hash = (seed) => {
+        let result = seed;
+        for (const char of value)
+            result = Math.imul(result ^ char.charCodeAt(0), 16777619);
+        return (result >>> 0).toString(36);
+    };
+    return `${hash(2166136261).padStart(7, "0")}${hash(2246822519).padStart(7, "0")}`.slice(-9);
+};
+export const normalizer = (request) => {
+    const ids = request.messages.flatMap((message) => message.content.flatMap((part) => (part.type === "tool-call" || part.type === "tool-result" ? [part.id] : [])));
+    // Reserve valid IDs before projecting any history, including IDs encountered later.
+    const used = new Set(ids.filter((id) => valid.test(id)));
+    const normalized = new Map();
+    return (id) => {
+        if (valid.test(id))
+            return id;
+        const previous = normalized.get(id);
+        if (previous)
+            return previous;
+        let attempt = 0;
+        let candidate = hash(id);
+        while (used.has(candidate))
+            candidate = hash(`${id}:${++attempt}`);
+        used.add(candidate);
+        normalized.set(id, candidate);
+        return candidate;
+    };
+};
+export * as MistralToolID from "./mistral-tool-id.js";

package/package.json

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