ai 6.0.13 → 6.0.14

package/dist/index.mjs

@@ -898,7 +898,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.13" : "0.0.0-test";
+var VERSION = true ? "6.0.14" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -3498,6 +3498,34 @@ async function toResponseMessages({
   return responseMessages;
 }
 
+// src/util/merge-abort-signals.ts
+function mergeAbortSignals(...signals) {
+  const validSignals = signals.filter(
+    (signal) => signal != null
+  );
+  if (validSignals.length === 0) {
+    return void 0;
+  }
+  if (validSignals.length === 1) {
+    return validSignals[0];
+  }
+  const controller = new AbortController();
+  for (const signal of validSignals) {
+    if (signal.aborted) {
+      controller.abort(signal.reason);
+      return controller.signal;
+    }
+    signal.addEventListener(
+      "abort",
+      () => {
+        controller.abort(signal.reason);
+      },
+      { once: true }
+    );
+  }
+  return controller.signal;
+}
+
 // src/generate-text/generate-text.ts
 var originalGenerateId = createIdGenerator({
   prefix: "aitxt",
@@ -3512,6 +3540,7 @@ async function generateText({
   messages,
   maxRetries: maxRetriesArg,
   abortSignal,
+  timeout,
   headers,
   stopWhen = stepCountIs(1),
   experimental_output,
@@ -3535,9 +3564,13 @@ async function generateText({
 }) {
   const model = resolveLanguageModel(modelArg);
   const stopConditions = asArray(stopWhen);
+  const mergedAbortSignal = mergeAbortSignals(
+    abortSignal,
+    timeout != null ? AbortSignal.timeout(timeout) : void 0
+  );
   const { maxRetries, retry } = prepareRetries({
     maxRetries: maxRetriesArg,
-    abortSignal
+    abortSignal: mergedAbortSignal
   });
   const callSettings = prepareCallSettings(settings);
   const headersWithUserAgent = withUserAgentSuffix2(
@@ -3594,7 +3627,7 @@ async function generateText({
             tracer,
             telemetry,
             messages: initialMessages,
-            abortSignal,
+            abortSignal: mergedAbortSignal,
             experimental_context
           });
           const toolContent = [];
@@ -3740,7 +3773,7 @@ async function generateText({
                     responseFormat: await (output == null ? void 0 : output.responseFormat),
                     prompt: promptMessages,
                     providerOptions: stepProviderOptions,
-                    abortSignal,
+                    abortSignal: mergedAbortSignal,
                     headers: headersWithUserAgent
                   });
                   const responseData = {
@@ -3816,7 +3849,7 @@ async function generateText({
                 input: toolCall.input,
                 toolCallId: toolCall.toolCallId,
                 messages: stepInputMessages,
-                abortSignal,
+                abortSignal: mergedAbortSignal,
                 experimental_context
               });
             }
@@ -3860,7 +3893,7 @@ async function generateText({
                 tracer,
                 telemetry,
                 messages: stepInputMessages,
-                abortSignal,
+                abortSignal: mergedAbortSignal,
                 experimental_context
               })
             );
@@ -5598,6 +5631,7 @@ function streamText({
   messages,
   maxRetries,
   abortSignal,
+  timeout,
   headers,
   stopWhen = stepCountIs(1),
   experimental_output,
@@ -5632,7 +5666,10 @@ function streamText({
     headers,
     settings,
     maxRetries,
-    abortSignal,
+    abortSignal: mergeAbortSignals(
+      abortSignal,
+      timeout != null ? AbortSignal.timeout(timeout) : void 0
+    ),
     system,
     prompt,
     messages,
@@ -7128,11 +7165,13 @@ var ToolLoopAgent = class {
    */
   async generate({
     abortSignal,
+    timeout,
     ...options
   }) {
     return generateText({
       ...await this.prepareCall(options),
-      abortSignal
+      abortSignal,
+      timeout
     });
   }
   /**
@@ -7140,12 +7179,14 @@ var ToolLoopAgent = class {
    */
   async stream({
     abortSignal,
+    timeout,
     experimental_transform,
     ...options
   }) {
     return streamText({
       ...await this.prepareCall(options),
       abortSignal,
+      timeout,
       experimental_transform
     });
   }
@@ -7908,6 +7949,7 @@ async function createAgentUIStream({
   uiMessages,
   options,
   abortSignal,
+  timeout,
   experimental_transform,
   ...uiMessageStreamOptions
 }) {
@@ -7922,6 +7964,7 @@ async function createAgentUIStream({
     prompt: modelMessages,
     options,
     abortSignal,
+    timeout,
     experimental_transform
   });
   return result.toUIMessageStream(uiMessageStreamOptions);