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

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ai
 
+## 7.0.0-beta.21
+
+### Patch Changes
+
+- 34fd051: feat(ai): add toolMs to timeout configuration
+
 ## 7.0.0-beta.20
 
 ### Patch Changes

package/dist/index.d.mts

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -1135,6 +1135,12 @@ function getChunkTimeoutMs(timeout) {
   }
   return timeout.chunkMs;
 }
+function getToolTimeoutMs(timeout) {
+  if (timeout == null || typeof timeout === "number") {
+    return void 0;
+  }
+  return timeout.toolMs;
+}
 
 // src/prompt/convert-to-language-model-prompt.ts
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
@@ -1371,7 +1377,7 @@ var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_provider_utils4 = 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 ({
@@ -3236,6 +3242,7 @@ async function executeToolCall({
   callId,
   messages,
   abortSignal,
+  toolTimeoutMs,
   experimental_context,
   stepNumber,
   model,
@@ -3262,6 +3269,7 @@ async function executeToolCall({
   };
   let output;
   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 {
     await executeToolInTelemetryContext({
@@ -3274,7 +3282,7 @@ async function executeToolCall({
           options: {
             toolCallId,
             messages,
-            abortSignal,
+            abortSignal: toolAbortSignal,
             experimental_context
           }
         });
@@ -4534,6 +4542,7 @@ async function generateText({
   const stopConditions = asArray(stopWhen);
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
   const stepTimeoutMs = getStepTimeoutMs(timeout);
+  const toolTimeoutMs = getToolTimeoutMs(timeout);
   const stepAbortController = stepTimeoutMs != null ? new AbortController() : void 0;
   const mergedAbortSignal = mergeAbortSignals(
     abortSignal,
@@ -4615,6 +4624,7 @@ async function generateText({
         callId,
         messages: initialMessages,
         abortSignal: mergedAbortSignal,
+        toolTimeoutMs,
         experimental_context,
         stepNumber: 0,
         model: modelInfo,
@@ -4861,6 +4871,7 @@ async function generateText({
               callId,
               messages: stepInputMessages,
               abortSignal: mergedAbortSignal,
+              toolTimeoutMs,
               experimental_context,
               stepNumber: steps.length,
               model: stepModelInfo,
@@ -5043,6 +5054,7 @@ async function executeTools({
   callId,
   messages,
   abortSignal,
+  toolTimeoutMs,
   experimental_context,
   stepNumber,
   model,
@@ -5059,6 +5071,7 @@ async function executeTools({
         callId,
         messages,
         abortSignal,
+        toolTimeoutMs,
         experimental_context,
         stepNumber,
         model,
@@ -6473,6 +6486,24 @@ function createStitchableStream() {
   };
 }
 
+// src/generate-text/create-stream-text-part-transform.ts
+function createStreamTextPartTransform() {
+  return new TransformStream({
+    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);
+      }
+    }
+  });
+}
+
 // src/generate-text/run-tools-transformation.ts
 var import_provider_utils18 = require("@ai-sdk/provider-utils");
 function runToolsTransformation({
@@ -6484,6 +6515,7 @@ function runToolsTransformation({
   messages,
   abortSignal,
   repairToolCall,
+  toolTimeoutMs,
   experimental_context,
   generateId: generateId2,
   stepNumber,
@@ -6517,6 +6549,7 @@ function runToolsTransformation({
       switch (chunkType) {
         case "stream-start":
         case "text-start":
+        case "text-delta":
         case "text-end":
         case "reasoning-start":
         case "reasoning-end":
@@ -6530,14 +6563,6 @@ function runToolsTransformation({
           controller.enqueue(chunk);
           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",
@@ -6647,6 +6672,7 @@ function runToolsTransformation({
                 callId,
                 messages,
                 abortSignal,
+                toolTimeoutMs,
                 experimental_context,
                 stepNumber,
                 model,
@@ -6793,6 +6819,7 @@ function streamText({
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
   const stepTimeoutMs = getStepTimeoutMs(timeout);
   const chunkTimeoutMs = getChunkTimeoutMs(timeout);
+  const toolTimeoutMs = getToolTimeoutMs(timeout);
   const stepAbortController = stepTimeoutMs != null ? new AbortController() : void 0;
   const chunkAbortController = chunkTimeoutMs != null ? new AbortController() : void 0;
   return new DefaultStreamTextResult({
@@ -6811,6 +6838,7 @@ function streamText({
     stepAbortController,
     chunkTimeoutMs,
     chunkAbortController,
+    toolTimeoutMs,
     system,
     prompt,
     messages,
@@ -6918,6 +6946,7 @@ var DefaultStreamTextResult = class {
     stepAbortController,
     chunkTimeoutMs,
     chunkAbortController,
+    toolTimeoutMs,
     system,
     prompt,
     messages,
@@ -7349,6 +7378,7 @@ var DefaultStreamTextResult = class {
                 callId,
                 messages: initialMessages,
                 abortSignal,
+                toolTimeoutMs,
                 experimental_context,
                 stepNumber: recordedSteps.length,
                 model: modelInfo,
@@ -7521,7 +7551,11 @@ var DefaultStreamTextResult = class {
             ]
           });
           const stepStartTimestampMs = now2();
-          const { stream: stream2, response, request } = await retry(
+          const {
+            stream: languageModelStream,
+            response,
+            request
+          } = await retry(
             async () => stepModel.doStream({
               ...callSettings,
               tools: stepTools,
@@ -7534,6 +7568,9 @@ var DefaultStreamTextResult = class {
               includeRawChunks: includeRawChunks2
             })
           );
+          const stream2 = languageModelStream.pipeThrough(
+            createStreamTextPartTransform()
+          );
           const streamWithToolResults = runToolsTransformation({
             tools,
             generatorStream: stream2,
@@ -7543,6 +7580,7 @@ var DefaultStreamTextResult = class {
             messages: stepInputMessages,
             repairToolCall,
             abortSignal,
+            toolTimeoutMs,
             experimental_context,
             generateId: generateId2,
             stepNumber: recordedSteps.length,