@mastra/core 1.16.0-alpha.2 → 1.16.0-alpha.4

package/dist/{chunk-2DPHD6NF.cjs → chunk-NTF7UIBI.cjs}

@@ -2,20 +2,20 @@
 
 var chunkZC4FJVJZ_cjs = require('./chunk-ZC4FJVJZ.cjs');
 var chunkZCBG4ZQT_cjs = require('./chunk-ZCBG4ZQT.cjs');
-var chunkKQ3SJZG5_cjs = require('./chunk-KQ3SJZG5.cjs');
-var chunkQ7EDK6IW_cjs = require('./chunk-Q7EDK6IW.cjs');
-var chunkO6O5MD7Q_cjs = require('./chunk-O6O5MD7Q.cjs');
+var chunkXW4B2RAG_cjs = require('./chunk-XW4B2RAG.cjs');
+var chunk6VYFRSNT_cjs = require('./chunk-6VYFRSNT.cjs');
+var chunkPCQBJ3NP_cjs = require('./chunk-PCQBJ3NP.cjs');
 var chunkY3APFUXZ_cjs = require('./chunk-Y3APFUXZ.cjs');
 var chunkCFMZZDO2_cjs = require('./chunk-CFMZZDO2.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkTQTUU6QD_cjs = require('./chunk-TQTUU6QD.cjs');
-var chunkKWQ4YIWP_cjs = require('./chunk-KWQ4YIWP.cjs');
+var chunk4THMANGC_cjs = require('./chunk-4THMANGC.cjs');
+var chunk7L2ICIDI_cjs = require('./chunk-7L2ICIDI.cjs');
 var chunk6BJ7XHRH_cjs = require('./chunk-6BJ7XHRH.cjs');
 var chunkOQDRPRKM_cjs = require('./chunk-OQDRPRKM.cjs');
-var chunk3XWXW2YI_cjs = require('./chunk-3XWXW2YI.cjs');
+var chunkRQBBPR64_cjs = require('./chunk-RQBBPR64.cjs');
 var chunkG5HKDGNT_cjs = require('./chunk-G5HKDGNT.cjs');
 var chunkKJBMTK5B_cjs = require('./chunk-KJBMTK5B.cjs');
-var chunkGYLHNAH7_cjs = require('./chunk-GYLHNAH7.cjs');
+var chunkK4NN2KQQ_cjs = require('./chunk-K4NN2KQQ.cjs');
 var chunkXB4FLS7A_cjs = require('./chunk-XB4FLS7A.cjs');
 var chunk5WBEMKE2_cjs = require('./chunk-5WBEMKE2.cjs');
 var chunk4U7ZLI36_cjs = require('./chunk-4U7ZLI36.cjs');
@@ -651,10 +651,10 @@ function prepareToolsAndToolChoice({
   return {
     tools: filteredTools.map(([name, tool2]) => {
       try {
-        if (chunkGYLHNAH7_cjs.isProviderDefinedTool(tool2)) {
+        if (chunkK4NN2KQQ_cjs.isProviderDefinedTool(tool2)) {
           return {
             type: providerToolType,
-            name: chunkGYLHNAH7_cjs.getProviderToolName(tool2.id),
+            name: chunkK4NN2KQQ_cjs.getProviderToolName(tool2.id),
             id: tool2.id,
             args: tool2.args ?? {}
           };
@@ -708,7 +708,7 @@ function prepareToolsAndToolChoice({
             const providerId = sdkTool.id;
             return {
               type: providerToolType,
-              name: providerId ? chunkGYLHNAH7_cjs.getProviderToolName(providerId) : name,
+              name: providerId ? chunkK4NN2KQQ_cjs.getProviderToolName(providerId) : name,
               id: providerId,
               args: sdkTool.args
             };
@@ -1296,7 +1296,7 @@ var ProcessorRunner = class _ProcessorRunner {
           writer
         });
         const mutations = messageList.stopRecording();
-        if (processResult instanceof chunkO6O5MD7Q_cjs.MessageList) {
+        if (processResult instanceof chunkPCQBJ3NP_cjs.MessageList) {
           if (processResult !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -1590,7 +1590,7 @@ var ProcessorRunner = class _ProcessorRunner {
           retryCount
         });
         let mutations;
-        if (result instanceof chunkO6O5MD7Q_cjs.MessageList) {
+        if (result instanceof chunkPCQBJ3NP_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -1961,7 +1961,7 @@ var ProcessorRunner = class _ProcessorRunner {
           writer
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunkO6O5MD7Q_cjs.MessageList) {
+        if (result instanceof chunkPCQBJ3NP_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunk4U7ZLI36_cjs.MastraError({
               category: "USER",
@@ -2034,7 +2034,7 @@ var ProcessorRunner = class _ProcessorRunner {
     processor,
     stepNumber
   }) {
-    if (result instanceof chunkO6O5MD7Q_cjs.MessageList) {
+    if (result instanceof chunkPCQBJ3NP_cjs.MessageList) {
       if (result !== messageList) {
         throw new chunk4U7ZLI36_cjs.MastraError({
           category: "USER",
@@ -2069,7 +2069,7 @@ var ProcessorRunner = class _ProcessorRunner {
       }
       const { model: _model, ...rest } = result;
       if (result.model) {
-        const resolvedModel = await chunkTQTUU6QD_cjs.resolveModelConfig(result.model);
+        const resolvedModel = await chunk4THMANGC_cjs.resolveModelConfig(result.model);
         const isSupported = isSupportedLanguageModel(resolvedModel);
         if (!isSupported) {
           throw new chunk4U7ZLI36_cjs.MastraError({
@@ -3276,7 +3276,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 ? chunkO6O5MD7Q_cjs.coreContentToString(lastResponseMessage.content) : "";
+                  const outputText = lastResponseMessage ? chunkPCQBJ3NP_cjs.coreContentToString(lastResponseMessage.content) : "";
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
@@ -4648,7 +4648,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkO6O5MD7Q_cjs.DefaultGeneratedFile({
+          file: new chunkPCQBJ3NP_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -4656,7 +4656,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkO6O5MD7Q_cjs.DefaultGeneratedFileWithType({
+        file: new chunkPCQBJ3NP_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -5495,7 +5495,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunk3XWXW2YI_cjs.removeUndefinedValues(result);
+        const formattedResult = chunkRQBBPR64_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -6053,7 +6053,7 @@ async function executeLoop(engine, params) {
       options: {
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: '${entry.loopType}'`,
-        input: chunk3XWXW2YI_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+        input: chunkRQBBPR64_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         },
@@ -8323,10 +8323,10 @@ function isAgent(input) {
   return input instanceof Agent;
 }
 function isToolStep(input) {
-  return input instanceof chunkGYLHNAH7_cjs.Tool;
+  return input instanceof chunkK4NN2KQQ_cjs.Tool;
 }
 function isStepParams(input) {
-  return input !== null && typeof input === "object" && "id" in input && "execute" in input && !(input instanceof Agent) && !(input instanceof chunkGYLHNAH7_cjs.Tool);
+  return input !== null && typeof input === "object" && "id" in input && "execute" in input && !(input instanceof Agent) && !(input instanceof chunkK4NN2KQQ_cjs.Tool);
 }
 function createStep(params, agentOrToolOptions) {
   if (isAgent(params)) {
@@ -8681,7 +8681,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 chunkO6O5MD7Q_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
+        messageList: messageList ?? (Array.isArray(messages) ? new chunkPCQBJ3NP_cjs.MessageList().add(messages, "input").addSystem(systemMessages ?? []) : void 0),
         stepNumber,
         systemMessages,
         streamParts,
@@ -8738,7 +8738,7 @@ function createStepFromProcessor(processor) {
                 messageList: checkedMessageList,
                 systemMessages: systemMessages ?? []
               });
-              if (result instanceof chunkO6O5MD7Q_cjs.MessageList) {
+              if (result instanceof chunkPCQBJ3NP_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8921,7 +8921,7 @@ function createStepFromProcessor(processor) {
                 messageList: passThrough.messageList,
                 result: passThrough.result ?? defaultResult
               });
-              if (result instanceof chunkO6O5MD7Q_cjs.MessageList) {
+              if (result instanceof chunkPCQBJ3NP_cjs.MessageList) {
                 if (result !== passThrough.messageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -8988,7 +8988,7 @@ function createStepFromProcessor(processor) {
                 systemMessages: systemMessages ?? [],
                 steps: steps ?? []
               });
-              if (result instanceof chunkO6O5MD7Q_cjs.MessageList) {
+              if (result instanceof chunkPCQBJ3NP_cjs.MessageList) {
                 if (result !== checkedMessageList) {
                   throw new chunk4U7ZLI36_cjs.MastraError({
                     category: "USER" /* USER */,
@@ -9056,7 +9056,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 chunkGYLHNAH7_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 chunkK4NN2KQQ_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);
@@ -11354,7 +11354,7 @@ var MastraScorer = class _MastraScorer {
         }
       });
     }
-    const resolvedModel = await chunkTQTUU6QD_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
+    const resolvedModel = await chunk4THMANGC_cjs.resolveModelConfig(modelConfig, void 0, this.#mastra);
     const judge = new Agent({
       id: "judge",
       name: "judge",
@@ -12209,11 +12209,11 @@ var DefaultStepResult = class {
 // src/tools/provider-tool-utils.ts
 function findProviderToolByName(tools, toolName) {
   if (!tools) return void 0;
-  return Object.values(tools).find((t) => chunkGYLHNAH7_cjs.isProviderTool(t) && chunkGYLHNAH7_cjs.getProviderToolName(t.id) === toolName);
+  return Object.values(tools).find((t) => chunkK4NN2KQQ_cjs.isProviderTool(t) && chunkK4NN2KQQ_cjs.getProviderToolName(t.id) === toolName);
 }
 function inferProviderExecuted(providerExecuted, tool2) {
   if (providerExecuted !== void 0) return providerExecuted;
-  return chunkGYLHNAH7_cjs.isProviderTool(tool2) ? true : void 0;
+  return chunkK4NN2KQQ_cjs.isProviderTool(tool2) ? true : void 0;
 }
 
 // src/loop/workflows/run-state.ts
@@ -12803,8 +12803,8 @@ function createLLMExecutionStep({
             if (processInputStepResult.tools && currentStep.tools) {
               const convertedTools = {};
               for (const [name, tool2] of Object.entries(currentStep.tools)) {
-                if (chunkGYLHNAH7_cjs.isMastraTool(tool2)) {
-                  convertedTools[name] = chunk3XWXW2YI_cjs.makeCoreTool(
+                if (chunkK4NN2KQQ_cjs.isMastraTool(tool2)) {
+                  convertedTools[name] = chunkRQBBPR64_cjs.makeCoreTool(
                     tool2,
                     {
                       name,
@@ -13011,7 +13011,7 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
           }
         });
         let transportResolver;
-        if (currentStep.model instanceof chunkTQTUU6QD_cjs.ModelRouterLanguageModel) {
+        if (currentStep.model instanceof chunk4THMANGC_cjs.ModelRouterLanguageModel) {
           const routerModel = currentStep.model;
           transportResolver = () => routerModel._getStreamTransport();
         }
@@ -13373,7 +13373,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
               toolInvocation: {
                 state: "result",
                 toolCallId: toolCall.toolCallId,
-                toolName: chunkO6O5MD7Q_cjs.sanitizeToolName(toolCall.toolName),
+                toolName: chunkPCQBJ3NP_cjs.sanitizeToolName(toolCall.toolName),
                 args: toolCall.args,
                 result: toolCall.error?.message ?? toolCall.error
               },
@@ -13408,7 +13408,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
                   toolInvocation: {
                     state: "result",
                     toolCallId: toolCall.toolCallId,
-                    toolName: chunkO6O5MD7Q_cjs.sanitizeToolName(toolCall.toolName),
+                    toolName: chunkPCQBJ3NP_cjs.sanitizeToolName(toolCall.toolName),
                     args: toolCall.args,
                     result: toolCall.result
                   },
@@ -13465,7 +13465,7 @@ function createLLMMappingStep({ models, _internal, ...rest }, llmExecutionStep)
               toolInvocation: {
                 state: "result",
                 toolCallId: toolCall.toolCallId,
-                toolName: chunkO6O5MD7Q_cjs.sanitizeToolName(toolCall.toolName),
+                toolName: chunkPCQBJ3NP_cjs.sanitizeToolName(toolCall.toolName),
                 args: toolCall.args,
                 result: toolCall.result
               },
@@ -14758,7 +14758,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 chunk3XWXW2YI_cjs.delay(10 * 1e3);
+              await chunkRQBBPR64_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -15034,7 +15034,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkO6O5MD7Q_cjs.MessageList({
+    const messageList = new chunkPCQBJ3NP_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -15091,7 +15091,7 @@ async function saveMessagesWithProcessors(memory, messages, processorRunner, con
     await memory.saveMessages({ messages });
     return;
   }
-  const messageList = new chunkO6O5MD7Q_cjs.MessageList();
+  const messageList = new chunkPCQBJ3NP_cjs.MessageList();
   for (const msg of messages) {
     messageList.add(msg, "response");
   }
@@ -16177,6 +16177,7 @@ async function createNetworkLoop({
           requestContext,
           mastra: agent.getMastraInstance(),
           agent: {
+            agentId: agent.id,
             resourceId: initData.threadResourceId || networkName,
             toolCallId,
             threadId: initData.threadId,
@@ -16528,7 +16529,7 @@ async function networkLoop({
               "resumeData": "string"
             }
           `;
-              const messageList = new chunkO6O5MD7Q_cjs.MessageList();
+              const messageList = new chunkPCQBJ3NP_cjs.MessageList();
               messageList.addSystem(systemInstructions);
               messageList.add(task, "user");
               const result = llm.stream({
@@ -16999,8 +17000,8 @@ var SkillsProcessor = class {
     if (!skillsList || skillsList.length === 0) {
       return "";
     }
-    const skillPromises = skillsList.map((meta) => this.skills?.get(meta.name));
-    const fullSkills = (await Promise.all(skillPromises)).filter((s) => s !== void 0);
+    const skillPromises = skillsList.map((meta) => this.skills?.get(meta.path));
+    const fullSkills = (await Promise.all(skillPromises)).filter((s) => s !== void 0 && s !== null);
     fullSkills.sort((a, b) => a.name.localeCompare(b.name));
     switch (this._format) {
       case "xml": {
@@ -17073,7 +17074,7 @@ ${skillsMd}`;
       }
       messageList.addSystem({
         role: "system",
-        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.'
+        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. If multiple skills share the same name, use the skill path (shown in the location field) instead of the name to disambiguate. When a user asks about a topic covered by an available skill, activate it immediately without asking for permission first.'
       });
     }
   }
@@ -17184,7 +17185,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunkO6O5MD7Q_cjs.MessageList({
+        let messageList = new chunkPCQBJ3NP_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -17353,7 +17354,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkO6O5MD7Q_cjs.MessageList({
+        const messageListResponses = new chunkPCQBJ3NP_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -18503,7 +18504,7 @@ var prepareToolsStepOutputSchema = v4.z.object({
 var prepareMemoryStepOutputSchema = v4.z.object({
   threadExists: v4.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: v4.z.instanceof(chunkO6O5MD7Q_cjs.MessageList),
+  messageList: v4.z.instanceof(chunkPCQBJ3NP_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 */
@@ -18544,7 +18545,7 @@ function createPrepareMemoryStep({
     execute: async ({ ...rest }) => {
       const observabilityContext = chunkG5HKDGNT_cjs.resolveObservabilityContext(rest);
       const thread = threadFromArgs;
-      const messageList = new chunkO6O5MD7Q_cjs.MessageList({
+      const messageList = new chunkPCQBJ3NP_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -19779,7 +19780,7 @@ ${errorMessages}`,
    */
   listTools({ requestContext = new chunk5WBEMKE2_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunk3XWXW2YI_cjs.ensureToolProperties(this.#tools);
+      return chunkRQBBPR64_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({
       requestContext,
@@ -19800,7 +19801,7 @@ ${errorMessages}`,
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunk3XWXW2YI_cjs.ensureToolProperties(tools);
+      return chunkRQBBPR64_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -19846,7 +19847,7 @@ ${errorMessages}`,
             });
           });
         } else {
-          llm = new chunkKWQ4YIWP_cjs.MastraLLMV1({
+          llm = new chunk7L2ICIDI_cjs.MastraLLMV1({
             model: modelInfo,
             mastra: this.#mastra,
             options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -19872,7 +19873,7 @@ ${errorMessages}`,
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkTQTUU6QD_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunk4THMANGC_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunk4U7ZLI36_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -20200,7 +20201,7 @@ ${errorMessages}`,
   }) {
     const observabilityContext = chunkG5HKDGNT_cjs.resolveObservabilityContext(rest);
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkO6O5MD7Q_cjs.MessageList().add(message, "user").get.all.aiV5.ui().at(-1);
+    const normMessage = new chunkPCQBJ3NP_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)}`);
     }
@@ -20223,7 +20224,7 @@ ${errorMessages}`,
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (isSupportedLanguageModel(llm.getModel())) {
-      const messageList = new chunkO6O5MD7Q_cjs.MessageList().add(
+      const messageList = new chunkPCQBJ3NP_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -20276,7 +20277,7 @@ ${errorMessages}`,
   async genTitle(userMessage, requestContext, observabilityContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkO6O5MD7Q_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkPCQBJ3NP_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -20351,13 +20352,14 @@ ${errorMessages}`,
           mastra: mastraProxy,
           memory,
           agentName: this.name,
+          agentId: this.id,
           requestContext,
           ...observabilityContext,
           model: await this.getModel({ requestContext }),
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunk3XWXW2YI_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkRQBBPR64_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -20386,7 +20388,7 @@ ${errorMessages}`,
     if (!workspace) {
       return convertedWorkspaceTools;
     }
-    const workspaceTools = chunkKQ3SJZG5_cjs.createWorkspaceTools(workspace);
+    const workspaceTools = chunkXW4B2RAG_cjs.createWorkspaceTools(workspace);
     if (Object.keys(workspaceTools).length > 0) {
       this.logger.debug(`[Agent:${this.name}] - Adding workspace tools: ${Object.keys(workspaceTools).join(", ")}`, {
         runId
@@ -20401,6 +20403,7 @@ ${errorMessages}`,
           logger: this.logger,
           mastra: mastraProxy,
           agentName: this.name,
+          agentId: this.id,
           requestContext,
           ...observabilityContext,
           model: await this.getModel({ requestContext }),
@@ -20408,7 +20411,7 @@ ${errorMessages}`,
           requireApproval: toolObj.requireApproval,
           workspace
         };
-        const convertedToCoreTool = chunk3XWXW2YI_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkRQBBPR64_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedWorkspaceTools[toolName] = convertedToCoreTool;
       }
     }
@@ -20439,7 +20442,7 @@ ${errorMessages}`,
     if (!workspace?.skills) {
       return convertedSkillTools;
     }
-    const skillTools = chunkKQ3SJZG5_cjs.createSkillTools(workspace.skills);
+    const skillTools = chunkXW4B2RAG_cjs.createSkillTools(workspace.skills);
     if (Object.keys(skillTools).length > 0) {
       this.logger.debug(`[Agent:${this.name}] - Adding skill tools: ${Object.keys(skillTools).join(", ")}`, {
         runId
@@ -20454,6 +20457,7 @@ ${errorMessages}`,
           logger: this.logger,
           mastra: mastraProxy,
           agentName: this.name,
+          agentId: this.id,
           requestContext,
           ...observabilityContext,
           model: await this.getModel({ requestContext }),
@@ -20462,7 +20466,7 @@ ${errorMessages}`,
           // Skill tools never require approval
           workspace
         };
-        const convertedToCoreTool = chunk3XWXW2YI_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkRQBBPR64_cjs.makeCoreTool(toolObj, options, void 0, autoResumeSuspendedTools);
         convertedSkillTools[toolName] = convertedToCoreTool;
       }
     }
@@ -20671,6 +20675,7 @@ ${errorMessages}`,
           mastra: mastraProxy,
           memory,
           agentName: this.name,
+          agentId: this.id,
           requestContext,
           ...observabilityContext,
           model: await this.getModel({ requestContext }),
@@ -20678,7 +20683,7 @@ ${errorMessages}`,
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        return [k, chunk3XWXW2YI_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
+        return [k, chunkRQBBPR64_cjs.makeCoreTool(tool2, options, void 0, autoResumeSuspendedTools)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -20723,13 +20728,14 @@ ${errorMessages}`,
             mastra: mastraProxy,
             memory,
             agentName: this.name,
+            agentId: this.id,
             requestContext,
             ...observabilityContext,
             model: await this.getModel({ requestContext }),
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunk3XWXW2YI_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
+          const convertedToCoreTool = chunkRQBBPR64_cjs.makeCoreTool(toolObj, options, "toolset", autoResumeSuspendedTools);
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -20769,13 +20775,14 @@ ${errorMessages}`,
           mastra: mastraProxy,
           memory,
           agentName: this.name,
+          agentId: this.id,
           requestContext,
           ...observabilityContext,
           model: await this.getModel({ requestContext }),
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool2.requireApproval
         };
-        const convertedToCoreTool = chunk3XWXW2YI_cjs.makeCoreTool(toolRest, options, "client-tool", autoResumeSuspendedTools);
+        const convertedToCoreTool = chunkRQBBPR64_cjs.makeCoreTool(toolRest, options, "client-tool", autoResumeSuspendedTools);
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -20859,7 +20866,7 @@ ${errorMessages}`,
           ).describe("The results from the agent's tool calls").optional()
         });
         const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
-        const toolObj = chunkGYLHNAH7_cjs.createTool({
+        const toolObj = chunkK4NN2KQQ_cjs.createTool({
           id: `agent-${agentName}`,
           description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
@@ -21430,12 +21437,13 @@ ${effectiveInstructions}`;
           mastra: this.#mastra,
           memory: await this.getMemory({ requestContext }),
           agentName: this.name,
+          agentId: this.id,
           requestContext,
           model: await this.getModel({ requestContext }),
           ...observabilityContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunk3XWXW2YI_cjs.makeCoreTool(
+        convertedAgentTools[`agent-${agentName}`] = chunkRQBBPR64_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -21500,7 +21508,7 @@ ${effectiveInstructions}`;
             }
           ]
         };
-        const toolObj = chunkGYLHNAH7_cjs.createTool({
+        const toolObj = chunkK4NN2KQQ_cjs.createTool({
           id: `workflow-${workflowName}`,
           description: workflow.description || `Workflow: ${workflowName}`,
           inputSchema: extendedInputSchema,
@@ -21646,12 +21654,13 @@ ${effectiveInstructions}`;
           mastra: this.#mastra,
           memory: await this.getMemory({ requestContext }),
           agentName: this.name,
+          agentId: this.id,
           requestContext,
           model: await this.getModel({ requestContext }),
           ...observabilityContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunk3XWXW2YI_cjs.makeCoreTool(
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunkRQBBPR64_cjs.makeCoreTool(
           toolObj,
           options,
           void 0,
@@ -21683,7 +21692,7 @@ ${effectiveInstructions}`;
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunk3XWXW2YI_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunkRQBBPR64_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -21935,7 +21944,7 @@ ${effectiveInstructions}`;
       const resolvedModel = await this.resolveModelConfig(selection, requestContext);
       this.assertSupportsPreparedModels(resolvedModel);
       let headers;
-      if (resolvedModel instanceof chunkTQTUU6QD_cjs.ModelRouterLanguageModel) {
+      if (resolvedModel instanceof chunk4THMANGC_cjs.ModelRouterLanguageModel) {
         headers = resolvedModel.config?.headers;
       }
       return [
@@ -21968,7 +21977,7 @@ ${effectiveInstructions}`;
           throw mastraError;
         }
         let headers;
-        if (model instanceof chunkTQTUU6QD_cjs.ModelRouterLanguageModel) {
+        if (model instanceof chunk4THMANGC_cjs.ModelRouterLanguageModel) {
           headers = model.config?.headers;
         }
         return {
@@ -22419,7 +22428,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunk3XWXW2YI_cjs.deepMerge(
+    const mergedOptions = chunkRQBBPR64_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -22489,7 +22498,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    const mergedOptions = chunk3XWXW2YI_cjs.deepMerge(
+    const mergedOptions = chunkRQBBPR64_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -22553,7 +22562,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: streamOptions?.requestContext
     });
-    let mergedStreamOptions = chunk3XWXW2YI_cjs.deepMerge(
+    let mergedStreamOptions = chunkRQBBPR64_cjs.deepMerge(
       defaultOptions,
       streamOptions ?? {}
     );
@@ -22618,7 +22627,7 @@ ${effectiveInstructions}`;
     const defaultOptions = await this.getDefaultOptions({
       requestContext: options?.requestContext
     });
-    const mergedOptions = chunk3XWXW2YI_cjs.deepMerge(
+    const mergedOptions = chunkRQBBPR64_cjs.deepMerge(
       defaultOptions,
       options ?? {}
     );
@@ -24192,7 +24201,7 @@ var TokenLimiterProcessor = class _TokenLimiterProcessor {
           return new TiktokenClass(this.customEncoding);
         });
       } else {
-        this.encoderPromise = chunkKQ3SJZG5_cjs.getTiktoken();
+        this.encoderPromise = chunkXW4B2RAG_cjs.getTiktoken();
       }
     }
     return this.encoderPromise;
@@ -24877,7 +24886,7 @@ var ToolSearchProcessor = class {
       minScore: options.search?.minScore ?? 0
     };
     this.ttl = options.ttl ?? 36e5;
-    this.bm25Index = new chunkKQ3SJZG5_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
+    this.bm25Index = new chunkXW4B2RAG_cjs.BM25Index({}, TOOL_SEARCH_TOKENIZE_OPTIONS);
     this.indexTools();
     if (this.ttl > 0) {
       this.scheduleCleanup();
@@ -25042,7 +25051,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 = chunkGYLHNAH7_cjs.createTool({
+    const searchTool = chunkK4NN2KQQ_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: v4.z.object({
@@ -25072,7 +25081,7 @@ var ToolSearchProcessor = class {
         };
       }
     });
-    const loadTool = chunkGYLHNAH7_cjs.createTool({
+    const loadTool = chunkK4NN2KQQ_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: v4.z.object({
@@ -25406,7 +25415,7 @@ var WorkingMemory = class {
     return messageList;
   }
   generateEmptyFromSchemaInternal(schema) {
-    const result = chunk3XWXW2YI_cjs.generateEmptyFromSchema(schema);
+    const result = chunkRQBBPR64_cjs.generateEmptyFromSchema(schema);
     return Object.keys(result).length > 0 ? result : null;
   }
   getWorkingMemoryToolInstruction({
@@ -25609,7 +25618,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunkO6O5MD7Q_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkPCQBJ3NP_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -26051,7 +26060,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkTQTUU6QD_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunk4THMANGC_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -26090,7 +26099,7 @@ https://mastra.ai/en/docs/memory/overview`
   }
   setEmbedder(embedder, embedderOptions) {
     if (typeof embedder === "string") {
-      this.embedder = new chunkTQTUU6QD_cjs.ModelRouterEmbeddingModel(embedder);
+      this.embedder = new chunk4THMANGC_cjs.ModelRouterEmbeddingModel(embedder);
     } else {
       this.embedder = embedder;
     }
@@ -26187,7 +26196,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunk3XWXW2YI_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunkRQBBPR64_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -26539,7 +26548,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunkQ7EDK6IW_cjs.InMemoryStore(),
+      storage: storage || new chunk6VYFRSNT_cjs.InMemoryStore(),
       options: {
         ...options,
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : options?.workingMemory,
@@ -26620,7 +26629,7 @@ var MockMemory = class extends MastraMemory {
       return {};
     }
     return {
-      updateWorkingMemory: chunkGYLHNAH7_cjs.createTool({
+      updateWorkingMemory: chunkK4NN2KQQ_cjs.createTool({
         id: "update-working-memory",
         description: `Update the working memory with new information. Any data not included will be overwritten.`,
         inputSchema: v4.z.object({ memory: v4.z.string() }),
@@ -26848,5 +26857,5 @@ exports.validateStepRequestContext = validateStepRequestContext;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepStateData = validateStepStateData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-2DPHD6NF.cjs.map
-//# sourceMappingURL=chunk-2DPHD6NF.cjs.map
+//# sourceMappingURL=chunk-NTF7UIBI.cjs.map
+//# sourceMappingURL=chunk-NTF7UIBI.cjs.map