ai 6.0.231 → 6.0.232

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ai
 
+## 6.0.232
+
+### Patch Changes
+
+- 7644a61: Preserve provider options when combining consecutive tool messages.
+
 ## 6.0.231
 
 ### Patch Changes

package/dist/index.js

@@ -1282,7 +1282,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.231" : "0.0.0-test";
+var VERSION = true ? "6.0.232" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -1335,6 +1335,42 @@ var createDefaultDownloadFunction = (download2 = download) => (requestedDownload
   )
 );
 
+// src/util/merge-objects.ts
+function mergeObjects(base, overrides) {
+  if (base === void 0 && overrides === void 0) {
+    return void 0;
+  }
+  if (base === void 0) {
+    return overrides;
+  }
+  if (overrides === void 0) {
+    return base;
+  }
+  const result = { ...base };
+  for (const key in overrides) {
+    if (key === "__proto__" || key === "constructor" || key === "prototype") {
+      continue;
+    }
+    if (Object.prototype.hasOwnProperty.call(overrides, key)) {
+      const overridesValue = overrides[key];
+      if (overridesValue === void 0)
+        continue;
+      const baseValue = key in base ? base[key] : void 0;
+      const isSourceObject = overridesValue !== null && typeof overridesValue === "object" && !Array.isArray(overridesValue) && !(overridesValue instanceof Date) && !(overridesValue instanceof RegExp);
+      const isTargetObject = baseValue !== null && baseValue !== void 0 && typeof baseValue === "object" && !Array.isArray(baseValue) && !(baseValue instanceof Date) && !(baseValue instanceof RegExp);
+      if (isSourceObject && isTargetObject) {
+        result[key] = mergeObjects(
+          baseValue,
+          overridesValue
+        );
+      } else {
+        result[key] = overridesValue;
+      }
+    }
+  }
+  return result;
+}
+
 // src/prompt/data-content.ts
 var import_provider23 = require("@ai-sdk/provider");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
@@ -1482,7 +1518,15 @@ async function convertToLanguageModelPrompt({
     }
     const lastCombinedMessage = combinedMessages.at(-1);
     if ((lastCombinedMessage == null ? void 0 : lastCombinedMessage.role) === "tool") {
+      const lastContentPart = lastCombinedMessage.content.at(-1);
+      if (lastContentPart != null && lastCombinedMessage.providerOptions != null) {
+        lastContentPart.providerOptions = mergeObjects(
+          lastCombinedMessage.providerOptions,
+          lastContentPart.providerOptions
+        );
+      }
       lastCombinedMessage.content.push(...message.content);
+      lastCombinedMessage.providerOptions = message.providerOptions;
     } else {
       combinedMessages.push(message);
     }
@@ -2739,42 +2783,6 @@ function addImageModelUsage(usage1, usage2) {
   };
 }
 
-// src/util/merge-objects.ts
-function mergeObjects(base, overrides) {
-  if (base === void 0 && overrides === void 0) {
-    return void 0;
-  }
-  if (base === void 0) {
-    return overrides;
-  }
-  if (overrides === void 0) {
-    return base;
-  }
-  const result = { ...base };
-  for (const key in overrides) {
-    if (key === "__proto__" || key === "constructor" || key === "prototype") {
-      continue;
-    }
-    if (Object.prototype.hasOwnProperty.call(overrides, key)) {
-      const overridesValue = overrides[key];
-      if (overridesValue === void 0)
-        continue;
-      const baseValue = key in base ? base[key] : void 0;
-      const isSourceObject = overridesValue !== null && typeof overridesValue === "object" && !Array.isArray(overridesValue) && !(overridesValue instanceof Date) && !(overridesValue instanceof RegExp);
-      const isTargetObject = baseValue !== null && baseValue !== void 0 && typeof baseValue === "object" && !Array.isArray(baseValue) && !(baseValue instanceof Date) && !(baseValue instanceof RegExp);
-      if (isSourceObject && isTargetObject) {
-        result[key] = mergeObjects(
-          baseValue,
-          overridesValue
-        );
-      } else {
-        result[key] = overridesValue;
-      }
-    }
-  }
-  return result;
-}
-
 // src/util/retry-with-exponential-backoff.ts
 var import_provider27 = require("@ai-sdk/provider");
 var import_gateway3 = require("@ai-sdk/gateway");