@ai-sdk/workflow 2.0.17 → 2.0.19

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @ai-sdk/workflow
 
+## 2.0.19
+
+### Patch Changes
+
+- 902ce3b: fix(workflow): respect empty activeTools lists
+- c143af4: fix(workflow): propagate agent abort signals to local tool executions
+- Updated dependencies [5190b67]
+  - @ai-sdk/provider@4.0.10
+  - @ai-sdk/provider-utils@5.0.35
+  - ai@7.0.89
+
+## 2.0.18
+
+### Patch Changes
+
+- 238aff0: fix(workflow): preserve context and lifecycle callbacks for approved tools
+- 05672ad: fix(workflow): stream failed tool executions as tool errors
+- 3b6ef0c: fix(workflow): infer configured tool parts in WorkflowAgent UI messages
+- d3b1ffb: feat(workflow): add stable onStart and onStepStart callbacks to WorkflowAgent
+- 33d185e: fix(workflow): restrict prepareStep activeTools to configured tool names
+- Updated dependencies [8b6b756]
+- Updated dependencies [e07b577]
+  - ai@7.0.88
+
 ## 2.0.17
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { LanguageModelV4, LanguageModelV4CallOptions, SharedV4ProviderOptions, LanguageModelV4Prompt, LanguageModelV4StreamPart } from '@ai-sdk/provider';
 import { Context, HasRequiredKey, InferToolSetContext } from '@ai-sdk/provider-utils';
