@ai-sdk/google 4.0.46 → 4.0.48

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ai-sdk/google
 
+## 4.0.48
+
+### Patch Changes
+
+- 6c5a1ed: Inline local JSON Schema references in Google tool and structured-output schemas.
+
+## 4.0.47
+
+### Patch Changes
+
+- e6087c9: fix: handle empty string tool call IDs
+- Updated dependencies [e6087c9]
+  - @ai-sdk/provider-utils@5.0.28
+
 ## 4.0.46
 
 ### Patch Changes

package/dist/index.js

@@ -7,7 +7,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "4.0.46" : "0.0.0-test";
+var VERSION = true ? "4.0.48" : "0.0.0-test";
 
 // src/google-embedding-model.ts
 import {
@@ -303,21 +303,37 @@ import {
   UnsupportedFunctionalityError
 } from "@ai-sdk/provider";
 function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
+  const rootSchema = typeof jsonSchema === "object" ? jsonSchema : void 0;
+  return convertJSONSchemaDefinition(jsonSchema, isRoot, {
+    definitions: rootSchema == null ? void 0 : rootSchema.definitions,
+    dollarDefinitions: rootSchema == null ? void 0 : rootSchema.$defs,
+    resolvingReferences: /* @__PURE__ */ new Set()
+  });
+}
+function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
   if (jsonSchema == null) {
     return void 0;
   }
+  if (typeof jsonSchema === "boolean") {
+    return { type: "boolean", properties: {} };
+  }
+  if (jsonSchema.$ref != null) {
+    return convertJSONSchemaReference({
+      jsonSchema,
+      reference: jsonSchema.$ref,
+      isRoot,
+      referenceContext
+    });
+  }
   if (isEmptyObjectSchema(jsonSchema)) {
     if (isRoot) {
       return void 0;
     }
-    if (typeof jsonSchema === "object" && jsonSchema.description) {
+    if (jsonSchema.description) {
       return { type: "object", description: jsonSchema.description };
     }
     return { type: "object" };
   }
-  if (typeof jsonSchema === "boolean") {
-    return { type: "boolean", properties: {} };
-  }
   const {
     type,
     description,
@@ -359,18 +375,20 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
   if (properties != null) {
     result.properties = Object.entries(properties).reduce(
       (acc, [key, value]) => {
-        acc[key] = convertJSONSchemaToOpenAPISchema(value, false);
+        acc[key] = convertJSONSchemaDefinition(value, false, referenceContext);
         return acc;
       },
       {}
     );
   }
   if (items) {
-    result.items = Array.isArray(items) ? items.map((item) => convertJSONSchemaToOpenAPISchema(item, false)) : convertJSONSchemaToOpenAPISchema(items, false);
+    result.items = Array.isArray(items) ? items.map(
+      (item) => convertJSONSchemaDefinition(item, false, referenceContext)
+    ) : convertJSONSchemaDefinition(items, false, referenceContext);
   }
   if (allOf) {
     result.allOf = allOf.map(
-      (item) => convertJSONSchemaToOpenAPISchema(item, false)
+      (item) => convertJSONSchemaDefinition(item, false, referenceContext)
     );
   }
   if (anyOf) {
@@ -381,9 +399,10 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
         (schema) => !(typeof schema === "object" && (schema == null ? void 0 : schema.type) === "null")
       );
       if (nonNullSchemas.length === 1) {
-        const converted = convertJSONSchemaToOpenAPISchema(
+        const converted = convertJSONSchemaDefinition(
           nonNullSchemas[0],
-          false
+          false,
+          referenceContext
         );
         if (typeof converted === "object") {
           result.nullable = true;
@@ -391,19 +410,19 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
         }
       } else {
         result.anyOf = nonNullSchemas.map(
-          (item) => convertJSONSchemaToOpenAPISchema(item, false)
+          (item) => convertJSONSchemaDefinition(item, false, referenceContext)
         );
         result.nullable = true;
       }
     } else {
       result.anyOf = anyOf.map(
-        (item) => convertJSONSchemaToOpenAPISchema(item, false)
+        (item) => convertJSONSchemaDefinition(item, false, referenceContext)
       );
     }
   }
   if (oneOf) {
     result.oneOf = oneOf.map(
-      (item) => convertJSONSchemaToOpenAPISchema(item, false)
+      (item) => convertJSONSchemaDefinition(item, false, referenceContext)
     );
   }
   if (minLength !== void 0) {
@@ -411,6 +430,76 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
   }
   return result;
 }
