@mastra/core 1.5.0 → 1.6.0

package/dist/chunk-OQDRPRKM.cjs

@@ -0,0 +1,46 @@
+'use strict';
+
+var EventEmitter = require('events');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var EventEmitter__default = /*#__PURE__*/_interopDefault(EventEmitter);
+
+// src/events/pubsub.ts
+var PubSub = class {
+};
+var EventEmitterPubSub = class extends PubSub {
+  emitter;
+  constructor(existingEmitter) {
+    super();
+    this.emitter = existingEmitter ?? new EventEmitter__default.default();
+  }
+  async publish(topic, event) {
+    const id = crypto.randomUUID();
+    const createdAt = /* @__PURE__ */ new Date();
+    this.emitter.emit(topic, {
+      ...event,
+      id,
+      createdAt
+    });
+  }
+  async subscribe(topic, cb) {
+    this.emitter.on(topic, cb);
+  }
+  async unsubscribe(topic, cb) {
+    this.emitter.off(topic, cb);
+  }
+  async flush() {
+  }
+  /**
+   * Clean up all listeners during graceful shutdown.
+   */
+  async close() {
+    this.emitter.removeAllListeners();
+  }
+};
+
+exports.EventEmitterPubSub = EventEmitterPubSub;
+exports.PubSub = PubSub;
+//# sourceMappingURL=chunk-OQDRPRKM.cjs.map
+//# sourceMappingURL=chunk-OQDRPRKM.cjs.map

