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

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

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunkJAGQZZ43_cjs = require('./chunk-JAGQZZ43.cjs');
+var chunk5DL6Y7PJ_cjs = require('./chunk-5DL6Y7PJ.cjs');
 var chunkL3NKIMF5_cjs = require('./chunk-L3NKIMF5.cjs');
-var chunkHWMMIRIF_cjs = require('./chunk-HWMMIRIF.cjs');
-var chunkZ55SJVEC_cjs = require('./chunk-Z55SJVEC.cjs');
+var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
+var chunk6YUHA5UH_cjs = require('./chunk-6YUHA5UH.cjs');
 var chunkUVHSM2GU_cjs = require('./chunk-UVHSM2GU.cjs');
 var chunkDGV2FWB4_cjs = require('./chunk-DGV2FWB4.cjs');
 var chunkAF74UXR5_cjs = require('./chunk-AF74UXR5.cjs');
@@ -26,12 +26,12 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
     this.mastra = mastra;
   }
   async execute(params) {
-    const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
+    const { step, stepResults, runId, requestContext, retryCount = 0, perStep } = params;
     const abortController = params.abortController ?? new AbortController();
     let suspended;
     let bailed;
     const startedAt = Date.now();
-    const { inputData, validationError } = await chunkJAGQZZ43_cjs.validateStepInput({
+    const { inputData, validationError } = await chunk5DL6Y7PJ_cjs.validateStepInput({
       prevOutput: typeof params.foreachIdx === "number" ? params.input?.[params.foreachIdx] : params.input,
       step,
       validateInputs: params.validateInputs ?? true
@@ -55,8 +55,8 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
       if (validationError) {
         throw validationError;
       }
-      const stepResult = await step.execute(
-        chunkJAGQZZ43_cjs.createDeprecationProxy(
+      const stepOutput = await step.execute(
+        chunk5DL6Y7PJ_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: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
+            getStepResult: chunk5DL6Y7PJ_cjs.getStepResult.bind(this, stepResults),
             suspend: async (suspendPayload) => {
-              const { suspendData, validationError: validationError2 } = await chunkJAGQZZ43_cjs.validateStepSuspendData({
+              const { suspendData, validationError: validationError2 } = await chunk5DL6Y7PJ_cjs.validateStepSuspendData({
                 suspendData: suspendPayload,
                 step,
                 validateInputs: params.validateInputs ?? true
@@ -91,7 +91,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             abort: () => {
               abortController?.abort();
             },
-            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(params.emitter),
+            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunk5DL6Y7PJ_cjs.EventEmitterPubSub(params.emitter),
             [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
             // TODO
             engine: {},
@@ -101,11 +101,13 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           },
           {
             paramName: "runCount",
-            deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
+            deprecationMessage: chunk5DL6Y7PJ_cjs.runCountDeprecationMessage,
             logger: this.logger
           }
         )
       );
+      const isNestedWorkflowStep = step.component === "WORKFLOW";
+      const nestedWflowStepPaused = isNestedWorkflowStep && perStep;
       const endedAt = Date.now();
       let finalResult;
       if (suspended) {
@@ -113,7 +115,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           ...stepInfo,
           status: "suspended",
           suspendedAt: endedAt,
-          ...stepResult ? { suspendOutput: stepResult } : {}
+          ...stepOutput ? { suspendOutput: stepOutput } : {}
         };
         if (suspended.payload) {
           finalResult.suspendPayload = suspended.payload;
@@ -126,18 +128,23 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           endedAt,
           output: bailed.payload
         };
+      } else if (nestedWflowStepPaused) {
+        finalResult = {
+          ...stepInfo,
+          status: "paused"
+        };
       } else {
         finalResult = {
           ...stepInfo,
           status: "success",
           endedAt,
-          output: stepResult
+          output: stepOutput
         };
       }
       return finalResult;
     } catch (error) {
       const endedAt = Date.now();
-      const errorInstance = chunkHWMMIRIF_cjs.getErrorFromUnknown(error, {
+      const errorInstance = chunk4U7ZLI36_cjs.getErrorFromUnknown(error, {
         serializeStack: false,
         fallbackMessage: "Unknown step execution error"
       });
@@ -171,7 +178,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             iterationCount: 0
           });
         } catch (e) {
-          console.error("error evaluating condition", e);
+          this.mastra?.getLogger()?.error("error evaluating condition", e);
           return false;
         }
       })
@@ -199,7 +206,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
     iterationCount
   }) {
     return condition(
-      chunkJAGQZZ43_cjs.createDeprecationProxy(
+      chunk5DL6Y7PJ_cjs.createDeprecationProxy(
         {
           workflowId,
           runId,
@@ -210,7 +217,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           retryCount,
           resumeData,
           getInitData: () => stepResults?.input,
-          getStepResult: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
+          getStepResult: chunk5DL6Y7PJ_cjs.getStepResult.bind(this, stepResults),
           bail: (_result) => {
             throw new Error("Not implemented");
           },
@@ -219,7 +226,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           abort: () => {
             abortController?.abort();
           },
-          [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(emitter),
+          [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunk5DL6Y7PJ_cjs.EventEmitterPubSub(emitter),
           [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
           // TODO
           engine: {},
@@ -230,7 +237,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
         },
         {
           paramName: "runCount",
-          deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
+          deprecationMessage: chunk5DL6Y7PJ_cjs.runCountDeprecationMessage,
           logger: this.logger
         }
       )
@@ -248,7 +255,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     try {
       return await step.fn(
-        chunkJAGQZZ43_cjs.createDeprecationProxy(
+        chunk5DL6Y7PJ_cjs.createDeprecationProxy(
           {
             workflowId: params.workflowId,
             runId,
@@ -262,7 +269,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             retryCount,
             resumeData: params.resumeData,
             getInitData: () => stepResults?.input,
-            getStepResult: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
+            getStepResult: chunk5DL6Y7PJ_cjs.getStepResult.bind(this, stepResults),
             suspend: async (_suspendPayload) => {
               throw new Error("Not implemented");
             },
@@ -274,7 +281,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             },
             // TODO
             writer: void 0,
-            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(ee),
+            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunk5DL6Y7PJ_cjs.EventEmitterPubSub(ee),
             [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
             // TODO
             engine: {},
@@ -284,13 +291,13 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           },
           {
             paramName: "runCount",
-            deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
+            deprecationMessage: chunk5DL6Y7PJ_cjs.runCountDeprecationMessage,
             logger: this.logger
           }
         )
       );
     } catch (e) {
-      console.error("error evaluating condition", e);
+      this.mastra?.getLogger()?.error("error evaluating condition", e);
       return 0;
     }
   }
@@ -306,7 +313,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     try {
       const result = await step.fn(
-        chunkJAGQZZ43_cjs.createDeprecationProxy(
+        chunk5DL6Y7PJ_cjs.createDeprecationProxy(
           {
             workflowId: params.workflowId,
             runId,
@@ -320,7 +327,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             retryCount,
             resumeData: params.resumeData,
             getInitData: () => stepResults?.input,
-            getStepResult: chunkJAGQZZ43_cjs.getStepResult.bind(this, stepResults),
+            getStepResult: chunk5DL6Y7PJ_cjs.getStepResult.bind(this, stepResults),
             suspend: async (_suspendPayload) => {
               throw new Error("Not implemented");
             },
@@ -332,7 +339,7 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
             },
             // TODO
             writer: void 0,
-            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunkJAGQZZ43_cjs.EventEmitterPubSub(ee),
+            [chunkL3NKIMF5_cjs.PUBSUB_SYMBOL]: this.mastra?.pubsub ?? new chunk5DL6Y7PJ_cjs.EventEmitterPubSub(ee),
             [chunkL3NKIMF5_cjs.STREAM_FORMAT_SYMBOL]: void 0,
             // TODO
             engine: {},
@@ -342,14 +349,14 @@ var StepExecutor = class extends chunkDGV2FWB4_cjs.MastraBase {
           },
           {
             paramName: "runCount",
-            deprecationMessage: chunkJAGQZZ43_cjs.runCountDeprecationMessage,
+            deprecationMessage: chunk5DL6Y7PJ_cjs.runCountDeprecationMessage,
             logger: this.logger
           }
         )
       );
       return result.getTime() - Date.now();
     } catch (e) {
-      console.error("error evaluating condition", e);
+      this.mastra?.getLogger()?.error("error evaluating condition", e);
       return 0;
     }
   }
@@ -376,7 +383,8 @@ async function processWorkflowLoop({
   resumeData,
   parentWorkflow,
   requestContext,
-  retryCount = 0
+  retryCount = 0,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -416,7 +424,8 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     } else {
@@ -434,7 +443,8 @@ async function processWorkflowLoop({
           resumeData,
           activeSteps,
           requestContext,
-          retryCount
+          retryCount,
+          perStep
         }
       });
     }
@@ -454,7 +464,8 @@ async function processWorkflowLoop({
           resumeData,
           activeSteps,
           requestContext,
-          retryCount
+          retryCount,
+          perStep
         }
       });
     } else {
@@ -471,7 +482,8 @@ async function processWorkflowLoop({
           prevResult: stepResult,
           resumeData,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     }
@@ -488,7 +500,8 @@ async function processWorkflowForEach({
   timeTravel,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   mastra,
@@ -512,22 +525,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
@@ -549,19 +564,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
@@ -582,7 +598,8 @@ async function processWorkflowForEach({
       prevResult,
       resumeData,
       activeSteps,
-      requestContext
+      requestContext,
+      perStep
     }
   });
 }
@@ -597,7 +614,8 @@ async function processWorkflowParallel({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   step
@@ -606,10 +624,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,
@@ -624,7 +645,8 @@ async function processWorkflowParallel({
           timeTravel,
           parentWorkflow,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     })
@@ -641,7 +663,8 @@ async function processWorkflowConditional({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -665,49 +688,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,
@@ -736,7 +789,8 @@ async function processWorkflowWaitForEvent(workflowData, {
       stepResults: currentState?.context,
       prevResult,
       activeSteps: [],
-      requestContext: currentState?.requestContext
+      requestContext: currentState?.requestContext,
+      perStep: workflowData.perStep
     }
   });
 }
@@ -751,7 +805,8 @@ async function processWorkflowSleep({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -825,7 +880,8 @@ async function processWorkflowSleep({
           resumeData,
           parentWorkflow,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     },
@@ -843,7 +899,8 @@ async function processWorkflowSleepUntil({
   prevResult,
   resumeData,
   parentWorkflow,
-  requestContext
+  requestContext,
+  perStep
 }, {
   pubsub,
   stepExecutor,
@@ -917,7 +974,8 @@ async function processWorkflowSleepUntil({
           resumeData,
           parentWorkflow,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     },
@@ -996,7 +1054,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
         executionPath: [],
         resumeSteps,
         stepResults,
-        prevResult: { status: "failed", error: chunkHWMMIRIF_cjs.getErrorFromUnknown(e).toJSON() },
+        prevResult: { status: "failed", error: chunk4U7ZLI36_cjs.getErrorFromUnknown(e).toJSON() },
         requestContext,
         resumeData,
         activeSteps: {},
@@ -1006,11 +1064,14 @@ var WorkflowEventProcessor = class extends EventProcessor {
   }
   async processWorkflowCancel({ workflowId, runId }) {
     this.cancelRunAndChildren(runId);
-    const storage = this.mastra.getStorage();
-    const currentState = await storage?.loadWorkflowSnapshot({
+    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,
@@ -1039,15 +1100,17 @@ var WorkflowEventProcessor = class extends EventProcessor {
     timeTravel,
     executionPath,
     stepResults,
-    requestContext
+    requestContext,
+    perStep
   }) {
     this.getOrCreateAbortController(runId);
     if (parentWorkflow?.runId) {
       this.parentChildRelationships.set(runId, parentWorkflow.runId);
     }
-    const existingRun = await this.mastra.getStorage()?.getWorkflowRunById({ runId, workflowName: workflow.id });
+    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,
@@ -1083,20 +1146,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,
@@ -1114,7 +1189,17 @@ 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", {
@@ -1132,7 +1217,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow: parentWorkflow.parentWorkflow,
           parentContext: parentWorkflow,
           requestContext,
-          timeTravel
+          timeTravel,
+          perStep
         }
       });
     }
@@ -1192,7 +1278,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
       timeTravel
     } = args;
     this.cleanupRun(runId);
-    await this.mastra.getStorage()?.updateWorkflowState({
+    const workflowsStore = await this.mastra.getStorage()?.getStore("workflows");
+    await workflowsStore?.updateWorkflowState({
       workflowName: workflowId,
       runId,
       opts: {
@@ -1239,7 +1326,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
     resumeData,
     parentWorkflow,
     requestContext,
-    retryCount = 0
+    retryCount = 0,
+    perStep
   }) {
     let stepGraph = workflow.stepGraph;
     if (!executionPath?.length) {
@@ -1256,7 +1344,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow,
           requestContext
         },
-        new chunkHWMMIRIF_cjs.MastraError({
+        new chunk4U7ZLI36_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Execution path is empty: ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1279,7 +1367,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow,
           requestContext
         },
-        new chunkHWMMIRIF_cjs.MastraError({
+        new chunk4U7ZLI36_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Step not found in step graph: ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1302,7 +1390,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1322,7 +1411,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1343,7 +1433,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1364,7 +1455,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1385,7 +1477,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           prevResult,
           resumeData,
           parentWorkflow,
-          requestContext
+          requestContext,
+          perStep
         },
         {
           pubsub: this.mastra.pubsub,
@@ -1408,7 +1501,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           parentWorkflow,
           requestContext
         },
-        new chunkHWMMIRIF_cjs.MastraError({
+        new chunk4U7ZLI36_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Step is not executable: ${step?.type} -- ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1417,6 +1510,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];
@@ -1435,7 +1529,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
               parentWorkflow,
               requestContext
             },
-            new chunkHWMMIRIF_cjs.MastraError({
+            new chunk4U7ZLI36_cjs.MastraError({
               id: "MASTRA_WORKFLOW",
               text: `Nested workflow run id not found: ${JSON.stringify(stepResults)}`,
               domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1443,7 +1537,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
             })
           );
         }
-        const snapshot = await this.mastra?.getStorage()?.loadWorkflowSnapshot({
+        const snapshot = await workflowsStore?.loadWorkflowSnapshot({
           workflowName: step.step.id,
           runId: nestedRunId
         });
@@ -1471,22 +1565,24 @@ 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: {} };
-        const timeTravelParams = chunkJAGQZZ43_cjs.createTimeTravelExecutionParams({
+        const timeTravelParams = chunk5DL6Y7PJ_cjs.createTimeTravelExecutionParams({
           steps: timeTravel.steps.slice(1),
           inputData: timeTravel.inputData,
           resumeData: timeTravel.resumeData,
           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"];
@@ -1512,7 +1608,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
             prevResult: { status: "success", output: nestedPrevResult?.payload },
             timeTravel: timeTravelParams,
             activeSteps,
-            requestContext
+            requestContext,
+            perStep
           }
         });
       } else {
@@ -1537,7 +1634,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
             prevResult,
             resumeData,
             activeSteps,
-            requestContext
+            requestContext,
+            perStep
           }
         });
       }
@@ -1570,7 +1668,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     for (const [key, value] of Object.entries(requestContext)) {
       rc.set(key, value);
     }
-    const { resumeData: timeTravelResumeData, validationError: timeTravelResumeValidationError } = await chunkJAGQZZ43_cjs.validateStepResumeData({
+    const { resumeData: timeTravelResumeData, validationError: timeTravelResumeValidationError } = await chunk5DL6Y7PJ_cjs.validateStepResumeData({
       resumeData: timeTravel?.stepResults[step.step.id]?.status === "suspended" ? timeTravel?.resumeData : void 0,
       step: step.step
     });
@@ -1600,7 +1698,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
       retryCount,
       foreachIdx: step.type === "foreach" ? executionPath[1] : void 0,
       validateInputs: workflow.options.validateInputs,
-      abortController
+      abortController,
+      perStep
     });
     requestContext = Object.fromEntries(rc.entries());
     if (stepResult.status === "bailed") {
@@ -1619,7 +1718,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
         },
         prevResult: stepResult,
         activeSteps,
-        requestContext
+        requestContext,
+        perStep
       });
       return;
     }
@@ -1697,7 +1797,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
           stepResults,
           prevResult: stepResult,
           activeSteps,
-          requestContext
+          requestContext,
+          perStep
         }
       });
     }
@@ -1714,7 +1815,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) {
@@ -1732,7 +1834,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           activeSteps,
           requestContext
         },
-        new chunkHWMMIRIF_cjs.MastraError({
+        new chunk4U7ZLI36_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Step not found: ${JSON.stringify(executionPath)}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -1740,8 +1842,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
       });
@@ -1756,7 +1859,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,
@@ -1775,7 +1878,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,
@@ -1811,7 +1914,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       if (suspendedStep) {
         suspendedPaths[suspendedStep.id] = executionPath;
       }
-      await this.mastra.getStorage()?.updateWorkflowState({
+      await workflowsStore?.updateWorkflowState({
         workflowName: workflowId,
         runId,
         opts: {
@@ -1878,7 +1981,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) => {
@@ -1967,7 +2101,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
     });
@@ -2008,7 +2143,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     if (!workflow) {
       return this.errorWorkflow(
         workflowData,
-        new chunkHWMMIRIF_cjs.MastraError({
+        new chunk4U7ZLI36_cjs.MastraError({
           id: "MASTRA_WORKFLOW",
           text: `Workflow not found: ${workflowData.workflowId}`,
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
@@ -2082,14 +2217,14 @@ var WorkflowEventProcessor = class extends EventProcessor {
     try {
       await ack?.();
     } catch (e) {
-      console.error("Error acking event", e);
+      this.mastra.getLogger()?.error("Error acking event", e);
     }
   }
 };
 
 // src/workflows/evented/workflow.ts
 function cloneWorkflow(workflow, opts) {
-  const wf = new chunkJAGQZZ43_cjs.Workflow({
+  const wf = new chunk5DL6Y7PJ_cjs.Workflow({
     id: opts.id,
     inputSchema: workflow.inputSchema,
     outputSchema: workflow.outputSchema,
@@ -2120,7 +2255,7 @@ function isAgent(params) {
   return params?.component === "AGENT";
 }
 function isTool(params) {
-  return params instanceof chunkZ55SJVEC_cjs.Tool;
+  return params instanceof chunk6YUHA5UH_cjs.Tool;
 }
 function createStep(params) {
   if (isAgent(params)) {
@@ -2257,7 +2392,7 @@ function createWorkflow(params) {
     executionEngine
   });
 }
-var EventedWorkflow = class extends chunkJAGQZZ43_cjs.Workflow {
+var EventedWorkflow = class extends chunk5DL6Y7PJ_cjs.Workflow {
   constructor(params) {
     super(params);
     this.engineType = "evented";
@@ -2291,7 +2426,8 @@ var EventedWorkflow = class extends chunkJAGQZZ43_cjs.Workflow {
       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,
@@ -2316,7 +2452,7 @@ var EventedWorkflow = class extends chunkJAGQZZ43_cjs.Workflow {
     return run;
   }
 };
-var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
+var EventedRun = class extends chunk5DL6Y7PJ_cjs.Run {
   constructor(params) {
     super(params);
     this.serializedStepGraph = params.serializedStepGraph;
@@ -2335,7 +2471,7 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
           runId: this.runId
         }
       }).catch((err) => {
-        console.error(`Failed to publish workflow.cancel for runId ${this.runId}:`, err);
+        this.mastra?.getLogger()?.error(`Failed to publish workflow.cancel for runId ${this.runId}:`, err);
       });
     };
     this.abortController.signal.addEventListener("abort", abortHandler, { once: true });
@@ -2343,7 +2479,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
   async start({
     inputData,
     initialState,
-    requestContext
+    requestContext,
+    perStep
   }) {
     if (this.serializedStepGraph.length === 0) {
       throw new Error(
@@ -2354,7 +2491,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
       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({
+    const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
       resourceId: this.resourceId,
@@ -2389,7 +2527,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
       pubsub: this.mastra.pubsub,
       retryConfig: this.retryConfig,
       requestContext,
-      abortController: this.abortController
+      abortController: this.abortController,
+      perStep
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -2404,7 +2543,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
   async startAsync({
     inputData,
     initialState,
-    requestContext
+    requestContext,
+    perStep
   }) {
     if (this.serializedStepGraph.length === 0) {
       throw new Error(
@@ -2415,7 +2555,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
       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({
+    const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
+    await workflowsStore?.persistWorkflowSnapshot({
       workflowName: this.workflowId,
       runId: this.runId,
       resourceId: this.resourceId,
@@ -2447,7 +2588,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
         runId: this.runId,
         prevResult: { status: "success", output: inputDataToUse },
         requestContext: Object.fromEntries(requestContext.entries()),
-        initialState: initialStateToUse
+        initialState: initialStateToUse,
+        perStep
       }
     });
     return { runId: this.runId };
@@ -2465,21 +2607,28 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.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 chunkUVHSM2GU_cjs.RequestContext();
     for (const [key, value] of Object.entries(requestContextObj)) {
       requestContext.set(key, value);
@@ -2509,7 +2658,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.Run {
       },
       pubsub: this.mastra.pubsub,
       requestContext,
-      abortController: this.abortController
+      abortController: this.abortController,
+      perStep: params.perStep
     }).then((result) => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {
@@ -2551,7 +2701,8 @@ var EventedRun = class extends chunkJAGQZZ43_cjs.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: {
@@ -2606,7 +2757,7 @@ function isExecutableStep(step) {
 }
 
 // src/workflows/evented/execution-engine.ts
-var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.ExecutionEngine {
+var EventedExecutionEngine = class extends chunk5DL6Y7PJ_cjs.ExecutionEngine {
   eventProcessor;
   constructor({
     mastra,
@@ -2646,7 +2797,8 @@ var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.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) {
@@ -2663,7 +2815,8 @@ var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.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 {
@@ -2675,7 +2828,8 @@ var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.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
         }
       });
     }
@@ -2689,7 +2843,7 @@ var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.ExecutionEngine {
           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);
+            event.data.stepResults = chunk5DL6Y7PJ_cjs.hydrateSerializedStepErrors(event.data.stepResults);
           }
           resolve(event.data);
           return;
@@ -2697,7 +2851,7 @@ var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.ExecutionEngine {
         await ack?.();
       };
       pubsub.subscribe("workflows-finish", finishCb).catch((err) => {
-        console.error("Failed to subscribe to workflows-finish:", err);
+        this.mastra?.getLogger()?.error("Failed to subscribe to workflows-finish:", err);
         reject(err);
       });
     });
@@ -2713,6 +2867,11 @@ var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.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,
@@ -2720,7 +2879,9 @@ var EventedExecutionEngine = class extends chunkJAGQZZ43_cjs.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]) => {
@@ -2749,5 +2910,5 @@ exports.cloneStep = cloneStep;
 exports.cloneWorkflow = cloneWorkflow;
 exports.createStep = createStep;
 exports.createWorkflow = createWorkflow;
-//# sourceMappingURL=chunk-6CG7IY57.cjs.map
-//# sourceMappingURL=chunk-6CG7IY57.cjs.map
+//# sourceMappingURL=chunk-A6JNGJIU.cjs.map
+//# sourceMappingURL=chunk-A6JNGJIU.cjs.map