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

package/dist/chunk-2AU5ZHBL.js

@@ -0,0 +1,79 @@
+import { __require } from './chunk-7D4SUZUM.js';
+
+// ../_vendored/ai_v6/dist/chunk-7D4SUZUM.js
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __require2 = /* @__PURE__ */ ((x) => typeof __require !== "undefined" ? __require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof __require !== "undefined" ? __require : a)[b]
+}) : x)(function(x) {
+  if (typeof __require !== "undefined") return __require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require22() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+
+// ../_vendored/ai_v6/dist/chunk-TLQKI65U.js
+var require_token_error = __commonJS({
+  "../../../node_modules/.pnpm/@vercel+oidc@3.0.5/node_modules/@vercel/oidc/dist/token-error.js"(exports, module) {
+    var __defProp2 = Object.defineProperty;
+    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
+    var __getOwnPropNames2 = Object.getOwnPropertyNames;
+    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+    var __export = (target, all) => {
+      for (var name in all)
+        __defProp2(target, name, { get: all[name], enumerable: true });
+    };
+    var __copyProps2 = (to, from, except, desc) => {
+      if (from && typeof from === "object" || typeof from === "function") {
+        for (let key of __getOwnPropNames2(from))
+          if (!__hasOwnProp2.call(to, key) && key !== except)
+            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
+      }
+      return to;
+    };
+    var __toCommonJS = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
+    var token_error_exports = {};
+    __export(token_error_exports, {
+      VercelOidcTokenError: () => VercelOidcTokenError
+    });
+    module.exports = __toCommonJS(token_error_exports);
+    var VercelOidcTokenError = class extends Error {
+      constructor(message, cause) {
+        super(message);
+        this.name = "VercelOidcTokenError";
+        this.cause = cause;
+      }
+      toString() {
+        if (this.cause) {
+          return `${this.name}: ${this.message}: ${this.cause}`;
+        }
+        return `${this.name}: ${this.message}`;
+      }
+    };
+  }
+});
+
+export { __commonJS, __require2 as __require, __toESM, require_token_error };
+//# sourceMappingURL=chunk-2AU5ZHBL.js.map
+//# sourceMappingURL=chunk-2AU5ZHBL.js.map

package/dist/chunk-2AU5ZHBL.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../_vendored/ai_v6/dist/chunk-7D4SUZUM.js","../../../node_modules/.pnpm/@vercel+oidc@3.0.5/node_modules/@vercel/oidc/dist/token-error.js"],"names":["__require","__require2","__defProp","__getOwnPropDesc","__getOwnPropNames","__hasOwnProp","__copyProps"],"mappings":"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","file":"chunk-2AU5ZHBL.js","sourcesContent":["var __create = Object.create;\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __getProtoOf = Object.getPrototypeOf;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __require = /* @__PURE__ */ ((x) => typeof require !== \"undefined\" ? require : typeof Proxy !== \"undefined\" ? new Proxy(x, {\n  get: (a, b) => (typeof require !== \"undefined\" ? require : a)[b]\n}) : x)(function(x) {\n  if (typeof require !== \"undefined\") return require.apply(this, arguments);\n  throw Error('Dynamic require of \"' + x + '\" is not supported');\n});\nvar __commonJS = (cb, mod) => function __require2() {\n  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(\n  // If the importer is in node compatibility mode or this is not an ESM\n  // file that has been converted to a CommonJS file using a Babel-\n  // compatible transform (i.e. \"__esModule\" has not been set), then set\n  // \"default\" to the CommonJS \"module.exports\" for node compatibility.\n  isNodeMode || !mod || !mod.__esModule ? __defProp(target, \"default\", { value: mod, enumerable: true }) : target,\n  mod\n));\n\nexport { __commonJS, __require, __toESM };\n//# sourceMappingURL=chunk-7D4SUZUM.js.map\n//# sourceMappingURL=chunk-7D4SUZUM.js.map","\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar token_error_exports = {};\n__export(token_error_exports, {\n  VercelOidcTokenError: () => VercelOidcTokenError\n});\nmodule.exports = __toCommonJS(token_error_exports);\nclass VercelOidcTokenError extends Error {\n  constructor(message, cause) {\n    super(message);\n    this.name = \"VercelOidcTokenError\";\n    this.cause = cause;\n  }\n  toString() {\n    if (this.cause) {\n      return `${this.name}: ${this.message}: ${this.cause}`;\n    }\n    return `${this.name}: ${this.message}`;\n  }\n}\n// Annotate the CommonJS export names for ESM import in node:\n0 && (module.exports = {\n  VercelOidcTokenError\n});\n"]}

package/dist/{chunk-BQDZIQ3G.js → chunk-3IP3DZ7G.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-QF4MHFSU.js';
 import { STREAM_FORMAT_SYMBOL, PUBSUB_SYMBOL } from './chunk-6PMMP3FR.js';
+import { getErrorFromUnknown, MastraError } from './chunk-YPLZDWG7.js';
 import { Tool } from './chunk-373OC54J.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';
@@ -20,7 +20,7 @@ var StepExecutor = class extends MastraBase {
   }
   async execute(params) {
     const { step, stepResults, runId, requestContext, retryCount = 0 } = params;
-    const abortController = new AbortController();
+    const abortController = params.abortController ?? new AbortController();
     let suspended;
     let bailed;
     const startedAt = Date.now();
@@ -144,7 +144,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 +231,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 +289,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();
@@ -921,10 +921,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,6 +998,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
     });
   }
   async processWorkflowCancel({ workflowId, runId }) {
+    this.cancelRunAndChildren(runId);
     const storage = this.mastra.getStorage();
     const currentState = await storage?.loadWorkflowSnapshot({
       workflowName: workflowId,
@@ -991,6 +1034,10 @@ var WorkflowEventProcessor = class extends EventProcessor {
     stepResults,
     requestContext
   }) {
+    this.getOrCreateAbortController(runId);
+    if (parentWorkflow?.runId) {
+      this.parentChildRelationships.set(runId, parentWorkflow.runId);
+    }
     const existingRun = await this.mastra.getStorage()?.getWorkflowRunById({ runId, workflowName: workflow.id });
     const resourceId = existingRun?.resourceId;
     await this.mastra.getStorage()?.persistWorkflowSnapshot({
@@ -1061,6 +1108,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
   }
   async processWorkflowEnd(args) {
     const { resumeSteps, prevResult, resumeData, parentWorkflow, activeSteps, requestContext, runId, timeTravel } = args;
+    this.cleanupRun(runId);
     if (parentWorkflow) {
       await this.mastra.pubsub.publish("workflows", {
         type: "workflow.step.end",
@@ -1136,6 +1184,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
       requestContext,
       timeTravel
     } = args;
+    this.cleanupRun(runId);
     await this.mastra.getStorage()?.updateWorkflowState({
       workflowName: workflowId,
       runId,
@@ -1529,6 +1578,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 +1592,8 @@ var WorkflowEventProcessor = class extends EventProcessor {
       resumeData: resumeDataToUse,
       retryCount,
       foreachIdx: step.type === "foreach" ? executionPath[1] : void 0,
-      validateInputs: workflow.options.validateInputs
+      validateInputs: workflow.options.validateInputs,
+      abortController
     });
     requestContext = Object.fromEntries(rc.entries());
     if (stepResult.status === "bailed") {
@@ -2229,7 +2280,9 @@ 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({
         workflowName: this.id,
@@ -2261,6 +2314,25 @@ 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,
@@ -2299,6 +2371,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,
@@ -2414,6 +2487,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,
@@ -2477,14 +2551,7 @@ var EventedRun = class extends Run {
         status: "canceled"
       }
     });
-    await this.mastra?.pubsub.publish("workflows", {
-      type: "workflow.cancel",
-      runId: this.runId,
-      data: {
-        workflowId: this.workflowId,
-        runId: this.runId
-      }
-    });
+    this.abortController.abort();
   }
 };
 
@@ -2667,5 +2734,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-3IP3DZ7G.js.map
+//# sourceMappingURL=chunk-3IP3DZ7G.js.map