@ai-sdk/workflow 1.0.65 → 1.0.67

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @ai-sdk/workflow
 
+## 1.0.67
+
+### Patch Changes
+
+- e3325bd: Fix `WorkflowAgent` timeout handling by enforcing absolute deadlines inside durable model-call steps and routing timeouts through abort handling.
+
+## 1.0.66
+
+### Patch Changes
+
+- c661693: Fix the Workflow integration test harness by aligning `@workflow/vitest` with the installed Workflow runtime.
+- Updated dependencies [0782259]
+- Updated dependencies [2fd1214]
+  - ai@7.0.66
+
 ## 1.0.65
 
 ### Patch Changes

package/dist/index.js

@@ -1,6 +1,7 @@
 // src/workflow-agent.ts
 import {
   getErrorMessage,
+  isAbortError as isAbortError2,
   validateTypes,
   withUserAgentSuffix
 } from "@ai-sdk/provider-utils";
@@ -12,7 +13,6 @@ import {
   createRestrictedTelemetryDispatcher as createRestrictedTelemetryDispatcher2,
   collectToolApprovals,
   convertToLanguageModelPrompt,
-  mergeAbortSignals,
   mergeCallbacks,
   standardizePrompt,
   validateApprovedToolApprovals
@@ -74,6 +74,7 @@ import {
 import { createRestrictedTelemetryDispatcher } from "ai/internal";
 
 // src/do-stream-step.ts
+import { isAbortError } from "@ai-sdk/provider-utils";
 import {
   experimental_streamLanguageModelCall as streamModelCall,
   gateway
@@ -165,6 +166,12 @@ function resolveSerializableTools(tools) {
 // src/do-stream-step.ts
 async function doStreamStep(conversationPrompt, modelInit, writable, serializedTools, options) {
   "use step";
+  var _a;
+  const timeout = (options == null ? void 0 : options.timeoutAt) == null ? void 0 : options.timeoutAt - Date.now();
+  if (((_a = options == null ? void 0 : options.abortSignal) == null ? void 0 : _a.aborted) || timeout != null && timeout <= 0) {
+    return { aborted: true };
+  }
+  const abortSignal = timeout == null ? options == null ? void 0 : options.abortSignal : (options == null ? void 0 : options.abortSignal) == null ? AbortSignal.timeout(timeout) : AbortSignal.any([options.abortSignal, AbortSignal.timeout(timeout)]);
   const model = typeof modelInit === "string" ? gateway.languageModel(modelInit) : modelInit;
   const tools = serializedTools ? resolveSerializableTools(serializedTools) : void 0;
   const output = (options == null ? void 0 : options.responseFormat) == null ? void 0 : {
@@ -182,7 +189,7 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
       return void 0;
     }
   };
-  const { stream: modelStream } = await streamModelCall({
+  const modelStream = await streamModelCall({
     model,
     // streamModelCall expects Prompt (ModelMessage[]) but we pass the
     // pre-converted LanguageModelV4Prompt. standardizePrompt inside
@@ -193,7 +200,7 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
     toolChoice: options == null ? void 0 : options.toolChoice,
     includeRawChunks: options == null ? void 0 : options.includeRawChunks,
     providerOptions: options == null ? void 0 : options.providerOptions,
-    abortSignal: options == null ? void 0 : options.abortSignal,
+    abortSignal,
     headers: options == null ? void 0 : options.headers,
     reasoning: options == null ? void 0 : options.reasoning,
     output,
@@ -206,7 +213,15 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
     stopSequences: options == null ? void 0 : options.stopSequences,
     seed: options == null ? void 0 : options.seed,
     repairToolCall: options == null ? void 0 : options.repairToolCall
+  }).then((result) => result.stream).catch((error) => {
+    if ((abortSignal == null ? void 0 : abortSignal.aborted) && isAbortError(error)) {
+      return void 0;
+    }
+    throw error;
   });
+  if (modelStream == null) {
+    return { aborted: true };
+  }
   const toolCalls = [];
   const providerExecutedToolResults = /* @__PURE__ */ new Map();
   let finish;
@@ -280,9 +295,17 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
         await writer.write(part);
       }
     }
+  } catch (error) {
+    if ((abortSignal == null ? void 0 : abortSignal.aborted) && isAbortError(error)) {
+      return { aborted: true };
+    }
+    throw error;
   } finally {
     writer == null ? void 0 : writer.releaseLock();
   }
+  if ((abortSignal == null ? void 0 : abortSignal.aborted) || (options == null ? void 0 : options.timeoutAt) != null && options.timeoutAt <= Date.now()) {
+    return { aborted: true };
+  }
   return {
     toolCalls,
     finish,
@@ -339,6 +362,7 @@ async function* streamTextIterator({
   toolsContext,
   telemetry,
   includeRawChunks = false,
+  timeoutAt,
   repairToolCall,
   responseFormat,
   experimental_sandbox: sandbox
@@ -357,6 +381,7 @@ async function* streamTextIterator({
   let stepNumber = 0;
   let lastStep;
   let lastStepWasToolCalls = false;
+  let wasAborted = false;
   const telemetryDispatcher = createRestrictedTelemetryDispatcher({
     telemetry,
     includeRuntimeContext: telemetry == null ? void 0 : telemetry.includeRuntimeContext,
@@ -472,7 +497,7 @@ async function* streamTextIterator({
         providerOptions: currentGenerationSettings.providerOptions,
         headers: currentGenerationSettings.headers
       }));
-      const { toolCalls, finish, raw, providerExecutedToolResults } = await doStreamStep(
+      const streamStepResult = await doStreamStep(
         conversationPrompt,
         currentModel,
         writable,
@@ -481,10 +506,16 @@ async function* streamTextIterator({
           ...currentGenerationSettings,
           toolChoice: currentToolChoice,
           includeRawChunks,
+          timeoutAt,
           repairToolCall,
           responseFormat
         }
       );
+      if (streamStepResult.aborted) {
+        wasAborted = true;
+        break;
+      }
+      const { toolCalls, finish, raw, providerExecutedToolResults } = streamStepResult;
       const step = buildStepResult(raw, toolCalls, finish, {
         stepNumber,
         runtimeContext: currentRuntimeContext,
@@ -600,6 +631,9 @@ async function* streamTextIterator({
       experimental_sandbox: sandbox
     };
   }
+  if (wasAborted) {
+    return { aborted: true, messages: conversationPrompt };
+  }
   return conversationPrompt;
 }
 function getModelInfo(model) {
@@ -1108,10 +1142,8 @@ var WorkflowAgent = class {
       supportedUrls: {},
       download
     });
-    const effectiveAbortSignal = mergeAbortSignals(
-      (_r = options.abortSignal) != null ? _r : effectiveGenerationSettings.abortSignal,
-      options.timeout
-    );
+    const effectiveAbortSignal = (_r = options.abortSignal) != null ? _r : effectiveGenerationSettings.abortSignal;
+    const timeoutAt = options.timeout == null ? void 0 : Date.now() + options.timeout;
     const mergedGenerationSettings = {
       ...effectiveGenerationSettings,
       ...options.maxOutputTokens !== void 0 && {
@@ -1397,6 +1429,7 @@ var WorkflowAgent = class {
       toolsContext,
       telemetry: effectiveTelemetry,
       includeRawChunks: (_A = options.includeRawChunks) != null ? _A : false,
+      timeoutAt,
       repairToolCall: (_C = (_B = options.repairToolCall) != null ? _B : options.experimental_repairToolCall) != null ? _C : this.repairToolCall,
       responseFormat: await ((_E = (_D = options.output) != null ? _D : this.output) == null ? void 0 : _E.responseFormat),
       experimental_sandbox: sandbox
@@ -1700,11 +1733,19 @@ var WorkflowAgent = class {
         }
       }
       if (result.done) {
-        finalMessages = result.value;
+        if (Array.isArray(result.value)) {
+          finalMessages = result.value;
+        } else {
+          finalMessages = result.value.messages;
+          wasAborted = true;
+          if (options.onAbort) {
+            await options.onAbort({ steps });
+          }
+        }
       }
     } catch (error) {
       encounteredError = error;
-      if (error instanceof Error && error.name === "AbortError") {
+      if (isAbortError2(error)) {
         wasAborted = true;
         if (options.onAbort) {
           await options.onAbort({ steps });