@mastra/core 0.10.8 → 0.10.9

package/dist/{chunk-E4A4XDDG.cjs → chunk-SO4GUX3Q.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var chunkBB6DPGIV_cjs = require('./chunk-BB6DPGIV.cjs');
-var chunkEYJXFYUH_cjs = require('./chunk-EYJXFYUH.cjs');
+var chunkSUF6QXSI_cjs = require('./chunk-SUF6QXSI.cjs');
 var chunk4Z3OU5RY_cjs = require('./chunk-4Z3OU5RY.cjs');
 var chunkB6TOBUS6_cjs = require('./chunk-B6TOBUS6.cjs');
 var chunkP3Q73CAW_cjs = require('./chunk-P3Q73CAW.cjs');
@@ -29,6 +29,30 @@ var ExecutionEngine = class extends chunkP3Q73CAW_cjs.MastraBase {
   }
 };
 var DefaultExecutionEngine = class extends ExecutionEngine {
+  /**
+   * The runCounts map is used to keep track of the run count for each step.
+   * The step id is used as the key and the run count is the value.
+   */
+  runCounts = /* @__PURE__ */ new Map();
+  /**
+   * Get or generate the run count for a step.
+   * If the step id is not in the map, it will be added and the run count will be 0.
+   * If the step id is in the map, it will return the run count.
+   *
+   * @param stepId - The id of the step.
+   * @returns The run count for the step.
+   */
+  getOrGenerateRunCount(stepId) {
+    if (this.runCounts.has(stepId)) {
+      const currentRunCount = this.runCounts.get(stepId);
+      const nextRunCount = currentRunCount + 1;
+      this.runCounts.set(stepId, nextRunCount);
+      return nextRunCount;
+    }
+    const runCount = 0;
+    this.runCounts.set(stepId, runCount);
+    return runCount;
+  }
   async fmtReturnValue(executionSpan, emitter, stepResults, lastOutput, error) {
     const base = {
       status: lastOutput.status,
@@ -133,6 +157,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             retryConfig: { attempts, delay },
             executionSpan
           },
+          abortController: params.abortController,
           emitter: params.emitter,
           runtimeContext: params.runtimeContext
         });
@@ -265,14 +290,14 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     resume,
     prevOutput,
     emitter,
+    abortController,
     runtimeContext
   }) {
     const startTime = resume?.steps[0] === step.id ? void 0 : Date.now();
     const resumeTime = resume?.steps[0] === step.id ? Date.now() : void 0;
     const stepInfo = {
       ...stepResults[step.id],
-      payload: prevOutput,
-      ...resume?.steps[0] === step.id ? { resumePayload: resume?.resumePayload } : {},
+      ...resume?.steps[0] === step.id ? { resumePayload: resume?.resumePayload } : { payload: prevOutput },
       ...startTime ? { startedAt: startTime } : {},
       ...resumeTime ? { resumedAt: resumeTime } : {}
     };
@@ -302,7 +327,9 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     await emitter.emit("watch-v2", {
       type: "step-start",
       payload: {
-        id: step.id
+        id: step.id,
+        ...stepInfo,
+        status: "running"
       }
     });
     const _runStep = (step2, spanName, attributes) => {
@@ -335,6 +362,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           mastra: this.mastra,
           runtimeContext,
           inputData: prevOutput,
+          runCount: this.getOrGenerateRunCount(step.id),
           resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
           getInitData: () => stepResults?.input,
           getStepResult: (step2) => {
@@ -354,6 +382,9 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           bail: (result2) => {
             bailed = { payload: result2 };
           },
+          abort: () => {
+            abortController?.abort();
+          },
           resume: {
             steps: resume?.steps?.slice(1) || [],
             resumePayload: resume?.resumePayload,
@@ -361,7 +392,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             runId: stepResults[step.id]?.suspendPayload?.__workflow_meta?.runId
           },
           [chunkBB6DPGIV_cjs.EMITTER_SYMBOL]: emitter,
-          engine: {}
+          engine: {},
+          abortSignal: abortController?.signal
         });
         if (suspended) {
           execResults = { status: "suspended", suspendPayload: suspended.payload, suspendedAt: Date.now() };
@@ -418,7 +450,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         type: "step-suspended",
         payload: {
           id: step.id,
-          output: execResults.output
+          ...execResults
         }
       });
     } else {
@@ -426,8 +458,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         type: "step-result",
         payload: {
           id: step.id,
-          status: execResults.status,
-          output: execResults.output
+          ...execResults
         }
       });
       await emitter.emit("watch-v2", {
@@ -450,6 +481,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     resume,
     executionContext,
     emitter,
+    abortController,
     runtimeContext
   }) {
     let execResults;
@@ -472,6 +504,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             executionSpan: executionContext.executionSpan
           },
           emitter,
