@mastra/core 0.9.4 → 0.10.0-alpha.1

package/dist/{chunk-66GQROSI.cjs → chunk-AOGUTJUO.cjs}

@@ -1,13 +1,13 @@
 'use strict';
 
-var chunkS7J63JOG_cjs = require('./chunk-S7J63JOG.cjs');
-var chunkXRGDVLM4_cjs = require('./chunk-XRGDVLM4.cjs');
+var chunkRVS6OUJN_cjs = require('./chunk-RVS6OUJN.cjs');
+var chunkST5RMVLG_cjs = require('./chunk-ST5RMVLG.cjs');
+var chunk5JRD3NDP_cjs = require('./chunk-5JRD3NDP.cjs');
 var chunkUVRGQEMD_cjs = require('./chunk-UVRGQEMD.cjs');
-var chunkEJITEVAB_cjs = require('./chunk-EJITEVAB.cjs');
+var chunkU3L3NEOM_cjs = require('./chunk-U3L3NEOM.cjs');
+var chunkYEULQPUY_cjs = require('./chunk-YEULQPUY.cjs');
+var chunkSWW4EBUZ_cjs = require('./chunk-SWW4EBUZ.cjs');
 var chunkLABUWBKX_cjs = require('./chunk-LABUWBKX.cjs');
-var chunkST5RMVLG_cjs = require('./chunk-ST5RMVLG.cjs');
-var chunkEG74VBSP_cjs = require('./chunk-EG74VBSP.cjs');
-var chunkO44MSFMZ_cjs = require('./chunk-O44MSFMZ.cjs');
 var chunkRWTSGWWL_cjs = require('./chunk-RWTSGWWL.cjs');
 var api = require('@opentelemetry/api');
 var zod = require('zod');
@@ -22,8 +22,8 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var EventEmitter__default = /*#__PURE__*/_interopDefault(EventEmitter);
 var sift__default = /*#__PURE__*/_interopDefault(sift);
 
-// src/workflows/step.ts
-var Step = class {
+// src/workflows/legacy/step.ts
+var LegacyStep = class {
   id;
   description;
   inputSchema;
@@ -51,7 +51,7 @@ var Step = class {
   }
 };
 
-// src/workflows/types.ts
+// src/workflows/legacy/types.ts
 var WhenConditionReturnValue = /* @__PURE__ */(WhenConditionReturnValue2 => {
   WhenConditionReturnValue2["CONTINUE"] = "continue";
   WhenConditionReturnValue2["CONTINUE_FAILED"] = "continue_failed";
@@ -70,7 +70,7 @@ _Agent_decorators = [chunkUVRGQEMD_cjs.InstrumentClass({
   prefix: "agent",
   excludeMethods: ["hasOwnMemory", "getMemory", "__primitive", "__registerMastra", "__registerPrimitives", "__setTools", "__setLogger", "__setTelemetry", "log", "getModel", "getInstructions", "getTools", "getLLM", "getWorkflows"]
 })];
-exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
+exports.Agent = class Agent extends (_a = chunkYEULQPUY_cjs.MastraBase) {
   id;
   name;
   #instructions;
@@ -87,7 +87,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
   #voice;
   constructor(config) {
     super({
-      component: chunkO44MSFMZ_cjs.RegisteredLogger.AGENT
+      component: chunkSWW4EBUZ_cjs.RegisteredLogger.AGENT
     });
     this.name = config.name;
     this.id = config.name;
@@ -131,14 +131,21 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunkS7J63JOG_cjs.DefaultVoice();
+      this.#voice = new chunkRVS6OUJN_cjs.DefaultVoice();
     }
   }
   hasOwnMemory() {
     return Boolean(this.#memory);
   }
   getMemory() {
-    return this.#memory ?? this.#mastra?.memory;
+    const memory = this.#memory;
+    if (memory && !memory.hasOwnStorage && this.#mastra) {
+      const storage = this.#mastra.getStorage();
+      if (storage) {
+        memory.setStorage(storage);
+      }
+    }
+    return memory;
   }
   get voice() {
     if (typeof this.#instructions === "function") {
@@ -177,7 +184,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
       }));
       return voice;
     } else {
-      return new chunkS7J63JOG_cjs.DefaultVoice();
+      return new chunkRVS6OUJN_cjs.DefaultVoice();
     }
   }
   get instructions() {
@@ -209,13 +216,13 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
     if (typeof this.#tools === "function") {
       throw new Error("Tools are not compatible when tools are a function. Please use getTools() instead.");
     }
-    return chunkEJITEVAB_cjs.ensureToolProperties(this.#tools);
+    return chunkU3L3NEOM_cjs.ensureToolProperties(this.#tools);
   }
   getTools({
     runtimeContext = new chunkLABUWBKX_cjs.RuntimeContext()
   } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkEJITEVAB_cjs.ensureToolProperties(this.#tools);
+      return chunkU3L3NEOM_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       runtimeContext
@@ -225,7 +232,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
         this.logger.error(`[Agent:${this.name}] - Function-based tools returned empty value`);
         throw new Error("Tools are required when using a function to provide them. The function returned an empty value.");
       }
-      return chunkEJITEVAB_cjs.ensureToolProperties(tools);
+      return chunkU3L3NEOM_cjs.ensureToolProperties(tools);
     });
   }
   get llm() {
@@ -247,7 +254,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
       runtimeContext
     });
     return resolveMaybePromise(model, model2 => {
-      const llm = new chunkXRGDVLM4_cjs.MastraLLM({
+      const llm = new chunk5JRD3NDP_cjs.MastraLLM({
         model: model2,
         mastra: this.#mastra
       });
@@ -386,7 +393,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
           messages: userMessages
         };
       }
-      const newMessages = chunkEJITEVAB_cjs.ensureAllMessagesAreCoreMessages(userMessages);
+      const newMessages = chunkU3L3NEOM_cjs.ensureAllMessagesAreCoreMessages(userMessages);
       const now = Date.now();
       const messages = newMessages.map((u, index) => {
         return {
@@ -638,7 +645,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
           runtimeContext
         }) : this.model
       };
-      return [k, chunkEJITEVAB_cjs.makeCoreTool(tool, options)];
+      return [k, chunkU3L3NEOM_cjs.makeCoreTool(tool, options)];
     }));
     const assignedToolEntriesConverted = Object.fromEntries(assignedCoreToolEntries.filter(entry => Boolean(entry)));
     toolsForRequest = {
@@ -678,7 +685,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
               runtimeContext
             }) : this.model
           };
