@aigne/core 1.7.0 → 1.8.0

package/CHANGELOG.md

@@ -22,6 +22,19 @@
 * rename @aigne/core-next to @aigne/core ([3a81009](https://github.com/AIGNE-io/aigne-framework/commit/3a8100962c81813217b687ae28e8de604419c622))
 * use text resource from MCP correctly ([8b9eba8](https://github.com/AIGNE-io/aigne-framework/commit/8b9eba83352ec096a2a5d4f410d4c4bde7420bce))
 
+## [1.8.0](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.7.0...core-v1.8.0) (2025-04-17)
+
+
+### Features
+
+* **ci:** support coverage examples with model matrix ([#59](https://github.com/AIGNE-io/aigne-framework/issues/59)) ([1edd704](https://github.com/AIGNE-io/aigne-framework/commit/1edd70426b80a69e3751b2d5fe818297711d0777))
+* **cli:** support model and download customization for aigne run ([#61](https://github.com/AIGNE-io/aigne-framework/issues/61)) ([51f6619](https://github.com/AIGNE-io/aigne-framework/commit/51f6619e6c591a84f1f2339b26ef66d89fa9486e))
+
+
+### Bug Fixes
+
+* **mcp:** set default timeout to 60s ([#67](https://github.com/AIGNE-io/aigne-framework/issues/67)) ([40dc029](https://github.com/AIGNE-io/aigne-framework/commit/40dc029b7795650283a505fd71b9566e5f0a4471))
+
 ## [1.7.0](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.6.0...core-v1.7.0) (2025-04-15)
 
 

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

@@ -22,7 +22,7 @@ export type SSEServerParameters = {
     opts?: SSEClientTransportOptions;
     /**
      * The timeout for requests to the server, in milliseconds.
-     * @default 10000
+     * @default 60000
      */
     timeout?: number;
     /**
@@ -41,7 +41,7 @@ export declare class MCPAgent extends Agent {
     static from(options: MCPAgentOptions): MCPAgent;
     private static fromTransport;
     constructor(options: MCPAgentOptions);
-    private client;
+    client: Client;
     readonly prompts: MCPPrompt[] & {
         [key: string]: MCPPrompt;
     };
@@ -71,7 +71,6 @@ export interface MCPBaseOptions<I extends Message = Message, O extends Message =
 export declare abstract class MCPBase<I extends Message, O extends Message> extends Agent<I, O> {
     constructor(options: MCPBaseOptions<I, O>);
     protected client: ClientWithReconnect;
-    protected get mcpServer(): string | undefined;
 }
 export declare class MCPTool extends MCPBase<Message, CallToolResult> {
     process(input: Message): Promise<CallToolResult>;

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

@@ -17,6 +17,11 @@ const agent_js_1 = require("./agent.js");
 const MCP_AGENT_CLIENT_NAME = "MCPAgent";
 const MCP_AGENT_CLIENT_VERSION = "0.0.1";
 const DEFAULT_MAX_RECONNECTS = 10;
+const DEFAULT_TIMEOUT = () => zod_1.z.coerce
+    .number()
+    .int()
+    .min(0)
+    .safeParse(process.env.MCP_TIMEOUT || process.env.TIMEOUT).data || 60e3;
 function isSSEServerParameters(options) {
     return "url" in options && typeof options.url === "string";
 }
@@ -140,7 +145,9 @@ class ClientWithReconnect extends index_js_1.Client {
             throw new Error("reconnect requires a transportCreator");
         await (0, p_retry_1.default)(async () => {
             await this.close();
-            await this.connect(await transportCreator());
+            await this.connect(await transportCreator(), {
+                timeout: this.reconnectOptions?.timeout ?? DEFAULT_TIMEOUT(),
+            });
         }, {
             retries: this.reconnectOptions?.maxReconnects ?? DEFAULT_MAX_RECONNECTS,
             shouldRetry: this.shouldReconnect,
@@ -149,8 +156,8 @@ class ClientWithReconnect extends index_js_1.Client {
     }
     async request(request, resultSchema, options) {
         const mergedOptions = {
-            ...(options ?? {}),
-            timeout: options?.timeout ?? this.reconnectOptions?.timeout ?? 10000,
+            ...options,
+            timeout: options?.timeout ?? DEFAULT_TIMEOUT(),
         };
         try {
             return await super.request(request, resultSchema, mergedOptions);
@@ -171,9 +178,6 @@ class MCPBase extends agent_js_1.Agent {
         this.client = options.client;
     }
     client;
-    get mcpServer() {
-        return getMCPServerName(this.client);
-    }
 }
 exports.MCPBase = MCPBase;
 class MCPTool extends MCPBase {

package/lib/cjs/execution-engine/execution-engine.js

@@ -12,8 +12,8 @@ class ExecutionEngine {
     static async load({ path, ...options }) {
         const { model, agents, tools, ...aigne } = await (0, index_js_1.load)({ path });
         return new ExecutionEngine({
-            model,
             ...options,
+            model: options.model || model,
             name: options.name || aigne.name || undefined,
             description: options.description || aigne.description || undefined,
             agents: agents.concat(options.agents ?? []),

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

@@ -58,7 +58,7 @@ async function loadAgentFromJsFile(path) {
         throw new Error(`Agent file ${path} must export a default function, but got ${typeof agent}`);
     }
     return (0, type_utils_js_1.tryOrThrow)(() => agentJsFileSchema.parse({
-        name: agent.name,
+        name: agent.agent_name || agent.name,
         description: agent.description,
         input_schema: agent.input_schema,
         output_schema: agent.output_schema,

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

@@ -10,6 +10,7 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
     }, {
         [x: string]: any;
     }> | undefined;
+    tool_choice?: "auto" | "none" | "required" | "router" | undefined;
     output_schema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {

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

@@ -33,6 +33,10 @@ const agentFileSchema = zod_1.z.discriminatedUnion("type", [
             .array(zod_1.z.string())
             .nullish()
             .transform((v) => v ?? undefined),
+        tool_choice: zod_1.z
+            .union([zod_1.z.literal("auto"), zod_1.z.literal("none"), zod_1.z.literal("required"), zod_1.z.literal("router")])
+            .nullish()
+            .transform((v) => v ?? undefined),
     }),
     zod_1.z.object({
         type: zod_1.z.literal("mcp"),

package/lib/cjs/loader/index.d.ts

@@ -1,5 +1,6 @@
+import { z } from "zod";
 import { type Agent } from "../agents/agent.js";
-import type { ChatModel } from "../models/chat-model.js";
+import type { ChatModel, ChatModelOptions } from "../models/chat-model.js";
 export interface LoadOptions {
     path: string;
 }
@@ -19,6 +20,75 @@ export declare function load(options: LoadOptions): Promise<{
     } | null | undefined;
 }>;
 export declare function loadAgent(path: string): Promise<Agent>;
+export declare function loadModel(model?: z.infer<typeof aigneFileSchema>["chat_model"], modelOptions?: ChatModelOptions): Promise<ChatModel | undefined>;
+declare const aigneFileSchema: z.ZodObject<{
+    name: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    chat_model: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodString, z.ZodObject<{
+        provider: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        name: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        temperature: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        top_p: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        frequent_penalty: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        presence_penalty: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    }, "strip", z.ZodTypeAny, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    }, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    }>]>>>, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined, string | {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined>;
+    agents: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
+    tools: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
+}, "strip", z.ZodTypeAny, {
+    description?: string | null | undefined;
+    tools?: string[] | null | undefined;
+    name?: string | null | undefined;
+    chat_model?: {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined;
+    agents?: string[] | null | undefined;
+}, {
+    description?: string | null | undefined;
+    tools?: string[] | null | undefined;
+    name?: string | null | undefined;
+    chat_model?: string | {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined;
+    agents?: string[] | null | undefined;
+}>;
 export declare function loadAIGNEFile(path: string): Promise<{
     description?: string | null | undefined;
     tools?: string[] | null | undefined;
@@ -33,3 +103,4 @@ export declare function loadAIGNEFile(path: string): Promise<{
     } | null | undefined;
     agents?: string[] | null | undefined;
 }>;
+export {};

package/lib/cjs/loader/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.load = load;
 exports.loadAgent = loadAgent;
+exports.loadModel = loadModel;
 exports.loadAIGNEFile = loadAIGNEFile;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
@@ -16,7 +17,6 @@ const xai_chat_model_js_1 = require("../models/xai-chat-model.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
 const agent_js_js_1 = require("./agent-js.js");
 const agent_yaml_js_1 = require("./agent-yaml.js");
-const DEFAULT_MODEL_PROVIDER = "openai";
 const AIGNE_FILE_NAME = ["aigne.yaml", "aigne.yml"];
 async function load(options) {
     const { path } = options;
@@ -54,6 +54,7 @@ async function loadAgent(path) {
                 outputSchema: agent.output_schema,
                 outputKey: agent.output_key,
                 tools: await Promise.all((agent.tools ?? []).map((filename) => loadAgent((0, node_path_1.join)((0, node_path_1.dirname)(path), filename)))),
+                toolChoice: agent.tool_choice,
             });
         }
         if (agent.type === "mcp") {
@@ -73,21 +74,20 @@ async function loadAgent(path) {
     }
     throw new Error(`Unsupported agent file type: ${path}`);
 }
-async function loadModel(model) {
-    if (!model?.name)
-        return undefined;
+const { MODEL_PROVIDER = "openai", MODEL_NAME = "gpt-4o-mini" } = process.env;
+async function loadModel(model, modelOptions) {
     const params = {
-        model: model.name,
-        temperature: model.temperature ?? undefined,
-        topP: model.top_p ?? undefined,
-        frequencyPenalty: model.frequent_penalty ?? undefined,
-        presencePenalty: model.presence_penalty ?? undefined,
+        model: model?.name ?? MODEL_NAME,
+        temperature: model?.temperature ?? undefined,
+        topP: model?.top_p ?? undefined,
+        frequencyPenalty: model?.frequent_penalty ?? undefined,
+        presencePenalty: model?.presence_penalty ?? undefined,
     };
     const availableModels = [openai_chat_model_js_1.OpenAIChatModel, claude_chat_model_js_1.ClaudeChatModel, xai_chat_model_js_1.XAIChatModel];
-    const M = availableModels.find((m) => m.name.toLowerCase().includes(model.provider || DEFAULT_MODEL_PROVIDER));
+    const M = availableModels.find((m) => m.name.toLowerCase().includes(model?.provider || MODEL_PROVIDER));
     if (!M)
-        throw new Error(`Unsupported model: ${model.provider} ${model.name}`);
-    return new M(params);
+        throw new Error(`Unsupported model: ${model?.provider} ${model?.name}`);
+    return new M({ model: params.model, modelOptions: { ...params, ...modelOptions } });
 }
 const aigneFileSchema = zod_1.z.object({
     name: zod_1.z.string().nullish(),

package/lib/cjs/models/claude-chat-model.js

@@ -36,7 +36,7 @@ class ClaudeChatModel extends chat_model_js_1.ChatModel {
     }
     _client;
     get client() {
-        const apiKey = this.options?.apiKey || process.env.CLAUDE_API_KEY;
+        const apiKey = this.options?.apiKey || process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY;
         if (!apiKey)
             throw new Error("Api Key is required for ClaudeChatModel");
         this._client ??= new sdk_1.default({ apiKey });

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

@@ -22,7 +22,7 @@ export type SSEServerParameters = {
     opts?: SSEClientTransportOptions;
     /**
      * The timeout for requests to the server, in milliseconds.
-     * @default 10000
+     * @default 60000
      */
     timeout?: number;
     /**
@@ -41,7 +41,7 @@ export declare class MCPAgent extends Agent {
     static from(options: MCPAgentOptions): MCPAgent;
     private static fromTransport;
     constructor(options: MCPAgentOptions);
-    private client;
+    client: Client;
     readonly prompts: MCPPrompt[] & {
         [key: string]: MCPPrompt;
     };
@@ -71,7 +71,6 @@ export interface MCPBaseOptions<I extends Message = Message, O extends Message =
 export declare abstract class MCPBase<I extends Message, O extends Message> extends Agent<I, O> {
     constructor(options: MCPBaseOptions<I, O>);
     protected client: ClientWithReconnect;
-    protected get mcpServer(): string | undefined;
 }
 export declare class MCPTool extends MCPBase<Message, CallToolResult> {
     process(input: Message): Promise<CallToolResult>;

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

@@ -10,6 +10,7 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
     }, {
         [x: string]: any;
     }> | undefined;
+    tool_choice?: "auto" | "none" | "required" | "router" | undefined;
     output_schema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {

package/lib/dts/loader/index.d.ts

@@ -1,5 +1,6 @@
+import { z } from "zod";
 import { type Agent } from "../agents/agent.js";
-import type { ChatModel } from "../models/chat-model.js";
+import type { ChatModel, ChatModelOptions } from "../models/chat-model.js";
 export interface LoadOptions {
     path: string;
 }
@@ -19,6 +20,75 @@ export declare function load(options: LoadOptions): Promise<{
     } | null | undefined;
 }>;
 export declare function loadAgent(path: string): Promise<Agent>;
+export declare function loadModel(model?: z.infer<typeof aigneFileSchema>["chat_model"], modelOptions?: ChatModelOptions): Promise<ChatModel | undefined>;
+declare const aigneFileSchema: z.ZodObject<{
+    name: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    chat_model: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodString, z.ZodObject<{
+        provider: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        name: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        temperature: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        top_p: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        frequent_penalty: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        presence_penalty: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    }, "strip", z.ZodTypeAny, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    }, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    }>]>>>, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined, string | {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined>;
+    agents: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
+    tools: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
+}, "strip", z.ZodTypeAny, {
+    description?: string | null | undefined;
+    tools?: string[] | null | undefined;
+    name?: string | null | undefined;
+    chat_model?: {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined;
+    agents?: string[] | null | undefined;
+}, {
+    description?: string | null | undefined;
+    tools?: string[] | null | undefined;
+    name?: string | null | undefined;
+    chat_model?: string | {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined;
+    agents?: string[] | null | undefined;
+}>;
 export declare function loadAIGNEFile(path: string): Promise<{
     description?: string | null | undefined;
     tools?: string[] | null | undefined;
@@ -33,3 +103,4 @@ export declare function loadAIGNEFile(path: string): Promise<{
     } | null | undefined;
     agents?: string[] | null | undefined;
 }>;
+export {};

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

@@ -22,7 +22,7 @@ export type SSEServerParameters = {
     opts?: SSEClientTransportOptions;
     /**
      * The timeout for requests to the server, in milliseconds.
-     * @default 10000
+     * @default 60000
      */
     timeout?: number;
     /**
@@ -41,7 +41,7 @@ export declare class MCPAgent extends Agent {
     static from(options: MCPAgentOptions): MCPAgent;
     private static fromTransport;
     constructor(options: MCPAgentOptions);
-    private client;
+    client: Client;
     readonly prompts: MCPPrompt[] & {
         [key: string]: MCPPrompt;
     };
@@ -71,7 +71,6 @@ export interface MCPBaseOptions<I extends Message = Message, O extends Message =
 export declare abstract class MCPBase<I extends Message, O extends Message> extends Agent<I, O> {
     constructor(options: MCPBaseOptions<I, O>);
     protected client: ClientWithReconnect;
-    protected get mcpServer(): string | undefined;
 }
 export declare class MCPTool extends MCPBase<Message, CallToolResult> {
     process(input: Message): Promise<CallToolResult>;

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

@@ -11,6 +11,11 @@ import { Agent } from "./agent.js";
 const MCP_AGENT_CLIENT_NAME = "MCPAgent";
 const MCP_AGENT_CLIENT_VERSION = "0.0.1";
 const DEFAULT_MAX_RECONNECTS = 10;
+const DEFAULT_TIMEOUT = () => z.coerce
+    .number()
+    .int()
+    .min(0)
+    .safeParse(process.env.MCP_TIMEOUT || process.env.TIMEOUT).data || 60e3;
 function isSSEServerParameters(options) {
     return "url" in options && typeof options.url === "string";
 }
@@ -133,7 +138,9 @@ class ClientWithReconnect extends Client {
             throw new Error("reconnect requires a transportCreator");
         await pRetry(async () => {
             await this.close();
-            await this.connect(await transportCreator());
+            await this.connect(await transportCreator(), {
+                timeout: this.reconnectOptions?.timeout ?? DEFAULT_TIMEOUT(),
+            });
         }, {
             retries: this.reconnectOptions?.maxReconnects ?? DEFAULT_MAX_RECONNECTS,
             shouldRetry: this.shouldReconnect,
@@ -142,8 +149,8 @@ class ClientWithReconnect extends Client {
     }
     async request(request, resultSchema, options) {
         const mergedOptions = {
-            ...(options ?? {}),
-            timeout: options?.timeout ?? this.reconnectOptions?.timeout ?? 10000,
+            ...options,
+            timeout: options?.timeout ?? DEFAULT_TIMEOUT(),
         };
         try {
             return await super.request(request, resultSchema, mergedOptions);
@@ -164,9 +171,6 @@ export class MCPBase extends Agent {
         this.client = options.client;
     }
     client;
-    get mcpServer() {
-        return getMCPServerName(this.client);
-    }
 }
 export class MCPTool extends MCPBase {
     async process(input) {

package/lib/esm/execution-engine/execution-engine.js

@@ -9,8 +9,8 @@ export class ExecutionEngine {
     static async load({ path, ...options }) {
         const { model, agents, tools, ...aigne } = await load({ path });
         return new ExecutionEngine({
-            model,
             ...options,
+            model: options.model || model,
             name: options.name || aigne.name || undefined,
             description: options.description || aigne.description || undefined,
             agents: agents.concat(options.agents ?? []),

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

@@ -22,7 +22,7 @@ export async function loadAgentFromJsFile(path) {
         throw new Error(`Agent file ${path} must export a default function, but got ${typeof agent}`);
     }
     return tryOrThrow(() => agentJsFileSchema.parse({
-        name: agent.name,
+        name: agent.agent_name || agent.name,
         description: agent.description,
         input_schema: agent.input_schema,
         output_schema: agent.output_schema,

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

@@ -10,6 +10,7 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
     }, {
         [x: string]: any;
     }> | undefined;
+    tool_choice?: "auto" | "none" | "required" | "router" | undefined;
     output_schema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {

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

@@ -30,6 +30,10 @@ const agentFileSchema = z.discriminatedUnion("type", [
             .array(z.string())
             .nullish()
             .transform((v) => v ?? undefined),
+        tool_choice: z
+            .union([z.literal("auto"), z.literal("none"), z.literal("required"), z.literal("router")])
+            .nullish()
+            .transform((v) => v ?? undefined),
     }),
     z.object({
         type: z.literal("mcp"),

package/lib/esm/loader/index.d.ts

@@ -1,5 +1,6 @@
+import { z } from "zod";
 import { type Agent } from "../agents/agent.js";
-import type { ChatModel } from "../models/chat-model.js";
+import type { ChatModel, ChatModelOptions } from "../models/chat-model.js";
 export interface LoadOptions {
     path: string;
 }
@@ -19,6 +20,75 @@ export declare function load(options: LoadOptions): Promise<{
     } | null | undefined;
 }>;
 export declare function loadAgent(path: string): Promise<Agent>;
+export declare function loadModel(model?: z.infer<typeof aigneFileSchema>["chat_model"], modelOptions?: ChatModelOptions): Promise<ChatModel | undefined>;
+declare const aigneFileSchema: z.ZodObject<{
+    name: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    chat_model: z.ZodEffects<z.ZodOptional<z.ZodNullable<z.ZodUnion<[z.ZodString, z.ZodObject<{
+        provider: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        name: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+        temperature: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        top_p: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        frequent_penalty: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        presence_penalty: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    }, "strip", z.ZodTypeAny, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    }, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    }>]>>>, {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined, string | {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined>;
+    agents: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
+    tools: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
+}, "strip", z.ZodTypeAny, {
+    description?: string | null | undefined;
+    tools?: string[] | null | undefined;
+    name?: string | null | undefined;
+    chat_model?: {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined;
+    agents?: string[] | null | undefined;
+}, {
+    description?: string | null | undefined;
+    tools?: string[] | null | undefined;
+    name?: string | null | undefined;
+    chat_model?: string | {
+        name?: string | null | undefined;
+        temperature?: number | null | undefined;
+        provider?: string | null | undefined;
+        top_p?: number | null | undefined;
+        frequent_penalty?: number | null | undefined;
+        presence_penalty?: number | null | undefined;
+    } | null | undefined;
+    agents?: string[] | null | undefined;
+}>;
 export declare function loadAIGNEFile(path: string): Promise<{
     description?: string | null | undefined;
     tools?: string[] | null | undefined;
@@ -33,3 +103,4 @@ export declare function loadAIGNEFile(path: string): Promise<{
     } | null | undefined;
     agents?: string[] | null | undefined;
 }>;
+export {};

package/lib/esm/loader/index.js

@@ -11,7 +11,6 @@ import { XAIChatModel } from "../models/xai-chat-model.js";
 import { tryOrThrow } from "../utils/type-utils.js";
 import { loadAgentFromJsFile } from "./agent-js.js";
 import { loadAgentFromYamlFile } from "./agent-yaml.js";
-const DEFAULT_MODEL_PROVIDER = "openai";
 const AIGNE_FILE_NAME = ["aigne.yaml", "aigne.yml"];
 export async function load(options) {
     const { path } = options;
@@ -49,6 +48,7 @@ export async function loadAgent(path) {
                 outputSchema: agent.output_schema,
                 outputKey: agent.output_key,
                 tools: await Promise.all((agent.tools ?? []).map((filename) => loadAgent(join(dirname(path), filename)))),
+                toolChoice: agent.tool_choice,
             });
         }
         if (agent.type === "mcp") {
@@ -68,21 +68,20 @@ export async function loadAgent(path) {
     }
     throw new Error(`Unsupported agent file type: ${path}`);
 }
-async function loadModel(model) {
-    if (!model?.name)
-        return undefined;
+const { MODEL_PROVIDER = "openai", MODEL_NAME = "gpt-4o-mini" } = process.env;
+export async function loadModel(model, modelOptions) {
     const params = {
-        model: model.name,
-        temperature: model.temperature ?? undefined,
-        topP: model.top_p ?? undefined,
-        frequencyPenalty: model.frequent_penalty ?? undefined,
-        presencePenalty: model.presence_penalty ?? undefined,
+        model: model?.name ?? MODEL_NAME,
+        temperature: model?.temperature ?? undefined,
+        topP: model?.top_p ?? undefined,
+        frequencyPenalty: model?.frequent_penalty ?? undefined,
+        presencePenalty: model?.presence_penalty ?? undefined,
     };
     const availableModels = [OpenAIChatModel, ClaudeChatModel, XAIChatModel];
-    const M = availableModels.find((m) => m.name.toLowerCase().includes(model.provider || DEFAULT_MODEL_PROVIDER));
+    const M = availableModels.find((m) => m.name.toLowerCase().includes(model?.provider || MODEL_PROVIDER));
     if (!M)
-        throw new Error(`Unsupported model: ${model.provider} ${model.name}`);
-    return new M(params);
+        throw new Error(`Unsupported model: ${model?.provider} ${model?.name}`);
+    return new M({ model: params.model, modelOptions: { ...params, ...modelOptions } });
 }
 const aigneFileSchema = z.object({
     name: z.string().nullish(),

package/lib/esm/models/claude-chat-model.js

@@ -30,7 +30,7 @@ export class ClaudeChatModel extends ChatModel {
     }
     _client;
     get client() {
-        const apiKey = this.options?.apiKey || process.env.CLAUDE_API_KEY;
+        const apiKey = this.options?.apiKey || process.env.ANTHROPIC_API_KEY || process.env.CLAUDE_API_KEY;
         if (!apiKey)
             throw new Error("Api Key is required for ClaudeChatModel");
         this._client ??= new Anthropic({ apiKey });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "AIGNE core library for building AI-powered applications",
   "publishConfig": {
     "access": "public"
@@ -47,6 +47,9 @@
       "execution-engine/*": [
         "./lib/dts/execution-engine/*"
       ],
+      "loader/*": [
+        "./lib/dts/loader/*"
+      ],
       "models/*": [
         "./lib/dts/models/*"
       ],
@@ -83,11 +86,11 @@
     "@types/bun": "^1.2.9",
     "@types/express": "^5.0.1",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.14.1",
     "detect-port": "^2.1.0",
     "express": "^5.1.0",
     "npm-run-all": "^4.1.5",
-    "openai": "^4.93.0",
+    "openai": "^4.94.0",
     "rimraf": "^6.0.1",
     "typescript": "^5.8.3"
   },