@mastra/core 0.8.0-alpha.7 → 0.8.0

package/dist/agent/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkLK5H7SEM_cjs = require('../chunk-LK5H7SEM.cjs');
+var chunkENOIN7PM_cjs = require('../chunk-ENOIN7PM.cjs');
 
 
 
 Object.defineProperty(exports, "Agent", {
   enumerable: true,
-  get: function () { return chunkLK5H7SEM_cjs.Agent; }
+  get: function () { return chunkENOIN7PM_cjs.Agent; }
 });

package/dist/agent/index.d.cts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-2iKEEo-U.cjs';
+export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-nVWefprR.cjs';
 import '../base-BihKcqDY.cjs';
 import '../types-BtMyV38I.cjs';
 import 'sift';

package/dist/agent/index.d.ts

@@ -1,7 +1,7 @@
 export { Message as AiMessageType } from 'ai';
 import 'json-schema';
 import 'zod';
-export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-BkKZJMd4.js';
+export { j as Agent, k as AgentConfig, aM as AgentGenerateOptions, aN as AgentStreamOptions, aG as MastraLanguageModel, aH as ToolsInput, aL as ToolsetsInput } from '../base-C7f5RDDD.js';
 import '../base-DT2poiVK.js';
 import '../types-BtMyV38I.js';
 import 'sift';

package/dist/agent/index.js

@@ -1 +1 @@
-export { Agent } from '../chunk-TFDALD5V.js';
+export { Agent } from '../chunk-SGR6AJWC.js';

package/dist/{base-BkKZJMd4.d.ts → base-C7f5RDDD.d.ts}

@@ -560,7 +560,7 @@ declare class Step<TStepId extends string = any, TSchemaIn extends z.ZodSchema |
 }
 declare function createStep<TId extends string, TSchemaIn extends z.ZodSchema | undefined, TSchemaOut extends z.ZodSchema | undefined, TContext extends StepExecutionContext<TSchemaIn>>(opts: StepAction<TId, TSchemaIn, TSchemaOut, TContext>): Step<TId, TSchemaIn, TSchemaOut, TContext>;
 
-declare class Machine<TSteps extends Step<any, any, any>[] = any, TTriggerSchema extends z.ZodObject<any> = any, TResultSchema extends z.ZodObject<any> = any> extends EventEmitter {
+declare class Machine<TSteps extends Step<any, any, any, any>[] = Step<any, any, any, any>[], TTriggerSchema extends z.ZodObject<any> = any, TResultSchema extends z.ZodObject<any> = any> extends EventEmitter {
     #private;
     logger: Logger;
     name: string;
@@ -571,7 +571,7 @@ declare class Machine<TSteps extends Step<any, any, any>[] = any, TTriggerSchema
         executionSpan?: Span;
         name: string;
         runId: string;
-        steps: Record<string, TSteps[0]>;
+        steps: Record<string, StepNode>;
         stepGraph: StepGraph;
         retryConfig?: RetryConfig;
         startStepId: string;
@@ -946,7 +946,7 @@ interface WorkflowResultReturn<TResult extends z.ZodObject<any>, T extends z.Zod
     }) => Promise<Omit<WorkflowRunResult<T, TSteps, TResult>, 'runId'> | undefined>;
     resumeWithEvent: (eventName: string, data: any) => Promise<Omit<WorkflowRunResult<T, TSteps, TResult>, 'runId'> | undefined>;
 }
