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

package/dist/{chunk-5NGEKEU7.js → chunk-P2IJ74UW.js}

@@ -1,14 +1,14 @@
 import { DefaultVoice } from './chunk-XM2ASGWH.js';
 import { EMITTER_SYMBOL } from './chunk-GK5V7YTQ.js';
 import { InstrumentClass, Telemetry } from './chunk-76MWMAR7.js';
-import { MastraLLMV1 } from './chunk-BRNBKCHE.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-C5C4PN54.js';
+import { MastraLLMV1 } from './chunk-CKM2ESZF.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-F4SQXAXR.js';
 import { executeHook } from './chunk-TTELJD4F.js';
-import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-FLXWZUIG.js';
+import { ensureToolProperties, makeCoreTool, createMastraProxy, delay } from './chunk-WWQ3QRPF.js';
 import { RuntimeContext } from './chunk-HLRWYUFN.js';
 import { ToolStream } from './chunk-YW7UILPE.js';
-import { Tool } from './chunk-IVGAHFAJ.js';
-import { getSelectedAITracing, wrapMastra } from './chunk-WOTBMZCN.js';
+import { Tool } from './chunk-BJGHUKKM.js';
+import { getOrCreateSpan, wrapMastra, selectFields } from './chunk-LOYT3WUA.js';
 import { MastraError } from './chunk-MCOVMKIS.js';
 import { MastraBase } from './chunk-6GF5M4GX.js';
 import { ConsoleLogger, RegisteredLogger } from './chunk-X3GXU6TZ.js';
