@mastra/core 1.2.1-alpha.0 → 1.3.0-alpha.2

package/dist/{chunk-5SOS47PH.cjs → chunk-FLHFB23E.cjs}

@@ -1,25 +1,25 @@
 'use strict';
 
-var chunkHMCXNOF6_cjs = require('./chunk-HMCXNOF6.cjs');
-var chunk6FG6FU5Y_cjs = require('./chunk-6FG6FU5Y.cjs');
+var chunkCGPH7CMG_cjs = require('./chunk-CGPH7CMG.cjs');
+var chunkRQ56ZSIR_cjs = require('./chunk-RQ56ZSIR.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
-var chunkQOFI2WBM_cjs = require('./chunk-QOFI2WBM.cjs');
-var chunk7MDVYPWX_cjs = require('./chunk-7MDVYPWX.cjs');
+var chunkJU6K7UDX_cjs = require('./chunk-JU6K7UDX.cjs');
+var chunkUE2G2LRP_cjs = require('./chunk-UE2G2LRP.cjs');
 var chunkZIEQA3YP_cjs = require('./chunk-ZIEQA3YP.cjs');
 var chunkPM3UIIBK_cjs = require('./chunk-PM3UIIBK.cjs');
-var chunkXCPEEIHI_cjs = require('./chunk-XCPEEIHI.cjs');
-var chunkHU2ONA2W_cjs = require('./chunk-HU2ONA2W.cjs');
+var chunkGCTAD6B7_cjs = require('./chunk-GCTAD6B7.cjs');
+var chunkON2KVIUJ_cjs = require('./chunk-ON2KVIUJ.cjs');
 var chunk6BJ7XHRH_cjs = require('./chunk-6BJ7XHRH.cjs');
 var chunk4D4KB75Y_cjs = require('./chunk-4D4KB75Y.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkI66TMZJ3_cjs = require('./chunk-I66TMZJ3.cjs');
+var chunkOOCEAC6U_cjs = require('./chunk-OOCEAC6U.cjs');
 var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
-var chunkIIZF4W7B_cjs = require('./chunk-IIZF4W7B.cjs');
+var chunk7UWHFWST_cjs = require('./chunk-7UWHFWST.cjs');
 var chunkCYUP7QWT_cjs = require('./chunk-CYUP7QWT.cjs');
 var chunkVDKWYUGC_cjs = require('./chunk-VDKWYUGC.cjs');
 var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
 var chunk4WQYXT2I_cjs = require('./chunk-4WQYXT2I.cjs');
-var chunkC4WWWQHT_cjs = require('./chunk-C4WWWQHT.cjs');
+var chunkRO47SMI7_cjs = require('./chunk-RO47SMI7.cjs');
 var chunk7XAECHYL_cjs = require('./chunk-7XAECHYL.cjs');
 var chunk6SZKM6EC_cjs = require('./chunk-6SZKM6EC.cjs');
 var z10 = require('zod');
@@ -1222,7 +1222,7 @@ var ProcessorRunner = class _ProcessorRunner {
         writer
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunk7MDVYPWX_cjs.MessageList) {
+      if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
@@ -1474,7 +1474,7 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       let mutations;
-      if (result instanceof chunk7MDVYPWX_cjs.MessageList) {
+      if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
@@ -1801,7 +1801,7 @@ var ProcessorRunner = class _ProcessorRunner {
           writer
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunk7MDVYPWX_cjs.MessageList) {
+        if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -1871,7 +1871,7 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunk7MDVYPWX_cjs.MessageList) {
+    if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
       if (result !== messageList) {
         throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
@@ -1906,7 +1906,7 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkXCPEEIHI_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunkGCTAD6B7_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
           throw new chunk4U7ZLI36_cjs.MastraError({
@@ -2487,7 +2487,7 @@ function createDestructurableOutput(output) {
     }
   });
 }
-var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
+var MastraModelOutput = class extends chunkRO47SMI7_cjs.MastraBase {
   #status = "running";
   #error;
   #baseStream;
@@ -2543,6 +2543,7 @@ var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
   #tripwire = void 0;
   #delayedPromises = {
     suspendPayload: new DelayedPromise(),
+    resumeSchema: new DelayedPromise(),
     object: new DelayedPromise(),
     finishReason: new DelayedPromise(),
     usage: new DelayedPromise(),
@@ -2692,6 +2693,7 @@ var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
             case "tool-call-approval":
               self.#status = "suspended";
               self.#delayedPromises.suspendPayload.resolve(chunk.payload);
+              self.#delayedPromises.resumeSchema.resolve(chunk.payload.resumeSchema);
               break;
             case "raw":
               if (!self.#options.includeRawChunks) {
@@ -2906,8 +2908,9 @@ var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
                 steps: self.#bufferedSteps,
                 totalUsage: self.#usageCount,
                 content: [],
-                suspendPayload: void 0
+                suspendPayload: void 0,
                 // Tripwire doesn't suspend, so resolve to undefined
+                resumeSchema: void 0
               });
               self.#emitChunk(chunk);
               controller.enqueue(chunk);
@@ -2972,7 +2975,7 @@ var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
                   );
                   const responseMessages = self.messageList.get.response.aiV4.core();
                   const lastResponseMessage = responseMessages[responseMessages.length - 1];
-                  const outputText = lastResponseMessage ? chunk7MDVYPWX_cjs.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkUE2G2LRP_cjs.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
@@ -3036,7 +3039,8 @@ var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
                 steps: self.#bufferedSteps,
                 totalUsage: self.#getTotalUsage(),
                 content: messageList.get.response.aiV5.stepContent(),
-                suspendPayload: void 0
+                suspendPayload: void 0,
+                resumeSchema: void 0
               });
               const baseFinishStep = self.#bufferedSteps[self.#bufferedSteps.length - 1];
               if (baseFinishStep) {
@@ -3194,6 +3198,9 @@ var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
   get suspendPayload() {
     return this.#getDelayedPromise(this.#delayedPromises.suspendPayload);
   }
+  get resumeSchema() {
+    return this.#getDelayedPromise(this.#delayedPromises.resumeSchema);
+  }
   /**
    * Stream of all chunks. Provides complete control over stream processing.
    */
@@ -3356,6 +3363,7 @@ var MastraModelOutput = class extends chunkC4WWWQHT_cjs.MastraBase {
       traceId: this.traceId,
       runId: this.runId,
       suspendPayload: await this.suspendPayload,
+      resumeSchema: await this.resumeSchema,
       // All messages from this execution (input + memory history + response)
       messages: this.messageList.get.all.db(),
       // Only messages loaded from memory (conversation history)
@@ -4279,7 +4287,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunk7MDVYPWX_cjs.DefaultGeneratedFile({
+          file: new chunkUE2G2LRP_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -4287,7 +4295,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunk7MDVYPWX_cjs.DefaultGeneratedFileWithType({
+        file: new chunkUE2G2LRP_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -4808,7 +4816,7 @@ var ProcessorStepOutputSchema = z10.z.object({
 var ProcessorStepSchema = ProcessorStepInputSchema;
 
 // src/workflows/execution-engine.ts
-var ExecutionEngine = class extends chunkC4WWWQHT_cjs.MastraBase {
+var ExecutionEngine = class extends chunkRO47SMI7_cjs.MastraBase {
   mastra;
   options;
   constructor({ mastra, options }) {
@@ -4818,6 +4826,10 @@ var ExecutionEngine = class extends chunkC4WWWQHT_cjs.MastraBase {
   }
   __registerMastra(mastra) {
     this.mastra = mastra;
+    const logger = mastra?.getLogger();
+    if (logger) {
+      this.__setLogger(logger);
+    }
   }
   getLogger() {
     return this.logger;
@@ -4897,7 +4909,7 @@ async function validateStepInput({
 }) {
   let inputData = prevOutput;
   let validationError;
-  if (validateInputs && chunkI66TMZJ3_cjs.isZodType(step.inputSchema)) {
+  if (validateInputs && chunkOOCEAC6U_cjs.isZodType(step.inputSchema)) {
     const inputSchema = step.inputSchema;
     const validatedInput = await inputSchema.safeParseAsync(prevOutput);
     if (!validatedInput.success) {
@@ -4926,7 +4938,7 @@ async function validateStepResumeData({ resumeData, step }) {
   }
   let validationError;
   const resumeSchema = step.resumeSchema;
-  if (resumeSchema && chunkI66TMZJ3_cjs.isZodType(resumeSchema)) {
+  if (resumeSchema && chunkOOCEAC6U_cjs.isZodType(resumeSchema)) {
     const validatedResumeData = await resumeSchema.safeParseAsync(resumeData);
     if (!validatedResumeData.success) {
       const errors = getZodErrors(validatedResumeData.error);
@@ -4957,7 +4969,7 @@ async function validateStepSuspendData({
   }
   let validationError;
   const suspendSchema = step.suspendSchema;
-  if (suspendSchema && validateInputs && chunkI66TMZJ3_cjs.isZodType(suspendSchema)) {
+  if (suspendSchema && validateInputs && chunkOOCEAC6U_cjs.isZodType(suspendSchema)) {
     const validatedSuspendData = await suspendSchema.safeParseAsync(suspendData);
     if (!validatedSuspendData.success) {
       const errors = getZodErrors(validatedSuspendData.error);
@@ -4988,7 +5000,7 @@ async function validateStepStateData({
   }
   let validationError;
   const stateSchema = step.stateSchema;
-  if (stateSchema && validateInputs && chunkI66TMZJ3_cjs.isZodType(stateSchema)) {
+  if (stateSchema && validateInputs && chunkOOCEAC6U_cjs.isZodType(stateSchema)) {
     const validatedStateData = await stateSchema.safeParseAsync(stateData);
     if (!validatedStateData.success) {
       const errors = getZodErrors(validatedStateData.error);
@@ -5007,7 +5019,7 @@ async function validateStepRequestContext({
 }) {
   let validationError;
   const requestContextSchema = step.requestContextSchema;
-  if (requestContextSchema && validateInputs && chunkI66TMZJ3_cjs.isZodType(requestContextSchema)) {
+  if (requestContextSchema && validateInputs && chunkOOCEAC6U_cjs.isZodType(requestContextSchema)) {
     const contextValues = requestContext?.all ?? {};
     const validatedRequestContext = await requestContextSchema.safeParseAsync(contextValues);
     if (!validatedRequestContext.success) {
@@ -5143,7 +5155,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkI66TMZJ3_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkOOCEAC6U_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -5703,7 +5715,7 @@ async function executeLoop(engine, params) {
       options: {
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: '${entry.loopType}'`,
-        input: chunkI66TMZJ3_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunkOOCEAC6U_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         },
@@ -7770,10 +7782,10 @@ function isAgent(input) {
   return input instanceof Agent;
 }
 function isToolStep(input) {
-  return input instanceof chunkIIZF4W7B_cjs.Tool;
+  return input instanceof chunk7UWHFWST_cjs.Tool;
 }
 function isStepParams(input) {
-  return input !== null && typeof input === "object" && "id" in input && "execute" in input && !(input instanceof Agent) && !(input instanceof chunkIIZF4W7B_cjs.Tool);
+  return input !== null && typeof input === "object" && "id" in input && "execute" in input && !(input instanceof Agent) && !(input instanceof chunk7UWHFWST_cjs.Tool);
 }
 function createStep(params, agentOrToolOptions) {
   if (isAgent(params)) {
@@ -7802,13 +7814,14 @@ function createStepFromParams(params) {
     requestContextSchema: params.requestContextSchema,
     scorers: params.scorers,
     retries: params.retries,
+    metadata: params.metadata,
     execute: params.execute.bind(params)
   };
 }
 function createStepFromAgent(params, agentOrToolOptions) {
   const options = agentOrToolOptions ?? {};
   const outputSchema = options?.structuredOutput?.schema ?? z10.z.object({ text: z10.z.string() });
-  const { retries, scorers, ...agentOptions } = options ?? {};
+  const { retries, scorers, metadata, ...agentOptions } = options ?? {};
   return {
     id: params.id,
     description: params.getDescription(),
@@ -7818,6 +7831,7 @@ function createStepFromAgent(params, agentOrToolOptions) {
     outputSchema,
     retries,
     scorers,
+    metadata,
     execute: async ({
       inputData,
       runId,
@@ -7943,6 +7957,7 @@ function createStepFromTool(params, toolOpts) {
     suspendSchema: params.suspendSchema,
     retries: toolOpts?.retries,
     scorers: toolOpts?.scorers,
+    metadata: toolOpts?.metadata,
     execute: async ({
       inputData,
       mastra,
@@ -8107,7 +8122,7 @@ function createStepFromProcessor(processor) {
         phase,
         // Auto-create MessageList from messages if not provided
         // This enables running processor workflows from the UI where messageList can't be serialized
-        messageList: messageList ?? (Array.isArray(messages) ? new chunk7MDVYPWX_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
+        messageList: messageList ?? (Array.isArray(messages) ? new chunkUE2G2LRP_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
         stepNumber,
         systemMessages,
         streamParts,
@@ -8161,7 +8176,7 @@ function createStepFromProcessor(processor) {
                 messageList: checkedMessageList,
                 systemMessages: systemMessages ?? []
               });
-              if (result instanceof chunk7MDVYPWX_cjs.MessageList) {
+              if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8325,7 +8340,7 @@ function createStepFromProcessor(processor) {
                 messages,
                 messageList: passThrough.messageList
               });
-              if (result instanceof chunk7MDVYPWX_cjs.MessageList) {
+              if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8392,7 +8407,7 @@ function createStepFromProcessor(processor) {
                 systemMessages: systemMessages ?? [],
                 steps: steps ?? []
               });
-              if (result instanceof chunk7MDVYPWX_cjs.MessageList) {
+              if (result instanceof chunkUE2G2LRP_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8455,11 +8470,12 @@ function cloneStep(step, opts) {
     execute: step.execute,
     retries: step.retries,
     scorers: step.scorers,
-    component: step.component
+    component: step.component,
+    metadata: step.metadata
   };
 }
 function isProcessor(obj) {
-  return obj !== null && typeof obj === "object" && "id" in obj && typeof obj.id === "string" && !(obj instanceof Agent) && !(obj instanceof chunkIIZF4W7B_cjs.Tool) && (typeof obj.processInput === "function" || typeof obj.processInputStep === "function" || typeof obj.processOutputStream === "function" || typeof obj.processOutputResult === "function" || typeof obj.processOutputStep === "function");
+  return obj !== null && typeof obj === "object" && "id" in obj && typeof obj.id === "string" && !(obj instanceof Agent) && !(obj instanceof chunk7UWHFWST_cjs.Tool) && (typeof obj.processInput === "function" || typeof obj.processInputStep === "function" || typeof obj.processOutputStream === "function" || typeof obj.processOutputResult === "function" || typeof obj.processOutputStep === "function");
 }
 function createWorkflow(params) {
   return new Workflow(params);
@@ -8477,7 +8493,7 @@ function cloneWorkflow(workflow, opts) {
   wf.commit();
   return wf;
 }
-var Workflow = class extends chunkC4WWWQHT_cjs.MastraBase {
+var Workflow = class extends chunkRO47SMI7_cjs.MastraBase {
   id;
   description;
   inputSchema;
@@ -8582,6 +8598,7 @@ var Workflow = class extends chunkC4WWWQHT_cjs.MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8751,6 +8768,7 @@ var Workflow = class extends chunkC4WWWQHT_cjs.MastraBase {
         step: {
           id: step.id,
           description: step.description,
+          metadata: step.metadata,
           component: step.component,
           serializedStepFlow: step.serializedStepFlow,
           canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8778,6 +8796,7 @@ var Workflow = class extends chunkC4WWWQHT_cjs.MastraBase {
         step: {
           id: step.id,
           description: step.description,
+          metadata: step.metadata,
           component: step.component,
           serializedStepFlow: step.serializedStepFlow,
           canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8803,6 +8822,7 @@ var Workflow = class extends chunkC4WWWQHT_cjs.MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8826,6 +8846,7 @@ var Workflow = class extends chunkC4WWWQHT_cjs.MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(step.suspendSchema || step.resumeSchema)
@@ -8844,6 +8865,7 @@ var Workflow = class extends chunkC4WWWQHT_cjs.MastraBase {
       step: {
         id: step.id,
         description: step.description,
+        metadata: step.metadata,
         component: step.component,
         serializedStepFlow: step.serializedStepFlow,
         canSuspend: Boolean(actualStep.suspendSchema || actualStep.resumeSchema)
@@ -9427,7 +9449,7 @@ var Run = class {
   }
   async _validateInput(inputData) {
     let inputDataToUse = inputData;
-    if (this.validateInputs && this.inputSchema && chunkI66TMZJ3_cjs.isZodType(this.inputSchema)) {
+    if (this.validateInputs && this.inputSchema && chunkOOCEAC6U_cjs.isZodType(this.inputSchema)) {
       const validatedInputData = await this.inputSchema.safeParseAsync(inputData);
       if (!validatedInputData.success) {
         const errors = getZodErrors(validatedInputData.error);
@@ -9441,7 +9463,7 @@ var Run = class {
     let initialStateToUse = initialState;
     if (this.validateInputs) {
       let stateSchema = this.stateSchema;
-      if (stateSchema && chunkI66TMZJ3_cjs.isZodType(stateSchema)) {
+      if (stateSchema && chunkOOCEAC6U_cjs.isZodType(stateSchema)) {
         const validatedInitialState = await stateSchema.safeParseAsync(initialState);
         if (!validatedInitialState.success) {
           const errors = getZodErrors(validatedInitialState.error);
@@ -9455,7 +9477,7 @@ var Run = class {
     return initialStateToUse;
   }
   async _validateRequestContext(requestContext) {
-    if (this.validateInputs && this.requestContextSchema && chunkI66TMZJ3_cjs.isZodType(this.requestContextSchema)) {
+    if (this.validateInputs && this.requestContextSchema && chunkOOCEAC6U_cjs.isZodType(this.requestContextSchema)) {
       const contextValues = requestContext?.all ?? {};
       const validatedRequestContext = await this.requestContextSchema.safeParseAsync(contextValues);
       if (!validatedRequestContext.success) {
@@ -9469,7 +9491,7 @@ var Run = class {
   }
   async _validateResumeData(resumeData, suspendedStep) {
     let resumeDataToUse = resumeData;
-    if (suspendedStep && suspendedStep.resumeSchema && this.validateInputs && chunkI66TMZJ3_cjs.isZodType(suspendedStep.resumeSchema)) {
+    if (suspendedStep && suspendedStep.resumeSchema && this.validateInputs && chunkOOCEAC6U_cjs.isZodType(suspendedStep.resumeSchema)) {
       const resumeSchema = suspendedStep.resumeSchema;
       const validatedResumeData = await resumeSchema.safeParseAsync(resumeData);
       if (!validatedResumeData.success) {
@@ -9482,7 +9504,7 @@ var Run = class {
   }
   async _validateTimetravelInputData(inputData, step) {
     let inputDataToUse = inputData;
-    if (step && step.inputSchema && this.validateInputs && chunkI66TMZJ3_cjs.isZodType(step.inputSchema)) {
+    if (step && step.inputSchema && this.validateInputs && chunkOOCEAC6U_cjs.isZodType(step.inputSchema)) {
       const inputSchema = step.inputSchema;
       const validatedInputData = await inputSchema.safeParseAsync(inputData);
       if (!validatedInputData.success) {
@@ -10433,7 +10455,7 @@ var PrepareStepProcessor = class {
 };
 
 // src/stream/base/input.ts
-var MastraModelInput = class extends chunkC4WWWQHT_cjs.MastraBase {
+var MastraModelInput = class extends chunkRO47SMI7_cjs.MastraBase {
   initialize({ runId, createStream, onResult }) {
     const self = this;
     const stream = new ReadableStream({
@@ -11121,6 +11143,7 @@ function createLLMExecutionStep({
   modelSpanTracker,
   autoResumeSuspendedTools,
   maxProcessorRetries,
+  workspace,
   outputWriter
 }) {
   const initialSystemMessages = messageList.getAllSystemMessages();
@@ -11134,7 +11157,7 @@ function createLLMExecutionStep({
       let warnings;
       let request;
       let rawResponse;
-      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(
+      const { outputStream, callBail, runState, stepTools, stepWorkspace } = await executeStreamWithFallbackModels(
         models,
         logger
       )(async (modelConfig, isLastModel) => {
@@ -11153,7 +11176,8 @@ function createLLMExecutionStep({
           activeTools,
           providerOptions,
           modelSettings,
-          structuredOutput
+          structuredOutput,
+          workspace
         };
         const inputStepProcessors = [
           ...inputProcessors || [],
@@ -11439,10 +11463,17 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
             throw error;
           }
         }
-        return { outputStream: outputStream2, callBail: false, runState: runState2, stepTools: currentStep.tools };
+        return {
+          outputStream: outputStream2,
+          callBail: false,
+          runState: runState2,
+          stepTools: currentStep.tools,
+          stepWorkspace: currentStep.workspace
+        };
       });
       if (_internal) {
         _internal.stepTools = stepTools;
+        _internal.stepWorkspace = stepWorkspace ?? _internal.stepWorkspace;
       }
       if (callBail) {
         const usage2 = outputStream._getImmediateUsage();
@@ -11594,6 +11625,9 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           tripwire: stepTripwireData
         })
       );
+      if (shouldRetry) {
+        messageList.removeByIds([messageId]);
+      }
       const retryFeedbackText = shouldRetry && processOutputStepTripwire ? `[Processor Feedback] Your previous response was not accepted: ${processOutputStepTripwire.message}. Please try again with the feedback in mind.` : void 0;
       const messages = {
         all: messageList.get.all.aiV5.model(),
@@ -11829,7 +11863,8 @@ function createToolCallStep({
         args,
         suspendPayload,
         resumeSchema,
-        type
+        type,
+        suspendedToolRunId
       }) => {
         const metadataKey = type === "suspension" ? "suspendedTools" : "pendingToolApprovals";
         const responseMessages = messageList.get.response.db();
@@ -11844,7 +11879,7 @@ function createToolCallStep({
             toolName,
             args,
             type,
-            runId,
+            runId: suspendedToolRunId ?? runId,
             // Store the runId so we can resume after page refresh
             ...type === "suspension" ? { suspendPayload } : {},
             resumeSchema
@@ -12064,42 +12099,122 @@ function createToolCallStep({
           outputWriter,
           // Pass current step span as parent for tool call spans
           tracingContext: modelSpanTracker?.getTracingContext(),
+          // Pass workspace from _internal (set by llmExecutionStep via prepareStep/processInputStep)
+          workspace: _internal?.stepWorkspace,
           suspend: async (suspendPayload, options2) => {
-            controller.enqueue({
-              type: "tool-call-suspended",
-              runId,
-              from: "AGENT" /* AGENT */,
-              payload: {
+            if (options2?.requireToolApproval) {
+              controller.enqueue({
+                type: "tool-call-approval",
+                runId,
+                from: "AGENT" /* AGENT */,
+                payload: {
+                  toolCallId: inputData.toolCallId,
+                  toolName: inputData.toolName,
+                  args: inputData.args,
+                  resumeSchema: JSON.stringify(
+                    zodToJson.zodToJsonSchema(
+                      z10__default.default.object({
+                        approved: z10__default.default.boolean().describe(
+                          "Controls if the tool call is approved or not, should be true when approved and false when declined"
+                        )
+                      })
+                    )
+                  )
+                }
+              });
+              addToolMetadata({
                 toolCallId: inputData.toolCallId,
                 toolName: inputData.toolName,
-                suspendPayload,
                 args: inputData.args,
-                resumeSchema: options2?.resumeSchema
-              }
-            });
-            addToolMetadata({
-              toolCallId: inputData.toolCallId,
-              toolName: inputData.toolName,
-              args,
-              suspendPayload,
-              type: "suspension",
-              resumeSchema: options2?.resumeSchema
-            });
-            await flushMessagesBeforeSuspension();
-            return await suspend(
-              {
-                toolCallSuspended: suspendPayload,
-                __streamState: streamState.serialize(),
+                type: "approval",
+                suspendedToolRunId: options2.runId,
+                resumeSchema: JSON.stringify(
+                  zodToJson.zodToJsonSchema(
+                    z10__default.default.object({
+                      approved: z10__default.default.boolean().describe(
+                        "Controls if the tool call is approved or not, should be true when approved and false when declined"
+                      )
+                    })
+                  )
+                )
+              });
+              await flushMessagesBeforeSuspension();
+              return suspend(
+                {
+                  requireToolApproval: {
+                    toolCallId: inputData.toolCallId,
+                    toolName: inputData.toolName,
+                    args: inputData.args
+                  },
+                  __streamState: streamState.serialize()
+                },
+                {
+                  resumeLabel: inputData.toolCallId
+                }
+              );
+            } else {
+              controller.enqueue({
+                type: "tool-call-suspended",
+                runId,
+                from: "AGENT" /* AGENT */,
+                payload: {
+                  toolCallId: inputData.toolCallId,
+                  toolName: inputData.toolName,
+                  suspendPayload,
+                  args: inputData.args,
+                  resumeSchema: options2?.resumeSchema
+                }
+              });
+              addToolMetadata({
+                toolCallId: inputData.toolCallId,
                 toolName: inputData.toolName,
-                resumeLabel: options2?.resumeLabel
-              },
-              {
-                resumeLabel: inputData.toolCallId
-              }
-            );
+                args,
+                suspendPayload,
+                suspendedToolRunId: options2?.isAgentSuspend ? options2.runId : void 0,
+                type: "suspension",
+                resumeSchema: options2?.resumeSchema
+              });
+              await flushMessagesBeforeSuspension();
+              return await suspend(
+                {
+                  toolCallSuspended: suspendPayload,
+                  __streamState: streamState.serialize(),
+                  toolName: inputData.toolName,
+                  resumeLabel: options2?.resumeLabel
+                },
+                {
+                  resumeLabel: inputData.toolCallId
+                }
+              );
+            }
           },
           resumeData: resumeDataToPassToToolOptions
         };
+        if (resumeDataToPassToToolOptions && inputData.toolName?.startsWith("agent-") && !isResumeToolCall) {
+          let suspendedToolRunId = "";
+          const messages = messageList.get.all.db();
+          const assistantMessages = [...messages].reverse().filter((message) => message.role === "assistant");
+          for (const message of assistantMessages) {
+            const pendingOrSuspendedTools = message.content.metadata?.suspendedTools || message.content.metadata?.pendingToolApprovals;
+            if (pendingOrSuspendedTools && pendingOrSuspendedTools[inputData.toolName]) {
+              suspendedToolRunId = pendingOrSuspendedTools[inputData.toolName].runId;
+              break;
+            }
+            const dataToolSuspendedParts = message.content.parts?.filter(
+              (part) => (part.type === "data-tool-call-suspended" || part.type === "data-tool-call-approval") && !part.data.resumed
+            );
+            if (dataToolSuspendedParts && dataToolSuspendedParts.length > 0) {
+              const foundTool = dataToolSuspendedParts.find((part) => part.data.toolName === inputData.toolName);
+              if (foundTool) {
+                suspendedToolRunId = foundTool.data.runId;
+                break;
+              }
+            }
+          }
+          if (suspendedToolRunId) {
+            args.suspendedToolRunId = suspendedToolRunId;
+          }
+        }
         const result = await tool2.execute(args, toolOptions);
         if (tool2 && "onOutput" in tool2 && typeof tool2.onOutput === "function") {
           try {
@@ -12602,6 +12717,12 @@ var MastraScorer = class _MastraScorer {
     }
   }
   #mastra;
+  #rawConfig;
+  /**
+   * Tracks whether this scorer was defined in code or loaded from storage.
+   * Set by `Mastra.addScorer()` when the `source` option is provided.
+   */
+  source;
   /**
    * Registers the Mastra instance with the scorer.
    * This enables access to custom gateways for model resolution.
@@ -12610,6 +12731,20 @@ var MastraScorer = class _MastraScorer {
   __registerMastra(mastra) {
     this.#mastra = mastra;
   }
+  /**
+   * Returns the raw storage configuration this scorer was created from,
+   * or undefined if it was created from code.
+   */
+  toRawConfig() {
+    return this.#rawConfig;
+  }
+  /**
+   * Sets the raw storage configuration for this scorer.
+   * @internal
+   */
+  __setRawConfig(rawConfig) {
+    this.#rawConfig = rawConfig;
+  }
   get type() {
     return this.config.type;
   }
@@ -12860,7 +12995,7 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const resolvedModel = await chunkXCPEEIHI_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const resolvedModel = await chunkGCTAD6B7_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
     const judge = new Agent({
       id: "judge",
       name: "judge",
@@ -13281,7 +13416,7 @@ async function generateStructuredFinalResult(agent, context, structuredOutputOpt
 }
 
 // src/llm/model/model.loop.ts
-var MastraLLMVNext = class extends chunkC4WWWQHT_cjs.MastraBase {
+var MastraLLMVNext = class extends chunkRO47SMI7_cjs.MastraBase {
   #models;
   #mastra;
   #options;
@@ -13403,7 +13538,8 @@ var MastraLLMVNext = class extends chunkC4WWWQHT_cjs.MastraBase {
     autoResumeSuspendedTools,
     maxProcessorRetries,
     processorStates,
-    activeTools
+    activeTools,
+    workspace
   }) {
     let stopWhenToUse;
     if (maxSteps && typeof maxSteps === "number") {
@@ -13470,6 +13606,7 @@ var MastraLLMVNext = class extends chunkC4WWWQHT_cjs.MastraBase {
         maxProcessorRetries,
         processorStates,
         activeTools,
+        workspace,
         options: {
           ...options,
           onStepFinish: async (props) => {
@@ -13510,7 +13647,7 @@ var MastraLLMVNext = class extends chunkC4WWWQHT_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 chunkI66TMZJ3_cjs.delay(10 * 1e3);
+              await chunkOOCEAC6U_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -13642,6 +13779,7 @@ async function getRoutingAgent({
   const toolsToUse = await agent.listTools({ requestContext });
   const model = await agent.getModel({ requestContext });
   const memoryToUse = await agent.getMemory({ requestContext });
+  const clientToolsToUse = (await agent.getDefaultOptions({ requestContext }))?.clientTools;
   const configuredInputProcessors = await agent.listConfiguredInputProcessors(requestContext);
   const configuredOutputProcessors = await agent.listConfiguredOutputProcessors(requestContext);
   const agentList = Object.entries(agentsToUse).map(([name, agent2]) => {
@@ -13653,7 +13791,7 @@ async function getRoutingAgent({
     )}`;
   }).join("\n");
   const memoryTools = await memoryToUse?.listTools?.();
-  const toolList = Object.entries({ ...toolsToUse, ...memoryTools }).map(([name, tool2]) => {
+  const toolList = Object.entries({ ...toolsToUse, ...memoryTools, ...clientToolsToUse || {} }).map(([name, tool2]) => {
     const inputSchema = "inputSchema" in tool2 ? tool2.inputSchema ?? z10__default.default.object({}) : z10__default.default.object({});
     return ` - **${name}**: ${tool2.description}, input schema: ${JSON.stringify(chunk4WQYXT2I_cjs.zodToJsonSchema(inputSchema))}`;
   }).join("\n");
@@ -13772,7 +13910,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunk7MDVYPWX_cjs.MessageList({
+    const messageList = new chunkUE2G2LRP_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -13835,7 +13973,7 @@ async function saveMessagesWithProcessors(memory, messages, processorRunner, con
     await memory.saveMessages({ messages });
     return;
   }
-  const messageList = new chunk7MDVYPWX_cjs.MessageList();
+  const messageList = new chunkUE2G2LRP_cjs.MessageList();
   for (const msg of messages) {
     messageList.add(msg, "response");
   }
@@ -14040,20 +14178,6 @@ async function createNetworkLoop({
         });
       }
       const isComplete = object.primitiveId === "none" && object.primitiveType === "none";
-      if (isComplete && object.selectionReason) {
-        await writer.write({
-          type: "routing-agent-text-start",
-          payload: { runId: stepId },
-          from: "NETWORK" /* NETWORK */,
-          runId
-        });
-        await writer.write({
-          type: "routing-agent-text-delta",
-          payload: { runId: stepId, text: object.selectionReason },
-          from: "NETWORK" /* NETWORK */,
-          runId
-        });
-      }
       const conversationContext = filterMessagesForSubAgent(result.rememberedMessages ?? []);
       const endPayload = {
         task: inputData.task,
@@ -14706,7 +14830,8 @@ async function createNetworkLoop({
       const agentTools = await agent.listTools({ requestContext });
       const memory = await agent.getMemory({ requestContext });
       const memoryTools = await memory?.listTools?.();
-      const toolsMap = { ...agentTools, ...memoryTools };
+      const clientTools = (await agent.getDefaultOptions({ requestContext }))?.clientTools;
+      const toolsMap = { ...agentTools, ...memoryTools, ...clientTools || {} };
       let tool2 = toolsMap[inputData.primitiveId];
       if (!tool2) {
         const mastraError = new chunk4U7ZLI36_cjs.MastraError({
@@ -15306,7 +15431,7 @@ async function networkLoop({
               "resumeData": "string"
             }
           `;
-              const messageList = new chunk7MDVYPWX_cjs.MessageList();
+              const messageList = new chunkUE2G2LRP_cjs.MessageList();
               messageList.addSystem(systemInstructions);
               messageList.add(task, "user");
               const result = llm.stream({
@@ -15871,7 +15996,7 @@ ${skillInstructions}`;
   createSkillActivateTool() {
     const skills = this.skills;
     const activatedSkills = this._activatedSkills;
-    return chunkIIZF4W7B_cjs.createTool({
+    return chunk7UWHFWST_cjs.createTool({
       id: "skill-activate",
       description: "Activate a skill to load its full instructions. You should activate skills proactively when they are relevant to the user's request without asking for permission first.",
       inputSchema: z10__default.default.object({
@@ -15912,7 +16037,7 @@ ${skillInstructions}`;
   createSkillReadReferenceTool() {
     const skills = this.skills;
     const activatedSkills = this._activatedSkills;
-    return chunkIIZF4W7B_cjs.createTool({
+    return chunk7UWHFWST_cjs.createTool({
       id: "skill-read-reference",
       description: "Read a reference file from an activated skill. Optionally specify line range to read a portion of the file.",
       inputSchema: z10__default.default.object({
@@ -15942,7 +16067,7 @@ ${skillInstructions}`;
             message: `Reference file "${referencePath}" not found in skill "${skillName}". Available references: ${availableRefs.join(", ") || "none"}`
           };
         }
-        const result = chunkHMCXNOF6_cjs.extractLines(fullContent, startLine, endLine);
+        const result = chunkCGPH7CMG_cjs.extractLines(fullContent, startLine, endLine);
         return {
           success: true,
           content: result.content,
@@ -15958,7 +16083,7 @@ ${skillInstructions}`;
   createSkillReadScriptTool() {
     const skills = this.skills;
     const activatedSkills = this._activatedSkills;
-    return chunkIIZF4W7B_cjs.createTool({
+    return chunk7UWHFWST_cjs.createTool({
       id: "skill-read-script",
       description: "Read a script file from an activated skill. Scripts contain executable code. Optionally specify line range.",
       inputSchema: z10__default.default.object({
@@ -15988,7 +16113,7 @@ ${skillInstructions}`;
             message: `Script file "${scriptPath}" not found in skill "${skillName}". Available scripts: ${availableScripts.join(", ") || "none"}`
           };
         }
-        const result = chunkHMCXNOF6_cjs.extractLines(fullContent, startLine, endLine);
+        const result = chunkCGPH7CMG_cjs.extractLines(fullContent, startLine, endLine);
         return {
           success: true,
           content: result.content,
@@ -16004,7 +16129,7 @@ ${skillInstructions}`;
   createSkillReadAssetTool() {
     const skills = this.skills;
     const activatedSkills = this._activatedSkills;
-    return chunkIIZF4W7B_cjs.createTool({
+    return chunk7UWHFWST_cjs.createTool({
       id: "skill-read-asset",
       description: "Read an asset file from an activated skill. Assets include templates, data files, and other static resources. Binary files are returned as base64.",
       inputSchema: z10__default.default.object({
@@ -16056,7 +16181,7 @@ ${skillInstructions}`;
    */
   createSkillSearchTool() {
     const skills = this.skills;
-    return chunkIIZF4W7B_cjs.createTool({
+    return chunk7UWHFWST_cjs.createTool({
       id: "skill-search",
       description: "Search across skill content to find relevant information. Useful when you need to find specific details within skills.",
       inputSchema: z10__default.default.object({
@@ -16233,7 +16358,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunk7MDVYPWX_cjs.MessageList({
+        let messageList = new chunkUE2G2LRP_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -16302,7 +16427,7 @@ var AgentLegacyHandler = class {
             title: thread.title,
             memoryConfig,
             resourceId,
-            saveThread: false
+            saveThread: true
           });
         }
         requestContext.set("MastraMemory", {
@@ -16364,7 +16489,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunk7MDVYPWX_cjs.MessageList({
+        const messageListResponses = new chunkUE2G2LRP_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -16413,9 +16538,7 @@ var AgentLegacyHandler = class {
               model: titleModel,
               instructions: titleInstructions
             } = this.capabilities.resolveTitleGenerationConfig(config?.generateTitle);
-            const rememberedUserMessages = messageList.get.remembered.db().filter((m) => m.role === "user");
-            const isFirstUserMessage = rememberedUserMessages.length === 0;
-            if (shouldGenerate && isFirstUserMessage && userMessage) {
+            if (shouldGenerate && !threadExists && userMessage) {
               promises.push(
                 this.capabilities.genTitle(userMessage, requestContext, { currentSpan: agentSpan }, titleModel, titleInstructions).then((title) => {
                   if (title) {
@@ -16571,12 +16694,14 @@ var AgentLegacyHandler = class {
     let messageList;
     let thread;
     let threadExists;
+    let threadCreatedByStep = false;
     return {
       llm,
       before: async () => {
         const beforeResult = await before();
         const { messageObjects, convertedTools, agentSpan } = beforeResult;
         threadExists = beforeResult.threadExists || false;
+        threadCreatedByStep = false;
         messageList = beforeResult.messageList;
         thread = beforeResult.thread;
         const threadId = thread?.id;
@@ -16592,7 +16717,7 @@ var AgentLegacyHandler = class {
           requestContext,
           onStepFinish: async (props) => {
             if (savePerStep) {
-              if (!threadExists && memory && thread) {
+              if (!threadExists && !threadCreatedByStep && memory && thread) {
                 await memory.createThread({
                   threadId,
                   title: thread.title,
@@ -16600,7 +16725,7 @@ var AgentLegacyHandler = class {
                   resourceId: thread.resourceId,
                   memoryConfig
                 });
-                threadExists = true;
+                threadCreatedByStep = true;
               }
               await this.capabilities.saveStepMessages({
                 result: props,
@@ -16665,17 +16790,23 @@ var AgentLegacyHandler = class {
     };
     const { llm, before, after } = await this.prepareLLMOptions(messages, mergedGenerateOptions, "generate");
     if (llm.getModel().specificationVersion !== "v1") {
-      this.capabilities.logger.error("V2 models are not supported for generateLegacy. Please use generate instead.", {
-        modelId: llm.getModel().modelId
-      });
+      const specVersion = llm.getModel().specificationVersion;
+      this.capabilities.logger.error(
+        `Models with specificationVersion "${specVersion}" are not supported for generateLegacy. Please use generate() instead.`,
+        {
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
+        }
+      );
       throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENERATE_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
         details: {
-          modelId: llm.getModel().modelId
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
         },
-        text: "V2 models are not supported for generateLegacy. Please use generate instead."
+        text: `Models with specificationVersion "${specVersion}" are not supported for generateLegacy(). Please use generate() instead.`
       });
     }
     const llmToUse = llm;
@@ -16885,17 +17016,23 @@ var AgentLegacyHandler = class {
     };
     const { llm, before, after } = await this.prepareLLMOptions(messages, mergedStreamOptions, "stream");
     if (llm.getModel().specificationVersion !== "v1") {
-      this.capabilities.logger.error("V2 models are not supported for streamLegacy. Please use stream instead.", {
-        modelId: llm.getModel().modelId
-      });
+      const specVersion = llm.getModel().specificationVersion;
+      this.capabilities.logger.error(
+        `Models with specificationVersion "${specVersion}" are not supported for streamLegacy. Please use stream() instead.`,
+        {
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
+        }
+      );
       throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_V2_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
         details: {
-          modelId: llm.getModel().modelId
+          modelId: llm.getModel().modelId,
+          specificationVersion: specVersion
         },
-        text: "V2 models are not supported for streamLegacy. Please use stream instead."
+        text: `Models with specificationVersion "${specVersion}" are not supported for streamLegacy(). Please use stream() instead.`
       });
     }
     const beforeResult = await before();
@@ -17196,6 +17333,7 @@ function createMapResultsStep({
   return async ({ inputData, bail, tracingContext }) => {
     const toolsData = inputData["prepare-tools-step"];
     const memoryData = inputData["prepare-memory-step"];
+    let threadCreatedByStep = false;
     const result = {
       ...options,
       tools: toolsData.convertedTools,
@@ -17206,7 +17344,7 @@ function createMapResultsStep({
       requestContext,
       onStepFinish: async (props) => {
         if (options.savePerStep && !memoryConfig?.readOnly) {
-          if (!memoryData.threadExists && memory && memoryData.thread) {
+          if (!memoryData.threadExists && !threadCreatedByStep && memory && memoryData.thread) {
             await memory.createThread({
               threadId: memoryData.thread?.id,
               title: memoryData.thread?.title,
@@ -17214,7 +17352,7 @@ function createMapResultsStep({
               resourceId: memoryData.thread?.resourceId,
               memoryConfig
             });
-            memoryData.threadExists = true;
+            threadCreatedByStep = true;
           }
           await capabilities.saveStepMessages({
             result: props,
@@ -17389,7 +17527,7 @@ var prepareToolsStepOutputSchema = z10.z.object({
 var prepareMemoryStepOutputSchema = z10.z.object({
   threadExists: z10.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z10.z.instanceof(chunk7MDVYPWX_cjs.MessageList),
+  messageList: z10.z.instanceof(chunkUE2G2LRP_cjs.MessageList),
   /** Shared processor states map that persists across loop iterations for both input and output processors */
   processorStates: z10.z.instanceof(Map),
   /** Tripwire data when input processor triggered abort */
@@ -17429,7 +17567,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunk7MDVYPWX_cjs.MessageList({
+      const messageList = new chunkUE2G2LRP_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -17589,7 +17727,8 @@ function createStreamStep({
   memoryConfig,
   memory,
   resourceId,
-  autoResumeSuspendedTools
+  autoResumeSuspendedTools,
+  workspace
 }) {
   return createStep({
     id: "stream-text-step",
@@ -17625,7 +17764,8 @@ function createStreamStep({
         agentName,
         toolCallId,
         methodType: modelMethodType,
-        autoResumeSuspendedTools
+        autoResumeSuspendedTools,
+        workspace
       });
       return streamResult;
     }
@@ -17652,7 +17792,8 @@ function createPrepareStreamWorkflow({
   resumeContext,
   agentId,
   agentName,
-  toolCallId
+  toolCallId,
+  workspace
 }) {
   const prepareToolsStep = createPrepareToolsStep({
     capabilities,
@@ -17691,7 +17832,8 @@ function createPrepareStreamWorkflow({
     memoryConfig,
     memory,
     resourceId,
-    autoResumeSuspendedTools: options.autoResumeSuspendedTools
+    autoResumeSuspendedTools: options.autoResumeSuspendedTools,
+    workspace
   });
   const mapResultsStep = createMapResultsStep({
     capabilities,
@@ -17726,7 +17868,7 @@ function resolveMaybePromise(value, cb) {
   }
   return cb(value);
 }
-var Agent = class extends chunkC4WWWQHT_cjs.MastraBase {
+var Agent = class extends chunkRO47SMI7_cjs.MastraBase {
   id;
   name;
   source;
@@ -17776,7 +17918,7 @@ var Agent = class extends chunkC4WWWQHT_cjs.MastraBase {
    * ```
    */
   constructor(config) {
-    super({ component: chunk7XAECHYL_cjs.RegisteredLogger.AGENT });
+    super({ component: chunk7XAECHYL_cjs.RegisteredLogger.AGENT, rawConfig: config.rawConfig });
     this.name = config.name;
     this.id = config.id ?? config.name;
     this.source = "code";
@@ -17855,7 +17997,7 @@ var Agent = class extends chunkC4WWWQHT_cjs.MastraBase {
         this.#voice?.addInstructions(config.instructions);
       }
     } else {
-      this.#voice = new chunk6FG6FU5Y_cjs.DefaultVoice();
+      this.#voice = new chunkRQ56ZSIR_cjs.DefaultVoice();
     }
     if (config.workspace) {
       this.#workspace = config.workspace;
@@ -17899,7 +18041,7 @@ var Agent = class extends chunkC4WWWQHT_cjs.MastraBase {
    * Throws an error if validation fails.
    */
   async #validateRequestContext(requestContext) {
-    if (this.#requestContextSchema && chunkI66TMZJ3_cjs.isZodType(this.#requestContextSchema)) {
+    if (this.#requestContextSchema && chunkOOCEAC6U_cjs.isZodType(this.#requestContextSchema)) {
       const contextValues = requestContext?.all ?? {};
       const validatedRequestContext = await this.#requestContextSchema.safeParseAsync(contextValues);
       if (!validatedRequestContext.success) {
@@ -18121,6 +18263,25 @@ ${errorMessages}`,
     const configuredProcessors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() }) : this.#outputProcessors;
     return this.combineProcessorsIntoWorkflow(configuredProcessors, `${this.id}-configured-output-processor`);
   }
+  /**
+   * Returns the IDs of the raw configured input and output processors,
+   * without combining them into workflows. Used by the editor to clone
+   * agent processor configuration to storage.
+   */
+  async getConfiguredProcessorIds(requestContext) {
+    const ctx = requestContext || new chunkVDKWYUGC_cjs.RequestContext();
+    let inputProcessorIds = [];
+    if (this.#inputProcessors) {
+      const processors = typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: ctx }) : this.#inputProcessors;
+      inputProcessorIds = processors.map((p) => p.id).filter(Boolean);
+    }
+    let outputProcessorIds = [];
+    if (this.#outputProcessors) {
+      const processors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: ctx }) : this.#outputProcessors;
+      outputProcessorIds = processors.map((p) => p.id).filter(Boolean);
+    }
+    return { inputProcessorIds, outputProcessorIds };
+  }
   /**
    * Returns configured processor workflows for registration with Mastra.
    * This excludes memory-derived processors to avoid triggering memory factory functions.
@@ -18239,26 +18400,17 @@ ${errorMessages}`,
     requestContext = new chunkVDKWYUGC_cjs.RequestContext()
   } = {}) {
     if (this.#workspace) {
-      let resolvedWorkspace;
       if (typeof this.#workspace !== "function") {
-        resolvedWorkspace = this.#workspace;
-      } else {
-        const result = this.#workspace({ requestContext, mastra: this.#mastra });
-        resolvedWorkspace = await Promise.resolve(result);
-        if (!resolvedWorkspace) {
-          const mastraError = new chunk4U7ZLI36_cjs.MastraError({
-            id: "AGENT_GET_WORKSPACE_FUNCTION_EMPTY_RETURN",
-            domain: "AGENT" /* AGENT */,
-            category: "USER" /* USER */,
-            details: {
-              agentName: this.name
-            },
-            text: `[Agent:${this.name}] - Function-based workspace returned empty value`
-          });
-          this.logger.trackException(mastraError);
-          this.logger.error(mastraError.toString());
-          throw mastraError;
-        }
+        return this.#workspace;
+      }
+      const result = this.#workspace({ requestContext, mastra: this.#mastra });
+      const resolvedWorkspace = await Promise.resolve(result);
+      if (!resolvedWorkspace) {
+        return void 0;
+      }
+      resolvedWorkspace.__setLogger(this.logger);
+      if (this.#mastra) {
+        this.#mastra.addWorkspace(resolvedWorkspace);
       }
       return resolvedWorkspace;
     }
@@ -18357,7 +18509,7 @@ ${errorMessages}`,
       voice?.addInstructions(this.#convertInstructionsToString(instructions));
       return voice;
     } else {
-      return new chunk6FG6FU5Y_cjs.DefaultVoice();
+      return new chunkRQ56ZSIR_cjs.DefaultVoice();
     }
   }
   /**
@@ -18615,7 +18767,7 @@ ${errorMessages}`,
    */
   listTools({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkI66TMZJ3_cjs.ensureToolProperties(this.#tools);
+      return chunkOOCEAC6U_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       requestContext,
@@ -18636,7 +18788,7 @@ ${errorMessages}`,
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkI66TMZJ3_cjs.ensureToolProperties(tools);
+      return chunkOOCEAC6U_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -18668,7 +18820,7 @@ ${errorMessages}`,
           });
         });
       } else {
-        llm = new chunkHU2ONA2W_cjs.MastraLLMV1({
+        llm = new chunkON2KVIUJ_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -18693,7 +18845,7 @@ ${errorMessages}`,
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkXCPEEIHI_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkGCTAD6B7_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -18845,6 +18997,9 @@ ${errorMessages}`,
    */
   __registerMastra(mastra) {
     this.#mastra = mastra;
+    if (this.#workspace && typeof this.#workspace !== "function") {
+      this.#workspace.__setLogger(this.logger);
+    }
     if (this.#tools && typeof this.#tools === "object") {
       Object.entries(this.#tools).forEach(([key, tool2]) => {
         try {
@@ -18901,7 +19056,7 @@ ${errorMessages}`,
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunk7MDVYPWX_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkUE2G2LRP_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -18924,7 +19079,7 @@ ${errorMessages}`,
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (isSupportedLanguageModel(llm.getModel())) {
-      const messageList = new chunk7MDVYPWX_cjs.MessageList().add(
+      const messageList = new chunkUE2G2LRP_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -18977,7 +19132,7 @@ ${errorMessages}`,
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunk7MDVYPWX_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkUE2G2LRP_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -19017,6 +19172,10 @@ ${errorMessages}`,
       return convertedMemoryTools;
     }
     const memory = await this.getMemory({ requestContext });
+    if (!threadId && !resourceId) {
+      this.logger.debug(`[Agent:${this.name}] - Skipping memory tools (no thread or resource context)`, { runId });
+      return convertedMemoryTools;
+    }
     const memoryTools = memory?.listTools?.(memoryConfig);
     if (memoryTools) {
       this.logger.debug(
@@ -19042,7 +19201,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkI66TMZJ3_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -19070,7 +19229,7 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = chunkHMCXNOF6_cjs.createWorkspaceTools(workspace);
+    const workspaceTools = chunkCGPH7CMG_cjs.createWorkspaceTools(workspace);
     if (Object.keys(workspaceTools).length > 0) {
       this.logger.debug(`[Agent:${this.name}] - Adding workspace tools: ${Object.keys(workspaceTools).join(", ")}`, {
         runId
@@ -19091,7 +19250,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkI66TMZJ3_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedWorkspaceTools[toolName] = convertedToCoreTool;
       }
     }
@@ -19248,7 +19407,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        return [k, chunkI66TMZJ3_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
+        return [k, chunkOOCEAC6U_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -19298,7 +19457,7 @@ ${errorMessages}`,
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkI66TMZJ3_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
+          const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -19343,7 +19502,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunkI66TMZJ3_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkOOCEAC6U_cjs.makeCoreTool(rest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -19382,7 +19541,7 @@ ${errorMessages}`,
           subAgentResourceId: z10.z.string().describe("The resource ID of the agent").optional()
         });
         const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
-        const toolObj = chunkIIZF4W7B_cjs.createTool({
+        const toolObj = chunk7UWHFWST_cjs.createTool({
           id: `agent-${agentName}`,
           description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
@@ -19412,11 +19571,20 @@ ${errorMessages}`,
                 source: "agent",
                 entityId: agentName
               }) || `${slugify.default(this.id)}-${agentName}`;
+              const suspendedToolRunId = inputData.suspendedToolRunId;
+              const { resumeData, suspend } = context?.agent ?? {};
               if ((methodType === "generate" || methodType === "generateLegacy") && supportedLanguageModelSpecifications.includes(modelVersion)) {
                 if (!agent.hasOwnMemory() && this.#memory) {
                   agent.__setMemory(this.#memory);
                 }
-                const generateResult = await agent.generate(inputData.prompt, {
+                const generateResult = resumeData ? await agent.resumeGenerate(resumeData, {
+                  runId: suspendedToolRunId,
+                  requestContext,
+                  tracingContext: context?.tracingContext,
+                  ...inputData.instructions && { instructions: inputData.instructions },
+                  ...inputData.maxSteps && { maxSteps: inputData.maxSteps },
+                  ...resourceId && threadId ? { memory: { resource: subAgentResourceId, thread: subAgentThreadId } } : {}
+                }) : await agent.generate(inputData.prompt, {
                   requestContext,
                   tracingContext: context?.tracingContext,
                   ...inputData.instructions && { instructions: inputData.instructions },
@@ -19428,6 +19596,13 @@ ${errorMessages}`,
                     }
                   } : {}
                 });
+                if (generateResult.finishReason === "suspended") {
+                  return suspend?.(generateResult.suspendPayload, {
+                    resumeSchema: generateResult.resumeSchema,
+                    runId: generateResult.runId,
+                    isAgentSuspend: true
+                  });
+                }
                 result = { text: generateResult.text, subAgentThreadId, subAgentResourceId };
               } else if (methodType === "generate" && modelVersion === "v1") {
                 const generateResult = await agent.generateLegacy(inputData.prompt, {
@@ -19439,7 +19614,19 @@ ${errorMessages}`,
                 if (!agent.hasOwnMemory() && this.#memory) {
                   agent.__setMemory(this.#memory);
                 }
-                const streamResult = await agent.stream(inputData.prompt, {
+                const streamResult = resumeData ? await agent.resumeStream(resumeData, {
+                  runId: suspendedToolRunId,
+                  requestContext,
+                  tracingContext: context?.tracingContext,
+                  ...inputData.instructions && { instructions: inputData.instructions },
+                  ...inputData.maxSteps && { maxSteps: inputData.maxSteps },
+                  ...resourceId && threadId ? {
+                    memory: {
+                      resource: subAgentResourceId,
+                      thread: subAgentThreadId
+                    }
+                  } : {}
+                }) : await agent.stream(inputData.prompt, {
                   requestContext,
                   tracingContext: context?.tracingContext,
                   ...inputData.instructions && { instructions: inputData.instructions },
@@ -19456,8 +19643,34 @@ ${errorMessages}`,
                   if (context?.writer) {
                     if (chunk.type.startsWith("data-")) {
                       await context.writer.custom(chunk);
+                      if (chunk.type === "data-tool-call-approval") {
+                        return suspend?.(
+                          {},
+                          { requireToolApproval: true, runId: streamResult.runId, isAgentSuspend: true }
+                        );
+                      }
+                      if (chunk.type === "data-tool-call-suspended") {
+                        return suspend?.(chunk.data.suspendPayload, {
+                          resumeSchema: chunk.data.resumeSchema,
+                          runId: streamResult.runId,
+                          isAgentSuspend: true
+                        });
+                      }
                     } else {
                       await context.writer.write(chunk);
+                      if (chunk.type === "tool-call-approval") {
+                        return suspend?.(
+                          {},
+                          { requireToolApproval: true, runId: streamResult.runId, isAgentSuspend: true }
+                        );
+                      }
+                      if (chunk.type === "tool-call-suspended") {
+                        return suspend?.(chunk.payload.suspendPayload, {
+                          resumeSchema: chunk.payload.resumeSchema,
+                          runId: streamResult.runId,
+                          isAgentSuspend: true
+                        });
+                      }
                     }
                   }
                   if (chunk.type === "text-delta") {
@@ -19523,7 +19736,7 @@ ${errorMessages}`,
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkI66TMZJ3_cjs.makeCoreTool(
+        convertedAgentTools[`agent-${agentName}`] = chunkOOCEAC6U_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -19552,10 +19765,10 @@ ${errorMessages}`,
       for (const [workflowName, workflow] of Object.entries(workflows)) {
         const extendedInputSchema = z10.z.object({
           // @ts-expect-error - zod types mismatch between v3 and v4
-          inputData: workflow.inputSchema,
+          inputData: workflow.inputSchema ?? z10.z.object({}).passthrough(),
           ...workflow.stateSchema ? { initialState: workflow.stateSchema } : {}
         });
-        const toolObj = chunkIIZF4W7B_cjs.createTool({
+        const toolObj = chunk7UWHFWST_cjs.createTool({
           id: `workflow-${workflowName}`,
           description: workflow.description || `Workflow: ${workflowName}`,
           inputSchema: extendedInputSchema,
@@ -19708,7 +19921,7 @@ ${errorMessages}`,
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkI66TMZJ3_cjs.makeCoreTool(
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkOOCEAC6U_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -19738,7 +19951,7 @@ ${errorMessages}`,
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkI66TMZJ3_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkOOCEAC6U_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -19988,7 +20201,7 @@ ${errorMessages}`,
         throw mastraError;
       }
       let headers;
-      if (resolvedModel instanceof chunkXCPEEIHI_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunkGCTAD6B7_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -20034,7 +20247,7 @@ ${errorMessages}`,
           throw mastraError;
         }
         let headers;
-        if (model2 instanceof chunkXCPEEIHI_cjs.ModelRouterLanguageModel) {
+        if (model2 instanceof chunkGCTAD6B7_cjs.ModelRouterLanguageModel) {
           headers = model2.config?.headers;
         }
         return {
@@ -20092,7 +20305,7 @@ ${errorMessages}`,
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunkI66TMZJ3_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunkOOCEAC6U_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -20138,6 +20351,7 @@ ${errorMessages}`,
       mastra: this.#mastra
     });
     const memory = await this.getMemory({ requestContext });
+    const workspace = await this.getWorkspace({ requestContext });
     const saveQueueManager = new SaveQueueManager({
       logger: this.logger,
       memory
@@ -20186,7 +20400,8 @@ ${errorMessages}`,
       resumeContext,
       agentId: this.id,
       agentName: this.name,
-      toolCallId: options.toolCallId
+      toolCallId: options.toolCallId,
+      workspace
     });
     const run = await executionWorkflow.createRun();
     const result = await run.start({ tracingContext: { currentSpan: agentSpan } });
@@ -20276,9 +20491,7 @@ ${errorMessages}`,
           model: titleModel,
           instructions: titleInstructions
         } = this.resolveTitleGenerationConfig(config.generateTitle);
-        const rememberedUserMessages = messageList.get.remembered.db().filter((m) => m.role === "user");
-        const isFirstUserMessage = rememberedUserMessages.length === 0;
-        if (shouldGenerate && isFirstUserMessage) {
+        if (shouldGenerate && !threadExists) {
           const userMessage = this.getMostRecentUserMessage(messageList.get.all.ui());
           if (userMessage) {
             const title = await this.genTitle(
@@ -20499,7 +20712,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkI66TMZJ3_cjs.deepMerge(
+    const mergedOptions = chunkOOCEAC6U_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -20510,16 +20723,17 @@ ${errorMessages}`,
     if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
+      const specVersion = modelInfo.specificationVersion;
       throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENERATE_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: specVersion === "v1" ? `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.` : `Agent "${this.name}" has a model (${provider}:${modelId}) with unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
         details: {
           agentName: this.name,
           modelId,
           provider,
-          specificationVersion: modelInfo.specificationVersion
+          specificationVersion: specVersion
         }
       });
     }
@@ -20562,7 +20776,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    const mergedOptions = chunkI66TMZJ3_cjs.deepMerge(
+    const mergedOptions = chunkOOCEAC6U_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -20573,16 +20787,17 @@ ${errorMessages}`,
     if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
+      const specVersion = modelInfo.specificationVersion;
       throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5+ models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: specVersion === "v1" ? `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5+ models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.` : `Agent "${this.name}" has a model (${provider}:${modelId}) with unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
         details: {
           agentName: this.name,
           modelId,
           provider,
-          specificationVersion: modelInfo.specificationVersion
+          specificationVersion: specVersion
         }
       });
     }
@@ -20619,7 +20834,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    let mergedStreamOptions = chunkI66TMZJ3_cjs.deepMerge(
+    let mergedStreamOptions = chunkOOCEAC6U_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -20627,11 +20842,18 @@ ${errorMessages}`,
       requestContext: mergedStreamOptions.requestContext
     });
     if (!isSupportedLanguageModel(llm.getModel())) {
+      const modelInfo = llm.getModel();
+      const specVersion = modelInfo.specificationVersion;
       throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: "V1 models are not supported for stream. Please use streamLegacy instead."
+        text: specVersion === "v1" ? "V1 models are not supported for resumeStream. Please use streamLegacy instead." : `Model has unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
+        details: {
+          modelId: modelInfo.modelId,
+          provider: modelInfo.provider,
+          specificationVersion: specVersion
+        }
       });
     }
     const workflowsStore = await this.#mastra?.getStorage()?.getStore("workflows");
@@ -20686,7 +20908,7 @@ ${errorMessages}`,
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkI66TMZJ3_cjs.deepMerge(
+    const mergedOptions = chunkOOCEAC6U_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -20697,16 +20919,17 @@ ${errorMessages}`,
     if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
+      const specVersion = modelInfo.specificationVersion;
       throw new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GENERATE_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: specVersion === "v1" ? `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.` : `Agent "${this.name}" has a model (${provider}:${modelId}) with unrecognized specificationVersion "${specVersion}". Supported versions: v1 (legacy), v2 (AI SDK v5), v3 (AI SDK v6). Please ensure your AI SDK provider is compatible with this version of Mastra.`,
         details: {
           agentName: this.name,
           modelId,
           provider,
-          specificationVersion: modelInfo.specificationVersion
+          specificationVersion: specVersion
         }
       });
     }
@@ -22890,7 +23113,7 @@ var ToolSearchProcessor = class {
       minScore: options.search?.minScore ?? 0
     };
     this.ttl = options.ttl ?? 36e5;
-    this.bm25Index = new chunkHMCXNOF6_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
+    this.bm25Index = new chunkCGPH7CMG_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
     this.indexTools();
     if (this.ttl > 0) {
       this.scheduleCleanup();
@@ -23055,7 +23278,7 @@ var ToolSearchProcessor = class {
     messageList.addSystem(
       "To discover available tools, call search_tools with a keyword query. To add a tool to the conversation, call load_tool with the tool name. Tools must be loaded before they can be used."
     );
-    const searchTool = chunkIIZF4W7B_cjs.createTool({
+    const searchTool = chunk7UWHFWST_cjs.createTool({
       id: "search_tools",
       description: "Search for available tools by keyword. Use this when you need a capability you don't currently have. Returns a list of matching tools with their names and descriptions. After finding a useful tool, use load_tool to make it available.",
       inputSchema: z10.z.object({
@@ -23085,7 +23308,7 @@ var ToolSearchProcessor = class {
         };
       }
     });
-    const loadTool = chunkIIZF4W7B_cjs.createTool({
+    const loadTool = chunk7UWHFWST_cjs.createTool({
       id: "load_tool",
       description: "Load a specific tool into your context. Call this after finding a tool with search_tools. Once loaded, the tool will be available for use. Args: toolName - The exact name of the tool to load (from search results).",
       inputSchema: z10.z.object({
@@ -23637,7 +23860,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunk7MDVYPWX_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkUE2G2LRP_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -23975,7 +24198,7 @@ function augmentWithInit(storage) {
 }
 
 // src/memory/memory.ts
-var MemoryProcessor = class extends chunkC4WWWQHT_cjs.MastraBase {
+var MemoryProcessor = class extends chunkRO47SMI7_cjs.MastraBase {
   /**
    * Process a list of messages and return a filtered or transformed list.
    * @param messages The messages to process
@@ -24005,7 +24228,7 @@ var memoryDefaultOptions = {
 `
   }
 };
-var MastraMemory = class extends chunkC4WWWQHT_cjs.MastraBase {
+var MastraMemory = class extends chunkRO47SMI7_cjs.MastraBase {
   /**
    * Unique identifier for the memory instance.
    * If not provided, defaults to a static name 'default-memory'.
@@ -24071,7 +24294,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkXCPEEIHI_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkGCTAD6B7_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -24110,7 +24333,7 @@ https://mastra.ai/en/docs/memory/overview`
   }
   setEmbedder(embedder, embedderOptions) {
     if (typeof embedder === "string") {
-      this.embedder = new chunkXCPEEIHI_cjs.ModelRouterEmbeddingModel(embedder);
+      this.embedder = new chunkGCTAD6B7_cjs.ModelRouterEmbeddingModel(embedder);
     } else {
       this.embedder = embedder;
     }
@@ -24177,7 +24400,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkI66TMZJ3_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkOOCEAC6U_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -24471,7 +24694,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkQOFI2WBM_cjs.InMemoryStore(),
+      storage: storage || new chunkJU6K7UDX_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -24549,7 +24772,7 @@ var MockMemory = class extends MastraMemory {
       return {};
     }
     return {
-      updateWorkingMemory: chunkIIZF4W7B_cjs.createTool({
+      updateWorkingMemory: chunk7UWHFWST_cjs.createTool({
         id: "update-working-memory",
         description: `Update the working memory with new information. Any data not included will be overwritten.`,
         inputSchema: z10__default.default.object({ memory: z10__default.default.string() }),
@@ -24557,21 +24780,30 @@ var MockMemory = class extends MastraMemory {
           const threadId = context?.agent?.threadId;
           const resourceId = context?.agent?.resourceId;
           const memory = context?.memory;
-          if (!threadId || !memory || !resourceId) {
-            throw new Error("Thread ID, Memory instance, and resourceId are required for working memory updates");
+          if (!memory) {
+            throw new Error("Memory instance is required for working memory updates");
           }
-          let thread = await memory.getThreadById({ threadId });
-          if (!thread) {
-            thread = await memory.createThread({
-              threadId,
-              resourceId,
-              memoryConfig: _config
-            });
+          const scope = mergedConfig.workingMemory?.scope || "resource";
+          if (scope === "thread" && !threadId) {
+            throw new Error("Thread ID is required for thread-scoped working memory updates");
           }
-          if (thread.resourceId && thread.resourceId !== resourceId) {
-            throw new Error(
-              `Thread with id ${threadId} resourceId does not match the current resourceId ${resourceId}`
-            );
+          if (scope === "resource" && !resourceId) {
+            throw new Error("Resource ID is required for resource-scoped working memory updates");
+          }
+          if (threadId) {
+            let thread = await memory.getThreadById({ threadId });
+            if (!thread) {
+              thread = await memory.createThread({
+                threadId,
+                resourceId,
+                memoryConfig: _config
+              });
+            }
+            if (thread.resourceId && resourceId && thread.resourceId !== resourceId) {
+              throw new Error(
+                `Thread with id ${threadId} resourceId does not match the current resourceId ${resourceId}`
+              );
+            }
           }
           const workingMemory = typeof inputData.memory === "string" ? inputData.memory : JSON.stringify(inputData.memory);
           await memory.updateWorkingMemory({
@@ -24770,5 +25002,5 @@ exports.validateStepRequestContext = validateStepRequestContext;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-5SOS47PH.cjs.map
-//# sourceMappingURL=chunk-5SOS47PH.cjs.map
+//# sourceMappingURL=chunk-FLHFB23E.cjs.map
+//# sourceMappingURL=chunk-FLHFB23E.cjs.map