-declare class WorkflowInstance<TSteps extends Step<any, any, any>[] = any, TTriggerSchema extends z.ZodObject<any> = any, TResult extends z.ZodObject<any> = any> implements WorkflowResultReturn<TResult, TTriggerSchema, TSteps> {
+declare class WorkflowInstance<TSteps extends Step<any, any, any, any>[] = Step<any, any, any, any>[], TTriggerSchema extends z.ZodObject<any> = any, TResult extends z.ZodObject<any> = any> implements WorkflowResultReturn<TResult, TTriggerSchema, TSteps> {
     #private;
     name: string;
     logger: Logger;
@@ -956,7 +956,7 @@ declare class WorkflowInstance<TSteps extends Step<any, any, any>[] = any, TTrig
     constructor({ name, logger, steps, runId, retryConfig, mastra, stepGraph, stepSubscriberGraph, onFinish, onStepTransition, resultMapping, events, }: {
         name: string;
         logger: Logger;
-        steps: Record<string, StepAction<any, any, any, any>>;
+        steps: Record<string, StepNode>;
         mastra?: Mastra;
         retryConfig?: RetryConfig;
         runId?: string;
@@ -998,7 +998,7 @@ declare class WorkflowInstance<TSteps extends Step<any, any, any>[] = any, TTrig
         resumeData?: any;
     }): Promise<Omit<WorkflowRunResult<TTriggerSchema, TSteps, TResult>, 'runId'>>;
     hasSubscribers(stepId: string): boolean;
-    runMachine(parentStepId: string, input: any): Promise<(Pick<WorkflowRunResult<any, any, any>, "runId" | "timestamp" | "results" | "activePaths"> | undefined)[]>;
+    runMachine(parentStepId: string, input: any): Promise<(Pick<WorkflowRunResult<TTriggerSchema, TSteps, TResult>, "runId" | "timestamp" | "results" | "activePaths"> | undefined)[]>;
     suspend(stepId: string, machine: Machine<TSteps, TTriggerSchema>): Promise<void>;
     /**
      * Persists the workflow state to the database

package/dist/{base-2iKEEo-U.d.cts → base-nVWefprR.d.cts}

@@ -560,7 +560,7 @@ declare class Step<TStepId extends string = any, TSchemaIn extends z.ZodSchema |
 }
 declare function createStep<TId extends string, TSchemaIn extends z.ZodSchema | undefined, TSchemaOut extends z.ZodSchema | undefined, TContext extends StepExecutionContext<TSchemaIn>>(opts: StepAction<TId, TSchemaIn, TSchemaOut, TContext>): Step<TId, TSchemaIn, TSchemaOut, TContext>;
 
-declare class Machine<TSteps extends Step<any, any, any>[] = any, TTriggerSchema extends z.ZodObject<any> = any, TResultSchema extends z.ZodObject<any> = any> extends EventEmitter {
+declare class Machine<TSteps extends Step<any, any, any, any>[] = Step<any, any, any, any>[], TTriggerSchema extends z.ZodObject<any> = any, TResultSchema extends z.ZodObject<any> = any> extends EventEmitter {
     #private;
     logger: Logger;
     name: string;
@@ -571,7 +571,7 @@ declare class Machine<TSteps extends Step<any, any, any>[] = any, TTriggerSchema
         executionSpan?: Span;
         name: string;
         runId: string;
-        steps: Record<string, TSteps[0]>;
+        steps: Record<string, StepNode>;
         stepGraph: StepGraph;
         retryConfig?: RetryConfig;
         startStepId: string;
@@ -946,7 +946,7 @@ interface WorkflowResultReturn<TResult extends z.ZodObject<any>, T extends z.Zod
     }) => Promise<Omit<WorkflowRunResult<T, TSteps, TResult>, 'runId'> | undefined>;
     resumeWithEvent: (eventName: string, data: any) => Promise<Omit<WorkflowRunResult<T, TSteps, TResult>, 'runId'> | undefined>;
 }
-declare class WorkflowInstance<TSteps extends Step<any, any, any>[] = any, TTriggerSchema extends z.ZodObject<any> = any, TResult extends z.ZodObject<any> = any> implements WorkflowResultReturn<TResult, TTriggerSchema, TSteps> {
+declare class WorkflowInstance<TSteps extends Step<any, any, any, any>[] = Step<any, any, any, any>[], TTriggerSchema extends z.ZodObject<any> = any, TResult extends z.ZodObject<any> = any> implements WorkflowResultReturn<TResult, TTriggerSchema, TSteps> {
     #private;
     name: string;
     logger: Logger;
@@ -956,7 +956,7 @@ declare class WorkflowInstance<TSteps extends Step<any, any, any>[] = any, TTrig
     constructor({ name, logger, steps, runId, retryConfig, mastra, stepGraph, stepSubscriberGraph, onFinish, onStepTransition, resultMapping, events, }: {
         name: string;
         logger: Logger;
-        steps: Record<string, StepAction<any, any, any, any>>;
+        steps: Record<string, StepNode>;
         mastra?: Mastra;
         retryConfig?: RetryConfig;
         runId?: string;
@@ -998,7 +998,7 @@ declare class WorkflowInstance<TSteps extends Step<any, any, any>[] = any, TTrig
         resumeData?: any;
     }): Promise<Omit<WorkflowRunResult<TTriggerSchema, TSteps, TResult>, 'runId'>>;
     hasSubscribers(stepId: string): boolean;
-    runMachine(parentStepId: string, input: any): Promise<(Pick<WorkflowRunResult<any, any, any>, "runId" | "timestamp" | "results" | "activePaths"> | undefined)[]>;
+    runMachine(parentStepId: string, input: any): Promise<(Pick<WorkflowRunResult<TTriggerSchema, TSteps, TResult>, "runId" | "timestamp" | "results" | "activePaths"> | undefined)[]>;
     suspend(stepId: string, machine: Machine<TSteps, TTriggerSchema>): Promise<void>;
     /**
      * Persists the workflow state to the database

package/dist/{chunk-KHMCAV4W.js → chunk-A74FQNCI.js}

@@ -1,4 +1,4 @@
-import { Agent } from './chunk-TFDALD5V.js';
+import { Agent } from './chunk-SGR6AJWC.js';
 import { CohereClient } from 'cohere-ai';
 
 var CohereRelevanceScorer = class {

package/dist/{chunk-LK5H7SEM.cjs → chunk-ENOIN7PM.cjs}

@@ -2052,6 +2052,9 @@ function generateRandomLetters(length) {
   }
   return result;
 }
+function isConditionalKey(key) {
+  return key.startsWith("__") && (key.includes("_if") || key.includes("_else"));
+}
 var Machine = class extends EventEmitter__default.default {
   logger;
   #mastra;
@@ -2247,7 +2250,7 @@ var Machine = class extends EventEmitter__default.default {
   #makeDelayMap() {
     const delayMap = {};
     Object.keys(this.#steps).forEach(stepId => {
-      delayMap[stepId] = this.#steps[stepId]?.retryConfig?.delay || this.#retryConfig?.delay || 1e3;
+      delayMap[stepId] = this.#steps[stepId]?.step?.retryConfig?.delay || this.#retryConfig?.delay || 1e3;
     });
     return delayMap;
   }
@@ -2500,6 +2503,11 @@ var Machine = class extends EventEmitter__default.default {
               type: "CONDITIONS_MET"
             };
           }
+          if (isConditionalKey(stepNode.id)) {
+            return {
+              type: "CONDITIONS_LIMBO"
+            };
+          }
           return this.#workflowInstance.hasSubscribers(stepNode.id) ? {
             type: "CONDITIONS_SKIPPED"
           } : {
@@ -3247,7 +3255,7 @@ var WorkflowInstance = class {
       steps: {},
       triggerData: triggerData || {},
       attempts: Object.keys(this.#steps).reduce((acc, stepKey) => {
-        acc[stepKey] = this.#steps[stepKey]?.retryConfig?.attempts || this.#retryConfig?.attempts || 0;
+        acc[stepKey] = this.#steps[stepKey]?.step?.retryConfig?.attempts || this.#retryConfig?.attempts || 0;
         return acc;
       }, {})
     };
@@ -3616,7 +3624,7 @@ var WorkflowInstance = class {
     }
     parsedSnapshot.value = updateStepInHierarchy(parsedSnapshot.value, stepId);
     if (parsedSnapshot.context?.attempts) {
-      parsedSnapshot.context.attempts[stepId] = this.#steps[stepId]?.retryConfig?.attempts || this.#retryConfig?.attempts || 0;
+      parsedSnapshot.context.attempts[stepId] = this.#steps[stepId]?.step?.retryConfig?.attempts || this.#retryConfig?.attempts || 0;
     }
     this.logger.debug("Resuming workflow with updated snapshot", {
       updatedSnapshot: parsedSnapshot,
@@ -3673,7 +3681,7 @@ var WorkflowInstance = class {
       const {
         payload = {},
         execute = async () => {}
-      } = targetStep;
+      } = targetStep.step;
       const mergedData = {
         ...payload,
         ...context
@@ -3741,6 +3749,7 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
   #stepSubscriberGraph = {};
   #serializedStepSubscriberGraph = {};
   #steps = {};
+  #ifCount = 0;
   /**
    * Creates a new Workflow instance
    * @param name - Identifier for the workflow (not necessarily unique)
@@ -3831,7 +3840,7 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
         return that.#makeStepKey(this.step, this.config);
       }
     };
-    this.#steps[stepKey] = step;
+    this.#steps[stepKey] = graphEntry;
     const parentStepKey = this.#getParentStepKey({
       loop_check: true
     });
@@ -3906,7 +3915,7 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
         return that.#makeStepKey(this.step, this.config);
       }
     };
-    this.#steps[stepKey] = step;
+    this.#steps[stepKey] = graphEntry;
     const parentStepKey = this.#getParentStepKey();
     const stepGraph = this.#stepSubscriberGraph[parentStepKey || ""];
     const serializedStepGraph = this.#serializedStepSubscriberGraph[parentStepKey || ""];
@@ -3937,7 +3946,7 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
       if (!lastStep) {
         throw new Error("Condition requires a step to be executed after");
       }
-      this.after(lastStep);
+      this.after(lastStep.step);
       const nextSteps = next.map(step2 => {
         if (isWorkflow(step2)) {
           return workflowToStep(step2, {
@@ -3990,9 +3999,9 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
         return that.#makeStepKey(this.step, this.config);
       }
     };
-    this.#steps[stepKey] = step;
+    this.#steps[stepKey] = graphEntry;
     if (!lastStepKey) return this;
-    const parentStepKey = this.#afterStepStack[this.#afterStepStack.length - 1];
+    const parentStepKey = this.#getParentStepKey();
     const stepGraph = this.#stepSubscriberGraph[parentStepKey || ""];
     const serializedStepGraph = this.#serializedStepSubscriberGraph[parentStepKey || ""];
     if (parentStepKey && this.#lastBuilderType === "after") {
@@ -4014,7 +4023,16 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
     const lastStepKey = this.#lastStepStack[this.#lastStepStack.length - 1];
     if (!lastStepKey) return this;
     const fallbackStepKey = this.#makeStepKey(fallbackStep);
-    this.#steps[fallbackStepKey] = fallbackStep;
+    const fallbackStepNode = {
+      step: fallbackStep,
+      config: {
+        ...this.#makeStepDef(fallbackStepKey)
+      },
+      get id() {
+        return fallbackStepKey;
+      }
+    };
+    this.#steps[fallbackStepKey] = fallbackStepNode;
     const checkStepKey = `__${fallbackStepKey}_${loopType}_loop_check`;
     const checkStep = {
       id: checkStepKey,
@@ -4068,7 +4086,16 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
         status: zod.z.enum(["continue", "complete"])
       })
     };
-    this.#steps[checkStepKey] = checkStep;
+    const checkStepNode = {
+      step: checkStep,
+      config: {
+        ...this.#makeStepDef(checkStepKey)
+      },
+      get id() {
+        return checkStepKey;
+      }
+    };
+    this.#steps[checkStepKey] = checkStepNode;
     const loopFinishedStepKey = `__${fallbackStepKey}_${loopType}_loop_finished`;
     const loopFinishedStep = {
       id: loopFinishedStepKey,
@@ -4078,7 +4105,16 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
         };
       }
     };
-    this.#steps[loopFinishedStepKey] = loopFinishedStep;
+    const loopFinishedStepNode = {
+      step: loopFinishedStep,
+      config: {
+        ...this.#makeStepDef(loopFinishedStepKey)
+      },
+      get id() {
+        return loopFinishedStepKey;
+      }
+    };
+    this.#steps[loopFinishedStepKey] = loopFinishedStepNode;
     this.then(checkStep, {
       id: checkStepKey,
       "#internal": {
@@ -4204,11 +4240,14 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
     return res;
   }
   if(condition, ifStep, elseStep) {
-    const lastStep = this.#steps[this.#lastStepStack[this.#lastStepStack.length - 1] ?? ""];
+    this.#ifCount++;
+    const lastStep = this.#getLastStep({
+      if_else_check: this.#lastBuilderType !== "else"
+    });
     if (!lastStep) {
       throw new Error("Condition requires a step to be executed after");
     }
-    this.after(lastStep);
+    this.after(lastStep.step);
     if (ifStep) {
       const _ifStep = isWorkflow(ifStep) ? workflowToStep(ifStep, {
         mastra: this.#mastra
@@ -4244,7 +4283,7 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
       }));
       return this;
     }
-    const ifStepKey = `__${lastStep.id}_if`;
+    const ifStepKey = `__${lastStep.id}_if_${this.#ifCount}`;
     this.step({
       id: ifStepKey,
       execute: async () => {
@@ -4256,11 +4295,11 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
       id: ifStepKey,
       when: condition
     });
-    const elseStepKey = `__${lastStep.id}_else`;
+    const elseStepKey = `__${lastStep.id}_else_${this.#ifCount}`;
     this.#ifStack.push({
       condition,
       elseStepKey,
-      condStep: lastStep
+      condStep: lastStep.step
     });
     this.#lastBuilderType = "if";
     return this;
@@ -4333,7 +4372,7 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
         };
       }
     });
-    this.after(lastStep).step(eventStep).after(eventStep);
+    this.after(lastStep.step).step(eventStep).after(eventStep);
     this.#lastBuilderType = "afterEvent";
     return this;
   }
@@ -4425,19 +4464,31 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
     return this.#runs.get(runId)?.executionSpan;
   }
   #getParentStepKey({
-    loop_check
-  } = {
-    loop_check: false
-  }) {
-    let parentStepKey = void 0;
+    loop_check = false,
+    if_else_check = false
+  } = {}) {
     for (let i = this.#afterStepStack.length - 1; i >= 0; i--) {
       const stepKey = this.#afterStepStack[i];
-      if (stepKey && this.#stepSubscriberGraph[stepKey] && (loop_check ? !stepKey.includes("loop_check") : true)) {
-        parentStepKey = stepKey;
-        break;
+      if (!stepKey) continue;
+      const isValidStep = this.#stepSubscriberGraph[stepKey] && (!loop_check || !stepKey.includes("loop_check")) && (!if_else_check || !isConditionalKey(stepKey));
+      if (isValidStep) {
+        return stepKey;
       }
     }
-    return parentStepKey;
+    return void 0;
+  }
+  #getLastStep({
+    if_else_check
+  }) {
+    for (let i = this.#lastStepStack.length - 1; i >= 0; i--) {
+      const stepKey = this.#lastStepStack[i];
+      if (!stepKey) continue;
+      const step = this.#steps[stepKey];
+      const isInvalidStep = !step || if_else_check && isConditionalKey(stepKey);
+      if (isInvalidStep) continue;
+      return step;
+    }
+    return void 0;
   }
   #makeStepDef(stepId) {
     const executeStep = (handler2, spanName, attributes) => {
@@ -4463,7 +4514,7 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
       const {
         payload = {},
         execute = async () => {}
-      } = targetStep;
+      } = targetStep.step;
       const finalAction = this.telemetry ? executeStep(execute, `workflow.${this.name}.action.${stepId}`, {
         componentName: this.name,
         runId: rest.runId
@@ -4611,7 +4662,10 @@ var Workflow = class extends chunkD63P5O4Q_cjs.MastraBase {
     return this.#serializedStepSubscriberGraph;
   }
   get steps() {
-    return this.#steps;
+    return Object.entries(this.#steps).reduce((acc, [key, step]) => {
+      acc[key] = step.step;
+      return acc;
+    }, {});
   }
   setNested(isNested) {
     this.isNested = isNested;
@@ -4634,6 +4688,7 @@ exports.getResultActivePaths = getResultActivePaths;
 exports.getStepResult = getStepResult;
 exports.getSuspendedPaths = getSuspendedPaths;
 exports.isAgent = isAgent;
+exports.isConditionalKey = isConditionalKey;
 exports.isErrorEvent = isErrorEvent;
 exports.isFinalState = isFinalState;
 exports.isLimboState = isLimboState;

package/dist/{chunk-S3VEAYDK.cjs → chunk-FUQKE5AK.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkLK5H7SEM_cjs = require('./chunk-LK5H7SEM.cjs');
+var chunkENOIN7PM_cjs = require('./chunk-ENOIN7PM.cjs');
 var cohereAi = require('cohere-ai');
 
 var CohereRelevanceScorer = class {
@@ -38,7 +38,7 @@ Relevance score (0-1):`;
 var MastraAgentRelevanceScorer = class {
   agent;
   constructor(name, model) {
-    this.agent = new chunkLK5H7SEM_cjs.Agent({
+    this.agent = new chunkENOIN7PM_cjs.Agent({
       name: `Relevance Scorer ${name}`,
       instructions: `You are a specialized agent for evaluating the relevance of text to queries.
 Your task is to rate how well a text passage answers a given query.