@@ -64,230 +64,17 @@ var require_fast_deep_equal = __commonJS({
 // src/agent/index.ts
 var import_fast_deep_equal = __toESM(require_fast_deep_equal(), 1);
 
-// src/agent/trip-wire.ts
-var TripWire = class extends Error {
-  constructor(reason) {
-    super(reason);
-    Object.setPrototypeOf(this, new.target.prototype);
-  }
-};
-
-// src/processors/runner.ts
-var ProcessorState = class {
-  constructor(processorName) {
-    this.processorName = processorName;
-  }
-  accumulatedText = "";
-  customState = {};
-  streamParts = [];
-  // Internal methods for the runner
-  addPart(part) {
-    if (part.type === "text-delta") {
-      this.accumulatedText += part.payload.text;
-    }
-    this.streamParts.push(part);
-  }
-};
-var ProcessorRunner = class {
-  inputProcessors;
-  outputProcessors;
-  logger;
-  agentName;
-  constructor({
-    inputProcessors,
-    outputProcessors,
-    logger,
-    agentName
-  }) {
-    this.inputProcessors = inputProcessors ?? [];
-    this.outputProcessors = outputProcessors ?? [];
-    this.logger = logger;
-    this.agentName = agentName;
-  }
-  async runOutputProcessors(messageList, telemetry) {
-    const responseMessages = messageList.clear.response.v2();
-    let processableMessages = [...responseMessages];
-    const ctx = {
-      abort: () => {
-        throw new TripWire("Tripwire triggered");
-      }
-    };
-    for (const [index, processor] of this.outputProcessors.entries()) {
-      const abort = reason => {
-        throw new TripWire(reason || `Tripwire triggered by ${processor.name}`);
-      };
-      ctx.abort = abort;
-      const processMethod = processor.processOutputResult?.bind(processor);
-      if (!processMethod) {
-        continue;
-      }
-      if (!telemetry) {
-        processableMessages = await processMethod({
-          messages: processableMessages,
-          abort: ctx.abort
-        });
-      } else {
-        await telemetry.traceMethod(async () => {
-          processableMessages = await processMethod({
-            messages: processableMessages,
-            abort: ctx.abort
-          });
-          return processableMessages;
-        }, {
-          spanName: `agent.outputProcessor.${processor.name}`,
-          attributes: {
-            "processor.name": processor.name,
-            "processor.index": index.toString(),
-            "processor.total": this.outputProcessors.length.toString()
-          }
-        })();
-      }
-    }
-    if (processableMessages.length > 0) {
-      messageList.add(processableMessages, "response");
-    }
-    return messageList;
-  }
-  /**
-   * Process a stream part through all output processors with state management
-   */
-  async processPart(part, processorStates) {
-    if (!this.outputProcessors.length) {
-      return {
-        part,
-        blocked: false
-      };
-    }
-    try {
-      let processedPart = part;
-      for (const processor of this.outputProcessors) {
-        try {
-          if (processor.processOutputStream && processedPart) {
-            let state = processorStates.get(processor.name);
-            if (!state) {
-              state = new ProcessorState(processor.name);
-              processorStates.set(processor.name, state);
-            }
-            state.addPart(processedPart);
-            const result = await processor.processOutputStream({
-              part: processedPart,
-              streamParts: state.streamParts,
-              state: state.customState,
-              abort: reason => {
-                throw new TripWire(reason || `Stream part blocked by ${processor.name}`);
-              }
-            });
-            processedPart = result;
-          }
-        } catch (error) {
-          if (error instanceof TripWire) {
-            return {
-              part: null,
-              blocked: true,
-              reason: error.message
-            };
-          }
-          this.logger.error(`[Agent:${this.agentName}] - Output processor ${processor.name} failed:`, error);
-        }
-      }
-      return {
-        part: processedPart,
-        blocked: false
-      };
-    } catch (error) {
-      this.logger.error(`[Agent:${this.agentName}] - Stream part processing failed:`, error);
-      return {
-        part,
-        blocked: false
-      };
-    }
-  }
-  async runOutputProcessorsForStream(streamResult) {
-    return new ReadableStream({
-      start: async controller => {
-        const reader = streamResult.fullStream.getReader();
-        const processorStates = /* @__PURE__ */new Map();
-        try {
-          while (true) {
-            const {
-              done,
-              value
-            } = await reader.read();
-            if (done) {
-              controller.close();
-              break;
-            }
-            const {
-              part: processedPart,
-              blocked,
-              reason
-            } = await this.processPart(value, processorStates);
-            if (blocked) {
-              void this.logger.debug(`[Agent:${this.agentName}] - Stream part blocked by output processor`, {
-                reason,
-                originalPart: value
-              });
-              controller.enqueue({
-                type: "tripwire",
-                tripwireReason: reason || "Output processor blocked content"
-              });
-              controller.close();
-              break;
-            } else if (processedPart !== null) {
-              controller.enqueue(processedPart);
-            }
-          }
-        } catch (error) {
-          controller.error(error);
-        }
-      }
-    });
-  }
-  async runInputProcessors(messageList, telemetry) {
-    const userMessages = messageList.clear.input.v2();
-    let processableMessages = [...userMessages];
-    const ctx = {
-      abort: () => {
-        throw new TripWire("Tripwire triggered");
-      }
-    };
-    for (const [index, processor] of this.inputProcessors.entries()) {
-      const abort = reason => {
-        throw new TripWire(reason || `Tripwire triggered by ${processor.name}`);
-      };
-      ctx.abort = abort;
-      const processMethod = processor.processInput?.bind(processor);
-      if (!processMethod) {
-        continue;
-      }
-      if (!telemetry) {
-        processableMessages = await processMethod({
-          messages: processableMessages,
-          abort: ctx.abort
-        });
-      } else {
-        await telemetry.traceMethod(async () => {
-          processableMessages = await processMethod({
-            messages: processableMessages,
-            abort: ctx.abort
-          });
-          return processableMessages;
-        }, {
-          spanName: `agent.inputProcessor.${processor.name}`,
-          attributes: {
-            "processor.name": processor.name,
-            "processor.index": index.toString(),
-            "processor.total": this.inputProcessors.length.toString()
-          }
-        })();
-      }
-    }
-    if (processableMessages.length > 0) {
-      messageList.add(processableMessages, "user");
-    }
-    return messageList;
+// src/stream/aisdk/v5/compat/ui-message.ts
+function getResponseUIMessageId({
+  originalMessages,
+  responseMessageId
+}) {
+  if (originalMessages == null) {
+    return void 0;
   }
-};
+  const lastMessage = originalMessages[originalMessages.length - 1];
+  return lastMessage?.role === "assistant" ? lastMessage.id : typeof responseMessageId === "function" ? responseMessageId() : responseMessageId;
+}
 function convertFullStreamChunkToUIMessageStream({
   part,
   messageMetadataValue,
@@ -540,16 +327,6 @@ function convertFullStreamChunkToUIMessageStream({
       }
   }
 }
-function getResponseUIMessageId({
-  originalMessages,
-  responseMessageId
-}) {
-  if (originalMessages == null) {
-    return void 0;
-  }
-  const lastMessage = originalMessages[originalMessages.length - 1];
-  return lastMessage?.role === "assistant" ? lastMessage.id : typeof responseMessageId === "function" ? responseMessageId() : responseMessageId;
-}
 async function safeValidateTypes({
   value,
   schema
@@ -582,6 +359,49 @@ async function safeValidateTypes({
     };
   }
 }
+
+// src/stream/aisdk/v5/compat/delayed-promise.ts
+var DelayedPromise = class {
+  status = {
+    type: "pending"
+  };
+  _promise;
+  _resolve = void 0;
+  _reject = void 0;
+  get promise() {
+    if (this._promise) {
+      return this._promise;
+    }
+    this._promise = new Promise((resolve, reject) => {
+      if (this.status.type === "resolved") {
+        resolve(this.status.value);
+      } else if (this.status.type === "rejected") {
+        reject(this.status.error);
+      }
+      this._resolve = resolve;
+      this._reject = reject;
+    });
+    return this._promise;
+  }
+  resolve(value) {
+    this.status = {
+      type: "resolved",
+      value
+    };
+    if (this._promise) {
+      this._resolve?.(value);
+    }
+  }
+  reject(error) {
+    this.status = {
+      type: "rejected",
+      error
+    };
+    if (this._promise) {
+      this._reject?.(error);
+    }
+  }
+};
 function prepareToolsAndToolChoice({
   tools,
   toolChoice,
@@ -649,45 +469,234 @@ function prepareToolsAndToolChoice({
     }
   };
 }
-var DelayedPromise = class {
-  status = {
-    type: "pending"
-  };
-  _promise;
-  _resolve = void 0;
-  _reject = void 0;
-  get promise() {
-    if (this._promise) {
-      return this._promise;
+
+// src/agent/trip-wire.ts
+var TripWire = class extends Error {
+  constructor(reason) {
+    super(reason);
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+};
+
+// src/processors/runner.ts
+var ProcessorState = class {
+  constructor(processorName) {
+    this.processorName = processorName;
+  }
+  accumulatedText = "";
+  customState = {};
+  streamParts = [];
+  // Internal methods for the runner
+  addPart(part) {
+    if (part.type === "text-delta") {
+      this.accumulatedText += part.payload.text;
     }
-    this._promise = new Promise((resolve, reject) => {
-      if (this.status.type === "resolved") {
-        resolve(this.status.value);
-      } else if (this.status.type === "rejected") {
-        reject(this.status.error);
+    this.streamParts.push(part);
+  }
+};
+var ProcessorRunner = class {
+  inputProcessors;
+  outputProcessors;
+  logger;
+  agentName;
+  constructor({
+    inputProcessors,
+    outputProcessors,
+    logger,
+    agentName
+  }) {
+    this.inputProcessors = inputProcessors ?? [];
+    this.outputProcessors = outputProcessors ?? [];
+    this.logger = logger;
+    this.agentName = agentName;
+  }
+  async runOutputProcessors(messageList, tracingContext, telemetry) {
+    const responseMessages = messageList.clear.response.v2();
+    let processableMessages = [...responseMessages];
+    const ctx = {
+      abort: () => {
+        throw new TripWire("Tripwire triggered");
+      }
+    };
+    for (const [index, processor] of this.outputProcessors.entries()) {
+      const abort = reason => {
+        throw new TripWire(reason || `Tripwire triggered by ${processor.name}`);
+      };
+      ctx.abort = abort;
+      const processMethod = processor.processOutputResult?.bind(processor);
+      if (!processMethod) {
+        continue;
+      }
+      if (!telemetry) {
+        processableMessages = await processMethod({
+          messages: processableMessages,
+          abort: ctx.abort,
+          tracingContext
+        });
+      } else {
+        await telemetry.traceMethod(async () => {
+          processableMessages = await processMethod({
+            messages: processableMessages,
+            abort: ctx.abort,
+            tracingContext
+          });
+          return processableMessages;
+        }, {
+          spanName: `agent.outputProcessor.${processor.name}`,
+          attributes: {
+            "processor.name": processor.name,
+            "processor.index": index.toString(),
+            "processor.total": this.outputProcessors.length.toString()
+          }
+        })();
+      }
+    }
+    if (processableMessages.length > 0) {
+      messageList.add(processableMessages, "response");
+    }
+    return messageList;
+  }
+  /**
+   * Process a stream part through all output processors with state management
+   */
+  async processPart(part, processorStates, tracingContext) {
+    if (!this.outputProcessors.length) {
+      return {
+        part,
+        blocked: false
+      };
+    }
+    try {
+      let processedPart = part;
+      for (const processor of this.outputProcessors) {
+        try {
+          if (processor.processOutputStream && processedPart) {
+            let state = processorStates.get(processor.name);
+            if (!state) {
+              state = new ProcessorState(processor.name);
+              processorStates.set(processor.name, state);
+            }
+            state.addPart(processedPart);
+            const result = await processor.processOutputStream({
+              part: processedPart,
+              streamParts: state.streamParts,
+              state: state.customState,
+              abort: reason => {
+                throw new TripWire(reason || `Stream part blocked by ${processor.name}`);
+              },
+              tracingContext
+            });
+            processedPart = result;
+          }
+        } catch (error) {
+          if (error instanceof TripWire) {
+            return {
+              part: null,
+              blocked: true,
+              reason: error.message
+            };
+          }
+          this.logger.error(`[Agent:${this.agentName}] - Output processor ${processor.name} failed:`, error);
+        }
+      }
+      return {
+        part: processedPart,
+        blocked: false
+      };
+    } catch (error) {
+      this.logger.error(`[Agent:${this.agentName}] - Stream part processing failed:`, error);
+      return {
+        part,
+        blocked: false
+      };
+    }
+  }
+  async runOutputProcessorsForStream(streamResult, tracingContext) {
+    return new ReadableStream({
+      start: async controller => {
+        const reader = streamResult.fullStream.getReader();
+        const processorStates = /* @__PURE__ */new Map();
+        try {
+          while (true) {
+            const {
+              done,
+              value
+            } = await reader.read();
+            if (done) {
+              controller.close();
+              break;
+            }
+            const {
+              part: processedPart,
+              blocked,
+              reason
+            } = await this.processPart(value, processorStates, tracingContext);
+            if (blocked) {
+              void this.logger.debug(`[Agent:${this.agentName}] - Stream part blocked by output processor`, {
+                reason,
+                originalPart: value
+              });
+              controller.enqueue({
+                type: "tripwire",
+                tripwireReason: reason || "Output processor blocked content"
+              });
+              controller.close();
+              break;
+            } else if (processedPart !== null) {
+              controller.enqueue(processedPart);
+            }
+          }
+        } catch (error) {
+          controller.error(error);
+        }
       }
-      this._resolve = resolve;
-      this._reject = reject;
     });
-    return this._promise;
   }
-  resolve(value) {
-    this.status = {
-      type: "resolved",
-      value
+  async runInputProcessors(messageList, tracingContext, telemetry) {
+    const userMessages = messageList.clear.input.v2();
+    let processableMessages = [...userMessages];
+    const ctx = {
+      abort: () => {
+        throw new TripWire("Tripwire triggered");
+      }
     };
-    if (this._promise) {
-      this._resolve?.(value);
+    for (const [index, processor] of this.inputProcessors.entries()) {
+      const abort = reason => {
+        throw new TripWire(reason || `Tripwire triggered by ${processor.name}`);
+      };
+      ctx.abort = abort;
+      const processMethod = processor.processInput?.bind(processor);
+      if (!processMethod) {
+        continue;
+      }
+      if (!telemetry) {
+        processableMessages = await processMethod({
+          messages: processableMessages,
+          abort: ctx.abort,
+          tracingContext
+        });
+      } else {
+        await telemetry.traceMethod(async () => {
+          processableMessages = await processMethod({
+            messages: processableMessages,
+            abort: ctx.abort,
+            tracingContext
+          });
+          return processableMessages;
+        }, {
+          spanName: `agent.inputProcessor.${processor.name}`,
+          attributes: {
+            "processor.name": processor.name,
+            "processor.index": index.toString(),
+            "processor.total": this.inputProcessors.length.toString()
+          }
+        })();
+      }
     }
-  }
-  reject(error) {
-    this.status = {
-      type: "rejected",
-      error
-    };
-    if (this._promise) {
-      this._reject?.(error);
+    if (processableMessages.length > 0) {
+      messageList.add(processableMessages, "user");
     }
+    return messageList;
   }
 };
 function getTransformedSchema(schema) {
@@ -3285,7 +3294,9 @@ function createLLMExecutionStep({
   toolCallStreaming,
   controller,
   output,
-  headers
+  headers,
+  downloadRetries,
+  downloadConcurrency
 }) {
   return createStep({
     id: "llm-execution",
@@ -3306,11 +3317,16 @@ function createLLMExecutionStep({
       switch (model.specificationVersion) {
         case "v2":
           {
+            const inputMessages = await messageList.get.all.aiV5.llmPrompt({
+              downloadRetries,
+              downloadConcurrency,
+              supportedUrls: model?.supportedUrls
+            });
             modelResult = execute({
               runId,
               model,
               providerOptions,
-              inputMessages: messageList.get.all.aiV5.llmPrompt(),
+              inputMessages,
               tools,
               toolChoice,
               options,
@@ -3727,12 +3743,23 @@ function workflowLoopStream({
   modelSettings,
   _internal,
   modelStreamSpan,
+  llmAISpan,
   ...rest
 }) {
   return new ReadableStream$1({
     start: async controller => {
       const writer = new WritableStream({
         write: chunk => {
+          if (llmAISpan && chunk.type === "text-delta") {
+            llmAISpan.createEventSpan({
+              type: "llm_chunk" /* LLM_CHUNK */,
+              name: `llm chunk: ${chunk.type}`,
+              output: chunk.payload.text,
+              attributes: {
+                chunkType: chunk.type
+              }
+            });
+          }
           controller.enqueue(chunk);
         }
       });
@@ -3833,6 +3860,9 @@ function workflowLoopStream({
             user: rest.messageList.get.input.aiV5.model(),
             nonUser: []
           }
+        },
+        tracingContext: {
+          currentSpan: llmAISpan
         }
       });
       if (executionResult.status !== "success") {
@@ -3875,6 +3905,7 @@ function loop({
   _internal,
   mode = "stream",
   outputProcessors,
+  llmAISpan,
   ...rest
 }) {
   let loggerToUse = logger || new ConsoleLogger({
@@ -3932,6 +3963,7 @@ function loop({
     telemetry_settings,
     modelSettings,
     outputProcessors,
+    llmAISpan,
     ...rest
   };
   const streamFn = workflowLoopStream(workflowLoopProps);
@@ -4043,7 +4075,9 @@ var MastraLLMVNext = class extends MastraBase {
     resourceId,
     output,
     options,
-    outputProcessors
+    outputProcessors,
+    providerOptions,
+    tracingContext
     // ...rest
   }) {
     let stopWhenToUse;
@@ -4063,6 +4097,20 @@ var MastraLLMVNext = class extends MastraBase {
     if (output) {
       output = this._applySchemaCompat(output);
     }
+    const llmAISpan = tracingContext?.currentSpan?.createChildSpan({
+      name: `llm stream: '${model.modelId}'`,
+      type: "llm_generation" /* LLM_GENERATION */,
+      input: messages,
+      attributes: {
+        model: model.modelId,
+        provider: model.provider,
+        streaming: true
+      },
+      metadata: {
+        threadId,
+        resourceId
+      }
+    });
     try {
       const messageList = new MessageList({
         threadId,
@@ -4076,12 +4124,14 @@ var MastraLLMVNext = class extends MastraBase {
         stopWhen: stopWhenToUse,
         toolChoice,
         modelSettings,
+        providerOptions,
         telemetry_settings: {
           ...this.experimental_telemetry,
           ...telemetry_settings
         },
         output,
         outputProcessors,
+        llmAISpan,
         options: {
           ...options,
           onStepFinish: async props => {
@@ -4164,7 +4214,11 @@ var MastraLLMVNext = class extends MastraBase {
           }
         }
       };
-      return loop(loopOptions);
+      const result = loop(loopOptions);
+      llmAISpan?.end({
+        output: result
+      });
+      return result;
     } catch (e) {
       const mastraError = new MastraError({
         id: "LLM_STREAM_TEXT_AI_SDK_EXECUTION_FAILED",
@@ -4178,6 +4232,9 @@ var MastraLLMVNext = class extends MastraBase {
           resourceId: resourceId ?? "unknown"
         }
       }, e);
+      llmAISpan?.error({
+        error: mastraError
+      });
       throw mastraError;
     }
   }
@@ -4341,6 +4398,7 @@ function runScorer({
   input,
   output,
   runtimeContext,
+  tracingContext,
   entity,
   structuredOutput,
   source,
@@ -4373,6 +4431,7 @@ function runScorer({
     input,
     output,
     runtimeContext: Object.fromEntries(runtimeContext.entries()),
+    tracingContext,
     runId,
     source,
     entity,
@@ -7586,7 +7645,8 @@ var ModerationProcessor = class _ModerationProcessor {
     try {
       const {
         messages,
-        abort
+        abort,
+        tracingContext
       } = args;
       if (messages.length === 0) {
         return messages;
@@ -7598,7 +7658,7 @@ var ModerationProcessor = class _ModerationProcessor {
           passedMessages.push(message);
           continue;
         }
-        const moderationResult = await this.moderateContent(textContent);
+        const moderationResult = await this.moderateContent(textContent, false, tracingContext);
         if (this.isModerationFlagged(moderationResult)) {
           this.handleFlaggedContent(moderationResult, this.strategy, abort);
           if (this.strategy === "filter") {
@@ -7623,13 +7683,14 @@ var ModerationProcessor = class _ModerationProcessor {
       const {
         part,
         streamParts,
-        abort
+        abort,
+        tracingContext
       } = args;
       if (part.type !== "text-delta") {
         return part;
       }
       const contentToModerate = this.buildContextFromChunks(streamParts);
-      const moderationResult = await this.moderateContent(contentToModerate, true);
+      const moderationResult = await this.moderateContent(contentToModerate, true, tracingContext);
       if (this.isModerationFlagged(moderationResult)) {
         this.handleFlaggedContent(moderationResult, this.strategy, abort);
         if (this.strategy === "filter") {
@@ -7648,7 +7709,7 @@ var ModerationProcessor = class _ModerationProcessor {
   /**
    * Moderate content using the internal agent
    */
-  async moderateContent(content, isStream = false) {
+  async moderateContent(content, isStream = false, tracingContext) {
     const prompt = this.createModerationPrompt(content, isStream);
     try {
       const model = await this.moderationAgent.getModel();
@@ -7665,12 +7726,14 @@ var ModerationProcessor = class _ModerationProcessor {
           output: schema,
           modelSettings: {
             temperature: 0
-          }
+          },
+          tracingContext
         });
       } else {
         response = await this.moderationAgent.generate(prompt, {
           output: schema,
-          temperature: 0
+          temperature: 0,
+          tracingContext
         });
       }
       const result = response.object;
@@ -7823,7 +7886,8 @@ var PromptInjectionDetector = class _PromptInjectionDetector {
     try {
       const {
         messages,
-        abort
+        abort,
+        tracingContext
       } = args;
       if (messages.length === 0) {
         return messages;
@@ -7835,7 +7899,7 @@ var PromptInjectionDetector = class _PromptInjectionDetector {
           processedMessages.push(message);
           continue;
         }
-        const detectionResult = await this.detectPromptInjection(textContent);
+        const detectionResult = await this.detectPromptInjection(textContent, tracingContext);
         if (this.isInjectionFlagged(detectionResult)) {
           const processedMessage = this.handleDetectedInjection(message, detectionResult, this.strategy, abort);
           if (this.strategy === "filter") {
@@ -7860,7 +7924,7 @@ var PromptInjectionDetector = class _PromptInjectionDetector {
   /**
    * Detect prompt injection using the internal agent
    */
-  async detectPromptInjection(content) {
+  async detectPromptInjection(content, tracingContext) {
     const prompt = this.createDetectionPrompt(content);
     try {
       const model = await this.detectionAgent.getModel();
@@ -7878,12 +7942,14 @@ var PromptInjectionDetector = class _PromptInjectionDetector {
           output: schema,
           modelSettings: {
             temperature: 0
-          }
+          },
+          tracingContext
         });
       } else {
         response = await this.detectionAgent.generate(prompt, {
           output: schema,
-          temperature: 0
+          temperature: 0,
+          tracingContext
         });
       }
       const result = response.object;
@@ -8054,7 +8120,8 @@ var PIIDetector = class _PIIDetector {
     try {
       const {
         messages,
-        abort
+        abort,
+        tracingContext
       } = args;
       if (messages.length === 0) {
         return messages;
@@ -8066,7 +8133,7 @@ var PIIDetector = class _PIIDetector {
           processedMessages.push(message);
           continue;
         }
-        const detectionResult = await this.detectPII(textContent);
+        const detectionResult = await this.detectPII(textContent, tracingContext);
         if (this.isPIIFlagged(detectionResult)) {
           const processedMessage = this.handleDetectedPII(message, detectionResult, this.strategy, abort);
           if (this.strategy === "filter") {
@@ -8093,7 +8160,7 @@ var PIIDetector = class _PIIDetector {
   /**
    * Detect PII using the internal agent
    */
-  async detectPII(content) {
+  async detectPII(content, tracingContext) {
     const prompt = this.createDetectionPrompt(content);
     const schema = z.object({
       categories: z.object(this.detectionTypes.reduce((props, type) => {
@@ -8118,12 +8185,14 @@ var PIIDetector = class _PIIDetector {
           output: schema,
           modelSettings: {
             temperature: 0
-          }
+          },
+          tracingContext
         });
       } else {
         response = await this.detectionAgent.generate(prompt, {
           output: schema,
-          temperature: 0
+          temperature: 0,
+          tracingContext
         });
       }
       const result = response.object;
@@ -8317,7 +8386,8 @@ IMPORTANT: IF NO PII IS DETECTED, RETURN AN EMPTY OBJECT, DO NOT INCLUDE ANYTHIN
   async processOutputStream(args) {
     const {
       part,
-      abort
+      abort,
+      tracingContext
     } = args;
     try {
       if (part.type !== "text-delta") {
@@ -8327,7 +8397,7 @@ IMPORTANT: IF NO PII IS DETECTED, RETURN AN EMPTY OBJECT, DO NOT INCLUDE ANYTHIN
       if (!textContent.trim()) {
         return part;
       }
-      const detectionResult = await this.detectPII(textContent);
+      const detectionResult = await this.detectPII(textContent, tracingContext);
       if (this.isPIIFlagged(detectionResult)) {
         switch (this.strategy) {
           case "block":
@@ -9345,6 +9415,7 @@ var Agent = class extends (_a = MastraBase) {
   async generateTitleFromUserMessage({
     message,
     runtimeContext = new RuntimeContext(),
+    tracingContext,
     model,
     instructions
   }) {
@@ -9377,6 +9448,7 @@ var Agent = class extends (_a = MastraBase) {
     if (llm.getModel().specificationVersion === "v2") {
       const result = llm.stream({
         runtimeContext,
+        tracingContext,
         messages: [{
           role: "system",
           content: systemInstructions
@@ -9389,6 +9461,7 @@ var Agent = class extends (_a = MastraBase) {
     } else {
       const result = await llm.__text({
         runtimeContext,
+        tracingContext,
         messages: [{
           role: "system",
           content: systemInstructions
@@ -9406,7 +9479,7 @@ var Agent = class extends (_a = MastraBase) {
     const userMessages = messages.filter(message => message.role === "user");
     return userMessages.at(-1);
   }
-  async genTitle(userMessage, runtimeContext, model, instructions) {
+  async genTitle(userMessage, runtimeContext, tracingContext, model, instructions) {
     try {
       if (userMessage) {
         const normMessage = new MessageList().add(userMessage, "user").get.all.ui().at(-1);
@@ -9414,6 +9487,7 @@ var Agent = class extends (_a = MastraBase) {
           return await this.generateTitleFromUserMessage({
             message: normMessage,
             runtimeContext,
+            tracingContext,
             model,
             instructions
           });
@@ -9505,8 +9579,8 @@ var Agent = class extends (_a = MastraBase) {
     resourceId,
     threadId,
     runtimeContext,
-    mastraProxy,
-    agentAISpan
+    tracingContext,
+    mastraProxy
   }) {
     let convertedMemoryTools = {};
     const memory = await this.getMemory({
@@ -9529,10 +9603,10 @@ var Agent = class extends (_a = MastraBase) {
           memory,
           agentName: this.name,
           runtimeContext,
+          tracingContext,
           model: typeof this.model === "function" ? await this.getModel({
             runtimeContext
-          }) : this.model,
-          agentAISpan
+          }) : this.model
         };
         const convertedToCoreTool = makeCoreTool(toolObj, options);
         convertedMemoryTools[toolName] = convertedToCoreTool;
@@ -9542,6 +9616,7 @@ var Agent = class extends (_a = MastraBase) {
   }
   async __runInputProcessors({
     runtimeContext,
+    tracingContext,
     messageList,
     inputProcessorOverrides
   }) {
@@ -9552,13 +9627,13 @@ var Agent = class extends (_a = MastraBase) {
         runtimeContext,
         inputProcessorOverrides
       });
-      const tracedRunInputProcessors = messageList2 => {
+      const tracedRunInputProcessors = (messageList2, tracingContext2) => {
         const telemetry = this.#mastra?.getTelemetry();
         if (!telemetry) {
-          return runner.runInputProcessors(messageList2, void 0);
+          return runner.runInputProcessors(messageList2, tracingContext2, void 0);
         }
         return telemetry.traceMethod(async data => {
-          return runner.runInputProcessors(data.messageList, telemetry);
+          return runner.runInputProcessors(data.messageList, tracingContext2, telemetry);
         }, {
           spanName: `agent.${this.name}.inputProcessors`,
           attributes: {
@@ -9571,7 +9646,7 @@ var Agent = class extends (_a = MastraBase) {
         });
       };
       try {
-        messageList = await tracedRunInputProcessors(messageList);
+        messageList = await tracedRunInputProcessors(messageList, tracingContext);
       } catch (error) {
         if (error instanceof TripWire) {
           tripwireTriggered = true;
@@ -9594,6 +9669,7 @@ var Agent = class extends (_a = MastraBase) {
   }
   async __runOutputProcessors({
     runtimeContext,
+    tracingContext,
     messageList,
     outputProcessorOverrides
   }) {
@@ -9604,13 +9680,13 @@ var Agent = class extends (_a = MastraBase) {
         runtimeContext,
         outputProcessorOverrides
       });
-      const tracedRunOutputProcessors = messageList2 => {
+      const tracedRunOutputProcessors = (messageList2, tracingContext2) => {
         const telemetry = this.#mastra?.getTelemetry();
         if (!telemetry) {
-          return runner.runOutputProcessors(messageList2, void 0);
+          return runner.runOutputProcessors(messageList2, tracingContext2, void 0);
         }
         return telemetry.traceMethod(async data => {
-          return runner.runOutputProcessors(data.messageList, telemetry);
+          return runner.runOutputProcessors(data.messageList, tracingContext2, telemetry);
         }, {
           spanName: `agent.${this.name}.outputProcessors`,
           attributes: {
@@ -9623,7 +9699,7 @@ var Agent = class extends (_a = MastraBase) {
         });
       };
       try {
-        messageList = await tracedRunOutputProcessors(messageList);
+        messageList = await tracedRunOutputProcessors(messageList, tracingContext);
       } catch (e) {
         if (e instanceof TripWire) {
           tripwireTriggered = true;
@@ -9662,13 +9738,13 @@ var Agent = class extends (_a = MastraBase) {
     }).then(r => r.messagesV2);
   }
   async getAssignedTools({
-    runtimeContext,
     runId,
     resourceId,
     threadId,
+    runtimeContext,
+    tracingContext,
     mastraProxy,
-    writableStream,
-    agentAISpan
+    writableStream
   }) {
     let toolsForRequest = {};
     this.logger.debug(`[Agents:${this.name}] - Assembling assigned tools`, {
@@ -9697,11 +9773,11 @@ var Agent = class extends (_a = MastraBase) {
         memory,
         agentName: this.name,
         runtimeContext,
+        tracingContext,
         model: typeof this.model === "function" ? await this.getModel({
           runtimeContext
         }) : this.model,
-        writableStream,
-        agentAISpan
+        writableStream
       };
       return [k, makeCoreTool(tool, options)];
     }));
@@ -9717,8 +9793,8 @@ var Agent = class extends (_a = MastraBase) {
     resourceId,
     toolsets,
     runtimeContext,
-    mastraProxy,
-    agentAISpan
+    tracingContext,
+    mastraProxy
   }) {
     let toolsForRequest = {};
     const memory = await this.getMemory({
@@ -9742,10 +9818,10 @@ var Agent = class extends (_a = MastraBase) {
             memory,
             agentName: this.name,
             runtimeContext,
+            tracingContext,
             model: typeof this.model === "function" ? await this.getModel({
               runtimeContext
-            }) : this.model,
-            agentAISpan
+            }) : this.model
           };
           const convertedToCoreTool = makeCoreTool(toolObj, options, "toolset");
           toolsForRequest[toolName] = convertedToCoreTool;
@@ -9759,9 +9835,9 @@ var Agent = class extends (_a = MastraBase) {
     threadId,
     resourceId,
     runtimeContext,
+    tracingContext,
     mastraProxy,
-    clientTools,
-    agentAISpan
+    clientTools
   }) {
     let toolsForRequest = {};
     const memory = await this.getMemory({
@@ -9787,10 +9863,10 @@ var Agent = class extends (_a = MastraBase) {
           memory,
           agentName: this.name,
           runtimeContext,
+          tracingContext,
           model: typeof this.model === "function" ? await this.getModel({
             runtimeContext
-          }) : this.model,
-          agentAISpan
+          }) : this.model
         };
         const convertedToCoreTool = makeCoreTool(rest, options, "client-tool");
         toolsForRequest[toolName] = convertedToCoreTool;
@@ -9803,7 +9879,7 @@ var Agent = class extends (_a = MastraBase) {
     threadId,
     resourceId,
     runtimeContext,
-    agentAISpan
+    tracingContext
   }) {
     let convertedWorkflowTools = {};
     const workflows = await this.getWorkflows({
@@ -9820,7 +9896,7 @@ var Agent = class extends (_a = MastraBase) {
           // manually wrap workflow tools with ai tracing, so that we can pass the
           // current tool span onto the workflow to maintain continuity of the trace
           execute: async args => {
-            const toolAISpan = agentAISpan?.createChildSpan({
+            const toolAISpan = tracingContext.currentSpan?.createChildSpan({
               type: "tool_call" /* TOOL_CALL */,
               name: `tool: '${workflowName}'`,
               input: args,
@@ -9842,7 +9918,9 @@ var Agent = class extends (_a = MastraBase) {
               const result = await run.start({
                 inputData: args,
                 runtimeContext,
-                currentSpan: toolAISpan
+                tracingContext: {
+                  currentSpan: toolAISpan
+                }
               });
               toolAISpan?.end({
                 output: result
@@ -9882,8 +9960,8 @@ var Agent = class extends (_a = MastraBase) {
     resourceId,
     runId,
     runtimeContext,
-    writableStream,
-    agentAISpan
+    tracingContext,
+    writableStream
   }) {
     let mastraProxy = void 0;
     const logger = this.logger;
@@ -9898,42 +9976,42 @@ var Agent = class extends (_a = MastraBase) {
       resourceId,
       threadId,
       runtimeContext,
+      tracingContext,
       mastraProxy,
-      writableStream,
-      agentAISpan
+      writableStream
     });
     const memoryTools = await this.getMemoryTools({
       runId,
       resourceId,
       threadId,
       runtimeContext,
-      mastraProxy,
-      agentAISpan
+      tracingContext,
+      mastraProxy
     });
     const toolsetTools = await this.getToolsets({
       runId,
       resourceId,
       threadId,
       runtimeContext,
+      tracingContext,
       mastraProxy,
-      toolsets,
-      agentAISpan
+      toolsets
     });
     const clientSideTools = await this.getClientTools({
       runId,
       resourceId,
       threadId,
       runtimeContext,
+      tracingContext,
       mastraProxy,
-      clientTools,
-      agentAISpan
+      clientTools
     });
     const workflowTools = await this.getWorkflowTools({
       runId,
       resourceId,
       threadId,
       runtimeContext,
-      agentAISpan
+      tracingContext
     });
     return this.formatTools({
       ...assignedTools,
@@ -10018,7 +10096,7 @@ var Agent = class extends (_a = MastraBase) {
     runtimeContext,
     saveQueueManager,
     writableStream,
-    currentSpan
+    tracingContext
   }) {
     return {
       before: async () => {
@@ -10027,8 +10105,10 @@ var Agent = class extends (_a = MastraBase) {
             runId
           });
         }
-        const spanArgs = {
+        const agentAISpan = getOrCreateSpan({
+          type: "agent_run" /* AGENT_RUN */,
           name: `agent run: '${this.id}'`,
+          input: messages,
           attributes: {
             agentId: this.id,
             instructions,
@@ -10038,28 +10118,13 @@ var Agent = class extends (_a = MastraBase) {
             runId,
             resourceId,
             threadId: thread ? thread.id : void 0
-          }
+          },
+          tracingContext,
+          runtimeContext
+        });
+        const innerTracingContext = {
+          currentSpan: agentAISpan
         };
-        let agentAISpan;
-        if (currentSpan) {
-          agentAISpan = currentSpan.createChildSpan({
-            type: "agent_run" /* AGENT_RUN */,
-            ...spanArgs
-          });
-        } else {
-          const aiTracing = getSelectedAITracing({
-            runtimeContext
-          });
-          if (aiTracing) {
-            agentAISpan = aiTracing.startSpan({
-              type: "agent_run" /* AGENT_RUN */,
-              ...spanArgs,
-              startOptions: {
-                runtimeContext
-              }
-            });
-          }
-        }
         const memory = await this.getMemory({
           runtimeContext
         });
@@ -10083,8 +10148,8 @@ var Agent = class extends (_a = MastraBase) {
           resourceId,
           runId,
           runtimeContext,
-          writableStream,
-          agentAISpan
+          tracingContext: innerTracingContext,
+          writableStream
         });
         const messageList = new MessageList({
           threadId,
@@ -10103,6 +10168,7 @@ var Agent = class extends (_a = MastraBase) {
             tripwireReason: tripwireReason2
           } = await this.__runInputProcessors({
             runtimeContext,
+            tracingContext: innerTracingContext,
             messageList
           });
           return {
@@ -10235,6 +10301,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           tripwireReason
         } = await this.__runInputProcessors({
           runtimeContext,
+          tracingContext: innerTracingContext,
           messageList
         });
         const systemMessage = [...messageList.getSystemMessages(), ...messageList.getSystemMessages("memory")]?.map(m => m.content)?.join(`
@@ -10299,17 +10366,6 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             };
           })
         };
-        agentAISpan?.end({
-          output: {
-            text: result?.text,
-            object: result?.object
-          },
-          metadata: {
-            usage: result?.usage,
-            toolResults: result?.toolResults,
-            toolCalls: result?.toolCalls
-          }
-        });
         this.logger.debug(`[Agent:${this.name}] - Post processing LLM response`, {
           runId: runId2,
           result: resToLog,
@@ -10371,7 +10427,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
                 instructions: titleInstructions
               } = this.resolveTitleGenerationConfig(config?.threads?.generateTitle);
               if (shouldGenerate && userMessage) {
-                promises.push(this.genTitle(userMessage, runtimeContext, titleModel, titleInstructions).then(title => {
+                promises.push(this.genTitle(userMessage, runtimeContext, {
+                  currentSpan: agentAISpan
+                }, titleModel, titleInstructions).then(title => {
                   if (title) {
                     return memory.createThread({
                       threadId: thread2.id,
@@ -10388,6 +10446,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           } catch (e) {
             await saveQueueManager.flushMessages(messageList, threadId, memoryConfig2);
             if (e instanceof MastraError) {
+              agentAISpan?.error({
+                error: e
+              });
               throw e;
             }
             const mastraError = new MastraError({
@@ -10403,6 +10464,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             }, e);
             this.logger.trackException(mastraError);
             this.logger.error(mastraError.toString());
+            agentAISpan?.error({
+              error: mastraError
+            });
             throw mastraError;
           }
         } else {
@@ -10427,6 +10491,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           outputText,
           instructions,
           runtimeContext,
+          tracingContext: {
+            currentSpan: agentAISpan
+          },
           structuredOutput,
           overrideScorers,
           threadId,
@@ -10441,6 +10508,17 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           },
           output: messageList.getPersisted.response.ui()
         };
+        agentAISpan?.end({
+          output: {
+            text: result?.text,
+            object: result?.object
+          },
+          metadata: {
+            usage: result?.usage,
+            toolResults: result?.toolResults,
+            toolCalls: result?.toolCalls
+          }
+        });
         return {
           scoringData
         };
@@ -10453,6 +10531,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     outputText,
     instructions,
     runtimeContext,
+    tracingContext,
     structuredOutput,
     overrideScorers,
     threadId,
@@ -10474,9 +10553,15 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         });
       }
     }
-    const scorers = overrideScorers ?? (await this.getScorers({
-      runtimeContext
-    }));
+    let scorers = {};
+    try {
+      scorers = overrideScorers ? this.resolveOverrideScorerReferences(overrideScorers) : await this.getScorers({
+        runtimeContext
+      });
+    } catch (e) {
+      this.logger.warn(`[Agent:${this.name}] - Failed to get scorers: ${e}`);
+      return;
+    }
     const scorerInput = {
       inputMessages: messageList.getPersisted.input.ui(),
       rememberedMessages: messageList.getPersisted.remembered.ui(),
@@ -10487,12 +10572,13 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     if (Object.keys(scorers || {}).length > 0) {
       for (const [id, scorerObject] of Object.entries(scorers)) {
         runScorer({
-          scorerId: id,
+          scorerId: overrideScorers ? scorerObject.scorer.name : id,
           scorerObject,
           runId,
           input: scorerInput,
           output: scorerOutput,
           runtimeContext,
+          tracingContext,
           entity: {
             id: this.id,
             name: this.name
@@ -10506,6 +10592,41 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       }
     }
   }
+  resolveOverrideScorerReferences(overrideScorers) {
+    const result = {};
+    for (const [id, scorerObject] of Object.entries(overrideScorers)) {
+      if (typeof scorerObject.scorer === "string") {
+        try {
+          if (!this.#mastra) {
+            throw new MastraError({
+              id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
+              domain: "AGENT" /* AGENT */,
+              category: "USER" /* USER */,
+              text: `Mastra not found when fetching scorer. Make sure to fetch agent from mastra.getAgent()`
+            });
+          }
+          const scorer = this.#mastra.getScorerByName(scorerObject.scorer);
+          result[id] = {
+            scorer,
+            sampling: scorerObject.sampling
+          };
+        } catch (error) {
+          this.logger.warn(`[Agent:${this.name}] - Failed to get scorer ${scorerObject.scorer}: ${error}`);
+        }
+      } else {
+        result[id] = scorerObject;
+      }
+    }
+    if (Object.keys(result).length === 0) {
+      throw new MastraError({
+        id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
+        domain: "AGENT" /* AGENT */,
+        category: "USER" /* USER */,
+        text: `No scorers found in overrideScorers`
+      });
+    }
+    return result;
+  }
   async prepareLLMOptions(messages, options) {
     const {
       context,
@@ -10518,6 +10639,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       temperature,
       toolChoice = "auto",
       runtimeContext = new RuntimeContext(),
+      tracingContext,
       savePerStep,
       writableStream,
       ...args
@@ -10582,7 +10704,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       runtimeContext,
       saveQueueManager,
       writableStream,
-      currentSpan: args.tracingContext?.currentSpan
+      tracingContext
     });
     let messageList;
     let thread;
@@ -10649,7 +10771,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         result,
         outputText,
         structuredOutput = false,
-        agentAISpan
+        agentAISpan,
+        overrideScorers
       }) => {
         const afterResult = await after({
           result,
@@ -10661,7 +10784,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           messageList,
           structuredOutput,
           threadExists,
-          agentAISpan
+          agentAISpan,
+          overrideScorers
         });
         return afterResult;
       }
@@ -10685,6 +10809,22 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     const instructions = options.instructions || (await this.getInstructions({
       runtimeContext
     }));
+    const agentAISpan = getOrCreateSpan({
+      type: "agent_run" /* AGENT_RUN */,
+      name: `agent run: '${this.id}'`,
+      input: options.messages,
+      attributes: {
+        agentId: this.id,
+        instructions
+      },
+      metadata: {
+        runId,
+        resourceId,
+        threadId: threadFromArgs ? threadFromArgs.id : void 0
+      },
+      tracingContext: options.tracingContext,
+      runtimeContext
+    });
     const activeSpan = Telemetry.getActiveSpan();
     const baggageEntries = {};
     if (threadFromArgs?.id) {
@@ -10745,7 +10885,10 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           resourceId,
           runId,
           runtimeContext,
-          writableStream: options.writableStream
+          writableStream: options.writableStream,
+          tracingContext: {
+            currentSpan: agentAISpan
+          }
         });
         return {
           convertedTools
@@ -10763,7 +10906,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         tripwire: z$1.boolean().optional(),
         tripwireReason: z$1.string().optional()
       }),
-      execute: async () => {
+      execute: async ({
+        tracingContext
+      }) => {
         const thread = threadFromArgs;
         const messageList = new MessageList({
           threadId: thread?.id,
@@ -10782,6 +10927,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             tripwireReason: tripwireReason2
           } = await this.__runInputProcessors({
             runtimeContext,
+            tracingContext,
             messageList
           });
           return {
@@ -10869,7 +11015,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
 The following messages were remembered from a different conversation:
 <remembered_from_other_conversation>
 ${(() => {
-            let result = ``;
+            let result2 = ``;
             const messages = new MessageList().add(resultsFromOtherThreads, "memory").get.all.v1();
             let lastYmd = null;
             for (const msg of messages) {
@@ -10886,15 +11032,14 @@ ${(() => {
               const ampm = utcHour < 12 ? "AM" : "PM";
               const timeofday = `${hour12}:${utcMinute < 10 ? "0" : ""}${utcMinute} ${ampm}`;
               if (!lastYmd || lastYmd !== ymd) {
-                result += `
+                result2 += `
 the following messages are from ${ymd}
 `;
               }
-              result += `
-Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conversation" : ""} at ${timeofday}: ${JSON.stringify(msg)}`;
+              result2 += `Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conversation" : ""} at ${timeofday}: ${JSON.stringify(msg)}`;
               lastYmd = ymd;
             }
-            return result;
+            return result2;
           })()}
 <end_remembered_from_other_conversation>`;
         }
@@ -10909,6 +11054,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           tripwireReason
         } = await this.__runInputProcessors({
           runtimeContext,
+          tracingContext,
           messageList
         });
         const systemMessage = [...messageList.getSystemMessages(), ...messageList.getSystemMessages("memory")]?.map(m => m.content)?.join(`
@@ -10947,7 +11093,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       inputSchema: z$1.any(),
       outputSchema: z$1.any(),
       execute: async ({
-        inputData
+        inputData,
+        tracingContext
       }) => {
         this.logger.debug(`Starting agent ${this.name} llm stream call`, {
           runId
@@ -10957,7 +11104,8 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         }) : this.#outputProcessors : []);
         const streamResult = llm.stream({
           ...inputData,
-          outputProcessors
+          outputProcessors,
+          tracingContext
         });
         if (options.format === "aisdk") {
           return streamResult.aisdk.v5;
@@ -10972,9 +11120,10 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       steps: [prepareToolsStep, prepareMemory]
     }).parallel([prepareToolsStep, prepareMemory]).map(async ({
       inputData,
-      bail
+      bail,
+      tracingContext
     }) => {
-      const result = {
+      const result2 = {
         ...options,
         messages: inputData["prepare-memory-step"].messageObjects,
         tools: inputData["prepare-tools-step"].convertedTools,
@@ -11016,7 +11165,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           tripwireReason: inputData["prepare-memory-step"].tripwireReason
         })
       };
-      if (result.tripwire) {
+      if (result2.tripwire) {
         const emptyResult = {
           textStream: async function* () {}(),
           fullStream: new globalThis.ReadableStream({
@@ -11037,7 +11186,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           }),
           finishReason: Promise.resolve("other"),
           tripwire: true,
-          tripwireReason: result.tripwireReason,
+          tripwireReason: result2.tripwireReason,
           response: {
             id: randomUUID(),
             timestamp: /* @__PURE__ */new Date(),
@@ -11060,23 +11209,27 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
         return bail(emptyResult);
       }
       let effectiveOutputProcessors = options.outputProcessors || (this.#outputProcessors ? typeof this.#outputProcessors === "function" ? await this.#outputProcessors({
-        runtimeContext: result.runtimeContext
+        runtimeContext: result2.runtimeContext
       }) : this.#outputProcessors : []);
       if (options.structuredOutput) {
         const structuredProcessor = new StructuredOutputProcessor(options.structuredOutput);
         effectiveOutputProcessors = effectiveOutputProcessors ? [...effectiveOutputProcessors, structuredProcessor] : [structuredProcessor];
       }
       const loopOptions = {
-        messages: result.messages,
-        runtimeContext: result.runtimeContext,
+        messages: result2.messages,
+        runtimeContext: result2.runtimeContext,
+        tracingContext: {
+          currentSpan: agentAISpan
+        },
         runId,
-        toolChoice: result.toolChoice,
-        tools: result.tools,
-        resourceId: result.resourceId,
-        threadId: result.threadId,
-        structuredOutput: result.structuredOutput,
-        stopWhen: result.stopWhen,
-        maxSteps: result.maxSteps,
+        toolChoice: result2.toolChoice,
+        tools: result2.tools,
+        resourceId: result2.resourceId,
+        threadId: result2.threadId,
+        structuredOutput: result2.structuredOutput,
+        stopWhen: result2.stopWhen,
+        maxSteps: result2.maxSteps,
+        providerOptions: result2.providerOptions,
         options: {
           onFinish: async payload => {
             if (payload.finishReason === "error") {
@@ -11094,16 +11247,18 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
                 result: payload,
                 outputText,
                 instructions,
-                thread: result.thread,
-                threadId: result.threadId,
+                thread: result2.thread,
+                threadId: result2.threadId,
                 resourceId,
                 memoryConfig,
                 runtimeContext,
+                tracingContext,
                 runId,
                 messageList,
                 threadExists: inputData["prepare-memory-step"].threadExists,
                 structuredOutput: !!options.output,
-                saveQueueManager
+                saveQueueManager,
+                overrideScorers: options.scorers
               });
             } catch (e) {
               this.logger.error("Error saving memory on finish", {
@@ -11112,11 +11267,12 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
               });
             }
             await options?.onFinish?.({
-              ...result,
-              runId
+              ...result2,
+              runId,
+              messages: messageList.get.response.aiV5.model()
             });
           },
-          onStepFinish: result.onStepFinish
+          onStepFinish: result2.onStepFinish
         },
         output: options.output,
         outputProcessors: effectiveOutputProcessors,
@@ -11128,7 +11284,15 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       return loopOptions;
     }).then(streamStep).commit();
     const run = await executionWorkflow.createRunAsync();
-    return await run.start({});
+    const result = await run.start({
+      tracingContext: {
+        currentSpan: agentAISpan
+      }
+    });
+    agentAISpan?.end({
+      output: result
+    });
+    return result;
   }
   async #executeOnFinish({
     result,
@@ -11139,11 +11303,13 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     memoryConfig,
     outputText,
     runtimeContext,
+    tracingContext,
     runId,
     messageList,
     threadExists,
     structuredOutput = false,
-    saveQueueManager
+    saveQueueManager,
+    overrideScorers
   }) {
     const resToLog = {
       text: result?.text,
@@ -11218,7 +11384,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             instructions: titleInstructions
           } = this.resolveTitleGenerationConfig(config?.threads?.generateTitle);
           if (shouldGenerate && userMessage) {
-            promises.push(this.genTitle(userMessage, runtimeContext, titleModel, titleInstructions).then(title => {
+            promises.push(this.genTitle(userMessage, runtimeContext, tracingContext, titleModel, titleInstructions).then(title => {
               if (title) {
                 return memory.createThread({
                   threadId: thread.id,
@@ -11274,7 +11440,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       outputText,
       instructions,
       runtimeContext,
-      structuredOutput
+      tracingContext,
+      structuredOutput,
+      overrideScorers
     });
   }
   async generateVNext(messages, options) {
@@ -11334,6 +11502,10 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     return result.result;
   }
   async generate(messages, generateOptions = {}) {
+    this.logger.warn("Deprecation NOTICE:\nGenerate method will switch to use generateVNext implementation September 16th. Please use generateLegacy if you don't want to upgrade just yet.");
+    return this.generateLegacy(messages, generateOptions);
+  }
+  async generateLegacy(messages, generateOptions = {}) {
     const defaultGenerateOptions = await this.getDefaultGenerateOptions({
       runtimeContext: generateOptions.runtimeContext
     });
@@ -11401,6 +11573,9 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       agentAISpan,
       ...llmOptions
     } = beforeResult;
+    const tracingContext = {
+      currentSpan: agentAISpan
+    };
     let finalOutputProcessors = mergedGenerateOptions.outputProcessors;
     if (mergedGenerateOptions.structuredOutput) {
       const structuredProcessor = new StructuredOutputProcessor(mergedGenerateOptions.structuredOutput);
@@ -11409,11 +11584,12 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     if (!output || experimental_output) {
       const result2 = await llmToUse.__text({
         ...llmOptions,
-        agentAISpan,
+        tracingContext,
         experimental_output
       });
       const outputProcessorResult2 = await this.__runOutputProcessors({
         runtimeContext: mergedGenerateOptions.runtimeContext || new RuntimeContext(),
+        tracingContext,
         outputProcessorOverrides: finalOutputProcessors,
         messageList: new MessageList({
           threadId: llmOptions.threadId || "",
@@ -11485,12 +11661,13 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
           }
         }
       }
+      const overrideScorers = mergedGenerateOptions.scorers;
       const afterResult2 = await after({
         result: result2,
         outputText: newText2,
         agentAISpan,
-        ...(generateOptions.scorers ? {
-          overrideScorers: generateOptions.scorers
+        ...(overrideScorers ? {
+          overrideScorers
         } : {})
       });
       if (generateOptions.returnScorerData) {
@@ -11500,12 +11677,13 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     }
     const result = await llmToUse.__textObject({
       ...llmOptions,
-      agentAISpan,
+      tracingContext,
       structuredOutput: output
     });
     const outputText = JSON.stringify(result.object);
     const outputProcessorResult = await this.__runOutputProcessors({
       runtimeContext: mergedGenerateOptions.runtimeContext || new RuntimeContext(),
+      tracingContext,
       messageList: new MessageList({
         threadId: llmOptions.threadId || "",
         resourceId: llmOptions.resourceId || ""
@@ -11574,6 +11752,10 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     return result;
   }
   async stream(messages, streamOptions = {}) {
+    this.logger.warn("Deprecation NOTICE:\nStream method will switch to use streamVNext implementation September 16th. Please use streamLegacy if you don't want to upgrade just yet.");
+    return this.streamLegacy(messages, streamOptions);
+  }
+  async streamLegacy(messages, streamOptions = {}) {
     const defaultStreamOptions = await this.getDefaultStreamOptions({
       runtimeContext: streamOptions.runtimeContext
     });
@@ -11674,6 +11856,10 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       agentAISpan,
       ...llmOptions
     } = beforeResult;
+    const overrideScorers = mergedStreamOptions.scorers;
+    const tracingContext = {
+      currentSpan: agentAISpan
+    };
     if (!output || experimental_output) {
       this.logger.debug(`Starting agent ${this.name} llm stream call`, {
         runId
@@ -11681,14 +11867,17 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
       const streamResult = llm.__stream({
         ...llmOptions,
         experimental_output,
-        agentAISpan,
+        tracingContext,
         onFinish: async result => {
           try {
             const outputText = result.text;
             await after({
               result,
               outputText,
-              agentAISpan
+              agentAISpan,
+              ...(overrideScorers ? {
+                overrideScorers
+              } : {})
             });
           } catch (e) {
             this.logger.error("Error saving memory on finish", {
@@ -11710,7 +11899,7 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
     });
     return llm.__streamObject({
       ...llmOptions,
-      agentAISpan,
+      tracingContext,
       onFinish: async result => {
         try {
           const outputText = JSON.stringify(result.object);
@@ -11718,7 +11907,10 @@ Message ${msg.threadId && msg.threadId !== threadObject.id ? "from previous conv
             result,
             outputText,
             structuredOutput: true,
-            agentAISpan
+            agentAISpan,
+            ...(overrideScorers ? {
+              overrideScorers
+            } : {})
           });
         } catch (e) {
           this.logger.error("Error saving memory on finish", {
@@ -12036,6 +12228,21 @@ var ExecutionEngine = class extends MastraBase {
 
 // src/workflows/default.ts
 var DefaultExecutionEngine = class extends ExecutionEngine {
+  /**
+   * Preprocesses an error caught during workflow execution.
+   *
+   * - Wraps a non-MastraError exception
+   * - Logs error details
+   */
+  preprocessExecutionError(e, errorDefinition, logPrefix) {
+    const error = e instanceof MastraError ? e : new MastraError(errorDefinition, e);
+    if (!(e instanceof MastraError) && e instanceof Error && e.stack) {
+      error.stack = e.stack;
+    }
+    this.logger?.trackException(error);
+    this.logger?.error(logPrefix + error?.stack);
+    return error;
+  }
   /**
    * The runCounts map is used to keep track of the run count for each step.
    * The step id is used as the key and the run count is the value.
@@ -12132,7 +12339,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       resume,
       retryConfig,
       runtimeContext,
-      currentSpan,
+      tracingContext,
       disableScorers
     } = params;
     const {
@@ -12141,33 +12348,16 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     } = retryConfig ?? {};
     const steps = graph.steps;
     this.runCounts.clear();
-    const spanArgs = {
+    const workflowAISpan = getOrCreateSpan({
+      type: "workflow_run" /* WORKFLOW_RUN */,
       name: `workflow run: '${workflowId}'`,
       input,
       attributes: {
         workflowId
-      }
-    };
-    let workflowAISpan;
-    if (currentSpan) {
-      workflowAISpan = currentSpan.createChildSpan({
-        type: "workflow_run" /* WORKFLOW_RUN */,
-        ...spanArgs
-      });
-    } else {
-      const aiTracing = getSelectedAITracing({
-        runtimeContext
-      });
-      if (aiTracing) {
-        workflowAISpan = aiTracing.startSpan({
-          type: "workflow_run" /* WORKFLOW_RUN */,
-          ...spanArgs,
-          startOptions: {
-            runtimeContext
-          }
-        });
-      }
-    }
+      },
+      tracingContext,
+      runtimeContext
+    });
     if (steps.length === 0) {
       const empty_graph_error = new MastraError({
         id: "WORKFLOW_EXECUTE_EMPTY_GRAPH",
@@ -12260,7 +12450,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           return result2;
         }
       } catch (e) {
-        const error = e instanceof MastraError ? e : new MastraError({
+        const error = this.preprocessExecutionError(e, {
           id: "WORKFLOW_ENGINE_STEP_EXECUTION_FAILED",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
           category: "USER" /* USER */,
@@ -12268,9 +12458,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             workflowId,
             runId
           }
-        }, e);
-        this.logger?.trackException(error);
-        this.logger?.error(`Error executing step: ${error?.stack}`);
+        }, "Error executing step: ");
         const result2 = await this.fmtReturnValue(executionSpan, params.emitter, stepResults, lastOutput.result, e);
         await this.persistStepUpdate({
           workflowId,
@@ -12584,11 +12772,15 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     const stepAISpan = tracingContext.currentSpan?.createChildSpan({
       name: `workflow step: '${step.id}'`,
       type: "workflow_step" /* WORKFLOW_STEP */,
-      input: prevOutput,
+
+      //input: prevOutput,
       attributes: {
         stepId: step.id
       }
     });
+    const innerTracingContext = {
+      currentSpan: stepAISpan
+    };
     if (!skipEmits) {
       await emitter.emit("watch", {
         type: "watch",
@@ -12664,16 +12856,12 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         const result = await runStep({
           runId,
           workflowId,
-          mastra: this.mastra ? wrapMastra(this.mastra, {
-            currentSpan: stepAISpan
-          }) : void 0,
+          mastra: this.mastra ? wrapMastra(this.mastra, innerTracingContext) : void 0,
           runtimeContext,
           inputData: prevOutput,
           runCount: this.getOrGenerateRunCount(step.id),
           resumeData: resume?.steps[0] === step.id ? resume?.resumePayload : void 0,
-          tracingContext: {
-            currentSpan: stepAISpan
-          },
+          tracingContext: innerTracingContext,
           getInitData: () => stepResults?.input,
           getStepResult: step2 => {
             if (!step2?.id) {
@@ -12728,6 +12916,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             workflowId,
             stepId: step.id,
             runtimeContext,
+            tracingContext: innerTracingContext,
             disableScorers
           });
         }
@@ -12752,7 +12941,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         }
         break;
       } catch (e) {
-        const error = e instanceof MastraError ? e : new MastraError({
+        const error = this.preprocessExecutionError(e, {
           id: "WORKFLOW_STEP_INVOKE_FAILED",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
           category: "USER" /* USER */,
@@ -12761,9 +12950,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             runId,
             stepId: step.id
           }
-        }, e);
-        this.logger.trackException(error);
-        this.logger.error(`Error executing step ${step.id}: ` + error?.stack);
+        }, `Error executing step ${step.id}: `);
         stepAISpan?.error({
           error,
           attributes: {
@@ -12850,6 +13037,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
     workflowId,
     stepId,
     runtimeContext,
+    tracingContext,
     disableScorers
   }) {
     let scorersToUse = scorers;
@@ -12859,18 +13047,16 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           runtimeContext
         });
       } catch (error) {
-        const mastraError = new MastraError({
+        this.preprocessExecutionError(error, {
           id: "WORKFLOW_FAILED_TO_FETCH_SCORERS",
-          domain: "MASTRA_WORKFLOW",
+          domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
           category: "USER" /* USER */,
           details: {
             runId,
             workflowId,
             stepId
           }
-        }, error);
-        this.logger.trackException(mastraError);
-        this.logger.error(mastraError.toString(), error);
+        }, "Error fetching scorers: ");
       }
     }
     if (!disableScorers && scorersToUse && Object.keys(scorersToUse || {}).length > 0) {
@@ -12882,6 +13068,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
           input: [input],
           output,
           runtimeContext,
+          tracingContext,
           entity: {
             id: workflowId,
             stepId
@@ -13063,7 +13250,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
         });
         return result ? index : null;
       } catch (e) {
-        const error = e instanceof MastraError ? e : new MastraError({
+        const error = this.preprocessExecutionError(e, {
           id: "WORKFLOW_CONDITION_EVALUATION_FAILED",
           domain: "MASTRA_WORKFLOW" /* MASTRA_WORKFLOW */,
           category: "USER" /* USER */,
@@ -13071,9 +13258,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
             workflowId,
             runId
           }
-        }, e);
-        this.logger.trackException(error);
-        this.logger.error("Error evaluating condition: " + error?.stack);
+        }, "Error evaluating condition: ");
         evalSpan?.error({
           error,
           attributes: {
@@ -13253,7 +13438,7 @@ var DefaultExecutionEngine = class extends ExecutionEngine {
       const evalSpan = loopSpan?.createChildSpan({
         type: "workflow_conditional_eval" /* WORKFLOW_CONDITIONAL_EVAL */,
         name: `condition: ${entry.loopType}`,
-        input: result.output,
+        input: selectFields(result.output, ["stepResult", "output.text", "output.object", "messages"]),
         attributes: {
           conditionIndex: iteration
         }
@@ -14751,7 +14936,7 @@ var Workflow = class extends MastraBase {
       cleanup: () => this.#runs.delete(runIdToUse)
     });
     this.#runs.set(runIdToUse, run);
-    this.mastra?.getLogger().warn("createRun() is deprecated. Use createRunAsync() instead.");
+    this.mastra?.getLogger().warn("createRun() will be removed on September 16th. Use createRunAsync() instead.");
     return run;
   }
   /**
@@ -14836,7 +15021,7 @@ var Workflow = class extends MastraBase {
     abort,
     abortSignal,
     runCount,
-    currentSpan
+    tracingContext
   }) {
     this.__registerMastra(mastra);
     const isResume = !!(resume?.steps && resume.steps.length > 0);
@@ -14872,11 +15057,11 @@ var Workflow = class extends MastraBase {
       resumeData,
       step: resume.steps,
       runtimeContext,
-      currentSpan
+      tracingContext
     }) : await run.start({
       inputData,
       runtimeContext,
-      currentSpan
+      tracingContext
     });
     unwatch();
     unwatchV2();
@@ -15042,7 +15227,7 @@ var Run = class {
     inputData,
     runtimeContext,
     writableStream,
-    currentSpan
+    tracingContext
   }) {
     const result = await this.executionEngine.execute({
       workflowId: this.workflowId,
@@ -15069,7 +15254,7 @@ var Run = class {
       runtimeContext: runtimeContext ?? new RuntimeContext(),
       abortController: this.abortController,
       writableStream,
-      currentSpan
+      tracingContext
     });
     if (result.status !== "suspended") {
       this.cleanup?.();
@@ -15406,7 +15591,7 @@ var Run = class {
       },
       runtimeContext: runtimeContextToUse,
       abortController: this.abortController,
-      currentSpan: params.currentSpan
+      tracingContext: params.tracingContext
     }).then(result => {
       if (result.status !== "suspended") {
         this.closeStreamAction?.().catch(() => {});
@@ -15467,5 +15652,5 @@ function deepMergeWorkflowState(a, b) {
 }
 
 export { AISDKV5OutputStream, Agent, DefaultExecutionEngine, ExecutionEngine, LanguageDetector, LanguageDetectorInputProcessor, LegacyStep, LegacyWorkflow, MastraModelOutput, ModerationInputProcessor, ModerationProcessor, PIIDetector, PIIDetectorInputProcessor, PromptInjectionDetector, PromptInjectionDetectorInputProcessor, Run, StructuredOutputProcessor, TripWire, UnicodeNormalizer, UnicodeNormalizerInputProcessor, WhenConditionReturnValue, Workflow, agentToStep, cloneStep, cloneWorkflow, createStep, createWorkflow, getActivePathsAndStatus, getResultActivePaths, getStepResult, getSuspendedPaths, isAgent, isConditionalKey, isErrorEvent, isFinalState, isLimboState, isTransitionEvent, isVariableReference, isWorkflow, loop, mapVariable, mergeChildValue, recursivelyCheckForFinalState, resolveVariables, updateStepInHierarchy, workflowToStep };
-//# sourceMappingURL=chunk-5NGEKEU7.js.map
-//# sourceMappingURL=chunk-5NGEKEU7.js.map
+//# sourceMappingURL=chunk-P2IJ74UW.js.map
+//# sourceMappingURL=chunk-P2IJ74UW.js.map