-          const convertedToCoreTool = chunkEJITEVAB_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunkU3L3NEOM_cjs.makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -719,7 +726,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
             runtimeContext
           }) : this.model
         };
-        const convertedToCoreTool = chunkEJITEVAB_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunkU3L3NEOM_cjs.makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -786,7 +793,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkEJITEVAB_cjs.createMastraProxy({
+      mastraProxy = chunkU3L3NEOM_cjs.createMastraProxy({
         mastra: this.#mastra,
         logger
       });
@@ -994,7 +1001,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
           try {
             const userMessage = this.getMostRecentUserMessage(messages);
             const now = Date.now();
-            const threadMessages = this.sanitizeResponseMessages(chunkEJITEVAB_cjs.ensureAllMessagesAreCoreMessages(messages)).map((u, index) => {
+            const threadMessages = this.sanitizeResponseMessages(chunkU3L3NEOM_cjs.ensureAllMessagesAreCoreMessages(messages)).map((u, index) => {
               return {
                 id: `id` in u && u.id || experimental_generateMessageId ? experimental_generateMessageId() : this.getMemory()?.generateId(),
                 createdAt: new Date(now + index),
@@ -1143,7 +1150,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
         messages: messageObjects,
         tools: convertedTools,
         onStepFinish: result3 => {
-          void onStepFinish?.(result3);
+          return onStepFinish?.(result3);
         },
         maxSteps,
         runId: runIdToUse,
@@ -1175,7 +1182,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
         messages: messageObjects,
         tools: convertedTools,
         onStepFinish: result3 => {
-          void onStepFinish?.(result3);
+          return onStepFinish?.(result3);
         },
         maxSteps,
         runId: runIdToUse,
@@ -1205,7 +1212,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
       tools: convertedTools,
       structuredOutput: output,
       onStepFinish: result2 => {
-        void onStepFinish?.(result2);
+        return onStepFinish?.(result2);
       },
       maxSteps,
       runId: runIdToUse,
@@ -1303,7 +1310,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
         temperature,
         tools: convertedTools,
         onStepFinish: result => {
-          void onStepFinish?.(result);
+          return onStepFinish?.(result);
         },
         onFinish: async result => {
           try {
@@ -1323,7 +1330,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
               runId
             });
           }
-          void onFinish?.(result);
+          await onFinish?.(result);
         },
         maxSteps,
         runId: runIdToUse,
@@ -1345,7 +1352,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
         temperature,
         tools: convertedTools,
         onStepFinish: result => {
-          void onStepFinish?.(result);
+          return onStepFinish?.(result);
         },
         onFinish: async result => {
           try {
@@ -1365,7 +1372,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
               runId
             });
           }
-          void onFinish?.(result);
+          await onFinish?.(result);
         },
         maxSteps,
         runId: runIdToUse,
@@ -1385,7 +1392,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
       temperature,
       structuredOutput: output,
       onStepFinish: result => {
-        void onStepFinish?.(result);
+        return onStepFinish?.(result);
       },
       onFinish: async result => {
         try {
@@ -1405,7 +1412,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
             runId
           });
         }
-        void onFinish?.(result);
+        await onFinish?.(result);
       },
       runId: runIdToUse,
       toolChoice,
@@ -1479,7 +1486,7 @@ exports.Agent = class Agent extends (_a = chunkEG74VBSP_cjs.MastraBase) {
   }
   toStep() {
     const x = agentToStep(this);
-    return new Step(x);
+    return new LegacyStep(x);
   }
 };
 exports.Agent = /*@__PURE__*/(_ => {
@@ -1487,10 +1494,10 @@ exports.Agent = /*@__PURE__*/(_ => {
   exports.Agent = chunkRWTSGWWL_cjs.__decorateElement(_init, 0, "Agent", _Agent_decorators, exports.Agent);
   chunkRWTSGWWL_cjs.__runInitializers(_init, 1, exports.Agent);
 
-  // src/workflows/utils.ts
+  // src/workflows/legacy/utils.ts
   return exports.Agent;
 })();
-// src/workflows/utils.ts
+// src/workflows/legacy/utils.ts
 function isErrorEvent(stateEvent) {
   return stateEvent.type.startsWith("xstate.error.actor.");
 }
@@ -1609,7 +1616,7 @@ function getResultActivePaths(state) {
   return activePathsAndStatus;
 }
 function isWorkflow(step) {
-  return step instanceof Workflow;
+  return step instanceof LegacyWorkflow;
 }
 function isAgent(step) {
   return step instanceof exports.Agent;
@@ -1723,7 +1730,7 @@ function workflowToStep(workflow, {
       });
       unwatch();
       if (!awaitedResult) {
-        throw new Error("Workflow run failed");
+        throw new Error("LegacyWorkflow run failed");
       }
       if (awaitedResult.activePaths?.size > 0) {
         const suspendedStep = [...awaitedResult.activePaths.entries()].find(([, {
@@ -2078,7 +2085,7 @@ var Machine = class extends EventEmitter__default.default {
         const logger = this.logger;
         let mastraProxy = void 0;
         if (this.#mastra) {
-          mastraProxy = chunkEJITEVAB_cjs.createMastraProxy({
+          mastraProxy = chunkU3L3NEOM_cjs.createMastraProxy({
             mastra: this.#mastra,
             logger
           });
@@ -2875,7 +2882,7 @@ var Machine = class extends EventEmitter__default.default {
   }
 };
 
-// src/workflows/workflow-instance.ts
+// src/workflows/legacy/workflow-instance.ts
 var WorkflowInstance = class {
   name;
   #mastra;
@@ -3459,8 +3466,8 @@ var WorkflowInstance = class {
   }
 };
 
-// src/workflows/workflow.ts
-var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
+// src/workflows/legacy/workflow.ts
+var LegacyWorkflow = class extends chunkYEULQPUY_cjs.MastraBase {
   name;
   triggerSchema;
   resultSchema;
@@ -3487,7 +3494,7 @@ var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
   #steps = {};
   #ifCount = 0;
   /**
-   * Creates a new Workflow instance
+   * Creates a new LegacyWorkflow instance
    * @param name - Identifier for the workflow (not necessarily unique)
    * @param logger - Optional logger instance
    */
@@ -3532,7 +3539,7 @@ var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
       });
       nextSteps.forEach(step2 => this.step(step2, config));
       this.after(nextSteps);
-      this.step(new Step({
+      this.step(new LegacyStep({
         id: `__after_${next.map(step2 => config?.id ?? step2?.id ?? step2?.name).join("_")}`,
         execute: async () => {
           return {
@@ -3611,7 +3618,7 @@ var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
       });
       nextSteps.forEach(step2 => this.#__internalStep(step2, config, internalUse));
       this.after(nextSteps);
-      this.#__internalStep(new Step({
+      this.#__internalStep(new LegacyStep({
         id: `__after_${next.map(step2 => step2?.id ?? step2?.name).join("_")}`,
         execute: async () => {
           return {
@@ -3695,7 +3702,7 @@ var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
         return step2;
       });
       nextSteps.forEach(step2 => this.step(step2, config));
-      this.step(new Step({
+      this.step(new LegacyStep({
         // @ts-ignore
         id: `__after_${next.map(step2 => step2?.id ?? step2?.name).join("_")}`,
         execute: async () => {
@@ -4009,7 +4016,7 @@ var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
       } else {
         this.after(_ifStep);
       }
-      this.step(new Step({
+      this.step(new LegacyStep({
         id: `${lastStep.id}_if_else`,
         execute: async () => {
           return {
@@ -4090,7 +4097,7 @@ var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
       throw new Error("Condition requires a step to be executed after");
     }
     const eventStepKey = `__${eventName}_event`;
-    const eventStep = new Step({
+    const eventStep = new LegacyStep({
       id: eventStepKey,
       execute: async ({
         context,
@@ -4436,13 +4443,13 @@ var Workflow = class extends chunkEG74VBSP_cjs.MastraBase {
     const x = workflowToStep(this, {
       mastra: this.#mastra
     });
-    return new Step(x);
+    return new LegacyStep(x);
   }
 };
 
-exports.Step = Step;
+exports.LegacyStep = LegacyStep;
+exports.LegacyWorkflow = LegacyWorkflow;
 exports.WhenConditionReturnValue = WhenConditionReturnValue;
-exports.Workflow = Workflow;
 exports.agentToStep = agentToStep;
 exports.getActivePathsAndStatus = getActivePathsAndStatus;
 exports.getResultActivePaths = getResultActivePaths;

package/dist/{chunk-WIKOYZ63.js → chunk-BPTSLJHA.js}

@@ -1,6 +1,6 @@
-import { delay } from './chunk-S34QVMKE.js';
-import { MastraBase } from './chunk-235X76GC.js';
-import { RegisteredLogger } from './chunk-CMPPXW4U.js';
+import { delay } from './chunk-2PW6UJMW.js';
+import { MastraBase } from './chunk-FI7R232B.js';
+import { RegisteredLogger } from './chunk-VHLL4AZK.js';
 import { jsonSchema, generateText, Output, generateObject, streamText, streamObject } from 'ai';
 import { z } from 'zod';
 
@@ -149,7 +149,7 @@ var MastraLLM = class extends MastraLLMBase {
       toolChoice,
       maxSteps,
       onStepFinish: async (props) => {
-        void onStepFinish?.(props);
+        await onStepFinish?.(props);
         this.logger.debug("[LLM] - Step Change:", {
           text: props?.text,
           toolCalls: props?.toolCalls,
@@ -218,7 +218,7 @@ var MastraLLM = class extends MastraLLMBase {
       maxSteps,
       toolChoice,
       onStepFinish: async (props) => {
-        void onStepFinish?.(props);
+        await onStepFinish?.(props);
         this.logger.debug("[LLM] - Step Change:", {
           text: props?.text,
           toolCalls: props?.toolCalls,
@@ -291,7 +291,7 @@ var MastraLLM = class extends MastraLLMBase {
       maxSteps,
       toolChoice,
       onStepFinish: async (props) => {
-        void onStepFinish?.(props);
+        await onStepFinish?.(props);
         this.logger.debug("[LLM] - Stream Step Change:", {
           text: props?.text,
           toolCalls: props?.toolCalls,
@@ -306,7 +306,7 @@ var MastraLLM = class extends MastraLLMBase {
         }
       },
       onFinish: async (props) => {
-        void onFinish?.(props);
+        await onFinish?.(props);
         this.logger.debug("[LLM] - Stream Finished:", {
           text: props?.text,
           toolCalls: props?.toolCalls,
@@ -380,7 +380,7 @@ var MastraLLM = class extends MastraLLMBase {
       maxSteps,
       toolChoice,
       onStepFinish: async (props) => {
-        void onStepFinish?.(props);
+        await onStepFinish?.(props);
         this.logger.debug("[LLM] - Stream Step Change:", {
           text: props?.text,
           toolCalls: props?.toolCalls,
@@ -397,7 +397,7 @@ var MastraLLM = class extends MastraLLMBase {
         }
       },
       onFinish: async (props) => {
-        void onFinish?.(props);
+        await onFinish?.(props);
         this.logger.debug("[LLM] - Stream Finished:", {
           text: props?.text,
           toolCalls: props?.toolCalls,

package/dist/{chunk-JBJ7KXN5.js → chunk-C3ICEF6E.js}

@@ -1,5 +1,5 @@
 import { InstrumentClass } from './chunk-BFNYQFG2.js';
-import { MastraBase } from './chunk-235X76GC.js';
+import { MastraBase } from './chunk-FI7R232B.js';
 import { __decoratorStart, __decorateElement, __runInitializers } from './chunk-C6A6W6XS.js';
 
 // src/tts/index.ts

package/dist/{chunk-E4FAXBUV.cjs → chunk-CWSFP2HS.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunkRGE4UF6A_cjs = require('./chunk-RGE4UF6A.cjs');
+var chunkTMPFLJLG_cjs = require('./chunk-TMPFLJLG.cjs');
 
 // src/deployer/index.ts
-var MastraDeployer = class extends chunkRGE4UF6A_cjs.MastraBundler {
+var MastraDeployer = class extends chunkTMPFLJLG_cjs.MastraBundler {
   constructor({ name }) {
     super({ component: "DEPLOYER", name });
   }