@mastra/core 1.0.0-beta.6 → 1.0.0-beta.7

package/dist/{chunk-NN3NOFRU.cjs → chunk-RBBEMTMA.cjs}

@@ -2,15 +2,15 @@
 
 var chunk4JKEUSCC_cjs = require('./chunk-4JKEUSCC.cjs');
 var chunkABJOUEVA_cjs = require('./chunk-ABJOUEVA.cjs');
-var chunk3TKNXJES_cjs = require('./chunk-3TKNXJES.cjs');
-var chunkVRFSEZBA_cjs = require('./chunk-VRFSEZBA.cjs');
-var chunkS5FPOCQF_cjs = require('./chunk-S5FPOCQF.cjs');
-var chunkSQAX4OW6_cjs = require('./chunk-SQAX4OW6.cjs');
+var chunkM7CQULF7_cjs = require('./chunk-M7CQULF7.cjs');
+var chunkYBEW5YWC_cjs = require('./chunk-YBEW5YWC.cjs');
+var chunkHJNEZRI4_cjs = require('./chunk-HJNEZRI4.cjs');
+var chunkYUXTDKYN_cjs = require('./chunk-YUXTDKYN.cjs');
 var chunkMR7ZWBL6_cjs = require('./chunk-MR7ZWBL6.cjs');
-var chunkRTROJFEU_cjs = require('./chunk-RTROJFEU.cjs');
-var chunkNHNXIYDG_cjs = require('./chunk-NHNXIYDG.cjs');
+var chunk6C2PU6J4_cjs = require('./chunk-6C2PU6J4.cjs');
+var chunk3EYBRHB2_cjs = require('./chunk-3EYBRHB2.cjs');
 var chunkTWH4PTDG_cjs = require('./chunk-TWH4PTDG.cjs');
-var chunkAQAIS7FH_cjs = require('./chunk-AQAIS7FH.cjs');
+var chunk3JA6VPNM_cjs = require('./chunk-3JA6VPNM.cjs');
 var chunkY24HI6ND_cjs = require('./chunk-Y24HI6ND.cjs');
 var chunkUVHSM2GU_cjs = require('./chunk-UVHSM2GU.cjs');
 var chunk4WQYXT2I_cjs = require('./chunk-4WQYXT2I.cjs');
@@ -1138,7 +1138,7 @@ var createTimeTravelExecutionParams = (params) => {
         result = void 0;
       }
       if (result) {
-        const formattedResult = chunkRTROJFEU_cjs.removeUndefinedValues(result);
+        const formattedResult = chunk6C2PU6J4_cjs.removeUndefinedValues(result);
         stepResults[stepId] = formattedResult;
       }
     });
