@ai-sdk/workflow 1.0.0-canary.39 → 1.0.0-canary.41

package/dist/index.mjs

@@ -1,4 +1,7 @@
 // src/workflow-agent.ts
+import {
+  validateTypes
+} from "@ai-sdk/provider-utils";
 import {
   Output,
   experimental_filterActiveTools as filterActiveTools2
@@ -85,7 +88,7 @@ function resolveSerializableTools(tools) {
 // src/do-stream-step.ts
 async function doStreamStep(conversationPrompt, modelInit, writable, serializedTools, options) {
   "use step";
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const model = typeof modelInit === "string" ? gateway.languageModel(modelInit) : modelInit;
   const tools = serializedTools ? resolveSerializableTools(serializedTools) : void 0;
   const { stream: modelStream } = await streamModelCall({
@@ -197,8 +200,8 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
     },
     functionId: void 0,
     metadata: void 0,
-    runtimeContext: void 0,
-    toolsContext: {},
+    runtimeContext: (_d = options == null ? void 0 : options.runtimeContext) != null ? _d : {},
+    toolsContext: (_e = options == null ? void 0 : options.toolsContext) != null ? _e : {},
     content: [
       ...text ? [{ type: "text", text }] : [],
       ...toolCalls.filter((tc) => !tc.invalid).map((tc) => ({
@@ -235,9 +238,9 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
     toolResults: [],
     staticToolResults: [],
     dynamicToolResults: [],
-    finishReason: (_d = finish == null ? void 0 : finish.finishReason) != null ? _d : "other",
+    finishReason: (_f = finish == null ? void 0 : finish.finishReason) != null ? _f : "other",
     rawFinishReason: finish == null ? void 0 : finish.rawFinishReason,
-    usage: (_e = finish == null ? void 0 : finish.usage) != null ? _e : {
+    usage: (_g = finish == null ? void 0 : finish.usage) != null ? _g : {
       inputTokens: 0,
       inputTokenDetails: {
         noCacheTokens: void 0,
@@ -258,12 +261,12 @@ async function doStreamStep(conversationPrompt, modelInit, writable, serializedT
       // TODO implement step request messages
     },
     response: {
-      id: (_f = responseMetadata == null ? void 0 : responseMetadata.id) != null ? _f : "unknown",
-      timestamp: (_g = responseMetadata == null ? void 0 : responseMetadata.timestamp) != null ? _g : /* @__PURE__ */ new Date(),
-      modelId: (_h = responseMetadata == null ? void 0 : responseMetadata.modelId) != null ? _h : "unknown",
+      id: (_h = responseMetadata == null ? void 0 : responseMetadata.id) != null ? _h : "unknown",
+      timestamp: (_i = responseMetadata == null ? void 0 : responseMetadata.timestamp) != null ? _i : /* @__PURE__ */ new Date(),
+      modelId: (_j = responseMetadata == null ? void 0 : responseMetadata.modelId) != null ? _j : "unknown",
       messages: []
     },
-    providerMetadata: (_i = finish == null ? void 0 : finish.providerMetadata) != null ? _i : {}
+    providerMetadata: (_k = finish == null ? void 0 : finish.providerMetadata) != null ? _k : {}
   };
   return {
     toolCalls,
@@ -286,7 +289,8 @@ async function* streamTextIterator({
   prepareStep,
   generationSettings,
   toolChoice,
-  experimental_context,
+  runtimeContext,
+  toolsContext,
   telemetry,
   includeRawChunks = false,
   repairToolCall,
@@ -297,7 +301,8 @@ async function* streamTextIterator({
   let currentModel = model;
   let currentGenerationSettings = generationSettings != null ? generationSettings : {};
   let currentToolChoice = toolChoice;
-  let currentContext = experimental_context;
+  let currentRuntimeContext = runtimeContext != null ? runtimeContext : {};
+  let currentToolsContext = toolsContext != null ? toolsContext : {};
   let currentActiveTools;
   const steps = [];
   let done = false;
@@ -315,15 +320,16 @@ async function* streamTextIterator({
         stepNumber,
         steps,
         messages: conversationPrompt,
-        experimental_context: currentContext
+        runtimeContext: currentRuntimeContext,
+        toolsContext: currentToolsContext
       });
-      if (prepareResult.model !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.model) !== void 0) {
         currentModel = prepareResult.model;
       }
-      if (prepareResult.messages !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.messages) !== void 0) {
         conversationPrompt = [...prepareResult.messages];
       }
-      if (prepareResult.system !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.system) !== void 0) {
         if (conversationPrompt.length > 0 && conversationPrompt[0].role === "system") {
           conversationPrompt[0] = {
             role: "system",
@@ -336,79 +342,82 @@ async function* streamTextIterator({
           });
         }
       }
-      if (prepareResult.experimental_context !== void 0) {
-        currentContext = prepareResult.experimental_context;
+      if ((prepareResult == null ? void 0 : prepareResult.runtimeContext) !== void 0) {
+        currentRuntimeContext = prepareResult.runtimeContext;
       }
-      if (prepareResult.activeTools !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.toolsContext) !== void 0) {
+        currentToolsContext = prepareResult.toolsContext;
+      }
+      if ((prepareResult == null ? void 0 : prepareResult.activeTools) !== void 0) {
         currentActiveTools = prepareResult.activeTools;
       }
-      if (prepareResult.maxOutputTokens !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.maxOutputTokens) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           maxOutputTokens: prepareResult.maxOutputTokens
         };
       }
-      if (prepareResult.temperature !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.temperature) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           temperature: prepareResult.temperature
         };
       }
-      if (prepareResult.topP !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.topP) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           topP: prepareResult.topP
         };
       }
-      if (prepareResult.topK !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.topK) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           topK: prepareResult.topK
         };
       }
-      if (prepareResult.presencePenalty !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.presencePenalty) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           presencePenalty: prepareResult.presencePenalty
         };
       }
-      if (prepareResult.frequencyPenalty !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.frequencyPenalty) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           frequencyPenalty: prepareResult.frequencyPenalty
         };
       }
-      if (prepareResult.stopSequences !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.stopSequences) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           stopSequences: prepareResult.stopSequences
         };
       }
