@mastra/core 1.0.0-beta.13 → 1.0.0-beta.15

package/dist/{chunk-BQDZIQ3G.js → chunk-D2IFWD7A.js}

@@ -1,8 +1,8 @@
-import { validateStepInput, createDeprecationProxy, EventEmitterPubSub, getStepResult, validateStepSuspendData, runCountDeprecationMessage, createTimeTravelExecutionParams, validateStepResumeData, Workflow, Run, ExecutionEngine, hydrateSerializedStepErrors } from './chunk-E5BQRAJK.js';
+import { validateStepInput, createDeprecationProxy, EventEmitterPubSub, getStepResult, validateStepSuspendData, runCountDeprecationMessage, createTimeTravelExecutionParams, validateStepResumeData, Workflow, Run, ExecutionEngine, hydrateSerializedStepErrors } from './chunk-NGWTSHNA.js';
 import { STREAM_FORMAT_SYMBOL, PUBSUB_SYMBOL } from './chunk-6PMMP3FR.js';
-import { Tool } from './chunk-373OC54J.js';
+import { getErrorFromUnknown, MastraError } from './chunk-FJEVLHJT.js';
+import { Tool } from './chunk-4HP7CS6L.js';
 import { RequestContext } from './chunk-6TBWJV35.js';
-import { getErrorFromUnknown, MastraError } from './chunk-YPLZDWG7.js';
 import { MastraBase } from './chunk-LSHPJWM5.js';
 import { RegisteredLogger } from './chunk-NRUZYMHE.js';
 import EventEmitter from 'events';
