@aigne/core 1.69.2 → 1.70.0-beta

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [1.70.0-beta](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.69.2...core-v1.70.0-beta) (2025-12-02)
+
+
+### Features
+
+* **core:** add nested getter pattern support for model options ([#796](https://github.com/AIGNE-io/aigne-framework/issues/796)) ([824b2fe](https://github.com/AIGNE-io/aigne-framework/commit/824b2fe55cb2a24620e2bb73b470532918fa2996))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @aigne/afs bumped to 1.2.3-beta
+    * @aigne/afs-history bumped to 1.1.2-beta
+
 ## [1.69.2](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.69.2-beta.1...core-v1.69.2) (2025-11-28)
 
 

package/lib/cjs/agents/chat-model.d.ts

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { type ZodType, z } from "zod";
 import { type PromiseOrValue } from "../utils/type-utils.js";
 import { type AgentInvokeOptions, type AgentOptions, type AgentProcessResult, type AgentResponse, type AgentResponseStream, type GetterSchema, type Message } from "./agent.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
@@ -40,7 +40,6 @@ export declare abstract class ChatModel extends Model<ChatModelInput, ChatModelO
         apiKey?: string;
         model?: string;
     }>;
-    getModelOptions(input: Message, options: AgentInvokeOptions): Promise<ChatModelInputOptions>;
     /**
      * Indicates whether the model supports parallel tool calls
      *
@@ -157,7 +156,7 @@ export interface ChatModelInput extends Message {
     /**
      * Model-specific configuration options
      */
-    modelOptions?: ChatModelInputOptionsWithGetter;
+    modelOptions?: ChatModelInputOptions;
 }
 /**
  * Message role types
@@ -241,8 +240,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     type: "text";
     text: string;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"local">;
     path: z.ZodString;
@@ -257,8 +256,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     filename?: string | undefined;
     mimeType?: string | undefined;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"url">;
     url: z.ZodString;
@@ -273,8 +272,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     filename?: string | undefined;
     mimeType?: string | undefined;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"file">;
     data: z.ZodString;
@@ -497,7 +496,7 @@ export interface ChatModelOutputUsage {
 export declare const chatModelOutputUsageSchema: z.ZodObject<{
     inputTokens: z.ZodNumber;
     outputTokens: z.ZodNumber;
-    aigneHubCredits: z.ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+    aigneHubCredits: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
 }, "strip", z.ZodTypeAny, {
     inputTokens: number;
     outputTokens: number;

package/lib/cjs/agents/chat-model.js

@@ -92,34 +92,12 @@ class ChatModel extends model_js_1.Model {
             inputSchema: chatModelInputSchema,
             outputSchema: chatModelOutputSchema,
             retryOnError,
-            model: undefined,
         });
         this.options = options;
     }
     get credential() {
         return {};
     }
-    async getModelOptions(input, options) {
-        const result = {};
-        for (const [key, val] of Object.entries({
-            ...this.options?.modelOptions,
-            ...("modelOptions" in input ? input.modelOptions : {}),
-        })) {
-            if (val &&
-                typeof val === "object" &&
-                agent_js_1.DEFAULT_INPUT_ACTION_GET in val &&
-                typeof val[agent_js_1.DEFAULT_INPUT_ACTION_GET] === "string") {
-                const getterPath = val[agent_js_1.DEFAULT_INPUT_ACTION_GET];
-                const value = input[getterPath] ?? options.context.userContext[getterPath];
-                if (!(0, type_utils_js_1.isNil)(value))
-                    Object.assign(result, { [key]: value });
-            }
-            else {
-                Object.assign(result, { [key]: val });
-            }
-        }
-        return result;
-    }
     /**
      * Indicates whether the model supports parallel tool calls
      *
@@ -351,25 +329,33 @@ const chatModelInputToolChoiceSchema = zod_1.z.union([
     zod_1.z.literal("required"),
     chatModelInputToolSchema,
 ]);
-const modelOptionsSchema = zod_1.z.object({
-    model: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.string())),
-    temperature: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.number())),
-    topP: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.number())),
-    frequencyPenalty: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.number())),
-    presencePenalty: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.number())),
-    parallelToolCalls: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.boolean())).default(true),
-    modalities: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.array(zod_1.z.enum(["text", "image", "audio"])))),
-    reasoningEffort: (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(zod_1.z.union([
+const modelOptionsSchemaProperties = {
+    model: zod_1.z.string(),
+    temperature: zod_1.z.number(),
+    topP: zod_1.z.number(),
+    frequencyPenalty: zod_1.z.number(),
+    presencePenalty: zod_1.z.number(),
+    parallelToolCalls: zod_1.z.boolean().default(true),
+    modalities: zod_1.z.array(zod_1.z.enum(["text", "image", "audio"])),
+    reasoningEffort: zod_1.z.union([
         zod_1.z.number(),
         zod_1.z.literal("minimal"),
         zod_1.z.literal("low"),
         zod_1.z.literal("medium"),
         zod_1.z.literal("high"),
-    ]))),
-});
+    ]),
+};
+const modelOptionsSchema = zod_1.z.object(Object.fromEntries(Object.entries(modelOptionsSchemaProperties).map(([key, schema]) => [
+    key,
+    (0, schema_js_1.optionalize)(schema),
+])));
+const modelOptionsWithGetterSchema = zod_1.z.object(Object.fromEntries(Object.entries(modelOptionsSchemaProperties).map(([key, schema]) => [
+    key,
+    (0, schema_js_1.optionalize)((0, agent_js_1.getterSchema)(schema)),
+])));
 const chatModelOptionsSchema = agent_js_1.agentOptionsSchema.extend({
     model: (0, schema_js_1.optionalize)(zod_1.z.string()),
-    modelOptions: (0, schema_js_1.optionalize)(modelOptionsSchema),
+    modelOptions: (0, schema_js_1.optionalize)(modelOptionsWithGetterSchema),
 });
 const chatModelInputSchema = zod_1.z.object({
     messages: zod_1.z.array(chatModelInputMessageSchema),

package/lib/cjs/agents/image-agent.d.ts

@@ -6,7 +6,6 @@ import { type FileType } from "./model.js";
 export interface ImageAgentOptions<I extends Message = any, O extends ImageModelOutput = any> extends Omit<AgentOptions<I, O>, "outputSchema"> {
     instructions: string | PromptBuilder;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
     outputFileType?: FileType;
 }
 export declare const imageAgentOptionsSchema: ZodObject<{
@@ -18,7 +17,6 @@ export declare class ImageAgent<I extends Message = any, O extends ImageModelOut
     constructor(options: ImageAgentOptions<I, O>);
     instructions: PromptBuilder;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
     outputFileType?: FileType;
     process(input: I, options: AgentInvokeOptions): Promise<O>;
 }

package/lib/cjs/agents/image-agent.js

@@ -12,7 +12,6 @@ const image_model_js_1 = require("./image-model.js");
 const model_js_1 = require("./model.js");
 exports.imageAgentOptionsSchema = agent_js_1.agentOptionsSchema.extend({
     instructions: zod_1.default.union([zod_1.default.string(), zod_1.default.custom()]),
-    modelOptions: zod_1.default.record(zod_1.default.any()).optional(),
     outputFileType: model_js_1.fileTypeSchema.optional(),
 });
 class ImageAgent extends agent_js_1.Agent {
@@ -28,26 +27,25 @@ class ImageAgent extends agent_js_1.Agent {
                 ? prompt_builder_js_1.PromptBuilder.from(options.instructions)
                 : options.instructions;
         this.inputFileKey = options.inputFileKey;
-        this.modelOptions = options.modelOptions;
         this.outputFileType = options.outputFileType;
     }
     instructions;
     inputFileKey;
-    modelOptions;
     outputFileType;
     async process(input, options) {
         const imageModel = this.imageModel || options.imageModel || options.context.imageModel;
         if (!imageModel)
             throw new Error("image model is required to run ImageAgent");
+        const modelOptions = await imageModel.getModelOptions(input, options);
         const { prompt, image } = await this.instructions.buildImagePrompt({
             ...options,
             input,
             agent: this,
         });
-        const n = input.n || this.modelOptions?.n;
+        const n = input.n || modelOptions?.n;
         return (await this.invokeChildAgent(imageModel, {
             n: n && typeof n === "number" ? n : undefined,
-            modelOptions: this.modelOptions,
+            modelOptions,
             prompt,
             image,
             outputFileType: this.outputFileType,

package/lib/cjs/agents/image-model.d.ts

@@ -5,7 +5,7 @@ import { type ChatModelOutputUsage } from "./chat-model.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
 export interface ImageModelOptions<I extends ImageModelInput = ImageModelInput, O extends ImageModelOutput = ImageModelOutput> extends Omit<AgentOptions<I, O>, "model"> {
     model?: string;
-    modelOptions?: Omit<ImageModelInputOptions, "model">;
+    modelOptions?: ImageModelInputOptionsWithGetter;
 }
 export declare abstract class ImageModel<I extends ImageModelInput = ImageModelInput, O extends ImageModelOutput = ImageModelOutput> extends Model<I, O> {
     options?: ImageModelOptions<I, O> | undefined;

package/lib/cjs/agents/image-model.js

@@ -13,7 +13,6 @@ class ImageModel extends model_js_1.Model {
             inputSchema: exports.imageModelInputSchema,
             outputSchema: exports.imageModelOutputSchema,
             ...options,
-            model: undefined,
         });
         this.options = options;
     }

package/lib/cjs/agents/model.d.ts

@@ -1,6 +1,22 @@
 import { z } from "zod";
-import { Agent, type AgentInvokeOptions, type Message } from "./agent.js";
+import { Agent, type AgentInvokeOptions, type AgentOptions, type Message } from "./agent.js";
 export declare abstract class Model<I extends Message = any, O extends Message = any> extends Agent<I, O> {
+    options?: (Omit<AgentOptions<I, O>, "model"> & {
+        modelOptions?: Record<string, unknown>;
+    }) | undefined;
+    constructor(options?: (Omit<AgentOptions<I, O>, "model"> & {
+        modelOptions?: Record<string, unknown>;
+    }) | undefined);
+    /**
+     * Resolves model options by merging instance-level and input-level options,
+     * and recursively resolving getter patterns
+     *
+     * @param input - The input message containing potential modelOptions
+     * @param options - The agent invocation options containing context
+     * @returns Resolved model options with all getters replaced by actual values
+     */
+    getModelOptions(input: Message, options: AgentInvokeOptions): Promise<Record<string, unknown>>;
+    protected preprocess(input: I, options: AgentInvokeOptions): Promise<void>;
     transformFileType(fileType: "file", data: FileUnionContent, options: AgentInvokeOptions): Promise<FileContent>;
     transformFileType(fileType: "local" | undefined, data: FileUnionContent, options: AgentInvokeOptions): Promise<LocalContent>;
     transformFileType(fileType: FileType | undefined, data: FileUnionContent, options: AgentInvokeOptions): Promise<FileUnionContent>;

