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

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

@@ -2,13 +2,13 @@
 
 var chunk4JKEUSCC_cjs = require('./chunk-4JKEUSCC.cjs');
 var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
-var chunkM7CQULF7_cjs = require('./chunk-M7CQULF7.cjs');
-var chunkYBEW5YWC_cjs = require('./chunk-YBEW5YWC.cjs');
-var chunkHJNEZRI4_cjs = require('./chunk-HJNEZRI4.cjs');
-var chunkYUXTDKYN_cjs = require('./chunk-YUXTDKYN.cjs');
+var chunk7S7TLMTS_cjs = require('./chunk-7S7TLMTS.cjs');
+var chunkVRFSEZBA_cjs = require('./chunk-VRFSEZBA.cjs');
+var chunkCKRWR5DS_cjs = require('./chunk-CKRWR5DS.cjs');
+var chunkIISGCZJ4_cjs = require('./chunk-IISGCZJ4.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunk6C2PU6J4_cjs = require('./chunk-6C2PU6J4.cjs');
-var chunk3EYBRHB2_cjs = require('./chunk-3EYBRHB2.cjs');
+var chunkHSRQXO6F_cjs = require('./chunk-HSRQXO6F.cjs');
+var chunkUVM27J4A_cjs = require('./chunk-UVM27J4A.cjs');
 var chunkTWH4PTDG_cjs = require('./chunk-TWH4PTDG.cjs');
 var chunk3JA6VPNM_cjs = require('./chunk-3JA6VPNM.cjs');
 var chunkY24HI6ND_cjs = require('./chunk-Y24HI6ND.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]) => {
@@ -1138,7 +1161,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunk6C2PU6J4_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkHSRQXO6F_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -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: () => {
@@ -1579,7 +1596,7 @@ async function executeLoop(engine, params) {
     const evalSpan = loopSpan?.createChildSpan({
       type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
       name: `condition: '${entry.loopType}'`,
-      input: chunk6C2PU6J4_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+      input: chunkHSRQXO6F_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
       attributes: {
         conditionIndex: iteration
       },
@@ -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,
@@ -2605,13 +2617,20 @@ async function executeStep(engine, params) {
         runId,
         resourceId,
         workflowId,
-        mastra: engine.mastra ? chunk3EYBRHB2_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
+        mastra: engine.mastra ? chunkUVM27J4A_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
         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) {
@@ -4374,7 +4394,7 @@ var Run = class {
     format,
     outputOptions
   }) {
-    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
+    const workflowSpan = chunkUVM27J4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: inputData,
@@ -4869,7 +4889,7 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     });
-    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
+    const workflowSpan = chunkUVM27J4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: resumeDataToUse,
@@ -4994,7 +5014,7 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
+    const workflowSpan = chunkUVM27J4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       attributes: {
@@ -5099,7 +5119,7 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
+    const workflowSpan = chunkUVM27J4A_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: inputData,
@@ -5410,7 +5430,7 @@ var ProcessorRunner = class {
         requestContext
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunkYBEW5YWC_cjs.MessageList) {
+      if (result instanceof chunkVRFSEZBA_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunkTWH4PTDG_cjs.MastraError({
             category: "USER",
@@ -5590,7 +5610,7 @@ var ProcessorRunner = class {
         requestContext
       });
       let mutations;
-      if (result instanceof chunkYBEW5YWC_cjs.MessageList) {
+      if (result instanceof chunkVRFSEZBA_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunkTWH4PTDG_cjs.MastraError({
             category: "USER",
@@ -5711,7 +5731,7 @@ var ProcessorRunner = class {
           requestContext
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunkYBEW5YWC_cjs.MessageList) {
+        if (result instanceof chunkVRFSEZBA_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunkTWH4PTDG_cjs.MastraError({
               category: "USER",
@@ -6155,7 +6175,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkYBEW5YWC_cjs.DefaultGeneratedFile({
+          file: new chunkVRFSEZBA_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -6163,7 +6183,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkYBEW5YWC_cjs.DefaultGeneratedFileWithType({
+        file: new chunkVRFSEZBA_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -6972,7 +6992,7 @@ function createLLMExecutionStep({
                   }
                   if (prepareStepResult.messages) {
                     const newMessages = prepareStepResult.messages;
-                    const newMessageList = new chunkYBEW5YWC_cjs.MessageList();
+                    const newMessageList = new chunkVRFSEZBA_cjs.MessageList();
                     for (const message of newMessages) {
                       if (message.role === "system") {
                         newMessageList.addSystem(message);
@@ -6989,7 +7009,7 @@ function createLLMExecutionStep({
                 console.error("Error in prepareStep callback:", error);
               }
             }
-            modelResult = chunk3EYBRHB2_cjs.executeWithContextSync({
+            modelResult = chunkUVM27J4A_cjs.executeWithContextSync({
               span: modelSpanTracker?.getTracingContext()?.currentSpan,
               fn: () => execute({
                 runId,
@@ -8102,6 +8122,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
     requireToolApproval,
     _internal,
     agentId,
+    agentName,
     toolCallId,
     requestContext,
     methodType,
@@ -8129,6 +8150,8 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
         messages: [...messageList.getSystemMessages(), ...messages]
       },
       attributes: {
+        agentId,
+        agentName,
         model: firstModel.modelId,
         provider: firstModel.provider,
         streaming: true,
@@ -8163,6 +8186,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
         modelSpanTracker,
         requireToolApproval,
         agentId,
+        agentName,
         requestContext,
         methodType,
         includeRawChunks,
@@ -8206,7 +8230,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
             const remainingTokens = parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"] ?? "", 10);
             if (!isNaN(remainingTokens) && remainingTokens > 0 && remainingTokens < 2e3) {
               this.logger.warn("Rate limit approaching, waiting 10 seconds", { runId });
-              await chunk6C2PU6J4_cjs.delay(10 * 1e3);
+              await chunkHSRQXO6F_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -8520,7 +8544,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkYBEW5YWC_cjs.MessageList({
+    const messageList = new chunkVRFSEZBA_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -9195,6 +9219,7 @@ ${completionResult?.object?.finalResult}` : ""}
           mastra: agent.getMastraInstance(),
           agent: {
             resourceId: initData.threadResourceId || networkName,
+            toolCallId,
             threadId: initData.threadId
           },
           runId,
@@ -9580,7 +9605,7 @@ var AgentLegacyHandler = class {
         if (process.env.NODE_ENV !== "test") {
           this.capabilities.logger.debug(`[Agents:${this.capabilities.name}] - Starting generation`, { runId });
         }
-        const agentSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
+        const agentSpan = chunkUVM27J4A_cjs.getOrCreateSpan({
           type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.capabilities.id}'`,
           input: {
@@ -9634,7 +9659,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunkYBEW5YWC_cjs.MessageList({
+        let messageList = new chunkVRFSEZBA_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -9775,7 +9800,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkYBEW5YWC_cjs.MessageList({
+        const messageListResponses = new chunkVRFSEZBA_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -12904,6 +12929,11 @@ var memoryDefaultOptions = {
   }
 };
 var MastraMemory = class extends chunkDGV2FWB4_cjs.MastraBase {
+  /**
+   * Unique identifier for the memory instance.
+   * If not provided, defaults to a static name 'default-memory'.
+   */
+  id;
   MAX_CONTEXT_TOKENS;
   _storage;
   vector;
@@ -12912,6 +12942,7 @@ var MastraMemory = class extends chunkDGV2FWB4_cjs.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(
@@ -12962,7 +12993,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 chunkCKRWR5DS_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -13058,7 +13089,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunk6C2PU6J4_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkHSRQXO6F_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -13294,7 +13325,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkM7CQULF7_cjs.InMemoryStore(),
+      storage: storage || new chunk7S7TLMTS_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -13808,7 +13839,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunkYBEW5YWC_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkVRFSEZBA_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -14260,7 +14291,7 @@ var prepareToolsStepOutputSchema = z5.z.object({
 var prepareMemoryStepOutputSchema = z5.z.object({
   threadExists: z5.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z5.z.instanceof(chunkYBEW5YWC_cjs.MessageList),
+  messageList: z5.z.instanceof(chunkVRFSEZBA_cjs.MessageList),
   tripwire: z5.z.boolean().optional(),
   tripwireReason: z5.z.string().optional()
 });
@@ -14293,7 +14324,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunkYBEW5YWC_cjs.MessageList({
+      const messageList = new chunkVRFSEZBA_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -14445,6 +14476,7 @@ function createStreamStep({
   requireToolApproval,
   resumeContext,
   agentId,
+  agentName,
   toolCallId,
   methodType,
   saveQueueManager,
@@ -14485,6 +14517,7 @@ function createStreamStep({
           memory
         },
         agentId,
+        agentName,
         toolCallId,
         methodType: modelMethodType
       });
@@ -14511,6 +14544,7 @@ function createPrepareStreamWorkflow({
   requireToolApproval,
   resumeContext,
   agentId,
+  agentName,
   toolCallId
 }) {
   const prepareToolsStep = createPrepareToolsStep({
@@ -14542,6 +14576,7 @@ function createPrepareStreamWorkflow({
     requireToolApproval,
     resumeContext,
     agentId,
+    agentName,
     toolCallId,
     methodType,
     saveQueueManager,
@@ -15165,7 +15200,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   listTools({ requestContext = new chunkUVHSM2GU_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunk6C2PU6J4_cjs.ensureToolProperties(this.#tools);
+      return chunkHSRQXO6F_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (tools) => {
@@ -15183,7 +15218,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunk6C2PU6J4_cjs.ensureToolProperties(tools);
+      return chunkHSRQXO6F_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -15215,7 +15250,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           });
         });
       } else {
-        llm = new chunkYUXTDKYN_cjs.MastraLLMV1({
+        llm = new chunkIISGCZJ4_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -15240,7 +15275,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkHJNEZRI4_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkCKRWR5DS_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunkTWH4PTDG_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -15446,7 +15481,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkYBEW5YWC_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkVRFSEZBA_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -15469,7 +15504,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
-      const messageList = new chunkYBEW5YWC_cjs.MessageList().add(
+      const messageList = new chunkVRFSEZBA_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -15491,7 +15526,8 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         requestContext,
         tracingContext,
         messageList,
-        agentId: this.id
+        agentId: this.id,
+        agentName: this.name
       });
       text = await result.text;
     } else {
@@ -15521,7 +15557,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkYBEW5YWC_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkVRFSEZBA_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -15585,7 +15621,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options);
+        const convertedToCoreTool = chunkHSRQXO6F_cjs.makeCoreTool(toolObj, options);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -15735,7 +15771,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool.requireApproval
         };
-        return [k, chunk6C2PU6J4_cjs.makeCoreTool(tool, options)];
+        return [k, chunkHSRQXO6F_cjs.makeCoreTool(tool, options)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -15784,7 +15820,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunkHSRQXO6F_cjs.makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -15828,7 +15864,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool.requireApproval
         };
-        const convertedToCoreTool = chunk6C2PU6J4_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunkHSRQXO6F_cjs.makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -15997,7 +16033,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options);
+        convertedAgentTools[`agent-${agentName}`] = chunkHSRQXO6F_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedAgentTools;
@@ -16049,16 +16085,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 +16118,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 +16143,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`,
@@ -16140,7 +16191,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options);
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkHSRQXO6F_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedWorkflowTools;
@@ -16164,7 +16215,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunk6C2PU6J4_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkHSRQXO6F_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -16488,7 +16539,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunk6C2PU6J4_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunkHSRQXO6F_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -16507,7 +16558,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     const runId = options.runId || this.#mastra?.generateId() || crypto2.randomUUID();
     const instructions = options.instructions || await this.getInstructions({ requestContext });
-    const agentSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
+    const agentSpan = chunkUVM27J4A_cjs.getOrCreateSpan({
       type: "agent_run" /* AGENT_RUN */,
       name: `agent run: '${this.id}'`,
       input: options.messages,
@@ -16569,6 +16620,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       requireToolApproval: options.requireToolApproval,
       resumeContext,
       agentId: this.id,
+      agentName: this.name,
       toolCallId: options.toolCallId
     });
     const run = await executionWorkflow.createRun();
@@ -17334,6 +17386,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).
@@ -17425,7 +17516,8 @@ ${z42__default.default.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
@@ -17446,6 +17538,7 @@ ${z42__default.default.prettifyError(result.error)}
         processedText = processedText.replace(/^```json\s*\n?/, "");
       }
     }
+    processedText = escapeUnescapedControlCharsInJsonStrings(processedText);
     return processedText;
   }
 };
@@ -18228,7 +18321,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                     options.tracingContext,
                     self.#options.requestContext
                   );
-                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkYBEW5YWC_cjs.MessageList.coreContentToString(m.content)).join("\n");
+                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkVRFSEZBA_cjs.MessageList.coreContentToString(m.content)).join("\n");
                   self.#delayedPromises.text.resolve(outputText);
                   self.#delayedPromises.finishReason.resolve(self.#finishReason);
                   if (chunk.payload.metadata) {
@@ -18855,6 +18948,7 @@ exports.WorkingMemory = WorkingMemory;
 exports.augmentWithInit = augmentWithInit;
 exports.cloneStep = cloneStep;
 exports.cloneWorkflow = cloneWorkflow;
+exports.convertFullStreamChunkToMastra = convertFullStreamChunkToMastra;
 exports.convertFullStreamChunkToUIMessageStream = convertFullStreamChunkToUIMessageStream;
 exports.convertMastraChunkToAISDKv5 = convertMastraChunkToAISDKv5;
 exports.createDeprecationProxy = createDeprecationProxy;
@@ -18875,6 +18969,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-XMT5T4F2.cjs.map
+//# sourceMappingURL=chunk-XMT5T4F2.cjs.map