+          abortController,
           runtimeContext
         })
       )
@@ -482,6 +515,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       execResults = { status: "failed", error: hasFailed.result.error };
     } else if (hasSuspended) {
       execResults = { status: "suspended", payload: hasSuspended.result.suspendPayload };
+    } else if (abortController?.signal?.aborted) {
+      execResults = { status: "canceled" };
     } else {
       execResults = {
         status: "success",
@@ -506,6 +541,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     resume,
     executionContext,
     emitter,
+    abortController,
     runtimeContext
   }) {
     let execResults;
@@ -517,6 +553,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             mastra: this.mastra,
             runtimeContext,
             inputData: prevOutput,
+            runCount: -1,
             getInitData: () => stepResults?.input,
             getStepResult: (step) => {
               if (!step?.id) {
@@ -533,8 +570,12 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             },
             bail: () => {
             },
+            abort: () => {
+              abortController?.abort();
+            },
             [chunkBB6DPGIV_cjs.EMITTER_SYMBOL]: emitter,
-            engine: {}
+            engine: {},
+            abortSignal: abortController?.signal
           });
           return result ? index : null;
         } catch (e) {
@@ -573,6 +614,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             executionSpan: executionContext.executionSpan
           },
           emitter,
+          abortController,
           runtimeContext
         })
       )
@@ -583,6 +625,8 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       execResults = { status: "failed", error: hasFailed.result.error };
     } else if (hasSuspended) {
       execResults = { status: "suspended", payload: hasSuspended.result.suspendPayload };
+    } else if (abortController?.signal?.aborted) {
+      execResults = { status: "canceled" };
     } else {
       execResults = {
         status: "success",
@@ -605,6 +649,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     resume,
     executionContext,
     emitter,
+    abortController,
     runtimeContext
   }) {
     const { step, condition } = entry;
@@ -620,6 +665,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         resume,
         prevOutput: result.output,
         emitter,
+        abortController,
         runtimeContext
       });
       if (result.status !== "success") {
@@ -630,6 +676,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         mastra: this.mastra,
         runtimeContext,
         inputData: result.output,
+        runCount: -1,
         getInitData: () => stepResults?.input,
         getStepResult: (step2) => {
           if (!step2?.id) {
@@ -642,8 +689,12 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         },
         bail: () => {
         },
+        abort: () => {
+          abortController?.abort();
+        },
         [chunkBB6DPGIV_cjs.EMITTER_SYMBOL]: emitter,
-        engine: {}
+        engine: {},
+        abortSignal: abortController?.signal
       });
     } while (entry.loopType === "dowhile" ? isTrue : !isTrue);
     return result;
@@ -657,6 +708,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     resume,
     executionContext,
     emitter,
+    abortController,
     runtimeContext
   }) {
     const { step, opts } = entry;
@@ -677,6 +729,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             resume,
             prevOutput: item,
             emitter,
+            abortController,
             runtimeContext
           });
         })
@@ -738,6 +791,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     resume,
     executionContext,
     emitter,
+    abortController,
     runtimeContext
   }) {
     const prevOutput = this.getStepOutput(stepResults, prevStep);
@@ -753,6 +807,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         resume,
         prevOutput,
         emitter,
+        abortController,
         runtimeContext
       });
     } else if (resume?.resumePath?.length && (entry.type === "parallel" || entry.type === "conditional")) {
@@ -774,6 +829,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           executionSpan: executionContext.executionSpan
         },
         emitter,
