@mastra/core 0.24.0 → 1.0.0-beta.0

package/dist/{chunk-3VXXCPKX.js → chunk-P6APHXPZ.js}

@@ -1,10 +1,10 @@
-import { validateStepInput, getStepResult, Workflow, Run, ExecutionEngine } from './chunk-LG5B3KIW.js';
+import { validateStepInput, createDeprecationProxy, getStepResult, runCountDeprecationMessage, Workflow, Run, ExecutionEngine } from './chunk-26SQQNMU.js';
 import { STREAM_FORMAT_SYMBOL, EMITTER_SYMBOL } from './chunk-NLNKQD2T.js';
-import { RuntimeContext } from './chunk-HLRWYUFN.js';
-import { MastraError } from './chunk-PZUZNPFM.js';
-import { Tool } from './chunk-WM4RO23J.js';
-import { MastraBase } from './chunk-VQASQG5D.js';
-import { RegisteredLogger } from './chunk-UXG7PYML.js';
+import { getErrorFromUnknown, MastraError } from './chunk-JJ5O45LH.js';
+import { Tool } from './chunk-7AHYOMHJ.js';
+import { RequestContext } from './chunk-GRBGQ2GE.js';
+import { MastraBase } from './chunk-S6URFGCZ.js';
+import { RegisteredLogger } from './chunk-KJ2SW6VA.js';
 import EventEmitter from 'events';
 import { randomUUID } from 'crypto';
 import z from 'zod';
