ai 6.0.230 → 6.0.232

package/src/generate-text/stream-text.ts

@@ -95,6 +95,7 @@ import type {
 } from './callback-events';
 import type { ContentPart } from './content-part';
 import { executeToolCall } from './execute-tool-call';
+import { filterActiveTools } from './filter-active-tools';
 import { text, type Output } from './output';
 import type {
   InferCompleteOutput,
@@ -882,6 +883,7 @@ class DefaultStreamTextResult<
     let recordedWarnings: Array<CallWarning> = [];
     const recordedSteps: StepResult<TOOLS>[] = [];
     let recordedNoOutputError: NoOutputGeneratedError | undefined;
+    let currentStepToolSet = tools;
 
     // Track provider-executed tool calls that support deferred results
     // (e.g., code_execution in programmatic tool calling scenarios).
@@ -1081,7 +1083,7 @@ class DefaultStreamTextResult<
         if (part.type === 'finish-step') {
           const stepMessages = await toResponseMessages({
             content: recordedContent,
-            tools,
+            tools: currentStepToolSet,
           });
 
           // Add step information (after response messages are updated):
@@ -1641,6 +1643,11 @@ class DefaultStreamTextResult<
 
             const stepActiveTools =
               prepareStepResult?.activeTools ?? activeTools;
+            const stepToolSet = filterActiveTools({
+              tools,
+              activeTools: stepActiveTools,
+            });
+            currentStepToolSet = stepToolSet;
 
             const { toolChoice: stepToolChoice, tools: stepTools } =
               await prepareToolsAndToolChoice({
@@ -1759,7 +1766,7 @@ class DefaultStreamTextResult<
             );
 
             const streamWithToolResults = runToolsTransformation({
-              tools,
+              tools: stepToolSet,
               generatorStream: stream,
               tracer,
               telemetry,
@@ -1967,7 +1974,7 @@ class DefaultStreamTextResult<
                       case 'tool-input-start': {
                         activeToolCallToolNames[chunk.id] = chunk.toolName;
 
-                        const tool = tools?.[chunk.toolName];
+                        const tool = stepToolSet?.[chunk.toolName];
                         if (tool?.onInputStart != null) {
                           await tool.onInputStart({
                             toolCallId: chunk.id,
@@ -1993,7 +2000,7 @@ class DefaultStreamTextResult<
 
                       case 'tool-input-delta': {
                         const toolName = activeToolCallToolNames[chunk.id];
-                        const tool = tools?.[toolName];
+                        const tool = stepToolSet?.[toolName];
 
                         if (tool?.onInputDelta != null) {
                           await tool.onInputDelta({
@@ -2167,7 +2174,7 @@ class DefaultStreamTextResult<
                     // the client tool's result is sent back.
                     for (const toolCall of stepToolCalls) {
                       if (toolCall.providerExecuted !== true) continue;
-                      const tool = tools?.[toolCall.toolName];
+                      const tool = stepToolSet?.[toolCall.toolName];
                       if (
                         tool?.type === 'provider' &&
                         tool.supportsDeferredResults
@@ -2220,7 +2227,7 @@ class DefaultStreamTextResult<
                           content:
                             // use transformed content to create the messages for the next step:
                             recordedSteps[recordedSteps.length - 1].content,
-                          tools,
+                          tools: stepToolSet,
                         })),
                       );
 

package/src/prompt/convert-to-language-model-prompt.ts

@@ -25,6 +25,7 @@ import {
   createDefaultDownloadFunction,
   type DownloadFunction,
 } from '../util/download/download-function';
+import { mergeObjects } from '../util/merge-objects';
 import {
   convertDataContentToBase64String,
   convertToLanguageModelV3DataContent,
@@ -106,7 +107,19 @@ export async function convertToLanguageModelPrompt({
 
     const lastCombinedMessage = combinedMessages.at(-1);
     if (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);
     }

package/src/ui-message-stream/ui-message-chunks.ts

@@ -21,29 +21,29 @@ const toolMetadataSchema: z.ZodType<JSONObject> = z.record(
 );
 
 export const uiMessageChunkSchema = lazySchema(() =>
-  zodSchema(
+  zodSchema<UIMessageChunk>(
     z.union([
-      z.strictObject({
+      z.looseObject({
         type: z.literal('text-start'),
         id: z.string(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('text-delta'),
         id: z.string(),
         delta: z.string(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('text-end'),
         id: z.string(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('error'),
         errorText: z.string(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-input-start'),
         toolCallId: z.string(),
         toolName: z.string(),
@@ -53,12 +53,12 @@ export const uiMessageChunkSchema = lazySchema(() =>
         dynamic: z.boolean().optional(),
         title: z.string().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-input-delta'),
         toolCallId: z.string(),
         inputTextDelta: z.string(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-input-available'),
         toolCallId: z.string(),
         toolName: z.string(),
@@ -69,7 +69,7 @@ export const uiMessageChunkSchema = lazySchema(() =>
         dynamic: z.boolean().optional(),
         title: z.string().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-input-error'),
         toolCallId: z.string(),
         toolName: z.string(),
@@ -81,13 +81,13 @@ export const uiMessageChunkSchema = lazySchema(() =>
         errorText: z.string(),
         title: z.string().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-approval-request'),
         approvalId: z.string(),
         toolCallId: z.string(),
         signature: z.string().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-output-available'),
         toolCallId: z.string(),
         output: z.unknown(),
@@ -97,7 +97,7 @@ export const uiMessageChunkSchema = lazySchema(() =>
         dynamic: z.boolean().optional(),
         preliminary: z.boolean().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-output-error'),
         toolCallId: z.string(),
         errorText: z.string(),
@@ -106,34 +106,34 @@ export const uiMessageChunkSchema = lazySchema(() =>
         toolMetadata: toolMetadataSchema.optional(),
         dynamic: z.boolean().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('tool-output-denied'),
         toolCallId: z.string(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('reasoning-start'),
         id: z.string(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('reasoning-delta'),
         id: z.string(),
         delta: z.string(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('reasoning-end'),
         id: z.string(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('source-url'),
         sourceId: z.string(),
         url: z.string(),
         title: z.string().optional(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('source-document'),
         sourceId: z.string(),
         mediaType: z.string(),
@@ -141,13 +141,13 @@ export const uiMessageChunkSchema = lazySchema(() =>
         filename: z.string().optional(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('file'),
         url: z.string(),
         mediaType: z.string(),
         providerMetadata: providerMetadataSchema.optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.custom<`data-${string}`>(
           (value): value is `data-${string}` =>
             typeof value === 'string' && value.startsWith('data-'),
@@ -157,18 +157,18 @@ export const uiMessageChunkSchema = lazySchema(() =>
         data: z.unknown(),
         transient: z.boolean().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('start-step'),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('finish-step'),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('start'),
         messageId: z.string().optional(),
         messageMetadata: z.unknown().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('finish'),
         finishReason: z
           .enum([
@@ -182,11 +182,11 @@ export const uiMessageChunkSchema = lazySchema(() =>
           .optional(),
         messageMetadata: z.unknown().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('abort'),
         reason: z.string().optional(),
       }),
-      z.strictObject({
+      z.looseObject({
         type: z.literal('message-metadata'),
         messageMetadata: z.unknown(),
       }),