+        abortController,
         runtimeContext
       });
     } else if (entry.type === "parallel") {
@@ -787,6 +843,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         resume,
         executionContext,
         emitter,
+        abortController,
         runtimeContext
       });
     } else if (entry.type === "conditional") {
@@ -801,6 +858,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         resume,
         executionContext,
         emitter,
+        abortController,
         runtimeContext
       });
     } else if (entry.type === "loop") {
@@ -814,6 +872,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         resume,
         executionContext,
         emitter,
+        abortController,
         runtimeContext
       });
     } else if (entry.type === "foreach") {
@@ -827,6 +886,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         resume,
         executionContext,
         emitter,
+        abortController,
         runtimeContext
       });
     } else if (entry.type === "sleep") {
@@ -859,7 +919,10 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       await emitter.emit("watch-v2", {
         type: "step-waiting",
         payload: {
-          id: entry.id
+          id: entry.id,
+          payload: prevOutput,
+          startedAt,
+          status: "waiting"
         }
       });
       await this.persistStepUpdate({
@@ -887,6 +950,41 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       };
       execResults = { ...stepInfo, status: "success", output: prevOutput };
       stepResults[entry.id] = { ...stepInfo, status: "success", output: prevOutput };
+      await emitter.emit("watch", {
+        type: "watch",
+        payload: {
+          currentStep: {
+            id: entry.id,
+            ...execResults
+          },
+          workflowState: {
+            status: "running",
+            steps: {
+              ...stepResults,
+              [entry.id]: {
+                ...execResults
+              }
+            },
+            result: null,
+            error: null
+          }
+        },
+        eventTimestamp: Date.now()
+      });
+      await emitter.emit("watch-v2", {
+        type: "step-result",
+        payload: {
+          id: entry.id,
+          ...execResults
+        }
+      });
+      await emitter.emit("watch-v2", {
+        type: "step-finish",
+        payload: {
+          id: entry.id,
+          metadata: {}
+        }
+      });
     } else if (entry.type === "sleepUntil") {
       const startedAt = Date.now();
       await emitter.emit("watch", {
@@ -917,7 +1015,10 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       await emitter.emit("watch-v2", {
         type: "step-waiting",
         payload: {
-          id: entry.id
+          id: entry.id,
+          payload: prevOutput,
+          startedAt,
+          status: "waiting"
         }
       });
       await this.persistStepUpdate({
@@ -945,6 +1046,41 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       };
       execResults = { ...stepInfo, status: "success", output: prevOutput };
       stepResults[entry.id] = { ...stepInfo, status: "success", output: prevOutput };
+      await emitter.emit("watch", {
+        type: "watch",
+        payload: {
+          currentStep: {
+            id: entry.id,
+            ...execResults
+          },
+          workflowState: {
+            status: "running",
+            steps: {
+              ...stepResults,
+              [entry.id]: {
+                ...execResults
+              }
+            },
+            result: null,
+            error: null
+          }
+        },
+        eventTimestamp: Date.now()
+      });
+      await emitter.emit("watch-v2", {
+        type: "step-result",
+        payload: {
+          id: entry.id,
+          ...execResults
+        }
+      });
+      await emitter.emit("watch-v2", {
+        type: "step-finish",
+        payload: {
+          id: entry.id,
+          metadata: {}
+        }
+      });
     } else if (entry.type === "waitForEvent") {
       const startedAt = Date.now();
       let eventData;
@@ -976,7 +1112,10 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       await emitter.emit("watch-v2", {
         type: "step-waiting",
         payload: {
-          id: entry.step.id
+          id: entry.step.id,
+          payload: prevOutput,
+          startedAt,
+          status: "waiting"
         }
       });
       await this.persistStepUpdate({
@@ -1010,6 +1149,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           },
           prevOutput,
           emitter,
+          abortController,
           runtimeContext
         });
       } catch (error) {
@@ -1029,6 +1169,9 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     if (entry.type === "step" || entry.type === "waitForEvent" || entry.type === "loop" || entry.type === "foreach") {
       stepResults[entry.step.id] = execResults;
     }
+    if (abortController?.signal?.aborted) {
+      execResults = { ...execResults, status: "canceled" };
+    }
     await this.persistStepUpdate({
       workflowId,
       runId,
@@ -1044,7 +1187,7 @@ function mapVariable(config) {
   return config;
 }
 function createStep(params) {
-  if (params instanceof chunkEYJXFYUH_cjs.Agent) {
+  if (params instanceof chunkSUF6QXSI_cjs.Agent) {
     return {
       id: params.name,
       // @ts-ignore
@@ -1057,7 +1200,7 @@ function createStep(params) {
       outputSchema: zod.z.object({
         text: zod.z.string()
       }),
-      execute: async ({ inputData, [chunkBB6DPGIV_cjs.EMITTER_SYMBOL]: emitter, runtimeContext }) => {
+      execute: async ({ inputData, [chunkBB6DPGIV_cjs.EMITTER_SYMBOL]: emitter, runtimeContext, abortSignal, abort }) => {
         let streamPromise = {};
         streamPromise.promise = new Promise((resolve, reject) => {
           streamPromise.resolve = resolve;
@@ -1077,8 +1220,12 @@ function createStep(params) {
           runtimeContext,
           onFinish: (result) => {
             streamPromise.resolve(result.text);
-          }
+          },
+          abortSignal
         });
+        if (abortSignal.aborted) {
+          return abort();
+        }
         for await (const chunk of fullStream) {
           switch (chunk.type) {
             case "text-delta":
@@ -1585,23 +1732,26 @@ var Workflow = class extends chunkP3Q73CAW_cjs.MastraBase {
       cleanup: () => this.#runs.delete(runIdToUse)
     });
     this.#runs.set(runIdToUse, run);
-    await this.mastra?.getStorage()?.persistWorkflowSnapshot({
-      workflowName: this.id,
-      runId: runIdToUse,
-      snapshot: {
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse);
+    if (!workflowSnapshotInStorage) {
+      await this.mastra?.getStorage()?.persistWorkflowSnapshot({
+        workflowName: this.id,
         runId: runIdToUse,
-        status: "pending",
-        value: {},
-        context: {},
-        activePaths: [],
-        serializedStepGraph: this.serializedStepGraph,
-        suspendedPaths: {},
-        result: void 0,
-        error: void 0,
-        // @ts-ignore
-        timestamp: Date.now()
-      }
-    });
+        snapshot: {
+          runId: runIdToUse,
+          status: "pending",
+          value: {},
+          context: {},
+          activePaths: [],
+          serializedStepGraph: this.serializedStepGraph,
+          suspendedPaths: {},
+          result: void 0,
+          error: void 0,
+          // @ts-ignore
+          timestamp: Date.now()
+        }
+      });
+    }
     return run;
   }
   async execute({
@@ -1611,12 +1761,22 @@ var Workflow = class extends chunkP3Q73CAW_cjs.MastraBase {
     resume,
     [chunkBB6DPGIV_cjs.EMITTER_SYMBOL]: emitter,
     mastra,
-    runtimeContext
+    runtimeContext,
+    abort,
+    abortSignal
   }) {
     this.__registerMastra(mastra);
     const run = resume?.steps?.length ? this.createRun({ runId: resume.runId }) : this.createRun();
+    const nestedAbortCb = () => {
+      abort();
+    };
+    run.abortController?.signal.addEventListener("abort", nestedAbortCb);
+    abortSignal.addEventListener("abort", async () => {
+      run.abortController.signal.removeEventListener("abort", nestedAbortCb);
+      await run.cancel();
+    });
     const unwatchV2 = run.watch((event) => {
-      emitter.emit("nested-watch-v2", event);
+      emitter.emit("nested-watch-v2", { event, workflowId: this.id });
     }, "watch-v2");
     const unwatch = run.watch((event) => {
       emitter.emit("nested-watch", { event, workflowId: this.id, runId: run.runId, isResume: !!resume?.steps?.length });
@@ -1688,6 +1848,7 @@ var Workflow = class extends chunkP3Q73CAW_cjs.MastraBase {
   }
 };
 var Run = class {
+  abortController;
   emitter;
   /**
    * Unique identifier for this workflow
@@ -1731,8 +1892,15 @@ var Run = class {
     this.emitter = new EventEmitter__default.default();
     this.retryConfig = params.retryConfig;
     this.cleanup = params.cleanup;
+    this.abortController = new AbortController();
+  }
+  /**
+   * Cancels the workflow execution
+   */
+  async cancel() {
+    this.abortController?.abort();
   }
-  sendEvent(event, data) {
+  async sendEvent(event, data) {
     this.emitter.emit(`user-event-${event}`, data);
   }
   /**
@@ -1765,9 +1933,12 @@ var Run = class {
         }
       },
       retryConfig: this.retryConfig,
-      runtimeContext: runtimeContext ?? new chunkLABUWBKX_cjs.RuntimeContext()
+      runtimeContext: runtimeContext ?? new chunkLABUWBKX_cjs.RuntimeContext(),
+      abortController: this.abortController
     });
-    this.cleanup?.();
+    if (result.status !== "suspended") {
+      this.cleanup?.();
+    }
     return result;
   }
   /**
@@ -1843,19 +2014,26 @@ var Run = class {
         console.error(e);
       }
     };
+    const nestedWatchV2Cb = ({
+      event,
+      workflowId
+    }) => {
+      this.emitter.emit("watch-v2", {
+        ...event,
+        ...event.payload?.id ? { payload: { ...event.payload, id: `${workflowId}.${event.payload.id}` } } : {}
+      });
+    };
     if (type === "watch") {
       this.emitter.on("watch", watchCb);
       this.emitter.on("nested-watch", nestedWatchCb);
     } else if (type === "watch-v2") {
       this.emitter.on("watch-v2", cb);
-      this.emitter.on("nested-watch-v2", (event) => {
-        this.emitter.emit("watch-v2", event);
-      });
+      this.emitter.on("nested-watch-v2", nestedWatchV2Cb);
     }
     return () => {
       if (type === "watch-v2") {
         this.emitter.off("watch-v2", cb);
-        this.emitter.off("nested-watch-v2", nestedWatchCb);
+        this.emitter.off("nested-watch-v2", nestedWatchV2Cb);
       } else {
         this.emitter.off("watch", watchCb);
         this.emitter.off("nested-watch", nestedWatchCb);
@@ -1898,7 +2076,8 @@ var Run = class {
           this.emitter.once(event, callback);
         }
       },
-      runtimeContext: params.runtimeContext ?? new chunkLABUWBKX_cjs.RuntimeContext()
+      runtimeContext: params.runtimeContext ?? new chunkLABUWBKX_cjs.RuntimeContext(),
+      abortController: this.abortController
     }).then((result) => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {