@ai-sdk/google 2.0.84 → 2.0.85

package/dist/index.mjs

@@ -7,7 +7,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "2.0.84" : "0.0.0-test";
+var VERSION = true ? "2.0.85" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 import {
@@ -365,13 +365,15 @@ import {
   UnsupportedFunctionalityError
 } from "@ai-sdk/provider";
 import { convertToBase64 } from "@ai-sdk/provider-utils";
+var SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator";
 function convertToGoogleGenerativeAIMessages(prompt, options) {
-  var _a, _b;
+  var _a, _b, _c;
   const systemInstructionParts = [];
   const contents = [];
   let systemMessagesAllowed = true;
   const isGemmaModel = (_a = options == null ? void 0 : options.isGemmaModel) != null ? _a : false;
-  const supportsFunctionResponseParts = (_b = options == null ? void 0 : options.supportsFunctionResponseParts) != null ? _b : true;
+  const isGemini3Model = (_b = options == null ? void 0 : options.isGemini3Model) != null ? _b : false;
+  const supportsFunctionResponseParts = (_c = options == null ? void 0 : options.supportsFunctionResponseParts) != null ? _c : true;
   for (const { role, content } of prompt) {
     switch (role) {
       case "system": {
@@ -416,11 +418,12 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
       }
       case "assistant": {
         systemMessagesAllowed = false;
+        let modelResponseHasSignedFunctionCall = false;
         contents.push({
           role: "model",
           parts: content.map((part) => {
-            var _a2, _b2, _c;
-            const thoughtSignature = ((_b2 = (_a2 = part.providerOptions) == null ? void 0 : _a2.google) == null ? void 0 : _b2.thoughtSignature) != null ? String((_c = part.providerOptions.google) == null ? void 0 : _c.thoughtSignature) : void 0;
+            var _a2, _b2, _c2;
+            const thoughtSignature = ((_b2 = (_a2 = part.providerOptions) == null ? void 0 : _a2.google) == null ? void 0 : _b2.thoughtSignature) != null ? String((_c2 = part.providerOptions.google) == null ? void 0 : _c2.thoughtSignature) : void 0;
             switch (part.type) {
               case "text": {
                 return part.text.length === 0 ? void 0 : {
@@ -454,13 +457,17 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
                 };
               }
               case "tool-call": {
+                const effectiveThoughtSignature = thoughtSignature != null ? thoughtSignature : isGemini3Model && !modelResponseHasSignedFunctionCall ? SKIP_THOUGHT_SIGNATURE_VALIDATOR : void 0;
+                if (thoughtSignature != null) {
+                  modelResponseHasSignedFunctionCall = true;
+                }
                 return {
                   functionCall: {
                     ...part.toolCallId != null ? { id: part.toolCallId } : {},
                     name: part.toolName,
                     args: part.input
                   },
-                  thoughtSignature
+                  thoughtSignature: effectiveThoughtSignature
                 };
               }
             }
@@ -753,6 +760,27 @@ var VertexServiceTierMap = {
   priority: "SERVICE_TIER_PRIORITY"
 };
 
+// src/google-model-capabilities.ts
+var gemini1ModelPattern = /(^|\/)gemini-1(?:[.-]|$)/i;
+var gemini2ModelPattern = /(^|\/)gemini-2(?:[.-]|$)/i;
+var gemini25ModelPattern = /(^|\/)gemini-2\.5(?:[.-]|$)/i;
+var geminiModelPattern = /(^|\/)gemini-/i;
+function isKnownPreGemini2Model(modelId) {
+  return gemini1ModelPattern.test(modelId) || /(^|\/)gemini-pro(?:-vision)?$/i.test(modelId) || /(^|\/)gemini-robotics-er-1\.5(?:[.-]|$)/i.test(modelId);
+}
+function getGoogleModelCapabilities(modelId) {
+  const isGeminiModel = geminiModelPattern.test(modelId);
+  const isGemini2Model = gemini2ModelPattern.test(modelId);
+  const isKnownPreGemini2 = isKnownPreGemini2Model(modelId);
+  const isKnownOlderModel = isKnownPreGemini2 || isGemini2Model;
+  const usesGemini3Features = isGeminiModel && !isKnownOlderModel;
+  return {
+    supportsGemini2Tools: isGeminiModel && !isKnownPreGemini2 || modelId.toLowerCase().includes("nano-banana"),
+    supportsFileSearch: gemini25ModelPattern.test(modelId) || usesGemini3Features,
+    usesGemini3Features
+  };
+}
+
 // src/google-prepare-tools.ts
 import {
   UnsupportedFunctionalityError as UnsupportedFunctionalityError2
@@ -760,18 +788,13 @@ import {
 function prepareTools({
   tools,
   toolChoice,
-  modelId
+  modelId,
+  isVertexProvider = false
 }) {
-  var _a;
+  var _a, _b;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
-  const isLatest = [
-    "gemini-flash-latest",
-    "gemini-flash-lite-latest",
-    "gemini-pro-latest"
-  ].some((id) => id === modelId);
-  const isGemini2orNewer = modelId.includes("gemini-2") || modelId.includes("gemini-3") || modelId.includes("nano-banana") || isLatest;
-  const supportsFileSearch = modelId.includes("gemini-2.5") || modelId.includes("gemini-3");
+  const { supportsGemini2Tools, supportsFileSearch, usesGemini3Features } = getGoogleModelCapabilities(modelId);
   if (tools == null) {
     return { tools: void 0, toolConfig: void 0, toolWarnings };
   }
@@ -779,7 +802,7 @@ function prepareTools({
   const hasProviderDefinedTools = tools.some(
     (tool) => tool.type === "provider-defined"
   );
-  if (hasFunctionTools && hasProviderDefinedTools) {
+  if (hasFunctionTools && hasProviderDefinedTools && !usesGemini3Features) {
     const functionTools = tools.filter((tool) => tool.type === "function");
     toolWarnings.push({
       type: "unsupported-tool",
@@ -795,7 +818,7 @@ function prepareTools({
     providerDefinedTools.forEach((tool) => {
       switch (tool.id) {
         case "google.google_search":
-          if (isGemini2orNewer) {
+          if (supportsGemini2Tools) {
             googleTools2.push({ googleSearch: { ...tool.args } });
           } else {
             toolWarnings.push({
@@ -806,7 +829,7 @@ function prepareTools({
           }
           break;
         case "google.enterprise_web_search":
-          if (isGemini2orNewer) {
+          if (supportsGemini2Tools) {
             googleTools2.push({ enterpriseWebSearch: {} });
           } else {
             toolWarnings.push({
@@ -817,7 +840,7 @@ function prepareTools({
           }
           break;
         case "google.url_context":
-          if (isGemini2orNewer) {
+          if (supportsGemini2Tools) {
             googleTools2.push({ urlContext: {} });
           } else {
             toolWarnings.push({
@@ -828,7 +851,7 @@ function prepareTools({
           }
           break;
         case "google.code_execution":
-          if (isGemini2orNewer) {
+          if (supportsGemini2Tools) {
             googleTools2.push({ codeExecution: {} });
           } else {
             toolWarnings.push({
@@ -850,7 +873,7 @@ function prepareTools({
           }
           break;
         case "google.vertex_rag_store":
-          if (isGemini2orNewer) {
+          if (supportsGemini2Tools) {
             googleTools2.push({
               retrieval: {
                 vertex_rag_store: {
@@ -870,7 +893,7 @@ function prepareTools({
           }
           break;
         case "google.google_maps":
-          if (isGemini2orNewer) {
+          if (supportsGemini2Tools) {
             googleTools2.push({ googleMaps: {} });
           } else {
             toolWarnings.push({
@@ -885,6 +908,47 @@ function prepareTools({
           break;
       }
     });
+    if (hasFunctionTools && usesGemini3Features && googleTools2.length > 0) {
+      const functionDeclarations2 = [];
+      for (const tool of tools) {
+        if (tool.type === "function") {
+          functionDeclarations2.push({
+            name: tool.name,
+            description: (_a = tool.description) != null ? _a : "",
+            parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
+          });
+        }
+      }
+      const combinedToolConfig = {
+        functionCallingConfig: { mode: "VALIDATED" },
+        ...!isVertexProvider && {
+          includeServerSideToolInvocations: true
+        }
+      };
+      if (toolChoice != null) {
+        switch (toolChoice.type) {
+          case "auto":
+            break;
+          case "none":
+            combinedToolConfig.functionCallingConfig = { mode: "NONE" };
+            break;
+          case "required":
+            combinedToolConfig.functionCallingConfig = { mode: "ANY" };
+            break;
+          case "tool":
+            combinedToolConfig.functionCallingConfig = {
+              mode: "ANY",
+              allowedFunctionNames: [toolChoice.toolName]
+            };
+            break;
+        }
+      }
+      return {
+        tools: [...googleTools2, { functionDeclarations: functionDeclarations2 }],
+        toolConfig: combinedToolConfig,
+        toolWarnings
+      };
+    }
     return {
       tools: googleTools2.length > 0 ? googleTools2 : void 0,
       toolConfig: void 0,
@@ -898,7 +962,7 @@ function prepareTools({
       case "function":
         functionDeclarations.push({
           name: tool.name,
-          description: (_a = tool.description) != null ? _a : "",
+          description: (_b = tool.description) != null ? _b : "",
           parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
         });
         if (tool.strict === true) {
@@ -1076,10 +1140,14 @@ var GoogleGenerativeAILanguageModel = class {
       threshold: safetyThreshold
     })) : void 0;
     const isGemmaModel = this.modelId.toLowerCase().startsWith("gemma-");
-    const supportsFunctionResponseParts = this.modelId.startsWith("gemini-3");
+    const { usesGemini3Features } = getGoogleModelCapabilities(this.modelId);
     const { contents, systemInstruction } = convertToGoogleGenerativeAIMessages(
       prompt,
-      { isGemmaModel, supportsFunctionResponseParts }
+      {
+        isGemmaModel,
+        isGemini3Model: usesGemini3Features,
+        supportsFunctionResponseParts: usesGemini3Features
+      }
     );
     const {
       tools: googleTools2,
@@ -1088,7 +1156,8 @@ var GoogleGenerativeAILanguageModel = class {
     } = prepareTools({
       tools,
       toolChoice,
-      modelId: this.modelId
+      modelId: this.modelId,
+      isVertexProvider
     });
     return {
       args: {