package/lib/cjs/agents/model.js

@@ -43,6 +43,52 @@ const fetch_js_1 = require("../utils/fetch.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
 const agent_js_1 = require("./agent.js");
 class Model extends agent_js_1.Agent {
+    options;
+    constructor(options) {
+        super(options);
+        this.options = options;
+    }
+    /**
+     * Resolves model options by merging instance-level and input-level options,
+     * and recursively resolving getter patterns
+     *
+     * @param input - The input message containing potential modelOptions
+     * @param options - The agent invocation options containing context
+     * @returns Resolved model options with all getters replaced by actual values
+     */
+    async getModelOptions(input, options) {
+        const resolveGetters = (obj) => {
+            if (!obj || typeof obj !== "object")
+                return obj;
+            // Check if this object itself is a getter pattern
+            if (agent_js_1.DEFAULT_INPUT_ACTION_GET in obj && typeof obj[agent_js_1.DEFAULT_INPUT_ACTION_GET] === "string") {
+                const getterPath = obj[agent_js_1.DEFAULT_INPUT_ACTION_GET];
+                const value = input[getterPath] ?? options.context.userContext[getterPath];
+                return (0, type_utils_js_1.isNil)(value) ? undefined : value;
+            }
+            // If it's an array, recursively resolve each element
+            if (Array.isArray(obj)) {
+                return obj.map((item) => resolveGetters(item));
+            }
+            // If it's a plain object, recursively resolve each property
+            return Object.entries(obj).reduce((resolved, [key, val]) => {
+                const resolvedValue = resolveGetters(val);
+                if (!(0, type_utils_js_1.isNil)(resolvedValue)) {
+                    resolved[key] = resolvedValue;
+                }
+                return resolved;
+            }, {});
+        };
+        const mergedOptions = {
+            ...this.options?.modelOptions,
+            ...("modelOptions" in input ? input.modelOptions : {}),
+        };
+        return resolveGetters(mergedOptions);
+    }
+    async preprocess(input, options) {
+        Object.assign(input, { modelOptions: await this.getModelOptions(input, options) });
+        return super.preprocess(input, options);
+    }
     async transformFileType(fileType = "local", data, options) {
         if (fileType === data.type)
             return data;

package/lib/cjs/agents/video-model.d.ts

@@ -5,7 +5,7 @@ import { type ChatModelOutputUsage } from "./chat-model.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
 export interface VideoModelOptions<I extends VideoModelInput = VideoModelInput, O extends VideoModelOutput = VideoModelOutput> extends Omit<AgentOptions<I, O>, "model"> {
     model?: string;
-    modelOptions?: Omit<VideoModelInputOptions, "model">;
+    modelOptions?: VideoModelInputOptionsWithGetter;
 }
 export declare abstract class VideoModel<I extends VideoModelInput = VideoModelInput, O extends VideoModelOutput = VideoModelOutput> extends Model<I, O> {
     options?: VideoModelOptions<I, O> | undefined;

package/lib/cjs/agents/video-model.js

@@ -12,7 +12,6 @@ class VideoModel extends model_js_1.Model {
             inputSchema: exports.videoModelInputSchema,
             outputSchema: exports.videoModelOutputSchema,
             ...options,
-            model: undefined,
         });
         this.options = options;
     }

package/lib/cjs/loader/agent-yaml.d.ts

@@ -67,7 +67,6 @@ export interface ImageAgentSchema extends BaseAgentSchema {
     type: "image";
     instructions: Instructions;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
 }
 export interface MCPAgentSchema extends BaseAgentSchema {
     type: "mcp";

package/lib/cjs/loader/agent-yaml.js

@@ -124,7 +124,6 @@ async function parseAgentFile(path, data) {
                 type: zod_1.z.literal("image"),
                 instructions: instructionsSchema,
                 inputFileKey: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                modelOptions: (0, schema_js_1.optionalize)((0, schema_js_1.camelizeSchema)(zod_1.z.record(zod_1.z.any()))),
             })
                 .extend(baseAgentSchema.shape),
             zod_1.z

package/lib/dts/agents/chat-model.d.ts

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { type ZodType, z } from "zod";
 import { type PromiseOrValue } from "../utils/type-utils.js";
 import { type AgentInvokeOptions, type AgentOptions, type AgentProcessResult, type AgentResponse, type AgentResponseStream, type GetterSchema, type Message } from "./agent.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
@@ -40,7 +40,6 @@ export declare abstract class ChatModel extends Model<ChatModelInput, ChatModelO
         apiKey?: string;
         model?: string;
     }>;
-    getModelOptions(input: Message, options: AgentInvokeOptions): Promise<ChatModelInputOptions>;
     /**
      * Indicates whether the model supports parallel tool calls
      *
@@ -157,7 +156,7 @@ export interface ChatModelInput extends Message {
     /**
      * Model-specific configuration options
      */
-    modelOptions?: ChatModelInputOptionsWithGetter;
+    modelOptions?: ChatModelInputOptions;
 }
 /**
  * Message role types
@@ -241,8 +240,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     type: "text";
     text: string;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"local">;
     path: z.ZodString;
@@ -257,8 +256,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     filename?: string | undefined;
     mimeType?: string | undefined;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"url">;
     url: z.ZodString;
@@ -273,8 +272,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     filename?: string | undefined;
     mimeType?: string | undefined;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"file">;
     data: z.ZodString;
@@ -497,7 +496,7 @@ export interface ChatModelOutputUsage {
 export declare const chatModelOutputUsageSchema: z.ZodObject<{
     inputTokens: z.ZodNumber;
     outputTokens: z.ZodNumber;
-    aigneHubCredits: z.ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+    aigneHubCredits: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
 }, "strip", z.ZodTypeAny, {
     inputTokens: number;
     outputTokens: number;

package/lib/dts/agents/image-agent.d.ts

@@ -6,7 +6,6 @@ import { type FileType } from "./model.js";
 export interface ImageAgentOptions<I extends Message = any, O extends ImageModelOutput = any> extends Omit<AgentOptions<I, O>, "outputSchema"> {
     instructions: string | PromptBuilder;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
     outputFileType?: FileType;
 }
 export declare const imageAgentOptionsSchema: ZodObject<{
@@ -18,7 +17,6 @@ export declare class ImageAgent<I extends Message = any, O extends ImageModelOut
     constructor(options: ImageAgentOptions<I, O>);
     instructions: PromptBuilder;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
     outputFileType?: FileType;
     process(input: I, options: AgentInvokeOptions): Promise<O>;
 }

package/lib/dts/agents/image-model.d.ts

@@ -5,7 +5,7 @@ import { type ChatModelOutputUsage } from "./chat-model.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
 export interface ImageModelOptions<I extends ImageModelInput = ImageModelInput, O extends ImageModelOutput = ImageModelOutput> extends Omit<AgentOptions<I, O>, "model"> {
     model?: string;
-    modelOptions?: Omit<ImageModelInputOptions, "model">;
+    modelOptions?: ImageModelInputOptionsWithGetter;
 }
 export declare abstract class ImageModel<I extends ImageModelInput = ImageModelInput, O extends ImageModelOutput = ImageModelOutput> extends Model<I, O> {
     options?: ImageModelOptions<I, O> | undefined;

package/lib/dts/agents/model.d.ts

@@ -1,6 +1,22 @@
 import { z } from "zod";
-import { Agent, type AgentInvokeOptions, type Message } from "./agent.js";
+import { Agent, type AgentInvokeOptions, type AgentOptions, type Message } from "./agent.js";
 export declare abstract class Model<I extends Message = any, O extends Message = any> extends Agent<I, O> {
+    options?: (Omit<AgentOptions<I, O>, "model"> & {
+        modelOptions?: Record<string, unknown>;
+    }) | undefined;
+    constructor(options?: (Omit<AgentOptions<I, O>, "model"> & {
+        modelOptions?: Record<string, unknown>;
+    }) | undefined);
+    /**
+     * Resolves model options by merging instance-level and input-level options,
+     * and recursively resolving getter patterns
+     *
+     * @param input - The input message containing potential modelOptions
+     * @param options - The agent invocation options containing context
+     * @returns Resolved model options with all getters replaced by actual values
+     */
+    getModelOptions(input: Message, options: AgentInvokeOptions): Promise<Record<string, unknown>>;
+    protected preprocess(input: I, options: AgentInvokeOptions): Promise<void>;
     transformFileType(fileType: "file", data: FileUnionContent, options: AgentInvokeOptions): Promise<FileContent>;
     transformFileType(fileType: "local" | undefined, data: FileUnionContent, options: AgentInvokeOptions): Promise<LocalContent>;
     transformFileType(fileType: FileType | undefined, data: FileUnionContent, options: AgentInvokeOptions): Promise<FileUnionContent>;

