@ai-sdk/google 3.0.135 → 3.0.136

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ai-sdk/google
 
+## 3.0.136
+
+### Patch Changes
+
+- 8fccc63: Preserve grounding metadata from each automatically continued Google response in `groundingMetadataPerRequest`. Previously, a later response without grounding could leave earlier Search queries absent from the final provider metadata even though their sources were returned. The new array preserves request order and includes `null` for requests without grounding.
+
 ## 3.0.135
 
 ### Patch Changes

package/dist/index.d.mts

@@ -241,6 +241,8 @@ type GoogleGenerativeAIUsageMetadata = UsageMetadataSchema;
 interface GoogleGenerativeAIProviderMetadata {
     promptFeedback: GoogleGenerativeAIPromptFeedback | null;
     groundingMetadata: GoogleGenerativeAIGroundingMetadata | null;
+    /** Grounding from each automatically continued request, in request order. */
+    groundingMetadataPerRequest?: Array<GoogleGenerativeAIGroundingMetadata | null>;
     urlContextMetadata: GoogleGenerativeAIUrlContextMetadata | null;
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
     usageMetadata: GoogleGenerativeAIUsageMetadata | null;

package/dist/index.d.ts

@@ -241,6 +241,8 @@ type GoogleGenerativeAIUsageMetadata = UsageMetadataSchema;
 interface GoogleGenerativeAIProviderMetadata {
     promptFeedback: GoogleGenerativeAIPromptFeedback | null;
     groundingMetadata: GoogleGenerativeAIGroundingMetadata | null;
+    /** Grounding from each automatically continued request, in request order. */
+    groundingMetadataPerRequest?: Array<GoogleGenerativeAIGroundingMetadata | null>;
     urlContextMetadata: GoogleGenerativeAIUrlContextMetadata | null;
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
     usageMetadata: GoogleGenerativeAIUsageMetadata | null;

package/dist/index.js

@@ -235,7 +235,7 @@ var googleInteractionsTranscriptionResponseSchema = import_v43.z.object({
 var import_provider_utils25 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.135" : "0.0.0-test";
+var VERSION = true ? "3.0.136" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider2 = require("@ai-sdk/provider");
@@ -2295,7 +2295,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
     const { args, warnings, providerOptionsName, extraHeaders } = await this.getArgs(options);
     const mergedHeaders = (0, import_provider_utils8.combineHeaders)(
       await (0, import_provider_utils8.resolve)(this.config.headers),
@@ -2319,18 +2319,20 @@ var GoogleGenerativeAILanguageModel = class {
       rawValue: rawResponse
     } = await generateContent(args);
     const continuedParts = [];
+    const groundingMetadataPerRequest = [];
     let continuedUsageMetadata;
     const firstPromptTokenCount = (_a2 = response.usageMetadata) == null ? void 0 : _a2.promptTokenCount;
     while (true) {
       const candidate2 = (_b = response.candidates) == null ? void 0 : _b[0];
+      groundingMetadataPerRequest.push((_c = candidate2 == null ? void 0 : candidate2.groundingMetadata) != null ? _c : null);
       const continuationToken = (candidate2 == null ? void 0 : candidate2.finishReason) === "CONTINUATION" ? candidate2.continuationToken : void 0;
       if (continuationToken == null) {
         break;
       }
-      continuedParts.push(...(_d = (_c = candidate2 == null ? void 0 : candidate2.content) == null ? void 0 : _c.parts) != null ? _d : []);
+      continuedParts.push(...(_e = (_d = candidate2 == null ? void 0 : candidate2.content) == null ? void 0 : _d.parts) != null ? _e : []);
       continuedUsageMetadata = addGoogleGenerativeAIUsageMetadata(
         continuedUsageMetadata,
-        (_e = response.usageMetadata) != null ? _e : void 0
+        (_f = response.usageMetadata) != null ? _f : void 0
       );
       ({
         responseHeaders,
@@ -2338,23 +2340,23 @@ var GoogleGenerativeAILanguageModel = class {
         rawValue: rawResponse
       } = await generateContent({ ...args, continuationToken }));
     }
-    const candidate = (_f = response.candidates) == null ? void 0 : _f[0];
-    const promptBlockReason = (_g = response.promptFeedback) == null ? void 0 : _g.blockReason;
+    const candidate = (_g = response.candidates) == null ? void 0 : _g[0];
+    const promptBlockReason = (_h = response.promptFeedback) == null ? void 0 : _h.blockReason;
     const confirmedPromptBlockReason = isConfirmedPromptBlockReason(
       promptBlockReason
     ) ? promptBlockReason : void 0;
     const isPromptBlocked = (candidate == null ? void 0 : candidate.finishReason) == null && confirmedPromptBlockReason != null;
-    const rawFinishReason = (_h = candidate == null ? void 0 : candidate.finishReason) != null ? _h : confirmedPromptBlockReason;
+    const rawFinishReason = (_i = candidate == null ? void 0 : candidate.finishReason) != null ? _i : confirmedPromptBlockReason;
     const content = [];
-    const parts = [...continuedParts, ...(_j = (_i = candidate == null ? void 0 : candidate.content) == null ? void 0 : _i.parts) != null ? _j : []];
+    const parts = [...continuedParts, ...(_k = (_j = candidate == null ? void 0 : candidate.content) == null ? void 0 : _j.parts) != null ? _k : []];
     const usageMetadata = addGoogleGenerativeAIUsageMetadata(
       continuedUsageMetadata,
-      (_k = response.usageMetadata) != null ? _k : void 0
+      (_l = response.usageMetadata) != null ? _l : void 0
     );
     let lastCodeExecutionToolCallId;
     let lastServerToolCallId;
     for (const part of parts) {
-      if ("executableCode" in part && ((_l = part.executableCode) == null ? void 0 : _l.code)) {
+      if ("executableCode" in part && ((_m = part.executableCode) == null ? void 0 : _m.code)) {
         const toolCallId = this.config.generateId();
         lastCodeExecutionToolCallId = toolCallId;
         content.push({
@@ -2372,7 +2374,7 @@ var GoogleGenerativeAILanguageModel = class {
           toolName: "code_execution",
           result: {
             outcome: part.codeExecutionResult.outcome,
-            output: (_m = part.codeExecutionResult.output) != null ? _m : ""
+            output: (_n = part.codeExecutionResult.output) != null ? _n : ""
           }
         });
       } else if ("text" in part && part.text != null) {
@@ -2396,9 +2398,9 @@ var GoogleGenerativeAILanguageModel = class {
       } else if ("functionCall" in part && part.functionCall.name != null) {
         content.push({
           type: "tool-call",
-          toolCallId: (_n = part.functionCall.id) != null ? _n : this.config.generateId(),
+          toolCallId: (_o = part.functionCall.id) != null ? _o : this.config.generateId(),
           toolName: part.functionCall.name,
-          input: JSON.stringify((_o = part.functionCall.args) != null ? _o : {}),
+          input: JSON.stringify((_p = part.functionCall.args) != null ? _p : {}),
           providerMetadata: part.thoughtSignature ? {
             [providerOptionsName]: {
               thoughtSignature: part.thoughtSignature
@@ -2420,13 +2422,13 @@ var GoogleGenerativeAILanguageModel = class {
           } : void 0
         });
       } else if ("toolCall" in part && part.toolCall) {
-        const toolCallId = (_p = part.toolCall.id) != null ? _p : this.config.generateId();
+        const toolCallId = (_q = part.toolCall.id) != null ? _q : this.config.generateId();
         lastServerToolCallId = toolCallId;
         content.push({
           type: "tool-call",
           toolCallId,
           toolName: `server:${part.toolCall.toolType}`,
-          input: JSON.stringify((_q = part.toolCall.args) != null ? _q : {}),
+          input: JSON.stringify((_r = part.toolCall.args) != null ? _r : {}),
           providerExecuted: true,
           dynamic: true,
           providerMetadata: part.thoughtSignature ? {
@@ -2443,12 +2445,12 @@ var GoogleGenerativeAILanguageModel = class {
           }
         });
       } else if ("toolResponse" in part && part.toolResponse) {
-        const responseToolCallId = (_r = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _r : this.config.generateId();
+        const responseToolCallId = (_s = lastServerToolCallId != null ? lastServerToolCallId : part.toolResponse.id) != null ? _s : this.config.generateId();
         content.push({
           type: "tool-result",
           toolCallId: responseToolCallId,
           toolName: `server:${part.toolResponse.toolType}`,
-          result: (_s = part.toolResponse.response) != null ? _s : {},
+          result: (_t = part.toolResponse.response) != null ? _t : {},
           providerMetadata: part.thoughtSignature ? {
             [providerOptionsName]: {
               thoughtSignature: part.thoughtSignature,
@@ -2465,10 +2467,10 @@ var GoogleGenerativeAILanguageModel = class {
         lastServerToolCallId = void 0;
       }
     }
-    const sources = (_t = extractSources({
+    const sources = (_u = extractSources({
       groundingMetadata: candidate == null ? void 0 : candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _t : [];
+    })) != null ? _u : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -2488,13 +2490,14 @@ var GoogleGenerativeAILanguageModel = class {
       warnings,
       providerMetadata: {
         [providerOptionsName]: {
-          promptFeedback: (_u = response.promptFeedback) != null ? _u : null,
-          groundingMetadata: (_v = candidate == null ? void 0 : candidate.groundingMetadata) != null ? _v : null,
-          urlContextMetadata: (_w = candidate == null ? void 0 : candidate.urlContextMetadata) != null ? _w : null,
-          safetyRatings: (_x = candidate == null ? void 0 : candidate.safetyRatings) != null ? _x : null,
+          promptFeedback: (_v = response.promptFeedback) != null ? _v : null,
+          groundingMetadata: (_w = candidate == null ? void 0 : candidate.groundingMetadata) != null ? _w : null,
+          ...groundingMetadataPerRequest.length > 1 ? { groundingMetadataPerRequest } : {},
+          urlContextMetadata: (_x = candidate == null ? void 0 : candidate.urlContextMetadata) != null ? _x : null,
+          safetyRatings: (_y = candidate == null ? void 0 : candidate.safetyRatings) != null ? _y : null,
           usageMetadata: usageMetadata != null ? usageMetadata : null,
-          finishMessage: (_y = candidate == null ? void 0 : candidate.finishMessage) != null ? _y : null,
-          serviceTier: (_z = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _z : null,
+          finishMessage: (_z = candidate == null ? void 0 : candidate.finishMessage) != null ? _z : null,
+          serviceTier: (_A = usageMetadata == null ? void 0 : usageMetadata.serviceTier) != null ? _A : null,
           ...(candidate == null ? void 0 : candidate.continuationToken) != null && rawFinishReason === "MAX_TOKENS" ? { continuationToken: candidate.continuationToken } : {},
           ...continuedUsageMetadata != null && firstPromptTokenCount != null ? { initialPromptTokenCount: firstPromptTokenCount } : {}
         }
@@ -2502,7 +2505,7 @@ var GoogleGenerativeAILanguageModel = class {
       request: { body: args },
       response: {
         // TODO timestamp, model id
-        id: (_A = response.responseId) != null ? _A : void 0,
+        id: (_B = response.responseId) != null ? _B : void 0,
         headers: responseHeaders,
         body: rawResponse
       }
@@ -2527,14 +2530,27 @@ var GoogleGenerativeAILanguageModel = class {
       fetch: this.config.fetch
     });
     const { responseHeaders, value: firstResponse } = await streamGenerateContent(args);
+    const groundingMetadataPerRequest = [];
+    let requestGroundingMetadata = null;
     const response = continueGoogleStream({
       stream: firstResponse,
       getContinuationToken: (chunk) => {
         var _a2, _b;
         const candidate = (_a2 = chunk.candidates) == null ? void 0 : _a2[0];
+        if ((candidate == null ? void 0 : candidate.groundingMetadata) != null) {
+          requestGroundingMetadata = candidate.groundingMetadata;
+        }
         return (candidate == null ? void 0 : candidate.finishReason) === "CONTINUATION" ? (_b = candidate.continuationToken) != null ? _b : void 0 : void 0;
       },
-      continueStream: async (continuationToken) => (await streamGenerateContent({ ...args, continuationToken })).value
+      continueStream: async (continuationToken) => {
+        const { value } = await streamGenerateContent({
+          ...args,
+          continuationToken
+        });
+        groundingMetadataPerRequest.push(requestGroundingMetadata);
+        requestGroundingMetadata = null;
+        return value;
+      }
     });
     let finishReason = {
       unified: "other",
@@ -2969,6 +2985,12 @@ var GoogleGenerativeAILanguageModel = class {
                 [providerOptionsName]: {
                   promptFeedback,
                   groundingMetadata: lastGroundingMetadata,
+                  ...groundingMetadataPerRequest.length > 0 ? {
+                    groundingMetadataPerRequest: [
+                      ...groundingMetadataPerRequest,
+                      requestGroundingMetadata
+                    ]
+                  } : {},
                   urlContextMetadata: lastUrlContextMetadata,
                   safetyRatings: lastSafetyRatings,
                   usageMetadata: usage != null ? usage : null,