@@ -1364,7 +1364,7 @@ async function executeConditional(engine, params) {
           [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: engine.getEngineContext(),
           abortSignal: abortController?.signal,
-          writer: new chunkAQAIS7FH_cjs.ToolStream(
+          writer: new chunk3JA6VPNM_cjs.ToolStream(
             {
               prefix: "workflow-step",
               callId: crypto2.randomUUID(),
@@ -1579,7 +1579,7 @@ async function executeLoop(engine, params) {
     const evalSpan = loopSpan?.createChildSpan({
       type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
       name: `condition: '${entry.loopType}'`,
-      input: chunkRTROJFEU_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
+      input: chunk6C2PU6J4_cjs.selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
       attributes: {
         conditionIndex: iteration
       },
@@ -1615,7 +1615,7 @@ async function executeLoop(engine, params) {
           [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
           engine: engine.getEngineContext(),
           abortSignal: abortController?.signal,
-          writer: new chunkAQAIS7FH_cjs.ToolStream(
+          writer: new chunk3JA6VPNM_cjs.ToolStream(
             {
               prefix: "workflow-step",
               callId: crypto2.randomUUID(),
@@ -2340,7 +2340,7 @@ async function executeSleep(engine, params) {
         [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: engine.getEngineContext(),
         abortSignal: abortController?.signal,
-        writer: new chunkAQAIS7FH_cjs.ToolStream(
+        writer: new chunk3JA6VPNM_cjs.ToolStream(
           {
             prefix: "workflow-step",
             callId: stepCallId,
@@ -2421,7 +2421,7 @@ async function executeSleepUntil(engine, params) {
         [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: engine.getEngineContext(),
         abortSignal: abortController?.signal,
-        writer: new chunkAQAIS7FH_cjs.ToolStream(
+        writer: new chunk3JA6VPNM_cjs.ToolStream(
           {
             prefix: "workflow-step",
             callId: stepCallId,
@@ -2605,7 +2605,7 @@ async function executeStep(engine, params) {
         runId,
         resourceId,
         workflowId,
-        mastra: engine.mastra ? chunkNHNXIYDG_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
+        mastra: engine.mastra ? chunk3EYBRHB2_cjs.wrapMastra(engine.mastra, { currentSpan: stepSpan }) : void 0,
         requestContext,
         inputData,
         state: executionContext.state,
@@ -2671,7 +2671,7 @@ async function executeStep(engine, params) {
         [chunkABJOUEVA_cjs.STREAM_FORMAT_SYMBOL]: executionContext.format,
         engine: engine.getEngineContext(),
         abortSignal: abortController?.signal,
-        writer: new chunkAQAIS7FH_cjs.ToolStream(
+        writer: new chunk3JA6VPNM_cjs.ToolStream(
           {
             prefix: "workflow-step",
             callId: stepCallId,
@@ -3231,10 +3231,11 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             }
           });
         }
-        if (lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels) {
-          return { ...result2, resumeLabels: lastOutput.mutableContext.resumeLabels };
-        }
-        return result2;
+        return {
+          ...result2,
+          ...lastOutput.result.status === "suspended" && params.outputOptions?.includeResumeLabels ? { resumeLabels: lastOutput.mutableContext.resumeLabels } : {},
+          ...params.outputOptions?.includeState ? { state: lastState } : {}
+        };
       }
     }
     const result = await this.fmtReturnValue(params.emitter, stepResults, lastOutput.result);
@@ -4373,7 +4374,7 @@ var Run = class {
     format,
     outputOptions
   }) {
-    const workflowSpan = chunkNHNXIYDG_cjs.getOrCreateSpan({
+    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: inputData,
@@ -4868,7 +4869,7 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     });
-    const workflowSpan = chunkNHNXIYDG_cjs.getOrCreateSpan({
+    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: resumeDataToUse,
@@ -4993,7 +4994,7 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunkNHNXIYDG_cjs.getOrCreateSpan({
+    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       attributes: {
@@ -5098,7 +5099,7 @@ var Run = class {
         requestContextToUse.set(key, value);
       }
     }
-    const workflowSpan = chunkNHNXIYDG_cjs.getOrCreateSpan({
+    const workflowSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
       type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${this.workflowId}'`,
       input: inputData,
@@ -5409,7 +5410,7 @@ var ProcessorRunner = class {
         requestContext
       });
       const mutations = messageList.stopRecording();
-      if (result instanceof chunkVRFSEZBA_cjs.MessageList) {
+      if (result instanceof chunkYBEW5YWC_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunkTWH4PTDG_cjs.MastraError({
             category: "USER",
@@ -5589,7 +5590,7 @@ var ProcessorRunner = class {
         requestContext
       });
       let mutations;
-      if (result instanceof chunkVRFSEZBA_cjs.MessageList) {
+      if (result instanceof chunkYBEW5YWC_cjs.MessageList) {
         if (result !== messageList) {
           throw new chunkTWH4PTDG_cjs.MastraError({
             category: "USER",
@@ -5710,7 +5711,7 @@ var ProcessorRunner = class {
           requestContext
         });
         const mutations = messageList.stopRecording();
-        if (result instanceof chunkVRFSEZBA_cjs.MessageList) {
+        if (result instanceof chunkYBEW5YWC_cjs.MessageList) {
           if (result !== messageList) {
             throw new chunkTWH4PTDG_cjs.MastraError({
               category: "USER",
@@ -6154,7 +6155,7 @@ function convertMastraChunkToAISDKv5({
       if (mode === "generate") {
         return {
           type: "file",
-          file: new chunkVRFSEZBA_cjs.DefaultGeneratedFile({
+          file: new chunkYBEW5YWC_cjs.DefaultGeneratedFile({
             data: chunk.payload.data,
             mediaType: chunk.payload.mimeType
           })
@@ -6162,7 +6163,7 @@ function convertMastraChunkToAISDKv5({
       }
       return {
         type: "file",
-        file: new chunkVRFSEZBA_cjs.DefaultGeneratedFileWithType({
+        file: new chunkYBEW5YWC_cjs.DefaultGeneratedFileWithType({
           data: chunk.payload.data,
           mediaType: chunk.payload.mimeType
         })
@@ -6278,18 +6279,39 @@ function convertMastraChunkToAISDKv5({
 }
 
 // src/stream/aisdk/v5/input.ts
+function isNumericId(id) {
+  return /^\d+$/.test(id);
+}
 var AISDKV5InputStream = class extends MastraModelInput {
-  constructor({ component, name }) {
+  #generateId;
+  constructor({
+    component,
+    name,
+    generateId: generateId3
+  }) {
     super({ component, name });
+    this.#generateId = generateId3 ?? aiV5.generateId;
   }
   async transform({
     runId,
     stream,
     controller
   }) {
+    const idMap = /* @__PURE__ */ new Map();
     for await (const chunk of stream) {
-      const transformedChunk = convertFullStreamChunkToMastra(chunk, { runId });
+      const rawChunk = chunk;
+      if (rawChunk.type === "stream-start") {
+        idMap.clear();
+      }
+      const transformedChunk = convertFullStreamChunkToMastra(rawChunk, { runId });
       if (transformedChunk) {
+        if ((transformedChunk.type === "text-start" || transformedChunk.type === "text-delta" || transformedChunk.type === "text-end") && transformedChunk.payload?.id && isNumericId(transformedChunk.payload.id)) {
+          const originalId = transformedChunk.payload.id;
+          if (!idMap.has(originalId)) {
+            idMap.set(originalId, this.#generateId());
+          }
+          transformedChunk.payload.id = idMap.get(originalId);
+        }
         controller.enqueue(transformedChunk);
       }
     }
@@ -6318,11 +6340,13 @@ function execute({
   structuredOutput,
   headers,
   shouldThrowError,
-  methodType
+  methodType,
+  generateId: generateId3
 }) {
   const v5 = new AISDKV5InputStream({
     component: "LLM",
-    name: model.modelId
+    name: model.modelId,
+    generateId: generateId3
   });
   const toolsAndToolChoice = prepareToolsAndToolChoice({
     tools,
@@ -6948,7 +6972,7 @@ function createLLMExecutionStep({
                   }
                   if (prepareStepResult.messages) {
                     const newMessages = prepareStepResult.messages;
-                    const newMessageList = new chunkVRFSEZBA_cjs.MessageList();
+                    const newMessageList = new chunkYBEW5YWC_cjs.MessageList();
                     for (const message of newMessages) {
                       if (message.role === "system") {
                         newMessageList.addSystem(message);
@@ -6965,7 +6989,7 @@ function createLLMExecutionStep({
                 console.error("Error in prepareStep callback:", error);
               }
             }
-            modelResult = chunkNHNXIYDG_cjs.executeWithContextSync({
+            modelResult = chunk3EYBRHB2_cjs.executeWithContextSync({
               span: modelSpanTracker?.getTracingContext()?.currentSpan,
               fn: () => execute({
                 runId,
@@ -6980,6 +7004,7 @@ function createLLMExecutionStep({
                 structuredOutput,
                 headers,
                 methodType,
+                generateId: _internal?.generateId,
                 onResult: ({
                   warnings: warningsFromStream,
                   request: requestFromStream,
@@ -7795,6 +7820,31 @@ function workflowLoopStream({
         requestContext
       });
       if (executionResult.status !== "success") {
+        if (executionResult.status === "failed") {
+          let executionResultError = executionResult.error;
+          if (typeof executionResult.error === "string") {
+            const prependedErrorString = "Error: ";
+            if (executionResult.error.startsWith(`${prependedErrorString}${prependedErrorString}`)) {
+              executionResultError = executionResult.error.substring(
+                `${prependedErrorString}${prependedErrorString}`.length
+              );
+            } else if (executionResult.error.startsWith(prependedErrorString)) {
+              executionResultError = executionResult.error.substring(prependedErrorString.length);
+            }
+          }
+          const error = chunkTWH4PTDG_cjs.getErrorFromUnknown(executionResultError, {
+            fallbackMessage: "Unknown error in agent workflow stream"
+          });
+          controller.enqueue({
+            type: "error",
+            runId,
+            from: "AGENT" /* AGENT */,
+            payload: { error }
+          });
+          if (rest.options?.onError) {
+            await rest.options?.onError?.({ error });
+          }
+        }
         controller.close();
         return;
       }
@@ -8043,6 +8093,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
     resourceId,
     structuredOutput,
     options,
+    inputProcessors,
     outputProcessors,
     returnScorerData,
     providerOptions,
@@ -8106,6 +8157,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
         providerOptions,
         _internal,
         structuredOutput,
+        inputProcessors,
         outputProcessors,
         returnScorerData,
         modelSpanTracker,
@@ -8154,7 +8206,7 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_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 chunkRTROJFEU_cjs.delay(10 * 1e3);
+              await chunk6C2PU6J4_cjs.delay(10 * 1e3);
             }
           },
           onFinish: async (props) => {
@@ -8176,7 +8228,9 @@ var MastraLLMVNext = class extends chunkDGV2FWB4_cjs.MastraBase {
                   totalTokens: props?.totalUsage?.totalTokens,
                   reasoningTokens: props?.totalUsage?.reasoningTokens,
                   cachedInputTokens: props?.totalUsage?.cachedInputTokens
-                }
+                },
+                responseId: props?.response.id,
+                responseModel: props?.response.modelId
               }
             });
             try {
@@ -8466,7 +8520,7 @@ async function prepareMemoryStep({
       );
     }
   } else {
-    const messageList = new chunkVRFSEZBA_cjs.MessageList({
+    const messageList = new chunkYBEW5YWC_cjs.MessageList({
       threadId: thread?.id,
       resourceId: thread?.resourceId
     });
@@ -9526,7 +9580,7 @@ var AgentLegacyHandler = class {
         if (process.env.NODE_ENV !== "test") {
           this.capabilities.logger.debug(`[Agents:${this.capabilities.name}] - Starting generation`, { runId });
         }
-        const agentSpan = chunkNHNXIYDG_cjs.getOrCreateSpan({
+        const agentSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
           type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.capabilities.id}'`,
           input: {
@@ -9534,6 +9588,7 @@ var AgentLegacyHandler = class {
           },
           attributes: {
             agentId: this.capabilities.id,
+            agentName: this.capabilities.name,
             instructions: this.capabilities.convertInstructionsToString(instructions),
             availableTools: [
               ...toolsets ? Object.keys(toolsets) : [],
@@ -9579,7 +9634,7 @@ var AgentLegacyHandler = class {
           methodType: methodType === "generate" ? "generateLegacy" : "streamLegacy",
           memoryConfig
         });
-        let messageList = new chunkVRFSEZBA_cjs.MessageList({
+        let messageList = new chunkYBEW5YWC_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -9720,7 +9775,7 @@ var AgentLegacyHandler = class {
           result: resToLog,
           threadId
         });
-        const messageListResponses = new chunkVRFSEZBA_cjs.MessageList({
+        const messageListResponses = new chunkYBEW5YWC_cjs.MessageList({
           threadId,
           resourceId,
           generateMessageId: this.capabilities.mastra?.generateId?.bind(this.capabilities.mastra),
@@ -12101,7 +12156,7 @@ var BatchPartsProcessor = class {
       const combinedText = textChunks.map((part) => part.type === "text-delta" ? part.payload.text : "").join("");
       const combinedChunk = {
         type: "text-delta",
-        payload: { text: combinedText, id: "1" },
+        payload: { text: combinedText, id: "text-1" },
         runId: "1",
         from: "AGENT" /* AGENT */
       };
@@ -12788,6 +12843,9 @@ var isAugmentedSymbol = Symbol("isAugmented");
 function augmentWithInit(storage) {
   let hasInitialized = null;
   const ensureInit = async () => {
+    if (storage.disableInit) {
+      return;
+    }
     if (!hasInitialized) {
       hasInitialized = storage.init();
     }
@@ -12904,7 +12962,7 @@ https://mastra.ai/en/docs/memory/semantic-recall`
         );
       }
       if (typeof config.embedder === "string") {
-        this.embedder = new chunkS5FPOCQF_cjs.ModelRouterEmbeddingModel(config.embedder);
+        this.embedder = new chunkHJNEZRI4_cjs.ModelRouterEmbeddingModel(config.embedder);
       } else {
         this.embedder = config.embedder;
       }
@@ -13000,7 +13058,7 @@ https://mastra.ai/en/docs/memory/overview`
         "The threads.generateTitle option has been moved. Use the top-level generateTitle option instead."
       );
     }
-    const mergedConfig = chunkRTROJFEU_cjs.deepMerge(this.threadConfig, config || {});
+    const mergedConfig = chunk6C2PU6J4_cjs.deepMerge(this.threadConfig, config || {});
     if (typeof config?.workingMemory === "object" && config.workingMemory?.schema && typeof mergedConfig.workingMemory === "object") {
       mergedConfig.workingMemory.schema = config.workingMemory.schema;
     }
@@ -13236,7 +13294,7 @@ var MockMemory = class extends MastraMemory {
   } = {}) {
     super({
       name: "mock",
-      storage: storage || new chunk3TKNXJES_cjs.InMemoryStore(),
+      storage: storage || new chunkM7CQULF7_cjs.InMemoryStore(),
       options: {
         workingMemory: enableWorkingMemory ? { enabled: true, template: workingMemoryTemplate } : void 0,
         lastMessages: enableMessageHistory ? 10 : void 0
@@ -13750,7 +13808,7 @@ var SemanticRecall = class {
    */
   formatCrossThreadMessages(messages, currentThreadId) {
     let result = ``;
-    const v1Messages = new chunkVRFSEZBA_cjs.MessageList().add(messages, "memory").get.all.v1();
+    const v1Messages = new chunkYBEW5YWC_cjs.MessageList().add(messages, "memory").get.all.v1();
     let lastYmd = null;
     for (const msg of v1Messages) {
       const date = msg.createdAt;
@@ -14091,6 +14149,9 @@ function createMapResultsStep({
       const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
       effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
     }
+    const effectiveInputProcessors = options.inputProcessors || (capabilities.inputProcessors ? typeof capabilities.inputProcessors === "function" ? await capabilities.inputProcessors({
+      requestContext: result.requestContext
+    }) : capabilities.inputProcessors : []);
     const messageList = memoryData.messageList;
     const modelMethodType = getModelMethodFromAgentMethod(methodType);
     const loopOptions = {
@@ -14157,6 +14218,7 @@ function createMapResultsStep({
         abortSignal: options.abortSignal
       },
       structuredOutput: options.structuredOutput,
+      inputProcessors: effectiveInputProcessors,
       outputProcessors: effectiveOutputProcessors,
       modelSettings: {
         temperature: 0,
@@ -14198,7 +14260,7 @@ var prepareToolsStepOutputSchema = z5.z.object({
 var prepareMemoryStepOutputSchema = z5.z.object({
   threadExists: z5.z.boolean(),
   thread: storageThreadSchema.optional(),
-  messageList: z5.z.instanceof(chunkVRFSEZBA_cjs.MessageList),
+  messageList: z5.z.instanceof(chunkYBEW5YWC_cjs.MessageList),
   tripwire: z5.z.boolean().optional(),
   tripwireReason: z5.z.string().optional()
 });
@@ -14231,7 +14293,7 @@ function createPrepareMemoryStep({
     outputSchema: prepareMemoryStepOutputSchema,
     execute: async ({ tracingContext }) => {
       const thread = threadFromArgs;
-      const messageList = new chunkVRFSEZBA_cjs.MessageList({
+      const messageList = new chunkYBEW5YWC_cjs.MessageList({
         threadId: thread?.id,
         resourceId,
         generateMessageId: capabilities.generateMessageId,
@@ -14303,7 +14365,7 @@ function createPrepareMemoryStep({
           title: thread.title,
           memoryConfig,
           resourceId,
-          saveThread: false
+          saveThread: true
         });
       }
       requestContext.set("MastraMemory", {
@@ -15103,7 +15165,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   listTools({ requestContext = new chunkUVHSM2GU_cjs.RequestContext() } = {}) {
     if (typeof this.#tools !== "function") {
-      return chunkRTROJFEU_cjs.ensureToolProperties(this.#tools);
+      return chunk6C2PU6J4_cjs.ensureToolProperties(this.#tools);
     }
     const result = this.#tools({ requestContext, mastra: this.#mastra });
     return resolveMaybePromise(result, (tools) => {
@@ -15121,7 +15183,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
-      return chunkRTROJFEU_cjs.ensureToolProperties(tools);
+      return chunk6C2PU6J4_cjs.ensureToolProperties(tools);
     });
   }
   /**
@@ -15153,7 +15215,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           });
         });
       } else {
-        llm = new chunkSQAX4OW6_cjs.MastraLLMV1({
+        llm = new chunkYUXTDKYN_cjs.MastraLLMV1({
           model: resolvedModel,
           mastra: this.#mastra,
           options: { tracingPolicy: this.#options?.tracingPolicy }
@@ -15178,7 +15240,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
    */
   async resolveModelConfig(modelConfig, requestContext) {
     try {
-      return await chunkS5FPOCQF_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
+      return await chunkHJNEZRI4_cjs.resolveModelConfig(modelConfig, requestContext, this.#mastra);
     } catch (error) {
       const mastraError = new chunkTWH4PTDG_cjs.MastraError({
         id: "AGENT_GET_MODEL_MISSING_MODEL_INSTANCE",
@@ -15384,7 +15446,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     instructions
   }) {
     const llm = await this.getLLM({ requestContext, model });
-    const normMessage = new chunkVRFSEZBA_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
+    const normMessage = new chunkYBEW5YWC_cjs.MessageList().add(message, "user").get.all.ui().at(-1);
     if (!normMessage) {
       throw new Error(`Could not generate title from input ${JSON.stringify(message)}`);
     }
@@ -15407,7 +15469,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
     if (llm.getModel().specificationVersion === "v2") {
-      const messageList = new chunkVRFSEZBA_cjs.MessageList().add(
+      const messageList = new chunkYBEW5YWC_cjs.MessageList().add(
         [
           {
             role: "system",
@@ -15459,7 +15521,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
   async genTitle(userMessage, requestContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
-        const normMessage = new chunkVRFSEZBA_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
+        const normMessage = new chunkYBEW5YWC_cjs.MessageList().add(userMessage, "user").get.all.ui().at(-1);
         if (normMessage) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
@@ -15523,7 +15585,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: toolObj.requireApproval
         };
-        const convertedToCoreTool = chunkRTROJFEU_cjs.makeCoreTool(toolObj, options);
+        const convertedToCoreTool = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options);
         convertedMemoryTools[toolName] = convertedToCoreTool;
       }
     }
@@ -15673,7 +15735,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool.requireApproval
         };
-        return [k, chunkRTROJFEU_cjs.makeCoreTool(tool, options)];
+        return [k, chunk6C2PU6J4_cjs.makeCoreTool(tool, options)];
       })
     );
     const assignedToolEntriesConverted = Object.fromEntries(
@@ -15722,7 +15784,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
             tracingPolicy: this.#options?.tracingPolicy,
             requireApproval: toolObj.requireApproval
           };
-          const convertedToCoreTool = chunkRTROJFEU_cjs.makeCoreTool(toolObj, options, "toolset");
+          const convertedToCoreTool = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
         }
       }
@@ -15766,7 +15828,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingPolicy: this.#options?.tracingPolicy,
           requireApproval: tool.requireApproval
         };
-        const convertedToCoreTool = chunkRTROJFEU_cjs.makeCoreTool(rest, options, "client-tool");
+        const convertedToCoreTool = chunk6C2PU6J4_cjs.makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
       }
     }
@@ -15802,10 +15864,10 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           subAgentThreadId: z5.z.string().describe("The thread ID of the agent").optional(),
           subAgentResourceId: z5.z.string().describe("The resource ID of the agent").optional()
         });
-        const modelVersion = (await agent.getModel()).specificationVersion;
+        const modelVersion = (await agent.getModel({ requestContext })).specificationVersion;
         const toolObj = chunkY24HI6ND_cjs.createTool({
           id: `agent-${agentName}`,
-          description: `Agent: ${agentName}`,
+          description: agent.getDescription() || `Agent: ${agentName}`,
           inputSchema: agentInputSchema,
           outputSchema: agentOutputSchema,
           mastra: this.#mastra,
@@ -15935,7 +15997,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedAgentTools[`agent-${agentName}`] = chunkRTROJFEU_cjs.makeCoreTool(toolObj, options);
+        convertedAgentTools[`agent-${agentName}`] = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedAgentTools;
@@ -16078,7 +16140,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
           tracingContext,
           tracingPolicy: this.#options?.tracingPolicy
         };
-        convertedWorkflowTools[`workflow-${workflowName}`] = chunkRTROJFEU_cjs.makeCoreTool(toolObj, options);
+        convertedWorkflowTools[`workflow-${workflowName}`] = chunk6C2PU6J4_cjs.makeCoreTool(toolObj, options);
       }
     }
     return convertedWorkflowTools;
@@ -16102,7 +16164,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     let mastraProxy = void 0;
     const logger = this.logger;
     if (this.#mastra) {
-      mastraProxy = chunkRTROJFEU_cjs.createMastraProxy({ mastra: this.#mastra, logger });
+      mastraProxy = chunk6C2PU6J4_cjs.createMastraProxy({ mastra: this.#mastra, logger });
     }
     const assignedTools = await this.listAssignedTools({
       runId,
@@ -16426,7 +16488,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       const targetProvider = structuredOutputModel.provider;
       const targetModelId = structuredOutputModel.modelId;
       if (targetProvider.includes("openai") || targetModelId.includes("openai")) {
-        if (chunkRTROJFEU_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
+        if (chunk6C2PU6J4_cjs.isZodType(options.structuredOutput.schema) && targetModelId) {
           const modelInfo = {
             provider: targetProvider,
             modelId: targetModelId,
@@ -16445,12 +16507,14 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
     }
     const runId = options.runId || this.#mastra?.generateId() || crypto2.randomUUID();
     const instructions = options.instructions || await this.getInstructions({ requestContext });
-    const agentSpan = chunkNHNXIYDG_cjs.getOrCreateSpan({
+    const agentSpan = chunk3EYBRHB2_cjs.getOrCreateSpan({
       type: "agent_run" /* AGENT_RUN */,
       name: `agent run: '${this.id}'`,
       input: options.messages,
       attributes: {
         agentId: this.id,
+        agentName: this.name,
+        conversationId: threadFromArgs?.id,
         instructions: this.#convertInstructionsToString(instructions)
       },
       metadata: {
@@ -16484,6 +16548,7 @@ var Agent = class extends chunkDGV2FWB4_cjs.MastraBase {
       getMemoryMessages: this.getMemoryMessages.bind(this),
       runInputProcessors: this.__runInputProcessors.bind(this),
       executeOnFinish: this.#executeOnFinish.bind(this),
+      inputProcessors: async ({ requestContext: requestContext2 }) => this.listResolvedInputProcessors(requestContext2),
       outputProcessors: async ({ requestContext: requestContext2 }) => this.listResolvedOutputProcessors(requestContext2),
       llm
     };
@@ -18163,7 +18228,7 @@ var MastraModelOutput = class extends chunkDGV2FWB4_cjs.MastraBase {
                     options.tracingContext,
                     self.#options.requestContext
                   );
-                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkVRFSEZBA_cjs.MessageList.coreContentToString(m.content)).join("\n");
+                  const outputText = self.messageList.get.response.aiV4.core().map((m) => chunkYBEW5YWC_cjs.MessageList.coreContentToString(m.content)).join("\n");
                   self.#delayedPromises.text.resolve(outputText);
                   self.#delayedPromises.finishReason.resolve(self.#finishReason);
                   if (chunk.payload.metadata) {
@@ -18811,5 +18876,5 @@ exports.tryStreamWithJsonFallback = tryStreamWithJsonFallback;
 exports.validateStepInput = validateStepInput;
 exports.validateStepResumeData = validateStepResumeData;
 exports.validateStepSuspendData = validateStepSuspendData;
-//# sourceMappingURL=chunk-NN3NOFRU.cjs.map
-//# sourceMappingURL=chunk-NN3NOFRU.cjs.map
+//# sourceMappingURL=chunk-RBBEMTMA.cjs.map
+//# sourceMappingURL=chunk-RBBEMTMA.cjs.map