@opencode-ai/ai 0.0.0-beta-17823 → 0.0.0-beta-17898

package/dist/protocols/gemini.d.ts

@@ -225,7 +225,6 @@ export declare const protocol: Protocol<{
     } | undefined;
 }, {
     hasToolCalls: boolean;
-    nextToolCallId: number;
     lifecycle: Lifecycle.State;
 }>;
 export declare const route: Route<{

package/dist/protocols/gemini.js

@@ -26,6 +26,9 @@ const requiresThoughtSignatureFallback = (modelID) => {
         return false;
     return !/(^|\/)gemini-robotics-er-1\.5(?:[.-]|$)/i.test(modelID);
 };
+// Gemini 3 accepts media nested inside function responses; matched Gemini 2.5 variants reject it,
+// so their tool-result attachments lower as a separate user turn instead.
+const routesLegacyToolMedia = (modelID) => /gemini-2[.-]5(?:[.-]|$)/i.test(modelID);
 // =============================================================================
 // Request Body Schema
 // =============================================================================
@@ -197,7 +200,17 @@ const lowerToolCall = (part) => ({
 });
 const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request) {
     const contents = [];
+    const legacyToolMedia = routesLegacyToolMedia(request.model.id);
+    let pendingMedia;
+    const flushMedia = () => {
+        if (!pendingMedia)
+            return;
+        contents.push({ role: "user", parts: [{ text: "Attached media from tool result:" }, ...pendingMedia] });
+        pendingMedia = undefined;
+    };
     for (const message of request.messages) {
+        if (message.role !== "tool")
+            flushMedia();
         if (message.role === "system") {
             const part = yield* ProviderShared.wrappedSystemUpdate("Gemini", message);
             const previous = contents.at(-1);
@@ -227,7 +240,7 @@ const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request) {
                 if (!ProviderShared.supportsContent(part, ["text", "reasoning", "tool-call"]))
                     return yield* ProviderShared.unsupportedContent("Gemini", "assistant", ["text", "reasoning", "tool-call"]);
                 if (part.type === "text") {
-                    parts.push({ text: part.text });
+                    parts.push({ text: part.text, thoughtSignature: thoughtSignature(part.providerMetadata) });
                     continue;
                 }
                 if (part.type === "reasoning") {
@@ -278,6 +291,8 @@ const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request) {
                 const value = ProviderShared.normalizeToolFile(item);
                 media.push({ inlineData: { mimeType: value.mime, data: value.base64 } });
             }
+            if (legacyToolMedia && media.length > 0)
+                (pendingMedia ??= []).push(...media);
             parts.push({
                 functionResponse: {
                     id: functionCallId(part.providerMetadata),
@@ -286,7 +301,7 @@ const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request) {
                         name: part.name,
                         content: text.join("\n"),
                     },
-                    parts: media.length > 0 ? media : undefined,
+                    parts: legacyToolMedia || media.length === 0 ? undefined : media,
                 },
             });
         }
@@ -298,6 +313,7 @@ const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request) {
         else
             contents.push({ role: "user", parts });
     }