@@ -19,7 +19,7 @@ var StepExecutor = class extends MastraBase {
     this.mastra = mastra;
   }
   async execute(params) {
-    const { step, stepResults, runId, runtimeContext, runCount = 0 } = params;
+    const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
     const abortController = new AbortController();
     let suspended;
     let bailed;
@@ -43,40 +43,49 @@ var StepExecutor = class extends MastraBase {
       if (validationError) {
         throw validationError;
       }
-      const stepResult = await step.execute({
-        workflowId: params.workflowId,
-        runId,
-        mastra: this.mastra,
-        runtimeContext,
-        inputData,
-        state: params.state,
-        setState: (state) => {
-          params.state = state;
-        },
-        runCount,
-        resumeData: params.resumeData,
-        getInitData: () => stepResults?.input,
-        getStepResult: getStepResult.bind(this, stepResults),
-        suspend: async (suspendPayload) => {
-          suspended = { payload: { ...suspendPayload, __workflow_meta: { runId, path: [step.id] } } };
-        },
-        bail: (result) => {
-          bailed = { payload: result };
-        },
-        // TODO
-        writer: void 0,
-        abort: () => {
-          abortController?.abort();
-        },
-        [EMITTER_SYMBOL]: params.emitter,
-        // TODO: refactor this to use our PubSub actually
-        [STREAM_FORMAT_SYMBOL]: void 0,
-        // TODO
-        engine: {},
-        abortSignal: abortController?.signal,
-        // TODO
-        tracingContext: {}
-      });
+      const stepResult = await step.execute(
+        createDeprecationProxy(
+          {
+            workflowId: params.workflowId,
+            runId,
+            mastra: this.mastra,
+            requestContext,
+            inputData,
+            state: params.state,
+            setState: (state) => {
+              params.state = state;
+            },
+            retryCount,
+            resumeData: params.resumeData,
+            getInitData: () => stepResults?.input,
+            getStepResult: getStepResult.bind(this, stepResults),
+            suspend: async (suspendPayload) => {
+              suspended = { payload: { ...suspendPayload, __workflow_meta: { runId, path: [step.id] } } };
+            },
+            bail: (result) => {
+              bailed = { payload: result };
+            },
+            // TODO
+            writer: void 0,
+            abort: () => {
+              abortController?.abort();
+            },
+            [EMITTER_SYMBOL]: params.emitter,
+            // TODO: refactor this to use our PubSub actually
+            [STREAM_FORMAT_SYMBOL]: void 0,
+            // TODO
+            engine: {},
+            abortSignal: abortController?.signal,
+            // TODO
+            tracingContext: {}
+          },
+          {
+            paramName: "runCount",
+            deprecationMessage: runCountDeprecationMessage,
+            logger: this.logger
+          }
+        )
+      );
       const endedAt = Date.now();
       let finalResult;
       if (suspended) {
@@ -107,16 +116,20 @@ var StepExecutor = class extends MastraBase {
       return finalResult;
     } catch (error) {
       const endedAt = Date.now();
+      const errorInstance = getErrorFromUnknown(error, {
+        includeStack: false,
+        fallbackMessage: "Unknown step execution error"
+      });
       return {
         ...stepInfo,
         status: "failed",
         endedAt,
-        error: error instanceof Error ? error?.stack ?? error.message : error
+        error: `Error: ${errorInstance.message}`
       };
     }
   }
   async evaluateConditions(params) {
-    const { step, stepResults, runId, runtimeContext, runCount = 0 } = params;
+    const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
     const abortController = new AbortController();
     const ee = new EventEmitter();
     const results = await Promise.all(
@@ -126,10 +139,10 @@ var StepExecutor = class extends MastraBase {
             workflowId: params.workflowId,
             condition,
             runId,
-            runtimeContext,
+            requestContext,
             inputData: params.input,
             state: params.state,
-            runCount,
+            retryCount,
             resumeData: params.resumeData,
             abortController,
             stepResults,
@@ -158,49 +171,58 @@ var StepExecutor = class extends MastraBase {
     resumeData,
     stepResults,
     state,
-    runtimeContext,
+    requestContext,
     emitter,
     abortController,
-    runCount = 0,
+    retryCount = 0,
     iterationCount
   }) {
-    return condition({
-      workflowId,
-      runId,
-      mastra: this.mastra,
-      runtimeContext,
-      inputData,
-      state,
-      setState: (_state) => {
-      },
-      runCount,
-      resumeData,
-      getInitData: () => stepResults?.input,
-      getStepResult: getStepResult.bind(this, stepResults),
-      suspend: async (_suspendPayload) => {
-        throw new Error("Not implemented");
-      },
-      bail: (_result) => {
-        throw new Error("Not implemented");
-      },
-      // TODO
-      writer: void 0,
-      abort: () => {
-        abortController?.abort();
-      },
-      [EMITTER_SYMBOL]: emitter,
-      // TODO: refactor this to use our PubSub actually
-      [STREAM_FORMAT_SYMBOL]: void 0,
-      // TODO
-      engine: {},
-      abortSignal: abortController?.signal,
-      // TODO
-      tracingContext: {},
-      iterationCount
-    });
+    return condition(
+      createDeprecationProxy(
+        {
+          workflowId,
+          runId,
+          mastra: this.mastra,
+          requestContext,
+          inputData,
+          state,
+          setState: (_state) => {
+          },
+          retryCount,
+          resumeData,
+          getInitData: () => stepResults?.input,
+          getStepResult: getStepResult.bind(this, stepResults),
+          suspend: async (_suspendPayload) => {
+            throw new Error("Not implemented");
+          },
+          bail: (_result) => {
+            throw new Error("Not implemented");
+          },
+          // TODO
+          writer: void 0,
+          abort: () => {
+            abortController?.abort();
+          },
+          [EMITTER_SYMBOL]: emitter,
+          // TODO: refactor this to use our PubSub actually
+          [STREAM_FORMAT_SYMBOL]: void 0,
+          // TODO
+          engine: {},
+          abortSignal: abortController?.signal,
+          // TODO
+          tracingContext: {},
+          iterationCount
+        },
+        {
+          paramName: "runCount",
+          deprecationMessage: runCountDeprecationMessage,
+          logger: this.logger
+        }
+      )
+    );
   }
   async resolveSleep(params) {
-    const { step, stepResults, runId, runtimeContext, runCount = 0 } = params;
+    const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
     const abortController = new AbortController();
     const ee = new EventEmitter();
     if (step.duration) {
@@ -210,47 +232,56 @@ var StepExecutor = class extends MastraBase {
       return 0;
     }
     try {
-      return await step.fn({
-        workflowId: params.workflowId,
-        runId,
-        mastra: this.mastra,
-        runtimeContext,
-        inputData: params.input,
-        // TODO: implement state
-        state: {},
-        setState: (_state) => {
-        },
-        runCount,
-        resumeData: params.resumeData,
-        getInitData: () => stepResults?.input,
-        getStepResult: getStepResult.bind(this, stepResults),
-        suspend: async (_suspendPayload) => {
-          throw new Error("Not implemented");
-        },
-        bail: (_result) => {
-          throw new Error("Not implemented");
-        },
-        abort: () => {
-          abortController?.abort();
-        },
-        // TODO
-        writer: void 0,
-        [EMITTER_SYMBOL]: ee,
-        // TODO: refactor this to use our PubSub actually
-        [STREAM_FORMAT_SYMBOL]: void 0,
-        // TODO
-        engine: {},
-        abortSignal: abortController?.signal,
-        // TODO
-        tracingContext: {}
-      });
+      return await step.fn(
+        createDeprecationProxy(
+          {
+            workflowId: params.workflowId,
+            runId,
+            mastra: this.mastra,
+            requestContext,
+            inputData: params.input,
+            // TODO: implement state
+            state: {},
+            setState: (_state) => {
+            },
+            retryCount,
+            resumeData: params.resumeData,
+            getInitData: () => stepResults?.input,
+            getStepResult: getStepResult.bind(this, stepResults),
+            suspend: async (_suspendPayload) => {
+              throw new Error("Not implemented");
+            },
+            bail: (_result) => {
+              throw new Error("Not implemented");
+            },
+            abort: () => {
+              abortController?.abort();
+            },
+            // TODO
+            writer: void 0,
+            [EMITTER_SYMBOL]: ee,
+            // TODO: refactor this to use our PubSub actually
+            [STREAM_FORMAT_SYMBOL]: void 0,
+            // TODO
+            engine: {},
+            abortSignal: abortController?.signal,
+            // TODO
+            tracingContext: {}
+          },
+          {
+            paramName: "runCount",
+            deprecationMessage: runCountDeprecationMessage,
+            logger: this.logger
+          }
+        )
+      );
     } catch (e) {
       console.error("error evaluating condition", e);
       return 0;
     }
   }
   async resolveSleepUntil(params) {
-    const { step, stepResults, runId, runtimeContext, runCount = 0 } = params;
+    const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
     const abortController = new AbortController();
     const ee = new EventEmitter();
     if (step.date) {
@@ -260,40 +291,49 @@ var StepExecutor = class extends MastraBase {
       return 0;
     }
     try {
-      const result = await step.fn({
-        workflowId: params.workflowId,
-        runId,
-        mastra: this.mastra,
-        runtimeContext,
-        inputData: params.input,
-        // TODO: implement state
-        state: {},
-        setState: (_state) => {
-        },
-        runCount,
-        resumeData: params.resumeData,
-        getInitData: () => stepResults?.input,
-        getStepResult: getStepResult.bind(this, stepResults),
-        suspend: async (_suspendPayload) => {
-          throw new Error("Not implemented");
-        },
-        bail: (_result) => {
-          throw new Error("Not implemented");
-        },
-        abort: () => {
-          abortController?.abort();
-        },
-        // TODO
-        writer: void 0,
-        [EMITTER_SYMBOL]: ee,
-        // TODO: refactor this to use our PubSub actually
-        [STREAM_FORMAT_SYMBOL]: void 0,
-        // TODO
-        engine: {},
-        abortSignal: abortController?.signal,
-        // TODO
-        tracingContext: {}
-      });
+      const result = await step.fn(
+        createDeprecationProxy(
+          {
+            workflowId: params.workflowId,
+            runId,
+            mastra: this.mastra,
+            requestContext,
+            inputData: params.input,
+            // TODO: implement state
+            state: {},
+            setState: (_state) => {
+            },
+            retryCount,
+            resumeData: params.resumeData,
+            getInitData: () => stepResults?.input,
+            getStepResult: getStepResult.bind(this, stepResults),
+            suspend: async (_suspendPayload) => {
+              throw new Error("Not implemented");
+            },
+            bail: (_result) => {
+              throw new Error("Not implemented");
+            },
+            abort: () => {
+              abortController?.abort();
+            },
+            // TODO
+            writer: void 0,
+            [EMITTER_SYMBOL]: ee,
+            // TODO: refactor this to use our PubSub actually
+            [STREAM_FORMAT_SYMBOL]: void 0,
+            // TODO
+            engine: {},
+            abortSignal: abortController?.signal,
+            // TODO
+            tracingContext: {}
+          },
+          {
+            paramName: "runCount",
+            deprecationMessage: runCountDeprecationMessage,
+            logger: this.logger
+          }
+        )
+      );
       return result.getTime() - Date.now();
     } catch (e) {
       console.error("error evaluating condition", e);
@@ -322,8 +362,8 @@ async function processWorkflowLoop({
   resumeSteps,
   resumeData,
   parentWorkflow,
-  runtimeContext,
-  runCount = 0
+  requestContext,
+  retryCount = 0
 }, {
   pubsub,
   stepExecutor,
@@ -339,12 +379,12 @@ async function processWorkflowLoop({
     state: {},
     emitter: new EventEmitter(),
     // TODO
-    runtimeContext: new RuntimeContext(),
+    requestContext: new RequestContext(),
     // TODO
     inputData: prevResult?.status === "success" ? prevResult.output : void 0,
     resumeData,
     abortController: new AbortController(),
-    runCount,
+    retryCount,
     iterationCount: 0
     //TODO: implement
   });
@@ -363,7 +403,7 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     } else {
@@ -380,8 +420,8 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          runtimeContext,
-          runCount
+          requestContext,
+          retryCount
         }
       });
     }
@@ -400,8 +440,8 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          runtimeContext,
-          runCount
+          requestContext,
+          retryCount
         }
       });
     } else {
@@ -418,7 +458,7 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     }
@@ -434,7 +474,7 @@ async function processWorkflowForEach({
   resumeSteps,
   resumeData,
   parentWorkflow,
-  runtimeContext
+  requestContext
 }, {
   pubsub,
   mastra,
@@ -457,7 +497,7 @@ async function processWorkflowForEach({
         prevResult: currentResult,
         resumeData,
         activeSteps,
-        runtimeContext
+        requestContext
       }
     });
     return;
@@ -477,7 +517,7 @@ async function processWorkflowForEach({
         startedAt: Date.now(),
         payload: prevResult?.output
       },
-      runtimeContext
+      requestContext
     });
     for (let i = 0; i < concurrency; i++) {
       await pubsub.publish("workflows", {
@@ -493,7 +533,7 @@ async function processWorkflowForEach({
           prevResult,
           resumeData,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     }
@@ -510,7 +550,7 @@ async function processWorkflowForEach({
       startedAt: Date.now(),
       payload: prevResult?.output
     },
-    runtimeContext
+    requestContext
   });
   await pubsub.publish("workflows", {
     type: "workflow.step.run",
@@ -525,7 +565,7 @@ async function processWorkflowForEach({
       prevResult,
       resumeData,
       activeSteps,
-      runtimeContext
+      requestContext
     }
   });
 }
@@ -539,7 +579,7 @@ async function processWorkflowParallel({
   prevResult,
   resumeData,
   parentWorkflow,
-  runtimeContext
+  requestContext
 }, {
   pubsub,
   step
@@ -565,7 +605,7 @@ async function processWorkflowParallel({
           resumeData,
           parentWorkflow,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     })
@@ -581,7 +621,7 @@ async function processWorkflowConditional({
   prevResult,
   resumeData,
   parentWorkflow,
-  runtimeContext
+  requestContext
 }, {
   pubsub,
   stepExecutor,
@@ -596,7 +636,7 @@ async function processWorkflowConditional({
     state: {},
     emitter: new EventEmitter(),
     // TODO
-    runtimeContext: new RuntimeContext(),
+    requestContext: new RequestContext(),
     // TODO
     input: prevResult?.status === "success" ? prevResult.output : void 0,
     resumeData
@@ -624,7 +664,7 @@ async function processWorkflowConditional({
             resumeData,
             parentWorkflow,
             activeSteps,
-            runtimeContext
+            requestContext
           }
         });
       } else {
@@ -641,7 +681,7 @@ async function processWorkflowConditional({
             resumeData,
             parentWorkflow,
             activeSteps,
-            runtimeContext
+            requestContext
           }
         });
       }
@@ -675,7 +715,7 @@ async function processWorkflowWaitForEvent(workflowData, {
       stepResults: currentState?.context,
       prevResult,
       activeSteps: [],
-      runtimeContext: currentState?.runtimeContext
+      requestContext: currentState?.requestContext
     }
   });
 }
@@ -689,7 +729,7 @@ async function processWorkflowSleep({
   prevResult,
   resumeData,
   parentWorkflow,
-  runtimeContext
+  requestContext
 }, {
   pubsub,
   stepExecutor,
@@ -716,7 +756,7 @@ async function processWorkflowSleep({
     stepResults,
     emitter: new EventEmitter(),
     // TODO
-    runtimeContext: new RuntimeContext(),
+    requestContext: new RequestContext(),
     // TODO
     input: prevResult?.status === "success" ? prevResult.output : void 0,
     resumeData
@@ -762,7 +802,7 @@ async function processWorkflowSleep({
           resumeData,
           parentWorkflow,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     },
@@ -779,7 +819,7 @@ async function processWorkflowSleepUntil({
   prevResult,
   resumeData,
   parentWorkflow,
-  runtimeContext
+  requestContext
 }, {
   pubsub,
   stepExecutor,
@@ -793,7 +833,7 @@ async function processWorkflowSleepUntil({
     stepResults,
     emitter: new EventEmitter(),
     // TODO
-    runtimeContext: new RuntimeContext(),
+    requestContext: new RequestContext(),
     // TODO
     input: prevResult?.status === "success" ? prevResult.output : void 0,
     resumeData
@@ -852,7 +892,7 @@ async function processWorkflowSleepUntil({
           resumeData,
           parentWorkflow,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     },
@@ -878,7 +918,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     resumeSteps,
     stepResults,
     resumeData,
-    runtimeContext
+    requestContext
   }, e) {
     await this.mastra.pubsub.publish("workflows", {
       type: "workflow.fail",
@@ -890,7 +930,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
         resumeSteps,
         stepResults,
         prevResult: { status: "failed", error: e.stack ?? e.message },
-        runtimeContext,
+        requestContext,
         resumeData,
         activeSteps: {},
         parentWorkflow
@@ -911,7 +951,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       runId,
       stepResults: currentState?.context,
       prevResult: { status: "canceled" },
-      runtimeContext: currentState?.runtimeContext,
+      requestContext: currentState?.requestContext,
       executionPath: [],
       activeSteps: {},
       resumeSteps: [],
@@ -929,7 +969,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     resumeData,
     executionPath,
     stepResults,
-    runtimeContext
+    requestContext
   }) {
     await this.mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: workflow.id,
@@ -962,14 +1002,14 @@ var WorkflowEventProcessor = class extends EventProcessor {
           input: prevResult?.status === "success" ? prevResult.output : void 0
         },
         prevResult,
-        runtimeContext,
+        requestContext,
         resumeData,
         activeSteps: {}
       }
     });
   }
   async endWorkflow(args) {
-    const { stepResults, workflowId, runId, prevResult } = args;
+    const { workflowId, runId, prevResult } = args;
     await this.mastra.getStorage()?.updateWorkflowState({
       workflowName: workflowId,
       runId,
@@ -978,23 +1018,6 @@ var WorkflowEventProcessor = class extends EventProcessor {
         result: prevResult
       }
     });
-    await this.mastra.pubsub.publish(`workflow.events.${runId}`, {
-      type: "watch",
-      runId,
-      data: {
-        type: "watch",
-        payload: {
-          currentStep: void 0,
-          workflowState: {
-            status: prevResult.status,
-            steps: stepResults,
-            result: prevResult.status === "success" ? prevResult.output : null,
-            error: prevResult.error ?? null
-          }
-        },
-        eventTimestamp: Date.now()
-      }
-    });
     await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
       type: "watch",
       runId,
@@ -1012,7 +1035,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     });
   }
   async processWorkflowEnd(args) {
-    const { resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, runtimeContext, runId } = args;
+    const { resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, requestContext, runId } = args;
     if (parentWorkflow) {
       await this.mastra.pubsub.publish("workflows", {
         type: "workflow.step.end",
@@ -1028,7 +1051,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           activeSteps,
           parentWorkflow: parentWorkflow.parentWorkflow,
           parentContext: parentWorkflow,
-          runtimeContext
+          requestContext
         }
       });
     }
@@ -1039,7 +1062,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     });
   }
   async processWorkflowSuspend(args) {
-    const { resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, runId, runtimeContext } = args;
+    const { resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, runId, requestContext } = args;
     if (parentWorkflow) {
       await this.mastra.pubsub.publish("workflows", {
         type: "workflow.step.end",
@@ -1062,7 +1085,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           },
           resumeData,
           activeSteps,
-          runtimeContext,
+          requestContext,
           parentWorkflow: parentWorkflow.parentWorkflow,
           parentContext: parentWorkflow
         }
@@ -1075,7 +1098,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     });
   }
   async processWorkflowFail(args) {
-    const { workflowId, runId, resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, runtimeContext } = args;
+    const { workflowId, runId, resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, requestContext } = args;
     await this.mastra.getStorage()?.updateWorkflowState({
       workflowName: workflowId,
       runId,
@@ -1097,7 +1120,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           activeSteps,
-          runtimeContext,
+          requestContext,
           parentWorkflow: parentWorkflow.parentWorkflow,
           parentContext: parentWorkflow
         }
@@ -1120,8 +1143,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
     prevResult,
     resumeData,
     parentWorkflow,
-    runtimeContext,
-    runCount = 0
+    requestContext,
+    retryCount = 0
   }) {
     let stepGraph = workflow.stepGraph;
     if (!executionPath?.length) {
@@ -1136,7 +1159,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         new MastraError({
           id: "MASTRA_WORKFLOW",
@@ -1159,7 +1182,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         new MastraError({
           id: "MASTRA_WORKFLOW",
@@ -1183,7 +1206,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1202,7 +1225,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1222,7 +1245,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1242,7 +1265,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1250,42 +1273,6 @@ var WorkflowEventProcessor = class extends EventProcessor {
           step
         }
       );
-    } else if (step?.type === "waitForEvent" && !resumeData) {
-      await this.mastra.getStorage()?.updateWorkflowResults({
-        workflowName: workflowId,
-        runId,
-        stepId: step.step.id,
-        result: {
-          startedAt: Date.now(),
-          status: "waiting",
-          payload: prevResult.status === "success" ? prevResult.output : void 0
-        },
-        runtimeContext
-      });
-      await this.mastra.getStorage()?.updateWorkflowState({
-        workflowName: workflowId,
-        runId,
-        opts: {
-          status: "waiting",
-          waitingPaths: {
-            [step.event]: executionPath
-          }
-        }
-      });
-      await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
-        type: "watch",
-        runId,
-        data: {
-          type: "workflow-step-waiting",
-          payload: {
-            id: step.step.id,
-            status: "waiting",
-            payload: prevResult.status === "success" ? prevResult.output : void 0,
-            startedAt: Date.now()
-          }
-        }
-      });
-      return;
     } else if (step?.type === "foreach" && executionPath.length === 1) {
       return processWorkflowForEach(
         {
@@ -1298,7 +1285,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1319,7 +1306,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          runtimeContext
+          requestContext
         },
         new MastraError({
           id: "MASTRA_WORKFLOW",
@@ -1346,7 +1333,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
               prevResult,
               resumeData,
               parentWorkflow,
-              runtimeContext
+              requestContext
             },
             new MastraError({
               id: "MASTRA_WORKFLOW",
@@ -1384,7 +1371,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
             prevResult,
             resumeData,
             activeSteps,
-            runtimeContext
+            requestContext
           }
         });
       } else {
@@ -1409,30 +1396,13 @@ var WorkflowEventProcessor = class extends EventProcessor {
             prevResult,
             resumeData,
             activeSteps,
-            runtimeContext
+            requestContext
           }
         });
       }
       return;
     }
-    if (step.type === "step" || step.type === "waitForEvent") {
-      await this.mastra.pubsub.publish(`workflow.events.${runId}`, {
-        type: "watch",
-        runId,
-        data: {
-          type: "watch",
-          payload: {
-            currentStep: { id: step.step.id, status: "running" },
-            workflowState: {
-              status: "running",
-              steps: stepResults,
-              error: null,
-              result: null
-            }
-          },
-          eventTimestamp: Date.now()
-        }
-      });
+    if (step.type === "step") {
       await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
         type: "watch",
         runId,
@@ -1448,15 +1418,15 @@ var WorkflowEventProcessor = class extends EventProcessor {
       });
     }
     const ee = new EventEmitter();
-    ee.on("watch-v2", async (event) => {
+    ee.on("watch", async (event) => {
       await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
         type: "watch",
         runId,
         data: event
       });
     });
-    const rc = new RuntimeContext();
-    for (const [key, value] of Object.entries(runtimeContext)) {
+    const rc = new RequestContext();
+    for (const [key, value] of Object.entries(requestContext)) {
       rc.set(key, value);
     }
     const stepResult = await this.stepExecutor.execute({
@@ -1467,14 +1437,14 @@ var WorkflowEventProcessor = class extends EventProcessor {
       // TODO: implement state
       state: {},
       emitter: ee,
-      runtimeContext: rc,
+      requestContext: rc,
       input: prevResult?.output,
-      resumeData: step.type === "waitForEvent" || resumeSteps?.length === 1 && resumeSteps?.[0] === step.step.id ? resumeData : void 0,
-      runCount,
+      resumeData: resumeSteps?.length === 1 && resumeSteps?.[0] === step.step.id ? resumeData : void 0,
+      retryCount,
       foreachIdx: step.type === "foreach" ? executionPath[1] : void 0,
       validateInputs: workflow.options.validateInputs
     });
-    runtimeContext = Object.fromEntries(rc.entries());
+    requestContext = Object.fromEntries(rc.entries());
     if (stepResult.status === "bailed") {
       stepResult.status = "success";
       await this.endWorkflow({
@@ -1491,12 +1461,12 @@ var WorkflowEventProcessor = class extends EventProcessor {
         },
         prevResult: stepResult,
         activeSteps,
-        runtimeContext
+        requestContext
       });
       return;
     }
     if (stepResult.status === "failed") {
-      if (runCount >= (workflow.retryConfig.attempts ?? 0)) {
+      if (retryCount >= (workflow.retryConfig.attempts ?? 0)) {
         await this.mastra.pubsub.publish("workflows", {
           type: "workflow.step.end",
           runId,
@@ -1509,7 +1479,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
             stepResults,
             prevResult: stepResult,
             activeSteps,
-            runtimeContext
+            requestContext
           }
         });
       } else {
@@ -1525,8 +1495,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
             stepResults,
             prevResult,
             activeSteps,
-            runtimeContext,
-            runCount: runCount + 1
+            requestContext,
+            retryCount: retryCount + 1
           }
         });
       }
@@ -1543,8 +1513,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           resumeSteps,
           resumeData,
           parentWorkflow,
-          runtimeContext,
-          runCount: runCount + 1
+          requestContext,
+          retryCount: retryCount + 1
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1566,7 +1536,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult: stepResult,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     }
@@ -1582,7 +1552,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     stepResults,
     activeSteps,
     parentContext,
-    runtimeContext
+    requestContext
   }) {
     let step = workflow.stepGraph[executionPath[0]];
     if ((step?.type === "parallel" || step?.type === "conditional") && executionPath.length > 1) {
@@ -1598,7 +1568,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           stepResults,
           activeSteps,
-          runtimeContext
+          requestContext
         },
         new MastraError({
           id: "MASTRA_WORKFLOW",
@@ -1629,7 +1599,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
         runId,
         stepId: step.step.id,
         result: newResult,
-        runtimeContext
+        requestContext
       });
       if (!newStepResults) {
         return;
@@ -1648,7 +1618,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
         runId,
         stepId: step.step.id,
         result: prevResult,
-        runtimeContext
+        requestContext
       });
       if (!newStepResults) {
         return;
@@ -1668,7 +1638,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
       return;
@@ -1699,22 +1669,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult,
           activeSteps,
-          runtimeContext
-        }
-      });
-      await this.mastra.pubsub.publish(`workflow.events.${runId}`, {
-        type: "watch",
-        runId,
-        data: {
-          type: "watch",
-          payload: {
-            currentStep: { ...prevResult, id: step?.step?.id },
-            workflowState: {
-              status: "suspended",
-              steps: stepResults,
-              suspendPayload: prevResult.suspendPayload
-            }
-          }
+          requestContext
         }
       });
       await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
@@ -1732,24 +1687,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       });
       return;
     }
