@mastra/core 1.0.0-beta.13 → 1.0.0-beta.14

package/dist/{chunk-E5BQRAJK.js → chunk-QF4MHFSU.js}

@@ -1,19 +1,19 @@
-import { DefaultVoice } from './chunk-4BC5FUAO.js';
+import { DefaultVoice } from './chunk-GELVUDUY.js';
 import { PUBSUB_SYMBOL, STREAM_FORMAT_SYMBOL } from './chunk-6PMMP3FR.js';
-import { InMemoryStore } from './chunk-VETAQUW3.js';
-import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType, isAbortError, injectJsonInstructionIntoMessages } from './chunk-WYWRMIQC.js';
+import { InMemoryStore } from './chunk-GBQXIVL6.js';
+import { MessageList, DefaultGeneratedFile, DefaultGeneratedFileWithType } from './chunk-4AT6YQKZ.js';
 import { createTextStreamResponse, createUIMessageStreamResponse, createUIMessageStream, parsePartialJson, isDeepEqualData, stepCountIs } from './chunk-2SQB3WBT.js';
 import { generateId, asSchema, jsonSchema, APICallError, tool } from './chunk-G6E6V2Z4.js';
+import { resolveModelConfig, ModelRouterEmbeddingModel, ModelRouterLanguageModel } from './chunk-QDVYP2T7.js';
+import { MastraLLMV1 } from './chunk-4CMIJQF6.js';
 import { PubSub } from './chunk-BVUMKER5.js';
 import { executeHook } from './chunk-L54GIUCB.js';
-import { resolveModelConfig, ModelRouterEmbeddingModel } from './chunk-5VZGJTPR.js';
-import { MastraLLMV1 } from './chunk-62Q7K656.js';
-import { removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, deepMerge, selectFields, delay } from './chunk-RCJLMMTO.js';
+import { removeUndefinedValues, ensureToolProperties, makeCoreTool, createMastraProxy, isZodType, deepMerge, selectFields, delay } from './chunk-LDXKZYOV.js';
+import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-Y36Y5MTD.js';
+import { MastraError, getErrorFromUnknown } from './chunk-YPLZDWG7.js';
 import { ToolStream } from './chunk-DD2VNRQM.js';
 import { Tool, createTool } from './chunk-373OC54J.js';
-import { getOrCreateSpan, wrapMastra, executeWithContextSync } from './chunk-Y36Y5MTD.js';
 import { RequestContext, MASTRA_RESOURCE_ID_KEY, MASTRA_THREAD_ID_KEY } from './chunk-6TBWJV35.js';
-import { MastraError, getErrorFromUnknown } from './chunk-YPLZDWG7.js';
 import { zodToJsonSchema as zodToJsonSchema$1 } from './chunk-PJKCPRYF.js';
 import { MastraBase } from './chunk-LSHPJWM5.js';
 import { RegisteredLogger, ConsoleLogger } from './chunk-NRUZYMHE.js';
@@ -27,6 +27,7 @@ import { getErrorMessage, TypeValidationError } from '@ai-sdk/provider-v5';
 import z4 from 'zod/v4';
 import { OpenAIReasoningSchemaCompatLayer, OpenAISchemaCompatLayer, GoogleSchemaCompatLayer, AnthropicSchemaCompatLayer, DeepSeekSchemaCompatLayer, MetaSchemaCompatLayer, applyCompatLayer } from '@mastra/schema-compat';
 import { isEmpty } from 'radash';
+import { isAbortError, injectJsonInstructionIntoMessages } from '@ai-sdk/provider-utils-v5';
 import { Tiktoken } from 'js-tiktoken/lite';
 import o200k_base from 'js-tiktoken/ranks/o200k_base';
 import { LRUCache } from 'lru-cache';
@@ -728,6 +729,69 @@ The input text may be in any format (sentences, bullet points, paragraphs, etc.)
   }
 };
 