-import { ToolSet, Experimental_LanguageModelStreamPart, LanguageModel, Instructions, ToolChoice, TelemetryOptions as TelemetryOptions$1, StopCondition, ActiveTools, LanguageModelResponseMetadata, LanguageModelUsage, FinishReason, ToolCallRepairFunction, Experimental_SandboxSession, ModelMessage, StepResult, GenerateTextOnStepEndCallback, UIMessage, UIMessageChunk, ChatTransport, PrepareSendMessagesRequest, PrepareReconnectToStreamRequest, ChatRequestOptions } from 'ai';
+import { ToolSet, Experimental_LanguageModelStreamPart, LanguageModel, Instructions, ToolChoice, TelemetryOptions as TelemetryOptions$1, StopCondition, ActiveTools, LanguageModelResponseMetadata, LanguageModelUsage, FinishReason, ToolCallRepairFunction, Experimental_SandboxSession, ModelMessage, StepResult, GenerateTextOnStepEndCallback, UIMessage, InferUITools, UIMessageChunk, ChatTransport, PrepareSendMessagesRequest, PrepareReconnectToStreamRequest, ChatRequestOptions } from 'ai';
 export { Output, ToolCallRepairFunction } from 'ai';
 
 type ModelCallStreamPart<TTools extends ToolSet = ToolSet> = Experimental_LanguageModelStreamPart<TTools> | {
@@ -43,7 +43,7 @@ type InferWorkflowAgentTools<WORKFLOW_AGENT> = WORKFLOW_AGENT extends WorkflowAg
 /**
  * Infer the UI message type of a workflow agent.
  */
-type InferWorkflowAgentUIMessage<_WORKFLOW_AGENT, MESSAGE_METADATA = unknown> = UIMessage<MESSAGE_METADATA>;
+type InferWorkflowAgentUIMessage<WORKFLOW_AGENT, MESSAGE_METADATA = unknown> = UIMessage<MESSAGE_METADATA, never, InferUITools<InferWorkflowAgentTools<WORKFLOW_AGENT>>>;
 
 /**
  * Output specification interface for structured outputs.
@@ -255,7 +255,7 @@ interface PrepareStepResult<TTools extends ToolSet = ToolSet, TRuntimeContext ex
      * Override the active tools for this step.
      * Limits the tools that are available for the model to call.
      */
-    activeTools?: string[];
+    activeTools?: ActiveTools<NoInfer<TTools>>;
     /**
      * Updated runtime context for the current and subsequent steps.
      * Returning a value replaces the agent's runtime context.
@@ -453,10 +453,22 @@ type WorkflowAgentOptions<TTools extends ToolSet = ToolSet, TRuntimeContext exte
     /**
      * Callback called when the agent starts streaming, before any LLM calls.
      */
+    onStart?: WorkflowAgentOnStartCallback<TTools, TRuntimeContext>;
+    /**
+     * Callback called when the agent starts streaming, before any LLM calls.
+     *
+     * @deprecated Use `onStart` instead.
+     */
     experimental_onStart?: WorkflowAgentOnStartCallback<TTools, TRuntimeContext>;
     /**
      * Callback called before each step (LLM call) begins.
      */
+    onStepStart?: WorkflowAgentOnStepStartCallback<TTools, TRuntimeContext>;
+    /**
+     * Callback called before each step (LLM call) begins.
+     *
+     * @deprecated Use `onStepStart` instead.
+     */
     experimental_onStepStart?: WorkflowAgentOnStepStartCallback<TTools, TRuntimeContext>;
     /**
      * Callback called before a tool's execute function runs.
@@ -833,10 +845,22 @@ type WorkflowAgentStreamOptions<TTools extends ToolSet = ToolSet, TRuntimeContex
     /**
      * Callback called when the agent starts streaming, before any LLM calls.
      */
+    onStart?: WorkflowAgentOnStartCallback<TTools, TRuntimeContext>;
+    /**
+     * Callback called when the agent starts streaming, before any LLM calls.
+     *
+     * @deprecated Use `onStart` instead.
+     */
     experimental_onStart?: WorkflowAgentOnStartCallback<TTools, TRuntimeContext>;
     /**
      * Callback called before each step (LLM call) begins.
      */
+    onStepStart?: WorkflowAgentOnStepStartCallback<TTools, TRuntimeContext>;
+    /**
+     * Callback called before each step (LLM call) begins.
+     *
+     * @deprecated Use `onStepStart` instead.
+     */
     experimental_onStepStart?: WorkflowAgentOnStepStartCallback<TTools, TRuntimeContext>;
     /**
      * Callback called before a tool's execute function runs.

package/dist/index.js

@@ -16,6 +16,7 @@ import {
   createRestrictedTelemetryDispatcher as createRestrictedTelemetryDispatcher2,
   collectToolApprovals,
   convertToLanguageModelPrompt,
+  mergeAbortSignals,
   mergeCallbacks,
   signToolApproval,
   standardizePrompt,
@@ -511,7 +512,7 @@ async function* streamTextIterator({
       toolsContext: currentToolsContext
     }));
     try {
-      const effectiveTools = currentActiveTools && currentActiveTools.length > 0 ? (_d = filterActiveTools({
+      const effectiveTools = currentActiveTools !== void 0 ? (_d = filterActiveTools({
         tools,
         activeTools: currentActiveTools
       })) != null ? _d : tools : tools;
@@ -803,7 +804,7 @@ function sanitizeProviderMetadataForToolCall(metadata) {
 // src/workflow-agent.ts
 var WorkflowAgent = class {
   constructor(options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     this.id = options.id;
     this.model = options.model;
     this.tools = (_a = options.tools) != null ? _a : {};
@@ -823,12 +824,12 @@ var WorkflowAgent = class {
     this.constructorOnStepEnd = (_d = options.onStepEnd) != null ? _d : options.onStepFinish;
     const { onFinish, onEnd = onFinish } = options;
     this.constructorOnEnd = onEnd;
-    this.constructorOnStart = options.experimental_onStart;
-    this.constructorOnStepStart = options.experimental_onStepStart;
+    this.constructorOnStart = (_e = options.onStart) != null ? _e : options.experimental_onStart;
+    this.constructorOnStepStart = (_f = options.onStepStart) != null ? _f : options.experimental_onStepStart;
     this.constructorOnToolExecutionStart = options.onToolExecutionStart;
     this.constructorOnToolExecutionEnd = options.onToolExecutionEnd;
     this.prepareCall = options.prepareCall;
-    this.allowSystemInMessages = (_e = options.allowSystemInMessages) != null ? _e : false;
+    this.allowSystemInMessages = (_g = options.allowSystemInMessages) != null ? _g : false;
     this.generationSettings = {
       maxOutputTokens: options.maxOutputTokens,
       temperature: options.temperature,
@@ -849,7 +850,7 @@ var WorkflowAgent = class {
     throw new Error("Not implemented");
   }
   async stream(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U;
     const { onFinish, onEnd = onFinish } = options;
     let effectiveModel = this.model;
     let effectiveInstructions = (_b = (_a = options.instructions) != null ? _a : options.system) != null ? _b : this.instructions;
@@ -941,6 +942,19 @@ var WorkflowAgent = class {
     });
     const download = effectiveDownloadFromPrepare;
     const sandbox = (_n = options.experimental_sandbox) != null ? _n : this.experimentalSandbox;
+    const effectiveAbortSignal = mergeAbortSignals(
+      (_o = options.abortSignal) != null ? _o : effectiveGenerationSettings.abortSignal,
+      options.timeout
+    );
+    const timeoutAt = options.timeout == null ? void 0 : Date.now() + options.timeout;
+    const mergedOnToolExecutionStart = mergeCallbacks(
+      this.constructorOnToolExecutionStart,
+      options.onToolExecutionStart
+    );
+    const mergedOnToolExecutionEnd = mergeCallbacks(
+      this.constructorOnToolExecutionEnd,
+      options.onToolExecutionEnd
+    );
     const collectedApprovals = collectToolApprovals({
       messages: prompt.messages
     });
@@ -1021,7 +1035,7 @@ var WorkflowAgent = class {
                 invalidToolApprovals[0].error
               );
             } else if (policyDenied.length > 0) {
-              revalidationReason = (_o = policyDenied[0].approvalResponse.reason) != null ? _o : "Tool approval denied";
+              revalidationReason = (_p = policyDenied[0].approvalResponse.reason) != null ? _p : "Tool approval denied";
             }
           } catch (error) {
             revalidationReason = getErrorMessage(error);
@@ -1044,106 +1058,25 @@ var WorkflowAgent = class {
             });
             continue;
           }
-          try {
-            const { execute } = tool2;
-            const resolvedContext = await resolveToolContext({
-              toolName: approval.toolName,
-              tool: tool2,
-              toolsContext: effectiveToolsContext
-            });
-            const toolCallEvent = {
-              type: "tool-call",
+          const result = await executeToolWithCallbacks(
+            {
               toolCallId: approval.toolCallId,
               toolName: approval.toolName,
               input: approval.input
-            };
-            const messages2 = prompt.messages;
-            await ((_p = telemetryDispatcher.onToolExecutionStart) == null ? void 0 : _p.call(telemetryDispatcher, {
-              toolCall: toolCallEvent,
-              stepNumber: 0,
-              messages: messages2,
-              toolContext: resolvedContext
-            }));
-            const startTime = Date.now();
-            const executeApprovedTool = () => execute(approval.input, {
-              toolCallId: approval.toolCallId,
-              messages: [],
-              context: resolvedContext,
-              experimental_sandbox: sandbox
-            });
-            const toolResult = telemetryDispatcher.executeTool != null ? await telemetryDispatcher.executeTool({
-              callId: "workflow-agent",
-              toolCallId: approval.toolCallId,
-              execute: executeApprovedTool
-            }) : await executeApprovedTool();
-            await ((_q = telemetryDispatcher.onToolExecutionEnd) == null ? void 0 : _q.call(telemetryDispatcher, {
-              toolCall: toolCallEvent,
-              stepNumber: 0,
-              durationMs: Date.now() - startTime,
-              messages: messages2,
-              toolContext: resolvedContext,
-              success: true,
-              output: toolResult
-            }));
-            toolResultContent.push({
-              type: "tool-result",
-              toolCallId: approval.toolCallId,
-              toolName: approval.toolName,
-              output: await createLanguageModelToolResultOutput({
-                toolCallId: approval.toolCallId,
-                toolName: approval.toolName,
-                input: approval.input,
-                output: toolResult,
-                tool: tool2,
-                errorMode: "none",
-                supportedUrls: {},
-                download
-              })
-            });
-            approvedRawResults.push({
-              toolCallId: approval.toolCallId,
-              toolName: approval.toolName,
-              input: approval.input,
-              output: toolResult
-            });
-          } catch (error) {
-            const errorMessage = getErrorMessage(error);
-            await ((_r = telemetryDispatcher.onToolExecutionEnd) == null ? void 0 : _r.call(telemetryDispatcher, {
-              toolCall: {
-                type: "tool-call",
-                toolCallId: approval.toolCallId,
-                toolName: approval.toolName,
-                input: approval.input
-              },
-              stepNumber: 0,
-              durationMs: 0,
-              messages: prompt.messages,
-              toolContext: void 0,
-              success: false,
-              error
-            }));
-            toolResultContent.push({
-              type: "tool-result",
-              toolCallId: approval.toolCallId,
-              toolName: approval.toolName,
-              output: await createLanguageModelToolResultOutput({
-                toolCallId: approval.toolCallId,
-                toolName: approval.toolName,
-                input: approval.input,
-                output: errorMessage,
-                tool: tool2,
-                errorMode: "text",
-                supportedUrls: {},
-                download
-              })
-            });
-            approvedRawResults.push({
-              toolCallId: approval.toolCallId,
-              toolName: approval.toolName,
-              input: approval.input,
-              output: errorMessage
-            });
-          }
+            },
+            this.tools,
+            prompt.messages,
+            effectiveToolsContext,
+            0,
+            sandbox
+          );
+          toolResultContent.push(result.modelResult);
+          approvedRawResults.push({
+            toolCallId: approval.toolCallId,
+            toolName: approval.toolName,
+            input: approval.input,
+            output: result.rawOutput
+          });
         }
       }
       for (const denial of deniedToolApprovals) {
@@ -1207,8 +1140,6 @@ var WorkflowAgent = class {
       supportedUrls: {},
       download
     });
-    const effectiveAbortSignal = (_s = options.abortSignal) != null ? _s : effectiveGenerationSettings.abortSignal;
-    const timeoutAt = options.timeout == null ? void 0 : Date.now() + options.timeout;
     const mergedGenerationSettings = {
       ...effectiveGenerationSettings,
       ...options.maxOutputTokens !== void 0 && {
@@ -1242,12 +1173,12 @@ var WorkflowAgent = class {
       }
     };
     mergedGenerationSettings.headers = withUserAgentSuffix(
-      (_t = mergedGenerationSettings.headers) != null ? _t : {},
+      (_q = mergedGenerationSettings.headers) != null ? _q : {},
       "ai-sdk-agent/workflow"
     );
     const mergedOnStepEnd = mergeCallbacks(
       this.constructorOnStepEnd,
-      (_u = options.onStepEnd) != null ? _u : options.onStepFinish
+      (_r = options.onStepEnd) != null ? _r : options.onStepFinish
     );
     const mergedOnEnd = mergeCallbacks(
       this.constructorOnEnd,
@@ -1255,26 +1186,18 @@ var WorkflowAgent = class {
     );
     const mergedOnStart = mergeCallbacks(
       this.constructorOnStart,
-      options.experimental_onStart
+      (_s = options.onStart) != null ? _s : options.experimental_onStart
     );
     const mergedOnStepStart = mergeCallbacks(
       this.constructorOnStepStart,
-      options.experimental_onStepStart
-    );
-    const mergedOnToolExecutionStart = mergeCallbacks(
-      this.constructorOnToolExecutionStart,
-      options.onToolExecutionStart
-    );
-    const mergedOnToolExecutionEnd = mergeCallbacks(
-      this.constructorOnToolExecutionEnd,
-      options.onToolExecutionEnd
+      (_t = options.onStepStart) != null ? _t : options.experimental_onStepStart
     );
     const effectiveToolChoice = effectiveToolChoiceFromPrepare;
     const effectiveActiveTools = effectiveActiveToolsFromPrepare;
-    const effectiveTools = effectiveActiveTools && effectiveActiveTools.length > 0 ? (_v = filterActiveTools2({
+    const effectiveTools = effectiveActiveTools !== void 0 ? (_u = filterActiveTools2({
       tools: this.tools,
       activeTools: effectiveActiveTools
-    })) != null ? _v : this.tools : this.tools;
+    })) != null ? _u : this.tools : this.tools;
     const effectiveModelInfo = getModelInfo2(effectiveModel);
     let runtimeContext = effectiveRuntimeContext;
     let toolsContext = effectiveToolsContext;
@@ -1289,7 +1212,7 @@ var WorkflowAgent = class {
         toolsContext
       });
     }
-    await ((_y = telemetryDispatcher.onStart) == null ? void 0 : _y.call(telemetryDispatcher, {
+    await ((_x = telemetryDispatcher.onStart) == null ? void 0 : _x.call(telemetryDispatcher, {
       callId: "workflow-agent",
       operationId: "ai.workflowAgent.stream",
       provider: effectiveModelInfo.provider,
@@ -1307,16 +1230,16 @@ var WorkflowAgent = class {
       frequencyPenalty: mergedGenerationSettings.frequencyPenalty,
       stopSequences: mergedGenerationSettings.stopSequences,
       seed: mergedGenerationSettings.seed,
-      maxRetries: (_w = mergedGenerationSettings.maxRetries) != null ? _w : 2,
+      maxRetries: (_v = mergedGenerationSettings.maxRetries) != null ? _v : 2,
       timeout: void 0,
       headers: mergedGenerationSettings.headers,
       reasoning: mergedGenerationSettings.reasoning,
       providerOptions: mergedGenerationSettings.providerOptions,
-      output: (_x = options.output) != null ? _x : this.output,
+      output: (_w = options.output) != null ? _w : this.output,
       runtimeContext,
       toolsContext
     }));
-    const executeToolWithCallbacks = async (toolCall, tools, messages2, perToolContexts, currentStepNumber = 0, stepSandbox) => {
+    async function executeToolWithCallbacks(toolCall, tools, messages2, perToolContexts, currentStepNumber = 0, stepSandbox) {
       var _a2, _b2, _c2, _d2;
       const toolCallEvent = {
         type: "tool-call",
@@ -1353,6 +1276,7 @@ var WorkflowAgent = class {
           tools,
           messages2,
           resolvedContext,
+          effectiveAbortSignal,
           download,
           stepSandbox
         );
@@ -1431,7 +1355,7 @@ var WorkflowAgent = class {
         }));
       }
       return result;
-    };
+    }
     const recordProviderExecutedToolTelemetry = async (toolCall, result, messages2, currentStepNumber) => {
       var _a2, _b2;
       const toolCallEvent = {
@@ -1462,7 +1386,7 @@ var WorkflowAgent = class {
         }
       }));
     };
-    if ((_z = mergedGenerationSettings.abortSignal) == null ? void 0 : _z.aborted) {
+    if ((_y = mergedGenerationSettings.abortSignal) == null ? void 0 : _y.aborted) {
       if (options.onAbort) {
         await options.onAbort({ steps });
       }
@@ -1486,16 +1410,16 @@ var WorkflowAgent = class {
       stopConditions: effectiveStopWhenFromPrepare,
       onStepEnd: mergedOnStepEnd,
       onStepStart: mergedOnStepStart,
-      prepareStep: (_A = options.prepareStep) != null ? _A : this.prepareStep,
+      prepareStep: (_z = options.prepareStep) != null ? _z : this.prepareStep,
       generationSettings: mergedGenerationSettings,
       toolChoice: effectiveToolChoice,
       runtimeContext,
       toolsContext,
       telemetry: effectiveTelemetry,
-      includeRawChunks: (_B = options.includeRawChunks) != null ? _B : false,
+      includeRawChunks: (_A = options.includeRawChunks) != null ? _A : false,
       timeoutAt,
-      repairToolCall: (_D = (_C = options.repairToolCall) != null ? _C : options.experimental_repairToolCall) != null ? _D : this.repairToolCall,
-      responseFormat: await ((_F = (_E = options.output) != null ? _E : this.output) == null ? void 0 : _F.responseFormat),
+      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
     });
     let finalMessages;
@@ -1507,7 +1431,7 @@ var WorkflowAgent = class {
     try {
       let result = await iterator.next();
       while (!result.done) {
-        if ((_G = mergedGenerationSettings.abortSignal) == null ? void 0 : _G.aborted) {
+        if ((_F = mergedGenerationSettings.abortSignal) == null ? void 0 : _F.aborted) {
           wasAborted = true;
           if (options.onAbort) {
             await options.onAbort({ steps });
@@ -1639,12 +1563,12 @@ var WorkflowAgent = class {
             const messages2 = iterMessages;
             const lastStep2 = steps[steps.length - 1];
             const totalUsage2 = aggregateUsage(steps);
-            const finishReason2 = (_H = lastStep2 == null ? void 0 : lastStep2.finishReason) != null ? _H : "other";
+            const finishReason2 = (_G = lastStep2 == null ? void 0 : lastStep2.finishReason) != null ? _G : "other";
             if (mergedOnEnd && !wasAborted) {
               await mergedOnEnd({
                 steps,
                 messages: messages2,
-                text: (_I = lastStep2 == null ? void 0 : lastStep2.text) != null ? _I : "",
+                text: (_H = lastStep2 == null ? void 0 : lastStep2.text) != null ? _H : "",
                 finishReason: finishReason2,
                 usage: totalUsage2,
                 totalUsage: totalUsage2,
@@ -1656,7 +1580,7 @@ var WorkflowAgent = class {
             if (!wasAborted && steps.length > 0) {
               const telemetrySteps = steps.map(normalizeStepForTelemetry2);
               const lastTelemetryStep = telemetrySteps[telemetrySteps.length - 1];
-              await ((_J = telemetryDispatcher.onEnd) == null ? void 0 : _J.call(telemetryDispatcher, {
+              await ((_I = telemetryDispatcher.onEnd) == null ? void 0 : _I.call(telemetryDispatcher, {
                 ...lastTelemetryStep,
                 steps: telemetrySteps,
                 usage: totalUsage2,
@@ -1665,7 +1589,21 @@ var WorkflowAgent = class {
             }
             if (options.writable) {
               if (allToolResults.length > 0) {
-                await writeToolResults(options.writable, allToolResults);
+                await writeToolResults(
+                  options.writable,
+                  executedResults.map((r) => {
+                    var _a2;
+                    return {
+                      toolCallId: r.modelResult.toolCallId,
+                      toolName: r.modelResult.toolName,
+                      input: (_a2 = toolCalls.find(
+                        (tc) => tc.toolCallId === r.modelResult.toolCallId
+                      )) == null ? void 0 : _a2.input,
+                      output: r.rawOutput,
+                      isError: r.isError
+                    };
+                  })
+                );
               }
               const approvalToolCalls = pausedToolCalls.filter((_, i) => {
                 const tcIndex = nonProviderToolCalls.indexOf(
@@ -1695,8 +1633,8 @@ var WorkflowAgent = class {
               }
             }
             if (options.writable) {
-              const sendFinish = (_K = options.sendFinish) != null ? _K : true;
-              const preventClose = (_L = options.preventClose) != null ? _L : false;
+              const sendFinish = (_J = options.sendFinish) != null ? _J : true;
+              const preventClose = (_K = options.preventClose) != null ? _K : false;
               if (sendFinish || !preventClose) {
                 await closeStream(options.writable, preventClose, sendFinish);
               }
@@ -1779,7 +1717,8 @@ var WorkflowAgent = class {
                   input: (_a2 = toolCalls.find(
                     (tc) => tc.toolCallId === r.modelResult.toolCallId
                   )) == null ? void 0 : _a2.input,
-                  output: r.rawOutput
+                  output: r.rawOutput,
+                  isError: r.isError
                 };
               }),
               true
@@ -1836,16 +1775,16 @@ var WorkflowAgent = class {
       } else if (options.onError) {
         await options.onError({ error });
       }
-      await ((_M = telemetryDispatcher.onError) == null ? void 0 : _M.call(telemetryDispatcher, error));
+      await ((_L = telemetryDispatcher.onError) == null ? void 0 : _L.call(telemetryDispatcher, error));
     }
     if (hasTerminalError) {
       if (options.onError) {
         await options.onError({ error: terminalError });
       }
-      await ((_N = telemetryDispatcher.onError) == null ? void 0 : _N.call(telemetryDispatcher, terminalError));
+      await ((_M = telemetryDispatcher.onError) == null ? void 0 : _M.call(telemetryDispatcher, terminalError));
     }
     const messages = finalMessages != null ? finalMessages : prompt.messages;
-    const effectiveOutput = (_O = options.output) != null ? _O : this.output;
+    const effectiveOutput = (_N = options.output) != null ? _N : this.output;
     let experimentalOutput = void 0;
     if (effectiveOutput && steps.length > 0) {
       const lastStep2 = steps[steps.length - 1];
@@ -1870,12 +1809,12 @@ var WorkflowAgent = class {
     }
     const lastStep = steps[steps.length - 1];
     const totalUsage = aggregateUsage(steps);
-    const finishReason = (_P = lastStep == null ? void 0 : lastStep.finishReason) != null ? _P : "other";
+    const finishReason = (_O = lastStep == null ? void 0 : lastStep.finishReason) != null ? _O : "other";
     if (mergedOnEnd && !wasAborted) {
       await mergedOnEnd({
         steps,
         messages,
-        text: (_Q = lastStep == null ? void 0 : lastStep.text) != null ? _Q : "",
+        text: (_P = lastStep == null ? void 0 : lastStep.text) != null ? _P : "",
         finishReason,
         usage: totalUsage,
         totalUsage,
@@ -1887,7 +1826,7 @@ var WorkflowAgent = class {
     if (!wasAborted && steps.length > 0) {
       const telemetrySteps = steps.map(normalizeStepForTelemetry2);
       const lastTelemetryStep = telemetrySteps[telemetrySteps.length - 1];
-      await ((_R = telemetryDispatcher.onEnd) == null ? void 0 : _R.call(telemetryDispatcher, {
+      await ((_Q = telemetryDispatcher.onEnd) == null ? void 0 : _Q.call(telemetryDispatcher, {
         ...lastTelemetryStep,
         steps: telemetrySteps,
         usage: totalUsage,
@@ -1896,8 +1835,8 @@ var WorkflowAgent = class {
     }
     if (hasEncounteredError) {
       if (options.writable) {
-        const sendFinish = (_S = options.sendFinish) != null ? _S : true;
-        const preventClose = (_T = options.preventClose) != null ? _T : false;
+        const sendFinish = (_R = options.sendFinish) != null ? _R : true;
+        const preventClose = (_S = options.preventClose) != null ? _S : false;
         if (sendFinish || !preventClose) {
           await closeStream(options.writable, preventClose, sendFinish);
         }
@@ -1905,8 +1844,8 @@ var WorkflowAgent = class {
       throw encounteredError;
     }
     if (options.writable) {
-      const sendFinish = (_U = options.sendFinish) != null ? _U : true;
-      const preventClose = (_V = options.preventClose) != null ? _V : false;
+      const sendFinish = (_T = options.sendFinish) != null ? _T : true;
+      const preventClose = (_U = options.preventClose) != null ? _U : false;
       if (sendFinish || !preventClose) {
         await closeStream(options.writable, preventClose, sendFinish);
       }
@@ -2048,13 +1987,21 @@ async function writeToolResults(writable, results, writeStepBoundary = false) {
   const writer = writable.getWriter();
   try {
     for (const r of results) {
-      await writer.write({
-        type: "tool-result",
-        toolCallId: r.toolCallId,
-        toolName: r.toolName,
-        input: r.input,
-        output: r.output
-      });
+      await writer.write(
+        r.isError ? {
+          type: "tool-error",
+          toolCallId: r.toolCallId,
+          toolName: r.toolName,
+          input: r.input,
+          error: r.output
+        } : {
+          type: "tool-result",
+          toolCallId: r.toolCallId,
+          toolName: r.toolName,
+          input: r.input,
+          output: r.output
+        }
+      );
     }
     if (writeStepBoundary) {
       await writer.write({ type: "finish-step" });
@@ -2177,7 +2124,7 @@ function getToolCallbackMessages(messages) {
   const withoutAssistantToolCall = ((_a = messages.at(-1)) == null ? void 0 : _a.role) === "assistant" ? messages.slice(0, -1) : messages;
   return withoutAssistantToolCall;
 }
-async function executeTool(toolCall, tools, messages, context, download, sandbox) {
+async function executeTool(toolCall, tools, messages, context, abortSignal, download, sandbox) {
   const tool2 = tools[toolCall.toolName];
   if (!tool2) throw new Error(`Tool "${toolCall.toolName}" not found`);
   if (typeof tool2.execute !== "function") {
@@ -2193,6 +2140,8 @@ async function executeTool(toolCall, tools, messages, context, download, sandbox
       toolCallId: toolCall.toolCallId,
       // Pass the conversation messages to the tool so it has context about the conversation
       messages,
+      // Pass the effective agent signal so in-flight tool work can cooperatively cancel
+      abortSignal,
       // Pass per-tool context to the tool (resolved from `toolsContext`)
       context,
       experimental_sandbox: sandbox