package/dist/chunk-OQDRPRKM.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/events/pubsub.ts","../src/events/event-emitter.ts"],"names":["EventEmitter"],"mappings":";;;;;;;;;AAEO,IAAe,SAAf,MAAsB;AAK7B;ACHO,IAAM,kBAAA,GAAN,cAAiC,MAAA,CAAO;AAAA,EACrC,OAAA;AAAA,EAER,YAAY,eAAA,EAAgC;AAC1C,IAAA,KAAA,EAAM;AACN,IAAA,IAAA,CAAK,OAAA,GAAU,eAAA,IAAmB,IAAIA,6BAAA,EAAa;AAAA,EACrD;AAAA,EAEA,MAAM,OAAA,CAAQ,KAAA,EAAe,KAAA,EAAuD;AAClF,IAAA,MAAM,EAAA,GAAK,OAAO,UAAA,EAAW;AAC7B,IAAA,MAAM,SAAA,uBAAgB,IAAA,EAAK;AAC3B,IAAA,IAAA,CAAK,OAAA,CAAQ,KAAK,KAAA,EAAO;AAAA,MACvB,GAAG,KAAA;AAAA,MACH,EAAA;AAAA,MACA;AAAA,KACD,CAAA;AAAA,EACH;AAAA,EAEA,MAAM,SAAA,CAAU,KAAA,EAAe,EAAA,EAAsE;AACnG,IAAA,IAAA,CAAK,OAAA,CAAQ,EAAA,CAAG,KAAA,EAAO,EAAE,CAAA;AAAA,EAC3B;AAAA,EAEA,MAAM,WAAA,CAAY,KAAA,EAAe,EAAA,EAAsE;AACrG,IAAA,IAAA,CAAK,OAAA,CAAQ,GAAA,CAAI,KAAA,EAAO,EAAE,CAAA;AAAA,EAC5B;AAAA,EAEA,MAAM,KAAA,GAAuB;AAAA,EAE7B;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,KAAA,GAAuB;AAC3B,IAAA,IAAA,CAAK,QAAQ,kBAAA,EAAmB;AAAA,EAClC;AACF","file":"chunk-OQDRPRKM.cjs","sourcesContent":["import type { Event } from './types';\n\nexport abstract class PubSub {\n  abstract publish(topic: string, event: Omit<Event, 'id' | 'createdAt'>): Promise<void>;\n  abstract subscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void>;\n  abstract unsubscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void>;\n  abstract flush(): Promise<void>;\n}\n","import EventEmitter from 'node:events';\nimport { PubSub } from './pubsub';\nimport type { Event } from './types';\n\nexport class EventEmitterPubSub extends PubSub {\n  private emitter: EventEmitter;\n\n  constructor(existingEmitter?: EventEmitter) {\n    super();\n    this.emitter = existingEmitter ?? new EventEmitter();\n  }\n\n  async publish(topic: string, event: Omit<Event, 'id' | 'createdAt'>): Promise<void> {\n    const id = crypto.randomUUID();\n    const createdAt = new Date();\n    this.emitter.emit(topic, {\n      ...event,\n      id,\n      createdAt,\n    });\n  }\n\n  async subscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void> {\n    this.emitter.on(topic, cb);\n  }\n\n  async unsubscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void> {\n    this.emitter.off(topic, cb);\n  }\n\n  async flush(): Promise<void> {\n    // no-op\n  }\n\n  /**\n   * Clean up all listeners during graceful shutdown.\n   */\n  async close(): Promise<void> {\n    this.emitter.removeAllListeners();\n  }\n}\n"]}

package/dist/{chunk-YV2YGQRY.js → chunk-RHKNKJNM.js}

@@ -1,7 +1,7 @@
-import { validateStepInput, createDeprecationProxy, getStepResult, validateStepSuspendData, runCountDeprecationMessage, TripWire, createTimeTravelExecutionParams, validateStepResumeData, Workflow, isSupportedLanguageModel, ProcessorStepOutputSchema, ProcessorStepSchema, Run, WorkflowRunOutput, ExecutionEngine, cleanStepResult, hydrateSerializedStepErrors, Agent, ProcessorRunner } from './chunk-MZIMV2BB.js';
+import { validateStepInput, createDeprecationProxy, getStepResult, validateStepSuspendData, runCountDeprecationMessage, TripWire, createTimeTravelExecutionParams, validateStepResumeData, Workflow, isSupportedLanguageModel, ProcessorStepOutputSchema, ProcessorStepSchema, Run, WorkflowRunOutput, ExecutionEngine, cleanStepResult, hydrateSerializedStepErrors, Agent, ProcessorRunner } from './chunk-IHDE4CJV.js';
 import { STREAM_FORMAT_SYMBOL, PUBSUB_SYMBOL } from './chunk-2QXNHEDL.js';
-import { createPendingMarker } from './chunk-YIN5F7VO.js';
-import { MessageList } from './chunk-OHLVZVIK.js';
+import { createPendingMarker } from './chunk-EEU5NHHU.js';
+import { MessageList } from './chunk-IC5OUWKJ.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
 import { Tool } from './chunk-BQHWJLXU.js';
 import { RequestContext } from './chunk-CCLV5CAA.js';
@@ -75,6 +75,7 @@ var StepExecutor = class extends MastraBase {
       const { __workflow_meta, ...userSuspendData } = suspendDataToUse;
       suspendDataToUse = userSuspendData;
     }
+    let stateUpdate;
     try {
       if (validationError) {
         throw validationError;
@@ -91,7 +92,7 @@ var StepExecutor = class extends MastraBase {
             inputData,
             state: params.state,
             setState: async (newState) => {
-              Object.assign(params.state, newState);
+              stateUpdate = { ...stateUpdate ?? params.state, ...newState };
             },
             retryCount,
             resumeData: params.resumeData,
@@ -162,6 +163,7 @@ var StepExecutor = class extends MastraBase {
       const isNestedWorkflowStep = step.component === "WORKFLOW";
       const nestedWflowStepPaused = isNestedWorkflowStep && perStep;
       const endedAt = Date.now();
+      const finalState = stateUpdate ?? params.state;
       let finalResult;
       if (suspended) {
         finalResult = {
@@ -169,7 +171,7 @@ var StepExecutor = class extends MastraBase {
           status: "suspended",
           suspendedAt: endedAt,
           ...stepOutput ? { suspendOutput: stepOutput } : {},
-          __state: params.state
+          __state: finalState
         };
         if (suspended.payload) {
           finalResult.suspendPayload = suspended.payload;
@@ -181,13 +183,13 @@ var StepExecutor = class extends MastraBase {
           status: "bailed",
           endedAt,
           output: bailed.payload,
-          __state: params.state
+          __state: finalState
         };
       } else if (nestedWflowStepPaused) {
         finalResult = {
           ...stepInfo,
           status: "paused",
-          __state: params.state
+          __state: finalState
         };
       } else {
         finalResult = {
@@ -195,7 +197,7 @@ var StepExecutor = class extends MastraBase {
           status: "success",
           endedAt,
           output: stepOutput,
-          __state: params.state
+          __state: finalState
         };
       }
       return finalResult;
@@ -1933,7 +1935,91 @@ var WorkflowEventProcessor = class extends EventProcessor {
     activeSteps[step.step.id] = true;
     const workflowsStore = await this.mastra?.getStorage()?.getStore("workflows");
     if (step.step instanceof EventedWorkflow || step.step.component === "WORKFLOW") {
-      if (resumeSteps?.length > 1) {
+      if (resumeSteps?.length === 1 && resumeSteps[0] === step.step.id) {
+        const stepData = stepResults[step.step.id];
+        const nestedRunId = stepData?.suspendPayload?.__workflow_meta?.runId;
+        if (!nestedRunId) {
+          return this.errorWorkflow(
+            {
+              workflowId,
+              runId,
+              executionPath,
+              stepResults,
+              activeSteps,
+              resumeSteps,
+              prevResult,
+              resumeData,
+              parentWorkflow,
+              requestContext
+            },
+            new MastraError({
+              id: "MASTRA_WORKFLOW",
+              text: `Nested workflow run id not found for auto-detection: ${JSON.stringify(stepResults)}`,
+              domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
+              category: "SYSTEM" /* SYSTEM */
+            })
+          );
+        }
+        const snapshot = await workflowsStore?.loadWorkflowSnapshot({
+          workflowName: step.step.id,
+          runId: nestedRunId
+        });
+        const suspendedStepId = Object.keys(snapshot?.suspendedPaths ?? {})?.[0];
+        if (!suspendedStepId) {
+          return this.errorWorkflow(
+            {
+              workflowId,
+              runId,
+              executionPath,
+              stepResults,
+              activeSteps,
+              resumeSteps,
+              prevResult,
+              resumeData,
+              parentWorkflow,
+              requestContext
+            },
+            new MastraError({
+              id: "MASTRA_WORKFLOW",
+              text: `No suspended step found in nested workflow: ${step.step.id}`,
+              domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
+              category: "SYSTEM" /* SYSTEM */
+            })
+          );
+        }
+        const nestedExecutionPath = snapshot?.suspendedPaths?.[suspendedStepId];
+        const nestedStepResults = snapshot?.context;
+        await this.mastra.pubsub.publish("workflows", {
+          type: "workflow.resume",
+          runId,
+          data: {
+            workflowId: step.step.id,
+            parentWorkflow: {
+              stepId: step.step.id,
+              workflowId,
+              runId,
+              executionPath,
+              resumeSteps,
+              stepResults,
+              input: prevResult,
+              parentWorkflow
+            },
+            executionPath: nestedExecutionPath,
+            runId: nestedRunId,
+            resumeSteps: [suspendedStepId],
+            // Resume the auto-detected inner step
+            stepResults: nestedStepResults,
+            prevResult,
+            resumeData,
+            activeSteps,
+            requestContext,
+            perStep,
+            initialState: currentState,
+            state: currentState,
+            outputOptions
+          }
+        });
+      } else if (resumeSteps?.length > 1) {
         const stepData = stepResults[step.step.id];
         const nestedRunId = stepData?.suspendPayload?.__workflow_meta?.runId;
         if (!nestedRunId) {
@@ -2233,6 +2319,7 @@ var WorkflowEventProcessor = class extends EventProcessor {
           //timeTravel is passed in as workflow.step.end ends the step, not the workflow, the timeTravel info is passed to the next step to run.
           stepResults: {
             ...stepResults,
+            [step.step.id]: stepResult,
             __state: updatedState
           },
           prevResult: stepResult,
@@ -4401,9 +4488,10 @@ var EventedExecutionEngine = class extends ExecutionEngine {
     }
     let result;
     if (resultData.prevResult.status === "suspended") {
-      const suspendedSteps = Object.entries(resultData.stepResults).map(([_stepId, stepResult]) => {
+      const suspendedSteps = Object.entries(resultData.stepResults).map(([stepId, stepResult]) => {
         if (stepResult.status === "suspended") {
-          return stepResult.suspendPayload?.__workflow_meta?.path ?? [];
+          const existingPath = stepResult.suspendPayload?.__workflow_meta?.path ?? [];
+          return [stepId, ...existingPath];
         }
         return null;
       }).filter(Boolean);
@@ -4446,5 +4534,5 @@ var EventedExecutionEngine = class extends ExecutionEngine {
 };
 
 export { EventedExecutionEngine, EventedRun, EventedWorkflow, StepExecutor, WorkflowEventProcessor, cloneStep, cloneWorkflow, createStep, createWorkflow };
-//# sourceMappingURL=chunk-YV2YGQRY.js.map
-//# sourceMappingURL=chunk-YV2YGQRY.js.map
+//# sourceMappingURL=chunk-RHKNKJNM.js.map
+//# sourceMappingURL=chunk-RHKNKJNM.js.map