@mastra/core 1.0.0-beta.11 → 1.0.0-beta.14

package/dist/{chunk-YC6PJEPH.cjs → chunk-6CG7IY57.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunk52RSUALV_cjs = require('./chunk-52RSUALV.cjs');
-var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
-var chunkTWH4PTDG_cjs = require('./chunk-TWH4PTDG.cjs');
-var chunkMGCGWPQJ_cjs = require('./chunk-MGCGWPQJ.cjs');
+var chunkJAGQZZ43_cjs = require('./chunk-JAGQZZ43.cjs');
+var chunkL3NKIMF5_cjs = require('./chunk-L3NKIMF5.cjs');
+var chunkHWMMIRIF_cjs = require('./chunk-HWMMIRIF.cjs');
+var chunkZ55SJVEC_cjs = require('./chunk-Z55SJVEC.cjs');
 var chunkUVHSM2GU_cjs = require('./chunk-UVHSM2GU.cjs');
 var chunkDGV2FWB4_cjs = require('./chunk-DGV2FWB4.cjs');
 var chunkAF74UXR5_cjs = require('./chunk-AF74UXR5.cjs');
@@ -27,11 +27,11 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
   }
   async execute(params) {
     const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
-    const abortController = new AbortController();
+    const abortController = params.abortController ?? new AbortController();
     let suspended;
     let bailed;
     const startedAt = Date.now();
-    const { inputData, validationError } = await chunk52RSUALV_cjs.validateStepInput({
+    const { inputData, validationError } = await chunkJAGQZZ43_cjs.validateStepInput({
       prevOutput: typeof params.foreachIdx === "number" ? params.input?.[params.foreachIdx] : params.input,
       step,
       validateInputs: params.validateInputs ?? true
@@ -56,7 +56,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
         throw validationError;
       }
       const stepResult = await step.execute(
-        chunk52RSUALV_cjs.createDeprecationProxy(
+        chunkJAGQZZ43_cjs.createDeprecationProxy(
           {
             workflowId: params.workflowId,
             runId,
@@ -71,9 +71,9 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             resumeData: params.resumeData,
             suspendData: suspendDataToUse,
             getInitData: () => stepResults?.input,
-            getStepResult: chunk52RSUALV_cjs.getStepResult.bind(this, stepResults),
+            getStepResult: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
             suspend: async (suspendPayload) => {
-              const { suspendData, validationError: validationError2 } = await chunk52RSUALV_cjs.validateStepSuspendData({
+              const { suspendData, validationError: validationError2 } = await chunkJAGQZZ43_cjs.validateStepSuspendData({
                 suspendData: suspendPayload,
                 step,
                 validateInputs: params.validateInputs ?? true
@@ -91,9 +91,8 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             abort: () => {
               abortController?.abort();
             },
-            [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: params.emitter,
-            // TODO: refactor this to use our PubSub actually
-            [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: void 0,
+            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(params.emitter),
+            [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
             // TODO
             engine: {},
             abortSignal: abortController?.signal,
@@ -102,7 +101,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           },
           {
             paramName: "runCount",
-            deprecationMessage: chunk52RSUALV_cjs.runCountDeprecationMessage,
+            deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
             logger: this.logger
           }
         )
@@ -138,21 +137,21 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
       return finalResult;
     } catch (error) {
       const endedAt = Date.now();
-      const errorInstance = chunkTWH4PTDG_cjs.getErrorFromUnknown(error, {
-        includeStack: false,
+      const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(error, {
+        serializeStack: false,
         fallbackMessage: "Unknown step execution error"
       });
       return {
         ...stepInfo,
         status: "failed",
         endedAt,
-        error: `Error: ${errorInstance.message}`
+        error: errorInstance
       };
     }
   }
   async evaluateConditions(params) {
     const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
-    const abortController = new AbortController();
+    const abortController = params.abortController ?? new AbortController();
     const ee = new EventEmitter__default.default();
     const results = await Promise.all(
       step.conditions.map((condition) => {
@@ -200,7 +199,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
     iterationCount
   }) {
     return condition(
-      chunk52RSUALV_cjs.createDeprecationProxy(
+      chunkJAGQZZ43_cjs.createDeprecationProxy(
         {
           workflowId,
           runId,
@@ -211,7 +210,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           retryCount,
           resumeData,
           getInitData: () => stepResults?.input,
-          getStepResult: chunk52RSUALV_cjs.getStepResult.bind(this, stepResults),
+          getStepResult: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
           bail: (_result) => {
             throw new Error("Not implemented");
           },
@@ -220,9 +219,8 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           abort: () => {
             abortController?.abort();
           },
-          [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter,
-          // TODO: refactor this to use our PubSub actually
-          [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: void 0,
+          [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(emitter),
+          [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
           // TODO
           engine: {},
           abortSignal: abortController?.signal,
@@ -232,7 +230,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
         },
         {
           paramName: "runCount",
-          deprecationMessage: chunk52RSUALV_cjs.runCountDeprecationMessage,
+          deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
           logger: this.logger
         }
       )
@@ -240,7 +238,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
   }
   async resolveSleep(params) {
     const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
-    const abortController = new AbortController();
+    const abortController = params.abortController ?? new AbortController();
     const ee = new EventEmitter__default.default();
     if (step.duration) {
       return step.duration;
@@ -250,7 +248,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     try {
       return await step.fn(
-        chunk52RSUALV_cjs.createDeprecationProxy(
+        chunkJAGQZZ43_cjs.createDeprecationProxy(
           {
             workflowId: params.workflowId,
             runId,
@@ -264,7 +262,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             retryCount,
             resumeData: params.resumeData,
             getInitData: () => stepResults?.input,
-            getStepResult: chunk52RSUALV_cjs.getStepResult.bind(this, stepResults),
+            getStepResult: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
             suspend: async (_suspendPayload) => {
               throw new Error("Not implemented");
             },
@@ -276,9 +274,8 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             },
             // TODO
             writer: void 0,
-            [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: ee,
-            // TODO: refactor this to use our PubSub actually
-            [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: void 0,
+            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(ee),
+            [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
             // TODO
             engine: {},
             abortSignal: abortController?.signal,
@@ -287,7 +284,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           },
           {
             paramName: "runCount",
-            deprecationMessage: chunk52RSUALV_cjs.runCountDeprecationMessage,
+            deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
             logger: this.logger
           }
         )
@@ -299,7 +296,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
   }
   async resolveSleepUntil(params) {
     const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
-    const abortController = new AbortController();
+    const abortController = params.abortController ?? new AbortController();
     const ee = new EventEmitter__default.default();
     if (step.date) {
       return step.date.getTime() - Date.now();
@@ -309,7 +306,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     try {
       const result = await step.fn(
-        chunk52RSUALV_cjs.createDeprecationProxy(
+        chunkJAGQZZ43_cjs.createDeprecationProxy(
           {
             workflowId: params.workflowId,
             runId,
@@ -323,7 +320,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             retryCount,
             resumeData: params.resumeData,
             getInitData: () => stepResults?.input,
-            getStepResult: chunk52RSUALV_cjs.getStepResult.bind(this, stepResults),
+            getStepResult: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
             suspend: async (_suspendPayload) => {
               throw new Error("Not implemented");
             },
@@ -335,9 +332,8 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             },
             // TODO
             writer: void 0,
-            [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: ee,
-            // TODO: refactor this to use our PubSub actually
-            [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: void 0,
+            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(ee),
+            [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
             // TODO
             engine: {},
             abortSignal: abortController?.signal,
@@ -346,7 +342,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           },
           {
             paramName: "runCount",
-            deprecationMessage: chunk52RSUALV_cjs.runCountDeprecationMessage,
+            deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
             logger: this.logger
           }
         )
@@ -932,10 +928,52 @@ async function processWorkflowSleepUntil({
 // src/workflows/evented/workflow-event-processor/index.ts
 var WorkflowEventProcessor = class extends EventProcessor {
   stepExecutor;
+  // Map of runId -> AbortController for active workflow runs
+  abortControllers = /* @__PURE__ */ new Map();
+  // Map of child runId -> parent runId for tracking nested workflows
+  parentChildRelationships = /* @__PURE__ */ new Map();
   constructor({ mastra }) {
     super({ mastra });
     this.stepExecutor = new StepExecutor({ mastra });
   }
+  /**
+   * Get or create an AbortController for a workflow run
+   */
+  getOrCreateAbortController(runId) {
+    let controller = this.abortControllers.get(runId);
+    if (!controller) {
+      controller = new AbortController();
+      this.abortControllers.set(runId, controller);
+    }
+    return controller;
+  }
+  /**
+   * Cancel a workflow run and all its nested child workflows
+   */
+  cancelRunAndChildren(runId) {
+    const controller = this.abortControllers.get(runId);
+    if (controller) {
+      controller.abort();
+    }
+    for (const [childRunId, parentRunId] of this.parentChildRelationships.entries()) {
+      if (parentRunId === runId) {
+        this.cancelRunAndChildren(childRunId);
+      }
+    }
+  }
+  /**
+   * Clean up abort controller and relationships when a workflow completes.
+   * Also cleans up any orphaned child entries that reference this run as parent.
+   */
+  cleanupRun(runId) {
+    this.abortControllers.delete(runId);
+    this.parentChildRelationships.delete(runId);
+    for (const [childRunId, parentRunId] of this.parentChildRelationships.entries()) {
+      if (parentRunId === runId) {
+        this.parentChildRelationships.delete(childRunId);
+      }
+    }
+  }
   __registerMastra(mastra) {
     super.__registerMastra(mastra);
     this.stepExecutor.__registerMastra(mastra);
@@ -958,7 +996,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
         executionPath: [],
         resumeSteps,
         stepResults,
-        prevResult: { status: "failed", error: e.stack ?? e.message },
+        prevResult: { status: "failed", error: chunkHWMMIRIF_cjs.getErrorFromUnknown(e).toJSON() },
         requestContext,
         resumeData,
         activeSteps: {},
@@ -967,26 +1005,28 @@ var WorkflowEventProcessor = class extends EventProcessor {
     });
   }
   async processWorkflowCancel({ workflowId, runId }) {
-    const currentState = await this.mastra.getStorage()?.updateWorkflowState({
+    this.cancelRunAndChildren(runId);
+    const storage = this.mastra.getStorage();
+    const currentState = await storage?.loadWorkflowSnapshot({
       workflowName: workflowId,
-      runId,
-      opts: {
-        status: "canceled"
-      }
-    });
-    await this.endWorkflow({
-      workflow: void 0,
-      workflowId,
-      runId,
-      stepResults: currentState?.context,
-      prevResult: { status: "canceled" },
-      requestContext: currentState?.requestContext,
-      executionPath: [],
-      activeSteps: {},
-      resumeSteps: [],
-      resumeData: void 0,
-      parentWorkflow: void 0
+      runId
     });
+    await this.endWorkflow(
+      {
+        workflow: void 0,
+        workflowId,
+        runId,
+        stepResults: currentState?.context ?? {},
+        prevResult: { status: "canceled" },
+        requestContext: currentState?.requestContext ?? {},
+        executionPath: [],
+        activeSteps: {},
+        resumeSteps: [],
+        resumeData: void 0,
+        parentWorkflow: void 0
+      },
+      "canceled"
+    );
   }
   async processWorkflowStart({
     workflow,
@@ -1001,9 +1041,16 @@ var WorkflowEventProcessor = class extends EventProcessor {
     stepResults,
     requestContext
   }) {
+    this.getOrCreateAbortController(runId);
+    if (parentWorkflow?.runId) {
+      this.parentChildRelationships.set(runId, parentWorkflow.runId);
+    }
+    const existingRun = await this.mastra.getStorage()?.getWorkflowRunById({ runId, workflowName: workflow.id });
+    const resourceId = existingRun?.resourceId;
     await this.mastra.getStorage()?.persistWorkflowSnapshot({
       workflowName: workflow.id,
       runId,
+      resourceId,
       snapshot: {
         activePaths: [],
         suspendedPaths: {},
@@ -1040,13 +1087,13 @@ var WorkflowEventProcessor = class extends EventProcessor {
       }
     });
   }
-  async endWorkflow(args) {
+  async endWorkflow(args, status = "success") {
     const { workflowId, runId, prevResult } = args;
     await this.mastra.getStorage()?.updateWorkflowState({
       workflowName: workflowId,
       runId,
       opts: {
-        status: "success",
+        status,
         result: prevResult
       }
     });
@@ -1068,6 +1115,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
   }
   async processWorkflowEnd(args) {
     const { resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, requestContext, runId, timeTravel } = args;
+    this.cleanupRun(runId);
     if (parentWorkflow) {
       await this.mastra.pubsub.publish("workflows", {
         type: "workflow.step.end",
@@ -1143,6 +1191,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       requestContext,
       timeTravel
     } = args;
+    this.cleanupRun(runId);
     await this.mastra.getStorage()?.updateWorkflowState({
       workflowName: workflowId,
       runId,
@@ -1207,7 +1256,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow,
           requestContext
         },
-        new chunkTWH4PTDG_cjs.MastraError({
+        new chunkHWMMIRIF_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Execution path is empty: ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1230,7 +1279,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow,
           requestContext
         },
-        new chunkTWH4PTDG_cjs.MastraError({
+        new chunkHWMMIRIF_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Step not found in step graph: ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1359,7 +1408,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow,
           requestContext
         },
-        new chunkTWH4PTDG_cjs.MastraError({
+        new chunkHWMMIRIF_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Step is not executable: ${step?.type} -- ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1386,7 +1435,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
               parentWorkflow,
               requestContext
             },
-            new chunkTWH4PTDG_cjs.MastraError({
+            new chunkHWMMIRIF_cjs.MastraError({
               id: "MASTRA_WORKFLOW",
               text: `Nested workflow run id not found: ${JSON.stringify(stepResults)}`,
               domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1430,7 +1479,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           workflowName: step.step.id,
           runId
         }) ?? { context: {} };
-        const timeTravelParams = chunk52RSUALV_cjs.createTimeTravelExecutionParams({
+        const timeTravelParams = chunkJAGQZZ43_cjs.createTimeTravelExecutionParams({
           steps: timeTravel.steps.slice(1),
           inputData: timeTravel.inputData,
           resumeData: timeTravel.resumeData,
@@ -1521,7 +1570,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     for (const [key, value] of Object.entries(requestContext)) {
       rc.set(key, value);
     }
-    const { resumeData: timeTravelResumeData, validationError: timeTravelResumeValidationError } = await chunk52RSUALV_cjs.validateStepResumeData({
+    const { resumeData: timeTravelResumeData, validationError: timeTravelResumeValidationError } = await chunkJAGQZZ43_cjs.validateStepResumeData({
       resumeData: timeTravel?.stepResults[step.step.id]?.status === "suspended" ? timeTravel?.resumeData : void 0,
       step: step.step
     });
@@ -1536,6 +1585,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     } else if (resumeSteps?.length > 0 && resumeSteps?.[0] === step.step.id) {
       resumeDataToUse = resumeData;
     }
+    const abortController = this.getOrCreateAbortController(runId);
     const stepResult = await this.stepExecutor.execute({
       workflowId,
       step: step.step,
@@ -1549,7 +1599,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
       resumeData: resumeDataToUse,
       retryCount,
       foreachIdx: step.type === "foreach" ? executionPath[1] : void 0,
-      validateInputs: workflow.options.validateInputs
+      validateInputs: workflow.options.validateInputs,
+      abortController
     });
     requestContext = Object.fromEntries(rc.entries());
     if (stepResult.status === "bailed") {
@@ -1681,7 +1732,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           activeSteps,
           requestContext
         },
-        new chunkTWH4PTDG_cjs.MastraError({
+        new chunkHWMMIRIF_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Step not found: ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1929,7 +1980,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       workflowId: workflowData.workflowId,
       runId: workflowData.runId
     });
-    if (currentState?.status === "canceled" && type !== "workflow.end") {
+    if (currentState?.status === "canceled" && type !== "workflow.end" && type !== "workflow.cancel") {
       return;
     }
     if (type.startsWith("workflow.user-event.")) {
@@ -1957,7 +2008,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     if (!workflow) {
       return this.errorWorkflow(
         workflowData,
-        new chunkTWH4PTDG_cjs.MastraError({
+        new chunkHWMMIRIF_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Workflow not found: ${workflowData.workflowId}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -2038,7 +2089,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
 
 // src/workflows/evented/workflow.ts
 function cloneWorkflow(workflow, opts) {
-  const wf = new chunk52RSUALV_cjs.Workflow({
+  const wf = new chunkJAGQZZ43_cjs.Workflow({
     id: opts.id,
     inputSchema: workflow.inputSchema,
     outputSchema: workflow.outputSchema,
@@ -2069,7 +2120,7 @@ function isAgent(params) {
   return params?.component === "AGENT";
 }
 function isTool(params) {
-  return params instanceof chunkMGCGWPQJ_cjs.Tool;
+  return params instanceof chunkZ55SJVEC_cjs.Tool;
 }
 function createStep(params) {
   if (isAgent(params)) {
@@ -2086,7 +2137,7 @@ function createStep(params) {
       outputSchema: z__default.default.object({
         text: z__default.default.string()
       }),
-      execute: async ({ inputData, [chunkABJOUEVA_cjs.EMITTER_SYMBOL]: emitter, requestContext, abortSignal, abort }) => {
+      execute: async ({ inputData, runId, [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: pubsub, requestContext, abortSignal, abort }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -2108,22 +2159,24 @@ function createStep(params) {
           name: params.name,
           args: inputData
         };
-        await emitter.emit("watch", {
-          type: "tool-call-streaming-start",
-          ...toolData ?? {}
+        await pubsub.publish(`workflow.events.v2.${runId}`, {
+          type: "watch",
+          runId,
+          data: { type: "tool-call-streaming-start", ...toolData ?? {} }
         });
         for await (const chunk of fullStream) {
           if (chunk.type === "text-delta") {
-            await emitter.emit("watch", {
-              type: "tool-call-delta",
-              ...toolData ?? {},
-              argsTextDelta: chunk.textDelta
+            await pubsub.publish(`workflow.events.v2.${runId}`, {
+              type: "watch",
+              runId,
+              data: { type: "tool-call-delta", ...toolData ?? {}, argsTextDelta: chunk.textDelta }
             });
           }
         }
-        await emitter.emit("watch", {
-          type: "tool-call-streaming-finish",
-          ...toolData ?? {}
+        await pubsub.publish(`workflow.events.v2.${runId}`, {
+          type: "watch",
+          runId,
+          data: { type: "tool-call-streaming-finish", ...toolData ?? {} }
         });
         return {
           text: await streamPromise.promise
@@ -2194,7 +2247,9 @@ function createWorkflow(params) {
     options: {
       validateInputs: params.options?.validateInputs ?? true,
       shouldPersistSnapshot: params.options?.shouldPersistSnapshot ?? (() => true),
-      tracingPolicy: params.options?.tracingPolicy
+      tracingPolicy: params.options?.tracingPolicy,
+      onFinish: params.options?.onFinish,
+      onError: params.options?.onError
     }
   });
   return new EventedWorkflow({
@@ -2202,7 +2257,7 @@ function createWorkflow(params) {
     executionEngine
   });
 }
-var EventedWorkflow = class extends chunk52RSUALV_cjs.Workflow {
+var EventedWorkflow = class extends chunkJAGQZZ43_cjs.Workflow {
   constructor(params) {
     super(params);
     this.engineType = "evented";
@@ -2216,6 +2271,7 @@ var EventedWorkflow = class extends chunk52RSUALV_cjs.Workflow {
     const run = this.runs.get(runIdToUse) ?? new EventedRun({
       workflowId: this.id,
       runId: runIdToUse,
+      resourceId: options?.resourceId,
       executionEngine: this.executionEngine,
       executionGraph: this.executionGraph,
       serializedStepGraph: this.serializedStepGraph,
@@ -2231,11 +2287,14 @@ var EventedWorkflow = class extends chunk52RSUALV_cjs.Workflow {
       workflowStatus: run.workflowRunStatus,
       stepResults: {}
     });
-    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, false);
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, {
+      withNestedWorkflows: false
+    });
     if (!workflowSnapshotInStorage && shouldPersistSnapshot) {
       await this.mastra?.getStorage()?.persistWorkflowSnapshot({
         workflowName: this.id,
         runId: runIdToUse,
+        resourceId: options?.resourceId,
         snapshot: {
           runId: runIdToUse,
           status: "pending",
@@ -2257,11 +2316,30 @@ var EventedWorkflow = class extends chunk52RSUALV_cjs.Workflow {
     return run;
   }
 };
-var EventedRun = class extends chunk52RSUALV_cjs.Run {
+var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
   constructor(params) {
     super(params);
     this.serializedStepGraph = params.serializedStepGraph;
   }
+  /**
+   * Set up abort signal handler to publish workflow.cancel event when abortController.abort() is called.
+   * This ensures consistent cancellation behavior whether abort() is called directly or via cancel().
+   */
+  setupAbortHandler() {
+    const abortHandler = () => {
+      this.mastra?.pubsub.publish("workflows", {
+        type: "workflow.cancel",
+        runId: this.runId,
+        data: {
+          workflowId: this.workflowId,
+          runId: this.runId
+        }
+      }).catch((err) => {
+        console.error(`Failed to publish workflow.cancel for runId ${this.runId}:`, err);
+      });
+    };
+    this.abortController.signal.addEventListener("abort", abortHandler, { once: true });
+  }
   async start({
     inputData,
     initialState,
@@ -2279,6 +2357,7 @@ var EventedRun = class extends chunk52RSUALV_cjs.Run {
     await this.mastra?.getStorage()?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
+      resourceId: this.resourceId,
       snapshot: {
         runId: this.runId,
         serializedStepGraph: this.serializedStepGraph,
@@ -2296,6 +2375,10 @@ var EventedRun = class extends chunk52RSUALV_cjs.Run {
     });
     const inputDataToUse = await this._validateInput(inputData);
     const initialStateToUse = await this._validateInitialState(initialState ?? {});
+    if (!this.mastra?.pubsub) {
+      throw new Error("Mastra instance with pubsub is required for workflow execution");
+    }
+    this.setupAbortHandler();
     const result = await this.executionEngine.execute({
       workflowId: this.workflowId,
       runId: this.runId,
@@ -2303,20 +2386,7 @@ var EventedRun = class extends chunk52RSUALV_cjs.Run {
       serializedStepGraph: this.serializedStepGraph,
       input: inputDataToUse,
       initialState: initialStateToUse,
-      emitter: {
-        emit: async (event, data) => {
-          this.emitter.emit(event, data);
-        },
-        on: (event, callback) => {
-          this.emitter.on(event, callback);
-        },
-        off: (event, callback) => {
-          this.emitter.off(event, callback);
-        },
-        once: (event, callback) => {
-          this.emitter.once(event, callback);
-        }
-      },
+      pubsub: this.mastra.pubsub,
       retryConfig: this.retryConfig,
       requestContext,
       abortController: this.abortController
@@ -2326,6 +2396,62 @@ var EventedRun = class extends chunk52RSUALV_cjs.Run {
     }
     return result;
   }
+  /**
+   * Starts the workflow execution without waiting for completion (fire-and-forget).
+   * Returns immediately with the runId. The workflow executes in the background via pubsub.
+   * Use this when you don't need to wait for the result or want to avoid polling failures.
+   */
+  async startAsync({
+    inputData,
+    initialState,
+    requestContext
+  }) {
+    if (this.serializedStepGraph.length === 0) {
+      throw new Error(
+        "Execution flow of workflow is not defined. Add steps to the workflow via .then(), .branch(), etc."
+      );
+    }
+    if (!this.executionGraph.steps) {
+      throw new Error("Uncommitted step flow changes detected. Call .commit() to register the steps.");
+    }
+    requestContext = requestContext ?? new chunkUVHSM2GU_cjs.RequestContext();
+    await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+      workflowName: this.workflowId,
+      runId: this.runId,
+      resourceId: this.resourceId,
+      snapshot: {
+        runId: this.runId,
+        serializedStepGraph: this.serializedStepGraph,
+        status: "running",
+        value: {},
+        context: {},
+        requestContext: Object.fromEntries(requestContext.entries()),
+        activePaths: [],
+        activeStepsPath: {},
+        suspendedPaths: {},
+        resumeLabels: {},
+        waitingPaths: {},
+        timestamp: Date.now()
+      }
+    });
+    const inputDataToUse = await this._validateInput(inputData);
+    const initialStateToUse = await this._validateInitialState(initialState ?? {});
+    if (!this.mastra?.pubsub) {
+      throw new Error("Mastra instance with pubsub is required for workflow execution");
+    }
+    await this.mastra.pubsub.publish("workflows", {
+      type: "workflow.start",
+      runId: this.runId,
+      data: {
+        workflowId: this.workflowId,
+        runId: this.runId,
+        prevResult: { status: "success", output: inputDataToUse },
+        requestContext: Object.fromEntries(requestContext.entries()),
+        initialState: initialStateToUse
+      }
+    });
+    return { runId: this.runId };
+  }
   // TODO: stream
   async resume(params) {
     let steps = [];
@@ -2365,6 +2491,10 @@ var EventedRun = class extends chunk52RSUALV_cjs.Run {
     }
     const suspendedStep = this.workflowSteps[steps?.[0] ?? ""];
     const resumeDataToUse = await this._validateResumeData(params.resumeData, suspendedStep);
+    if (!this.mastra?.pubsub) {
+      throw new Error("Mastra instance with pubsub is required for workflow execution");
+    }
+    this.setupAbortHandler();
     const executionResultPromise = this.executionEngine.execute({
       workflowId: this.workflowId,
       runId: this.runId,
@@ -2377,21 +2507,7 @@ var EventedRun = class extends chunk52RSUALV_cjs.Run {
         resumePayload: resumeDataToUse,
         resumePath
       },
-      emitter: {
-        emit: (event, data) => {
-          this.emitter.emit(event, data);
-          return Promise.resolve();
-        },
-        on: (event, callback) => {
-          this.emitter.on(event, callback);
-        },
-        off: (event, callback) => {
-          this.emitter.off(event, callback);
-        },
-        once: (event, callback) => {
-          this.emitter.once(event, callback);
-        }
-      },
+      pubsub: this.mastra.pubsub,
       requestContext,
       abortController: this.abortController
     }).then((result) => {
@@ -2435,14 +2551,14 @@ var EventedRun = class extends chunk52RSUALV_cjs.Run {
     };
   }
   async cancel() {
-    await this.mastra?.pubsub.publish("workflows", {
-      type: "workflow.cancel",
+    await this.mastra?.getStorage()?.updateWorkflowState({
+      workflowName: this.workflowId,
       runId: this.runId,
-      data: {
-        workflowId: this.workflowId,
-        runId: this.runId
+      opts: {
+        status: "canceled"
       }
     });
+    this.abortController.abort();
   }
 };
 
@@ -2490,7 +2606,7 @@ function isExecutableStep(step) {
 }
 
 // src/workflows/evented/execution-engine.ts
-var EventedExecutionEngine = class extends chunk52RSUALV_cjs.ExecutionEngine {
+var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.ExecutionEngine {
   eventProcessor;
   constructor({
     mastra,
@@ -2563,7 +2679,7 @@ var EventedExecutionEngine = class extends chunk52RSUALV_cjs.ExecutionEngine {
         }
       });
     }
-    const resultData = await new Promise((resolve) => {
+    const resultData = await new Promise((resolve, reject) => {
       const finishCb = async (event, ack) => {
         if (event.runId !== params.runId) {
           await ack?.();
@@ -2572,38 +2688,55 @@ var EventedExecutionEngine = class extends chunk52RSUALV_cjs.ExecutionEngine {
         if (["workflow.end", "workflow.fail", "workflow.suspend"].includes(event.type)) {
           await ack?.();
           await pubsub.unsubscribe("workflows-finish", finishCb);
+          if (event.type === "workflow.fail" && event.data.stepResults) {
+            event.data.stepResults = chunkJAGQZZ43_cjs.hydrateSerializedStepErrors(event.data.stepResults);
+          }
           resolve(event.data);
           return;
         }
         await ack?.();
       };
-      pubsub.subscribe("workflows-finish", finishCb).catch(() => {
+      pubsub.subscribe("workflows-finish", finishCb).catch((err) => {
+        console.error("Failed to subscribe to workflows-finish:", err);
+        reject(err);
       });
     });
+    let callbackArg;
     if (resultData.prevResult.status === "failed") {
-      return {
+      callbackArg = {
         status: "failed",
         error: resultData.prevResult.error,
         steps: resultData.stepResults
       };
     } else if (resultData.prevResult.status === "suspended") {
+      callbackArg = {
+        status: "suspended",
+        steps: resultData.stepResults
+      };
+    } else {
+      callbackArg = {
+        status: resultData.prevResult.status,
+        result: resultData.prevResult?.output,
+        steps: resultData.stepResults
+      };
+    }
+    await this.invokeLifecycleCallbacks(callbackArg);
+    let result;
+    if (resultData.prevResult.status === "suspended") {
       const suspendedSteps = Object.entries(resultData.stepResults).map(([_stepId, stepResult]) => {
         if (stepResult.status === "suspended") {
           return stepResult.suspendPayload?.__workflow_meta?.path ?? [];
         }
         return null;
       }).filter(Boolean);
-      return {
-        status: "suspended",
-        steps: resultData.stepResults,
+      result = {
+        ...callbackArg,
         suspended: suspendedSteps
       };
+    } else {
+      result = callbackArg;
     }
-    return {
-      status: resultData.prevResult.status,
-      result: resultData.prevResult?.output,
-      steps: resultData.stepResults
-    };
+    return result;
   }
 };
 
@@ -2616,5 +2749,5 @@ exports.cloneStep = cloneStep;
 exports.cloneWorkflow = cloneWorkflow;
 exports.createStep = createStep;
 exports.createWorkflow = createWorkflow;
-//# sourceMappingURL=chunk-YC6PJEPH.cjs.map
-//# sourceMappingURL=chunk-YC6PJEPH.cjs.map
+//# sourceMappingURL=chunk-6CG7IY57.cjs.map
+//# sourceMappingURL=chunk-6CG7IY57.cjs.map