package/lib/dts/agents/video-model.d.ts

@@ -5,7 +5,7 @@ import { type ChatModelOutputUsage } from "./chat-model.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
 export interface VideoModelOptions<I extends VideoModelInput = VideoModelInput, O extends VideoModelOutput = VideoModelOutput> extends Omit<AgentOptions<I, O>, "model"> {
     model?: string;
-    modelOptions?: Omit<VideoModelInputOptions, "model">;
+    modelOptions?: VideoModelInputOptionsWithGetter;
 }
 export declare abstract class VideoModel<I extends VideoModelInput = VideoModelInput, O extends VideoModelOutput = VideoModelOutput> extends Model<I, O> {
     options?: VideoModelOptions<I, O> | undefined;

package/lib/dts/loader/agent-yaml.d.ts

@@ -67,7 +67,6 @@ export interface ImageAgentSchema extends BaseAgentSchema {
     type: "image";
     instructions: Instructions;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
 }
 export interface MCPAgentSchema extends BaseAgentSchema {
     type: "mcp";

package/lib/esm/agents/chat-model.d.ts

@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { type ZodType, z } from "zod";
 import { type PromiseOrValue } from "../utils/type-utils.js";
 import { type AgentInvokeOptions, type AgentOptions, type AgentProcessResult, type AgentResponse, type AgentResponseStream, type GetterSchema, type Message } from "./agent.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
@@ -40,7 +40,6 @@ export declare abstract class ChatModel extends Model<ChatModelInput, ChatModelO
         apiKey?: string;
         model?: string;
     }>;
-    getModelOptions(input: Message, options: AgentInvokeOptions): Promise<ChatModelInputOptions>;
     /**
      * Indicates whether the model supports parallel tool calls
      *
@@ -157,7 +156,7 @@ export interface ChatModelInput extends Message {
     /**
      * Model-specific configuration options
      */
-    modelOptions?: ChatModelInputOptionsWithGetter;
+    modelOptions?: ChatModelInputOptions;
 }
 /**
  * Message role types
@@ -241,8 +240,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     type: "text";
     text: string;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"local">;
     path: z.ZodString;
@@ -257,8 +256,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     filename?: string | undefined;
     mimeType?: string | undefined;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"url">;
     url: z.ZodString;
@@ -273,8 +272,8 @@ export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodO
     filename?: string | undefined;
     mimeType?: string | undefined;
 }>, z.ZodObject<{
-    filename: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
-    mimeType: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+    mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
 } & {
     type: z.ZodLiteral<"file">;
     data: z.ZodString;
@@ -497,7 +496,7 @@ export interface ChatModelOutputUsage {
 export declare const chatModelOutputUsageSchema: z.ZodObject<{
     inputTokens: z.ZodNumber;
     outputTokens: z.ZodNumber;
-    aigneHubCredits: z.ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+    aigneHubCredits: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
 }, "strip", z.ZodTypeAny, {
     inputTokens: number;
     outputTokens: number;

package/lib/esm/agents/chat-model.js

@@ -5,7 +5,7 @@ import { optionalize } from "../loader/schema.js";
 import { wrapAutoParseJsonSchema } from "../utils/json-schema.js";
 import { logger } from "../utils/logger.js";
 import { checkArguments, isNil, omitByDeep } from "../utils/type-utils.js";
-import { agentOptionsSchema, DEFAULT_INPUT_ACTION_GET, getterSchema, } from "./agent.js";
+import { agentOptionsSchema, getterSchema, } from "./agent.js";
 import { fileContentSchema, fileUnionContentSchema, localContentSchema, Model, urlContentSchema, } from "./model.js";
 const CHAT_MODEL_DEFAULT_RETRY_OPTIONS = {
     retries: 3,
@@ -55,34 +55,12 @@ export class ChatModel extends Model {
             inputSchema: chatModelInputSchema,
             outputSchema: chatModelOutputSchema,
             retryOnError,
-            model: undefined,
         });
         this.options = options;
     }
     get credential() {
         return {};
     }
-    async getModelOptions(input, options) {
-        const result = {};
-        for (const [key, val] of Object.entries({
-            ...this.options?.modelOptions,
-            ...("modelOptions" in input ? input.modelOptions : {}),
-        })) {
-            if (val &&
-                typeof val === "object" &&
-                DEFAULT_INPUT_ACTION_GET in val &&
-                typeof val[DEFAULT_INPUT_ACTION_GET] === "string") {
-                const getterPath = val[DEFAULT_INPUT_ACTION_GET];
-                const value = input[getterPath] ?? options.context.userContext[getterPath];
-                if (!isNil(value))
-                    Object.assign(result, { [key]: value });
-            }
-            else {
-                Object.assign(result, { [key]: val });
-            }
-        }
-        return result;
-    }
     /**
      * Indicates whether the model supports parallel tool calls
      *
@@ -313,25 +291,33 @@ const chatModelInputToolChoiceSchema = z.union([
     z.literal("required"),
     chatModelInputToolSchema,
 ]);
-const modelOptionsSchema = z.object({
-    model: optionalize(getterSchema(z.string())),
-    temperature: optionalize(getterSchema(z.number())),
-    topP: optionalize(getterSchema(z.number())),
-    frequencyPenalty: optionalize(getterSchema(z.number())),
-    presencePenalty: optionalize(getterSchema(z.number())),
-    parallelToolCalls: optionalize(getterSchema(z.boolean())).default(true),
-    modalities: optionalize(getterSchema(z.array(z.enum(["text", "image", "audio"])))),
-    reasoningEffort: optionalize(getterSchema(z.union([
+const modelOptionsSchemaProperties = {
+    model: z.string(),
+    temperature: z.number(),
+    topP: z.number(),
+    frequencyPenalty: z.number(),
+    presencePenalty: z.number(),
+    parallelToolCalls: z.boolean().default(true),
+    modalities: z.array(z.enum(["text", "image", "audio"])),
+    reasoningEffort: z.union([
         z.number(),
         z.literal("minimal"),
         z.literal("low"),
         z.literal("medium"),
         z.literal("high"),
-    ]))),
-});
+    ]),
+};
+const modelOptionsSchema = z.object(Object.fromEntries(Object.entries(modelOptionsSchemaProperties).map(([key, schema]) => [
+    key,
+    optionalize(schema),
+])));
+const modelOptionsWithGetterSchema = z.object(Object.fromEntries(Object.entries(modelOptionsSchemaProperties).map(([key, schema]) => [
+    key,
+    optionalize(getterSchema(schema)),
+])));
 const chatModelOptionsSchema = agentOptionsSchema.extend({
     model: optionalize(z.string()),
-    modelOptions: optionalize(modelOptionsSchema),
+    modelOptions: optionalize(modelOptionsWithGetterSchema),
 });
 const chatModelInputSchema = z.object({
     messages: z.array(chatModelInputMessageSchema),

package/lib/esm/agents/image-agent.d.ts

@@ -6,7 +6,6 @@ import { type FileType } from "./model.js";
 export interface ImageAgentOptions<I extends Message = any, O extends ImageModelOutput = any> extends Omit<AgentOptions<I, O>, "outputSchema"> {
     instructions: string | PromptBuilder;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
     outputFileType?: FileType;
 }
 export declare const imageAgentOptionsSchema: ZodObject<{
@@ -18,7 +17,6 @@ export declare class ImageAgent<I extends Message = any, O extends ImageModelOut
     constructor(options: ImageAgentOptions<I, O>);
     instructions: PromptBuilder;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
     outputFileType?: FileType;
     process(input: I, options: AgentInvokeOptions): Promise<O>;
 }

package/lib/esm/agents/image-agent.js

@@ -6,7 +6,6 @@ import { imageModelOutputSchema } from "./image-model.js";
 import { fileTypeSchema } from "./model.js";
 export const imageAgentOptionsSchema = agentOptionsSchema.extend({
     instructions: z.union([z.string(), z.custom()]),
-    modelOptions: z.record(z.any()).optional(),
     outputFileType: fileTypeSchema.optional(),
 });
 export class ImageAgent extends Agent {
@@ -22,26 +21,25 @@ export class ImageAgent extends Agent {
                 ? PromptBuilder.from(options.instructions)
                 : options.instructions;
         this.inputFileKey = options.inputFileKey;
-        this.modelOptions = options.modelOptions;
         this.outputFileType = options.outputFileType;
     }
     instructions;
     inputFileKey;
-    modelOptions;
     outputFileType;
     async process(input, options) {
         const imageModel = this.imageModel || options.imageModel || options.context.imageModel;
         if (!imageModel)
             throw new Error("image model is required to run ImageAgent");
+        const modelOptions = await imageModel.getModelOptions(input, options);
         const { prompt, image } = await this.instructions.buildImagePrompt({
             ...options,
             input,
             agent: this,
         });
-        const n = input.n || this.modelOptions?.n;
+        const n = input.n || modelOptions?.n;
         return (await this.invokeChildAgent(imageModel, {
             n: n && typeof n === "number" ? n : undefined,
-            modelOptions: this.modelOptions,
+            modelOptions,
             prompt,
             image,
             outputFileType: this.outputFileType,

package/lib/esm/agents/image-model.d.ts

@@ -5,7 +5,7 @@ import { type ChatModelOutputUsage } from "./chat-model.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
 export interface ImageModelOptions<I extends ImageModelInput = ImageModelInput, O extends ImageModelOutput = ImageModelOutput> extends Omit<AgentOptions<I, O>, "model"> {
     model?: string;
-    modelOptions?: Omit<ImageModelInputOptions, "model">;
+    modelOptions?: ImageModelInputOptionsWithGetter;
 }
 export declare abstract class ImageModel<I extends ImageModelInput = ImageModelInput, O extends ImageModelOutput = ImageModelOutput> extends Model<I, O> {
     options?: ImageModelOptions<I, O> | undefined;

package/lib/esm/agents/image-model.js

@@ -10,7 +10,6 @@ export class ImageModel extends Model {
             inputSchema: imageModelInputSchema,
             outputSchema: imageModelOutputSchema,
             ...options,
-            model: undefined,
         });
         this.options = options;
     }

package/lib/esm/agents/model.d.ts

@@ -1,6 +1,22 @@
 import { z } from "zod";
-import { Agent, type AgentInvokeOptions, type Message } from "./agent.js";
+import { Agent, type AgentInvokeOptions, type AgentOptions, type Message } from "./agent.js";
 export declare abstract class Model<I extends Message = any, O extends Message = any> extends Agent<I, O> {
+    options?: (Omit<AgentOptions<I, O>, "model"> & {
+        modelOptions?: Record<string, unknown>;
+    }) | undefined;
+    constructor(options?: (Omit<AgentOptions<I, O>, "model"> & {
+        modelOptions?: Record<string, unknown>;
+    }) | undefined);
+    /**
+     * Resolves model options by merging instance-level and input-level options,
+     * and recursively resolving getter patterns
+     *
+     * @param input - The input message containing potential modelOptions
+     * @param options - The agent invocation options containing context
+     * @returns Resolved model options with all getters replaced by actual values
+     */
+    getModelOptions(input: Message, options: AgentInvokeOptions): Promise<Record<string, unknown>>;
+    protected preprocess(input: I, options: AgentInvokeOptions): Promise<void>;
     transformFileType(fileType: "file", data: FileUnionContent, options: AgentInvokeOptions): Promise<FileContent>;
     transformFileType(fileType: "local" | undefined, data: FileUnionContent, options: AgentInvokeOptions): Promise<LocalContent>;
     transformFileType(fileType: FileType | undefined, data: FileUnionContent, options: AgentInvokeOptions): Promise<FileUnionContent>;

