ai 7.0.0-beta.20 → 7.0.0-beta.21

package/dist/internal/index.d.mts

@@ -93,6 +93,7 @@ type TimeoutConfiguration = number | {
     totalMs?: number;
     stepMs?: number;
     chunkMs?: number;
+    toolMs?: number;
 };
 type CallSettings = {
     /**

package/dist/internal/index.d.ts

@@ -93,6 +93,7 @@ type TimeoutConfiguration = number | {
     totalMs?: number;
     stepMs?: number;
     chunkMs?: number;
+    toolMs?: number;
 };
 type CallSettings = {
     /**

package/dist/internal/index.js

@@ -153,7 +153,7 @@ var import_provider_utils2 = require("@ai-sdk/provider-utils");
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "7.0.0-beta.20" : "0.0.0-test";
+var VERSION = true ? "7.0.0-beta.21" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({

package/dist/internal/index.mjs

@@ -133,7 +133,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.0-beta.20" : "0.0.0-test";
+var VERSION = true ? "7.0.0-beta.21" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai",
-  "version": "7.0.0-beta.20",
+  "version": "7.0.0-beta.21",
   "description": "AI SDK by Vercel - The AI Toolkit for TypeScript and JavaScript",
   "license": "Apache-2.0",
   "sideEffects": false,

package/src/generate-text/create-stream-text-part-transform.ts

@@ -0,0 +1,36 @@
+import { LanguageModelV4StreamPart } from '@ai-sdk/provider';
+import { ProviderMetadata } from '../types/provider-metadata';
+
+export type UglyTransformedStreamTextPart =
+  | Exclude<
+      LanguageModelV4StreamPart,
+      {
+        type: 'text-delta';
+      }
+    >
+  | {
+      type: 'text-delta';
+      id: string;
+      providerMetadata?: ProviderMetadata;
+      text: string;
+    };
+
+export function createStreamTextPartTransform() {
+  return new TransformStream<
+    LanguageModelV4StreamPart,
+    UglyTransformedStreamTextPart
+  >({
+    async transform(chunk, controller) {
+      if (chunk.type === 'text-delta') {
+        controller.enqueue({
+          type: 'text-delta',
+          id: chunk.id,
+          text: chunk.delta,
+          providerMetadata: chunk.providerMetadata,
+        });
+      } else {
+        controller.enqueue(chunk);
+      }
+    },
+  });
+}

package/src/generate-text/execute-tool-call.ts

@@ -30,6 +30,7 @@ export async function executeToolCall<TOOLS extends ToolSet>({
   callId,
   messages,
   abortSignal,
+  toolTimeoutMs,
   experimental_context,
   stepNumber,
   model,
@@ -44,6 +45,7 @@ export async function executeToolCall<TOOLS extends ToolSet>({
   callId: string;
   messages: ModelMessage[];
   abortSignal: AbortSignal | undefined;
+  toolTimeoutMs?: number | undefined;
   experimental_context: unknown;
   stepNumber?: number;
   model?: { provider: string; modelId: string };
@@ -83,6 +85,13 @@ export async function executeToolCall<TOOLS extends ToolSet>({
 
   await notify({ event: baseCallbackEvent, callbacks: onToolCallStart });
 
+  const toolAbortSignal =
+    toolTimeoutMs != null
+      ? abortSignal != null
+        ? AbortSignal.any([abortSignal, AbortSignal.timeout(toolTimeoutMs)])
+        : AbortSignal.timeout(toolTimeoutMs)
+      : abortSignal;
+
   const startTime = now();
 
   try {
@@ -101,7 +110,7 @@ export async function executeToolCall<TOOLS extends ToolSet>({
           options: {
             toolCallId,
             messages,
-            abortSignal,
+            abortSignal: toolAbortSignal,
             experimental_context,
           },
         });

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

@@ -21,6 +21,7 @@ import { ModelMessage } from '../prompt';
 import {
   CallSettings,
   getStepTimeoutMs,
+  getToolTimeoutMs,
   getTotalTimeoutMs,
   TimeoutConfiguration,
 } from '../prompt/call-settings';
@@ -449,6 +450,7 @@ export async function generateText<
 
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
   const stepTimeoutMs = getStepTimeoutMs(timeout);
+  const toolTimeoutMs = getToolTimeoutMs(timeout);
   const stepAbortController =
     stepTimeoutMs != null ? new AbortController() : undefined;
   const mergedAbortSignal = mergeAbortSignals(
@@ -548,6 +550,7 @@ export async function generateText<
         callId,
         messages: initialMessages,
         abortSignal: mergedAbortSignal,
+        toolTimeoutMs,
         experimental_context,
         stepNumber: 0,
         model: modelInfo,
@@ -870,6 +873,7 @@ export async function generateText<
               callId,
               messages: stepInputMessages,
               abortSignal: mergedAbortSignal,
+              toolTimeoutMs,
               experimental_context,
               stepNumber: steps.length,
               model: stepModelInfo,
@@ -1102,6 +1106,7 @@ async function executeTools<TOOLS extends ToolSet>({
   callId,
   messages,
   abortSignal,
+  toolTimeoutMs,
   experimental_context,
   stepNumber,
   model,
@@ -1115,6 +1120,7 @@ async function executeTools<TOOLS extends ToolSet>({
   callId: string;
   messages: ModelMessage[];
   abortSignal: AbortSignal | undefined;
+  toolTimeoutMs?: number | undefined;
   experimental_context: unknown;
   stepNumber: number;
   model: { provider: string; modelId: string };
@@ -1131,6 +1137,7 @@ async function executeTools<TOOLS extends ToolSet>({
         callId,
         messages,
         abortSignal,
+        toolTimeoutMs,
         experimental_context,
         stepNumber,
         model,

package/src/generate-text/run-tools-transformation.ts

@@ -1,4 +1,4 @@
-import { LanguageModelV4StreamPart, SharedV4Warning } from '@ai-sdk/provider';
+import { SharedV4Warning } from '@ai-sdk/provider';
 import {
   getErrorMessage,
   IdGenerator,
@@ -11,14 +11,15 @@ import { TelemetrySettings } from '../telemetry/telemetry-settings';
 import { FinishReason, LanguageModelUsage, ProviderMetadata } from '../types';
 import { Source } from '../types/language-model';
 import { asLanguageModelUsage } from '../types/usage';
+import { UglyTransformedStreamTextPart } from './create-stream-text-part-transform';
 import { executeToolCall } from './execute-tool-call';
+import { DefaultGeneratedFileWithType, GeneratedFile } from './generated-file';
+import { isApprovalNeeded } from './is-approval-needed';
+import { parseToolCall } from './parse-tool-call';
 import {
   StreamTextOnToolCallFinishCallback,
   StreamTextOnToolCallStartCallback,
 } from './stream-text';
-import { DefaultGeneratedFileWithType, GeneratedFile } from './generated-file';
-import { isApprovalNeeded } from './is-approval-needed';
-import { parseToolCall } from './parse-tool-call';
 import { ToolApprovalRequestOutput } from './tool-approval-request-output';
 import { TypedToolCall } from './tool-call';
 import { ToolCallRepairFunction } from './tool-call-repair-function';
@@ -122,6 +123,7 @@ export function runToolsTransformation<TOOLS extends ToolSet>({
   messages,
   abortSignal,
   repairToolCall,
+  toolTimeoutMs,
   experimental_context,
   generateId,
   stepNumber,
@@ -131,13 +133,14 @@ export function runToolsTransformation<TOOLS extends ToolSet>({
   executeToolInTelemetryContext,
 }: {
   tools: TOOLS | undefined;
-  generatorStream: ReadableStream<LanguageModelV4StreamPart>;
+  generatorStream: ReadableStream<UglyTransformedStreamTextPart>;
   telemetry: TelemetrySettings | undefined;
   callId: string;
   system: string | SystemModelMessage | Array<SystemModelMessage> | undefined;
   messages: ModelMessage[];
   abortSignal: AbortSignal | undefined;
   repairToolCall: ToolCallRepairFunction<TOOLS> | undefined;
+  toolTimeoutMs?: number | undefined;
   experimental_context: unknown;
   generateId: IdGenerator;
   stepNumber?: number;
@@ -192,11 +195,11 @@ export function runToolsTransformation<TOOLS extends ToolSet>({
 
   // forward stream
   const forwardStream = new TransformStream<
-    LanguageModelV4StreamPart,
+    UglyTransformedStreamTextPart,
     SingleRequestTextStreamPart<TOOLS>
   >({
     async transform(
-      chunk: LanguageModelV4StreamPart,
+      chunk: UglyTransformedStreamTextPart,
       controller: TransformStreamDefaultController<
         SingleRequestTextStreamPart<TOOLS>
       >,
@@ -207,6 +210,7 @@ export function runToolsTransformation<TOOLS extends ToolSet>({
         // forward:
         case 'stream-start':
         case 'text-start':
+        case 'text-delta':
         case 'text-end':
         case 'reasoning-start':
         case 'reasoning-end':
@@ -221,15 +225,6 @@ export function runToolsTransformation<TOOLS extends ToolSet>({
           break;
         }
 
-        case 'text-delta':
-          controller.enqueue({
-            type: 'text-delta',
-            id: chunk.id,
-            text: chunk.delta,
-            providerMetadata: chunk.providerMetadata,
-          });
-          break;
-
         case 'reasoning-delta':
           controller.enqueue({
             type: 'reasoning-delta',
@@ -364,6 +359,7 @@ export function runToolsTransformation<TOOLS extends ToolSet>({
                 callId,
                 messages,
                 abortSignal,
+                toolTimeoutMs,
                 experimental_context,
                 stepNumber,
                 model,

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

@@ -21,6 +21,7 @@ import {
   CallSettings,
   getChunkTimeoutMs,
   getStepTimeoutMs,
+  getToolTimeoutMs,
   getTotalTimeoutMs,
   TimeoutConfiguration,
 } from '../prompt/call-settings';
@@ -82,6 +83,7 @@ import type {
 } from './callback-events';
 import { collectToolApprovals } from './collect-tool-approvals';
 import { ContentPart } from './content-part';
+import { createStreamTextPartTransform } from './create-stream-text-part-transform';
 import { executeToolCall } from './execute-tool-call';
 import { Output, text } from './output';
 import {
@@ -530,6 +532,7 @@ export function streamText<
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
   const stepTimeoutMs = getStepTimeoutMs(timeout);
   const chunkTimeoutMs = getChunkTimeoutMs(timeout);
+  const toolTimeoutMs = getToolTimeoutMs(timeout);
   const stepAbortController =
     stepTimeoutMs != null ? new AbortController() : undefined;
   const chunkAbortController =
@@ -550,6 +553,7 @@ export function streamText<
     stepAbortController,
     chunkTimeoutMs,
     chunkAbortController,
+    toolTimeoutMs,
     system,
     prompt,
     messages,
@@ -729,6 +733,7 @@ class DefaultStreamTextResult<TOOLS extends ToolSet, OUTPUT extends Output>
     stepAbortController,
     chunkTimeoutMs,
     chunkAbortController,
+    toolTimeoutMs,
     system,
     prompt,
     messages,
@@ -771,6 +776,7 @@ class DefaultStreamTextResult<TOOLS extends ToolSet, OUTPUT extends Output>
     stepAbortController: AbortController | undefined;
     chunkTimeoutMs: number | undefined;
     chunkAbortController: AbortController | undefined;
+    toolTimeoutMs: number | undefined;
     system: Prompt['system'];
     prompt: Prompt['prompt'];
     messages: Prompt['messages'];
@@ -1352,6 +1358,7 @@ class DefaultStreamTextResult<TOOLS extends ToolSet, OUTPUT extends Output>
                 callId,
                 messages: initialMessages,
                 abortSignal,
+                toolTimeoutMs,
                 experimental_context,
                 stepNumber: recordedSteps.length,
                 model: modelInfo,
@@ -1573,7 +1580,11 @@ class DefaultStreamTextResult<TOOLS extends ToolSet, OUTPUT extends Output>
           });
 
           const stepStartTimestampMs = now();
-          const { stream, response, request } = await retry(async () =>
+          const {
+            stream: languageModelStream,
+            response,
+            request,
+          } = await retry(async () =>
             stepModel.doStream({
               ...callSettings,
               tools: stepTools,
@@ -1587,6 +1598,10 @@ class DefaultStreamTextResult<TOOLS extends ToolSet, OUTPUT extends Output>
             }),
           );
 
+          const stream = languageModelStream.pipeThrough(
+            createStreamTextPartTransform(),
+          );
+
           const streamWithToolResults = runToolsTransformation({
             tools,
             generatorStream: stream,
@@ -1596,6 +1611,7 @@ class DefaultStreamTextResult<TOOLS extends ToolSet, OUTPUT extends Output>
             messages: stepInputMessages,
             repairToolCall,
             abortSignal,
+            toolTimeoutMs,
             experimental_context,
             generateId,
             stepNumber: recordedSteps.length,

package/src/prompt/call-settings.ts

@@ -7,7 +7,7 @@
  */
 export type TimeoutConfiguration =
   | number
-  | { totalMs?: number; stepMs?: number; chunkMs?: number };
+  | { totalMs?: number; stepMs?: number; chunkMs?: number; toolMs?: number };
 
 /**
  * Extracts the total timeout value in milliseconds from a TimeoutConfiguration.
@@ -58,6 +58,15 @@ export function getChunkTimeoutMs(
   return timeout.chunkMs;
 }
 
+export function getToolTimeoutMs(
+  timeout: TimeoutConfiguration | undefined,
+): number | undefined {
+  if (timeout == null || typeof timeout === 'number') {
+    return undefined;
+  }
+  return timeout.toolMs;
+}
+
 export type CallSettings = {
   /**
    * Maximum number of tokens to generate.