ai 7.0.31 → 7.0.33

package/dist/index.js

@@ -1089,7 +1089,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.31" : "0.0.0-test";
+var VERSION = true ? "7.0.33" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -1142,6 +1142,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/file-part-data.ts
 import {
   isBuffer,
@@ -1307,7 +1343,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);
     }
@@ -2586,42 +2630,6 @@ function mergeAbortSignals(...signals) {
   return validSignals.length === 0 ? void 0 : validSignals.length === 1 ? validSignals[0] : AbortSignal.any(validSignals);
 }
 
-// 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/now.ts
 function now() {
   var _a22, _b;
@@ -5223,6 +5231,9 @@ async function generateText({
       ];
       const pendingDeferredToolCalls = /* @__PURE__ */ new Map();
       do {
+        if (steps.length > 0) {
+          mergedAbortSignal == null ? void 0 : mergedAbortSignal.throwIfAborted();
+        }
         const stepTimeoutId = setAbortTimeout({
           abortController: stepAbortController,
           label: "Step",
@@ -6254,27 +6265,27 @@ var toolMetadataSchema = z6.record(
 var uiMessageChunkSchema = lazySchema(
   () => zodSchema(
     z6.union([
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("text-start"),
         id: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("text-delta"),
         id: z6.string(),
         delta: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("text-end"),
         id: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("error"),
         errorText: z6.string()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-input-start"),
         toolCallId: z6.string(),
         toolName: z6.string(),
@@ -6284,12 +6295,12 @@ var uiMessageChunkSchema = lazySchema(
         dynamic: z6.boolean().optional(),
         title: z6.string().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-input-delta"),
         toolCallId: z6.string(),
         inputTextDelta: z6.string()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-input-available"),
         toolCallId: z6.string(),
         toolName: z6.string(),
@@ -6300,7 +6311,7 @@ var uiMessageChunkSchema = lazySchema(
         dynamic: z6.boolean().optional(),
         title: z6.string().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-input-error"),
         toolCallId: z6.string(),
         toolName: z6.string(),
@@ -6312,14 +6323,14 @@ var uiMessageChunkSchema = lazySchema(
         errorText: z6.string(),
         title: z6.string().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-approval-request"),
         approvalId: z6.string(),
         toolCallId: z6.string(),
         isAutomatic: z6.boolean().optional(),
         signature: z6.string().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-approval-response"),
         approvalId: z6.string(),
         approved: z6.boolean(),
@@ -6327,7 +6338,7 @@ var uiMessageChunkSchema = lazySchema(
         providerExecuted: z6.boolean().optional(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-output-available"),
         toolCallId: z6.string(),
         output: z6.unknown(),
@@ -6337,7 +6348,7 @@ var uiMessageChunkSchema = lazySchema(
         dynamic: z6.boolean().optional(),
         preliminary: z6.boolean().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-output-error"),
         toolCallId: z6.string(),
         errorText: z6.string(),
@@ -6346,39 +6357,39 @@ var uiMessageChunkSchema = lazySchema(
         toolMetadata: toolMetadataSchema.optional(),
         dynamic: z6.boolean().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("tool-output-denied"),
         toolCallId: z6.string()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("reasoning-start"),
         id: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("reasoning-delta"),
         id: z6.string(),
         delta: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("reasoning-end"),
         id: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("custom"),
         kind: z6.string().transform((value) => value),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("source-url"),
         sourceId: z6.string(),
         url: z6.string(),
         title: z6.string().optional(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("source-document"),
         sourceId: z6.string(),
         mediaType: z6.string(),
@@ -6386,19 +6397,19 @@ var uiMessageChunkSchema = lazySchema(
         filename: z6.string().optional(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("file"),
         url: z6.string(),
         mediaType: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("reasoning-file"),
         url: z6.string(),
         mediaType: z6.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.custom(
           (value) => typeof value === "string" && value.startsWith("data-"),
           { message: 'Type must start with "data-"' }
@@ -6407,18 +6418,18 @@ var uiMessageChunkSchema = lazySchema(
         data: z6.unknown(),
         transient: z6.boolean().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("start-step")
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("finish-step")
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("start"),
         messageId: z6.string().optional(),
         messageMetadata: z6.unknown().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("finish"),
         finishReason: z6.enum([
           "stop",
@@ -6430,11 +6441,11 @@ var uiMessageChunkSchema = lazySchema(
         ]).optional(),
         messageMetadata: z6.unknown().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("abort"),
         reason: z6.string().optional()
       }),
-      z6.strictObject({
+      z6.looseObject({
         type: z6.literal("message-metadata"),
         messageMetadata: z6.unknown()
       })
@@ -6517,11 +6528,32 @@ function processUIMessageStream({
       async transform(chunk, controller) {
         await runUpdateMessageJob(async ({ state, write }) => {
           var _a22, _b, _c, _d;
+          function getCurrentStepParts() {
+            const parts = state.message.parts;
+            let currentStepStartIndex = parts.length - 1;
+            while (currentStepStartIndex >= 0 && parts[currentStepStartIndex].type !== "step-start") {
+              currentStepStartIndex--;
+            }
+            return parts.slice(currentStepStartIndex + 1);
+          }
+          function getCurrentStepToolInvocations() {
+            return getCurrentStepParts().filter(isToolUIPart);
+          }
           function getToolInvocation(toolCallId) {
-            const toolInvocations = state.message.parts.filter(isToolUIPart);
-            const toolInvocation = toolInvocations.find(
+            const toolInvocations = getCurrentStepToolInvocations();
+            let toolInvocation = toolInvocations.find(
               (invocation) => invocation.toolCallId === toolCallId
             );
+            if (toolInvocation == null) {
+              const parts = state.message.parts;
+              for (let i = parts.length - 1; i >= 0; i--) {
+                const part = parts[i];
+                if (isToolUIPart(part) && part.toolCallId === toolCallId) {
+                  toolInvocation = part;
+                  break;
+                }
+              }
+            }
             if (toolInvocation == null) {
               throw new UIMessageStreamError({
                 chunkType: "tool-invocation",
@@ -6548,9 +6580,9 @@ function processUIMessageStream({
             }
             return toolInvocation;
           }
-          function updateToolPart(options) {
+          function updateToolPart(options, existingPart) {
             var _a23;
-            const part = state.message.parts.find(
+            const part = existingPart != null ? existingPart : getCurrentStepParts().find(
               (part2) => isStaticToolUIPart(part2) && part2.toolCallId === options.toolCallId
             );
             const anyOptions = options;
@@ -6596,9 +6628,9 @@ function processUIMessageStream({
               });
             }
           }
-          function updateDynamicToolPart(options) {
+          function updateDynamicToolPart(options, existingPart) {
             var _a23, _b2;
-            const part = state.message.parts.find(
+            const part = existingPart != null ? existingPart : getCurrentStepParts().find(
               (part2) => part2.type === "dynamic-tool" && part2.toolCallId === options.toolCallId
             );
             const anyOptions = options;
@@ -6789,7 +6821,7 @@ function processUIMessageStream({
               break;
             }
             case "tool-input-start": {
-              const toolInvocations = state.message.parts.filter(isStaticToolUIPart);
+              const toolInvocations = getCurrentStepParts().filter(isStaticToolUIPart);
               state.partialToolCalls[chunk.toolCallId] = {
                 text: "",
                 toolName: chunk.toolName,
@@ -6892,7 +6924,7 @@ function processUIMessageStream({
               break;
             }
             case "tool-input-error": {
-              const existingPart = state.message.parts.filter(isToolUIPart).find((p) => p.toolCallId === chunk.toolCallId);
+              const existingPart = getCurrentStepParts().filter(isToolUIPart).find((p) => p.toolCallId === chunk.toolCallId);
               const isDynamic = existingPart != null ? existingPart.type === "dynamic-tool" : !!chunk.dynamic;
               if (isDynamic) {
                 updateDynamicToolPart({
@@ -6963,31 +6995,37 @@ function processUIMessageStream({
             case "tool-output-available": {
               const toolInvocation = getToolInvocation(chunk.toolCallId);
               if (toolInvocation.type === "dynamic-tool") {
-                updateDynamicToolPart({
-                  toolCallId: chunk.toolCallId,
-                  toolName: toolInvocation.toolName,
-                  state: "output-available",
-                  input: toolInvocation.input,
-                  output: chunk.output,
-                  preliminary: chunk.preliminary,
-                  providerExecuted: chunk.providerExecuted,
-                  providerMetadata: chunk.providerMetadata,
-                  title: toolInvocation.title,
-                  toolMetadata: toolInvocation.toolMetadata
-                });
+                updateDynamicToolPart(
+                  {
+                    toolCallId: chunk.toolCallId,
+                    toolName: toolInvocation.toolName,
+                    state: "output-available",
+                    input: toolInvocation.input,
+                    output: chunk.output,
+                    preliminary: chunk.preliminary,
+                    providerExecuted: chunk.providerExecuted,
+                    providerMetadata: chunk.providerMetadata,
+                    title: toolInvocation.title,
+                    toolMetadata: toolInvocation.toolMetadata
+                  },
+                  toolInvocation
+                );
               } else {
-                updateToolPart({
-                  toolCallId: chunk.toolCallId,
-                  toolName: getStaticToolName(toolInvocation),
-                  state: "output-available",
-                  input: toolInvocation.input,
-                  output: chunk.output,
-                  providerExecuted: chunk.providerExecuted,
-                  preliminary: chunk.preliminary,
-                  providerMetadata: chunk.providerMetadata,
-                  title: toolInvocation.title,
-                  toolMetadata: toolInvocation.toolMetadata
-                });
+                updateToolPart(
+                  {
+                    toolCallId: chunk.toolCallId,
+                    toolName: getStaticToolName(toolInvocation),
+                    state: "output-available",
+                    input: toolInvocation.input,
+                    output: chunk.output,
+                    providerExecuted: chunk.providerExecuted,
+                    preliminary: chunk.preliminary,
+                    providerMetadata: chunk.providerMetadata,
+                    title: toolInvocation.title,
+                    toolMetadata: toolInvocation.toolMetadata
+                  },
+                  toolInvocation
+                );
               }
               write();
               break;
@@ -6995,30 +7033,36 @@ function processUIMessageStream({
             case "tool-output-error": {
               const toolInvocation = getToolInvocation(chunk.toolCallId);
               if (toolInvocation.type === "dynamic-tool") {
-                updateDynamicToolPart({
-                  toolCallId: chunk.toolCallId,
-                  toolName: toolInvocation.toolName,
-                  state: "output-error",
-                  input: toolInvocation.input,
-                  errorText: chunk.errorText,
-                  providerExecuted: chunk.providerExecuted,
-                  providerMetadata: chunk.providerMetadata,
-                  title: toolInvocation.title,
-                  toolMetadata: toolInvocation.toolMetadata
-                });
+                updateDynamicToolPart(
+                  {
+                    toolCallId: chunk.toolCallId,
+                    toolName: toolInvocation.toolName,
+                    state: "output-error",
+                    input: toolInvocation.input,
+                    errorText: chunk.errorText,
+                    providerExecuted: chunk.providerExecuted,
+                    providerMetadata: chunk.providerMetadata,
+                    title: toolInvocation.title,
+                    toolMetadata: toolInvocation.toolMetadata
+                  },
+                  toolInvocation
+                );
               } else {
-                updateToolPart({
-                  toolCallId: chunk.toolCallId,
-                  toolName: getStaticToolName(toolInvocation),
-                  state: "output-error",
-                  input: toolInvocation.input,
-                  rawInput: toolInvocation.rawInput,
-                  errorText: chunk.errorText,
-                  providerExecuted: chunk.providerExecuted,
-                  providerMetadata: chunk.providerMetadata,
-                  title: toolInvocation.title,
-                  toolMetadata: toolInvocation.toolMetadata
-                });
+                updateToolPart(
+                  {
+                    toolCallId: chunk.toolCallId,
+                    toolName: getStaticToolName(toolInvocation),
+                    state: "output-error",
+                    input: toolInvocation.input,
+                    rawInput: toolInvocation.rawInput,
+                    errorText: chunk.errorText,
+                    providerExecuted: chunk.providerExecuted,
+                    providerMetadata: chunk.providerMetadata,
+                    title: toolInvocation.title,
+                    toolMetadata: toolInvocation.toolMetadata
+                  },
+                  toolInvocation
+                );
               }
               write();
               break;