package/lib/esm/agents/model.js

@@ -4,9 +4,55 @@ import { parseURL } from "ufo";
 import { z } from "zod";
 import { optionalize } from "../loader/schema.js";
 import { fetch } from "../utils/fetch.js";
-import { pick } from "../utils/type-utils.js";
-import { Agent } from "./agent.js";
+import { isNil, pick } from "../utils/type-utils.js";
+import { Agent, DEFAULT_INPUT_ACTION_GET, } from "./agent.js";
 export class Model extends Agent {
+    options;
+    constructor(options) {
+        super(options);
+        this.options = options;
+    }
+    /**
+     * Resolves model options by merging instance-level and input-level options,
+     * and recursively resolving getter patterns
+     *
+     * @param input - The input message containing potential modelOptions
+     * @param options - The agent invocation options containing context
+     * @returns Resolved model options with all getters replaced by actual values
+     */
+    async getModelOptions(input, options) {
+        const resolveGetters = (obj) => {
+            if (!obj || typeof obj !== "object")
+                return obj;
+            // Check if this object itself is a getter pattern
+            if (DEFAULT_INPUT_ACTION_GET in obj && typeof obj[DEFAULT_INPUT_ACTION_GET] === "string") {
+                const getterPath = obj[DEFAULT_INPUT_ACTION_GET];
+                const value = input[getterPath] ?? options.context.userContext[getterPath];
+                return isNil(value) ? undefined : value;
+            }
+            // If it's an array, recursively resolve each element
+            if (Array.isArray(obj)) {
+                return obj.map((item) => resolveGetters(item));
+            }
+            // If it's a plain object, recursively resolve each property
+            return Object.entries(obj).reduce((resolved, [key, val]) => {
+                const resolvedValue = resolveGetters(val);
+                if (!isNil(resolvedValue)) {
+                    resolved[key] = resolvedValue;
+                }
+                return resolved;
+            }, {});
+        };
+        const mergedOptions = {
+            ...this.options?.modelOptions,
+            ...("modelOptions" in input ? input.modelOptions : {}),
+        };
+        return resolveGetters(mergedOptions);
+    }
+    async preprocess(input, options) {
+        Object.assign(input, { modelOptions: await this.getModelOptions(input, options) });
+        return super.preprocess(input, options);
+    }
     async transformFileType(fileType = "local", data, options) {
         if (fileType === data.type)
             return data;

package/lib/esm/agents/video-model.d.ts

@@ -5,7 +5,7 @@ import { type ChatModelOutputUsage } from "./chat-model.js";
 import { type FileType, type FileUnionContent, Model } from "./model.js";
 export interface VideoModelOptions<I extends VideoModelInput = VideoModelInput, O extends VideoModelOutput = VideoModelOutput> extends Omit<AgentOptions<I, O>, "model"> {
     model?: string;
-    modelOptions?: Omit<VideoModelInputOptions, "model">;
+    modelOptions?: VideoModelInputOptionsWithGetter;
 }
 export declare abstract class VideoModel<I extends VideoModelInput = VideoModelInput, O extends VideoModelOutput = VideoModelOutput> extends Model<I, O> {
     options?: VideoModelOptions<I, O> | undefined;

package/lib/esm/agents/video-model.js

@@ -9,7 +9,6 @@ export class VideoModel extends Model {
             inputSchema: videoModelInputSchema,
             outputSchema: videoModelOutputSchema,
             ...options,
-            model: undefined,
         });
         this.options = options;
     }

package/lib/esm/loader/agent-yaml.d.ts

@@ -67,7 +67,6 @@ export interface ImageAgentSchema extends BaseAgentSchema {
     type: "image";
     instructions: Instructions;
     inputFileKey?: string;
-    modelOptions?: Record<string, any>;
 }
 export interface MCPAgentSchema extends BaseAgentSchema {
     type: "mcp";

package/lib/esm/loader/agent-yaml.js

@@ -120,7 +120,6 @@ export async function parseAgentFile(path, data) {
                 type: z.literal("image"),
                 instructions: instructionsSchema,
                 inputFileKey: optionalize(z.string()),
-                modelOptions: optionalize(camelizeSchema(z.record(z.any()))),
             })
                 .extend(baseAgentSchema.shape),
             z

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.69.2",
+  "version": "1.70.0-beta",
   "description": "The functional core of agentic AI",
   "publishConfig": {
     "access": "public"
@@ -92,8 +92,8 @@
     "zod": "^3.25.67",
     "zod-from-json-schema": "^0.0.5",
     "zod-to-json-schema": "^3.24.6",
-    "@aigne/afs": "^1.2.2",
-    "@aigne/afs-history": "^1.1.1",
+    "@aigne/afs": "^1.2.3-beta",
+    "@aigne/afs-history": "^1.1.2-beta",
     "@aigne/observability-api": "^0.11.11",
     "@aigne/platform-helpers": "^0.6.5"
   },