+function convertJSONSchemaReference({
+  jsonSchema,
+  reference,
+  isRoot,
+  referenceContext
+}) {
+  const { definition, referenceKey } = getReferencedDefinition(
+    reference,
+    referenceContext
+  );
+  if (referenceContext.resolvingReferences.has(referenceKey)) {
+    throw new UnsupportedFunctionalityError({
+      functionality: `recursive JSON Schema reference: ${reference}`,
+      message: "Google schema conversion does not support recursive JSON Schema references."
+    });
+  }
+  const resolvingReferences = new Set(referenceContext.resolvingReferences);
+  resolvingReferences.add(referenceKey);
+  const { $ref: _reference, ...siblingSchema } = jsonSchema;
+  const resolvedSchema = typeof definition === "boolean" ? definition ? siblingSchema : false : { ...definition, ...siblingSchema };
+  return convertJSONSchemaDefinition(resolvedSchema, isRoot, {
+    ...referenceContext,
+    resolvingReferences
+  });
+}
+function getReferencedDefinition(reference, referenceContext) {
+  const definitionSources = [
+    {
+      prefix: "#/$defs/",
+      definitions: referenceContext.dollarDefinitions
+    },
+    {
+      prefix: "#/definitions/",
+      definitions: referenceContext.definitions
+    }
+  ];
+  const source = definitionSources.find(
+    ({ prefix }) => reference.startsWith(prefix)
+  );
+  const encodedDefinitionName = source ? reference.slice(source.prefix.length) : void 0;
+  if (source == null || encodedDefinitionName == null || encodedDefinitionName.length === 0 || encodedDefinitionName.includes("/")) {
+    throwUnsupportedReference(reference);
+  }
+  let decodedDefinitionName;
+  try {
+    decodedDefinitionName = decodeURIComponent(encodedDefinitionName);
+  } catch (e) {
+    throwUnsupportedReference(reference);
+  }
+  if (decodedDefinitionName.includes("/") || /~(?![01])/u.test(decodedDefinitionName) || source.definitions == null) {
+    throwUnsupportedReference(reference);
+  }
+  const definitionName = decodedDefinitionName.replace(
+    /~[01]/g,
+    (match) => match === "~1" ? "/" : "~"
+  );
+  if (!Object.prototype.hasOwnProperty.call(source.definitions, definitionName)) {
+    throwUnsupportedReference(reference);
+  }
+  return {
+    definition: source.definitions[definitionName],
+    referenceKey: `${source.prefix}${definitionName}`
+  };
+}
+function throwUnsupportedReference(reference) {
+  throw new UnsupportedFunctionalityError({
+    functionality: `JSON Schema reference: ${reference}`,
+    message: "Google schema conversion only supports references to direct children of root-level $defs or definitions."
+  });
+}
 function addEnumToSchema({
   values,
   type,
@@ -1881,7 +1970,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const { args, warnings, providerOptionsNames, extraHeaders } = await this.getArgs(options);
     const wrapProviderMetadata = (payload) => Object.fromEntries(
       providerOptionsNames.map((name) => [name, payload])
@@ -1953,9 +2042,9 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
       } else if ("functionCall" in part && part.functionCall.name != null) {
         content.push({
           type: "tool-call",
-          toolCallId: (_e = part.functionCall.id) != null ? _e : this.config.generateId(),
+          toolCallId: part.functionCall.id || this.config.generateId(),
           toolName: part.functionCall.name,
-          input: JSON.stringify((_f = part.functionCall.args) != null ? _f : {}),
+          input: JSON.stringify((_e = part.functionCall.args) != null ? _e : {}),
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
             thoughtSignature: part.thoughtSignature
           }) : void 0
@@ -1972,13 +2061,13 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           }) : void 0
         });
       } else if ("toolCall" in part && part.toolCall) {
-        const toolCallId = (_g = part.toolCall.id) != null ? _g : this.config.generateId();
+        const toolCallId = part.toolCall.id || this.config.generateId();
         lastServerToolCallId = toolCallId;
         content.push({
           type: "tool-call",
           toolCallId,
           toolName: `server:${part.toolCall.toolType}`,
-          input: JSON.stringify((_h = part.toolCall.args) != null ? _h : {}),
+          input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
           providerExecuted: true,
           dynamic: true,
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
@@ -1991,12 +2080,12 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
           })
         });
       } else if ("toolResponse" in part && part.toolResponse) {
-        const responseToolCallId = (_i = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _i : this.config.generateId();
+        const responseToolCallId = lastServerToolCallId || part.toolResponse.id || this.config.generateId();
         content.push({
           type: "tool-result",
           toolCallId: responseToolCallId,
           toolName: `server:${part.toolResponse.toolType}`,
-          result: (_j = part.toolResponse.response) != null ? _j : {},
+          result: (_g = part.toolResponse.response) != null ? _g : {},
           providerMetadata: part.thoughtSignature ? wrapProviderMetadata({
             thoughtSignature: part.thoughtSignature,
             serverToolCallId: responseToolCallId,
@@ -2009,10 +2098,10 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
         lastServerToolCallId = void 0;
       }
     }
-    const sources = (_k = extractSources({
+    const sources = (_h = extractSources({
       groundingMetadata: candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _k : [];
+    })) != null ? _h : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -2026,23 +2115,23 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
             (part) => part.type === "tool-call" && !part.providerExecuted
           )
         }),
-        raw: (_l = candidate.finishReason) != null ? _l : void 0
+        raw: (_i = candidate.finishReason) != null ? _i : void 0
       },
       usage: convertGoogleUsage(usageMetadata),
       warnings,
       providerMetadata: wrapProviderMetadata({
-        promptFeedback: (_m = response.promptFeedback) != null ? _m : null,
-        groundingMetadata: (_n = candidate.groundingMetadata) != null ? _n : null,
-        urlContextMetadata: (_o = candidate.urlContextMetadata) != null ? _o : null,
-        safetyRatings: (_p = candidate.safetyRatings) != null ? _p : null,
+        promptFeedback: (_j = response.promptFeedback) != null ? _j : null,
+        groundingMetadata: (_k = candidate.groundingMetadata) != null ? _k : null,
+        urlContextMetadata: (_l = candidate.urlContextMetadata) != null ? _l : null,
+        safetyRatings: (_m = candidate.safetyRatings) != null ? _m : null,
         usageMetadata: usageMetadata != null ? usageMetadata : null,
-        finishMessage: (_q = candidate.finishMessage) != null ? _q : null,
-        serviceTier: (_r = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _r : null
+        finishMessage: (_n = candidate.finishMessage) != null ? _n : null,
+        serviceTier: (_o = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _o : null
       }),
       request: { body: args },
       response: {
         // TODO timestamp, model id
-        id: (_s = response.responseId) != null ? _s : void 0,
+        id: (_p = response.responseId) != null ? _p : void 0,
         headers: responseHeaders,
         body: rawResponse
       }
@@ -2122,7 +2211,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -2276,7 +2365,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                     providerMetadata: fileMeta
                   });
                 } else if ("toolCall" in part && part.toolCall) {
-                  const toolCallId = (_e = part.toolCall.id) != null ? _e : generateId3();
+                  const toolCallId = part.toolCall.id || generateId3();
                   lastServerToolCallId = toolCallId;
                   const serverMeta = wrapProviderMetadata({
                     ...part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {},
@@ -2287,13 +2376,13 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                     type: "tool-call",
                     toolCallId,
                     toolName: `server:${part.toolCall.toolType}`,
-                    input: JSON.stringify((_f = part.toolCall.args) != null ? _f : {}),
+                    input: JSON.stringify((_e = part.toolCall.args) != null ? _e : {}),
                     providerExecuted: true,
                     dynamic: true,
                     providerMetadata: serverMeta
                   });
                 } else if ("toolResponse" in part && part.toolResponse) {
-                  const responseToolCallId = (_g = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _g : generateId3();
+                  const responseToolCallId = lastServerToolCallId || part.toolResponse.id || generateId3();
                   const serverMeta = wrapProviderMetadata({
                     ...part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {},
                     serverToolCallId: responseToolCallId,
@@ -2303,7 +2392,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                     type: "tool-result",
                     toolCallId: responseToolCallId,
                     toolName: `server:${part.toolResponse.toolType}`,
-                    result: (_h = part.toolResponse.response) != null ? _h : {},
+                    result: (_f = part.toolResponse.response) != null ? _f : {},
                     providerMetadata: serverMeta
                   });
                   lastServerToolCallId = void 0;
@@ -2320,7 +2409,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                 const isNoArgsCompleteCall = part.functionCall.name != null && part.functionCall.args == null && part.functionCall.partialArgs == null && part.functionCall.willContinue !== true;
                 if (isStreamingChunk) {
                   if (part.functionCall.name != null) {
-                    const toolCallId = (_i = part.functionCall.id) != null ? _i : generateId3();
+                    const toolCallId = part.functionCall.id || generateId3();
                     const accumulator = new GoogleJSONAccumulator();
                     activeStreamingToolCalls.push({
                       toolCallId,
@@ -2368,9 +2457,9 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                 } else if (isTerminalChunk && activeStreamingToolCalls.length > 0) {
                   finishActiveStreamingToolCall(controller);
                 } else if (isCompleteCall) {
-                  const toolCallId = (_j = part.functionCall.id) != null ? _j : generateId3();
+                  const toolCallId = part.functionCall.id || generateId3();
                   const toolName = part.functionCall.name;
-                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_k = part.functionCall.args) != null ? _k : {});
+                  const args2 = typeof part.functionCall.args === "string" ? part.functionCall.args : JSON.stringify((_g = part.functionCall.args) != null ? _g : {});
                   controller.enqueue({
                     type: "tool-input-start",
                     id: toolCallId,
@@ -2397,7 +2486,7 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                   });
                   hasToolCalls = true;
                 } else if (isNoArgsCompleteCall) {
-                  const toolCallId = (_l = part.functionCall.id) != null ? _l : generateId3();
+                  const toolCallId = part.functionCall.id || generateId3();
                   const toolName = part.functionCall.name;
                   controller.enqueue({
                     type: "tool-input-start",
@@ -2430,13 +2519,13 @@ var GoogleLanguageModel = class _GoogleLanguageModel {
                 raw: candidate.finishReason
               };
               providerMetadata = wrapProviderMetadata({
-                promptFeedback: (_m = value.promptFeedback) != null ? _m : null,
+                promptFeedback: (_h = value.promptFeedback) != null ? _h : null,
                 groundingMetadata: lastGroundingMetadata,
                 urlContextMetadata: lastUrlContextMetadata,
-                safetyRatings: (_n = candidate.safetyRatings) != null ? _n : null,
+                safetyRatings: (_i = candidate.safetyRatings) != null ? _i : null,
                 usageMetadata: usageMetadata != null ? usageMetadata : null,
-                finishMessage: (_o = candidate.finishMessage) != null ? _o : null,
-                serviceTier: (_p = usage == null ? void 0 : usage.serviceTier) != null ? _p : null
+                finishMessage: (_j = candidate.finishMessage) != null ? _j : null,
+                serviceTier: (_k = usage == null ? void 0 : usage.serviceTier) != null ? _k : null
               });
             }
           },
@@ -4417,7 +4506,7 @@ function buildGoogleInteractionsStreamTransform({
       controller.enqueue({ type: "stream-start", warnings });
     },
     transform(chunk, controller) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
       if (includeRawChunks) {
         controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
       }
@@ -4508,8 +4597,8 @@ function buildGoogleInteractionsStreamTransform({
               }
             }
           } else if (stepType === "function_call") {
-            const toolCallId = (_b = step == null ? void 0 : step.id) != null ? _b : blockId;
-            const toolName = (_c = step == null ? void 0 : step.name) != null ? _c : "unknown";
+            const toolCallId = (step == null ? void 0 : step.id) || blockId;
+            const toolName = (_b = step == null ? void 0 : step.name) != null ? _b : "unknown";
             hasFunctionCall = true;
             const state = {
               kind: "function_call",
@@ -4526,28 +4615,28 @@ function buildGoogleInteractionsStreamTransform({
               toolName
             });
           } else if (stepType != null && BUILTIN_TOOL_CALL_TYPES.has(stepType)) {
-            const toolName = stepType === "mcp_server_tool_call" ? (_d = step == null ? void 0 : step.name) != null ? _d : "mcp_server_tool" : builtinToolNameFromCallType(stepType);
-            const toolCallId = (_e = step == null ? void 0 : step.id) != null ? _e : blockId;
+            const toolName = stepType === "mcp_server_tool_call" ? (_c = step == null ? void 0 : step.name) != null ? _c : "mcp_server_tool" : builtinToolNameFromCallType(stepType);
+            const toolCallId = (step == null ? void 0 : step.id) || blockId;
             const state = {
               kind: "builtin_tool_call",
               id: blockId,
               blockType: stepType,
               toolCallId,
               toolName,
-              arguments: (_f = step == null ? void 0 : step.arguments) != null ? _f : {},
+              arguments: (_d = step == null ? void 0 : step.arguments) != null ? _d : {},
               callEmitted: false
             };
             openBlocks.set(index, state);
           } else if (stepType != null && BUILTIN_TOOL_RESULT_TYPES.has(stepType)) {
-            const toolName = stepType === "mcp_server_tool_result" ? (_g = step == null ? void 0 : step.name) != null ? _g : "mcp_server_tool" : builtinToolNameFromResultType(stepType);
-            const callId = (_h = step == null ? void 0 : step.call_id) != null ? _h : blockId;
+            const toolName = stepType === "mcp_server_tool_result" ? (_e = step == null ? void 0 : step.name) != null ? _e : "mcp_server_tool" : builtinToolNameFromResultType(stepType);
+            const callId = (step == null ? void 0 : step.call_id) || blockId;
             const state = {
               kind: "builtin_tool_result",
               id: blockId,
               blockType: stepType,
               callId,
               toolName,
-              result: (_i = step == null ? void 0 : step.result) != null ? _i : null,
+              result: (_f = step == null ? void 0 : step.result) != null ? _f : null,
               ...(step == null ? void 0 : step.is_error) != null ? { isError: step.is_error } : {},
               resultEmitted: false
             };
@@ -4561,7 +4650,7 @@ function buildGoogleInteractionsStreamTransform({
           const event = value;
           let open = openBlocks.get(event.index);
           if (open == null) break;
-          const dtype = (_j = event.delta) == null ? void 0 : _j.type;
+          const dtype = (_g = event.delta) == null ? void 0 : _g.type;
           if (open.kind === "pending_model_output") {
             if (dtype === "text" || dtype === "text_annotation" || dtype === "text_annotation_delta") {
               const promoted = {
@@ -4582,14 +4671,14 @@ function buildGoogleInteractionsStreamTransform({
             if ((imageDelta == null ? void 0 : imageDelta.data) != null && imageDelta.data.length > 0) {
               controller.enqueue({
                 type: "file",
-                mediaType: (_k = imageDelta.mime_type) != null ? _k : "image/png",
+                mediaType: (_h = imageDelta.mime_type) != null ? _h : "image/png",
                 data: { type: "data", data: imageDelta.data },
                 ...providerMetadata ? { providerMetadata } : {}
               });
             } else if ((imageDelta == null ? void 0 : imageDelta.uri) != null && imageDelta.uri.length > 0) {
               controller.enqueue({
                 type: "file",
-                mediaType: (_l = imageDelta.mime_type) != null ? _l : "image/png",
+                mediaType: (_i = imageDelta.mime_type) != null ? _i : "image/png",
                 data: { type: "url", url: new URL(imageDelta.uri) },
                 ...providerMetadata ? { providerMetadata } : {}
               });
@@ -4608,14 +4697,14 @@ function buildGoogleInteractionsStreamTransform({
             if ((videoDelta == null ? void 0 : videoDelta.data) != null && videoDelta.data.length > 0) {
               controller.enqueue({
                 type: "file",
-                mediaType: (_m = videoDelta.mime_type) != null ? _m : "video/mp4",
+                mediaType: (_j = videoDelta.mime_type) != null ? _j : "video/mp4",
                 data: { type: "data", data: videoDelta.data },
                 ...providerMetadata ? { providerMetadata } : {}
               });
             } else if ((videoDelta == null ? void 0 : videoDelta.uri) != null && videoDelta.uri.length > 0) {
               controller.enqueue({
                 type: "file",
-                mediaType: (_n = videoDelta.mime_type) != null ? _n : "video/mp4",
+                mediaType: (_k = videoDelta.mime_type) != null ? _k : "video/mp4",
                 data: { type: "url", url: new URL(videoDelta.uri) },
                 ...providerMetadata ? { providerMetadata } : {}
               });
@@ -4624,7 +4713,7 @@ function buildGoogleInteractionsStreamTransform({
           }
           const delta = event.delta;
           if (open.kind === "text" && (delta == null ? void 0 : delta.type) === "text") {
-            const text = (_o = delta.text) != null ? _o : "";
+            const text = (_l = delta.text) != null ? _l : "";
             if (text.length > 0) {
               controller.enqueue({
                 type: "text-delta",
@@ -4674,7 +4763,7 @@ function buildGoogleInteractionsStreamTransform({
                 delta: slice
               });
             }
-            if (delta.id != null) {
+            if (delta.id != null && delta.id.length > 0) {
               open.toolCallId = delta.id;
             }
             if (delta.signature != null) {
@@ -4682,7 +4771,9 @@ function buildGoogleInteractionsStreamTransform({
             }
             hasFunctionCall = true;
           } else if (open.kind === "builtin_tool_call" && (delta == null ? void 0 : delta.type) === open.blockType) {
-            if (delta.id != null) open.toolCallId = delta.id;
+            if (delta.id != null && delta.id.length > 0) {
+              open.toolCallId = delta.id;
+            }
             if (delta.arguments != null && typeof delta.arguments === "object") {
               open.arguments = delta.arguments;
             }
@@ -4690,7 +4781,9 @@ function buildGoogleInteractionsStreamTransform({
               open.toolName = delta.name;
             }
           } else if (open.kind === "builtin_tool_result" && (delta == null ? void 0 : delta.type) === open.blockType) {
-            if (delta.call_id != null) open.callId = delta.call_id;
+            if (delta.call_id != null && delta.call_id.length > 0) {
+              open.callId = delta.call_id;
+            }
             if (delta.result !== void 0) open.result = delta.result;
             if (delta.is_error != null) open.isError = delta.is_error;
             if (delta.name != null && open.blockType === "mcp_server_tool_result") {
@@ -4727,14 +4820,14 @@ function buildGoogleInteractionsStreamTransform({
             if (open.data != null && open.data.length > 0) {
               controller.enqueue({
                 type: "file",
-                mediaType: (_p = open.mimeType) != null ? _p : "image/png",
+                mediaType: (_m = open.mimeType) != null ? _m : "image/png",
                 data: { type: "data", data: open.data },
                 ...providerMetadata ? { providerMetadata } : {}
               });
             } else if (open.uri != null && open.uri.length > 0) {
               controller.enqueue({
                 type: "file",
-                mediaType: (_q = open.mimeType) != null ? _q : "image/png",
+                mediaType: (_n = open.mimeType) != null ? _n : "image/png",
                 data: { type: "url", url: new URL(open.uri) },
                 ...providerMetadata ? { providerMetadata } : {}
               });
@@ -4761,7 +4854,7 @@ function buildGoogleInteractionsStreamTransform({
               type: "tool-call",
               toolCallId: open.toolCallId,
               toolName: open.toolName,
-              input: JSON.stringify((_r = open.arguments) != null ? _r : {}),
+              input: JSON.stringify((_o = open.arguments) != null ? _o : {}),
               providerExecuted: true
             });
             open.callEmitted = true;
@@ -4770,7 +4863,7 @@ function buildGoogleInteractionsStreamTransform({
               type: "tool-result",
               toolCallId: open.callId,
               toolName: open.toolName,
-              result: (_s = open.result) != null ? _s : null
+              result: (_p = open.result) != null ? _p : null
             });
             open.resultEmitted = true;
             const sources = builtinToolResultToSources({
@@ -4824,7 +4917,7 @@ function buildGoogleInteractionsStreamTransform({
         case "error": {
           const event = value;
           finishStatus = "failed";
-          const errorPayload = (_t = event.error) != null ? _t : {
+          const errorPayload = (_q = event.error) != null ? _q : {
             message: "Unknown interaction error"
           };
           controller.enqueue({ type: "error", error: errorPayload });
@@ -5812,7 +5905,7 @@ function parseGoogleInteractionsOutputs({
   generateId: generateId3,
   interactionId
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const content = [];
   let hasFunctionCall = false;
   if (steps == null) {
@@ -5919,19 +6012,19 @@ function parseGoogleInteractionsOutputs({
           const input = JSON.stringify((_i = call.arguments) != null ? _i : {});
           content.push({
             type: "tool-call",
-            toolCallId: (_j = call.id) != null ? _j : generateId3(),
+            toolCallId: call.id || generateId3(),
             toolName,
             input,
             providerExecuted: true
           });
         } else if (BUILTIN_TOOL_RESULT_TYPES2.has(type)) {
           const result = step;
-          const toolName = type === "mcp_server_tool_result" ? (_k = result.name) != null ? _k : "mcp_server_tool" : builtinToolNameFromResultType2(type);
+          const toolName = type === "mcp_server_tool_result" ? (_j = result.name) != null ? _j : "mcp_server_tool" : builtinToolNameFromResultType2(type);
           content.push({
             type: "tool-result",
-            toolCallId: (_l = result.call_id) != null ? _l : generateId3(),
+            toolCallId: result.call_id || generateId3(),
             toolName,
-            result: (_m = result.result) != null ? _m : null
+            result: (_k = result.result) != null ? _k : null
           });
           const sources = builtinToolResultToSources({
             block: step,