@mastra/core 1.21.0-alpha.2 → 1.22.0-alpha.0

package/dist/{chunk-DRWYPRD7.cjs → chunk-QF4KRWYU.cjs}

@@ -1,23 +1,23 @@
 'use strict';
 
+var chunkAVRRH42W_cjs = require('./chunk-AVRRH42W.cjs');
 var chunkX7SJO3JJ_cjs = require('./chunk-X7SJO3JJ.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
-var chunkYPMF3QLA_cjs = require('./chunk-YPMF3QLA.cjs');
-var chunkV2MOZKZ2_cjs = require('./chunk-V2MOZKZ2.cjs');
-var chunkUWYGTSWV_cjs = require('./chunk-UWYGTSWV.cjs');
+var chunkK7TAXUW5_cjs = require('./chunk-K7TAXUW5.cjs');
+var chunkDOPULILR_cjs = require('./chunk-DOPULILR.cjs');
 var chunkY3APFUXZ_cjs = require('./chunk-Y3APFUXZ.cjs');
 var chunkCFMZZDO2_cjs = require('./chunk-CFMZZDO2.cjs');
-var chunkOQDRPRKM_cjs = require('./chunk-OQDRPRKM.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkDGX6FWSX_cjs = require('./chunk-DGX6FWSX.cjs');
-var chunkMBWY7AOA_cjs = require('./chunk-MBWY7AOA.cjs');
+var chunkJZBAUINL_cjs = require('./chunk-JZBAUINL.cjs');
+var chunkTDTG2WDG_cjs = require('./chunk-TDTG2WDG.cjs');
 var chunk22FSGATE_cjs = require('./chunk-22FSGATE.cjs');
-var chunkOMKFSCBO_cjs = require('./chunk-OMKFSCBO.cjs');
+var chunkOQDRPRKM_cjs = require('./chunk-OQDRPRKM.cjs');
+var chunkZTC3TLFM_cjs = require('./chunk-ZTC3TLFM.cjs');
 var chunkW6PDQCCN_cjs = require('./chunk-W6PDQCCN.cjs');
-var chunkDLBIUFZL_cjs = require('./chunk-DLBIUFZL.cjs');
 var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
 var chunkLDLHW3QN_cjs = require('./chunk-LDLHW3QN.cjs');
 var chunkXB4FLS7A_cjs = require('./chunk-XB4FLS7A.cjs');
+var chunkDLBIUFZL_cjs = require('./chunk-DLBIUFZL.cjs');
 var chunk5WBEMKE2_cjs = require('./chunk-5WBEMKE2.cjs');
 var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
 var chunkC5WSRMJD_cjs = require('./chunk-C5WSRMJD.cjs');
@@ -1306,7 +1306,7 @@ var ProcessorRunner = class _ProcessorRunner {
           writer
         });
         const mutations = messageList.stopRecording();
-        if (processResult instanceof chunkUWYGTSWV_cjs.MessageList) {
+        if (processResult instanceof chunkDOPULILR_cjs.MessageList) {
           if (processResult !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -1600,7 +1600,7 @@ var ProcessorRunner = class _ProcessorRunner {
           retryCount
         });
         let mutations;
-        if (result instanceof chunkUWYGTSWV_cjs.MessageList) {
+        if (result instanceof chunkDOPULILR_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -1970,7 +1970,7 @@ var ProcessorRunner = class _ProcessorRunner {
           writer
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunkUWYGTSWV_cjs.MessageList) {
+        if (result instanceof chunkDOPULILR_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -2042,7 +2042,7 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunkUWYGTSWV_cjs.MessageList) {
+    if (result instanceof chunkDOPULILR_cjs.MessageList) {
       if (result !== messageList) {
         throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
@@ -2077,7 +2077,7 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkDGX6FWSX_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunkJZBAUINL_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
           throw new chunk4U7ZLI36_cjs.MastraError({
@@ -3284,7 +3284,7 @@ var MastraModelOutput = class extends chunkC5WSRMJD_cjs.MastraBase {
                   );
                   const responseMessages = self.messageList.get.response.aiV4.core();
                   const lastResponseMessage = responseMessages[responseMessages.length - 1];
-                  const outputText = lastResponseMessage ? chunkUWYGTSWV_cjs.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkDOPULILR_cjs.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
@@ -4656,7 +4656,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkUWYGTSWV_cjs.DefaultGeneratedFile({
+          file: new chunkDOPULILR_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -4664,7 +4664,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkUWYGTSWV_cjs.DefaultGeneratedFileWithType({
+        file: new chunkDOPULILR_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -5503,7 +5503,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkOMKFSCBO_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkZTC3TLFM_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -6061,7 +6061,7 @@ async function executeLoop(engine, params) {
       options: {
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: '${entry.loopType}'`,
-        input: chunkOMKFSCBO_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunkZTC3TLFM_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         },
@@ -8699,7 +8699,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 chunkUWYGTSWV_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
+        messageList: messageList ?? (Array.isArray(messages) ? new chunkDOPULILR_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
         stepNumber,
         systemMessages,
         streamParts,
@@ -8756,7 +8756,7 @@ function createStepFromProcessor(processor) {
                 messageList: checkedMessageList,
                 systemMessages: systemMessages ?? []
               });
-              if (result instanceof chunkUWYGTSWV_cjs.MessageList) {
+              if (result instanceof chunkDOPULILR_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8939,7 +8939,7 @@ function createStepFromProcessor(processor) {
                 messageList: passThrough.messageList,
                 result: passThrough.result ?? defaultResult
               });
-              if (result instanceof chunkUWYGTSWV_cjs.MessageList) {
+              if (result instanceof chunkDOPULILR_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -9006,7 +9006,7 @@ function createStepFromProcessor(processor) {
                 systemMessages: systemMessages ?? [],
                 steps: steps ?? []
               });
-              if (result instanceof chunkUWYGTSWV_cjs.MessageList) {
+              if (result instanceof chunkDOPULILR_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -11517,7 +11517,7 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const resolvedModel = await chunkDGX6FWSX_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const resolvedModel = await chunkJZBAUINL_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
     const judgeModel = resolvedModel.modelId;
     const judge = new Agent({
       id: "judge",
@@ -11748,7 +11748,7 @@ async function runDefaultCompletionCheck(agent, context, streamContext, abortSig
 Primitives already executed: ${completedPrimitives.join(", ")}` : "";
   const completionPrompt = `
     The ${context.selectedPrimitive.type} ${context.selectedPrimitive.id} has contributed to the task.
-    This is the result: ${chunkOMKFSCBO_cjs.safeStringify(context.primitiveResult)}
+    This is the result: ${chunkZTC3TLFM_cjs.safeStringify(context.primitiveResult)}
     
     ${completedSection}
 
@@ -11844,7 +11844,7 @@ async function generateFinalResult(agent, context, streamContext, abortSignal, o
     Original task: ${context.originalTask}
 
     The ${context.selectedPrimitive.type} ${context.selectedPrimitive.id} produced this result:
-    ${chunkOMKFSCBO_cjs.safeStringify(context.primitiveResult)}
+    ${chunkZTC3TLFM_cjs.safeStringify(context.primitiveResult)}
 
     IMPORTANT: If the above result is from an AGENT PRIMITIVE and it is a suitable final result itself considering the original task, then finalResult should be an empty string or undefined.
     You should evaluate if the above result is comprehensive enough to accomplish the user's original task.
@@ -11902,7 +11902,7 @@ async function generateStructuredFinalResult(agent, context, structuredOutputOpt
     Original task: ${context.originalTask}
 
     The ${context.selectedPrimitive.type} ${context.selectedPrimitive.id} produced this result:
-    ${chunkOMKFSCBO_cjs.safeStringify(context.primitiveResult)}
+    ${chunkZTC3TLFM_cjs.safeStringify(context.primitiveResult)}
 
     Based on the task and result above, generate a structured response according to the provided schema.
     Use the conversation history and primitive results to craft the response.
@@ -13002,7 +13002,7 @@ function createLLMExecutionStep({
               const convertedTools = {};
               for (const [name, tool2] of Object.entries(currentStep.tools)) {
                 if (chunkLDLHW3QN_cjs.isMastraTool(tool2)) {
-                  convertedTools[name] = chunkOMKFSCBO_cjs.makeCoreTool(
+                  convertedTools[name] = chunkZTC3TLFM_cjs.makeCoreTool(
                     tool2,
                     {
                       name,
@@ -13160,9 +13160,19 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
               modelSettings: { ...currentStep.modelSettings, maxRetries: modelConfig.maxRetries },
               includeRawChunks,
               structuredOutput: currentStep.structuredOutput,
-              // Merge headers: modelConfig headers first, then modelSettings overrides them
-              // Only create object if there are actual headers to avoid passing empty {}
-              headers: modelHeaders || currentStep.modelSettings?.headers ? { ...modelHeaders, ...currentStep.modelSettings?.headers } : void 0,
+              // Merge headers: memory context first, then modelConfig headers, then modelSettings overrides
+              // x-thread-id / x-resource-id enable server-side memory enrichment (e.g. Memory Gateway)
+              headers: (() => {
+                const memoryHeaders = {};
+                if (_internal?.threadId) memoryHeaders["x-thread-id"] = _internal.threadId;
+                if (_internal?.resourceId) memoryHeaders["x-resource-id"] = _internal.resourceId;
+                const merged = {
+                  ...memoryHeaders,
+                  ...modelHeaders,
+                  ...currentStep.modelSettings?.headers
+                };
+                return Object.keys(merged).length > 0 ? merged : void 0;
+              })(),
               methodType,
               generateId: _internal?.generateId,
               onResult: ({
@@ -13214,7 +13224,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }
         });
         let transportResolver;
-        if (currentStep.model instanceof chunkDGX6FWSX_cjs.ModelRouterLanguageModel) {
+        if (currentStep.model instanceof chunkJZBAUINL_cjs.ModelRouterLanguageModel) {
           const routerModel = currentStep.model;
           transportResolver = () => routerModel._getStreamTransport();
         }
@@ -13581,7 +13591,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
               toolInvocation: {
                 state: "result",
                 toolCallId: toolCall.toolCallId,
-                toolName: chunkUWYGTSWV_cjs.sanitizeToolName(toolCall.toolName),
+                toolName: chunkDOPULILR_cjs.sanitizeToolName(toolCall.toolName),
                 args: toolCall.args,
                 result: toolCall.error?.message ?? toolCall.error
               },
@@ -13616,7 +13626,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
                   toolInvocation: {
                     state: "result",
                     toolCallId: toolCall.toolCallId,
-                    toolName: chunkUWYGTSWV_cjs.sanitizeToolName(toolCall.toolName),
+                    toolName: chunkDOPULILR_cjs.sanitizeToolName(toolCall.toolName),
                     args: toolCall.args,
                     result: toolCall.result
                   },
@@ -13673,7 +13683,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
               toolInvocation: {
                 state: "result",
                 toolCallId: toolCall.toolCallId,
-                toolName: chunkUWYGTSWV_cjs.sanitizeToolName(toolCall.toolName),
+                toolName: chunkDOPULILR_cjs.sanitizeToolName(toolCall.toolName),
                 args: toolCall.args,
                 result: toolCall.result
               },
@@ -14110,7 +14120,7 @@ function createToolCallStep({
           }
         }
         const rawResult = await tool2.execute(args, toolOptions);
-        const result = chunkOMKFSCBO_cjs.ensureSerializable(rawResult);
+        const result = chunkZTC3TLFM_cjs.ensureSerializable(rawResult);
         if (tool2 && "onOutput" in tool2 && typeof tool2.onOutput === "function") {
           try {
             await tool2.onOutput({
@@ -14970,7 +14980,7 @@ var MastraLLMVNext = class extends chunkC5WSRMJD_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 chunkOMKFSCBO_cjs.delay(10 * 1e3);
+              await chunkZTC3TLFM_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -15246,7 +15256,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkUWYGTSWV_cjs.MessageList({
+    const messageList = new chunkDOPULILR_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -15303,7 +15313,7 @@ async function saveMessagesWithProcessors(memory, messages, processorRunner, con
     await memory.saveMessages({ messages });
     return;
   }
-  const messageList = new chunkUWYGTSWV_cjs.MessageList();
+  const messageList = new chunkDOPULILR_cjs.MessageList();
   for (const msg of messages) {
     messageList.add(msg, "response");
   }
@@ -16741,7 +16751,7 @@ async function networkLoop({
               "resumeData": "string"
             }
           `;
-              const messageList = new chunkUWYGTSWV_cjs.MessageList();
+              const messageList = new chunkDOPULILR_cjs.MessageList();
               messageList.addSystem(systemInstructions);
               messageList.add(task, "user");
               const result = llm.stream({
@@ -17382,7 +17392,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunkUWYGTSWV_cjs.MessageList({
+        let messageList = new chunkDOPULILR_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -17541,7 +17551,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkUWYGTSWV_cjs.MessageList({
+        const messageListResponses = new chunkDOPULILR_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -18717,7 +18727,7 @@ var prepareToolsStepOutputSchema = v4.z.object({
 var prepareMemoryStepOutputSchema = v4.z.object({
   threadExists: v4.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: v4.z.instanceof(chunkUWYGTSWV_cjs.MessageList),
+  messageList: v4.z.instanceof(chunkDOPULILR_cjs.MessageList),
   /** Shared processor states map that persists across loop iterations for both input and output processors */
   processorStates: v4.z.instanceof(Map),
   /** Tripwire data when input processor triggered abort */
@@ -18759,7 +18769,7 @@ function createPrepareMemoryStep({
     execute: async ({ ...rest }) => {
       const observabilityContext = chunkW6PDQCCN_cjs.resolveObservabilityContext(rest);
       const thread = threadFromArgs;
-      const messageList = new chunkUWYGTSWV_cjs.MessageList({
+      const messageList = new chunkDOPULILR_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -18785,7 +18795,7 @@ function createPrepareMemoryStep({
         }
         return {
           threadExists: false,
-          thread: void 0,
+          thread,
           messageList,
           processorStates,
           tripwire: tripwire2
@@ -19997,7 +20007,7 @@ ${errorMessages}`,
    */
   listTools({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkOMKFSCBO_cjs.ensureToolProperties(this.#tools);
+      return chunkZTC3TLFM_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       requestContext,
@@ -20017,7 +20027,7 @@ ${errorMessages}`,
         this.logger.trackException(mastraError);
         throw mastraError;
       }
-      return chunkOMKFSCBO_cjs.ensureToolProperties(tools);
+      return chunkZTC3TLFM_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -20065,7 +20075,7 @@ ${errorMessages}`,
             });
           });
         } else {
-          llm = new chunkMBWY7AOA_cjs.MastraLLMV1({
+          llm = new chunkTDTG2WDG_cjs.MastraLLMV1({
             model: modelInfo,
             mastra: this.#mastra,
             options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -20091,7 +20101,7 @@ ${errorMessages}`,
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkDGX6FWSX_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkJZBAUINL_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -20411,7 +20421,7 @@ ${errorMessages}`,
   }) {
     const observabilityContext = chunkW6PDQCCN_cjs.resolveObservabilityContext(rest);
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkUWYGTSWV_cjs.MessageList().add(message, "user").get.all.aiV5.ui().at(-1);
+    const normMessage = new chunkDOPULILR_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)}`);
     }
@@ -20434,7 +20444,7 @@ ${errorMessages}`,
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (isSupportedLanguageModel(llm.getModel())) {
-      const messageList = new chunkUWYGTSWV_cjs.MessageList().add(
+      const messageList = new chunkDOPULILR_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -20487,7 +20497,7 @@ ${errorMessages}`,
   async genTitle(userMessage, requestContext, observabilityContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkUWYGTSWV_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkDOPULILR_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -20563,7 +20573,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkOMKFSCBO_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkZTC3TLFM_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -20592,7 +20602,7 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = chunkYPMF3QLA_cjs.createWorkspaceTools(workspace);
+    const workspaceTools = chunkAVRRH42W_cjs.createWorkspaceTools(workspace);
     if (Object.keys(workspaceTools).length > 0) {
       this.logger.debug("Adding workspace tools", { agent: this.name, tools: Object.keys(workspaceTools), runId });
       for (const [toolName, tool2] of Object.entries(workspaceTools)) {
@@ -20613,7 +20623,7 @@ ${errorMessages}`,
           requireApproval: toolObj.requireApproval,
           workspace
         };
-        const convertedToCoreTool = chunkOMKFSCBO_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkZTC3TLFM_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedWorkspaceTools[toolName] = convertedToCoreTool;
       }
     }
@@ -20644,7 +20654,7 @@ ${errorMessages}`,
     if (!workspace?.skills) {
       return convertedSkillTools;
     }
-    const skillTools = chunkYPMF3QLA_cjs.createSkillTools(workspace.skills);
+    const skillTools = chunkAVRRH42W_cjs.createSkillTools(workspace.skills);
     if (Object.keys(skillTools).length > 0) {
       this.logger.debug("Adding skill tools", { agent: this.name, tools: Object.keys(skillTools), runId });
       for (const [toolName, tool2] of Object.entries(skillTools)) {
@@ -20666,7 +20676,7 @@ ${errorMessages}`,
           // Skill tools never require approval
           workspace
         };
-        const convertedToCoreTool = chunkOMKFSCBO_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkZTC3TLFM_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedSkillTools[toolName] = convertedToCoreTool;
       }
     }
@@ -20899,7 +20909,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        return [k, chunkOMKFSCBO_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
+        return [k, chunkZTC3TLFM_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -20953,7 +20963,7 @@ ${errorMessages}`,
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkOMKFSCBO_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
+          const convertedToCoreTool = chunkZTC3TLFM_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -20998,7 +21008,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunkOMKFSCBO_cjs.makeCoreTool(toolRest, options, "client-tool", autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkZTC3TLFM_cjs.makeCoreTool(toolRest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -21680,7 +21690,7 @@ ${effectiveInstructions}`;
           ...observabilityContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkOMKFSCBO_cjs.makeCoreTool(
+        convertedAgentTools[`agent-${agentName}`] = chunkZTC3TLFM_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -21901,7 +21911,7 @@ ${effectiveInstructions}`;
           ...observabilityContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkOMKFSCBO_cjs.makeCoreTool(
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkZTC3TLFM_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -21933,7 +21943,7 @@ ${effectiveInstructions}`;
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkOMKFSCBO_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkZTC3TLFM_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -22185,7 +22195,7 @@ ${effectiveInstructions}`;
       const resolvedModel = await this.resolveModelConfig(selection, requestContext);
       this.assertSupportsPreparedModels(resolvedModel);
       let headers;
-      if (resolvedModel instanceof chunkDGX6FWSX_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunkJZBAUINL_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -22217,7 +22227,7 @@ ${effectiveInstructions}`;
           throw mastraError;
         }
         let headers;
-        if (model instanceof chunkDGX6FWSX_cjs.ModelRouterLanguageModel) {
+        if (model instanceof chunkJZBAUINL_cjs.ModelRouterLanguageModel) {
           headers = model.config?.headers;
         }
         return {
@@ -22259,13 +22269,15 @@ ${effectiveInstructions}`;
     });
     const resourceId = resourceIdFromContext || options.memory?.resource || snapshotMemoryInfo?.resourceId;
     const memoryConfig = options.memory?.options;
-    if (resourceId && threadFromArgs && !this.hasOwnMemory()) {
-      this.logger.warn("No memory is configured but resourceId and threadId were passed in args", { agent: this.name });
-    }
     const llm = await this.getLLM({
       requestContext,
       model: options.model
     });
+    const resolvedModel = llm.getModel();
+    const isGatewayModel = resolvedModel instanceof chunkJZBAUINL_cjs.ModelRouterLanguageModel && resolvedModel.gatewayId === "mastra";
+    if (resourceId && threadFromArgs && !this.hasOwnMemory() && !isGatewayModel) {
+      this.logger.warn("No memory is configured but resourceId and threadId were passed in args", { agent: this.name });
+    }
     if ("structuredOutput" in options && options.structuredOutput?.schema && !options.structuredOutput?.model) {
       const structuredOutputModel = llm.getModel();
       const targetProvider = structuredOutputModel.provider;
@@ -22673,7 +22685,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkOMKFSCBO_cjs.deepMerge(
+    const mergedOptions = chunkZTC3TLFM_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -22744,7 +22756,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    const mergedOptions = chunkOMKFSCBO_cjs.deepMerge(
+    const mergedOptions = chunkZTC3TLFM_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -22809,7 +22821,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    let mergedStreamOptions = chunkOMKFSCBO_cjs.deepMerge(
+    let mergedStreamOptions = chunkZTC3TLFM_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -22875,7 +22887,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunkOMKFSCBO_cjs.deepMerge(
+    const mergedOptions = chunkZTC3TLFM_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -24501,7 +24513,7 @@ var TokenLimiterProcessor = class _TokenLimiterProcessor {
           return new TiktokenClass(this.customEncoding);
         });
       } else {
-        this.encoderPromise = chunkYPMF3QLA_cjs.getTiktoken();
+        this.encoderPromise = chunkAVRRH42W_cjs.getTiktoken();
       }
     }
     return this.encoderPromise;
@@ -25408,7 +25420,7 @@ var ToolSearchProcessor = class {
       minScore: options.search?.minScore ?? 0
     };
     this.ttl = options.ttl ?? 36e5;
-    this.bm25Index = new chunkYPMF3QLA_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
+    this.bm25Index = new chunkAVRRH42W_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
     this.indexTools();
     if (this.ttl > 0) {
       this.scheduleCleanup();
@@ -26190,7 +26202,7 @@ var WorkingMemory = class {
     return messageList;
   }
   generateEmptyFromSchemaInternal(schema) {
-    const result = chunkOMKFSCBO_cjs.generateEmptyFromSchema(schema);
+    const result = chunkZTC3TLFM_cjs.generateEmptyFromSchema(schema);
     return Object.keys(result).length > 0 ? result : null;
   }
   getWorkingMemoryToolInstruction({
@@ -26393,7 +26405,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunkUWYGTSWV_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkDOPULILR_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -26835,7 +26847,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkDGX6FWSX_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkJZBAUINL_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -26848,7 +26860,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
       }
       if (config.embedder) {
         if (typeof config.embedder === "string") {
-          this.embedder = new chunkDGX6FWSX_cjs.ModelRouterEmbeddingModel(config.embedder);
+          this.embedder = new chunkJZBAUINL_cjs.ModelRouterEmbeddingModel(config.embedder);
         } else {
           this.embedder = config.embedder;
         }
@@ -26888,7 +26900,7 @@ https://mastra.ai/en/docs/memory/overview`
   }
   setEmbedder(embedder, embedderOptions) {
     if (typeof embedder === "string") {
-      this.embedder = new chunkDGX6FWSX_cjs.ModelRouterEmbeddingModel(embedder);
+      this.embedder = new chunkJZBAUINL_cjs.ModelRouterEmbeddingModel(embedder);
     } else {
       this.embedder = embedder;
     }
@@ -26985,7 +26997,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkOMKFSCBO_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkZTC3TLFM_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -27337,7 +27349,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkV2MOZKZ2_cjs.InMemoryStore(),
+      storage: storage || new chunkK7TAXUW5_cjs.InMemoryStore(),
       options: {
         ...options,
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : options?.workingMemory,
@@ -27648,5 +27660,5 @@ exports.validateStepRequestContext = validateStepRequestContext;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-DRWYPRD7.cjs.map
-//# sourceMappingURL=chunk-DRWYPRD7.cjs.map
+//# sourceMappingURL=chunk-QF4KRWYU.cjs.map
+//# sourceMappingURL=chunk-QF4KRWYU.cjs.map