@@ -19,8 +19,8 @@ var StepExecutor = class extends MastraBase {
     this.mastra = mastra;
   }
   async execute(params) {
-    const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
-    const abortController = new AbortController();
+    const { step, stepResults, runId, requestContext, retryCount = 0, perStep } = params;
+    const abortController = params.abortController ?? new AbortController();
     let suspended;
     let bailed;
     const startedAt = Date.now();
@@ -48,7 +48,7 @@ var StepExecutor = class extends MastraBase {
       if (validationError) {
         throw validationError;
       }
-      const stepResult = await step.execute(
+      const stepOutput = await step.execute(
         createDeprecationProxy(
           {
             workflowId: params.workflowId,
@@ -99,6 +99,8 @@ var StepExecutor = class extends MastraBase {
           }
         )
       );
+      const isNestedWorkflowStep = step.component === "WORKFLOW";
+      const nestedWflowStepPaused = isNestedWorkflowStep && perStep;
       const endedAt = Date.now();
       let finalResult;
       if (suspended) {
@@ -106,7 +108,7 @@ var StepExecutor = class extends MastraBase {
           ...stepInfo,
           status: "suspended",
           suspendedAt: endedAt,
-          ...stepResult ? { suspendOutput: stepResult } : {}
+          ...stepOutput ? { suspendOutput: stepOutput } : {}
         };
         if (suspended.payload) {
           finalResult.suspendPayload = suspended.payload;
@@ -119,12 +121,17 @@ var StepExecutor = class extends MastraBase {
           endedAt,
           output: bailed.payload
         };
+      } else if (nestedWflowStepPaused) {
+        finalResult = {
+          ...stepInfo,
+          status: "paused"
+        };
       } else {
         finalResult = {
           ...stepInfo,
           status: "success",
           endedAt,
-          output: stepResult
+          output: stepOutput
         };
       }
       return finalResult;
@@ -144,7 +151,7 @@ var StepExecutor = class extends MastraBase {
   }
   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();
     const results = await Promise.all(
       step.conditions.map((condition) => {
@@ -231,7 +238,7 @@ var StepExecutor = class extends 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();
     if (step.duration) {
       return step.duration;
@@ -289,7 +296,7 @@ var StepExecutor = class extends 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();
     if (step.date) {
       return step.date.getTime() - Date.now();
@@ -369,7 +376,8 @@ async function processWorkflowLoop({
   resumeData,
   parentWorkflow,
   requestContext,
-  retryCount = 0
+  retryCount = 0,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -409,7 +417,8 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     } else {
@@ -427,7 +436,8 @@ async function processWorkflowLoop({
           resumeData,
           activeSteps,
           requestContext,
-          retryCount
+          retryCount,
+          perStep
         }
       });
     }
@@ -447,7 +457,8 @@ async function processWorkflowLoop({
           resumeData,
           activeSteps,
           requestContext,
-          retryCount
+          retryCount,
+          perStep
         }
       });
     } else {
@@ -464,7 +475,8 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     }
@@ -481,7 +493,8 @@ async function processWorkflowForEach({
   timeTravel,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   mastra,
@@ -505,22 +518,24 @@ async function processWorkflowForEach({
         prevResult: currentResult,
         resumeData,
         activeSteps,
-        requestContext
+        requestContext,
+        perStep
       }
     });
     return;
   } else if (idx >= targetLen) {
     return;
   }
+  const workflowsStore = await mastra.getStorage()?.getStore("workflows");
   if (executionPath.length === 1 && idx === 0) {
     const concurrency = Math.min(step.opts.concurrency ?? 1, targetLen);
     const dummyResult = Array.from({ length: concurrency }, () => null);
-    await mastra.getStorage()?.updateWorkflowResults({
+    await workflowsStore?.updateWorkflowResults({
       workflowName: workflowId,
       runId,
       stepId: step.step.id,
       result: {
-        status: "succcess",
+        status: "success",
         output: dummyResult,
         startedAt: Date.now(),
         payload: prevResult?.output
@@ -542,19 +557,20 @@ async function processWorkflowForEach({
           prevResult,
           resumeData,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     }
     return;
   }
   currentResult.output.push(null);
-  await mastra.getStorage()?.updateWorkflowResults({
+  await workflowsStore?.updateWorkflowResults({
     workflowName: workflowId,
     runId,
     stepId: step.step.id,
     result: {
-      status: "succcess",
+      status: "success",
       output: currentResult.output,
       startedAt: Date.now(),
       payload: prevResult?.output
@@ -575,7 +591,8 @@ async function processWorkflowForEach({
       prevResult,
       resumeData,
       activeSteps,
-      requestContext
+      requestContext,
+      perStep
     }
   });
 }
@@ -590,7 +607,8 @@ async function processWorkflowParallel({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   step
@@ -599,10 +617,13 @@ async function processWorkflowParallel({
     const nestedStep = step.steps[i];
     if (nestedStep?.type === "step") {
       activeSteps[nestedStep.step.id] = true;
+      if (perStep) {
+        break;
+      }
     }
   }
   await Promise.all(
-    step.steps.map(async (_step, idx) => {
+    step.steps?.filter((step2) => activeSteps[step2.step.id]).map(async (_step, idx) => {
       return pubsub.publish("workflows", {
         type: "workflow.step.run",
         runId,
@@ -617,7 +638,8 @@ async function processWorkflowParallel({
           timeTravel,
           parentWorkflow,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     })
@@ -634,7 +656,8 @@ async function processWorkflowConditional({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -658,49 +681,79 @@ async function processWorkflowConditional({
   for (let i = 0; i < idxs.length; i++) {
     truthyIdxs[idxs[i]] = true;
   }
-  await Promise.all(
-    step.steps.map(async (step2, idx) => {
-      if (truthyIdxs[idx]) {
-        if (step2?.type === "step") {
-          activeSteps[step2.step.id] = true;
-        }
-        return pubsub.publish("workflows", {
-          type: "workflow.step.run",
-          runId,
-          data: {
-            workflowId,
-            runId,
-            executionPath: executionPath.concat([idx]),
-            resumeSteps,
-            stepResults,
-            timeTravel,
-            prevResult,
-            resumeData,
-            parentWorkflow,
-            activeSteps,
-            requestContext
+  let onlyStepToRun;
+  if (perStep) {
+    const stepsToRun = step.steps.filter((_, idx) => truthyIdxs[idx]);
+    onlyStepToRun = stepsToRun[0];
+  }
+  if (onlyStepToRun) {
+    activeSteps[onlyStepToRun.step.id] = true;
+    const stepIndex = step.steps.findIndex((step2) => step2.step.id === onlyStepToRun.step.id);
+    await pubsub.publish("workflows", {
+      type: "workflow.step.run",
+      runId,
+      data: {
+        workflowId,
+        runId,
+        executionPath: executionPath.concat([stepIndex]),
+        resumeSteps,
+        stepResults,
+        timeTravel,
+        prevResult,
+        resumeData,
+        parentWorkflow,
+        activeSteps,
+        requestContext,
+        perStep
+      }
+    });
+  } else {
+    await Promise.all(
+      step.steps.map(async (step2, idx) => {
+        if (truthyIdxs[idx]) {
+          if (step2?.type === "step") {
+            activeSteps[step2.step.id] = true;
           }
-        });
-      } else {
-        return pubsub.publish("workflows", {
-          type: "workflow.step.end",
-          runId,
-          data: {
-            workflowId,
+          return pubsub.publish("workflows", {
+            type: "workflow.step.run",
             runId,
-            executionPath: executionPath.concat([idx]),
-            resumeSteps,
-            stepResults,
-            prevResult: { status: "skipped" },
-            resumeData,
-            parentWorkflow,
-            activeSteps,
-            requestContext
-          }
-        });
-      }
-    })
-  );
+            data: {
+              workflowId,
+              runId,
+              executionPath: executionPath.concat([idx]),
+              resumeSteps,
+              stepResults,
+              timeTravel,
+              prevResult,
+              resumeData,
+              parentWorkflow,
+              activeSteps,
+              requestContext,
+              perStep
+            }
+          });
+        } else {
+          return pubsub.publish("workflows", {
+            type: "workflow.step.end",
+            runId,
+            data: {
+              workflowId,
+              runId,
+              executionPath: executionPath.concat([idx]),
+              resumeSteps,
+              stepResults,
+              prevResult: { status: "skipped" },
+              resumeData,
+              parentWorkflow,
+              activeSteps,
+              requestContext,
+              perStep
+            }
+          });
+        }
+      })
+    );
+  }
 }
 async function processWorkflowWaitForEvent(workflowData, {
   pubsub,
@@ -729,7 +782,8 @@ async function processWorkflowWaitForEvent(workflowData, {
       stepResults: currentState?.context,
       prevResult,
       activeSteps: [],
-      requestContext: currentState?.requestContext
+      requestContext: currentState?.requestContext,
+      perStep: workflowData.perStep
     }
   });
 }
@@ -744,7 +798,8 @@ async function processWorkflowSleep({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -818,7 +873,8 @@ async function processWorkflowSleep({
           resumeData,
           parentWorkflow,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     },
@@ -836,7 +892,8 @@ async function processWorkflowSleepUntil({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -910,7 +967,8 @@ async function processWorkflowSleepUntil({
           resumeData,
           parentWorkflow,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     },
@@ -921,10 +979,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);
@@ -956,11 +1056,15 @@ var WorkflowEventProcessor = class extends EventProcessor {
     });
   }
   async processWorkflowCancel({ workflowId, runId }) {
-    const storage = this.mastra.getStorage();
-    const currentState = await storage?.loadWorkflowSnapshot({
+    this.cancelRunAndChildren(runId);
+    const workflowsStore = await this.mastra.getStorage()?.getStore("workflows");
+    const currentState = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: workflowId,
       runId
     });
+    if (!currentState) {
+      this.mastra.getLogger()?.warn("Canceling workflow without loaded state", { workflowId, runId });
+    }
     await this.endWorkflow(
       {
         workflow: void 0,
@@ -989,11 +1093,17 @@ var WorkflowEventProcessor = class extends EventProcessor {
     timeTravel,
     executionPath,
     stepResults,
-    requestContext
+    requestContext,
+    perStep
   }) {
-    const existingRun = await this.mastra.getStorage()?.getWorkflowRunById({ runId, workflowName: workflow.id });
+    this.getOrCreateAbortController(runId);
+    if (parentWorkflow?.runId) {
+      this.parentChildRelationships.set(runId, parentWorkflow.runId);
+    }
+    const workflowsStore = await this.mastra.getStorage()?.getStore("workflows");
+    const existingRun = await workflowsStore?.getWorkflowRunById({ runId, workflowName: workflow.id });
     const resourceId = existingRun?.resourceId;
-    await this.mastra.getStorage()?.persistWorkflowSnapshot({
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: workflow.id,
       runId,
       resourceId,
@@ -1029,20 +1139,32 @@ var WorkflowEventProcessor = class extends EventProcessor {
         timeTravel,
         requestContext,
         resumeData,
-        activeSteps: {}
+        activeSteps: {},
+        perStep
       }
     });
   }
   async endWorkflow(args, status = "success") {
-    const { workflowId, runId, prevResult } = args;
-    await this.mastra.getStorage()?.updateWorkflowState({
+    const { workflowId, runId, prevResult, perStep } = args;
+    const workflowsStore = await this.mastra.getStorage()?.getStore("workflows");
+    await workflowsStore?.updateWorkflowState({
       workflowName: workflowId,
       runId,
       opts: {
-        status,
+        status: perStep && status === "success" ? "paused" : status,
         result: prevResult
       }
     });
+    if (perStep) {
+      await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
+        type: "watch",
+        runId,
+        data: {
+          type: "workflow-paused",
+          payload: {}
+        }
+      });
+    }
     await this.mastra.pubsub.publish(`workflow.events.v2.${runId}`, {
       type: "watch",
       runId,
@@ -1060,7 +1182,18 @@ var WorkflowEventProcessor = class extends EventProcessor {
     });
   }
   async processWorkflowEnd(args) {
-    const { resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, requestContext, runId, timeTravel } = args;
+    const {
+      resumeSteps,
+      prevResult,
+      resumeData,
+      parentWorkflow,
+      activeSteps,
+      requestContext,
+      runId,
+      timeTravel,
+      perStep
+    } = args;
+    this.cleanupRun(runId);
     if (parentWorkflow) {
       await this.mastra.pubsub.publish("workflows", {
         type: "workflow.step.end",
@@ -1077,7 +1210,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow: parentWorkflow.parentWorkflow,
           parentContext: parentWorkflow,
           requestContext,
-          timeTravel
+          timeTravel,
+          perStep
         }
       });
     }
@@ -1136,7 +1270,9 @@ var WorkflowEventProcessor = class extends EventProcessor {
       requestContext,
       timeTravel
     } = args;
-    await this.mastra.getStorage()?.updateWorkflowState({
+    this.cleanupRun(runId);
+    const workflowsStore = await this.mastra.getStorage()?.getStore("workflows");
+    await workflowsStore?.updateWorkflowState({
       workflowName: workflowId,
       runId,
       opts: {
@@ -1183,7 +1319,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
     resumeData,
     parentWorkflow,
     requestContext,
-    retryCount = 0
+    retryCount = 0,
+    perStep
   }) {
     let stepGraph = workflow.stepGraph;
     if (!executionPath?.length) {
@@ -1246,7 +1383,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1266,7 +1404,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1287,7 +1426,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1308,7 +1448,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1329,7 +1470,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1361,6 +1503,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       );
     }
     activeSteps[step.step.id] = true;
+    const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
     if (step.step instanceof EventedWorkflow) {
       if (resumeSteps?.length > 1) {
         const stepData = stepResults[step.step.id];
@@ -1387,7 +1530,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
             })
           );
         }
-        const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+        const snapshot = await workflowsStore?.loadWorkflowSnapshot({
           workflowName: step.step.id,
           runId: nestedRunId
         });
@@ -1415,11 +1558,12 @@ var WorkflowEventProcessor = class extends EventProcessor {
             prevResult,
             resumeData,
             activeSteps,
-            requestContext
+            requestContext,
+            perStep
           }
         });
       } else if (timeTravel && timeTravel.steps?.length > 1 && timeTravel.steps[0] === step.step.id) {
-        const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+        const snapshot = await workflowsStore?.loadWorkflowSnapshot({
           workflowName: step.step.id,
           runId
         }) ?? { context: {} };
@@ -1430,7 +1574,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           context: timeTravel.nestedStepResults?.[step.step.id] ?? {},
           nestedStepsContext: timeTravel.nestedStepResults ?? {},
           snapshot,
-          graph: step.step.buildExecutionGraph()
+          graph: step.step.buildExecutionGraph(),
+          perStep
         });
         const nestedPrevStep = getStep(step.step, timeTravelParams.executionPath);
         const nestedPrevResult = timeTravelParams.stepResults[nestedPrevStep?.id ?? "input"];
@@ -1456,7 +1601,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
             prevResult: { status: "success", output: nestedPrevResult?.payload },
             timeTravel: timeTravelParams,
             activeSteps,
-            requestContext
+            requestContext,
+            perStep
           }
         });
       } else {
@@ -1481,7 +1627,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
             prevResult,
             resumeData,
             activeSteps,
-            requestContext
+            requestContext,
+            perStep
           }
         });
       }
@@ -1529,6 +1676,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,
@@ -1542,7 +1690,9 @@ 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,
+      perStep
     });
     requestContext = Object.fromEntries(rc.entries());
     if (stepResult.status === "bailed") {
@@ -1561,7 +1711,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
         },
         prevResult: stepResult,
         activeSteps,
-        requestContext
+        requestContext,
+        perStep
       });
       return;
     }
@@ -1639,7 +1790,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult: stepResult,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     }
@@ -1656,7 +1808,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
     stepResults,
     activeSteps,
     parentContext,
-    requestContext
+    requestContext,
+    perStep
   }) {
     let step = workflow.stepGraph[executionPath[0]];
     if ((step?.type === "parallel" || step?.type === "conditional") && executionPath.length > 1) {
@@ -1682,8 +1835,9 @@ var WorkflowEventProcessor = class extends EventProcessor {
         })
       );
     }
+    const workflowsStore = await this.mastra.getStorage()?.getStore("workflows");
     if (step.type === "foreach") {
-      const snapshot = await this.mastra.getStorage()?.loadWorkflowSnapshot({
+      const snapshot = await workflowsStore?.loadWorkflowSnapshot({
         workflowName: workflowId,
         runId
       });
@@ -1698,7 +1852,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           newResult = { ...prevResult, output: [prevResult.output] };
         }
       }
-      const newStepResults = await this.mastra.getStorage()?.updateWorkflowResults({
+      const newStepResults = await workflowsStore?.updateWorkflowResults({
         workflowName: workflow.id,
         runId,
         stepId: step.step.id,
@@ -1717,7 +1871,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           payload: parentContext.input?.output ?? {}
         };
       }
-      const newStepResults = await this.mastra.getStorage()?.updateWorkflowResults({
+      const newStepResults = await workflowsStore?.updateWorkflowResults({
         workflowName: workflow.id,
         runId,
         stepId: step.step.id,
@@ -1753,7 +1907,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       if (suspendedStep) {
         suspendedPaths[suspendedStep.id] = executionPath;
       }
-      await this.mastra.getStorage()?.updateWorkflowState({
+      await workflowsStore?.updateWorkflowState({
         workflowName: workflowId,
         runId,
         opts: {
@@ -1820,7 +1974,38 @@ var WorkflowEventProcessor = class extends EventProcessor {
       }
     }
     step = workflow.stepGraph[executionPath[0]];
-    if ((step?.type === "parallel" || step?.type === "conditional") && executionPath.length > 1) {
+    if (perStep) {
+      if (parentWorkflow && executionPath[0] < workflow.stepGraph.length - 1) {
+        const { endedAt, output, status, ...nestedPrevResult } = prevResult;
+        await this.endWorkflow({
+          workflow,
+          parentWorkflow,
+          workflowId,
+          runId,
+          executionPath,
+          resumeSteps,
+          stepResults,
+          prevResult: { ...nestedPrevResult, status: "paused" },
+          activeSteps,
+          requestContext,
+          perStep
+        });
+      } else {
+        await this.endWorkflow({
+          workflow,
+          parentWorkflow,
+          workflowId,
+          runId,
+          executionPath,
+          resumeSteps,
+          stepResults,
+          prevResult,
+          activeSteps,
+          requestContext,
+          perStep
+        });
+      }
+    } else if ((step?.type === "parallel" || step?.type === "conditional") && executionPath.length > 1) {
       let skippedCount = 0;
       const allResults = step.steps.reduce(
         (acc, step2) => {
@@ -1909,7 +2094,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
     workflowId,
     runId
   }) {
-    const snapshot = await this.mastra.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.mastra.getStorage()?.getStore("workflows");
+    const snapshot = await workflowsStore?.loadWorkflowSnapshot({
       workflowName: workflowId,
       runId
     });
@@ -2229,9 +2415,12 @@ var EventedWorkflow = class extends 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({
+      const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+      await workflowsStore?.persistWorkflowSnapshot({
         workflowName: this.id,
         runId: runIdToUse,
         resourceId: options?.resourceId,
@@ -2261,10 +2450,30 @@ var EventedRun = class extends Run {
     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,
-    requestContext
+    requestContext,
+    perStep
   }) {
     if (this.serializedStepGraph.length === 0) {
       throw new Error(
@@ -2275,7 +2484,8 @@ var EventedRun = class extends Run {
       throw new Error("Uncommitted step flow changes detected. Call .commit() to register the steps.");
     }
     requestContext = requestContext ?? new RequestContext();
-    await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+    const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
       resourceId: this.resourceId,
@@ -2299,6 +2509,7 @@ var EventedRun = class extends Run {
     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,
@@ -2309,7 +2520,8 @@ var EventedRun = class extends Run {
       pubsub: this.mastra.pubsub,
       retryConfig: this.retryConfig,
       requestContext,
-      abortController: this.abortController
+      abortController: this.abortController,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -2324,7 +2536,8 @@ var EventedRun = class extends Run {
   async startAsync({
     inputData,
     initialState,
-    requestContext
+    requestContext,
+    perStep
   }) {
     if (this.serializedStepGraph.length === 0) {
       throw new Error(
@@ -2335,7 +2548,8 @@ var EventedRun = class extends Run {
       throw new Error("Uncommitted step flow changes detected. Call .commit() to register the steps.");
     }
     requestContext = requestContext ?? new RequestContext();
-    await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+    const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
       resourceId: this.resourceId,
@@ -2367,7 +2581,8 @@ var EventedRun = class extends Run {
         runId: this.runId,
         prevResult: { status: "success", output: inputDataToUse },
         requestContext: Object.fromEntries(requestContext.entries()),
-        initialState: initialStateToUse
+        initialState: initialStateToUse,
+        perStep
       }
     });
     return { runId: this.runId };
@@ -2385,21 +2600,28 @@ var EventedRun = class extends Run {
     if (steps.length === 0) {
       throw new Error("No steps provided to resume");
     }
-    const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+    const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+    if (!workflowsStore) {
+      throw new Error("Cannot resume workflow: workflows store is required");
+    }
+    const snapshot = await workflowsStore.loadWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId
     });
-    const resumePath = snapshot?.suspendedPaths?.[steps[0]];
+    if (!snapshot) {
+      throw new Error(`Cannot resume workflow: no snapshot found for runId ${this.runId}`);
+    }
+    const resumePath = snapshot.suspendedPaths?.[steps[0]];
     if (!resumePath) {
       throw new Error(
-        `No resume path found for step ${JSON.stringify(steps)}, currently suspended paths are ${JSON.stringify(snapshot?.suspendedPaths)}`
+        `No resume path found for step ${JSON.stringify(steps)}, currently suspended paths are ${JSON.stringify(snapshot.suspendedPaths)}`
       );
     }
     console.dir(
-      { resume: { requestContextObj: snapshot?.requestContext, requestContext: params.requestContext } },
+      { resume: { requestContextObj: snapshot.requestContext, requestContext: params.requestContext } },
       { depth: null }
     );
-    const requestContextObj = snapshot?.requestContext ?? {};
+    const requestContextObj = snapshot.requestContext ?? {};
     const requestContext = new RequestContext();
     for (const [key, value] of Object.entries(requestContextObj)) {
       requestContext.set(key, value);
@@ -2414,6 +2636,7 @@ var EventedRun = class extends Run {
     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,
@@ -2428,7 +2651,8 @@ var EventedRun = class extends Run {
       },
       pubsub: this.mastra.pubsub,
       requestContext,
-      abortController: this.abortController
+      abortController: this.abortController,
+      perStep: params.perStep
     }).then((result) => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {
@@ -2470,21 +2694,15 @@ var EventedRun = class extends Run {
     };
   }
   async cancel() {
-    await this.mastra?.getStorage()?.updateWorkflowState({
+    const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+    await workflowsStore?.updateWorkflowState({
       workflowName: this.workflowId,
       runId: this.runId,
       opts: {
         status: "canceled"
       }
     });
-    await this.mastra?.pubsub.publish("workflows", {
-      type: "workflow.cancel",
-      runId: this.runId,
-      data: {
-        workflowId: this.workflowId,
-        runId: this.runId
-      }
-    });
+    this.abortController.abort();
   }
 };
 
@@ -2572,7 +2790,8 @@ var EventedExecutionEngine = class extends ExecutionEngine {
           prevResult: { status: "success", output: prevResult?.payload },
           resumeData: params.resume.resumePayload,
           requestContext: Object.fromEntries(params.requestContext.entries()),
-          format: params.format
+          format: params.format,
+          perStep: params.perStep
         }
       });
     } else if (params.timeTravel) {
@@ -2589,7 +2808,8 @@ var EventedExecutionEngine = class extends ExecutionEngine {
           timeTravel: params.timeTravel,
           prevResult: { status: "success", output: prevResult?.payload },
           requestContext: Object.fromEntries(params.requestContext.entries()),
-          format: params.format
+          format: params.format,
+          perStep: params.perStep
         }
       });
     } else {
@@ -2601,7 +2821,8 @@ var EventedExecutionEngine = class extends ExecutionEngine {
           runId: params.runId,
           prevResult: { status: "success", output: params.input },
           requestContext: Object.fromEntries(params.requestContext.entries()),
-          format: params.format
+          format: params.format,
+          perStep: params.perStep
         }
       });
     }
@@ -2639,6 +2860,11 @@ var EventedExecutionEngine = class extends ExecutionEngine {
         status: "suspended",
         steps: resultData.stepResults
       };
+    } else if (resultData.prevResult.status === "paused" || params.perStep) {
+      callbackArg = {
+        status: "paused",
+        steps: resultData.stepResults
+      };
     } else {
       callbackArg = {
         status: resultData.prevResult.status,
@@ -2646,7 +2872,9 @@ var EventedExecutionEngine = class extends ExecutionEngine {
         steps: resultData.stepResults
       };
     }
-    await this.invokeLifecycleCallbacks(callbackArg);
+    if (callbackArg.status !== "paused") {
+      await this.invokeLifecycleCallbacks(callbackArg);
+    }
     let result;
     if (resultData.prevResult.status === "suspended") {
       const suspendedSteps = Object.entries(resultData.stepResults).map(([_stepId, stepResult]) => {
@@ -2667,5 +2895,5 @@ var EventedExecutionEngine = class extends ExecutionEngine {
 };
 
 export { EventedExecutionEngine, EventedRun, EventedWorkflow, StepExecutor, WorkflowEventProcessor, cloneStep, cloneWorkflow, createStep, createWorkflow };
-//# sourceMappingURL=chunk-BQDZIQ3G.js.map
-//# sourceMappingURL=chunk-BQDZIQ3G.js.map
+//# sourceMappingURL=chunk-D2IFWD7A.js.map
+//# sourceMappingURL=chunk-D2IFWD7A.js.map