@mastra/core 1.9.0 → 1.10.0

package/dist/{chunk-YIJZBU54.cjs → chunk-BCSVBOAN.cjs}

@@ -2,22 +2,22 @@
 
 var chunkRQ56ZSIR_cjs = require('./chunk-RQ56ZSIR.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
-var chunk4P35AVPE_cjs = require('./chunk-4P35AVPE.cjs');
-var chunkZBESCKPX_cjs = require('./chunk-ZBESCKPX.cjs');
-var chunk3ZF7IC6Q_cjs = require('./chunk-3ZF7IC6Q.cjs');
+var chunkMEMYFFOL_cjs = require('./chunk-MEMYFFOL.cjs');
+var chunk7AHCLTZZ_cjs = require('./chunk-7AHCLTZZ.cjs');
+var chunkYZMSJKAK_cjs = require('./chunk-YZMSJKAK.cjs');
 var chunkZIEQA3YP_cjs = require('./chunk-ZIEQA3YP.cjs');
 var chunkPM3UIIBK_cjs = require('./chunk-PM3UIIBK.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkWU2P7XOU_cjs = require('./chunk-WU2P7XOU.cjs');
-var chunkPKORY4ZZ_cjs = require('./chunk-PKORY4ZZ.cjs');
+var chunkPP4G2TZZ_cjs = require('./chunk-PP4G2TZZ.cjs');
+var chunkOOTLMVNN_cjs = require('./chunk-OOTLMVNN.cjs');
 var chunk6BJ7XHRH_cjs = require('./chunk-6BJ7XHRH.cjs');
 var chunkOQDRPRKM_cjs = require('./chunk-OQDRPRKM.cjs');
-var chunkQNXY3J6B_cjs = require('./chunk-QNXY3J6B.cjs');
+var chunkGCRPNAAR_cjs = require('./chunk-GCRPNAAR.cjs');
 var chunk4UOWNFAL_cjs = require('./chunk-4UOWNFAL.cjs');
-var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
-var chunkD6HO5QAM_cjs = require('./chunk-D6HO5QAM.cjs');
-var chunkVDKWYUGC_cjs = require('./chunk-VDKWYUGC.cjs');
 var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
+var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
+var chunkM26GEN4C_cjs = require('./chunk-M26GEN4C.cjs');
+var chunk5WBEMKE2_cjs = require('./chunk-5WBEMKE2.cjs');
 var chunk4WQYXT2I_cjs = require('./chunk-4WQYXT2I.cjs');
 var chunkRO47SMI7_cjs = require('./chunk-RO47SMI7.cjs');
 var chunk7XAECHYL_cjs = require('./chunk-7XAECHYL.cjs');
@@ -1306,7 +1306,7 @@ var ProcessorRunner = class _ProcessorRunner {
         writer
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunk3ZF7IC6Q_cjs.MessageList) {
+      if (result instanceof chunkYZMSJKAK_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
@@ -1570,7 +1570,7 @@ var ProcessorRunner = class _ProcessorRunner {
         retryCount
       });
       let mutations;
-      if (result instanceof chunk3ZF7IC6Q_cjs.MessageList) {
+      if (result instanceof chunkYZMSJKAK_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunk4U7ZLI36_cjs.MastraError({
             category: "USER",
@@ -1899,7 +1899,7 @@ var ProcessorRunner = class _ProcessorRunner {
           writer
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunk3ZF7IC6Q_cjs.MessageList) {
+        if (result instanceof chunkYZMSJKAK_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -1969,7 +1969,7 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunk3ZF7IC6Q_cjs.MessageList) {
+    if (result instanceof chunkYZMSJKAK_cjs.MessageList) {
       if (result !== messageList) {
         throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
@@ -2004,7 +2004,7 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkWU2P7XOU_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunkPP4G2TZZ_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
           throw new chunk4U7ZLI36_cjs.MastraError({
@@ -3144,7 +3144,7 @@ var MastraModelOutput = class extends chunkRO47SMI7_cjs.MastraBase {
                   );
                   const responseMessages = self.messageList.get.response.aiV4.core();
                   const lastResponseMessage = responseMessages[responseMessages.length - 1];
-                  const outputText = lastResponseMessage ? chunk3ZF7IC6Q_cjs.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkYZMSJKAK_cjs.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
@@ -4479,7 +4479,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunk3ZF7IC6Q_cjs.DefaultGeneratedFile({
+          file: new chunkYZMSJKAK_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -4487,7 +4487,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunk3ZF7IC6Q_cjs.DefaultGeneratedFileWithType({
+        file: new chunkYZMSJKAK_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -5073,7 +5073,7 @@ async function validateStepInput({
 }) {
   let inputData = prevOutput;
   let validationError;
-  if (validateInputs && chunkQNXY3J6B_cjs.isZodType(step.inputSchema)) {
+  if (validateInputs && chunkGCRPNAAR_cjs.isZodType(step.inputSchema)) {
     const inputSchema = step.inputSchema;
     const validatedInput = await inputSchema.safeParseAsync(prevOutput);
     if (!validatedInput.success) {
@@ -5102,7 +5102,7 @@ async function validateStepResumeData({ resumeData, step }) {
   }
   let validationError;
   const resumeSchema = step.resumeSchema;
-  if (resumeSchema && chunkQNXY3J6B_cjs.isZodType(resumeSchema)) {
+  if (resumeSchema && chunkGCRPNAAR_cjs.isZodType(resumeSchema)) {
     const validatedResumeData = await resumeSchema.safeParseAsync(resumeData);
     if (!validatedResumeData.success) {
       const errors = getZodErrors(validatedResumeData.error);
@@ -5133,7 +5133,7 @@ async function validateStepSuspendData({
   }
   let validationError;
   const suspendSchema = step.suspendSchema;
-  if (suspendSchema && validateInputs && chunkQNXY3J6B_cjs.isZodType(suspendSchema)) {
+  if (suspendSchema && validateInputs && chunkGCRPNAAR_cjs.isZodType(suspendSchema)) {
     const validatedSuspendData = await suspendSchema.safeParseAsync(suspendData);
     if (!validatedSuspendData.success) {
       const errors = getZodErrors(validatedSuspendData.error);
@@ -5164,7 +5164,7 @@ async function validateStepStateData({
   }
   let validationError;
   const stateSchema = step.stateSchema;
-  if (stateSchema && validateInputs && chunkQNXY3J6B_cjs.isZodType(stateSchema)) {
+  if (stateSchema && validateInputs && chunkGCRPNAAR_cjs.isZodType(stateSchema)) {
     const validatedStateData = await stateSchema.safeParseAsync(stateData);
     if (!validatedStateData.success) {
       const errors = getZodErrors(validatedStateData.error);
@@ -5183,7 +5183,7 @@ async function validateStepRequestContext({
 }) {
   let validationError;
   const requestContextSchema = step.requestContextSchema;
-  if (requestContextSchema && validateInputs && chunkQNXY3J6B_cjs.isZodType(requestContextSchema)) {
+  if (requestContextSchema && validateInputs && chunkGCRPNAAR_cjs.isZodType(requestContextSchema)) {
     const contextValues = requestContext?.all ?? {};
     const validatedRequestContext = await requestContextSchema.safeParseAsync(contextValues);
     if (!validatedRequestContext.success) {
@@ -5319,7 +5319,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkQNXY3J6B_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkGCRPNAAR_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -5877,7 +5877,7 @@ async function executeLoop(engine, params) {
       options: {
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: '${entry.loopType}'`,
-        input: chunkQNXY3J6B_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunkGCRPNAAR_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         },
@@ -6279,7 +6279,7 @@ async function persistStepUpdate(engine, params) {
     if (!shouldPersistSnapshot) {
       return;
     }
-    const ctx = requestContext instanceof chunkVDKWYUGC_cjs.RequestContext ? requestContext : new chunkVDKWYUGC_cjs.RequestContext(requestContext);
+    const ctx = requestContext instanceof chunk5WBEMKE2_cjs.RequestContext ? requestContext : new chunk5WBEMKE2_cjs.RequestContext(requestContext);
     const requestContextObj = ctx.toJSON();
     const workflowsStore = await engine.mastra?.getStorage()?.getStore("workflows");
     await workflowsStore?.persistWorkflowSnapshot({
@@ -8122,10 +8122,10 @@ function isAgent(input) {
   return input instanceof Agent;
 }
 function isToolStep(input) {
-  return input instanceof chunkD6HO5QAM_cjs.Tool;
+  return input instanceof chunkM26GEN4C_cjs.Tool;
 }
 function isStepParams(input) {
-  return input !== null && typeof input === "object" && "id" in input && "execute" in input && !(input instanceof Agent) && !(input instanceof chunkD6HO5QAM_cjs.Tool);
+  return input !== null && typeof input === "object" && "id" in input && "execute" in input && !(input instanceof Agent) && !(input instanceof chunkM26GEN4C_cjs.Tool);
 }
 function createStep(params, agentOrToolOptions) {
   if (isAgent(params)) {
@@ -8466,7 +8466,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 chunk3ZF7IC6Q_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
+        messageList: messageList ?? (Array.isArray(messages) ? new chunkYZMSJKAK_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
         stepNumber,
         systemMessages,
         streamParts,
@@ -8520,7 +8520,7 @@ function createStepFromProcessor(processor) {
                 messageList: checkedMessageList,
                 systemMessages: systemMessages ?? []
               });
-              if (result instanceof chunk3ZF7IC6Q_cjs.MessageList) {
+              if (result instanceof chunkYZMSJKAK_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8686,7 +8686,7 @@ function createStepFromProcessor(processor) {
                 messages,
                 messageList: passThrough.messageList
               });
-              if (result instanceof chunk3ZF7IC6Q_cjs.MessageList) {
+              if (result instanceof chunkYZMSJKAK_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8753,7 +8753,7 @@ function createStepFromProcessor(processor) {
                 systemMessages: systemMessages ?? [],
                 steps: steps ?? []
               });
-              if (result instanceof chunk3ZF7IC6Q_cjs.MessageList) {
+              if (result instanceof chunkYZMSJKAK_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8821,7 +8821,7 @@ function cloneStep(step, opts) {
   };
 }
 function isProcessor(obj) {
-  return obj !== null && typeof obj === "object" && "id" in obj && typeof obj.id === "string" && !(obj instanceof Agent) && !(obj instanceof chunkD6HO5QAM_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 chunkM26GEN4C_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);
@@ -9328,7 +9328,7 @@ var Workflow = class extends chunkRO47SMI7_cjs.MastraBase {
     return run;
   }
   async listScorers({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext()
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext()
   } = {}) {
     const steps = this.steps;
     if (!steps || Object.keys(steps).length === 0) {
@@ -9809,7 +9809,7 @@ var Run = class {
   }
   async _validateInput(inputData) {
     let inputDataToUse = inputData;
-    if (this.validateInputs && this.inputSchema && chunkQNXY3J6B_cjs.isZodType(this.inputSchema)) {
+    if (this.validateInputs && this.inputSchema && chunkGCRPNAAR_cjs.isZodType(this.inputSchema)) {
       const validatedInputData = await this.inputSchema.safeParseAsync(inputData);
       if (!validatedInputData.success) {
         const errors = getZodErrors(validatedInputData.error);
@@ -9823,7 +9823,7 @@ var Run = class {
     let initialStateToUse = initialState;
     if (this.validateInputs) {
       let stateSchema = this.stateSchema;
-      if (stateSchema && chunkQNXY3J6B_cjs.isZodType(stateSchema)) {
+      if (stateSchema && chunkGCRPNAAR_cjs.isZodType(stateSchema)) {
         const validatedInitialState = await stateSchema.safeParseAsync(initialState);
         if (!validatedInitialState.success) {
           const errors = getZodErrors(validatedInitialState.error);
@@ -9837,7 +9837,7 @@ var Run = class {
     return initialStateToUse;
   }
   async _validateRequestContext(requestContext) {
-    if (this.validateInputs && this.requestContextSchema && chunkQNXY3J6B_cjs.isZodType(this.requestContextSchema)) {
+    if (this.validateInputs && this.requestContextSchema && chunkGCRPNAAR_cjs.isZodType(this.requestContextSchema)) {
       const contextValues = requestContext?.all ?? {};
       const validatedRequestContext = await this.requestContextSchema.safeParseAsync(contextValues);
       if (!validatedRequestContext.success) {
@@ -9851,7 +9851,7 @@ var Run = class {
   }
   async _validateResumeData(resumeData, suspendedStep) {
     let resumeDataToUse = resumeData;
-    if (suspendedStep && suspendedStep.resumeSchema && this.validateInputs && chunkQNXY3J6B_cjs.isZodType(suspendedStep.resumeSchema)) {
+    if (suspendedStep && suspendedStep.resumeSchema && this.validateInputs && chunkGCRPNAAR_cjs.isZodType(suspendedStep.resumeSchema)) {
       const resumeSchema = suspendedStep.resumeSchema;
       const validatedResumeData = await resumeSchema.safeParseAsync(resumeData);
       if (!validatedResumeData.success) {
@@ -9864,7 +9864,7 @@ var Run = class {
   }
   async _validateTimetravelInputData(inputData, step) {
     let inputDataToUse = inputData;
-    if (step && step.inputSchema && this.validateInputs && chunkQNXY3J6B_cjs.isZodType(step.inputSchema)) {
+    if (step && step.inputSchema && this.validateInputs && chunkGCRPNAAR_cjs.isZodType(step.inputSchema)) {
       const inputSchema = step.inputSchema;
       const validatedInputData = await inputSchema.safeParseAsync(inputData);
       if (!validatedInputData.success) {
@@ -9919,7 +9919,7 @@ var Run = class {
       initialState: initialStateToUse,
       pubsub: this.pubsub,
       retryConfig: this.retryConfig,
-      requestContext: requestContext ?? new chunkVDKWYUGC_cjs.RequestContext(),
+      requestContext: requestContext ?? new chunk5WBEMKE2_cjs.RequestContext(),
       abortController: this.abortController,
       outputWriter,
       workflowSpan,
@@ -10389,7 +10389,7 @@ var Run = class {
       params.requestContext.delete("__mastraWorflowInputData");
     }
     const stepResults = { ...snapshot?.context ?? {}, input: requestContextInput ?? snapshot?.context?.input };
-    const requestContextToUse = params.requestContext ?? new chunkVDKWYUGC_cjs.RequestContext();
+    const requestContextToUse = params.requestContext ?? new chunk5WBEMKE2_cjs.RequestContext();
     Object.entries(snapshot?.requestContext ?? {}).forEach(([key, value]) => {
       if (!requestContextToUse.has(key)) {
         requestContextToUse.set(key, value);
@@ -10504,7 +10504,7 @@ var Run = class {
       state: snapshot.value,
       stepExecutionPath: snapshot?.stepExecutionPath
     };
-    const requestContextToUse = requestContext ?? new chunkVDKWYUGC_cjs.RequestContext();
+    const requestContextToUse = requestContext ?? new chunk5WBEMKE2_cjs.RequestContext();
     for (const [key, value] of Object.entries(snapshot.requestContext ?? {})) {
       if (!requestContextToUse.has(key)) {
         requestContextToUse.set(key, value);
@@ -10599,7 +10599,7 @@ var Run = class {
       graph: this.executionGraph,
       perStep
     });
-    const requestContextToUse = requestContext ?? new chunkVDKWYUGC_cjs.RequestContext();
+    const requestContextToUse = requestContext ?? new chunk5WBEMKE2_cjs.RequestContext();
     for (const [key, value] of Object.entries(snapshot.requestContext ?? {})) {
       if (!requestContextToUse.has(key)) {
         requestContextToUse.set(key, value);
@@ -11111,7 +11111,7 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const resolvedModel = await chunkWU2P7XOU_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const resolvedModel = await chunkPP4G2TZZ_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
     const judge = new Agent({
       id: "judge",
       name: "judge",
@@ -12634,7 +12634,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }
         });
         let transportResolver;
-        if (currentStep.model instanceof chunkWU2P7XOU_cjs.ModelRouterLanguageModel) {
+        if (currentStep.model instanceof chunkPP4G2TZZ_cjs.ModelRouterLanguageModel) {
           const routerModel = currentStep.model;
           transportResolver = () => routerModel._getStreamTransport();
         }
@@ -13023,7 +13023,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
                   toolInvocation: {
                     state: "result",
                     toolCallId: toolCallErrorResult.toolCallId,
-                    toolName: chunk3ZF7IC6Q_cjs.sanitizeToolName(toolCallErrorResult.toolName),
+                    toolName: chunkYZMSJKAK_cjs.sanitizeToolName(toolCallErrorResult.toolName),
                     args: toolCallErrorResult.args,
                     result: toolCallErrorResult.error?.message ?? toolCallErrorResult.error
                   },
@@ -13072,7 +13072,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
                         toolInvocation: {
                           state: "result",
                           toolCallId: toolCall.toolCallId,
-                          toolName: chunk3ZF7IC6Q_cjs.sanitizeToolName(toolCall.toolName),
+                          toolName: chunkYZMSJKAK_cjs.sanitizeToolName(toolCall.toolName),
                           args: toolCall.args,
                           result: toolCall.result
                         },
@@ -13098,7 +13098,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
                     toolInvocation: {
                       state: "result",
                       toolCallId: toolCall.toolCallId,
-                      toolName: chunk3ZF7IC6Q_cjs.sanitizeToolName(toolCall.toolName),
+                      toolName: chunkYZMSJKAK_cjs.sanitizeToolName(toolCall.toolName),
                       args: toolCall.args,
                       result: toolCall.result
                     },
@@ -13168,7 +13168,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
                     toolInvocation: {
                       state: "result",
                       toolCallId: toolCall.toolCallId,
-                      toolName: chunk3ZF7IC6Q_cjs.sanitizeToolName(toolCall.toolName),
+                      toolName: chunkYZMSJKAK_cjs.sanitizeToolName(toolCall.toolName),
                       args: toolCall.args,
                       result: toolCall.result
                     },
@@ -13194,7 +13194,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
                 toolInvocation: {
                   state: "result",
                   toolCallId: toolCall.toolCallId,
-                  toolName: chunk3ZF7IC6Q_cjs.sanitizeToolName(toolCall.toolName),
+                  toolName: chunkYZMSJKAK_cjs.sanitizeToolName(toolCall.toolName),
                   args: toolCall.args,
                   result: toolCall.result
                 },
@@ -13764,6 +13764,7 @@ function createAgenticLoopWorkflow(params) {
   } = params;
   const accumulatedSteps = [];
   let previousContentLength = 0;
+  let pendingFeedbackStop = false;
   const agenticExecutionWorkflow = createAgenticExecutionWorkflow({
     messageId,
     models,
@@ -13794,6 +13795,10 @@ function createAgenticLoopWorkflow(params) {
   }).dowhile(agenticExecutionWorkflow, async ({ inputData }) => {
     const typedInputData = inputData;
     let hasFinishedSteps = false;
+    if (pendingFeedbackStop) {
+      hasFinishedSteps = true;
+      pendingFeedbackStop = false;
+    }
     const allContent = typedInputData.messages.nonUser.flatMap(
       (message) => message.content
     );
@@ -13838,7 +13843,7 @@ function createAgenticLoopWorkflow(params) {
         })
       );
       const hasStopped = conditions.some((condition) => condition);
-      hasFinishedSteps = hasStopped;
+      hasFinishedSteps = hasFinishedSteps || hasStopped;
     }
     if (rest.onIterationComplete) {
       const isFinal = !typedInputData.stepResult?.isContinued || hasFinishedSteps;
@@ -13869,10 +13874,7 @@ function createAgenticLoopWorkflow(params) {
       try {
         const iterationResult = await rest.onIterationComplete(iterationContext);
         if (iterationResult) {
-          if (iterationResult.continue === false && !hasFinishedSteps) {
-            hasFinishedSteps = true;
-          }
-          if (iterationResult.feedback && typedInputData.stepResult?.isContinued && !hasFinishedSteps) {
+          if (iterationResult.feedback && typedInputData.stepResult?.isContinued) {
             messageList.add(
               {
                 id: rest.mastra?.generateId() || crypto2.randomUUID(),
@@ -13897,10 +13899,14 @@ function createAgenticLoopWorkflow(params) {
               },
               "response"
             );
-            if (iterationResult.continue && rest.maxSteps && accumulatedSteps.length < rest.maxSteps) {
+            if (iterationResult.continue === false) {
+              pendingFeedbackStop = true;
+            } else if (!hasFinishedSteps && rest.maxSteps && accumulatedSteps.length < rest.maxSteps) {
               hasFinishedSteps = false;
               typedInputData.stepResult.isContinued = true;
             }
+          } else if (iterationResult.continue === false && !hasFinishedSteps) {
+            hasFinishedSteps = true;
           }
         }
       } catch (error) {
@@ -14028,7 +14034,7 @@ function workflowLoopStream({
       const run = await agenticLoopWorkflow.createRun({
         runId
       });
-      const requestContext = rest.requestContext ?? new chunkVDKWYUGC_cjs.RequestContext();
+      const requestContext = rest.requestContext ?? new chunk5WBEMKE2_cjs.RequestContext();
       if (requireToolApproval) {
         requestContext.set("__mastra_requireToolApproval", true);
       }
@@ -14384,6 +14390,7 @@ var MastraLLMVNext = class extends chunkRO47SMI7_cjs.MastraBase {
         toolCallId,
         messageList,
         models: this.#models,
+        logger: this.logger,
         tools,
         stopWhen: stopWhenToUse,
         toolChoice,
@@ -14450,7 +14457,7 @@ var MastraLLMVNext = class extends chunkRO47SMI7_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 chunkQNXY3J6B_cjs.delay(10 * 1e3);
+              await chunkGCRPNAAR_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -14715,7 +14722,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunk3ZF7IC6Q_cjs.MessageList({
+    const messageList = new chunkYZMSJKAK_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -14772,7 +14779,7 @@ async function saveMessagesWithProcessors(memory, messages, processorRunner, con
     await memory.saveMessages({ messages });
     return;
   }
-  const messageList = new chunk3ZF7IC6Q_cjs.MessageList();
+  const messageList = new chunkYZMSJKAK_cjs.MessageList();
   for (const msg of messages) {
     messageList.add(msg, "response");
   }
@@ -16210,7 +16217,7 @@ async function networkLoop({
               "resumeData": "string"
             }
           `;
-              const messageList = new chunk3ZF7IC6Q_cjs.MessageList();
+              const messageList = new chunkYZMSJKAK_cjs.MessageList();
               messageList.addSystem(systemInstructions);
               messageList.add(task, "user");
               const result = llm.stream({
@@ -16626,6 +16633,8 @@ async function networkLoop({
     }
   });
 }
+
+// src/processors/processors/skills.ts
 var SkillsProcessor = class {
   id = "skills-processor";
   name = "Skills Processor";
@@ -16633,8 +16642,6 @@ var SkillsProcessor = class {
   _workspace;
   /** Format for skill injection */
   _format;
-  /** Set of activated skill names */
-  _activatedSkills = /* @__PURE__ */ new Set();
   constructor(opts) {
     this._workspace = opts.workspace;
     this._format = opts.format ?? "xml";
@@ -16674,7 +16681,8 @@ var SkillsProcessor = class {
     return skill.source.type;
   }
   /**
-   * Format available skills metadata based on configured format
+   * Format available skills metadata based on configured format.
+   * Skills are sorted by name for deterministic output (prompt cache stability).
    */
   async formatAvailableSkills() {
     const skillsList = await this.skills?.list();
@@ -16683,6 +16691,7 @@ var SkillsProcessor = class {
     }
     const skillPromises = skillsList.map((meta) => this.skills?.get(meta.name));
     const fullSkills = (await Promise.all(skillPromises)).filter((s) => s !== void 0);
+    fullSkills.sort((a, b) => a.name.localeCompare(b.name));
     switch (this._format) {
       case "xml": {
         const skillsXml = fullSkills.map(
@@ -16725,46 +16734,6 @@ ${skillsMd}`;
       }
     }
   }
-  /**
-   * Format activated skills based on configured format
-   */
-  async formatActivatedSkills() {
-    const skillPromises = Array.from(this._activatedSkills).map((name) => this.skills?.get(name));
-    const activatedSkillsList = (await Promise.all(skillPromises)).filter((s) => s !== void 0);
-    if (activatedSkillsList.length === 0) {
-      return "";
-    }
-    switch (this._format) {
-      case "xml": {
-        const skillInstructions = activatedSkillsList.map(
-          (skill) => `# Skill: ${skill.name}
-Location: ${this.formatLocation(skill)}
-Source: ${this.formatSourceType(skill)}
-
-${skill.instructions}`
-        ).join("\n\n---\n\n");
-        return `<activated_skills>
-${skillInstructions}
-</activated_skills>`;
-      }
-      case "json":
-      case "markdown": {
-        const skillInstructions = activatedSkillsList.map(
-          (skill) => `# Skill: ${skill.name}
-*Location: ${this.formatLocation(skill)} | Source: ${this.formatSourceType(skill)}*
-
-${skill.instructions}`
-        ).join("\n\n---\n\n");
-        return `# Activated Skills
-
-${skillInstructions}`;
-      }
-      default: {
-        const _exhaustive = this._format;
-        return _exhaustive;
-      }
-    }
-  }
   /**
    * Escape XML special characters
    */
@@ -16772,255 +16741,13 @@ ${skillInstructions}`;
     return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
   }
   // ===========================================================================
-  // Tool Creation
+  // processInputStep — system message injection only
   // ===========================================================================
   /**
-   * Create skill-activate tool
-   */
-  createSkillActivateTool() {
-    const skills = this.skills;
-    const activatedSkills = this._activatedSkills;
-    return chunkD6HO5QAM_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({
-        name: z10__default.default.string().describe("The name of the skill to activate")
-      }),
-      execute: async ({ name }) => {
-        if (!skills) {
-          return {
-            success: false,
-            message: "No skills configured"
-          };
-        }
-        if (!await skills.has(name)) {
-          const skillsList = await skills.list();
-          const skillNames = skillsList.map((s) => s.name);
-          return {
-            success: false,
-            message: `Skill "${name}" not found. Available skills: ${skillNames.join(", ")}`
-          };
-        }
-        if (activatedSkills.has(name)) {
-          return {
-            success: true,
-            message: `Skill "${name}" is already activated`
-          };
-        }
-        activatedSkills.add(name);
-        return {
-          success: true,
-          message: `Skill "${name}" activated successfully. The skill instructions are now available.`
-        };
-      }
-    });
-  }
-  /**
-   * Create skill-read-reference tool
-   */
-  createSkillReadReferenceTool() {
-    const skills = this.skills;
-    const activatedSkills = this._activatedSkills;
-    return chunkD6HO5QAM_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({
-        skillName: z10__default.default.string().describe("The name of the activated skill"),
-        referencePath: z10__default.default.string().describe(
-          'Path to the reference file (relative to the skill root directory, e.g. "references/colors.md" or "docs/schema.md")'
-        ),
-        startLine: z10__default.default.number().optional().describe("Starting line number (1-indexed). If omitted, starts from the beginning."),
-        endLine: z10__default.default.number().optional().describe("Ending line number (1-indexed, inclusive). If omitted, reads to the end.")
-      }),
-      execute: async ({ skillName, referencePath, startLine, endLine }) => {
-        if (!skills) {
-          return {
-            success: false,
-            message: "No skills configured"
-          };
-        }
-        if (!activatedSkills.has(skillName)) {
-          return {
-            success: false,
-            message: `Skill "${skillName}" is not activated. Activate it first using skill-activate.`
-          };
-        }
-        const fullContent = await skills.getReference(skillName, referencePath);
-        if (fullContent === null) {
-          const availableRefs = await skills.listReferences(skillName);
-          return {
-            success: false,
-            message: `Reference file "${referencePath}" not found in skill "${skillName}". Available references: ${availableRefs.join(", ") || "none"}`
-          };
-        }
-        const result = chunk4P35AVPE_cjs.extractLines(fullContent, startLine, endLine);
-        return {
-          success: true,
-          content: result.content,
-          lines: result.lines,
-          totalLines: result.totalLines
-        };
-      }
-    });
-  }
-  /**
-   * Create skill-read-script tool
-   */
-  createSkillReadScriptTool() {
-    const skills = this.skills;
-    const activatedSkills = this._activatedSkills;
-    return chunkD6HO5QAM_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({
-        skillName: z10__default.default.string().describe("The name of the activated skill"),
-        scriptPath: z10__default.default.string().describe('Path to the script file (relative to the skill root directory, e.g. "scripts/run.sh")'),
-        startLine: z10__default.default.number().optional().describe("Starting line number (1-indexed). If omitted, starts from the beginning."),
-        endLine: z10__default.default.number().optional().describe("Ending line number (1-indexed, inclusive). If omitted, reads to the end.")
-      }),
-      execute: async ({ skillName, scriptPath, startLine, endLine }) => {
-        if (!skills) {
-          return {
-            success: false,
-            message: "No skills configured"
-          };
-        }
-        if (!activatedSkills.has(skillName)) {
-          return {
-            success: false,
-            message: `Skill "${skillName}" is not activated. Activate it first using skill-activate.`
-          };
-        }
-        const fullContent = await skills.getScript(skillName, scriptPath);
-        if (fullContent === null) {
-          const availableScripts = await skills.listScripts(skillName);
-          return {
-            success: false,
-            message: `Script file "${scriptPath}" not found in skill "${skillName}". Available scripts: ${availableScripts.join(", ") || "none"}`
-          };
-        }
-        const result = chunk4P35AVPE_cjs.extractLines(fullContent, startLine, endLine);
-        return {
-          success: true,
-          content: result.content,
-          lines: result.lines,
-          totalLines: result.totalLines
-        };
-      }
-    });
-  }
-  /**
-   * Create skill-read-asset tool
+   * Process input step - inject available skills metadata into the system
+   * message.  Tools are provided by `Agent.listSkillTools()` instead.
    */
-  createSkillReadAssetTool() {
-    const skills = this.skills;
-    const activatedSkills = this._activatedSkills;
-    return chunkD6HO5QAM_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({
-        skillName: z10__default.default.string().describe("The name of the activated skill"),
-        assetPath: z10__default.default.string().describe('Path to the asset file (relative to the skill root directory, e.g. "assets/logo.png")')
-      }),
-      execute: async ({ skillName, assetPath }) => {
-        if (!skills) {
-          return {
-            success: false,
-            message: "No skills configured"
-          };
-        }
-        if (!activatedSkills.has(skillName)) {
-          return {
-            success: false,
-            message: `Skill "${skillName}" is not activated. Activate it first using skill-activate.`
-          };
-        }
-        const content = await skills.getAsset(skillName, assetPath);
-        if (content === null) {
-          const availableAssets = await skills.listAssets(skillName);
-          return {
-            success: false,
-            message: `Asset file "${assetPath}" not found in skill "${skillName}". Available assets: ${availableAssets.join(", ") || "none"}`
-          };
-        }
-        try {
-          const textContent = content.toString("utf-8");
-          if (!textContent.slice(0, 1e3).includes("\0")) {
-            return {
-              success: true,
-              content: textContent,
-              encoding: "utf-8"
-            };
-          }
-        } catch {
-        }
-        return {
-          success: true,
-          content: content.toString("base64"),
-          encoding: "base64"
-        };
-      }
-    });
-  }
-  /**
-   * Create skill-search tool for searching across skill content
-   */
-  createSkillSearchTool() {
-    const skills = this.skills;
-    return chunkD6HO5QAM_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({
-        query: z10__default.default.string().describe("The search query"),
-        skillNames: z10__default.default.array(z10__default.default.string()).optional().describe("Optional list of skill names to search within"),
-        topK: z10__default.default.number().optional().describe("Maximum number of results to return (default: 5)")
-      }),
-      execute: async ({ query, skillNames, topK }) => {
-        if (!skills) {
-          return {
-            success: false,
-            message: "No skills configured"
-          };
-        }
-        const results = await skills.search(query, { topK, skillNames });
-        if (results.length === 0) {
-          return {
-            success: true,
-            message: "No results found",
-            results: []
-          };
-        }
-        return {
-          success: true,
-          results: results.map((r) => ({
-            skillName: r.skillName,
-            source: r.source,
-            score: r.score,
-            preview: r.content.substring(0, 200) + (r.content.length > 200 ? "..." : ""),
-            lineRange: r.lineRange
-          }))
-        };
-      }
-    });
-  }
-  // ===========================================================================
-  // Helpers
-  // ===========================================================================
-  /**
-   * Mark a tool as never requiring approval.
-   * Skill tools are internal plumbing and should bypass requireToolApproval.
-   */
-  withNoApproval(tool2) {
-    tool2.needsApprovalFn = () => false;
-    return tool2;
-  }
-  // ===========================================================================
-  // Processor Interface
-  // ===========================================================================
-  /**
-   * Process input step - inject available skills and provide skill tools
-   */
-  async processInputStep({ messageList, tools, stepNumber, requestContext }) {
+  async processInputStep({ messageList, stepNumber, requestContext }) {
     if (stepNumber === 0) {
       await this.skills?.maybeRefresh({ requestContext });
     }
@@ -17036,35 +16763,9 @@ ${skillInstructions}`;
       }
       messageList.addSystem({
         role: "system",
-        content: 'IMPORTANT: Skills are NOT tools. Do not call skill names directly. To use a skill, call the skill-activate tool with the skill name as the "name" parameter. When a user asks about a topic covered by an available skill, activate it immediately without asking for permission.'
+        content: 'IMPORTANT: Skills are NOT tools. Do not call skill names directly as tool names. To use a skill, call the `skill` tool with the skill name as the "name" parameter. When a user asks about a topic covered by an available skill, activate it immediately without asking for permission first.'
       });
     }
-    if (this._activatedSkills.size > 0) {
-      const activatedSkillsMessage = await this.formatActivatedSkills();
-      if (activatedSkillsMessage) {
-        messageList.addSystem({
-          role: "system",
-          content: activatedSkillsMessage
-        });
-      }
-    }
-    const skillTools = {};
-    if (hasSkills) {
-      skillTools["skill-activate"] = this.withNoApproval(this.createSkillActivateTool());
-      skillTools["skill-search"] = this.withNoApproval(this.createSkillSearchTool());
-    }
-    if (this._activatedSkills.size > 0) {
-      skillTools["skill-read-reference"] = this.withNoApproval(this.createSkillReadReferenceTool());
-      skillTools["skill-read-script"] = this.withNoApproval(this.createSkillReadScriptTool());
-      skillTools["skill-read-asset"] = this.withNoApproval(this.createSkillReadAssetTool());
-    }
-    return {
-      messageList,
-      tools: {
-        ...tools,
-        ...skillTools
-      }
-    };
   }
 };
 
@@ -17173,7 +16874,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunk3ZF7IC6Q_cjs.MessageList({
+        let messageList = new chunkYZMSJKAK_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -17342,7 +17043,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunk3ZF7IC6Q_cjs.MessageList({
+        const messageListResponses = new chunkYZMSJKAK_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -17502,14 +17203,14 @@ var AgentLegacyHandler = class {
       clientTools,
       temperature,
       toolChoice = "auto",
-      requestContext = new chunkVDKWYUGC_cjs.RequestContext(),
+      requestContext = new chunk5WBEMKE2_cjs.RequestContext(),
       tracingOptions,
       savePerStep,
       writableStream,
       ...args
     } = options;
-    const resourceIdFromContext = requestContext.get(chunkVDKWYUGC_cjs.MASTRA_RESOURCE_ID_KEY);
-    const threadIdFromContext = requestContext.get(chunkVDKWYUGC_cjs.MASTRA_THREAD_ID_KEY);
+    const resourceIdFromContext = requestContext.get(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY);
+    const threadIdFromContext = requestContext.get(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY);
     const threadFromArgs = threadIdFromContext ? { id: threadIdFromContext } : resolveThreadIdFromArgs({ threadId: args.threadId, memory: args.memory });
     const resourceId = resourceIdFromContext || args.memory?.resource || resourceIdFromArgs;
     const memoryConfig = args.memory?.options || memoryConfigFromArgs;
@@ -17710,7 +17411,7 @@ var AgentLegacyHandler = class {
         "response"
       );
       const outputProcessorResult2 = await this.capabilities.__runOutputProcessors({
-        requestContext: contextWithMemory || new chunkVDKWYUGC_cjs.RequestContext(),
+        requestContext: contextWithMemory || new chunk5WBEMKE2_cjs.RequestContext(),
         ...observabilityContext,
         outputProcessorOverrides: finalOutputProcessors,
         messageList
@@ -17799,7 +17500,7 @@ var AgentLegacyHandler = class {
       "response"
     );
     const outputProcessorResult = await this.capabilities.__runOutputProcessors({
-      requestContext: contextWithMemory || new chunkVDKWYUGC_cjs.RequestContext(),
+      requestContext: contextWithMemory || new chunk5WBEMKE2_cjs.RequestContext(),
       ...observabilityContext,
       messageList
       // Use the full message list with complete conversation history
@@ -18388,7 +18089,7 @@ var prepareToolsStepOutputSchema = z10.z.object({
 var prepareMemoryStepOutputSchema = z10.z.object({
   threadExists: z10.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z10.z.instanceof(chunk3ZF7IC6Q_cjs.MessageList),
+  messageList: z10.z.instanceof(chunkYZMSJKAK_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 */
@@ -18429,7 +18130,7 @@ function createPrepareMemoryStep({
     execute: async ({ ...rest }) => {
       const observabilityContext = chunk4UOWNFAL_cjs.resolveObservabilityContext(rest);
       const thread = threadFromArgs;
-      const messageList = new chunk3ZF7IC6Q_cjs.MessageList({
+      const messageList = new chunkYZMSJKAK_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -18605,7 +18306,7 @@ function createStreamStep({
         runId
       });
       const processors = validatedInputData.outputProcessors || (capabilities.outputProcessors ? typeof capabilities.outputProcessors === "function" ? await capabilities.outputProcessors({
-        requestContext: validatedInputData.requestContext || new chunkVDKWYUGC_cjs.RequestContext()
+        requestContext: validatedInputData.requestContext || new chunk5WBEMKE2_cjs.RequestContext()
       }) : capabilities.outputProcessors : []);
       const modelMethodType = getModelMethodFromAgentMethod(methodType);
       const streamResult = capabilities.llm.stream({
@@ -18888,7 +18589,7 @@ var Agent = class extends chunkRO47SMI7_cjs.MastraBase {
    * @internal
    */
   async getSkillsProcessors(configuredProcessors, requestContext) {
-    const workspace = await this.getWorkspace({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() });
+    const workspace = await this.getWorkspace({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() });
     if (!workspace?.skills) {
       return [];
     }
@@ -18906,7 +18607,7 @@ var Agent = class extends chunkRO47SMI7_cjs.MastraBase {
    * @internal
    */
   async getWorkspaceInstructionsProcessors(configuredProcessors, requestContext) {
-    const workspace = await this.getWorkspace({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() });
+    const workspace = await this.getWorkspace({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() });
     if (!workspace) return [];
     if (!workspace.filesystem && !workspace.sandbox) return [];
     const hasProcessor = configuredProcessors.some(
@@ -18920,7 +18621,7 @@ var Agent = class extends chunkRO47SMI7_cjs.MastraBase {
    * Throws an error if validation fails.
    */
   async #validateRequestContext(requestContext) {
-    if (this.#requestContextSchema && chunkQNXY3J6B_cjs.isZodType(this.#requestContextSchema)) {
+    if (this.#requestContextSchema && chunkGCRPNAAR_cjs.isZodType(this.#requestContextSchema)) {
       const contextValues = requestContext?.all ?? {};
       const validatedRequestContext = await this.#requestContextSchema.safeParseAsync(contextValues);
       if (!validatedRequestContext.success) {
@@ -18950,7 +18651,7 @@ ${errorMessages}`,
    * console.log(Object.keys(agents)); // ['agent1', 'agent2']
    * ```
    */
-  listAgents({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
+  listAgents({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     const agentsToUse = this.#agents ? typeof this.#agents === "function" ? this.#agents({ requestContext }) : this.#agents : {};
     return resolveMaybePromise(agentsToUse, (agents) => {
       if (!agents) {
@@ -19055,8 +18756,8 @@ ${errorMessages}`,
    * @internal
    */
   async listResolvedOutputProcessors(requestContext, configuredProcessorOverrides) {
-    const configuredProcessors = configuredProcessorOverrides ? configuredProcessorOverrides : this.#outputProcessors ? typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() }) : this.#outputProcessors : [];
-    const memory = await this.getMemory({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() });
+    const configuredProcessors = configuredProcessorOverrides ? configuredProcessorOverrides : this.#outputProcessors ? typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() }) : this.#outputProcessors : [];
+    const memory = await this.getMemory({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() });
     const memoryProcessors = memory ? await memory.getOutputProcessors(configuredProcessors, requestContext) : [];
     const allProcessors = [...configuredProcessors, ...memoryProcessors];
     return this.combineProcessorsIntoWorkflow(allProcessors, `${this.id}-output-processor`);
@@ -19067,8 +18768,8 @@ ${errorMessages}`,
    * @internal
    */
   async listResolvedInputProcessors(requestContext, configuredProcessorOverrides) {
-    const configuredProcessors = configuredProcessorOverrides ? configuredProcessorOverrides : this.#inputProcessors ? typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() }) : this.#inputProcessors : [];
-    const memory = await this.getMemory({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() });
+    const configuredProcessors = configuredProcessorOverrides ? configuredProcessorOverrides : this.#inputProcessors ? typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() }) : this.#inputProcessors : [];
+    const memory = await this.getMemory({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() });
     const memoryProcessors = memory ? await memory.getInputProcessors(configuredProcessors, requestContext) : [];
     const workspaceProcessors = await this.getWorkspaceInstructionsProcessors(configuredProcessors, requestContext);
     const skillsProcessors = await this.getSkillsProcessors(configuredProcessors, requestContext);
@@ -19101,7 +18802,7 @@ ${errorMessages}`,
    * ```
    */
   async resolveProcessorById(processorId, requestContext) {
-    const ctx = requestContext || new chunkVDKWYUGC_cjs.RequestContext();
+    const ctx = requestContext || new chunk5WBEMKE2_cjs.RequestContext();
     const configuredInputProcessors = this.#inputProcessors ? typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: ctx }) : this.#inputProcessors : [];
     const memory = await this.getMemory({ requestContext: ctx });
     const memoryInputProcessors = memory ? await memory.getInputProcessors(configuredInputProcessors, ctx) : [];
@@ -19128,7 +18829,7 @@ ${errorMessages}`,
    */
   async listConfiguredInputProcessors(requestContext) {
     if (!this.#inputProcessors) return [];
-    const configuredProcessors = typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() }) : this.#inputProcessors;
+    const configuredProcessors = typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() }) : this.#inputProcessors;
     return this.combineProcessorsIntoWorkflow(configuredProcessors, `${this.id}-configured-input-processor`);
   }
   /**
@@ -19140,7 +18841,7 @@ ${errorMessages}`,
    */
   async listConfiguredOutputProcessors(requestContext) {
     if (!this.#outputProcessors) return [];
-    const configuredProcessors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new chunkVDKWYUGC_cjs.RequestContext() }) : this.#outputProcessors;
+    const configuredProcessors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: requestContext || new chunk5WBEMKE2_cjs.RequestContext() }) : this.#outputProcessors;
     return this.combineProcessorsIntoWorkflow(configuredProcessors, `${this.id}-configured-output-processor`);
   }
   /**
@@ -19149,7 +18850,7 @@ ${errorMessages}`,
    * agent processor configuration to storage.
    */
   async getConfiguredProcessorIds(requestContext) {
-    const ctx = requestContext || new chunkVDKWYUGC_cjs.RequestContext();
+    const ctx = requestContext || new chunk5WBEMKE2_cjs.RequestContext();
     let inputProcessorIds = [];
     if (this.#inputProcessors) {
       const processors = typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: ctx }) : this.#inputProcessors;
@@ -19170,7 +18871,7 @@ ${errorMessages}`,
   async getConfiguredProcessorWorkflows() {
     const workflows = [];
     if (this.#inputProcessors) {
-      const inputProcessors = typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: new chunkVDKWYUGC_cjs.RequestContext() }) : this.#inputProcessors;
+      const inputProcessors = typeof this.#inputProcessors === "function" ? await this.#inputProcessors({ requestContext: new chunk5WBEMKE2_cjs.RequestContext() }) : this.#inputProcessors;
       const combined = this.combineProcessorsIntoWorkflow(inputProcessors, `${this.id}-input-processor`);
       for (const p of combined) {
         if (isProcessorWorkflow(p)) {
@@ -19179,7 +18880,7 @@ ${errorMessages}`,
       }
     }
     if (this.#outputProcessors) {
-      const outputProcessors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: new chunkVDKWYUGC_cjs.RequestContext() }) : this.#outputProcessors;
+      const outputProcessors = typeof this.#outputProcessors === "function" ? await this.#outputProcessors({ requestContext: new chunk5WBEMKE2_cjs.RequestContext() }) : this.#outputProcessors;
       const combined = this.combineProcessorsIntoWorkflow(outputProcessors, `${this.id}-output-processor`);
       for (const p of combined) {
         if (isProcessorWorkflow(p)) {
@@ -19214,7 +18915,7 @@ ${errorMessages}`,
    * }
    * ```
    */
-  async getMemory({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
+  async getMemory({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     if (!this.#memory) {
       return void 0;
     }
@@ -19277,7 +18978,7 @@ ${errorMessages}`,
    * ```
    */
   async getWorkspace({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext()
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext()
   } = {}) {
     if (this.#workspace) {
       if (typeof this.#workspace !== "function") {
@@ -19335,7 +19036,7 @@ ${errorMessages}`,
    * ```
    */
   async listWorkflows({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext()
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext()
   } = {}) {
     let workflowRecord;
     if (typeof this.#workflows === "function") {
@@ -19351,7 +19052,7 @@ ${errorMessages}`,
     return workflowRecord;
   }
   async listScorers({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext()
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext()
   } = {}) {
     if (typeof this.#scorers !== "function") {
       return this.#scorers;
@@ -19406,7 +19107,7 @@ ${errorMessages}`,
    * console.log(instructions); // 'You are a helpful assistant'
    * ```
    */
-  getInstructions({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
+  getInstructions({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     if (typeof this.#instructions === "function") {
       const result = this.#instructions({
         requestContext,
@@ -19512,7 +19213,7 @@ ${errorMessages}`,
    * ```
    */
   getDefaultGenerateOptionsLegacy({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext()
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext()
   } = {}) {
     if (typeof this.#defaultGenerateOptionsLegacy !== "function") {
       return this.#defaultGenerateOptionsLegacy;
@@ -19547,7 +19248,7 @@ ${errorMessages}`,
    * ```
    */
   getDefaultStreamOptionsLegacy({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext()
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext()
   } = {}) {
     if (typeof this.#defaultStreamOptionsLegacy !== "function") {
       return this.#defaultStreamOptionsLegacy;
@@ -19581,7 +19282,7 @@ ${errorMessages}`,
    * console.log(options.maxSteps); // 5
    * ```
    */
-  getDefaultOptions({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
+  getDefaultOptions({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     if (typeof this.#defaultOptions !== "function") {
       return this.#defaultOptions;
     }
@@ -19617,7 +19318,7 @@ ${errorMessages}`,
    * console.log(options.completion?.scorers); // [testsScorer, buildScorer]
    * ```
    */
-  getDefaultNetworkOptions({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
+  getDefaultNetworkOptions({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     if (typeof this.#defaultNetworkOptions !== "function") {
       return this.#defaultNetworkOptions;
     }
@@ -19650,9 +19351,9 @@ ${errorMessages}`,
    * console.log(Object.keys(tools)); // ['calculator', 'weather']
    * ```
    */
-  listTools({ requestContext = new chunkVDKWYUGC_cjs.RequestContext() } = {}) {
+  listTools({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkQNXY3J6B_cjs.ensureToolProperties(this.#tools);
+      return chunkGCRPNAAR_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       requestContext,
@@ -19673,7 +19374,7 @@ ${errorMessages}`,
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkQNXY3J6B_cjs.ensureToolProperties(tools);
+      return chunkGCRPNAAR_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -19688,7 +19389,7 @@ ${errorMessages}`,
    * ```
    */
   getLLM({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext(),
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext(),
     model
   } = {}) {
     const modelToUse = this.getModel({ modelConfig: model, requestContext });
@@ -19705,7 +19406,7 @@ ${errorMessages}`,
           });
         });
       } else {
-        llm = new chunkPKORY4ZZ_cjs.MastraLLMV1({
+        llm = new chunkOOTLMVNN_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -19730,7 +19431,7 @@ ${errorMessages}`,
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkWU2P7XOU_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkPP4G2TZZ_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -19761,7 +19462,7 @@ ${errorMessages}`,
    * ```
    */
   getModel({
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext(),
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext(),
     modelConfig = this.model
   } = {}) {
     if (!Array.isArray(modelConfig)) return this.resolveModelConfig(modelConfig, requestContext);
@@ -19793,7 +19494,7 @@ ${errorMessages}`,
    * }
    * ```
    */
-  async getModelList(requestContext = new chunkVDKWYUGC_cjs.RequestContext()) {
+  async getModelList(requestContext = new chunk5WBEMKE2_cjs.RequestContext()) {
     if (!Array.isArray(this.model)) {
       return null;
     }
@@ -19824,6 +19525,19 @@ ${errorMessages}`,
     this.model = Array.isArray(this.#originalModel) ? [...this.#originalModel] : this.#originalModel;
     this.logger.debug(`[Agents:${this.name}] Model reset to original.`, { model: this.model, name: this.name });
   }
+  /**
+   * Returns a snapshot of the raw field values that may be overridden by stored config.
+   * Used by the editor to save/restore code defaults externally.
+   * @internal
+   */
+  __getOverridableFields() {
+    return {
+      instructions: this.#instructions,
+      model: this.model,
+      tools: this.#tools,
+      workspace: this.#workspace
+    };
+  }
   reorderModels(modelIds) {
     if (!Array.isArray(this.model)) {
       this.logger.warn(`[Agents:${this.name}] model is not an array`);
@@ -19937,14 +19651,14 @@ ${errorMessages}`,
   }
   async generateTitleFromUserMessage({
     message,
-    requestContext = new chunkVDKWYUGC_cjs.RequestContext(),
+    requestContext = new chunk5WBEMKE2_cjs.RequestContext(),
     model,
     instructions,
     ...rest
   }) {
     const observabilityContext = chunk4UOWNFAL_cjs.resolveObservabilityContext(rest);
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunk3ZF7IC6Q_cjs.MessageList().add(message, "user").get.all.aiV5.ui().at(-1);
+    const normMessage = new chunkYZMSJKAK_cjs.MessageList().add(message, "user").get.all.aiV5.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -19967,7 +19681,7 @@ ${errorMessages}`,
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (isSupportedLanguageModel(llm.getModel())) {
-      const messageList = new chunk3ZF7IC6Q_cjs.MessageList().add(
+      const messageList = new chunkYZMSJKAK_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -20020,7 +19734,7 @@ ${errorMessages}`,
   async genTitle(userMessage, requestContext, observabilityContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunk3ZF7IC6Q_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkYZMSJKAK_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -20101,7 +19815,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkQNXY3J6B_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkGCRPNAAR_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -20130,7 +19844,7 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = chunk4P35AVPE_cjs.createWorkspaceTools(workspace);
+    const workspaceTools = chunkMEMYFFOL_cjs.createWorkspaceTools(workspace);
     if (Object.keys(workspaceTools).length > 0) {
       this.logger.debug(`[Agent:${this.name}] - Adding workspace tools: ${Object.keys(workspaceTools).join(", ")}`, {
         runId
@@ -20151,12 +19865,65 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkQNXY3J6B_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkGCRPNAAR_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedWorkspaceTools[toolName] = convertedToCoreTool;
       }
     }
     return convertedWorkspaceTools;
   }
+  /**
+   * Returns skill tools (skill, skill_search, skill_read) when the workspace
+   * has skills configured. These are added at the Agent level (like workspace
+   * tools) rather than inside a processor, so they persist across turns and
+   * survive serialization across tool-approval pauses.
+   * @internal
+   */
+  async listSkillTools({
+    runId,
+    resourceId,
+    threadId,
+    requestContext,
+    mastraProxy,
+    autoResumeSuspendedTools,
+    ...rest
+  }) {
+    const observabilityContext = chunk4UOWNFAL_cjs.resolveObservabilityContext(rest);
+    let convertedSkillTools = {};
+    if (this._agentNetworkAppend) {
+      return convertedSkillTools;
+    }
+    const workspace = await this.getWorkspace({ requestContext });
+    if (!workspace?.skills) {
+      return convertedSkillTools;
+    }
+    const skillTools = chunkMEMYFFOL_cjs.createSkillTools(workspace.skills);
+    if (Object.keys(skillTools).length > 0) {
+      this.logger.debug(`[Agent:${this.name}] - Adding skill tools: ${Object.keys(skillTools).join(", ")}`, {
+        runId
+      });
+      for (const [toolName, tool2] of Object.entries(skillTools)) {
+        const toolObj = tool2;
+        const options = {
+          name: toolName,
+          runId,
+          threadId,
+          resourceId,
+          logger: this.logger,
+          mastra: mastraProxy,
+          agentName: this.name,
+          requestContext,
+          ...observabilityContext,
+          model: await this.getModel({ requestContext }),
+          tracingPolicy: this.#options?.tracingPolicy,
+          requireApproval: false
+          // Skill tools never require approval
+        };
+        const convertedToCoreTool = chunkGCRPNAAR_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        convertedSkillTools[toolName] = convertedToCoreTool;
+      }
+    }
+    return convertedSkillTools;
+  }
   /**
    * Executes input processors on the message list before LLM processing.
    * @internal
@@ -20364,7 +20131,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        return [k, chunkQNXY3J6B_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
+        return [k, chunkGCRPNAAR_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -20415,7 +20182,7 @@ ${errorMessages}`,
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkQNXY3J6B_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
+          const convertedToCoreTool = chunkGCRPNAAR_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -20461,7 +20228,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunkQNXY3J6B_cjs.makeCoreTool(toolRest, options, "client-tool", autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkGCRPNAAR_cjs.makeCoreTool(toolRest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -20504,7 +20271,7 @@ ${errorMessages}`,
           subAgentResourceId: z10.z.string().describe("The resource ID of the agent").optional()
         });
         const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
-        const toolObj = chunkD6HO5QAM_cjs.createTool({
+        const toolObj = chunkM26GEN4C_cjs.createTool({
           id: `agent-${agentName}`,
           description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
@@ -21063,7 +20830,7 @@ ${effectiveInstructions}`;
           ...observabilityContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkQNXY3J6B_cjs.makeCoreTool(
+        convertedAgentTools[`agent-${agentName}`] = chunkGCRPNAAR_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -21096,7 +20863,7 @@ ${effectiveInstructions}`;
           inputData: workflow.inputSchema ?? z10.z.object({}).passthrough(),
           ...workflow.stateSchema ? { initialState: workflow.stateSchema } : {}
         });
-        const toolObj = chunkD6HO5QAM_cjs.createTool({
+        const toolObj = chunkM26GEN4C_cjs.createTool({
           id: `workflow-${workflowName}`,
           description: workflow.description || `Workflow: ${workflowName}`,
           inputSchema: extendedInputSchema,
@@ -21257,7 +21024,7 @@ ${effectiveInstructions}`;
           ...observabilityContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkQNXY3J6B_cjs.makeCoreTool(
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkGCRPNAAR_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -21289,7 +21056,7 @@ ${effectiveInstructions}`;
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkQNXY3J6B_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkGCRPNAAR_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -21359,6 +21126,15 @@ ${effectiveInstructions}`;
       mastraProxy,
       autoResumeSuspendedTools
     });
+    const skillTools = await this.listSkillTools({
+      runId,
+      resourceId,
+      threadId,
+      requestContext,
+      ...observabilityContext,
+      mastraProxy,
+      autoResumeSuspendedTools
+    });
     const allTools = {
       ...assignedTools,
       ...memoryTools,
@@ -21366,7 +21142,8 @@ ${effectiveInstructions}`;
       ...clientSideTools,
       ...agentTools,
       ...workflowTools,
-      ...workspaceTools
+      ...workspaceTools,
+      ...skillTools
     };
     return this.formatTools(allTools);
   }
@@ -21541,7 +21318,7 @@ ${effectiveInstructions}`;
         throw mastraError;
       }
       let headers;
-      if (resolvedModel instanceof chunkWU2P7XOU_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunkPP4G2TZZ_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -21587,7 +21364,7 @@ ${effectiveInstructions}`;
           throw mastraError;
         }
         let headers;
-        if (model2 instanceof chunkWU2P7XOU_cjs.ModelRouterLanguageModel) {
+        if (model2 instanceof chunkPP4G2TZZ_cjs.ModelRouterLanguageModel) {
           headers = model2.config?.headers;
         }
         return {
@@ -21617,9 +21394,9 @@ ${effectiveInstructions}`;
         }
       }
     }
-    const requestContext = options.requestContext || new chunkVDKWYUGC_cjs.RequestContext();
-    const resourceIdFromContext = requestContext.get(chunkVDKWYUGC_cjs.MASTRA_RESOURCE_ID_KEY);
-    const threadIdFromContext = requestContext.get(chunkVDKWYUGC_cjs.MASTRA_THREAD_ID_KEY);
+    const requestContext = options.requestContext || new chunk5WBEMKE2_cjs.RequestContext();
+    const resourceIdFromContext = requestContext.get(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY);
+    const threadIdFromContext = requestContext.get(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY);
     const threadFromArgs = threadIdFromContext ? { id: threadIdFromContext } : resolveThreadIdFromArgs({
       memory: {
         ...options.memory,
@@ -21645,7 +21422,7 @@ ${effectiveInstructions}`;
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunkQNXY3J6B_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunkGCRPNAAR_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -21914,7 +21691,7 @@ ${effectiveInstructions}`;
     });
   }
   async network(messages, options) {
-    const requestContextToUse = options?.requestContext || new chunkVDKWYUGC_cjs.RequestContext();
+    const requestContextToUse = options?.requestContext || new chunk5WBEMKE2_cjs.RequestContext();
     const defaultNetworkOptions = await this.getDefaultNetworkOptions({ requestContext: requestContextToUse });
     const mergedOptions = {
       ...defaultNetworkOptions,
@@ -21924,8 +21701,8 @@ ${effectiveInstructions}`;
       completion: { ...defaultNetworkOptions?.completion, ...options?.completion }
     };
     const runId = mergedOptions?.runId || this.#mastra?.generateId() || crypto2.randomUUID();
-    const resourceIdFromContext = requestContextToUse.get(chunkVDKWYUGC_cjs.MASTRA_RESOURCE_ID_KEY);
-    const threadIdFromContext = requestContextToUse.get(chunkVDKWYUGC_cjs.MASTRA_THREAD_ID_KEY);
+    const resourceIdFromContext = requestContextToUse.get(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY);
+    const threadIdFromContext = requestContextToUse.get(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY);
     const threadId = threadIdFromContext || (typeof mergedOptions?.memory?.thread === "string" ? mergedOptions?.memory?.thread : mergedOptions?.memory?.thread?.id);
     const resourceId = resourceIdFromContext || mergedOptions?.memory?.resource;
     return await networkLoop({
@@ -21978,7 +21755,7 @@ ${effectiveInstructions}`;
    */
   async resumeNetwork(resumeData, options) {
     const runId = options.runId;
-    const requestContextToUse = options?.requestContext || new chunkVDKWYUGC_cjs.RequestContext();
+    const requestContextToUse = options?.requestContext || new chunk5WBEMKE2_cjs.RequestContext();
     const defaultNetworkOptions = await this.getDefaultNetworkOptions({ requestContext: requestContextToUse });
     const mergedOptions = {
       ...defaultNetworkOptions,
@@ -21987,8 +21764,8 @@ ${effectiveInstructions}`;
       routing: { ...defaultNetworkOptions?.routing, ...options?.routing },
       completion: { ...defaultNetworkOptions?.completion, ...options?.completion }
     };
-    const resourceIdFromContext = requestContextToUse.get(chunkVDKWYUGC_cjs.MASTRA_RESOURCE_ID_KEY);
-    const threadIdFromContext = requestContextToUse.get(chunkVDKWYUGC_cjs.MASTRA_THREAD_ID_KEY);
+    const resourceIdFromContext = requestContextToUse.get(chunk5WBEMKE2_cjs.MASTRA_RESOURCE_ID_KEY);
+    const threadIdFromContext = requestContextToUse.get(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY);
     const threadId = threadIdFromContext || (typeof mergedOptions?.memory?.thread === "string" ? mergedOptions?.memory?.thread : mergedOptions?.memory?.thread?.id);
     const resourceId = resourceIdFromContext || mergedOptions?.memory?.resource;
     return await networkLoop({
@@ -22058,7 +21835,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkQNXY3J6B_cjs.deepMerge(
+    const mergedOptions = chunkGCRPNAAR_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -22112,7 +21889,7 @@ ${effectiveInstructions}`;
     }
     const fullOutput = await result.result.getFullOutput();
     const error = fullOutput.error;
-    if (fullOutput.finishReason === "error" && error) {
+    if (error) {
       throw error;
     }
     return fullOutput;
@@ -22122,7 +21899,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    const mergedOptions = chunkQNXY3J6B_cjs.deepMerge(
+    const mergedOptions = chunkGCRPNAAR_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -22180,7 +21957,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    let mergedStreamOptions = chunkQNXY3J6B_cjs.deepMerge(
+    let mergedStreamOptions = chunkGCRPNAAR_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -22254,7 +22031,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkQNXY3J6B_cjs.deepMerge(
+    const mergedOptions = chunkGCRPNAAR_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -22316,7 +22093,7 @@ ${effectiveInstructions}`;
     }
     const fullOutput = await result.result.getFullOutput();
     const error = fullOutput.error;
-    if (fullOutput.finishReason === "error" && error) {
+    if (error) {
       throw error;
     }
     return fullOutput;
@@ -24468,7 +24245,7 @@ var ToolSearchProcessor = class {
       minScore: options.search?.minScore ?? 0
     };
     this.ttl = options.ttl ?? 36e5;
-    this.bm25Index = new chunk4P35AVPE_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
+    this.bm25Index = new chunkMEMYFFOL_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
     this.indexTools();
     if (this.ttl > 0) {
       this.scheduleCleanup();
@@ -24478,7 +24255,7 @@ var ToolSearchProcessor = class {
    * Get the thread ID from the request context, or use 'default' as fallback.
    */
   getThreadId(args) {
-    return args.requestContext?.get(chunkVDKWYUGC_cjs.MASTRA_THREAD_ID_KEY) || "default";
+    return args.requestContext?.get(chunk5WBEMKE2_cjs.MASTRA_THREAD_ID_KEY) || "default";
   }
   /**
    * Get the set of loaded tool names for the current thread.
@@ -24633,7 +24410,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 = chunkD6HO5QAM_cjs.createTool({
+    const searchTool = chunkM26GEN4C_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({
@@ -24663,7 +24440,7 @@ var ToolSearchProcessor = class {
         };
       }
     });
-    const loadTool = chunkD6HO5QAM_cjs.createTool({
+    const loadTool = chunkM26GEN4C_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({
@@ -25216,7 +24993,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunk3ZF7IC6Q_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkYZMSJKAK_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -25658,7 +25435,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkWU2P7XOU_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkPP4G2TZZ_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -25697,7 +25474,7 @@ https://mastra.ai/en/docs/memory/overview`
   }
   setEmbedder(embedder, embedderOptions) {
     if (typeof embedder === "string") {
-      this.embedder = new chunkWU2P7XOU_cjs.ModelRouterEmbeddingModel(embedder);
+      this.embedder = new chunkPP4G2TZZ_cjs.ModelRouterEmbeddingModel(embedder);
     } else {
       this.embedder = embedder;
     }
@@ -25793,7 +25570,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkQNXY3J6B_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkGCRPNAAR_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -26143,7 +25920,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkZBESCKPX_cjs.InMemoryStore(),
+      storage: storage || new chunk7AHCLTZZ_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -26221,7 +25998,7 @@ var MockMemory = class extends MastraMemory {
       return {};
     }
     return {
-      updateWorkingMemory: chunkD6HO5QAM_cjs.createTool({
+      updateWorkingMemory: chunkM26GEN4C_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() }),
@@ -26453,5 +26230,5 @@ exports.validateStepRequestContext = validateStepRequestContext;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-YIJZBU54.cjs.map
-//# sourceMappingURL=chunk-YIJZBU54.cjs.map
+//# sourceMappingURL=chunk-BCSVBOAN.cjs.map
+//# sourceMappingURL=chunk-BCSVBOAN.cjs.map