@mastra/core 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/{chunk-OWX2PUFH.cjs → chunk-KP42JLXE.cjs}

@@ -1,16 +1,16 @@
 'use strict';
 
-var chunkQUKUN6NR_cjs = require('./chunk-QUKUN6NR.cjs');
+var chunkISMGVGUM_cjs = require('./chunk-ISMGVGUM.cjs');
 var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
-var chunkG36A2JRR_cjs = require('./chunk-G36A2JRR.cjs');
-var chunkN4SJ4YX7_cjs = require('./chunk-N4SJ4YX7.cjs');
-var chunkO6NA3Z43_cjs = require('./chunk-O6NA3Z43.cjs');
+var chunkDQIZ5FFX_cjs = require('./chunk-DQIZ5FFX.cjs');
+var chunkNHP6ZIDG_cjs = require('./chunk-NHP6ZIDG.cjs');
+var chunkOUUPUAGA_cjs = require('./chunk-OUUPUAGA.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkHBJPYQRN_cjs = require('./chunk-HBJPYQRN.cjs');
+var chunkRROQ46B6_cjs = require('./chunk-RROQ46B6.cjs');
 var chunkE7K4FTLN_cjs = require('./chunk-E7K4FTLN.cjs');
 var chunkTWH4PTDG_cjs = require('./chunk-TWH4PTDG.cjs');
-var chunkLRSB62Z6_cjs = require('./chunk-LRSB62Z6.cjs');
-var chunk4IKJAKCD_cjs = require('./chunk-4IKJAKCD.cjs');
+var chunkX7F4CSGR_cjs = require('./chunk-X7F4CSGR.cjs');
+var chunkV537VSV4_cjs = require('./chunk-V537VSV4.cjs');
 var chunkJ7O6WENZ_cjs = require('./chunk-J7O6WENZ.cjs');
 var chunk4WQYXT2I_cjs = require('./chunk-4WQYXT2I.cjs');
 var chunkKEXGB7FK_cjs = require('./chunk-KEXGB7FK.cjs');
@@ -21,8 +21,8 @@ var web = require('stream/web');
 var crypto2 = require('crypto');
 var providerV5 = require('@ai-sdk/provider-v5');
 var aiV5 = require('ai-v5');
-var z5 = require('zod');
 var schemaCompat = require('@mastra/schema-compat');
+var z5 = require('zod');
 var radash = require('radash');
 var providerUtilsV5 = require('@ai-sdk/provider-utils-v5');
 var lite = require('js-tiktoken/lite');
@@ -449,14 +449,22 @@ function prepareToolsAndToolChoice({
               inputSchema: aiV5.asSchema(sdkTool.inputSchema).jsonSchema,
               providerOptions: sdkTool.providerOptions
             };
-          case "provider-defined":
+          case "provider-defined": {
+            const providerId = sdkTool.id;
+            let providerToolName = name;
+            if (providerId && providerId.includes(".")) {
+              providerToolName = providerId.split(".").slice(1).join(".");
+            } else if (providerId) {
+              providerToolName = providerId;
+            }
             return {
               type: "provider-defined",
-              name,
+              name: providerToolName,
               // TODO: as any seems wrong here. are there cases where we don't have an id?
-              id: sdkTool.id,
+              id: providerId,
               args: sdkTool.args
             };
+          }
           default: {
             const exhaustiveCheck = toolType;
             throw new Error(`Unsupported tool type: ${exhaustiveCheck}`);
@@ -962,7 +970,8 @@ async function validateStepInput({
       const errorMessages = errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n");
       validationError = new Error("Step input validation failed: \n" + errorMessages);
     } else {
-      inputData = radash.isEmpty(validatedInput.data) ? prevOutput : validatedInput.data;
+      const isEmptyData = radash.isEmpty(validatedInput.data);
+      inputData = isEmptyData ? prevOutput : validatedInput.data;
     }
   }
   return { inputData, validationError };
@@ -985,6 +994,27 @@ async function validateStepResumeData({ resumeData, step }) {
   }
   return { resumeData, validationError };
 }
+async function validateStepSuspendData({
+  suspendData,
+  step
+}) {
+  if (!suspendData) {
+    return { suspendData: void 0, validationError: void 0 };
+  }
+  let validationError;
+  const suspendSchema = step.suspendSchema;
+  if (suspendSchema) {
+    const validatedSuspendData = await suspendSchema.safeParseAsync(suspendData);
+    if (!validatedSuspendData.success) {
+      const errors = getZodErrors(validatedSuspendData.error);
+      const errorMessages = errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n");
+      validationError = new Error("Step suspend data validation failed: \n" + errorMessages);
+    } else {
+      suspendData = validatedSuspendData.data;
+    }
+  }
+  return { suspendData, validationError };
+}
 function getResumeLabelsByStepId(resumeLabels, stepId) {
   return Object.entries(resumeLabels).filter(([_, value]) => value.stepId === stepId).reduce(
     (acc, [key, value]) => {
@@ -1099,7 +1129,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkHBJPYQRN_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkRROQ46B6_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -1443,7 +1473,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: {},
         abortSignal: abortController?.signal,
-        writer: new chunkLRSB62Z6_cjs.ToolStream(
+        writer: new chunkX7F4CSGR_cjs.ToolStream(
           {
             prefix: "workflow-step",
             callId: stepCallId,
@@ -1520,7 +1550,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: {},
         abortSignal: abortController?.signal,
-        writer: new chunkLRSB62Z6_cjs.ToolStream(
+        writer: new chunkX7F4CSGR_cjs.ToolStream(
           {
             prefix: "workflow-step",
             callId: stepCallId,
@@ -1673,6 +1703,13 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           getInitData: () => stepResults?.input,
           getStepResult: getStepResult.bind(this, stepResults),
           suspend: async (suspendPayload, suspendOptions) => {
+            const { suspendData, validationError: validationError2 } = await validateStepSuspendData({
+              suspendData: suspendPayload,
+              step
+            });
+            if (validationError2) {
+              throw validationError2;
+            }
             executionContext.suspendedPaths[step.id] = executionContext.executionPath;
             if (suspendOptions?.resumeLabel) {
               const resumeLabel = Array.isArray(suspendOptions.resumeLabel) ? suspendOptions.resumeLabel : [suspendOptions.resumeLabel];
@@ -1683,7 +1720,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
                 };
               }
             }
-            suspended = { payload: suspendPayload };
+            suspended = { payload: suspendData };
           },
           bail: (result2) => {
             bailed = { payload: result2 };
@@ -1714,7 +1751,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: {},
           abortSignal: abortController?.signal,
-          writer: new chunkLRSB62Z6_cjs.ToolStream(
+          writer: new chunkX7F4CSGR_cjs.ToolStream(
             {
               prefix: "workflow-step",
               callId: stepCallId,
@@ -2077,7 +2114,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
                 [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
                 engine: {},
                 abortSignal: abortController?.signal,
-                writer: new chunkLRSB62Z6_cjs.ToolStream(
+                writer: new chunkX7F4CSGR_cjs.ToolStream(
                   {
                     prefix: "workflow-step",
                     callId: crypto2.randomUUID(),
@@ -2286,7 +2323,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       const evalSpan = loopSpan?.createChildSpan({
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: '${entry.loopType}'`,
-        input: chunkHBJPYQRN_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunkRROQ46B6_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         },
@@ -2322,7 +2359,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
             engine: {},
             abortSignal: abortController?.signal,
-            writer: new chunkLRSB62Z6_cjs.ToolStream(
+            writer: new chunkX7F4CSGR_cjs.ToolStream(
               {
                 prefix: "workflow-step",
                 callId: crypto2.randomUUID(),
@@ -2979,7 +3016,7 @@ function mapVariable(config) {
 function createStep(params, agentOptions) {
   if (params instanceof Agent) {
     return {
-      id: params.name,
+      id: params.id,
       description: params.getDescription(),
       // @ts-ignore
       inputSchema: z5.z.object({
@@ -3071,7 +3108,7 @@ function createStep(params, agentOptions) {
       component: params.component
     };
   }
-  if (params instanceof chunk4IKJAKCD_cjs.Tool) {
+  if (params instanceof chunkV537VSV4_cjs.Tool) {
     if (!params.inputSchema || !params.outputSchema) {
       throw new Error("Tool must have input and output schemas defined");
     }
@@ -3082,6 +3119,8 @@ function createStep(params, agentOptions) {
       description: params.description,
       inputSchema: params.inputSchema,
       outputSchema: params.outputSchema,
+      resumeSchema: params.resumeSchema,
+      suspendSchema: params.suspendSchema,
       execute: async ({
         inputData,
         mastra,
@@ -3098,10 +3137,11 @@ function createStep(params, agentOptions) {
           mastra,
           requestContext,
           tracingContext,
-          suspend,
           resumeData,
           workflow: {
             runId,
+            suspend,
+            resumeData,
             workflowId,
             state,
             setState
@@ -3562,6 +3602,7 @@ var Workflow = class extends chunkKEXGB7FK_cjs.MastraBase {
     const run = this.#runs.get(runIdToUse) ?? new Run({
       workflowId: this.id,
       stateSchema: this.stateSchema,
+      inputSchema: this.inputSchema,
       runId: runIdToUse,
       resourceId: options?.resourceId,
       executionEngine: this.executionEngine,
@@ -3921,6 +3962,7 @@ var Run = class {
   closeStreamAction;
   executionResults;
   stateSchema;
+  inputSchema;
   cleanup;
   retryConfig;
   constructor(params) {
@@ -3939,6 +3981,7 @@ var Run = class {
     this.workflowSteps = params.workflowSteps;
     this.validateInputs = params.validateInputs;
     this.stateSchema = params.stateSchema;
+    this.inputSchema = params.inputSchema;
     this.workflowRunStatus = "pending";
     this.workflowEngineType = params.workflowEngineType;
   }
@@ -3955,29 +3998,16 @@ var Run = class {
     this.abortController?.abort();
   }
   async _validateInput(inputData) {
-    const firstEntry = this.executionGraph.steps[0];
     let inputDataToUse = inputData;
-    if (firstEntry && this.validateInputs) {
-      let inputSchema;
-      if (firstEntry.type === "step" || firstEntry.type === "foreach" || firstEntry.type === "loop") {
-        const step = firstEntry.step;
-        inputSchema = step.inputSchema;
-      } else if (firstEntry.type === "conditional" || firstEntry.type === "parallel") {
-        const firstStep = firstEntry.steps[0];
-        if (firstStep && firstStep.type === "step") {
-          inputSchema = firstStep.step.inputSchema;
-        }
-      }
-      if (inputSchema) {
-        const validatedInputData = await inputSchema.safeParseAsync(inputData);
-        if (!validatedInputData.success) {
-          const errors = getZodErrors(validatedInputData.error);
-          throw new Error(
-            "Invalid input data: \n" + errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n")
-          );
-        }
-        inputDataToUse = validatedInputData.data;
+    if (this.validateInputs && this.inputSchema) {
+      const validatedInputData = await this.inputSchema.safeParseAsync(inputData);
+      if (!validatedInputData.success) {
+        const errors = getZodErrors(validatedInputData.error);
+        throw new Error(
+          "Invalid input data: \n" + errors.map((e) => `- ${e.path?.join(".")}: ${e.message}`).join("\n")
+        );
       }
+      inputDataToUse = validatedInputData.data;
     }
     return inputDataToUse;
   }
@@ -5356,7 +5386,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkG36A2JRR_cjs.DefaultGeneratedFile({
+          file: new chunkDQIZ5FFX_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -5364,7 +5394,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkG36A2JRR_cjs.DefaultGeneratedFileWithType({
+        file: new chunkDQIZ5FFX_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -5748,23 +5778,22 @@ async function processOutputStream({
       if (runState.state.textDeltas.length) {
         const textStartPayload = chunk.payload;
         const providerMetadata = textStartPayload.providerMetadata ?? runState.state.providerOptions;
-        messageList.add(
-          {
-            id: messageId,
-            role: "assistant",
-            content: [
-              providerMetadata ? {
+        const message = {
+          id: messageId,
+          role: "assistant",
+          content: {
+            format: 2,
+            parts: [
+              {
                 type: "text",
                 text: runState.state.textDeltas.join(""),
-                providerOptions: providerMetadata
-              } : {
-                type: "text",
-                text: runState.state.textDeltas.join("")
+                ...providerMetadata ? { providerMetadata } : {}
               }
             ]
           },
-          "response"
-        );
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        messageList.add(message, "response");
       }
       runState.setState({
         isStreaming: false,
@@ -5844,20 +5873,23 @@ async function processOutputStream({
           providerOptions: chunk.payload.providerMetadata ?? runState.state.providerOptions
         });
         if (Object.values(chunk.payload.providerMetadata || {}).find((v) => v?.redactedData)) {
-          messageList.add(
-            {
-              id: messageId,
-              role: "assistant",
-              content: [
+          const message = {
+            id: messageId,
+            role: "assistant",
+            content: {
+              format: 2,
+              parts: [
                 {
                   type: "reasoning",
-                  text: "",
-                  providerOptions: chunk.payload.providerMetadata ?? runState.state.providerOptions
+                  reasoning: "",
+                  details: [{ type: "redacted", data: "" }],
+                  providerMetadata: chunk.payload.providerMetadata ?? runState.state.providerOptions
                 }
               ]
             },
-            "response"
-          );
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          messageList.add(message, "response");
           if (isControllerOpen(controller)) {
             controller.enqueue(chunk);
           }
@@ -5883,20 +5915,23 @@ async function processOutputStream({
       }
       case "reasoning-end": {
         if (runState.state.reasoningDeltas.length > 0) {
-          messageList.add(
-            {
-              id: messageId,
-              role: "assistant",
-              content: [
+          const message = {
+            id: messageId,
+            role: "assistant",
+            content: {
+              format: 2,
+              parts: [
                 {
                   type: "reasoning",
-                  text: runState.state.reasoningDeltas.join(""),
-                  providerOptions: chunk.payload.providerMetadata ?? runState.state.providerOptions
+                  reasoning: "",
+                  details: [{ type: "text", text: runState.state.reasoningDeltas.join("") }],
+                  providerMetadata: chunk.payload.providerMetadata ?? runState.state.providerOptions
                 }
               ]
             },
-            "response"
-          );
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          messageList.add(message, "response");
         }
         runState.setState({
           isReasoning: false,
@@ -5908,25 +5943,31 @@ async function processOutputStream({
         break;
       }
       case "file":
-        messageList.add(
-          {
+        {
+          const message = {
             id: messageId,
             role: "assistant",
-            content: [
-              {
-                type: "file",
-                data: chunk.payload.data,
-                mimeType: chunk.payload.mimeType
-              }
-            ]
-          },
-          "response"
-        );
-        controller.enqueue(chunk);
+            content: {
+              format: 2,
+              parts: [
+                {
+                  type: "file",
+                  // @ts-expect-error
+                  data: chunk.payload.data,
+                  // TODO: incorrect string type
+                  mimeType: chunk.payload.mimeType
+                }
+              ]
+            },
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          messageList.add(message, "response");
+          controller.enqueue(chunk);
+        }
         break;
       case "source":
-        messageList.add(
-          {
+        {
+          const message = {
             id: messageId,
             role: "assistant",
             content: {
@@ -5945,10 +5986,10 @@ async function processOutputStream({
               ]
             },
             createdAt: /* @__PURE__ */ new Date()
-          },
-          "response"
-        );
-        controller.enqueue(chunk);
+          };
+          messageList.add(message, "response");
+          controller.enqueue(chunk);
+        }
         break;
       case "finish":
         runState.setState({
@@ -6115,7 +6156,7 @@ function createLLMExecutionStep({
                   }
                   if (prepareStepResult.messages) {
                     const newMessages = prepareStepResult.messages;
-                    const newMessageList = new chunkG36A2JRR_cjs.MessageList();
+                    const newMessageList = new chunkDQIZ5FFX_cjs.MessageList();
                     for (const message of newMessages) {
                       if (message.role === "system") {
                         newMessageList.addSystem(message);
@@ -6287,24 +6328,27 @@ function createLLMExecutionStep({
         return chunk.payload;
       });
       if (toolCalls.length > 0) {
-        const assistantContent = [
-          ...toolCalls.map((toolCall) => {
-            return {
-              type: "tool-call",
-              toolCallId: toolCall.toolCallId,
-              toolName: toolCall.toolName,
-              args: toolCall.args
-            };
-          })
-        ];
-        messageList.add(
-          {
-            id: messageId,
-            role: "assistant",
-            content: assistantContent
+        const message = {
+          id: messageId,
+          role: "assistant",
+          content: {
+            format: 2,
+            parts: toolCalls.map((toolCall) => {
+              return {
+                type: "tool-invocation",
+                toolInvocation: {
+                  state: "call",
+                  toolCallId: toolCall.toolCallId,
+                  toolName: toolCall.toolName,
+                  args: toolCall.args
+                },
+                ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {}
+              };
+            })
           },
-          "response"
-        );
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        messageList.add(message, "response");
       }
       const finishReason = runState?.state?.stepResult?.reason ?? outputStream._getImmediateFinishReason();
       const hasErrored = runState.state.hasErrored;
@@ -6386,24 +6430,28 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
             };
             rest.controller.enqueue(chunk);
           });
-          rest.messageList.add(
-            {
-              id: toolResultMessageId,
-              role: "tool",
-              content: errorResults.map((toolCall) => {
+          const msg = {
+            id: toolResultMessageId || "",
+            role: "assistant",
+            content: {
+              format: 2,
+              parts: errorResults.map((toolCallErrorResult) => {
                 return {
-                  type: "tool-result",
-                  args: toolCall.args,
-                  toolCallId: toolCall.toolCallId,
-                  toolName: toolCall.toolName,
-                  result: {
-                    tool_execution_error: toolCall.error?.message ?? toolCall.error
-                  }
+                  type: "tool-invocation",
+                  toolInvocation: {
+                    state: "result",
+                    toolCallId: toolCallErrorResult.toolCallId,
+                    toolName: toolCallErrorResult.toolName,
+                    args: toolCallErrorResult.args,
+                    result: toolCallErrorResult.error?.message ?? toolCallErrorResult.error
+                  },
+                  ...toolCallErrorResult.providerMetadata ? { providerMetadata: toolCallErrorResult.providerMetadata } : {}
                 };
               })
             },
-            "response"
-          );
+            createdAt: /* @__PURE__ */ new Date()
+          };
+          rest.messageList.add(msg, "response");
         }
         initialResult.stepResult.isContinued = false;
         return bail(initialResult);
@@ -6431,24 +6479,30 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
               })
             });
           }
-          const toolResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
-          rest.messageList.add(
-            {
-              id: toolResultMessageId,
-              role: "tool",
-              content: inputData.map((toolCall2) => {
-                return {
-                  type: "tool-result",
-                  args: toolCall2.args,
-                  toolCallId: toolCall2.toolCallId,
-                  toolName: toolCall2.toolName,
-                  result: toolCall2.result
-                };
-              })
-            },
-            "response"
-          );
         }
+        const toolResultMessageId = rest.experimental_generateMessageId?.() || _internal?.generateId?.();
+        const toolResultMessage = {
+          id: toolResultMessageId || "",
+          role: "assistant",
+          content: {
+            format: 2,
+            parts: inputData.map((toolCall) => {
+              return {
+                type: "tool-invocation",
+                toolInvocation: {
+                  state: "result",
+                  toolCallId: toolCall.toolCallId,
+                  toolName: toolCall.toolName,
+                  args: toolCall.args,
+                  result: toolCall.result
+                },
+                ...toolCall.providerMetadata ? { providerMetadata: toolCall.providerMetadata } : {}
+              };
+            })
+          },
+          createdAt: /* @__PURE__ */ new Date()
+        };
+        rest.messageList.add(toolResultMessage, "response");
         return {
           ...initialResult,
           messages: {
@@ -6471,13 +6525,87 @@ function createToolCallStep({
   controller,
   runId,
   streamState,
-  modelSpanTracker
+  modelSpanTracker,
+  _internal
 }) {
   return createStep({
     id: "toolCallStep",
     inputSchema: toolCallInputSchema,
     outputSchema: toolCallOutputSchema,
     execute: async ({ inputData, suspend, resumeData, requestContext }) => {
+      const addToolApprovalMetadata = (toolCallId, toolName, args) => {
+        const responseMessages = messageList.get.response.db();
+        const lastAssistantMessage = [...responseMessages].reverse().find((msg) => msg.role === "assistant");
+        if (lastAssistantMessage) {
+          const content = lastAssistantMessage.content;
+          if (!content) return;
+          const metadata = typeof lastAssistantMessage.content.metadata === "object" && lastAssistantMessage.content.metadata !== null ? lastAssistantMessage.content.metadata : {};
+          metadata.pendingToolApprovals = metadata.pendingToolApprovals || {};
+          metadata.pendingToolApprovals[toolCallId] = {
+            toolName,
+            args,
+            type: "approval",
+            runId
+            // Store the runId so we can resume after page refresh
+          };
+          lastAssistantMessage.content.metadata = metadata;
+        }
+      };
+      const removeToolApprovalMetadata = async (toolCallId) => {
+        const { saveQueueManager, memoryConfig, threadId } = _internal || {};
+        if (!saveQueueManager || !threadId) {
+          return;
+        }
+        const getMetadata = (message) => {
+          const content = message.content;
+          if (!content) return void 0;
+          const metadata = typeof content.metadata === "object" && content.metadata !== null ? content.metadata : void 0;
+          return metadata;
+        };
+        const allMessages = messageList.get.all.db();
+        const lastAssistantMessage = [...allMessages].reverse().find((msg) => {
+          const metadata = getMetadata(msg);
+          const pendingToolApprovals = metadata?.pendingToolApprovals;
+          return !!pendingToolApprovals?.[toolCallId];
+        });
+        if (lastAssistantMessage) {
+          const metadata = getMetadata(lastAssistantMessage);
+          const pendingToolApprovals = metadata?.pendingToolApprovals;
+          if (pendingToolApprovals && typeof pendingToolApprovals === "object") {
+            delete pendingToolApprovals[toolCallId];
+            if (metadata && Object.keys(pendingToolApprovals).length === 0) {
+              delete metadata.pendingToolApprovals;
+            }
+            try {
+              await saveQueueManager.flushMessages(messageList, threadId, memoryConfig);
+            } catch (error) {
+              console.error("Error removing tool approval metadata:", error);
+            }
+          }
+        }
+      };
+      const flushMessagesBeforeSuspension = async () => {
+        const { saveQueueManager, memoryConfig, threadId, resourceId, memory } = _internal || {};
+        if (!saveQueueManager || !threadId) {
+          return;
+        }
+        try {
+          if (memory && !_internal.threadExists && resourceId) {
+            const thread = await memory.getThreadById?.({ threadId });
+            if (!thread) {
+              await memory.createThread?.({
+                threadId,
+                resourceId,
+                memoryConfig
+              });
+            }
+            _internal.threadExists = true;
+          }
+          await saveQueueManager.flushMessages(messageList, threadId, memoryConfig);
+        } catch (error) {
+          console.error("Error flushing messages before suspension:", error);
+        }
+      };
       if (inputData.providerExecuted) {
         return {
           ...inputData,
@@ -6517,6 +6645,8 @@ function createToolCallStep({
                 args: inputData.args
               }
             });
+            addToolApprovalMetadata(inputData.toolCallId, inputData.toolName, inputData.args);
+            await flushMessagesBeforeSuspension();
             return suspend(
               {
                 requireToolApproval: {
@@ -6531,6 +6661,7 @@ function createToolCallStep({
               }
             );
           } else {
+            await removeToolApprovalMetadata(inputData.toolCallId);
             if (!resumeData.approved) {
               return {
                 result: "Tool call was not approved by the user",
@@ -6553,6 +6684,7 @@ function createToolCallStep({
               from: "AGENT" /* AGENT */,
               payload: { toolCallId: inputData.toolCallId, toolName: inputData.toolName, suspendPayload }
             });
+            await flushMessagesBeforeSuspension();
             return await suspend(
               {
                 toolCallSuspended: suspendPayload,
@@ -6566,6 +6698,18 @@ function createToolCallStep({
           resumeData
         };
         const result = await tool.execute(inputData.args, toolOptions);
+        if (tool && "onOutput" in tool && typeof tool.onOutput === "function") {
+          try {
+            await tool.onOutput({
+              toolCallId: inputData.toolCallId,
+              toolName: inputData.toolName,
+              output: result,
+              abortSignal: options?.abortSignal
+            });
+          } catch (error) {
+            console.error("Error calling onOutput", error);
+          }
+        }
         return { result, ...inputData };
       } catch (error) {
         return {
@@ -6585,6 +6729,7 @@ function createAgenticExecutionWorkflow({ models, _internal, ...rest }) {
     ...rest
   });
   const toolCallStep = createToolCallStep({
+    _internal,
     ...rest
   });
   const llmMappingStep = createLLMMappingStep(
@@ -6609,6 +6754,16 @@ function createAgenticExecutionWorkflow({ models, _internal, ...rest }) {
       validateInputs: false
     }
   }).then(llmExecutionStep).map(
+    async ({ inputData }) => {
+      const typedInputData = inputData;
+      const responseMessages = typedInputData.messages.nonUser;
+      if (responseMessages && responseMessages.length > 0) {
+        rest.messageList.add(responseMessages, "response");
+      }
+      return typedInputData;
+    },
+    { id: "add-response-to-messagelist" }
+  ).map(
     async ({ inputData }) => {
       const typedInputData = inputData;
       return typedInputData.output.toolCalls || [];
@@ -6872,7 +7027,13 @@ function loop({
   const internalToUse = {
     now: _internal?.now || (() => Date.now()),
     generateId: _internal?.generateId || (() => aiV5.generateId()),
-    currentDate: _internal?.currentDate || (() => /* @__PURE__ */ new Date())
+    currentDate: _internal?.currentDate || (() => /* @__PURE__ */ new Date()),
+    saveQueueManager: _internal?.saveQueueManager,
+    memoryConfig: _internal?.memoryConfig,
+    threadId: _internal?.threadId,
+    resourceId: _internal?.resourceId,
+    memory: _internal?.memory,
+    threadExists: _internal?.threadExists
   };
   let startTimestamp = internalToUse.now?.();
   const messageId = rest.experimental_generateMessageId?.() || internalToUse.generateId?.();
@@ -7058,7 +7219,8 @@ var MastraLLMVNext = class extends chunkKEXGB7FK_cjs.MastraBase {
     _internal,
     agentId,
     toolCallId,
-    methodType
+    methodType,
+    includeRawChunks
   }) {
     let stopWhenToUse;
     if (maxSteps && typeof maxSteps === "number") {
@@ -7116,6 +7278,7 @@ var MastraLLMVNext = class extends chunkKEXGB7FK_cjs.MastraBase {
         requireToolApproval,
         agentId,
         methodType,
+        includeRawChunks,
         options: {
           ...options,
           onStepFinish: async (props) => {
@@ -7153,9 +7316,10 @@ var MastraLLMVNext = class extends chunkKEXGB7FK_cjs.MastraBase {
               usage: props?.usage,
               runId
             });
-            if (props?.response?.headers?.["x-ratelimit-remaining-tokens"] && parseInt(props?.response?.headers?.["x-ratelimit-remaining-tokens"], 10) < 2e3) {
+            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 chunkHBJPYQRN_cjs.delay(10 * 1e3);
+              await chunkRROQ46B6_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -7459,7 +7623,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkG36A2JRR_cjs.MessageList({
+    const messageList = new chunkDQIZ5FFX_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -7549,11 +7713,13 @@ async function createNetworkLoop({
       const routingAgent = await getRoutingAgent({ requestContext, agent });
       let completionResult;
       const iterationCount = (inputData.iteration ?? -1) + 1;
+      const stepId = generateId3();
       await writer.write({
         type: "routing-agent-start",
         payload: {
+          networkId: agent.id,
           agentId: routingAgent.id,
-          runId,
+          runId: stepId,
           inputData: {
             ...inputData,
             iteration: iterationCount
@@ -7599,7 +7765,7 @@ async function createNetworkLoop({
         await writer.write({
           type: "routing-agent-text-start",
           payload: {
-            runId
+            runId: stepId
           },
           from: "NETWORK" /* NETWORK */,
           runId
@@ -7613,6 +7779,7 @@ async function createNetworkLoop({
             await writer.write({
               type: "routing-agent-text-delta",
               payload: {
+                runId: stepId,
                 text: currentSlice
               },
               from: "NETWORK" /* NETWORK */,
@@ -7641,6 +7808,7 @@ async function createNetworkLoop({
               await writer.write({
                 type: "routing-agent-text-delta",
                 payload: {
+                  runId: stepId,
                   text: currentSlice
                 },
                 from: "NETWORK" /* NETWORK */,
@@ -7661,7 +7829,7 @@ async function createNetworkLoop({
             isComplete: true,
             selectionReason: completionResult.object.completionReason || "",
             iteration: iterationCount,
-            runId
+            runId: stepId
           };
           await writer.write({
             type: "routing-agent-end",
@@ -7763,7 +7931,7 @@ ${completionResult?.object?.finalResult}` : ""}
         isComplete: object.primitiveId === "none" && object.primitiveType === "none",
         selectionReason: object.selectionReason,
         iteration: iterationCount,
-        runId
+        runId: stepId
       };
       await writer.write({
         type: "routing-agent-end",
@@ -7799,23 +7967,24 @@ ${completionResult?.object?.finalResult}` : ""}
     }),
     execute: async ({ inputData, writer, getInitData }) => {
       const agentsMap = await agent.listAgents({ requestContext });
-      const agentId = inputData.primitiveId;
-      const agentForStep = agentsMap[agentId];
+      const agentForStep = agentsMap[inputData.primitiveId];
       if (!agentForStep) {
         const mastraError = new chunkTWH4PTDG_cjs.MastraError({
           id: "AGENT_NETWORK_AGENT_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
-          text: `Agent ${agentId} not found`
+          text: `Agent ${inputData.primitiveId} not found`
         });
         throw mastraError;
       }
+      const agentId = agentForStep.id;
+      const stepId = generateId3();
       await writer.write({
         type: "agent-execution-start",
         payload: {
-          agentId: inputData.primitiveId,
+          agentId,
           args: inputData,
-          runId
+          runId: stepId
         },
         from: "NETWORK" /* NETWORK */,
         runId
@@ -7827,9 +7996,12 @@ ${completionResult?.object?.finalResult}` : ""}
       for await (const chunk of result.fullStream) {
         await writer.write({
           type: `agent-execution-event-${chunk.type}`,
-          payload: chunk,
-          runId: chunk.runId,
-          from: "NETWORK" /* NETWORK */
+          payload: {
+            ...chunk,
+            runId: stepId
+          },
+          from: "NETWORK" /* NETWORK */,
+          runId
         });
       }
       const memory = await agent.getMemory({ requestContext });
@@ -7865,10 +8037,11 @@ ${completionResult?.object?.finalResult}` : ""}
       });
       const endPayload = {
         task: inputData.task,
-        agentId: inputData.primitiveId,
+        agentId,
         result: await result.text,
         isComplete: false,
-        iteration: inputData.iteration
+        iteration: inputData.iteration,
+        runId: stepId
       };
       await writer.write({
         type: "agent-execution-end",
@@ -7937,11 +8110,12 @@ ${completionResult?.object?.finalResult}` : ""}
         );
         throw mastraError;
       }
+      const stepId = generateId3();
       const run = await wf.createRun({ runId });
       const toolData = {
-        name: wf.name,
+        workflowId: wf.id,
         args: inputData,
-        runId
+        runId: stepId
       };
       await writer?.write({
         type: "workflow-execution-start",
@@ -7954,13 +8128,16 @@ ${completionResult?.object?.finalResult}` : ""}
         requestContext
       });
       let chunks = [];
-      for await (const chunk of stream) {
+      for await (const chunk of stream.fullStream) {
         chunks.push(chunk);
         await writer?.write({
           type: `workflow-execution-event-${chunk.type}`,
-          payload: chunk,
-          runId: chunk.runId,
-          from: "NETWORK" /* NETWORK */
+          payload: {
+            ...chunk,
+            runId: stepId
+          },
+          from: "NETWORK" /* NETWORK */,
+          runId
         });
       }
       let runSuccess = true;
@@ -8002,13 +8179,15 @@ ${completionResult?.object?.finalResult}` : ""}
         primitiveType: inputData.primitiveType,
         result: finalResult,
         isComplete: false,
-        iteration: inputData.iteration,
-        name: wf.name
+        iteration: inputData.iteration
       };
       await writer?.write({
         type: "workflow-execution-end",
         payload: {
           ...endPayload,
+          result: workflowState,
+          name: wf.name,
+          runId: stepId,
           usage: await stream.usage
         },
         from: "NETWORK" /* NETWORK */,
@@ -8043,14 +8222,13 @@ ${completionResult?.object?.finalResult}` : ""}
       const memory = await agent.getMemory({ requestContext });
       const memoryTools = await memory?.listTools?.();
       const toolsMap = { ...agentTools, ...memoryTools };
-      const toolId = inputData.primitiveId;
-      let tool = toolsMap[toolId];
+      let tool = toolsMap[inputData.primitiveId];
       if (!tool) {
         const mastraError = new chunkTWH4PTDG_cjs.MastraError({
           id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
-          text: `Tool ${toolId} not found`
+          text: `Tool ${inputData.primitiveId} not found`
         });
         throw mastraError;
       }
@@ -8059,10 +8237,11 @@ ${completionResult?.object?.finalResult}` : ""}
           id: "AGENT_NETWORK_TOOL_EXECUTION_STEP_INVALID_TASK_INPUT",
           domain: "AGENT_NETWORK" /* AGENT_NETWORK */,
           category: "USER" /* USER */,
-          text: `Tool ${toolId} does not have an execute function`
+          text: `Tool ${inputData.primitiveId} does not have an execute function`
         });
         throw mastraError;
       }
+      const toolId = tool.id;
       let inputDataToUse;
       try {
         inputDataToUse = JSON.parse(inputData.prompt);
@@ -8911,7 +9090,7 @@ var AgentLegacyHandler = class {
           writableStream,
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy"
         });
-        const messageList = new chunkG36A2JRR_cjs.MessageList({
+        const messageList = new chunkDQIZ5FFX_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -8992,7 +9171,7 @@ var AgentLegacyHandler = class {
           existingThread || hasResourceScopeSemanticRecall ? this.capabilities.getMemoryMessages({
             resourceId,
             threadId: threadObject.id,
-            vectorMessageSearch: new chunkG36A2JRR_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
+            vectorMessageSearch: new chunkDQIZ5FFX_cjs.MessageList().add(messages, `user`).getLatestUserContent() || "",
             memoryConfig,
             requestContext
           }) : { messages: [] },
@@ -9014,7 +9193,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
             let result = ``;
-            const messages2 = new chunkG36A2JRR_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+            const messages2 = new chunkDQIZ5FFX_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
             let lastYmd = null;
             for (const msg of messages2) {
               const date = msg.createdAt;
@@ -9065,7 +9244,7 @@ the following messages are from ${ymd}
           systemMessage,
           memorySystemMessage: memorySystemMessage || void 0
         });
-        const processedList = new chunkG36A2JRR_cjs.MessageList({
+        const processedList = new chunkDQIZ5FFX_cjs.MessageList({
           threadId: threadObject.id,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -9121,7 +9300,7 @@ the following messages are from ${ymd}
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkG36A2JRR_cjs.MessageList({
+        const messageListResponses = new chunkDQIZ5FFX_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -9481,7 +9660,7 @@ the following messages are from ${ymd}
         requestContext: mergedGenerateOptions.requestContext || new chunkJ7O6WENZ_cjs.RequestContext(),
         tracingContext,
         outputProcessorOverrides: finalOutputProcessors,
-        messageList: new chunkG36A2JRR_cjs.MessageList({
+        messageList: new chunkDQIZ5FFX_cjs.MessageList({
           threadId: llmOptions.threadId || "",
           resourceId: llmOptions.resourceId || ""
         }).add(
@@ -9571,7 +9750,7 @@ the following messages are from ${ymd}
     const outputProcessorResult = await this.capabilities.__runOutputProcessors({
       requestContext: mergedGenerateOptions.requestContext || new chunkJ7O6WENZ_cjs.RequestContext(),
       tracingContext,
-      messageList: new chunkG36A2JRR_cjs.MessageList({
+      messageList: new chunkDQIZ5FFX_cjs.MessageList({
         threadId: llmOptions.threadId || "",
         resourceId: llmOptions.resourceId || ""
       }).add(
@@ -11874,6 +12053,7 @@ function createMapResultsStep({
       stopWhen: result.stopWhen,
       maxSteps: result.maxSteps,
       providerOptions: result.providerOptions,
+      includeRawChunks: options.includeRawChunks,
       options: {
         ...options.prepareStep && { prepareStep: options.prepareStep },
         onFinish: async (payload) => {
@@ -11966,7 +12146,7 @@ var prepareToolsStepOutputSchema = z5.z.object({
 var prepareMemoryStepOutputSchema = z5.z.object({
   threadExists: z5.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z5.z.instanceof(chunkG36A2JRR_cjs.MessageList),
+  messageList: z5.z.instanceof(chunkDQIZ5FFX_cjs.MessageList),
   tripwire: z5.z.boolean().optional(),
   tripwireReason: z5.z.string().optional()
 });
@@ -11999,7 +12179,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunkG36A2JRR_cjs.MessageList({
+      const messageList = new chunkDQIZ5FFX_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -12080,7 +12260,7 @@ function createPrepareMemoryStep({
         existingThread || hasResourceScopeSemanticRecall ? capabilities.getMemoryMessages({
           resourceId,
           threadId: threadObject.id,
-          vectorMessageSearch: new chunkG36A2JRR_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
+          vectorMessageSearch: new chunkDQIZ5FFX_cjs.MessageList().add(options.messages, `user`).getLatestUserContent() || "",
           memoryConfig,
           requestContext
         }) : { messages: [] },
@@ -12106,7 +12286,7 @@ The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
           let result = ``;
-          const messages = new chunkG36A2JRR_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
+          const messages = new chunkDQIZ5FFX_cjs.MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
           let lastYmd = null;
           for (const msg of messages) {
             const date = msg.createdAt;
@@ -12153,7 +12333,7 @@ the following messages are from ${ymd}
         systemMessage,
         memorySystemMessage: memorySystemMessage || void 0
       });
-      const processedList = new chunkG36A2JRR_cjs.MessageList({
+      const processedList = new chunkDQIZ5FFX_cjs.MessageList({
         threadId: threadObject.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -12229,7 +12409,11 @@ function createStreamStep({
   resumeContext,
   agentId,
   toolCallId,
-  methodType
+  methodType,
+  saveQueueManager,
+  memoryConfig,
+  memory,
+  resourceId
 }) {
   return createStep({
     id: "stream-text-step",
@@ -12256,7 +12440,12 @@ function createStreamStep({
         requireToolApproval,
         resumeContext,
         _internal: {
-          generateId: capabilities.generateMessageId
+          generateId: capabilities.generateMessageId,
+          saveQueueManager,
+          memoryConfig,
+          threadId: validatedInputData.threadId,
+          resourceId,
+          memory
         },
         agentId,
         toolCallId,
@@ -12317,7 +12506,11 @@ function createPrepareStreamWorkflow({
     resumeContext,
     agentId,
     toolCallId,
-    methodType
+    methodType,
+    saveQueueManager,
+    memoryConfig,
+    memory,
+    resourceId
   });
   const mapResultsStep = createMapResultsStep({
     capabilities,
@@ -12474,7 +12667,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunkQUKUN6NR_cjs.DefaultVoice();
+      this.#voice = new chunkISMGVGUM_cjs.DefaultVoice();
     }
     if (config.inputProcessors) {
       this.#inputProcessors = config.inputProcessors;
@@ -12721,7 +12914,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
       voice?.addInstructions(this.#convertInstructionsToString(instructions));
       return voice;
     } else {
-      return new chunkQUKUN6NR_cjs.DefaultVoice();
+      return new chunkISMGVGUM_cjs.DefaultVoice();
     }
   }
   /**
@@ -12942,7 +13135,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
    */
   listTools({ requestContext = new chunkJ7O6WENZ_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkHBJPYQRN_cjs.ensureToolProperties(this.#tools);
+      return chunkRROQ46B6_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (tools) => {
@@ -12960,7 +13153,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkHBJPYQRN_cjs.ensureToolProperties(tools);
+      return chunkRROQ46B6_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -12992,7 +13185,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
           });
         });
       } else {
-        llm = new chunkO6NA3Z43_cjs.MastraLLMV1({
+        llm = new chunkOUUPUAGA_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -13017,7 +13210,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkN4SJ4YX7_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkNHP6ZIDG_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunkTWH4PTDG_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -13223,7 +13416,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkG36A2JRR_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkDQIZ5FFX_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -13246,7 +13439,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
-      const messageList = new chunkG36A2JRR_cjs.MessageList().add(
+      const messageList = new chunkDQIZ5FFX_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -13298,7 +13491,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkG36A2JRR_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkDQIZ5FFX_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -13358,9 +13551,10 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
           requestContext,
           tracingContext,
           model: await this.getModel({ requestContext }),
-          tracingPolicy: this.#options?.tracingPolicy
+          tracingPolicy: this.#options?.tracingPolicy,
+          requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkHBJPYQRN_cjs.makeCoreTool(toolObj, options);
+        const convertedToCoreTool = chunkRROQ46B6_cjs.makeCoreTool(toolObj, options);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -13510,7 +13704,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool.requireApproval
         };
-        return [k, chunkHBJPYQRN_cjs.makeCoreTool(tool, options)];
+        return [k, chunkRROQ46B6_cjs.makeCoreTool(tool, options)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -13556,9 +13750,10 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
             requestContext,
             tracingContext,
             model: await this.getModel({ requestContext }),
-            tracingPolicy: this.#options?.tracingPolicy
+            tracingPolicy: this.#options?.tracingPolicy,
+            requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkHBJPYQRN_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunkRROQ46B6_cjs.makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -13599,9 +13794,10 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
           requestContext,
           tracingContext,
           model: await this.getModel({ requestContext }),
-          tracingPolicy: this.#options?.tracingPolicy
+          tracingPolicy: this.#options?.tracingPolicy,
+          requireApproval: tool.requireApproval
         };
-        const convertedToCoreTool = chunkHBJPYQRN_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunkRROQ46B6_cjs.makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -13624,7 +13820,11 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
     if (Object.keys(agents).length > 0) {
       for (const [agentName, agent] of Object.entries(agents)) {
         const agentInputSchema = z5.z.object({
-          prompt: z5.z.string().describe("The prompt to send to the agent")
+          prompt: z5.z.string().describe("The prompt to send to the agent"),
+          threadId: z5.z.string().optional().describe("Thread ID for conversation continuity for memory messages"),
+          resourceId: z5.z.string().optional().describe("Resource/user identifier for memory messages"),
+          instructions: z5.z.string().optional().describe("Custom instructions to override agent defaults"),
+          maxSteps: z5.z.number().optional().describe("Maximum number of execution steps for the sub-agent")
         });
         const agentOutputSchema = z5.z.object({
           text: z5.z.string().describe("The response from the agent"),
@@ -13632,13 +13832,12 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
           subAgentResourceId: z5.z.string().describe("The resource ID of the agent").optional()
         });
         const modelVersion = (await agent.getModel()).specificationVersion;
-        const toolObj = chunk4IKJAKCD_cjs.createTool({
+        const toolObj = chunkV537VSV4_cjs.createTool({
           id: `agent-${agentName}`,
           description: `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
           outputSchema: agentOutputSchema,
           mastra: this.#mastra,
-          // BREAKING CHANGE v1.0: New tool signature - first param is inputData, second is context
           // manually wrap agent tools with tracing, so that we can pass the
           // current tool span onto the agent to maintain continuity of the trace
           execute: async (inputData, context) => {
@@ -13651,16 +13850,18 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
                 resourceId
               });
               let result;
+              const slugify = await import('@sindresorhus/slugify');
+              const subAgentThreadId = inputData.threadId || context?.mastra?.generateId() || crypto2.randomUUID();
+              const subAgentResourceId = inputData.resourceId || context?.mastra?.generateId() || `${slugify.default(this.id)}-${agentName}`;
               if ((methodType === "generate" || methodType === "generateLegacy") && modelVersion === "v2") {
                 if (!agent.hasOwnMemory() && this.#memory) {
                   agent.__setMemory(this.#memory);
                 }
-                const subAgentThreadId = crypto2.randomUUID();
-                const slugify = await import('@sindresorhus/slugify');
-                const subAgentResourceId = `${slugify.default(this.id)}-${agentName}`;
                 const generateResult = await agent.generate(inputData.prompt, {
                   requestContext,
                   tracingContext: context?.tracingContext,
+                  ...inputData.instructions && { instructions: inputData.instructions },
+                  ...inputData.maxSteps && { maxSteps: inputData.maxSteps },
                   ...resourceId && threadId ? {
                     memory: {
                       resource: subAgentResourceId,
@@ -13679,12 +13880,11 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
                 if (!agent.hasOwnMemory() && this.#memory) {
                   agent.__setMemory(this.#memory);
                 }
-                const subAgentThreadId = crypto2.randomUUID();
-                const slugify = await import('@sindresorhus/slugify');
-                const subAgentResourceId = `${slugify.default(this.id)}-${agentName}`;
                 const streamResult = await agent.stream(inputData.prompt, {
                   requestContext,
                   tracingContext: context?.tracingContext,
+                  ...inputData.instructions && { instructions: inputData.instructions },
+                  ...inputData.maxSteps && { maxSteps: inputData.maxSteps },
                   ...resourceId && threadId ? {
                     memory: {
                       resource: subAgentResourceId,
@@ -13695,7 +13895,11 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
                 let fullText = "";
                 for await (const chunk of streamResult.fullStream) {
                   if (context?.writer) {
-                    await context.writer.write(chunk);
+                    if (chunk.type.startsWith("data-")) {
+                      await context.writer.custom(chunk);
+                    } else {
+                      await context.writer.write(chunk);
+                    }
                   }
                   if (chunk.type === "text-delta") {
                     fullText += chunk.payload.text;
@@ -13710,7 +13914,11 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
                 let fullText = "";
                 for await (const chunk of streamResult.fullStream) {
                   if (context?.writer) {
-                    await context.writer.write(chunk);
+                    if (chunk.type.startsWith("data-")) {
+                      await context.writer.custom(chunk);
+                    } else {
+                      await context.writer.write(chunk);
+                    }
                   }
                   if (chunk.type === "text-delta") {
                     fullText += chunk.textDelta;
@@ -13756,7 +13964,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkHBJPYQRN_cjs.makeCoreTool(toolObj, options);
+        convertedAgentTools[`agent-${agentName}`] = chunkRROQ46B6_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedAgentTools;
@@ -13777,13 +13985,25 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
     const workflows = await this.listWorkflows({ requestContext });
     if (Object.keys(workflows).length > 0) {
       for (const [workflowName, workflow] of Object.entries(workflows)) {
-        const toolObj = chunk4IKJAKCD_cjs.createTool({
+        const extendedInputSchema = z5.z.object({
+          inputData: workflow.inputSchema,
+          ...workflow.stateSchema ? { initialState: workflow.stateSchema } : {}
+        });
+        const toolObj = chunkV537VSV4_cjs.createTool({
           id: `workflow-${workflowName}`,
           description: workflow.description || `Workflow: ${workflowName}`,
-          inputSchema: workflow.inputSchema,
-          outputSchema: z5.z.object({ result: workflow.outputSchema, runId: z5.z.string() }),
+          inputSchema: extendedInputSchema,
+          outputSchema: z5.z.union([
+            z5.z.object({
+              result: workflow.outputSchema,
+              runId: z5.z.string().describe("Unique identifier for the workflow run")
+            }),
+            z5.z.object({
+              runId: z5.z.string().describe("Unique identifier for the workflow run"),
+              error: z5.z.string().describe("Error message if workflow execution failed")
+            })
+          ]),
           mastra: this.#mastra,
-          // BREAKING CHANGE v1.0: New tool signature - first param is inputData, second is context
           // manually wrap workflow tools with tracing, so that we can pass the
           // current tool span onto the workflow to maintain continuity of the trace
           execute: async (inputData, context) => {
@@ -13797,16 +14017,18 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
                 resourceId
               });
               const run = await workflow.createRun();
-              let result;
+              const { initialState, inputData: workflowInputData } = inputData;
+              let result = void 0;
               if (methodType === "generate" || methodType === "generateLegacy") {
                 result = await run.start({
-                  inputData,
+                  inputData: workflowInputData,
                   requestContext,
-                  tracingContext: context?.tracingContext
+                  tracingContext: context?.tracingContext,
+                  ...initialState && { initialState }
                 });
               } else if (methodType === "streamLegacy") {
                 const streamResult = run.streamLegacy({
-                  inputData,
+                  inputData: workflowInputData,
                   requestContext,
                   tracingContext: context?.tracingContext
                 });
@@ -13819,17 +14041,36 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
                 result = await streamResult.getWorkflowState();
               } else if (methodType === "stream") {
                 const streamResult = run.stream({
-                  inputData,
+                  inputData: workflowInputData,
                   requestContext,
-                  tracingContext: context?.tracingContext
+                  tracingContext: context?.tracingContext,
+                  ...initialState && { initialState }
                 });
                 if (context?.writer) {
                   await streamResult.fullStream.pipeTo(context.writer);
                 }
                 result = await streamResult.result;
               }
-              const workflowOutput = result?.result || result;
-              return { result: workflowOutput, runId: run.runId };
+              if (result?.status === "success") {
+                const workflowOutput = result?.result || result;
+                return { result: workflowOutput, runId: run.runId };
+              } else if (result?.status === "failed") {
+                const workflowOutputError = result?.error;
+                return {
+                  error: workflowOutputError?.message || String(workflowOutputError) || "Workflow execution failed",
+                  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
+                };
+              } else {
+                return {
+                  error: `Workflow should never reach this path, workflow returned no status`,
+                  runId: run.runId
+                };
+              }
             } catch (err) {
               const mastraError = new chunkTWH4PTDG_cjs.MastraError(
                 {
@@ -13866,7 +14107,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkHBJPYQRN_cjs.makeCoreTool(toolObj, options);
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkRROQ46B6_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedWorkflowTools;
@@ -13889,7 +14130,7 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkHBJPYQRN_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkRROQ46B6_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -14204,6 +14445,34 @@ var Agent = class extends chunkKEXGB7FK_cjs.MastraBase {
       );
     }
     const llm = await this.getLLM({ requestContext, model: options.model });
+    if ("structuredOutput" in options && options.structuredOutput && options.structuredOutput.schema) {
+      let structuredOutputModel = llm.getModel();
+      if (options.structuredOutput?.model) {
+        structuredOutputModel = await this.resolveModelConfig(
+          options.structuredOutput?.model,
+          requestContext
+        );
+      }
+      const targetProvider = structuredOutputModel.provider;
+      const targetModelId = structuredOutputModel.modelId;
+      if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
+        if (chunkRROQ46B6_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+          const modelInfo = {
+            provider: targetProvider,
+            modelId: targetModelId,
+            supportsStructuredOutputs: false
+            // Set to false to enable transform
+          };
+          const isReasoningModel = /^o[1-5]/.test(targetModelId);
+          const compatLayer = isReasoningModel ? new schemaCompat.OpenAIReasoningSchemaCompatLayer(modelInfo) : new schemaCompat.OpenAISchemaCompatLayer(modelInfo);
+          if (compatLayer.shouldApply() && options.structuredOutput.schema) {
+            options.structuredOutput.schema = compatLayer.processZodType(
+              options.structuredOutput.schema
+            );
+          }
+        }
+      }
+    }
     const runId = options.runId || this.#mastra?.generateId() || crypto2.randomUUID();
     const instructions = options.instructions || await this.getInstructions({ requestContext });
     const agentSpan = chunkE7K4FTLN_cjs.getOrCreateSpan({
@@ -15924,7 +16193,7 @@ var MastraModelOutput = class extends chunkKEXGB7FK_cjs.MastraBase {
                     self.messageList,
                     options.tracingContext
                   );
-                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkG36A2JRR_cjs.MessageList.coreContentToString(m.content)).join("\n");
+                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkDQIZ5FFX_cjs.MessageList.coreContentToString(m.content)).join("\n");
                   self.#delayedPromises.text.resolve(outputText);
                   self.#delayedPromises.finishReason.resolve(self.#finishReason);
                   if (chunk.payload.metadata) {
@@ -16561,5 +16830,6 @@ exports.tryGenerateWithJsonFallback = tryGenerateWithJsonFallback;
 exports.tryStreamWithJsonFallback = tryStreamWithJsonFallback;
 exports.validateStepInput = validateStepInput;
 exports.validateStepResumeData = validateStepResumeData;
-//# sourceMappingURL=chunk-OWX2PUFH.cjs.map
-//# sourceMappingURL=chunk-OWX2PUFH.cjs.map
+exports.validateStepSuspendData = validateStepSuspendData;
+//# sourceMappingURL=chunk-KP42JLXE.cjs.map
+//# sourceMappingURL=chunk-KP42JLXE.cjs.map