@voltagent/core 2.0.11 → 2.0.12

package/dist/index.d.mts

@@ -5689,9 +5689,10 @@ declare class Agent {
      */
     private calculateMaxSteps;
     /**
-     * Get the model name
+     * Get the model name.
+     * Pass a resolved model to return its modelId (useful for dynamic models).
      */
-    getModelName(): string;
+    getModelName(model?: LanguageModel | string): string;
     /**
      * Get full agent state
      */
@@ -6822,6 +6823,7 @@ type ExtractExecuteResult<T> = T extends {
 type AgentConfig$1<SCHEMA extends z.ZodTypeAny, INPUT, DATA> = BaseGenerationOptions & {
     schema: SCHEMA | ((context: Omit<WorkflowExecuteContext<INPUT, DATA, any, any>, "suspend" | "writer">) => SCHEMA | Promise<SCHEMA>);
 };
+type AgentResultMapper<INPUT, DATA, SCHEMA extends z.ZodTypeAny, RESULT> = (output: z.infer<SCHEMA>, context: WorkflowExecuteContext<INPUT, DATA, any, any>) => Promise<RESULT> | RESULT;
 /**
  * Creates an agent step for a workflow
  *
@@ -6843,15 +6845,16 @@ type AgentConfig$1<SCHEMA extends z.ZodTypeAny, INPUT, DATA> = BaseGenerationOpt
  * @param task - The task (prompt) to execute for the agent, can be a string or a function that returns a string
  * @param agent - The agent to execute the task using `generateText`
  * @param config - The config for the agent (schema) `generateText` call
+ * @param map - Optional mapper to shape or merge the agent output with existing data
  * @returns A workflow step that executes the agent with the task
  */
-declare function andAgent<INPUT, DATA, SCHEMA extends z.ZodTypeAny>(task: UIMessage[] | ModelMessage[] | string | InternalWorkflowFunc<INPUT, DATA, UIMessage[] | ModelMessage[] | string, any, any>, agent: Agent, config: AgentConfig$1<SCHEMA, INPUT, DATA>): {
+declare function andAgent<INPUT, DATA, SCHEMA extends z.ZodTypeAny, RESULT = z.infer<SCHEMA>>(task: UIMessage[] | ModelMessage[] | string | InternalWorkflowFunc<INPUT, DATA, UIMessage[] | ModelMessage[] | string, any, any>, agent: Agent, config: AgentConfig$1<SCHEMA, INPUT, DATA>, map?: AgentResultMapper<INPUT, DATA, SCHEMA, RESULT>): {
     type: "agent";
     id: string;
     name: string;
     purpose: string | null;
     agent: Agent;
-    execute: (context: WorkflowExecuteContext<INPUT, DATA, any, any>) => Promise<z.TypeOf<SCHEMA>>;
+    execute: (context: WorkflowExecuteContext<INPUT, DATA, any, any>) => Promise<RESULT>;
 };
 
 interface WorkflowStepAgent<INPUT, DATA, RESULT> extends InternalBaseWorkflowStep<INPUT, DATA, RESULT, any, any> {
@@ -7572,9 +7575,11 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
      * @param task - The task (prompt) to execute for the agent, can be a string or a function that returns a string
      * @param agent - The agent to execute the task using `generateText`
      * @param config - The config for the agent (schema) `generateText` call
+     * @param map - Optional mapper to shape or merge the agent output with existing data
      * @returns A workflow step that executes the agent with the task
      */
     andAgent<SCHEMA extends z.ZodTypeAny>(task: string | UIMessage[] | ModelMessage[] | InternalWorkflowFunc<WorkflowInput<INPUT_SCHEMA>, CURRENT_DATA, string | UIMessage[] | ModelMessage[], any, any>, agent: Agent, config: AgentConfig<SCHEMA, INPUT_SCHEMA, CURRENT_DATA>): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, z.infer<SCHEMA>, SUSPEND_SCHEMA, RESUME_SCHEMA>;
+    andAgent<SCHEMA extends z.ZodTypeAny, NEW_DATA>(task: string | UIMessage[] | ModelMessage[] | InternalWorkflowFunc<WorkflowInput<INPUT_SCHEMA>, CURRENT_DATA, string | UIMessage[] | ModelMessage[], any, any>, agent: Agent, config: AgentConfig<SCHEMA, INPUT_SCHEMA, CURRENT_DATA>, map: (output: z.infer<SCHEMA>, context: WorkflowExecuteContext<WorkflowInput<INPUT_SCHEMA>, CURRENT_DATA, any, any>) => Promise<NEW_DATA> | NEW_DATA): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, NEW_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with both input and output schemas
      * @param config - Step configuration with schemas
@@ -7591,12 +7596,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<z.infer<OS>>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, z.infer<OS>, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with only input schema
@@ -7614,12 +7621,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<NEW_DATA>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, NEW_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with only output schema
@@ -7637,12 +7646,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<z.infer<OS>>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, z.infer<OS>, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with only resumeSchema
@@ -7660,12 +7671,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: z.infer<RS>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<NEW_DATA>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, NEW_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow
@@ -7699,12 +7712,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<NEW_DATA>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
         inputSchema?: never;
         outputSchema?: never;
         suspendSchema?: z.ZodTypeAny;
@@ -7784,12 +7799,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<void>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, CURRENT_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a tap step to the workflow
@@ -7822,12 +7839,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<void>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
         inputSchema?: never;
         suspendSchema?: z.ZodTypeAny;
         resumeSchema?: z.ZodTypeAny;

package/dist/index.d.ts

@@ -5689,9 +5689,10 @@ declare class Agent {
      */
     private calculateMaxSteps;
     /**
-     * Get the model name
+     * Get the model name.
+     * Pass a resolved model to return its modelId (useful for dynamic models).
      */
-    getModelName(): string;
+    getModelName(model?: LanguageModel | string): string;
     /**
      * Get full agent state
      */
@@ -6822,6 +6823,7 @@ type ExtractExecuteResult<T> = T extends {
 type AgentConfig$1<SCHEMA extends z.ZodTypeAny, INPUT, DATA> = BaseGenerationOptions & {
     schema: SCHEMA | ((context: Omit<WorkflowExecuteContext<INPUT, DATA, any, any>, "suspend" | "writer">) => SCHEMA | Promise<SCHEMA>);
 };
+type AgentResultMapper<INPUT, DATA, SCHEMA extends z.ZodTypeAny, RESULT> = (output: z.infer<SCHEMA>, context: WorkflowExecuteContext<INPUT, DATA, any, any>) => Promise<RESULT> | RESULT;
 /**
  * Creates an agent step for a workflow
  *
@@ -6843,15 +6845,16 @@ type AgentConfig$1<SCHEMA extends z.ZodTypeAny, INPUT, DATA> = BaseGenerationOpt
  * @param task - The task (prompt) to execute for the agent, can be a string or a function that returns a string
  * @param agent - The agent to execute the task using `generateText`
  * @param config - The config for the agent (schema) `generateText` call
+ * @param map - Optional mapper to shape or merge the agent output with existing data
  * @returns A workflow step that executes the agent with the task
  */
-declare function andAgent<INPUT, DATA, SCHEMA extends z.ZodTypeAny>(task: UIMessage[] | ModelMessage[] | string | InternalWorkflowFunc<INPUT, DATA, UIMessage[] | ModelMessage[] | string, any, any>, agent: Agent, config: AgentConfig$1<SCHEMA, INPUT, DATA>): {
+declare function andAgent<INPUT, DATA, SCHEMA extends z.ZodTypeAny, RESULT = z.infer<SCHEMA>>(task: UIMessage[] | ModelMessage[] | string | InternalWorkflowFunc<INPUT, DATA, UIMessage[] | ModelMessage[] | string, any, any>, agent: Agent, config: AgentConfig$1<SCHEMA, INPUT, DATA>, map?: AgentResultMapper<INPUT, DATA, SCHEMA, RESULT>): {
     type: "agent";
     id: string;
     name: string;
     purpose: string | null;
     agent: Agent;
-    execute: (context: WorkflowExecuteContext<INPUT, DATA, any, any>) => Promise<z.TypeOf<SCHEMA>>;
+    execute: (context: WorkflowExecuteContext<INPUT, DATA, any, any>) => Promise<RESULT>;
 };
 
 interface WorkflowStepAgent<INPUT, DATA, RESULT> extends InternalBaseWorkflowStep<INPUT, DATA, RESULT, any, any> {
@@ -7572,9 +7575,11 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
      * @param task - The task (prompt) to execute for the agent, can be a string or a function that returns a string
      * @param agent - The agent to execute the task using `generateText`
      * @param config - The config for the agent (schema) `generateText` call
+     * @param map - Optional mapper to shape or merge the agent output with existing data
      * @returns A workflow step that executes the agent with the task
      */
     andAgent<SCHEMA extends z.ZodTypeAny>(task: string | UIMessage[] | ModelMessage[] | InternalWorkflowFunc<WorkflowInput<INPUT_SCHEMA>, CURRENT_DATA, string | UIMessage[] | ModelMessage[], any, any>, agent: Agent, config: AgentConfig<SCHEMA, INPUT_SCHEMA, CURRENT_DATA>): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, z.infer<SCHEMA>, SUSPEND_SCHEMA, RESUME_SCHEMA>;
+    andAgent<SCHEMA extends z.ZodTypeAny, NEW_DATA>(task: string | UIMessage[] | ModelMessage[] | InternalWorkflowFunc<WorkflowInput<INPUT_SCHEMA>, CURRENT_DATA, string | UIMessage[] | ModelMessage[], any, any>, agent: Agent, config: AgentConfig<SCHEMA, INPUT_SCHEMA, CURRENT_DATA>, map: (output: z.infer<SCHEMA>, context: WorkflowExecuteContext<WorkflowInput<INPUT_SCHEMA>, CURRENT_DATA, any, any>) => Promise<NEW_DATA> | NEW_DATA): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, NEW_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with both input and output schemas
      * @param config - Step configuration with schemas
@@ -7591,12 +7596,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<z.infer<OS>>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, z.infer<OS>, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with only input schema
@@ -7614,12 +7621,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<NEW_DATA>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, NEW_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with only output schema
@@ -7637,12 +7646,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<z.infer<OS>>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, z.infer<OS>, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow with only resumeSchema
@@ -7660,12 +7671,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: z.infer<RS>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<NEW_DATA>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, NEW_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a function step to the workflow
@@ -7699,12 +7712,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<NEW_DATA>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
         inputSchema?: never;
         outputSchema?: never;
         suspendSchema?: z.ZodTypeAny;
@@ -7784,12 +7799,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: SS extends z.ZodTypeAny ? z.infer<SS> : z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: RS extends z.ZodTypeAny ? z.infer<RS> : z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<void>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
     }): WorkflowChain<INPUT_SCHEMA, RESULT_SCHEMA, CURRENT_DATA, SUSPEND_SCHEMA, RESUME_SCHEMA>;
     /**
      * Add a tap step to the workflow
@@ -7822,12 +7839,14 @@ declare class WorkflowChain<INPUT_SCHEMA extends InternalBaseWorkflowInputSchema
             getStepData: (stepId: string) => WorkflowStepData | undefined;
             suspend: (reason?: string, suspendData?: z.infer<SUSPEND_SCHEMA>) => Promise<never>;
             resumeData?: z.infer<RESUME_SCHEMA>;
+            retryCount?: number;
             logger: Logger;
             writer: WorkflowStreamWriter;
         }) => Promise<void>;
         id: string;
         name?: string;
         purpose?: string;
+        retries?: number;
         inputSchema?: never;
         suspendSchema?: z.ZodTypeAny;
         resumeSchema?: z.ZodTypeAny;

package/dist/index.js

@@ -399,7 +399,7 @@ function convertUsage(usage) {
 __name(convertUsage, "convertUsage");
 
 // src/workflow/steps/and-agent.ts
-function andAgent(task, agent, config) {
+function andAgent(task, agent, config, map) {
   return {
     type: "agent",
     id: agent.id,
@@ -412,6 +412,12 @@ function andAgent(task, agent, config) {
       const finalTask = typeof task === "function" ? await task(context8) : task;
       const finalSchema = typeof schema === "function" ? await schema(context8) : schema;
       const output = import_ai.Output.object({ schema: finalSchema });
+      const mapOutput = /* @__PURE__ */ __name(async (outputValue) => {
+        if (map) {
+          return await map(outputValue, context8);
+        }
+        return outputValue;
+      }, "mapOutput");
       if (!state.workflowContext) {
         const result = await agent.generateText(finalTask, {
           ...restConfig,
@@ -433,7 +439,7 @@ function andAgent(task, agent, config) {
           }
           state.usage.totalTokens += convertedUsage?.totalTokens || 0;
         }
-        return result.output;
+        return mapOutput(result.output);
       }
       try {
         const result = await agent.generateText(finalTask, {
@@ -457,7 +463,7 @@ function andAgent(task, agent, config) {
           }
           state.usage.totalTokens += convertedUsage?.totalTokens || 0;
         }
-        return result.output;
+        return mapOutput(result.output);
       } catch (error) {
         if (error instanceof Error && (error.message === "WORKFLOW_SUSPENDED" || error.message === "WORKFLOW_CANCELLED")) {
           throw error;
@@ -9151,34 +9157,8 @@ var WorkflowChain = class {
   constructor(config) {
     this.config = config;
   }
-  /**
-   * Creates an agent step for a workflow
-   *
-   * @example
-   * ```ts
-   * const w = createWorkflowChain({
-   *   id: "greeting-workflow",
-   *   input: z.object({ name: z.string() }),
-   *   result: z.string()
-   * })
-   *   .andAgent(
-   *     ({ data }) => `Generate a greeting for the user ${data.name}`,
-   *     agent,
-   *     { schema: z.object({ greeting: z.string() }) }
-   *   )
-   *   .andThen({
-   *     id: "extract-greeting",
-   *     execute: async ({ data }) => data.greeting
-   *   })
-   * ```
-   *
-   * @param task - The task (prompt) to execute for the agent, can be a string or a function that returns a string
-   * @param agent - The agent to execute the task using `generateText`
-   * @param config - The config for the agent (schema) `generateText` call
-   * @returns A workflow step that executes the agent with the task
-   */
-  andAgent(task, agent, config) {
-    const step = andAgent(task, agent, config);
+  andAgent(task, agent, config, map) {
+    const step = andAgent(task, agent, config, map);
     this.steps.push(step);
     return this;
   }
@@ -19515,7 +19495,7 @@ var Agent = class {
           oc,
           options
         );
-        const modelName = this.getModelName();
+        const modelName = this.getModelName(model);
         const contextLimit = options?.contextLimit;
         addModelAttributesToSpan(
           rootSpan,
@@ -19837,7 +19817,7 @@ var Agent = class {
           oc,
           options
         );
-        const modelName = this.getModelName();
+        const modelName = this.getModelName(model);
         const contextLimit = options?.contextLimit;
         if (oc.traceContext) {
           const rootSpan2 = oc.traceContext.getRootSpan();
@@ -19942,7 +19922,7 @@ var Agent = class {
             methodLogger.error("Stream error occurred", {
               error: actualError,
               agentName: this.name,
-              modelName: this.getModelName()
+              modelName
             });
             finalizeLLMSpan(import_api15.SpanStatusCode.ERROR, { message: actualError?.message });
             this.getMergedHooks(options).onError?.({
@@ -20361,7 +20341,7 @@ var Agent = class {
           oc,
           options
         );
-        const modelName = this.getModelName();
+        const modelName = this.getModelName(model);
         const schemaName = schema.description || "unknown";
         addModelAttributesToSpan(
           rootSpan,
@@ -20546,7 +20526,7 @@ var Agent = class {
           oc,
           options
         );
-        const modelName = this.getModelName();
+        const modelName = this.getModelName(model);
         const schemaName = schema.description || "unknown";
         addModelAttributesToSpan(
           rootSpan,
@@ -20617,7 +20597,7 @@ var Agent = class {
             methodLogger.error("Stream object error occurred", {
               error: actualError,
               agentName: this.name,
-              modelName: this.getModelName(),
+              modelName,
               schemaName
             });
             this.getMergedHooks(options).onError?.({
@@ -22246,9 +22226,16 @@ ${retrieverContext}`;
     return this.subAgentManager.calculateMaxSteps(this.maxSteps);
   }
   /**
-   * Get the model name
+   * Get the model name.
+   * Pass a resolved model to return its modelId (useful for dynamic models).
    */
-  getModelName() {
+  getModelName(model) {
+    if (model) {
+      if (typeof model === "string") {
+        return model;
+      }
+      return model.modelId || "unknown";
+    }
     if (typeof this.model === "function") {
       return "dynamic";
     }