@ai-sdk/google 2.0.103 → 2.0.104

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ai-sdk/google
 
+## 2.0.104
+
+### Patch Changes
+
+- 1275533: 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.
+
 ## 2.0.103
 
 ### Patch Changes

package/dist/index.d.mts

@@ -183,6 +183,8 @@ type GoogleGenerativeAIUrlContextMetadata = UrlContextMetadataSchema;
 type GoogleGenerativeAISafetyRating = SafetyRatingSchema;
 interface GoogleGenerativeAIProviderMetadata {
     groundingMetadata: GoogleGenerativeAIGroundingMetadata | null;
+    /** Grounding from each automatically continued request, in request order. */
+    groundingMetadataPerRequest?: Array<GoogleGenerativeAIGroundingMetadata | null>;
     urlContextMetadata: GoogleGenerativeAIUrlContextMetadata | null;
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
     serviceTier: string | null;

package/dist/index.d.ts

@@ -183,6 +183,8 @@ type GoogleGenerativeAIUrlContextMetadata = UrlContextMetadataSchema;
 type GoogleGenerativeAISafetyRating = SafetyRatingSchema;
 interface GoogleGenerativeAIProviderMetadata {
     groundingMetadata: GoogleGenerativeAIGroundingMetadata | null;
+    /** Grounding from each automatically continued request, in request order. */
+    groundingMetadataPerRequest?: Array<GoogleGenerativeAIGroundingMetadata | null>;
     urlContextMetadata: GoogleGenerativeAIUrlContextMetadata | null;
     safetyRatings: GoogleGenerativeAISafetyRating[] | null;
     serviceTier: string | null;

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils15 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.103" : "0.0.0-test";
+var VERSION = true ? "2.0.104" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -1484,7 +1484,7 @@ var GoogleGenerativeAILanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
     const { args, warnings } = await this.getArgs(options);
     const body = JSON.stringify(args);
     const mergedHeaders = (0, import_provider_utils6.combineHeaders)(
@@ -1508,18 +1508,20 @@ var GoogleGenerativeAILanguageModel = class {
       rawValue: rawResponse
     } = await generateContent(args);
     const continuedParts = [];
+    const groundingMetadataPerRequest = [];
     let continuedUsageMetadata;
     const firstPromptTokenCount = (_a = response.usageMetadata) == null ? void 0 : _a.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,
@@ -1527,18 +1529,18 @@ 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 isPromptBlocked = (candidate == null ? void 0 : candidate.finishReason) == null && promptBlockReason != null;
     const content = [];
-    const parts = [...continuedParts, ...(_i = (_h = candidate == null ? void 0 : candidate.content) == null ? void 0 : _h.parts) != null ? _i : []];
+    const parts = [...continuedParts, ...(_j = (_i = candidate == null ? void 0 : candidate.content) == null ? void 0 : _i.parts) != null ? _j : []];
     const usageMetadata = addGoogleGenerativeAIUsageMetadata(
       continuedUsageMetadata,
-      (_j = response.usageMetadata) != null ? _j : void 0
+      (_k = response.usageMetadata) != null ? _k : void 0
     );
     let lastCodeExecutionToolCallId;
     for (const part of parts) {
-      if ("executableCode" in part && ((_k = part.executableCode) == null ? void 0 : _k.code)) {
+      if ("executableCode" in part && ((_l = part.executableCode) == null ? void 0 : _l.code)) {
         const toolCallId = this.config.generateId();
         lastCodeExecutionToolCallId = toolCallId;
         content.push({
@@ -1579,7 +1581,7 @@ var GoogleGenerativeAILanguageModel = class {
       } else if ("functionCall" in part) {
         content.push({
           type: "tool-call",
-          toolCallId: (_l = part.functionCall.id) != null ? _l : this.config.generateId(),
+          toolCallId: (_m = part.functionCall.id) != null ? _m : this.config.generateId(),
           toolName: part.functionCall.name,
           input: JSON.stringify(part.functionCall.args),
           providerMetadata: part.thoughtSignature ? { google: { thoughtSignature: part.thoughtSignature } } : void 0
@@ -1592,10 +1594,10 @@ var GoogleGenerativeAILanguageModel = class {
         });
       }
     }
-    const sources = (_m = extractSources({
+    const sources = (_n = extractSources({
       groundingMetadata: candidate == null ? void 0 : candidate.groundingMetadata,
       generateId: this.config.generateId
-    })) != null ? _m : [];
+    })) != null ? _n : [];
     for (const source of sources) {
       content.push(source);
     }
@@ -1606,21 +1608,22 @@ var GoogleGenerativeAILanguageModel = class {
         hasToolCalls: content.some((part) => part.type === "tool-call")
       }),
       usage: {
-        inputTokens: (_n = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _n : void 0,
-        outputTokens: (_o = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _o : void 0,
-        totalTokens: (_p = usageMetadata == null ? void 0 : usageMetadata.totalTokenCount) != null ? _p : void 0,
-        reasoningTokens: (_q = usageMetadata == null ? void 0 : usageMetadata.thoughtsTokenCount) != null ? _q : void 0,
-        cachedInputTokens: (_r = usageMetadata == null ? void 0 : usageMetadata.cachedContentTokenCount) != null ? _r : void 0
+        inputTokens: (_o = usageMetadata == null ? void 0 : usageMetadata.promptTokenCount) != null ? _o : void 0,
+        outputTokens: (_p = usageMetadata == null ? void 0 : usageMetadata.candidatesTokenCount) != null ? _p : void 0,
+        totalTokens: (_q = usageMetadata == null ? void 0 : usageMetadata.totalTokenCount) != null ? _q : void 0,
+        reasoningTokens: (_r = usageMetadata == null ? void 0 : usageMetadata.thoughtsTokenCount) != null ? _r : void 0,
+        cachedInputTokens: (_s = usageMetadata == null ? void 0 : usageMetadata.cachedContentTokenCount) != null ? _s : void 0
       },
       warnings,
       providerMetadata: {
         google: {
-          promptFeedback: (_s = response.promptFeedback) != null ? _s : null,
-          groundingMetadata: (_t = candidate == null ? void 0 : candidate.groundingMetadata) != null ? _t : null,
-          urlContextMetadata: (_u = candidate == null ? void 0 : candidate.urlContextMetadata) != null ? _u : null,
-          safetyRatings: (_v = candidate == null ? void 0 : candidate.safetyRatings) != null ? _v : null,
-          serviceTier: (_w = response.serviceTier) != null ? _w : null,
-          ...(candidate == null ? void 0 : candidate.continuationToken) != null ? { continuationToken: candidate.continuationToken } : {},
+          promptFeedback: (_t = response.promptFeedback) != null ? _t : null,
+          groundingMetadata: (_u = candidate == null ? void 0 : candidate.groundingMetadata) != null ? _u : null,
+          ...groundingMetadataPerRequest.length > 1 ? { groundingMetadataPerRequest } : {},
+          urlContextMetadata: (_v = candidate == null ? void 0 : candidate.urlContextMetadata) != null ? _v : null,
+          safetyRatings: (_w = candidate == null ? void 0 : candidate.safetyRatings) != null ? _w : null,
+          serviceTier: (_x = response.serviceTier) != null ? _x : null,
+          ...(candidate == null ? void 0 : candidate.continuationToken) != null && candidate.finishReason === "MAX_TOKENS" ? { continuationToken: candidate.continuationToken } : {},
           ...continuedUsageMetadata != null && firstPromptTokenCount != null ? { initialPromptTokenCount: firstPromptTokenCount } : {},
           usageMetadata: usageMetadata != null ? usageMetadata : null
         }
@@ -1652,14 +1655,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 _a, _b;
         const candidate = (_a = chunk.candidates) == null ? void 0 : _a[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 = "unknown";
     const usage = {
@@ -1937,6 +1953,18 @@ var GoogleGenerativeAILanguageModel = class {
                 id: currentReasoningBlockId
               });
             }
+            if (groundingMetadataPerRequest.length > 0) {
+              providerMetadata = {
+                ...providerMetadata,
+                google: {
+                  ...providerMetadata == null ? void 0 : providerMetadata.google,
+                  groundingMetadataPerRequest: [
+                    ...groundingMetadataPerRequest,
+                    requestGroundingMetadata
+                  ]
+                }
+              };
+            }
             controller.enqueue({
               type: "finish",
               finishReason,