-      if (prepareResult.seed !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.seed) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           seed: prepareResult.seed
         };
       }
-      if (prepareResult.maxRetries !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.maxRetries) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           maxRetries: prepareResult.maxRetries
         };
       }
-      if (prepareResult.headers !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.headers) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           headers: prepareResult.headers
         };
       }
-      if (prepareResult.providerOptions !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.providerOptions) !== void 0) {
         currentGenerationSettings = {
           ...currentGenerationSettings,
           providerOptions: prepareResult.providerOptions
         };
       }
-      if (prepareResult.toolChoice !== void 0) {
+      if ((prepareResult == null ? void 0 : prepareResult.toolChoice) !== void 0) {
         currentToolChoice = prepareResult.toolChoice;
       }
     }
@@ -417,7 +426,9 @@ async function* streamTextIterator({
         stepNumber,
         model: currentModel,
         messages: conversationPrompt,
-        steps: [...steps]
+        steps: [...steps],
+        runtimeContext: currentRuntimeContext,
+        toolsContext: currentToolsContext
       });
     }
     try {
@@ -437,7 +448,9 @@ async function* streamTextIterator({
           includeRawChunks,
           telemetry,
           repairToolCall,
-          responseFormat
+          responseFormat,
+          runtimeContext: currentRuntimeContext,
+          toolsContext: currentToolsContext
         }
       );
       _isFirstIteration = false;
@@ -467,7 +480,8 @@ async function* streamTextIterator({
           toolCalls,
           messages: conversationPrompt,
           step,
-          context: currentContext,
+          runtimeContext: currentRuntimeContext,
+          toolsContext: currentToolsContext,
           providerExecutedToolResults
         };
         conversationPrompt.push({
@@ -523,7 +537,8 @@ async function* streamTextIterator({
       toolCalls: [],
       messages: conversationPrompt,
       step: lastStep,
-      context: currentContext
+      runtimeContext: currentRuntimeContext,
+      toolsContext: currentToolsContext
     };
   }
   return conversationPrompt;
@@ -559,7 +574,8 @@ var WorkflowAgent = class {
     this.instructions = (_b = options.instructions) != null ? _b : options.system;
     this.toolChoice = options.toolChoice;
     this.telemetry = (_c = options.telemetry) != null ? _c : options.experimental_telemetry;
-    this.experimentalContext = options.experimental_context;
+    this.runtimeContext = options.runtimeContext;
+    this.toolsContext = options.toolsContext;
     this.stopWhen = options.stopWhen;
     this.activeTools = options.activeTools;
     this.output = options.output;
@@ -592,16 +608,17 @@ 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;
+    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;
     let effectiveModel = this.model;
     let effectiveInstructions = (_a = options.system) != null ? _a : this.instructions;
     let effectivePrompt = options.prompt;
     let effectiveMessages = options.messages;
     let effectiveGenerationSettings = { ...this.generationSettings };
-    let effectiveExperimentalContext = (_b = options.experimental_context) != null ? _b : this.experimentalContext;
-    let effectiveToolChoiceFromPrepare = (_c = options.toolChoice) != null ? _c : this.toolChoice;
-    let effectiveTelemetryFromPrepare = (_e = (_d = options.telemetry) != null ? _d : options.experimental_telemetry) != null ? _e : this.telemetry;
-    const resolvedMessagesForPrepareCall = (_f = effectiveMessages != null ? effectiveMessages : typeof effectivePrompt === "string" ? [{ role: "user", content: effectivePrompt }] : effectivePrompt) != null ? _f : [];
+    let effectiveRuntimeContext = (_c = (_b = options.runtimeContext) != null ? _b : this.runtimeContext) != null ? _c : {};
+    let effectiveToolsContext = (_e = (_d = options.toolsContext) != null ? _d : this.toolsContext) != null ? _e : {};
+    let effectiveToolChoiceFromPrepare = (_f = options.toolChoice) != null ? _f : this.toolChoice;
+    let effectiveTelemetryFromPrepare = (_h = (_g = options.telemetry) != null ? _g : options.experimental_telemetry) != null ? _h : this.telemetry;
+    const resolvedMessagesForPrepareCall = (_i = effectiveMessages != null ? effectiveMessages : typeof effectivePrompt === "string" ? [{ role: "user", content: effectivePrompt }] : effectivePrompt) != null ? _i : [];
     if (this.prepareCall) {
       const prepared = await this.prepareCall({
         model: effectiveModel,
@@ -610,7 +627,8 @@ var WorkflowAgent = class {
         toolChoice: effectiveToolChoiceFromPrepare,
         telemetry: effectiveTelemetryFromPrepare,
         experimental_telemetry: effectiveTelemetryFromPrepare,
-        experimental_context: effectiveExperimentalContext,
+        runtimeContext: effectiveRuntimeContext,
+        toolsContext: effectiveToolsContext,
         messages: resolvedMessagesForPrepareCall,
         ...effectiveGenerationSettings
       });
@@ -621,8 +639,10 @@ var WorkflowAgent = class {
         effectiveMessages = prepared.messages;
         effectivePrompt = void 0;
       }
-      if (prepared.experimental_context !== void 0)
-        effectiveExperimentalContext = prepared.experimental_context;
+      if (prepared.runtimeContext !== void 0)
+        effectiveRuntimeContext = prepared.runtimeContext;
+      if (prepared.toolsContext !== void 0)
+        effectiveToolsContext = prepared.toolsContext;
       if (prepared.toolChoice !== void 0)
         effectiveToolChoiceFromPrepare = prepared.toolChoice;
       if (prepared.telemetry !== void 0)
@@ -665,10 +685,15 @@ var WorkflowAgent = class {
         if (tool2 && typeof tool2.execute === "function") {
           try {
             const { execute } = tool2;
+            const resolvedContext = await resolveToolContext({
+              toolName: approval.toolName,
+              tool: tool2,
+              toolsContext: effectiveToolsContext
+            });
             const toolResult = await execute(approval.input, {
               toolCallId: approval.toolCallId,
               messages: [],
-              context: effectiveExperimentalContext
+              context: resolvedContext
             });
             toolResultContent.push({
               type: "tool-result",
@@ -750,10 +775,10 @@ var WorkflowAgent = class {
     const modelPrompt = await convertToLanguageModelPrompt({
       prompt,
       supportedUrls: {},
-      download: (_g = options.experimental_download) != null ? _g : this.experimentalDownload
+      download: (_j = options.experimental_download) != null ? _j : this.experimentalDownload
     });
     const effectiveAbortSignal = mergeAbortSignals(
-      (_h = options.abortSignal) != null ? _h : effectiveGenerationSettings.abortSignal,
+      (_k = options.abortSignal) != null ? _k : effectiveGenerationSettings.abortSignal,
       options.timeout
     );
     const mergedGenerationSettings = {
@@ -813,38 +838,50 @@ var WorkflowAgent = class {
     );
     const effectiveToolChoice = effectiveToolChoiceFromPrepare;
     const effectiveTelemetry = effectiveTelemetryFromPrepare;
-    const effectiveActiveTools = (_i = options.activeTools) != null ? _i : this.activeTools;
-    const effectiveTools = effectiveActiveTools && effectiveActiveTools.length > 0 ? (_j = filterActiveTools2({
+    const effectiveActiveTools = (_l = options.activeTools) != null ? _l : this.activeTools;
+    const effectiveTools = effectiveActiveTools && effectiveActiveTools.length > 0 ? (_m = filterActiveTools2({
       tools: this.tools,
       activeTools: effectiveActiveTools
-    })) != null ? _j : this.tools : this.tools;
-    let experimentalContext = effectiveExperimentalContext;
+    })) != null ? _m : this.tools : this.tools;
+    let runtimeContext = effectiveRuntimeContext;
+    let toolsContext = effectiveToolsContext;
     const steps = [];
     let lastStepToolCalls = [];
     let lastStepToolResults = [];
     if (mergedOnStart) {
       await mergedOnStart({
         model: effectiveModel,
-        messages: prompt.messages
+        messages: prompt.messages,
+        runtimeContext,
+        toolsContext
       });
     }
-    const executeToolWithCallbacks = async (toolCall, tools, messages2, context, currentStepNumber = 0) => {
+    const executeToolWithCallbacks = async (toolCall, tools, messages2, perToolContexts, currentStepNumber = 0) => {
       const toolCallEvent = {
         type: "tool-call",
         toolCallId: toolCall.toolCallId,
         toolName: toolCall.toolName,
         input: toolCall.input
       };
+      const tool2 = tools[toolCall.toolName];
+      const resolvedContext = tool2 ? await resolveToolContext({
+        toolName: toolCall.toolName,
+        tool: tool2,
+        toolsContext: perToolContexts
+      }) : void 0;
+      const modelMessages = getToolCallbackMessages(messages2);
       if (mergedOnToolExecutionStart) {
         await mergedOnToolExecutionStart({
           toolCall: toolCallEvent,
-          stepNumber: currentStepNumber
+          stepNumber: currentStepNumber,
+          messages: modelMessages,
+          toolContext: resolvedContext
         });
       }
       const startTime = Date.now();
       let result;
       try {
-        result = await executeTool(toolCall, tools, messages2, context);
+        result = await executeTool(toolCall, tools, messages2, resolvedContext);
       } catch (err) {
         const durationMs2 = Date.now() - startTime;
         if (mergedOnToolExecutionEnd) {
@@ -852,6 +889,8 @@ var WorkflowAgent = class {
             toolCall: toolCallEvent,
             stepNumber: currentStepNumber,
             durationMs: durationMs2,
+            messages: modelMessages,
+            toolContext: resolvedContext,
             success: false,
             error: err
           });
@@ -866,6 +905,8 @@ var WorkflowAgent = class {
             toolCall: toolCallEvent,
             stepNumber: currentStepNumber,
             durationMs,
+            messages: modelMessages,
+            toolContext: resolvedContext,
             success: false,
             error: "value" in result.output ? result.output.value : void 0
           });
@@ -874,6 +915,8 @@ var WorkflowAgent = class {
             toolCall: toolCallEvent,
             stepNumber: currentStepNumber,
             durationMs,
+            messages: modelMessages,
+            toolContext: resolvedContext,
             success: true,
             output: result.output && "value" in result.output ? result.output.value : void 0
           });
@@ -881,7 +924,7 @@ var WorkflowAgent = class {
       }
       return result;
     };
-    if ((_k = mergedGenerationSettings.abortSignal) == null ? void 0 : _k.aborted) {
+    if ((_n = mergedGenerationSettings.abortSignal) == null ? void 0 : _n.aborted) {
       if (options.onAbort) {
         await options.onAbort({ steps });
       }
@@ -898,18 +941,19 @@ var WorkflowAgent = class {
       tools: effectiveTools,
       writable: options.writable,
       prompt: modelPrompt,
-      stopConditions: (_l = options.stopWhen) != null ? _l : this.stopWhen,
+      stopConditions: (_o = options.stopWhen) != null ? _o : this.stopWhen,
       onStepFinish: mergedOnStepFinish,
       onStepStart: mergedOnStepStart,
       onError: options.onError,
-      prepareStep: (_m = options.prepareStep) != null ? _m : this.prepareStep,
+      prepareStep: (_p = options.prepareStep) != null ? _p : this.prepareStep,
       generationSettings: mergedGenerationSettings,
       toolChoice: effectiveToolChoice,
-      experimental_context: experimentalContext,
+      runtimeContext,
+      toolsContext,
       telemetry: effectiveTelemetry,
-      includeRawChunks: (_n = options.includeRawChunks) != null ? _n : false,
-      repairToolCall: (_o = options.experimental_repairToolCall) != null ? _o : this.experimentalRepairToolCall,
-      responseFormat: await ((_q = (_p = options.output) != null ? _p : this.output) == null ? void 0 : _q.responseFormat)
+      includeRawChunks: (_q = options.includeRawChunks) != null ? _q : false,
+      repairToolCall: (_r = options.experimental_repairToolCall) != null ? _r : this.experimentalRepairToolCall,
+      responseFormat: await ((_t = (_s = options.output) != null ? _s : this.output) == null ? void 0 : _t.responseFormat)
     });
     let finalMessages;
     let encounteredError;
@@ -917,7 +961,7 @@ var WorkflowAgent = class {
     try {
       let result = await iterator.next();
       while (!result.done) {
-        if ((_r = mergedGenerationSettings.abortSignal) == null ? void 0 : _r.aborted) {
+        if ((_u = mergedGenerationSettings.abortSignal) == null ? void 0 : _u.aborted) {
           wasAborted = true;
           if (options.onAbort) {
             await options.onAbort({ steps });
@@ -928,15 +972,19 @@ var WorkflowAgent = class {
           toolCalls,
           messages: iterMessages,
           step,
-          context,
+          runtimeContext: yieldedRuntimeContext,
+          toolsContext: yieldedToolsContext,
           providerExecutedToolResults
         } = result.value;
         const currentStepNumber = steps.length;
         if (step) {
           steps.push(step);
         }
-        if (context !== void 0) {
-          experimentalContext = context;
+        if (yieldedRuntimeContext !== void 0) {
+          runtimeContext = yieldedRuntimeContext;
+        }
+        if (yieldedToolsContext !== void 0) {
+          toolsContext = yieldedToolsContext;
         }
         if (toolCalls.length > 0) {
           const invalidToolCalls = toolCalls.filter((tc) => tc.invalid === true);
@@ -954,10 +1002,15 @@ var WorkflowAgent = class {
               if (tool2.needsApproval == null) return false;
               if (typeof tool2.needsApproval === "boolean")
                 return tool2.needsApproval;
+              const resolvedContext = await resolveToolContext({
+                toolName: tc.toolName,
+                tool: tool2,
+                toolsContext
+              });
               return tool2.needsApproval(tc.input, {
                 toolCallId: tc.toolCallId,
                 messages: iterMessages,
-                context: experimentalContext
+                context: resolvedContext
               });
             })
           );
@@ -976,7 +1029,7 @@ var WorkflowAgent = class {
                   toolCall,
                   effectiveTools,
                   iterMessages,
-                  experimentalContext,
+                  toolsContext,
                   currentStepNumber
                 )
               )
@@ -1024,10 +1077,11 @@ var WorkflowAgent = class {
               await mergedOnFinish({
                 steps,
                 messages: messages2,
-                text: (_s = lastStep == null ? void 0 : lastStep.text) != null ? _s : "",
-                finishReason: (_t = lastStep == null ? void 0 : lastStep.finishReason) != null ? _t : "other",
+                text: (_v = lastStep == null ? void 0 : lastStep.text) != null ? _v : "",
+                finishReason: (_w = lastStep == null ? void 0 : lastStep.finishReason) != null ? _w : "other",
                 totalUsage: aggregateUsage(steps),
-                experimental_context: experimentalContext,
+                runtimeContext,
+                toolsContext,
                 output: void 0
               });
             }
@@ -1049,8 +1103,8 @@ var WorkflowAgent = class {
               }
             }
             if (options.writable) {
-              const sendFinish = (_u = options.sendFinish) != null ? _u : true;
-              const preventClose = (_v = options.preventClose) != null ? _v : false;
+              const sendFinish = (_x = options.sendFinish) != null ? _x : true;
+              const preventClose = (_y = options.preventClose) != null ? _y : false;
               if (sendFinish || !preventClose) {
                 await closeStream(options.writable, preventClose, sendFinish);
               }
@@ -1069,7 +1123,7 @@ var WorkflowAgent = class {
                 toolCall,
                 effectiveTools,
                 iterMessages,
-                experimentalContext,
+                toolsContext,
                 currentStepNumber
               )
             )
@@ -1150,7 +1204,7 @@ var WorkflowAgent = class {
       }
     }
     const messages = finalMessages != null ? finalMessages : prompt.messages;
-    const effectiveOutput = (_w = options.output) != null ? _w : this.output;
+    const effectiveOutput = (_z = options.output) != null ? _z : this.output;
     let experimentalOutput = void 0;
     if (effectiveOutput && steps.length > 0) {
       const lastStep = steps[steps.length - 1];
@@ -1177,17 +1231,18 @@ var WorkflowAgent = class {
       await mergedOnFinish({
         steps,
         messages,
-        text: (_x = lastStep == null ? void 0 : lastStep.text) != null ? _x : "",
-        finishReason: (_y = lastStep == null ? void 0 : lastStep.finishReason) != null ? _y : "other",
+        text: (_A = lastStep == null ? void 0 : lastStep.text) != null ? _A : "",
+        finishReason: (_B = lastStep == null ? void 0 : lastStep.finishReason) != null ? _B : "other",
         totalUsage: aggregateUsage(steps),
-        experimental_context: experimentalContext,
+        runtimeContext,
+        toolsContext,
         output: experimentalOutput
       });
     }
     if (encounteredError) {
       if (options.writable) {
-        const sendFinish = (_z = options.sendFinish) != null ? _z : true;
-        const preventClose = (_A = options.preventClose) != null ? _A : false;
+        const sendFinish = (_C = options.sendFinish) != null ? _C : true;
+        const preventClose = (_D = options.preventClose) != null ? _D : false;
         if (sendFinish || !preventClose) {
           await closeStream(options.writable, preventClose, sendFinish);
         }
@@ -1195,8 +1250,8 @@ var WorkflowAgent = class {
       throw encounteredError;
     }
     if (options.writable) {
-      const sendFinish = (_B = options.sendFinish) != null ? _B : true;
-      const preventClose = (_C = options.preventClose) != null ? _C : false;
+      const sendFinish = (_E = options.sendFinish) != null ? _E : true;
+      const preventClose = (_F = options.preventClose) != null ? _F : false;
       if (sendFinish || !preventClose) {
         await closeStream(options.writable, preventClose, sendFinish);
       }
@@ -1283,6 +1338,22 @@ async function writeApprovalToolResults(writable, approvedResults, deniedResults
     writer.releaseLock();
   }
 }
+async function resolveToolContext({
+  toolName,
+  tool: tool2,
+  toolsContext
+}) {
+  const contextSchema = tool2.contextSchema;
+  const entry = toolsContext == null ? void 0 : toolsContext[toolName];
+  if (contextSchema == null) {
+    return entry;
+  }
+  return await validateTypes({
+    value: entry,
+    schema: contextSchema,
+    context: { field: "tool context", entityName: toolName }
+  });
+}
 function aggregateUsage(steps) {
   var _a, _b, _c, _d;
   let inputTokens = 0;
@@ -1351,7 +1422,12 @@ function createInvalidToolResult(toolCall) {
     }
   };
 }
-async function executeTool(toolCall, tools, messages, experimentalContext) {
+function getToolCallbackMessages(messages) {
+  var _a;
+  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) {
   const tool2 = tools[toolCall.toolName];
   if (!tool2) throw new Error(`Tool "${toolCall.toolName}" not found`);
   if (typeof tool2.execute !== "function") {
@@ -1366,8 +1442,8 @@ async function executeTool(toolCall, tools, messages, experimentalContext) {
       toolCallId: toolCall.toolCallId,
       // Pass the conversation messages to the tool so it has context about the conversation
       messages,
-      // Pass context to the tool
-      context: experimentalContext
+      // Pass per-tool context to the tool (resolved from `toolsContext`)
+      context
     });
     const output = typeof toolResult === "string" ? { type: "text", value: toolResult } : { type: "json", value: toolResult };
     return {