+// src/agent/utils.ts
+var supportedLanguageModelSpecifications = ["v2", "v3"];
+var isSupportedLanguageModel = (model) => {
+  return supportedLanguageModelSpecifications.includes(model.specificationVersion);
+};
+async function tryGenerateWithJsonFallback(agent, prompt, options) {
+  if (!options.structuredOutput?.schema) {
+    throw new MastraError({
+      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
+      domain: "AGENT" /* AGENT */,
+      category: "USER" /* USER */,
+      text: "structuredOutput is required to use tryGenerateWithJsonFallback"
+    });
+  }
+  try {
+    return await agent.generate(prompt, options);
+  } catch (error) {
+    console.warn("Error in tryGenerateWithJsonFallback. Attempting fallback.", error);
+    return await agent.generate(prompt, {
+      ...options,
+      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
+    });
+  }
+}
+async function tryStreamWithJsonFallback(agent, prompt, options) {
+  if (!options.structuredOutput?.schema) {
+    throw new MastraError({
+      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
+      domain: "AGENT" /* AGENT */,
+      category: "USER" /* USER */,
+      text: "structuredOutput is required to use tryStreamWithJsonFallback"
+    });
+  }
+  try {
+    const result = await agent.stream(prompt, options);
+    const object = await result.object;
+    if (!object) {
+      throw new MastraError({
+        id: "STRUCTURED_OUTPUT_OBJECT_UNDEFINED",
+        domain: "AGENT" /* AGENT */,
+        category: "USER" /* USER */,
+        text: "structuredOutput object is undefined"
+      });
+    }
+    return result;
+  } catch (error) {
+    console.warn("Error in tryStreamWithJsonFallback. Attempting fallback.", error);
+    return await agent.stream(prompt, {
+      ...options,
+      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
+    });
+  }
+}
+function resolveThreadIdFromArgs(args) {
+  if (args?.memory?.thread) {
+    if (typeof args.memory.thread === "string") return { id: args.memory.thread };
+    if (typeof args.memory.thread === "object" && args.memory.thread.id)
+      return args.memory.thread;
+  }
+  if (args?.threadId) return { id: args.threadId };
+  return void 0;
+}
+
 // src/processors/runner.ts
 var ProcessorState = class {
   accumulatedText = "";
@@ -1638,12 +1702,13 @@ var ProcessorRunner = class _ProcessorRunner {
       const { model: _model, ...rest } = result;
       if (result.model) {
         const resolvedModel = await resolveModelConfig(result.model);
-        if (resolvedModel.specificationVersion === "v1") {
+        const isSupported = isSupportedLanguageModel(resolvedModel);
+        if (!isSupported) {
           throw new MastraError({
             category: "USER",
             domain: "AGENT",
-            id: "PROCESSOR_RETURNED_V1_MODEL",
-            text: `Processor ${processor.id} returned a v1 model in step ${stepNumber}. v1 models are not supported in processInputStep.`
+            id: "PROCESSOR_RETURNED_UNSUPPORTED_MODEL",
+            text: `Processor ${processor.id} returned an unsupported model version ${resolvedModel.specificationVersion} in step ${stepNumber}. Only ${supportedLanguageModelSpecifications.join(", ")} models are supported in processInputStep.`
           });
         }
         return {
@@ -1842,10 +1907,8 @@ function convertFullStreamChunkToMastra(value, ctx) {
             reason: value.finishReason
           },
           output: {
-            usage: {
-              ...value.usage ?? {},
-              totalTokens: value?.usage?.totalTokens ?? (value.usage?.inputTokens ?? 0) + (value.usage?.outputTokens ?? 0)
-            }
+            // Normalize usage to handle both V2 (flat) and V3 (nested) formats
+            usage: normalizeUsage(value.usage)
           },
           metadata: {
             providerMetadata: value.providerMetadata
@@ -1897,6 +1960,7 @@ function convertMastraChunkToAISDKv5({
         type: "finish",
         // Cast needed: Mastra extends reason with 'tripwire' | 'retry' for processor scenarios
         finishReason: chunk.payload.stepResult.reason,
+        // Cast needed: Mastra's LanguageModelUsage has optional properties, V2 has required-but-nullable
         totalUsage: chunk.payload.output.usage
       };
     }
@@ -1915,18 +1979,8 @@ function convertMastraChunkToAISDKv5({
       };
     case "reasoning-signature":
       throw new Error('AISDKv5 chunk type "reasoning-signature" not supported');
-    // return {
-    //   type: 'reasoning-signature' as const,
-    //   id: chunk.payload.id,
-    //   signature: chunk.payload.signature,
-    // };
     case "redacted-reasoning":
       throw new Error('AISDKv5 chunk type "redacted-reasoning" not supported');
-    // return {
-    //   type: 'redacted-reasoning',
-    //   id: chunk.payload.id,
-    //   data: chunk.payload.data,
-    // };
     case "reasoning-end":
       return {
         type: "reasoning-end",
@@ -2080,6 +2134,44 @@ function convertMastraChunkToAISDKv5({
       return;
   }
 }
+function isV3Usage(usage) {
+  if (!usage || typeof usage !== "object") return false;
+  const u = usage;
+  return typeof u.inputTokens === "object" && u.inputTokens !== null && "total" in u.inputTokens && typeof u.outputTokens === "object" && u.outputTokens !== null && "total" in u.outputTokens;
+}
+function normalizeUsage(usage) {
+  if (!usage) {
+    return {
+      inputTokens: void 0,
+      outputTokens: void 0,
+      totalTokens: void 0,
+      reasoningTokens: void 0,
+      cachedInputTokens: void 0,
+      raw: void 0
+    };
+  }
+  if (isV3Usage(usage)) {
+    const inputTokens = usage.inputTokens.total;
+    const outputTokens = usage.outputTokens.total;
+    return {
+      inputTokens,
+      outputTokens,
+      totalTokens: (inputTokens ?? 0) + (outputTokens ?? 0),
+      reasoningTokens: usage.outputTokens.reasoning,
+      cachedInputTokens: usage.inputTokens.cacheRead,
+      raw: usage
+    };
+  }
+  const v2Usage = usage;
+  return {
+    inputTokens: v2Usage.inputTokens,
+    outputTokens: v2Usage.outputTokens,
+    totalTokens: v2Usage.totalTokens ?? (v2Usage.inputTokens ?? 0) + (v2Usage.outputTokens ?? 0),
+    reasoningTokens: v2Usage.reasoningTokens,
+    cachedInputTokens: v2Usage.cachedInputTokens,
+    raw: usage
+  };
+}
 
 // src/stream/aisdk/v5/output.ts
 var AISDKV5OutputStream = class {
@@ -2975,7 +3067,11 @@ var MastraModelOutput = class extends MastraBase {
   #warnings = [];
   #finishReason = void 0;
   #request = {};
-  #usageCount = { inputTokens: void 0, outputTokens: void 0, totalTokens: void 0 };
+  #usageCount = {
+    inputTokens: void 0,
+    outputTokens: void 0,
+    totalTokens: void 0
+  };
   #tripwire = void 0;
   #delayedPromises = {
     suspendPayload: new DelayedPromise(),
@@ -3322,23 +3418,25 @@ var MastraModelOutput = class extends MastraBase {
               };
               self.#finishReason = "other";
               self.#streamFinished = true;
-              self.#delayedPromises.text.resolve(self.#bufferedText.join(""));
-              self.#delayedPromises.finishReason.resolve("other");
-              self.#delayedPromises.object.resolve(void 0);
-              self.#delayedPromises.usage.resolve(self.#usageCount);
-              self.#delayedPromises.warnings.resolve(self.#warnings);
-              self.#delayedPromises.providerMetadata.resolve(void 0);
-              self.#delayedPromises.response.resolve({});
-              self.#delayedPromises.request.resolve({});
-              self.#delayedPromises.reasoning.resolve([]);
-              self.#delayedPromises.reasoningText.resolve(void 0);
-              self.#delayedPromises.sources.resolve([]);
-              self.#delayedPromises.files.resolve([]);
-              self.#delayedPromises.toolCalls.resolve([]);
-              self.#delayedPromises.toolResults.resolve([]);
-              self.#delayedPromises.steps.resolve(self.#bufferedSteps);
-              self.#delayedPromises.totalUsage.resolve(self.#usageCount);
-              self.#delayedPromises.content.resolve([]);
+              self.resolvePromises({
+                text: self.#bufferedText.join(""),
+                finishReason: "other",
+                object: void 0,
+                usage: self.#usageCount,
+                warnings: self.#warnings,
+                providerMetadata: void 0,
+                response: {},
+                request: {},
+                reasoning: [],
+                reasoningText: void 0,
+                sources: [],
+                files: [],
+                toolCalls: [],
+                toolResults: [],
+                steps: self.#bufferedSteps,
+                totalUsage: self.#usageCount,
+                content: []
+              });
               self.#emitChunk(chunk);
               controller.enqueue(chunk);
               self.#emitter.emit("finish");
@@ -3406,8 +3504,10 @@ var MastraModelOutput = class extends MastraBase {
                   if (lastStep && outputText && outputText !== originalText) {
                     lastStep.text = outputText;
                   }
-                  self.#delayedPromises.text.resolve(outputText || originalText);
-                  self.#delayedPromises.finishReason.resolve(self.#finishReason);
+                  this.resolvePromises({
+                    text: outputText || originalText,
+                    finishReason: self.#finishReason
+                  });
                   if (chunk.payload.metadata) {
                     const { providerMetadata, request, ...otherMetadata } = chunk.payload.metadata;
                     response = {
@@ -3417,9 +3517,10 @@ var MastraModelOutput = class extends MastraBase {
                     };
                   }
                 } else if (!self.#options.isLLMExecutionStep) {
-                  const textContent = self.#bufferedText.join("");
-                  self.#delayedPromises.text.resolve(textContent);
-                  self.#delayedPromises.finishReason.resolve(self.#finishReason);
+                  this.resolvePromises({
+                    text: self.#bufferedText.join(""),
+                    finishReason: self.#finishReason
+                  });
                 }
               } catch (error2) {
                 if (error2 instanceof TripWire) {
@@ -3429,35 +3530,41 @@ var MastraModelOutput = class extends MastraBase {
                     metadata: error2.options?.metadata,
                     processorId: error2.processorId
                   };
-                  self.#delayedPromises.finishReason.resolve("other");
-                  self.#delayedPromises.text.resolve("");
+                  self.resolvePromises({
+                    finishReason: "other",
+                    text: ""
+                  });
                 } else {
                   self.#error = getErrorFromUnknown(error2, {
                     fallbackMessage: "Unknown error in stream"
                   });
-                  self.#delayedPromises.finishReason.resolve("error");
-                  self.#delayedPromises.text.resolve("");
+                  self.resolvePromises({
+                    finishReason: "error",
+                    text: ""
+                  });
                 }
                 if (self.#delayedPromises.object.status.type !== "resolved") {
                   self.#delayedPromises.object.resolve(void 0);
                 }
               }
-              self.#delayedPromises.usage.resolve(self.#usageCount);
-              self.#delayedPromises.warnings.resolve(self.#warnings);
-              self.#delayedPromises.providerMetadata.resolve(chunk.payload.metadata?.providerMetadata);
-              self.#delayedPromises.response.resolve(response);
-              self.#delayedPromises.request.resolve(self.#request || {});
               const reasoningText = self.#bufferedReasoning.length > 0 ? self.#bufferedReasoning.map((reasoningPart) => reasoningPart.payload.text).join("") : void 0;
-              self.#delayedPromises.reasoningText.resolve(reasoningText);
-              self.#delayedPromises.reasoning.resolve(Object.values(self.#bufferedReasoningDetails || {}));
-              self.#delayedPromises.sources.resolve(self.#bufferedSources);
-              self.#delayedPromises.files.resolve(self.#bufferedFiles);
-              self.#delayedPromises.toolCalls.resolve(self.#toolCalls);
-              self.#delayedPromises.toolResults.resolve(self.#toolResults);
-              self.#delayedPromises.steps.resolve(self.#bufferedSteps);
-              self.#delayedPromises.totalUsage.resolve(self.#getTotalUsage());
-              self.#delayedPromises.content.resolve(messageList.get.response.aiV5.stepContent());
-              self.#delayedPromises.suspendPayload.resolve(void 0);
+              this.resolvePromises({
+                usage: self.#usageCount,
+                warnings: self.#warnings,
+                providerMetadata: chunk.payload.metadata?.providerMetadata,
+                response,
+                request: self.#request || {},
+                reasoningText,
+                reasoning: Object.values(self.#bufferedReasoningDetails || {}),
+                sources: self.#bufferedSources,
+                files: self.#bufferedFiles,
+                toolCalls: self.#toolCalls,
+                toolResults: self.#toolResults,
+                steps: self.#bufferedSteps,
+                totalUsage: self.#getTotalUsage(),
+                content: messageList.get.response.aiV5.stepContent(),
+                suspendPayload: void 0
+              });
               const baseFinishStep = self.#bufferedSteps[self.#bufferedSteps.length - 1];
               if (baseFinishStep) {
                 const onFinishPayload = {
@@ -3525,6 +3632,28 @@ var MastraModelOutput = class extends MastraBase {
           if (self.#delayedPromises.object.status.type === "pending") {
             self.#delayedPromises.object.resolve(void 0);
           }
+          if (self.#status === "suspended") {
+            const reasoningText = self.#bufferedReasoning.length > 0 ? self.#bufferedReasoning.map((reasoningPart) => reasoningPart.payload.text).join("") : void 0;
+            self.resolvePromises({
+              toolResults: self.#toolResults,
+              toolCalls: self.#toolCalls,
+              text: self.#bufferedText.join(""),
+              reasoning: Object.values(self.#bufferedReasoningDetails || {}),
+              reasoningText,
+              sources: self.#bufferedSources,
+              files: self.#bufferedFiles,
+              steps: self.#bufferedSteps,
+              usage: self.#usageCount,
+              totalUsage: self.#getTotalUsage(),
+              warnings: self.#warnings,
+              finishReason: "other",
+              content: self.messageList.get.response.aiV5.stepContent(),
+              object: void 0,
+              request: self.#request,
+              response: {},
+              providerMetadata: void 0
+            });
+          }
           Object.entries(self.#delayedPromises).forEach(([key, promise]) => {
             if (promise.status.type === "pending") {
               promise.reject(new Error(`promise '${key}' was not resolved or rejected when stream finished`));
@@ -3548,6 +3677,23 @@ var MastraModelOutput = class extends MastraBase {
       this.deserializeState(initialState);
     }
   }
+  resolvePromise(key, value) {
+    if (!(key in this.#delayedPromises)) {
+      throw new MastraError({
+        id: "MASTRA_MODEL_OUTPUT_INVALID_PROMISE_KEY",
+        domain: "LLM" /* LLM */,
+        category: "SYSTEM" /* SYSTEM */,
+        text: `Attempted to resolve invalid promise key '${key}' with value '${typeof value === "object" ? JSON.stringify(value, null, 2) : value}'`
+      });
+    }
+    this.#delayedPromises[key].resolve(value);
+  }
+  resolvePromises(data) {
+    for (const keyString in data) {
+      const key = keyString;
+      this.resolvePromise(key, data[key]);
+    }
+  }
   #getDelayedPromise(promise) {
     if (!this.#consumptionStarted) {
       void this.consumeStream();
@@ -4520,7 +4666,7 @@ var getModelOutputForTripwire = async ({
     model: {
       modelId: model.modelId,
       provider: model.provider,
-      version: model.specificationVersion || "v2"
+      version: model.specificationVersion
     },
     stream: tripwireStream,
     messageList,
@@ -4591,11 +4737,6 @@ function runScorer({
   };
   executeHook("onScorerRun" /* ON_SCORER_RUN */, payload);
 }
-
-// src/llm/model/is-v2-model.ts
-function isV2Model(model) {
-  return model.specificationVersion === "v2";
-}
 var EventEmitterPubSub = class extends PubSub {
   emitter;
   constructor(existingEmitter) {
@@ -8382,7 +8523,9 @@ var Workflow = class extends MastraBase {
       workflowStatus: run.workflowRunStatus,
       stepResults: {}
     });
-    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, false);
+    const workflowSnapshotInStorage = await this.getWorkflowRunExecutionResult(runIdToUse, {
+      withNestedWorkflows: false
+    });
     if (workflowSnapshotInStorage && workflowSnapshotInStorage.status) {
       run.workflowRunStatus = workflowSnapshotInStorage.status;
     }
@@ -8647,7 +8790,8 @@ var Workflow = class extends MastraBase {
     }
     return finalSteps;
   }
-  async getWorkflowRunExecutionResult(runId, withNestedWorkflows = true) {
+  async getWorkflowRunExecutionResult(runId, options = {}) {
+    const { withNestedWorkflows = true, fields } = options;
     const storage = this.#mastra?.getStorage();
     if (!storage) {
       this.logger.debug("Cannot get workflow run execution result. Mastra storage is not initialized");
@@ -8666,15 +8810,51 @@ var Workflow = class extends MastraBase {
         return null;
       }
     }
-    const fullSteps = withNestedWorkflows ? await this.getWorkflowRunSteps({ runId, workflowId: this.id }) : snapshot.context;
+    const snapshotState = snapshot;
+    const defaultResult = {
+      status: snapshotState.status,
+      result: snapshotState.result,
+      error: snapshotState.error,
+      payload: snapshotState.context?.input,
+      steps: null,
+      // Will be populated below
+      activeStepsPath: snapshotState.activeStepsPath,
+      serializedStepGraph: snapshotState.serializedStepGraph
+    };
+    const allowedFields = new Set(Object.keys(defaultResult));
+    if (fields && fields.length > 0) {
+      const result = {};
+      for (const field of fields) {
+        if (!allowedFields.has(field)) {
+          continue;
+        }
+        if (field === "steps") {
+          let fullSteps2;
+          if (withNestedWorkflows) {
+            fullSteps2 = await this.getWorkflowRunSteps({ runId, workflowId: this.id });
+          } else {
+            const { input, ...stepsOnly } = snapshotState.context || {};
+            fullSteps2 = stepsOnly;
+          }
+          result.steps = fullSteps2;
+        } else if (field === "payload") {
+          result.payload = snapshotState.context?.input;
+        } else {
+          result[field] = snapshotState[field];
+        }
+      }
+      return result;
+    }
+    let fullSteps;
+    if (withNestedWorkflows) {
+      fullSteps = await this.getWorkflowRunSteps({ runId, workflowId: this.id });
+    } else {
+      const { input, ...stepsOnly } = snapshotState.context || {};
+      fullSteps = stepsOnly;
+    }
     return {
-      status: snapshot.status,
-      result: snapshot.result,
-      error: snapshot.error,
-      payload: snapshot.context?.input,
-      steps: fullSteps,
-      activeStepsPath: snapshot.activeStepsPath,
-      serializedStepGraph: snapshot.serializedStepGraph
+      ...defaultResult,
+      steps: fullSteps
     };
   }
 };
@@ -10419,7 +10599,7 @@ function executeStreamWithFallbackModels(models) {
       while (attempt <= maxRetries) {
         try {
           const isLastModel = attempt === maxRetries && index === models.length;
-          const result = await callback(modelConfig.model, isLastModel);
+          const result = await callback(modelConfig, isLastModel);
           finalResult = result;
           done = true;
           break;
@@ -10461,7 +10641,6 @@ function createLLMExecutionStep({
   inputProcessors,
   logger,
   agentId,
-  headers,
   downloadRetries,
   downloadConcurrency,
   processorStates,
@@ -10481,7 +10660,9 @@ function createLLMExecutionStep({
       let warnings;
       let request;
       let rawResponse;
-      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(models)(async (model, isLastModel) => {
+      const { outputStream, callBail, runState, stepTools } = await executeStreamWithFallbackModels(models)(async (modelConfig, isLastModel) => {
+        const model = modelConfig.model;
+        const modelHeaders = modelConfig.headers;
         if (initialSystemMessages) {
           messageList.replaceAllSystemMessages(initialSystemMessages);
         }
@@ -10566,55 +10747,55 @@ Analyse the suspended tools: ${JSON.stringify(suspendedTools)}, using the messag
             }
           }
         }
-        switch (currentStep.model.specificationVersion) {
-          case "v2": {
-            modelResult = executeWithContextSync({
-              span: modelSpanTracker?.getTracingContext()?.currentSpan,
-              fn: () => execute({
-                runId,
-                model: currentStep.model,
-                providerOptions: currentStep.providerOptions,
-                inputMessages,
-                tools: currentStep.tools,
-                toolChoice: currentStep.toolChoice,
-                activeTools: currentStep.activeTools,
-                options,
-                modelSettings: currentStep.modelSettings,
-                includeRawChunks,
-                structuredOutput: currentStep.structuredOutput,
-                headers,
-                methodType,
-                generateId: _internal?.generateId,
-                onResult: ({
-                  warnings: warningsFromStream,
-                  request: requestFromStream,
-                  rawResponse: rawResponseFromStream
-                }) => {
-                  warnings = warningsFromStream;
-                  request = requestFromStream || {};
-                  rawResponse = rawResponseFromStream;
-                  if (!isControllerOpen(controller)) {
-                    return;
+        if (isSupportedLanguageModel(currentStep.model)) {
+          modelResult = executeWithContextSync({
+            span: modelSpanTracker?.getTracingContext()?.currentSpan,
+            fn: () => execute({
+              runId,
+              model: currentStep.model,
+              providerOptions: currentStep.providerOptions,
+              inputMessages,
+              tools: currentStep.tools,
+              toolChoice: currentStep.toolChoice,
+              activeTools: currentStep.activeTools,
+              options,
+              modelSettings: currentStep.modelSettings,
+              includeRawChunks,
+              structuredOutput: currentStep.structuredOutput,
+              // Merge headers: modelConfig headers first, then modelSettings overrides them
+              // Only create object if there are actual headers to avoid passing empty {}
+              headers: modelHeaders || currentStep.modelSettings?.headers ? { ...modelHeaders, ...currentStep.modelSettings?.headers } : void 0,
+              methodType,
+              generateId: _internal?.generateId,
+              onResult: ({
+                warnings: warningsFromStream,
+                request: requestFromStream,
+                rawResponse: rawResponseFromStream
+              }) => {
+                warnings = warningsFromStream;
+                request = requestFromStream || {};
+                rawResponse = rawResponseFromStream;
+                if (!isControllerOpen(controller)) {
+                  return;
+                }
+                controller.enqueue({
+                  runId,
+                  from: "AGENT" /* AGENT */,
+                  type: "step-start",
+                  payload: {
+                    request: request || {},
+                    warnings: warnings || [],
+                    messageId
                   }
-                  controller.enqueue({
-                    runId,
-                    from: "AGENT" /* AGENT */,
-                    type: "step-start",
-                    payload: {
-                      request: request || {},
-                      warnings: warnings || [],
-                      messageId
-                    }
-                  });
-                },
-                shouldThrowError: !isLastModel
-              })
-            });
-            break;
-          }
-          default: {
-            throw new Error(`Unsupported model version: ${model.specificationVersion}`);
-          }
+                });
+              },
+              shouldThrowError: !isLastModel
+            })
+          });
+        } else {
+          throw new Error(
+            `Unsupported model version: ${currentStep.model.specificationVersion}. Supported versions: ${supportedLanguageModelSpecifications.join(", ")}`
+          );
         }
         const outputStream2 = new MastraModelOutput({
           model: {
@@ -13158,67 +13339,6 @@ async function networkLoop({
 
 // src/agent/agent-legacy.ts
 var import_fast_deep_equal = __toESM(require_fast_deep_equal(), 1);
-
-// src/agent/utils.ts
-async function tryGenerateWithJsonFallback(agent, prompt, options) {
-  if (!options.structuredOutput?.schema) {
-    throw new MastraError({
-      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
-      domain: "AGENT" /* AGENT */,
-      category: "USER" /* USER */,
-      text: "structuredOutput is required to use tryGenerateWithJsonFallback"
-    });
-  }
-  try {
-    return await agent.generate(prompt, options);
-  } catch (error) {
-    console.warn("Error in tryGenerateWithJsonFallback. Attempting fallback.", error);
-    return await agent.generate(prompt, {
-      ...options,
-      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
-    });
-  }
-}
-async function tryStreamWithJsonFallback(agent, prompt, options) {
-  if (!options.structuredOutput?.schema) {
-    throw new MastraError({
-      id: "STRUCTURED_OUTPUT_OPTIONS_REQUIRED",
-      domain: "AGENT" /* AGENT */,
-      category: "USER" /* USER */,
-      text: "structuredOutput is required to use tryStreamWithJsonFallback"
-    });
-  }
-  try {
-    const result = await agent.stream(prompt, options);
-    const object = await result.object;
-    if (!object) {
-      throw new MastraError({
-        id: "STRUCTURED_OUTPUT_OBJECT_UNDEFINED",
-        domain: "AGENT" /* AGENT */,
-        category: "USER" /* USER */,
-        text: "structuredOutput object is undefined"
-      });
-    }
-    return result;
-  } catch (error) {
-    console.warn("Error in tryStreamWithJsonFallback. Attempting fallback.", error);
-    return await agent.stream(prompt, {
-      ...options,
-      structuredOutput: { ...options.structuredOutput, jsonPromptInjection: true }
-    });
-  }
-}
-function resolveThreadIdFromArgs(args) {
-  if (args?.memory?.thread) {
-    if (typeof args.memory.thread === "string") return { id: args.memory.thread };
-    if (typeof args.memory.thread === "object" && args.memory.thread.id)
-      return args.memory.thread;
-  }
-  if (args?.threadId) return { id: args.threadId };
-  return void 0;
-}
-
-// src/agent/agent-legacy.ts
 var AgentLegacyHandler = class {
   constructor(capabilities) {
     this.capabilities = capabilities;
@@ -14298,6 +14418,14 @@ function createMapResultsStep({
     };
     if (result.tripwire) {
       const agentModel = await capabilities.getModel({ requestContext: result.requestContext });
+      if (!isSupportedLanguageModel(agentModel)) {
+        throw new MastraError({
+          id: "MAP_RESULTS_STEP_UNSUPPORTED_MODEL",
+          domain: "AGENT" /* AGENT */,
+          category: "USER" /* USER */,
+          text: "Tripwire handling requires a v2/v3 model"
+        });
+      }
       const modelOutput = await getModelOutputForTripwire({
         tripwire: memoryData.tripwire,
         runId,
@@ -14939,7 +15067,6 @@ var Agent = class extends MastraBase {
   }) {
     const inputProcessors = inputProcessorOverrides ?? await this.listResolvedInputProcessors(requestContext);
     const outputProcessors = outputProcessorOverrides ?? await this.listResolvedOutputProcessors(requestContext);
-    this.logger.debug("outputProcessors", outputProcessors);
     return new ProcessorRunner({
       inputProcessors,
       outputProcessors,
@@ -15458,7 +15585,7 @@ var Agent = class extends MastraBase {
     const modelToUse = this.getModel({ modelConfig: model, requestContext });
     return resolveMaybePromise(modelToUse, (resolvedModel) => {
       let llm;
-      if (resolvedModel.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(resolvedModel)) {
         const modelsPromise = Array.isArray(this.model) && !model ? this.prepareModels(requestContext) : this.prepareModels(requestContext, resolvedModel);
         llm = modelsPromise.then((models) => {
           const enabledModels = models.filter((model2) => model2.enabled);
@@ -15722,7 +15849,7 @@ var Agent = class extends MastraBase {
     }
     const systemInstructions = await this.resolveTitleInstructions(requestContext, instructions);
     let text = "";
-    if (llm.getModel().specificationVersion === "v2") {
+    if (isSupportedLanguageModel(llm.getModel())) {
       const messageList = new MessageList().add(
         [
           {
@@ -16674,7 +16801,7 @@ var Agent = class extends MastraBase {
         result[id] = scorerObject;
       }
     }
-    if (Object.keys(result).length === 0) {
+    if (Object.keys(result).length === 0 && Object.keys(overrideScorers).length > 0) {
       throw new MastraError({
         id: "AGENT_GENEREATE_SCORER_NOT_FOUND",
         domain: "AGENT" /* AGENT */,
@@ -16691,8 +16818,11 @@ var Agent = class extends MastraBase {
   async prepareModels(requestContext, model) {
     if (model || !Array.isArray(this.model)) {
       const modelToUse = model ?? this.model;
-      const resolvedModel = typeof modelToUse === "function" ? await modelToUse({ requestContext, mastra: this.#mastra }) : modelToUse;
-      if (resolvedModel?.specificationVersion !== "v2") {
+      const resolvedModel = await this.resolveModelConfig(
+        modelToUse,
+        requestContext
+      );
+      if (!isSupportedLanguageModel(resolvedModel)) {
         const mastraError = new MastraError({
           id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
           domain: "AGENT" /* AGENT */,
@@ -16700,26 +16830,30 @@ var Agent = class extends MastraBase {
           details: {
             agentName: this.name
           },
-          text: `[Agent:${this.name}] - Only v2 models are allowed when an array of models is provided`
+          text: `[Agent:${this.name}] - Only v2/v3 models are allowed when an array of models is provided`
         });
         this.logger.trackException(mastraError);
         this.logger.error(mastraError.toString());
         throw mastraError;
       }
+      let headers;
+      if (resolvedModel instanceof ModelRouterLanguageModel) {
+        headers = resolvedModel.config?.headers;
+      }
       return [
         {
           id: "main",
-          // TODO fix type check
           model: resolvedModel,
           maxRetries: this.maxRetries ?? 0,
-          enabled: true
+          enabled: true,
+          headers
         }
       ];
     }
     const models = await Promise.all(
       this.model.map(async (modelConfig) => {
         const model2 = await this.resolveModelConfig(modelConfig.model, requestContext);
-        if (!isV2Model(model2)) {
+        if (!isSupportedLanguageModel(model2)) {
           const mastraError = new MastraError({
             id: "AGENT_PREPARE_MODELS_INCOMPATIBLE_WITH_MODEL_ARRAY_V1",
             domain: "AGENT" /* AGENT */,
@@ -16727,7 +16861,7 @@ var Agent = class extends MastraBase {
             details: {
               agentName: this.name
             },
-            text: `[Agent:${this.name}] - Only v2 models are allowed when an array of models is provided`
+            text: `[Agent:${this.name}] - Only v2/v3 models are allowed when an array of models is provided`
           });
           this.logger.trackException(mastraError);
           this.logger.error(mastraError.toString());
@@ -16748,11 +16882,16 @@ var Agent = class extends MastraBase {
           this.logger.error(mastraError.toString());
           throw mastraError;
         }
+        let headers;
+        if (model2 instanceof ModelRouterLanguageModel) {
+          headers = model2.config?.headers;
+        }
         return {
           id: modelId,
           model: model2,
           maxRetries: modelConfig.maxRetries ?? 0,
-          enabled: modelConfig.enabled ?? true
+          enabled: modelConfig.enabled ?? true,
+          headers
         };
       })
     );
@@ -16762,7 +16901,11 @@ var Agent = class extends MastraBase {
    * Executes the agent call, handling tools, memory, and streaming.
    * @internal
    */
-  async #execute({ methodType, resumeContext, ...options }) {
+  async #execute({
+    methodType,
+    resumeContext,
+    ...options
+  }) {
     const existingSnapshot = resumeContext?.snapshot;
     let snapshotMemoryInfo;
     if (existingSnapshot) {
@@ -17109,14 +17252,14 @@ var Agent = class extends MastraBase {
       requestContext: mergedOptions.requestContext
     });
     const modelInfo = llm.getModel();
-    if (modelInfo.specificationVersion !== "v2") {
+    if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
       throw new MastraError({
         id: "AGENT_GENERATE_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5 models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with generate(). Please use AI SDK v5+ models or call the generateLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
         details: {
           agentName: this.name,
           modelId,
@@ -17171,14 +17314,14 @@ var Agent = class extends MastraBase {
       requestContext: mergedOptions.requestContext
     });
     const modelInfo = llm.getModel();
-    if (modelInfo.specificationVersion !== "v2") {
+    if (!isSupportedLanguageModel(modelInfo)) {
       const modelId = modelInfo.modelId || "unknown";
       const provider = modelInfo.provider || "unknown";
       throw new MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
         category: "USER" /* USER */,
-        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5 models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
+        text: `Agent "${this.name}" is using AI SDK v4 model (${provider}:${modelId}) which is not compatible with stream(). Please use AI SDK v5+ models or call the streamLegacy() method instead. See https://mastra.ai/en/docs/streaming/overview for more information.`,
         details: {
           agentName: this.name,
           modelId,
@@ -17240,7 +17383,7 @@ var Agent = class extends MastraBase {
     const llm = await this.getLLM({
       requestContext: mergedStreamOptions.requestContext
     });
-    if (llm.getModel().specificationVersion !== "v2") {
+    if (!isSupportedLanguageModel(llm.getModel())) {
       throw new MastraError({
         id: "AGENT_STREAM_V1_MODEL_NOT_SUPPORTED",
         domain: "AGENT" /* AGENT */,
@@ -17480,7 +17623,7 @@ var ModerationProcessor = class _ModerationProcessor {
         reason: z8.string().describe("Brief explanation of why content was flagged").nullable()
       });
       let response;
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.moderationAgent.generate(prompt, {
           structuredOutput: {
             schema,
@@ -17700,7 +17843,7 @@ var PromptInjectionDetector = class _PromptInjectionDetector {
           rewritten_content: z8.string().describe("The rewritten content that neutralizes the attack while preserving any legitimate user intent").nullable()
         });
       }
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.detectionAgent.generate(prompt, {
           structuredOutput: {
             schema,
@@ -17948,7 +18091,7 @@ var PIIDetector = class _PIIDetector {
         redacted_content: z8.string().describe("The content with all PII redacted according to the redaction method").nullable()
       }) : baseSchema;
       let response;
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.detectionAgent.generate(prompt, {
           structuredOutput: {
             schema,
@@ -18410,7 +18553,7 @@ var LanguageDetector = class _LanguageDetector {
       const schema = this.strategy === "translate" ? baseSchema.extend({
         translated_text: z8.string().describe("Translated text").nullable()
       }) : baseSchema;
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         response = await this.detectionAgent.generate(prompt, {
           structuredOutput: {
             schema
@@ -19088,7 +19231,7 @@ var SystemPromptScrubber = class {
       const schema = this.strategy === "redact" ? baseSchema.extend({
         redacted_content: z.string().describe("Redacted content").nullable()
       }) : baseSchema;
-      if (model.specificationVersion === "v2") {
+      if (isSupportedLanguageModel(model)) {
         result = await this.detectionAgent.generate(text, {
           structuredOutput: {
             schema,
@@ -20567,6 +20710,6 @@ var MockMemory = class extends MastraMemory {
   }
 };
 
-export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, EventEmitterPubSub, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, hydrateSerializedStepErrors, isProcessor, isProcessorWorkflow, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, resolveThreadIdFromArgs, runCountDeprecationMessage, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepStateData, validateStepSuspendData };
-//# sourceMappingURL=chunk-E5BQRAJK.js.map
-//# sourceMappingURL=chunk-E5BQRAJK.js.map
+export { AISDKV5OutputStream, Agent, BatchPartsProcessor, ChunkFrom, DefaultExecutionEngine, EventEmitterPubSub, ExecutionEngine, FilePartSchema, ImagePartSchema, LanguageDetector, MastraAgentNetworkStream, MastraMemory, MastraModelOutput, MemoryProcessor, MessageContentSchema, MessageHistory, MessagePartSchema, MockMemory, ModerationProcessor, PIIDetector, ProcessorInputPhaseSchema, ProcessorInputStepPhaseSchema, ProcessorMessageContentSchema, ProcessorMessageSchema, ProcessorOutputResultPhaseSchema, ProcessorOutputStepPhaseSchema, ProcessorOutputStreamPhaseSchema, ProcessorRunner, ProcessorState, ProcessorStepInputSchema, ProcessorStepOutputSchema, ProcessorStepSchema, PromptInjectionDetector, ReasoningPartSchema, Run, SemanticRecall, SourcePartSchema, StepStartPartSchema, StructuredOutputProcessor, SystemPromptScrubber, TextPartSchema, TokenLimiterProcessor, ToolCallFilter, ToolInvocationPartSchema, TripWire, UnicodeNormalizer, Workflow, WorkflowRunOutput, WorkingMemory, augmentWithInit, cloneStep, cloneWorkflow, convertFullStreamChunkToMastra, convertFullStreamChunkToUIMessageStream, convertMastraChunkToAISDKv5, createDeprecationProxy, createStep, createTimeTravelExecutionParams, createWorkflow, getResumeLabelsByStepId, getStepIds, getStepResult, getZodErrors, hydrateSerializedStepErrors, isProcessor, isProcessorWorkflow, isSupportedLanguageModel, loop, mapVariable, memoryDefaultOptions, parseMemoryRequestContext, resolveThreadIdFromArgs, runCountDeprecationMessage, supportedLanguageModelSpecifications, tryGenerateWithJsonFallback, tryStreamWithJsonFallback, validateStepInput, validateStepResumeData, validateStepStateData, validateStepSuspendData };
+//# sourceMappingURL=chunk-QF4MHFSU.js.map
+//# sourceMappingURL=chunk-QF4MHFSU.js.map