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

package/dist/{chunk-POM7FCH5.js → chunk-ARSSSQQP.js}

@@ -1,12 +1,12 @@
 import { DefaultVoice } from './chunk-F2GAJSBI.js';
 import { EMITTER_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-NLNKQD2T.js';
-import { InMemoryStore } from './chunk-G32WDDGV.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-DMPHPHMU.js';
-import { ModelRouterEmbeddingModel, resolveModelConfig } from './chunk-NAKPEQEQ.js';
-import { MastraLLMV1 } from './chunk-4GTU7MB2.js';
+import { InMemoryStore } from './chunk-ZINZHEXZ.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-APMPOYPI.js';
+import { ModelRouterEmbeddingModel, resolveModelConfig } from './chunk-A4C3AGVS.js';
+import { MastraLLMV1 } from './chunk-7IMDJAYQ.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { removeUndefinedValues, deepMerge, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, selectFields, delay } from './chunk-URBPEE67.js';
-import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-FNSFXWDN.js';
+import { removeUndefinedValues, deepMerge, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, selectFields, delay } from './chunk-MCRIVYUB.js';
+import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-PIHOAJTA.js';
 import { MastraError, getErrorFromUnknown } from './chunk-JJ5O45LH.js';
 import { ToolStream } from './chunk-F54IK3GJ.js';
 import { Tool, createTool } from './chunk-4F6RAJFU.js';
@@ -977,14 +977,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);
@@ -996,6 +997,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]) => {
@@ -1315,18 +1338,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: () => {
@@ -1566,9 +1583,6 @@ async function executeLoop(engine, params) {
           requestContext,
           inputData: result.output,
           state: executionContext.state,
-          setState: (state) => {
-            executionContext.state = state;
-          },
           retryCount: -1,
           tracingContext: {
             currentSpan: evalSpan
@@ -1576,8 +1590,6 @@ async function executeLoop(engine, params) {
           iterationCount: iteration + 1,
           getInitData: () => stepResults?.input,
           getStepResult: getStepResult.bind(null, stepResults),
-          suspend: async (_suspendPayload) => {
-          },
           bail: () => {
           },
           abort: () => {
@@ -2291,7 +2303,7 @@ async function executeSleep(engine, params) {
         requestContext,
         inputData: prevOutput,
         state: executionContext.state,
-        setState: (state) => {
+        setState: async (state) => {
           executionContext.state = state;
         },
         retryCount: -1,
@@ -2372,7 +2384,7 @@ async function executeSleepUntil(engine, params) {
         requestContext,
         inputData: prevOutput,
         state: executionContext.state,
-        setState: (state) => {
+        setState: async (state) => {
           executionContext.state = state;
         },
         retryCount: -1,
@@ -2581,9 +2593,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,
@@ -2594,7 +2613,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;
@@ -2669,9 +2689,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)) {
@@ -2729,7 +2746,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)
   };
 }
@@ -3077,7 +3097,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);
   }
@@ -4041,7 +4061,7 @@ var Workflow = class extends MastraBase {
       return stepRes?.status === "suspended";
     });
     if (res.state) {
-      setState(res.state);
+      await setState(res.state);
     }
     if (suspendedSteps?.length) {
       for (const [stepName, stepResult] of suspendedSteps) {
@@ -8074,6 +8094,7 @@ var MastraLLMVNext = class extends MastraBase {
     requireToolApproval,
     _internal,
     agentId,
+    agentName,
     toolCallId,
     requestContext,
     methodType,
@@ -8101,6 +8122,8 @@ var MastraLLMVNext = class extends MastraBase {
         messages: [...messageList.getSystemMessages(), ...messages]
       },
       attributes: {
+        agentId,
+        agentName,
         model: firstModel.modelId,
         provider: firstModel.provider,
         streaming: true,
@@ -8135,6 +8158,7 @@ var MastraLLMVNext = class extends MastraBase {
         modelSpanTracker,
         requireToolApproval,
         agentId,
+        agentName,
         requestContext,
         methodType,
         includeRawChunks,
@@ -9167,6 +9191,7 @@ ${completionResult?.object?.finalResult}` : ""}
           mastra: agent.getMastraInstance(),
           agent: {
             resourceId: initData.threadResourceId || networkName,
+            toolCallId,
             threadId: initData.threadId
           },
           runId,
@@ -12876,6 +12901,11 @@ var memoryDefaultOptions = {
   }
 };
 var MastraMemory = class extends MastraBase {
+  /**
+   * Unique identifier for the memory instance.
+   * If not provided, defaults to a static name 'default-memory'.
+   */
+  id;
   MAX_CONTEXT_TOKENS;
   _storage;
   vector;
@@ -12884,6 +12914,7 @@ var MastraMemory = class extends MastraBase {
   #mastra;
   constructor(config) {
     super({ component: "MEMORY", name: config.name });
+    this.id = config.id ?? config.name ?? "default-memory";
     if (config.options) this.threadConfig = this.getMergedThreadConfig(config.options);
     if (config.processors) {
       throw new Error(
@@ -14417,6 +14448,7 @@ function createStreamStep({
   requireToolApproval,
   resumeContext,
   agentId,
+  agentName,
   toolCallId,
   methodType,
   saveQueueManager,
@@ -14457,6 +14489,7 @@ function createStreamStep({
           memory
         },
         agentId,
+        agentName,
         toolCallId,
         methodType: modelMethodType
       });
@@ -14483,6 +14516,7 @@ function createPrepareStreamWorkflow({
   requireToolApproval,
   resumeContext,
   agentId,
+  agentName,
   toolCallId
 }) {
   const prepareToolsStep = createPrepareToolsStep({
@@ -14514,6 +14548,7 @@ function createPrepareStreamWorkflow({
     requireToolApproval,
     resumeContext,
     agentId,
+    agentName,
     toolCallId,
     methodType,
     saveQueueManager,
@@ -15463,7 +15498,8 @@ var Agent = class extends MastraBase {
         requestContext,
         tracingContext,
         messageList,
-        agentId: this.id
+        agentId: this.id,
+        agentName: this.name
       });
       text = await result.text;
     } else {
@@ -16021,16 +16057,25 @@ var Agent = class extends 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,
@@ -16045,7 +16090,11 @@ var Agent = class extends 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,
@@ -16066,10 +16115,12 @@ var Agent = class extends 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`,
@@ -16541,6 +16592,7 @@ var Agent = class extends MastraBase {
       requireToolApproval: options.requireToolApproval,
       resumeContext,
       agentId: this.id,
+      agentName: this.name,
       toolCallId: options.toolCallId
     });
     const run = await executionWorkflow.createRun();
@@ -17306,6 +17358,45 @@ var AISDKV5OutputStream = class {
     return this.#modelOutput.object;
   }
 };
+function escapeUnescapedControlCharsInJsonStrings(text) {
+  let result = "";
+  let inString = false;
+  let i = 0;
+  while (i < text.length) {
+    const char = text[i];
+    if (char === "\\" && i + 1 < text.length) {
+      result += char + text[i + 1];
+      i += 2;
+      continue;
+    }
+    if (char === '"') {
+      inString = !inString;
+      result += char;
+      i++;
+      continue;
+    }
+    if (inString) {
+      if (char === "\n") {
+        result += "\\n";
+        i++;
+        continue;
+      }
+      if (char === "\r") {
+        result += "\\r";
+        i++;
+        continue;
+      }
+      if (char === "	") {
+        result += "\\t";
+        i++;
+        continue;
+      }
+    }
+    result += char;
+    i++;
+  }
+  return result;
+}
 var BaseFormatHandler = class {
   /**
    * The original user-provided schema (Zod, JSON Schema, or AI SDK Schema).
@@ -17397,7 +17488,8 @@ ${z42.prettifyError(result.error)}
     }
   }
   /**
-   * Preprocesses accumulated text to handle LLMs that wrap JSON in code blocks.
+   * Preprocesses accumulated text to handle LLMs that wrap JSON in code blocks
+   * and fix common JSON formatting issues like unescaped newlines in strings.
    * Extracts content from the first complete valid ```json...``` code block or removes opening ```json prefix if no complete code block is found (streaming chunks).
    * @param accumulatedText - Raw accumulated text from streaming
    * @returns Processed text ready for JSON parsing
@@ -17418,6 +17510,7 @@ ${z42.prettifyError(result.error)}
         processedText = processedText.replace(/^```json\s*\n?/, "");
       }
     }
+    processedText = escapeUnescapedControlCharsInJsonStrings(processedText);
     return processedText;
   }
 };
@@ -18795,6 +18888,6 @@ var MastraModelOutput = class extends MastraBase {
   }
 };
 
-export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageHistory, MockMemory, ModerationProcessor, PIIDetector, ProcessorRunner, ProcessorState, PromptInjectionDetector, Run, SemanticRecall, StructuredOutputProcessor, SystemPromptScrubber, TokenLimiterProcessor, ToolCallFilter, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, loop, mapVariable, memoryDefaultOptions, parseMemoryRuntimeContext, resolveThreadIdFromArgs, runCountDeprecationMessage, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepSuspendData };
-//# sourceMappingURL=chunk-POM7FCH5.js.map
-//# sourceMappingURL=chunk-POM7FCH5.js.map
+export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageHistory, MockMemory, ModerationProcessor, PIIDetector, ProcessorRunner, ProcessorState, PromptInjectionDetector, Run, SemanticRecall, StructuredOutputProcessor, SystemPromptScrubber, TokenLimiterProcessor, ToolCallFilter, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, loop, mapVariable, memoryDefaultOptions, parseMemoryRuntimeContext, resolveThreadIdFromArgs, runCountDeprecationMessage, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepStateData, validateStepSuspendData };
+//# sourceMappingURL=chunk-ARSSSQQP.js.map
+//# sourceMappingURL=chunk-ARSSSQQP.js.map