@mastra/core 1.0.0-beta.7 → 1.0.0-beta.8

package/dist/{chunk-RBBEMTMA.cjs → chunk-HP6TRJ2Q.cjs}

@@ -2,9 +2,9 @@
 
 var chunk4JKEUSCC_cjs = require('./chunk-4JKEUSCC.cjs');
 var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
-var chunkM7CQULF7_cjs = require('./chunk-M7CQULF7.cjs');
+var chunkKBXFAF37_cjs = require('./chunk-KBXFAF37.cjs');
 var chunkYBEW5YWC_cjs = require('./chunk-YBEW5YWC.cjs');
-var chunkHJNEZRI4_cjs = require('./chunk-HJNEZRI4.cjs');
+var chunk6BYHQ52F_cjs = require('./chunk-6BYHQ52F.cjs');
 var chunkYUXTDKYN_cjs = require('./chunk-YUXTDKYN.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
 var chunk6C2PU6J4_cjs = require('./chunk-6C2PU6J4.cjs');
@@ -1005,14 +1005,15 @@ async function validateStepResumeData({ resumeData, step }) {
 }
 async function validateStepSuspendData({
   suspendData,
-  step
+  step,
+  validateInputs
 }) {
   if (!suspendData) {
     return { suspendData: void 0, validationError: void 0 };
   }
   let validationError;
   const suspendSchema = step.suspendSchema;
-  if (suspendSchema) {
+  if (suspendSchema && validateInputs) {
     const validatedSuspendData = await suspendSchema.safeParseAsync(suspendData);
     if (!validatedSuspendData.success) {
       const errors = getZodErrors(validatedSuspendData.error);
@@ -1024,6 +1025,28 @@ async function validateStepSuspendData({
   }
   return { suspendData, validationError };
 }
+async function validateStepStateData({
+  stateData,
+  step,
+  validateInputs
+}) {
+  if (!stateData) {
+    return { stateData: void 0, validationError: void 0 };
+  }
+  let validationError;
+  const stateSchema = step.stateSchema;
+  if (stateSchema && validateInputs) {
+    const validatedStateData = await stateSchema.safeParseAsync(stateData);
+    if (!validatedStateData.success) {
+      const errors = getZodErrors(validatedStateData.error);
+      const errorMessages = errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n");
+      validationError = new Error("Step state data validation failed: \n" + errorMessages);
+    } else {
+      stateData = validatedStateData.data;
+    }
+  }
+  return { stateData, validationError };
+}
 function getResumeLabelsByStepId(resumeLabels, stepId) {
   return Object.entries(resumeLabels).filter(([_, value]) => value.stepId === stepId).reduce(
     (acc, [key, value]) => {
@@ -1343,18 +1366,12 @@ async function executeConditional(engine, params) {
           requestContext,
           inputData: prevOutput,
           state: executionContext.state,
-          setState: (state) => {
-            executionContext.state = state;
-          },
           retryCount: -1,
           tracingContext: {
             currentSpan: evalSpan
           },
           getInitData: () => stepResults?.input,
           getStepResult: getStepResult.bind(null, stepResults),
-          // TODO: this function shouldn't have suspend probably?
-          suspend: async (_suspendPayload) => {
-          },
           bail: () => {
           },
           abort: () => {
@@ -1594,9 +1611,6 @@ async function executeLoop(engine, params) {
           requestContext,
           inputData: result.output,
           state: executionContext.state,
-          setState: (state) => {
-            executionContext.state = state;
-          },
           retryCount: -1,
           tracingContext: {
             currentSpan: evalSpan
@@ -1604,8 +1618,6 @@ async function executeLoop(engine, params) {
           iterationCount: iteration + 1,
           getInitData: () => stepResults?.input,
           getStepResult: getStepResult.bind(null, stepResults),
-          suspend: async (_suspendPayload) => {
-          },
           bail: () => {
           },
           abort: () => {
@@ -2319,7 +2331,7 @@ async function executeSleep(engine, params) {
         requestContext,
         inputData: prevOutput,
         state: executionContext.state,
-        setState: (state) => {
+        setState: async (state) => {
           executionContext.state = state;
         },
         retryCount: -1,
@@ -2400,7 +2412,7 @@ async function executeSleepUntil(engine, params) {
         requestContext,
         inputData: prevOutput,
         state: executionContext.state,
-        setState: (state) => {
+        setState: async (state) => {
           executionContext.state = state;
         },
         retryCount: -1,
@@ -2609,9 +2621,16 @@ async function executeStep(engine, params) {
         requestContext,
         inputData,
         state: executionContext.state,
-        setState: (state) => {
-          executionContext.state = state;
-          contextMutations.stateUpdate = state;
+        setState: async (state) => {
+          const { stateData, validationError: stateValidationError } = await validateStepStateData({
+            stateData: state,
+            step,
+            validateInputs: engine.options?.validateInputs ?? true
+          });
+          if (stateValidationError) {
+            throw stateValidationError;
+          }
+          contextMutations.stateUpdate = stateData;
         },
         retryCount,
         resumeData: resumeDataToUse,
@@ -2622,7 +2641,8 @@ async function executeStep(engine, params) {
         suspend: async (suspendPayload, suspendOptions) => {
           const { suspendData, validationError: suspendValidationError } = await validateStepSuspendData({
             suspendData: suspendPayload,
-            step
+            step,
+            validateInputs: engine.options?.validateInputs ?? true
           });
           if (suspendValidationError) {
             throw suspendValidationError;
@@ -2697,9 +2717,6 @@ async function executeStep(engine, params) {
     const { result: durableResult } = stepRetryResult;
     Object.assign(executionContext.suspendedPaths, durableResult.contextMutations.suspendedPaths);
     Object.assign(executionContext.resumeLabels, durableResult.contextMutations.resumeLabels);
-    if (durableResult.contextMutations.stateUpdate !== null) {
-      executionContext.state = durableResult.contextMutations.stateUpdate;
-    }
     if (engine.requiresDurableContextSerialization() && durableResult.contextMutations.requestContextUpdate) {
       requestContext.clear();
       for (const [key, value] of Object.entries(durableResult.contextMutations.requestContextUpdate)) {
@@ -2757,7 +2774,10 @@ async function executeStep(engine, params) {
   return {
     result: stepResult,
     stepResults: { [step.id]: stepResult },
-    mutableContext: engine.buildMutableContext(executionContext),
+    mutableContext: engine.buildMutableContext({
+      ...executionContext,
+      state: stepRetryResult.ok ? stepRetryResult.result.contextMutations.stateUpdate ?? executionContext.state : executionContext.state
+    }),
     requestContext: engine.serializeRequestContext(requestContext)
   };
 }
@@ -3105,7 +3125,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
    * Apply mutable context changes back to the execution context.
    */
   applyMutableContext(executionContext, mutableContext) {
-    executionContext.state = mutableContext.state;
+    Object.assign(executionContext.state, mutableContext.state);
     Object.assign(executionContext.suspendedPaths, mutableContext.suspendedPaths);
     Object.assign(executionContext.resumeLabels, mutableContext.resumeLabels);
   }
@@ -4069,7 +4089,7 @@ var Workflow = class extends chunkDGV2FWB4_cjs.MastraBase {
       return stepRes?.status === "suspended";
     });
     if (res.state) {
-      setState(res.state);
+      await setState(res.state);
     }
     if (suspendedSteps?.length) {
       for (const [stepName, stepResult] of suspendedSteps) {
@@ -12962,7 +12982,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkHJNEZRI4_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunk6BYHQ52F_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -13294,7 +13314,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkM7CQULF7_cjs.InMemoryStore(),
+      storage: storage || new chunkKBXFAF37_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -15240,7 +15260,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkHJNEZRI4_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunk6BYHQ52F_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunkTWH4PTDG_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -16049,16 +16069,25 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
                 threadId,
                 resourceId
               });
-              const run = await workflow.createRun();
+              const run = await workflow.createRun({ runId });
               const { initialState, inputData: workflowInputData } = inputData;
+              const { resumeData, suspend } = context?.agent ?? {};
               let result = void 0;
               if (methodType === "generate" || methodType === "generateLegacy") {
-                result = await run.start({
-                  inputData: workflowInputData,
-                  requestContext,
-                  tracingContext: context?.tracingContext,
-                  ...initialState && { initialState }
-                });
+                if (resumeData) {
+                  result = await run.resume({
+                    resumeData,
+                    requestContext,
+                    tracingContext: context?.tracingContext
+                  });
+                } else {
+                  result = await run.start({
+                    inputData: workflowInputData,
+                    requestContext,
+                    tracingContext: context?.tracingContext,
+                    ...initialState && { initialState }
+                  });
+                }
               } else if (methodType === "streamLegacy") {
                 const streamResult = run.streamLegacy({
                   inputData: workflowInputData,
@@ -16073,7 +16102,11 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
                 }
                 result = await streamResult.getWorkflowState();
               } else if (methodType === "stream") {
-                const streamResult = run.stream({
+                const streamResult = resumeData ? run.resumeStream({
+                  resumeData,
+                  requestContext,
+                  tracingContext: context?.tracingContext
+                }) : run.stream({
                   inputData: workflowInputData,
                   requestContext,
                   tracingContext: context?.tracingContext,
@@ -16094,10 +16127,12 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
                   runId: run.runId
                 };
               } else if (result?.status === "suspended") {
-                return {
-                  error: `Workflow ended with status: "suspended". This is not currently handled in the basic agent workflow tool transformation. To achieve this you'll need to write your own tool that uses a workflow internally.`,
-                  runId: run.runId
-                };
+                const suspendedStep = result?.suspended?.[0]?.[0];
+                const suspendPayload = result?.steps?.[suspendedStep]?.suspendPayload;
+                if (suspendPayload?.__workflow_meta) {
+                  delete suspendPayload.__workflow_meta;
+                }
+                return suspend?.(suspendPayload);
               } else {
                 return {
                   error: `Workflow should never reach this path, workflow returned no status`,
@@ -18875,6 +18910,7 @@ exports.tryGenerateWithJsonFallback = tryGenerateWithJsonFallback;
 exports.tryStreamWithJsonFallback = tryStreamWithJsonFallback;
 exports.validateStepInput = validateStepInput;
 exports.validateStepResumeData = validateStepResumeData;
+exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-RBBEMTMA.cjs.map
-//# sourceMappingURL=chunk-RBBEMTMA.cjs.map
+//# sourceMappingURL=chunk-HP6TRJ2Q.cjs.map
+//# sourceMappingURL=chunk-HP6TRJ2Q.cjs.map