ai 6.0.230 → 6.0.232

package/dist/index.mjs

@@ -1171,7 +1171,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.230" : "0.0.0-test";
+var VERSION = true ? "6.0.232" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -1224,6 +1224,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
 import { AISDKError as AISDKError23 } from "@ai-sdk/provider";
 import {
@@ -1374,7 +1410,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);
     }
@@ -2636,42 +2680,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
 import { APICallError as APICallError2 } from "@ai-sdk/provider";
 import { GatewayError } from "@ai-sdk/gateway";
@@ -3013,6 +3021,21 @@ function extractTextContent(content) {
   return parts.map((content2) => content2.text).join("");
 }
 
+// src/generate-text/filter-active-tools.ts
+function filterActiveTools({
+  tools,
+  activeTools
+}) {
+  if (tools == null || activeTools == null) {
+    return tools;
+  }
+  return Object.fromEntries(
+    Object.entries(tools).filter(
+      ([name22]) => activeTools.includes(name22)
+    )
+  );
+}
+
 // src/generate-text/generated-file.ts
 import {
   convertBase64ToUint8Array as convertBase64ToUint8Array3,
@@ -4569,6 +4592,9 @@ async function generateText({
         const steps = [];
         const pendingDeferredToolCalls = /* @__PURE__ */ new Map();
         do {
+          if (steps.length > 0) {
+            mergedAbortSignal == null ? void 0 : mergedAbortSignal.throwIfAborted();
+          }
           const stepTimeoutId = setAbortTimeout({
             abortController: stepAbortController,
             label: "Step",
@@ -4600,6 +4626,10 @@ async function generateText({
             });
             experimental_context = (_d = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _d : experimental_context;
             const stepActiveTools = (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools;
+            const stepToolSet = filterActiveTools({
+              tools,
+              activeTools: stepActiveTools
+            });
             const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
               tools,
               toolChoice: (_f = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _f : toolChoice,
@@ -4752,7 +4782,7 @@ async function generateText({
               ).map(
                 (toolCall) => parseToolCall({
                   toolCall,
-                  tools,
+                  tools: stepToolSet,
                   repairToolCall,
                   system,
                   messages: stepInputMessages
@@ -4764,7 +4794,7 @@ async function generateText({
               if (toolCall.invalid) {
                 continue;
               }
-              const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
+              const tool2 = stepToolSet == null ? void 0 : stepToolSet[toolCall.toolName];
               if (tool2 == null) {
                 continue;
               }
@@ -4824,13 +4854,13 @@ async function generateText({
             clientToolCalls = stepToolCalls.filter(
               (toolCall) => !toolCall.providerExecuted
             );
-            if (tools != null) {
+            if (stepToolSet != null) {
               clientToolOutputs.push(
                 ...await executeTools({
                   toolCalls: clientToolCalls.filter(
                     (toolCall) => !toolCall.invalid && toolApprovalRequests[toolCall.toolCallId] == null
                   ),
-                  tools,
+                  tools: stepToolSet,
                   tracer,
                   telemetry,
                   messages: stepInputMessages,
@@ -4852,7 +4882,7 @@ async function generateText({
             for (const toolCall of stepToolCalls) {
               if (!toolCall.providerExecuted)
                 continue;
-              const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
+              const tool2 = stepToolSet == null ? void 0 : stepToolSet[toolCall.toolName];
               if ((tool2 == null ? void 0 : tool2.type) === "provider" && tool2.supportsDeferredResults) {
                 const hasResultInResponse = currentModelResponse.content.some(
                   (part) => part.type === "tool-result" && part.toolCallId === toolCall.toolCallId
@@ -4874,12 +4904,12 @@ async function generateText({
               toolCalls: stepToolCalls,
               toolOutputs: clientToolOutputs,
               toolApprovalRequests: Object.values(toolApprovalRequests),
-              tools
+              tools: stepToolSet
             });
             responseMessages.push(
               ...await toResponseMessages({
                 content: stepContent,
-                tools
+                tools: stepToolSet
               })
             );
             const stepRequest = ((_i = include == null ? void 0 : include.requestBody) != null ? _i : true) ? (_j = currentModelResponse.request) != null ? _j : {} : { ...currentModelResponse.request, body: void 0 };
@@ -5444,27 +5474,27 @@ var toolMetadataSchema = z7.record(
 var uiMessageChunkSchema = lazySchema(
   () => zodSchema(
     z7.union([
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("text-start"),
         id: z7.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("text-delta"),
         id: z7.string(),
         delta: z7.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("text-end"),
         id: z7.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("error"),
         errorText: z7.string()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-input-start"),
         toolCallId: z7.string(),
         toolName: z7.string(),
@@ -5474,12 +5504,12 @@ var uiMessageChunkSchema = lazySchema(
         dynamic: z7.boolean().optional(),
         title: z7.string().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-input-delta"),
         toolCallId: z7.string(),
         inputTextDelta: z7.string()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-input-available"),
         toolCallId: z7.string(),
         toolName: z7.string(),
@@ -5490,7 +5520,7 @@ var uiMessageChunkSchema = lazySchema(
         dynamic: z7.boolean().optional(),
         title: z7.string().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-input-error"),
         toolCallId: z7.string(),
         toolName: z7.string(),
@@ -5502,13 +5532,13 @@ var uiMessageChunkSchema = lazySchema(
         errorText: z7.string(),
         title: z7.string().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-approval-request"),
         approvalId: z7.string(),
         toolCallId: z7.string(),
         signature: z7.string().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-output-available"),
         toolCallId: z7.string(),
         output: z7.unknown(),
@@ -5518,7 +5548,7 @@ var uiMessageChunkSchema = lazySchema(
         dynamic: z7.boolean().optional(),
         preliminary: z7.boolean().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-output-error"),
         toolCallId: z7.string(),
         errorText: z7.string(),
@@ -5527,34 +5557,34 @@ var uiMessageChunkSchema = lazySchema(
         toolMetadata: toolMetadataSchema.optional(),
         dynamic: z7.boolean().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("tool-output-denied"),
         toolCallId: z7.string()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("reasoning-start"),
         id: z7.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("reasoning-delta"),
         id: z7.string(),
         delta: z7.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("reasoning-end"),
         id: z7.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("source-url"),
         sourceId: z7.string(),
         url: z7.string(),
         title: z7.string().optional(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("source-document"),
         sourceId: z7.string(),
         mediaType: z7.string(),
@@ -5562,13 +5592,13 @@ var uiMessageChunkSchema = lazySchema(
         filename: z7.string().optional(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("file"),
         url: z7.string(),
         mediaType: z7.string(),
         providerMetadata: providerMetadataSchema.optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.custom(
           (value) => typeof value === "string" && value.startsWith("data-"),
           { message: 'Type must start with "data-"' }
@@ -5577,18 +5607,18 @@ var uiMessageChunkSchema = lazySchema(
         data: z7.unknown(),
         transient: z7.boolean().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("start-step")
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("finish-step")
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("start"),
         messageId: z7.string().optional(),
         messageMetadata: z7.unknown().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("finish"),
         finishReason: z7.enum([
           "stop",
@@ -5600,11 +5630,11 @@ var uiMessageChunkSchema = lazySchema(
         ]).optional(),
         messageMetadata: z7.unknown().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("abort"),
         reason: z7.string().optional()
       }),
-      z7.strictObject({
+      z7.looseObject({
         type: z7.literal("message-metadata"),
         messageMetadata: z7.unknown()
       })
@@ -7060,6 +7090,7 @@ var DefaultStreamTextResult = class {
     let recordedWarnings = [];
     const recordedSteps = [];
     let recordedNoOutputError;
+    let currentStepToolSet = tools;
     const pendingDeferredToolCalls = /* @__PURE__ */ new Map();
     let rootSpan;
     let activeTextContent = createIdMap();
@@ -7187,7 +7218,7 @@ var DefaultStreamTextResult = class {
         if (part.type === "finish-step") {
           const stepMessages = await toResponseMessages({
             content: recordedContent,
-            tools
+            tools: currentStepToolSet
           });
           const currentStepResult = new DefaultStepResult({
             stepNumber: recordedSteps.length,
@@ -7618,6 +7649,11 @@ var DefaultStreamTextResult = class {
               download: download2
             });
             const stepActiveTools = (_d = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _d : activeTools;
+            const stepToolSet = filterActiveTools({
+              tools,
+              activeTools: stepActiveTools
+            });
+            currentStepToolSet = stepToolSet;
             const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
               tools,
               toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
@@ -7717,7 +7753,7 @@ var DefaultStreamTextResult = class {
               })
             );
             const streamWithToolResults = runToolsTransformation({
-              tools,
+              tools: stepToolSet,
               generatorStream: stream2,
               tracer,
               telemetry,
@@ -7868,7 +7904,7 @@ var DefaultStreamTextResult = class {
                       }
                       case "tool-input-start": {
                         activeToolCallToolNames[chunk.id] = chunk.toolName;
-                        const tool2 = tools == null ? void 0 : tools[chunk.toolName];
+                        const tool2 = stepToolSet == null ? void 0 : stepToolSet[chunk.toolName];
                         if ((tool2 == null ? void 0 : tool2.onInputStart) != null) {
                           await tool2.onInputStart({
                             toolCallId: chunk.id,
@@ -7891,7 +7927,7 @@ var DefaultStreamTextResult = class {
                       }
                       case "tool-input-delta": {
                         const toolName = activeToolCallToolNames[chunk.id];
-                        const tool2 = tools == null ? void 0 : tools[toolName];
+                        const tool2 = stepToolSet == null ? void 0 : stepToolSet[toolName];
                         if ((tool2 == null ? void 0 : tool2.onInputDelta) != null) {
                           await tool2.onInputDelta({
                             inputTextDelta: chunk.delta,
@@ -8023,7 +8059,7 @@ var DefaultStreamTextResult = class {
                     for (const toolCall of stepToolCalls) {
                       if (toolCall.providerExecuted !== true)
                         continue;
-                      const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
+                      const tool2 = stepToolSet == null ? void 0 : stepToolSet[toolCall.toolName];
                       if ((tool2 == null ? void 0 : tool2.type) === "provider" && tool2.supportsDeferredResults) {
                         const hasResultInStep = stepToolOutputs.some(
                           (output2) => (output2.type === "tool-result" || output2.type === "tool-error") && output2.toolCallId === toolCall.toolCallId
@@ -8058,7 +8094,7 @@ var DefaultStreamTextResult = class {
                             // use transformed content to create the messages for the next step:
                             recordedSteps[recordedSteps.length - 1].content
                           ),
-                          tools
+                          tools: stepToolSet
                         })
                       );
                       try {