-    if (step?.type === "step" || step?.type === "waitForEvent") {
-      await this.mastra.pubsub.publish(`workflow.events.${runId}`, {
-        type: "watch",
-        runId,
-        data: {
-          type: "watch",
-          payload: {
-            currentStep: { ...prevResult, id: step.step.id },
-            workflowState: {
-              status: "running",
-              steps: stepResults,
-              error: null,
-              result: null
-            }
-          },
-          eventTimestamp: Date.now()
-        }
-      });
+    if (step?.type === "step") {
       await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
         type: "watch",
         runId,
@@ -1808,7 +1746,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult: { status: "success", output: allResults },
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     } else if (step?.type === "foreach") {
@@ -1824,7 +1762,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult: { ...prevResult, output: prevResult?.payload },
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     } else if (executionPath[0] >= workflow.stepGraph.length - 1) {
@@ -1838,7 +1776,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
         stepResults,
         prevResult,
         activeSteps,
-        runtimeContext
+        requestContext
       });
     } else {
       await this.mastra.pubsub.publish("workflows", {
@@ -1853,7 +1791,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult,
           activeSteps,
-          runtimeContext
+          requestContext
         }
       });
     }
@@ -2026,7 +1964,7 @@ function createStep(params) {
       outputSchema: z.object({
         text: z.string()
       }),
-      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
+      execute: async ({ inputData, [EMITTER_SYMBOL]: emitter, requestContext, abortSignal, abort }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -2035,7 +1973,7 @@ function createStep(params) {
         const { fullStream } = await params.streamLegacy(inputData.prompt, {
           // resourceId: inputData.resourceId,
           // threadId: inputData.threadId,
-          runtimeContext,
+          requestContext,
           onFinish: (result) => {
             streamPromise.resolve(result.text);
           },
@@ -2048,20 +1986,20 @@ function createStep(params) {
           name: params.name,
           args: inputData
         };
-        await emitter.emit("watch-v2", {
+        await emitter.emit("watch", {
           type: "tool-call-streaming-start",
           ...toolData ?? {}
         });
         for await (const chunk of fullStream) {
           if (chunk.type === "text-delta") {
-            await emitter.emit("watch-v2", {
+            await emitter.emit("watch", {
               type: "tool-call-delta",
               ...toolData ?? {},
               argsTextDelta: chunk.textDelta
             });
           }
         }
-        await emitter.emit("watch-v2", {
+        await emitter.emit("watch", {
           type: "tool-call-streaming-finish",
           ...toolData ?? {}
         });
@@ -2077,24 +2015,41 @@ function createStep(params) {
       throw new Error("Tool must have input and output schemas defined");
     }
     return {
-      // TODO: tool probably should have strong id type
-      // @ts-ignore
       id: params.id,
       description: params.description,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
       suspendSchema: params.suspendSchema,
       resumeSchema: params.resumeSchema,
-      execute: async ({ inputData, mastra, runtimeContext, suspend, resumeData }) => {
-        return params.execute({
-          context: inputData,
+      execute: async ({
+        inputData,
+        mastra,
+        requestContext,
+        suspend,
+        resumeData,
+        runId,
+        workflowId,
+        state,
+        setState
+      }) => {
+        if (!params.execute) {
+          throw new Error(`Tool ${params.id} does not have an execute function`);
+        }
+        const context = {
           mastra,
-          runtimeContext,
-          // TODO: Pass proper tracing context when evented workflows support tracing
+          requestContext,
           tracingContext: { currentSpan: void 0 },
-          suspend,
-          resumeData
-        });
+          // TODO: Pass proper tracing context when evented workflows support tracing
+          workflow: {
+            runId,
+            workflowId,
+            state,
+            setState,
+            suspend,
+            resumeData
+          }
+        };
+        return params.execute(inputData, context);
       },
       component: "TOOL"
     };
@@ -2133,7 +2088,7 @@ var EventedWorkflow = class extends Workflow {
     super.__registerMastra(mastra);
     this.executionEngine.__registerMastra(mastra);
   }
-  async createRunAsync(options) {
+  async createRun(options) {
     const runIdToUse = options?.runId || randomUUID();
     const run = this.runs.get(runIdToUse) ?? new EventedRun({
       workflowId: this.id,
@@ -2184,7 +2139,7 @@ var EventedRun = class extends Run {
   async start({
     inputData,
     initialState,
-    runtimeContext
+    requestContext
   }) {
     if (this.serializedStepGraph.length === 0) {
       throw new Error(
@@ -2194,7 +2149,7 @@ var EventedRun = class extends Run {
     if (!this.executionGraph.steps) {
       throw new Error("Uncommitted step flow changes detected. Call .commit() to register the steps.");
     }
-    runtimeContext = runtimeContext ?? new RuntimeContext();
+    requestContext = requestContext ?? new RequestContext();
     await this.mastra?.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
@@ -2203,7 +2158,7 @@ var EventedRun = class extends Run {
         serializedStepGraph: this.serializedStepGraph,
         value: {},
         context: {},
-        runtimeContext: Object.fromEntries(runtimeContext.entries()),
+        requestContext: Object.fromEntries(requestContext.entries()),
         activePaths: [],
         suspendedPaths: {},
         resumeLabels: {},
@@ -2236,7 +2191,7 @@ var EventedRun = class extends Run {
         }
       },
       retryConfig: this.retryConfig,
-      runtimeContext,
+      requestContext,
       abortController: this.abortController
     });
     console.dir({ startResult: result }, { depth: null });
@@ -2264,17 +2219,17 @@ var EventedRun = class extends Run {
       );
     }
     console.dir(
-      { resume: { runtimeContextObj: snapshot?.runtimeContext, runtimeContext: params.runtimeContext } },
+      { resume: { requestContextObj: snapshot?.requestContext, requestContext: params.requestContext } },
       { depth: null }
     );
-    const runtimeContextObj = snapshot?.runtimeContext ?? {};
-    const runtimeContext = new RuntimeContext();
-    for (const [key, value] of Object.entries(runtimeContextObj)) {
-      runtimeContext.set(key, value);
+    const requestContextObj = snapshot?.requestContext ?? {};
+    const requestContext = new RequestContext();
+    for (const [key, value] of Object.entries(requestContextObj)) {
+      requestContext.set(key, value);
     }
-    if (params.runtimeContext) {
-      for (const [key, value] of params.runtimeContext.entries()) {
-        runtimeContext.set(key, value);
+    if (params.requestContext) {
+      for (const [key, value] of params.requestContext.entries()) {
+        requestContext.set(key, value);
       }
     }
     const suspendedStep = this.workflowSteps[steps?.[0] ?? ""];
@@ -2306,7 +2261,7 @@ var EventedRun = class extends Run {
           this.emitter.once(event, callback);
         }
       },
-      runtimeContext,
+      requestContext,
       abortController: this.abortController
     }).then((result) => {
       if (result.status !== "suspended") {
@@ -2318,7 +2273,7 @@ var EventedRun = class extends Run {
     this.executionResults = executionResultPromise;
     return executionResultPromise;
   }
-  watch(cb, type = "watch") {
+  watch(cb) {
     const watchCb = async (event, ack) => {
       if (event.runId !== this.runId) {
         return;
@@ -2326,24 +2281,14 @@ var EventedRun = class extends Run {
       cb(event.data);
       await ack?.();
     };
-    if (type === "watch-v2") {
-      this.mastra?.pubsub.subscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
-      });
-    } else {
-      this.mastra?.pubsub.subscribe(`workflow.events.${this.runId}`, watchCb).catch(() => {
-      });
-    }
+    this.mastra?.pubsub.subscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
+    });
     return () => {
-      if (type === "watch-v2") {
-        this.mastra?.pubsub.unsubscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
-        });
-      } else {
-        this.mastra?.pubsub.unsubscribe(`workflow.events.${this.runId}`, watchCb).catch(() => {
-        });
-      }
+      this.mastra?.pubsub.unsubscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
+      });
     };
   }
-  async watchAsync(cb, type = "watch") {
+  async watchAsync(cb) {
     const watchCb = async (event, ack) => {
       if (event.runId !== this.runId) {
         return;
@@ -2351,21 +2296,11 @@ var EventedRun = class extends Run {
       cb(event.data);
       await ack?.();
     };
-    if (type === "watch-v2") {
-      await this.mastra?.pubsub.subscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
-      });
-    } else {
-      await this.mastra?.pubsub.subscribe(`workflow.events.${this.runId}`, watchCb).catch(() => {
-      });
-    }
+    await this.mastra?.pubsub.subscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
+    });
     return async () => {
-      if (type === "watch-v2") {
-        await this.mastra?.pubsub.unsubscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
-        });
-      } else {
-        await this.mastra?.pubsub.unsubscribe(`workflow.events.${this.runId}`, watchCb).catch(() => {
-        });
-      }
+      await this.mastra?.pubsub.unsubscribe(`workflow.events.v2.${this.runId}`, watchCb).catch(() => {
+      });
     };
   }
   async cancel() {
@@ -2378,17 +2313,6 @@ var EventedRun = class extends Run {
       }
     });
   }
-  async sendEvent(eventName, data) {
-    await this.mastra?.pubsub.publish("workflows", {
-      type: `workflow.user-event.${eventName}`,
-      runId: this.runId,
-      data: {
-        workflowId: this.workflowId,
-        runId: this.runId,
-        resumeData: data
-      }
-    });
-  }
 };
 
 // src/workflows/evented/workflow-event-processor/utils.ts
@@ -2422,7 +2346,7 @@ function getStep(workflow, executionPath) {
   } else if (parentStep?.type === "foreach") {
     return parentStep.step;
   }
-  if (!(parentStep?.type === "step" || parentStep?.type === "loop" || parentStep?.type === "waitForEvent")) {
+  if (!(parentStep?.type === "step" || parentStep?.type === "loop")) {
     return null;
   }
   if (parentStep instanceof EventedWorkflow) {
@@ -2431,7 +2355,7 @@ function getStep(workflow, executionPath) {
   return parentStep.step;
 }
 function isExecutableStep(step) {
-  return step.type === "step" || step.type === "loop" || step.type === "waitForEvent" || step.type === "foreach";
+  return step.type === "step" || step.type === "loop" || step.type === "foreach";
 }
 
 // src/workflows/evented/execution-engine.ts
@@ -2474,7 +2398,7 @@ var EventedExecutionEngine = class extends ExecutionEngine {
           resumeSteps: params.resume.steps,
           prevResult: { status: "success", output: prevResult?.payload },
           resumeData: params.resume.resumePayload,
-          runtimeContext: Object.fromEntries(params.runtimeContext.entries()),
+          requestContext: Object.fromEntries(params.requestContext.entries()),
           format: params.format
         }
       });
@@ -2486,7 +2410,7 @@ var EventedExecutionEngine = class extends ExecutionEngine {
           workflowId: params.workflowId,
           runId: params.runId,
           prevResult: { status: "success", output: params.input },
-          runtimeContext: Object.fromEntries(params.runtimeContext.entries()),
+          requestContext: Object.fromEntries(params.requestContext.entries()),
           format: params.format
         }
       });
@@ -2536,5 +2460,5 @@ var EventedExecutionEngine = class extends ExecutionEngine {
 };
 
 export { EventedExecutionEngine, EventedRun, EventedWorkflow, StepExecutor, WorkflowEventProcessor, cloneStep, cloneWorkflow, createStep, createWorkflow };
-//# sourceMappingURL=chunk-3VXXCPKX.js.map
-//# sourceMappingURL=chunk-3VXXCPKX.js.map
+//# sourceMappingURL=chunk-P6APHXPZ.js.map
+//# sourceMappingURL=chunk-P6APHXPZ.js.map