+    flushMedia();
     return contents;
 });
 const resolveOptions = (request) => {
@@ -422,9 +438,11 @@ const finish = (state) => {
     if (finishReason === undefined && state.usage === undefined)
         return [];
     const events = [];
-    const lifecycle = state.reasoningSignature
-        ? Lifecycle.reasoningEnd(state.lifecycle, events, "reasoning-0", googleMetadata({ thoughtSignature: state.reasoningSignature }))
-        : state.lifecycle;
+    let lifecycle = state.lifecycle;
+    if (state.reasoningSignature !== undefined)
+        lifecycle = Lifecycle.reasoningEnd(lifecycle, events, "reasoning-0", googleMetadata({ thoughtSignature: state.reasoningSignature }));
+    if (state.textSignature !== undefined)
+        lifecycle = Lifecycle.textEnd(lifecycle, events, "text-0", googleMetadata({ thoughtSignature: state.textSignature }));
     Lifecycle.finish(lifecycle, events, {
         reason: {
             normalized: promptBlockReason === undefined ? mapFinishReason(finishReason, state.hasToolCalls) : "content-filter",
@@ -450,23 +468,31 @@ const step = (state, event) => {
     const events = [];
     let hasToolCalls = nextState.hasToolCalls;
     let lifecycle = nextState.lifecycle;
-    let nextToolCallId = nextState.nextToolCallId;
     let reasoningSignature = nextState.reasoningSignature;
+    let textSignature = nextState.textSignature;
     for (const part of candidate.content.parts) {
-        if ("thoughtSignature" in part && part.thoughtSignature && "thought" in part && part.thought)
-            reasoningSignature = part.thoughtSignature;
+        const signature = "thoughtSignature" in part && part.thoughtSignature ? part.thoughtSignature : undefined;
+        // Gemini attaches replay signatures to thought parts, visible text, or function calls;
+        // each block kind must retain the signature attached to its own parts.
+        if (signature !== undefined && "thought" in part && part.thought)
+            reasoningSignature = signature;
+        else if (signature !== undefined && "text" in part)
+            textSignature = signature;
         if ("text" in part && part.text.length > 0) {
             if (part.thought) {
-                lifecycle = Lifecycle.reasoningDelta(lifecycle, events, "reasoning-0", part.text, part.thoughtSignature ? googleMetadata({ thoughtSignature: part.thoughtSignature }) : undefined);
+                lifecycle = Lifecycle.reasoningDelta(lifecycle, events, "reasoning-0", part.text, signature ? googleMetadata({ thoughtSignature: signature }) : undefined);
                 continue;
             }
             lifecycle = Lifecycle.reasoningEnd(lifecycle, events, "reasoning-0", reasoningSignature ? googleMetadata({ thoughtSignature: reasoningSignature }) : undefined);
-            lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", part.text);
+            lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", part.text, textSignature ? googleMetadata({ thoughtSignature: textSignature }) : undefined);
+            textSignature = undefined;
             continue;
         }
         if ("functionCall" in part) {
             const input = part.functionCall.args === undefined ? {} : part.functionCall.args;
-            const id = `tool_${nextToolCallId++}`;
+            // Gemini 2.0+ and Vertex supply a unique function call ID on the part; when omitted (e.g. Gemini 1.5),
+            // generate a globally unique ID rather than a per-request counter to prevent cross-request collisions in downstream registries.
+            const id = part.functionCall.id ?? `tool_${crypto.randomUUID().replaceAll("-", "")}`;
             const metadata = {
                 ...(part.functionCall.id === undefined ? {} : { functionCallId: part.functionCall.id }),
                 ...(part.thoughtSignature === undefined ? {} : { thoughtSignature: part.thoughtSignature }),
@@ -487,8 +513,8 @@ const step = (state, event) => {
             ...nextState,
             hasToolCalls,
             lifecycle,
-            nextToolCallId,
             reasoningSignature,
+            textSignature,
             finishReason: candidate.finishReason ?? nextState.finishReason,
         },
         events,
@@ -509,7 +535,7 @@ export const protocol = Protocol.make({
     },
     stream: {
         event: Protocol.jsonEvent(GeminiEvent),
-        initial: () => ({ hasToolCalls: false, nextToolCallId: 0, lifecycle: Lifecycle.initial() }),
+        initial: () => ({ hasToolCalls: false, lifecycle: Lifecycle.initial() }),
         step,
         onHalt: finish,
     },

package/dist/protocols/openai-images.js

@@ -61,7 +61,7 @@ export const model = (input) => {
                     return Effect.succeed({ data: image.data, mediaType: image.mediaType });
                 if (image.type === "url")
                     return ImageInputs.decodeDataUrl(image.url, ADAPTER);
-                return Effect.succeed(undefined);
+                return Effect.undefined;
             });
             const multipartMask = mask === undefined
                 ? undefined

package/dist/protocols/utils/image-input.js

@@ -8,7 +8,7 @@ const invalid = (module, message) => new AIError({
 export const dataUrl = (input) => `data:${input.mediaType};base64,${Encoding.encodeBase64(input.data)}`;
 export const decodeDataUrl = (url, module) => {
     if (!url.startsWith("data:"))
-        return Effect.succeed(undefined);
+        return Effect.undefined;
     const match = /^data:([^;,]+);base64,(.*)$/s.exec(url);
     if (!match)
         return Effect.fail(invalid(module, "Image data URLs must contain a MIME type and base64 data"));

package/dist/protocols/utils/lifecycle.d.ts

@@ -7,7 +7,7 @@ export interface State {
 export declare const initial: () => State;
 export declare const stepStart: (state: State, events: LLMEvent[]) => State;
 export declare const textStart: (state: State, events: LLMEvent[], id: string, providerMetadata?: ProviderMetadata) => State;
-export declare const textDelta: (state: State, events: LLMEvent[], id: string, text: string) => State;
+export declare const textDelta: (state: State, events: LLMEvent[], id: string, text: string, providerMetadata?: ProviderMetadata) => State;
 export declare const reasoningStart: (state: State, events: LLMEvent[], id: string, providerMetadata?: ProviderMetadata) => State;
 export declare const reasoningDelta: (state: State, events: LLMEvent[], id: string, text: string, providerMetadata?: ProviderMetadata) => State;
 export declare const reasoningEnd: (state: State, events: LLMEvent[], id: string, providerMetadata?: ProviderMetadata) => State;

package/dist/protocols/utils/lifecycle.js

@@ -13,9 +13,9 @@ export const textStart = (state, events, id, providerMetadata) => {
     events.push(LLMEvent.textStart({ id, providerMetadata }));
     return { ...stepped, text: new Set([...stepped.text, id]) };
 };
-export const textDelta = (state, events, id, text) => {
+export const textDelta = (state, events, id, text, providerMetadata) => {
     const started = textStart(state, events, id);
-    events.push(LLMEvent.textDelta({ id, text }));
+    events.push(LLMEvent.textDelta({ id, text, providerMetadata }));
     return started;
 };
 export const reasoningStart = (state, events, id, providerMetadata) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "0.0.0-beta-17823",
+  "version": "0.0.0-beta-17898",
   "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.110",
-    "@opencode-ai/http-recorder": "0.0.0-beta-17823",
+    "@opencode-ai/http-recorder": "0.0.0-beta-17898",
     "@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-beta-17823",
+    "@opencode-ai/schema": "0.0.0-beta-17898",
     "aws4fetch": "1.0.20",
     "effect": "4.0.0-rc.110",
     "google-auth-library": "10.5.0"