@aigne/core 1.5.1-2 → 1.6.0

package/CHANGELOG.md

@@ -22,6 +22,20 @@
 * 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.6.0](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.5.0...core-v1.6.0) (2025-04-08)
+
+
+### Features
+
+* add `serve` command for @aigne/cli ([#54](https://github.com/AIGNE-io/aigne-framework/issues/54)) ([1cca843](https://github.com/AIGNE-io/aigne-framework/commit/1cca843f1760abe832b6651108fa858130f47355))
+* add agent library support ([#51](https://github.com/AIGNE-io/aigne-framework/issues/51)) ([1f0d34d](https://github.com/AIGNE-io/aigne-framework/commit/1f0d34ddda3154283a4bc958ddb9b68b4ac106b0))
+* support token/call/time limits for ExecutionEngine ([#44](https://github.com/AIGNE-io/aigne-framework/issues/44)) ([5a2ca0a](https://github.com/AIGNE-io/aigne-framework/commit/5a2ca0a033267dd4765f574b53dca71e932e53d4))
+
+
+### Bug Fixes
+
+* support reconnect to the MCP server automatically ([#50](https://github.com/AIGNE-io/aigne-framework/issues/50)) ([898d83f](https://github.com/AIGNE-io/aigne-framework/commit/898d83f75fc655142b93c70a1afeda376a2e92b4))
+
 ## [1.5.0](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.4.0...core-v1.5.0) (2025-03-27)
 
 

package/lib/cjs/execution-engine/execution-engine.d.ts

@@ -5,6 +5,8 @@ import { ChatModel } from "../models/chat-model.js";
 import { type ContextLimits, ExecutionContext, type Runnable } from "./context.js";
 import { type MessagePayload, MessageQueue, type MessageQueueListener, type Unsubscribe } from "./message-queue.js";
 export interface ExecutionEngineOptions {
+    name?: string;
+    description?: string;
     model?: ChatModel;
     tools?: Agent[];
     agents?: Agent[];
@@ -15,6 +17,8 @@ export declare class ExecutionEngine extends EventEmitter {
         path: string;
     } & ExecutionEngineOptions): Promise<ExecutionEngine>;
     constructor(options?: ExecutionEngineOptions);
+    name?: string;
+    description?: string;
     readonly messageQueue: MessageQueue;
     model?: ChatModel;
     readonly tools: Agent<Message, Message>[] & {

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

@@ -14,10 +14,12 @@ const context_js_1 = require("./context.js");
 const message_queue_js_1 = require("./message-queue.js");
 class ExecutionEngine extends node_events_1.default {
     static async load({ path, ...options }) {
-        const { model, agents, tools } = await (0, index_js_1.load)({ path });
+        const { model, agents, tools, ...aigne } = await (0, index_js_1.load)({ path });
         return new ExecutionEngine({
             model,
             ...options,
+            name: options.name || aigne.name || undefined,
+            description: options.description || aigne.description || undefined,
             agents: agents.concat(options.agents ?? []),
             tools: tools.concat(options.tools ?? []),
         });
@@ -26,6 +28,8 @@ class ExecutionEngine extends node_events_1.default {
         if (options)
             (0, type_utils_js_1.checkArguments)("ExecutionEngine", executionEngineOptionsSchema, options);
         super();
+        this.name = options?.name;
+        this.description = options?.description;
         this.model = options?.model;
         this.limits = options?.limits;
         if (options?.tools?.length)
@@ -34,6 +38,8 @@ class ExecutionEngine extends node_events_1.default {
             this.addAgent(...options.agents);
         this.initProcessExitHandler();
     }
+    name;
+    description;
     messageQueue = new message_queue_js_1.MessageQueue();
     model;
     tools = (0, type_utils_js_1.createAccessorArray)([], (arr, name) => arr.find((i) => i.name === name));

package/lib/{esm/loader/function-agent.d.ts → cjs/loader/agent-js.d.ts}

@@ -1,10 +1,6 @@
 import { type ZodObject, type ZodType, z } from "zod";
 import type { Message } from "../agents/agent.js";
-export declare function loadAgentFromJsFile(path: string, { import: _import }?: {
-    import?: (path: string) => Promise<{
-        default: unknown;
-    }>;
-}): Promise<{
+export declare function loadAgentFromJsFile(path: string): Promise<{
     name: string;
     fn: (args_0: Message) => Message;
     description?: string | undefined;

package/lib/cjs/loader/{function-agent.js → agent-js.js}

@@ -52,8 +52,8 @@ const agentJsFileSchema = zod_1.z.object({
         .transform((v) => (v ? (0, json_schema_to_zod_1.jsonSchemaToZod)(v) : undefined)),
     fn: zod_1.z.function(),
 });
-async function loadAgentFromJsFile(path, { import: _import } = {}) {
-    const { default: agent } = await (0, type_utils_js_1.tryOrThrow)(() => (_import ? _import(path) : Promise.resolve(`${path}`).then(s => __importStar(require(s)))), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
+async function loadAgentFromJsFile(path) {
+    const { default: agent } = await (0, type_utils_js_1.tryOrThrow)(() => Promise.resolve(`${path}`).then(s => __importStar(require(s))), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
     if (typeof agent !== "function") {
         throw new Error(`Agent file ${path} must export a default function, but got ${typeof agent}`);
     }

package/lib/cjs/loader/{ai-agent.d.ts → agent-yaml.d.ts}

@@ -1,8 +1,6 @@
-import { readFile } from "node:fs/promises";
 import { type ZodObject, type ZodType, z } from "zod";
-export declare function loadAgentFromYamlFile(path: string, { readFile: _readFile }?: {
-    readFile?: typeof readFile;
-}): Promise<{
+export declare function loadAgentFromYamlFile(path: string): Promise<{
+    type: "ai";
     name: string;
     description?: string | undefined;
     tools?: string[] | undefined;
@@ -18,4 +16,9 @@ export declare function loadAgentFromYamlFile(path: string, { readFile: _readFil
         [x: string]: any;
     }> | undefined;
     output_key?: string | undefined;
+} | {
+    type: "mcp";
+    url?: string | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
 }>;

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

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadAgentFromYamlFile = loadAgentFromYamlFile;
+const promises_1 = require("node:fs/promises");
+const json_schema_to_zod_1 = require("@aigne/json-schema-to-zod");
+const yaml_1 = require("yaml");
+const zod_1 = require("zod");
+const type_utils_js_1 = require("../utils/type-utils.js");
+const schema_js_1 = require("./schema.js");
+const agentFileSchema = zod_1.z.discriminatedUnion("type", [
+    zod_1.z.object({
+        type: zod_1.z.literal("ai"),
+        name: zod_1.z.string(),
+        description: zod_1.z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        instructions: zod_1.z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        input_schema: schema_js_1.inputOutputSchema
+            .nullish()
+            .transform((v) => (v ? (0, json_schema_to_zod_1.jsonSchemaToZod)(v) : undefined)),
+        output_schema: schema_js_1.inputOutputSchema
+            .nullish()
+            .transform((v) => (v ? (0, json_schema_to_zod_1.jsonSchemaToZod)(v) : undefined)),
+        output_key: zod_1.z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        tools: zod_1.z
+            .array(zod_1.z.string())
+            .nullish()
+            .transform((v) => v ?? undefined),
+    }),
+    zod_1.z.object({
+        type: zod_1.z.literal("mcp"),
+        url: zod_1.z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        command: zod_1.z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        args: zod_1.z
+            .array(zod_1.z.string())
+            .nullish()
+            .transform((v) => v ?? undefined),
+    }),
+]);
+async function loadAgentFromYamlFile(path) {
+    const raw = await (0, type_utils_js_1.tryOrThrow)(() => (0, promises_1.readFile)(path, "utf8"), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
+    const json = await (0, type_utils_js_1.tryOrThrow)(() => (0, yaml_1.parse)(raw), (error) => new Error(`Failed to parse agent definition from ${path}: ${error.message}`));
+    const agent = (0, type_utils_js_1.tryOrThrow)(() => agentFileSchema.parse({ ...json, type: json.type ?? "ai" }), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
+    return agent;
+}

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

@@ -1,4 +1,3 @@
-import { readFile } from "node:fs/promises";
 import { type Agent } from "../agents/agent.js";
 import type { ChatModel } from "../models/chat-model.js";
 export interface LoadOptions {
@@ -8,15 +7,26 @@ export declare function load(options: LoadOptions): Promise<{
     model: ChatModel | undefined;
     agents: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
     tools: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
+    description?: 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;
 }>;
 export declare function loadAgent(path: string): Promise<Agent>;
-export declare function loadAIGNEFile(path: string, { readFile: _readFile }?: {
-    readFile?: typeof readFile;
-}): Promise<{
+export declare function loadAIGNEFile(path: string): Promise<{
+    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;

package/lib/cjs/loader/index.js

@@ -9,19 +9,24 @@ const yaml_1 = require("yaml");
 const zod_1 = require("zod");
 const agent_js_1 = require("../agents/agent.js");
 const ai_agent_js_1 = require("../agents/ai-agent.js");
+const mcp_agent_js_1 = require("../agents/mcp-agent.js");
+const claude_chat_model_js_1 = require("../models/claude-chat-model.js");
 const openai_chat_model_js_1 = require("../models/openai-chat-model.js");
+const xai_chat_model_js_1 = require("../models/xai-chat-model.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
-const ai_agent_js_2 = require("./ai-agent.js");
-const function_agent_js_1 = require("./function-agent.js");
-const AIGNE_FILE_NAME = "aigne.yaml";
+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;
-    const aigneFilePath = path.endsWith(AIGNE_FILE_NAME) ? path : (0, node_path_1.join)(path, AIGNE_FILE_NAME);
+    const aigneFilePath = await getAIGNEFilePath(path);
     const rootDir = (0, node_path_1.dirname)(aigneFilePath);
     const aigne = await loadAIGNEFile(aigneFilePath);
     const agents = await Promise.all((aigne.agents ?? []).map((filename) => loadAgent((0, node_path_1.join)(rootDir, filename))));
     const tools = await Promise.all((aigne.tools ?? []).map((filename) => loadAgent((0, node_path_1.join)(rootDir, filename))));
     return {
+        ...aigne,
         model: await loadModel(aigne.chat_model),
         agents,
         tools,
@@ -29,7 +34,7 @@ async function load(options) {
 }
 async function loadAgent(path) {
     if ((0, node_path_1.extname)(path) === ".js") {
-        const agent = await (0, function_agent_js_1.loadAgentFromJsFile)(path);
+        const agent = await (0, agent_js_js_1.loadAgentFromJsFile)(path);
         return agent_js_1.FunctionAgent.from({
             name: agent.name,
             description: agent.description,
@@ -39,16 +44,32 @@ async function loadAgent(path) {
         });
     }
     if ((0, node_path_1.extname)(path) === ".yaml" || (0, node_path_1.extname)(path) === ".yml") {
-        const agent = await (0, ai_agent_js_2.loadAgentFromYamlFile)(path);
-        return ai_agent_js_1.AIAgent.from({
-            name: agent.name,
-            description: agent.description,
-            instructions: agent.instructions,
-            inputSchema: agent.input_schema,
-            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)))),
-        });
+        const agent = await (0, agent_yaml_js_1.loadAgentFromYamlFile)(path);
+        if (agent.type === "ai") {
+            return ai_agent_js_1.AIAgent.from({
+                name: agent.name,
+                description: agent.description,
+                instructions: agent.instructions,
+                inputSchema: agent.input_schema,
+                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)))),
+            });
+        }
+        if (agent.type === "mcp") {
+            if (agent.url) {
+                return mcp_agent_js_1.MCPAgent.from({
+                    url: agent.url,
+                });
+            }
+            if (agent.command) {
+                return mcp_agent_js_1.MCPAgent.from({
+                    command: agent.command,
+                    args: agent.args,
+                });
+            }
+            throw new Error(`Missing url or command in mcp agent: ${path}`);
+        }
     }
     throw new Error(`Unsupported agent file type: ${path}`);
 }
@@ -62,17 +83,20 @@ async function loadModel(model) {
         frequencyPenalty: model.frequent_penalty ?? undefined,
         presencePenalty: model.presence_penalty ?? undefined,
     };
-    // TODO: add support for other models such as AutoChatModel, ClaudeChatModel, etc.
-    if (/^o1|gpt-/.test(model.name)) {
-        return new openai_chat_model_js_1.OpenAIChatModel(params);
-    }
-    throw new Error(`Unsupported model: ${model.name}`);
+    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));
+    if (!M)
+        throw new Error(`Unsupported model: ${model.provider} ${model.name}`);
+    return new M(params);
 }
 const aigneFileSchema = zod_1.z.object({
+    name: zod_1.z.string().nullish(),
+    description: zod_1.z.string().nullish(),
     chat_model: zod_1.z
         .union([
         zod_1.z.string(),
         zod_1.z.object({
+            provider: zod_1.z.string().nullish(),
             name: zod_1.z.string().nullish(),
             temperature: zod_1.z.number().min(0).max(2).nullish(),
             top_p: zod_1.z.number().min(0).nullish(),
@@ -85,9 +109,20 @@ const aigneFileSchema = zod_1.z.object({
     agents: zod_1.z.array(zod_1.z.string()).nullish(),
     tools: zod_1.z.array(zod_1.z.string()).nullish(),
 });
-async function loadAIGNEFile(path, { readFile: _readFile = promises_1.readFile } = {}) {
-    const raw = await (0, type_utils_js_1.tryOrThrow)(() => _readFile(path, "utf8"), (error) => new Error(`Failed to load aigne.yaml from ${path}: ${error.message}`));
+async function loadAIGNEFile(path) {
+    const raw = await (0, type_utils_js_1.tryOrThrow)(() => (0, promises_1.readFile)(path, "utf8"), (error) => new Error(`Failed to load aigne.yaml from ${path}: ${error.message}`));
     const json = await (0, type_utils_js_1.tryOrThrow)(() => (0, yaml_1.parse)(raw), (error) => new Error(`Failed to parse aigne.yaml from ${path}: ${error.message}`));
     const agent = (0, type_utils_js_1.tryOrThrow)(() => aigneFileSchema.parse(json), (error) => new Error(`Failed to validate aigne.yaml from ${path}: ${error.message}`));
     return agent;
 }
+async function getAIGNEFilePath(path) {
+    const s = await (0, promises_1.stat)(path);
+    if (s.isDirectory()) {
+        for (const file of AIGNE_FILE_NAME) {
+            const filePath = (0, node_path_1.join)(path, file);
+            if (await (0, promises_1.exists)(filePath))
+                return filePath;
+        }
+    }
+    return path;
+}

package/lib/dts/execution-engine/execution-engine.d.ts

@@ -5,6 +5,8 @@ import { ChatModel } from "../models/chat-model.js";
 import { type ContextLimits, ExecutionContext, type Runnable } from "./context.js";
 import { type MessagePayload, MessageQueue, type MessageQueueListener, type Unsubscribe } from "./message-queue.js";
 export interface ExecutionEngineOptions {
+    name?: string;
+    description?: string;
     model?: ChatModel;
     tools?: Agent[];
     agents?: Agent[];
@@ -15,6 +17,8 @@ export declare class ExecutionEngine extends EventEmitter {
         path: string;
     } & ExecutionEngineOptions): Promise<ExecutionEngine>;
     constructor(options?: ExecutionEngineOptions);
+    name?: string;
+    description?: string;
     readonly messageQueue: MessageQueue;
     model?: ChatModel;
     readonly tools: Agent<Message, Message>[] & {

package/lib/{cjs/loader/function-agent.d.ts → dts/loader/agent-js.d.ts}

@@ -1,10 +1,6 @@
 import { type ZodObject, type ZodType, z } from "zod";
 import type { Message } from "../agents/agent.js";
-export declare function loadAgentFromJsFile(path: string, { import: _import }?: {
-    import?: (path: string) => Promise<{
-        default: unknown;
-    }>;
-}): Promise<{
+export declare function loadAgentFromJsFile(path: string): Promise<{
     name: string;
     fn: (args_0: Message) => Message;
     description?: string | undefined;

package/lib/dts/loader/{ai-agent.d.ts → agent-yaml.d.ts}

@@ -1,8 +1,6 @@
-import { readFile } from "node:fs/promises";
 import { type ZodObject, type ZodType, z } from "zod";
-export declare function loadAgentFromYamlFile(path: string, { readFile: _readFile }?: {
-    readFile?: typeof readFile;
-}): Promise<{
+export declare function loadAgentFromYamlFile(path: string): Promise<{
+    type: "ai";
     name: string;
     description?: string | undefined;
     tools?: string[] | undefined;
@@ -18,4 +16,9 @@ export declare function loadAgentFromYamlFile(path: string, { readFile: _readFil
         [x: string]: any;
     }> | undefined;
     output_key?: string | undefined;
+} | {
+    type: "mcp";
+    url?: string | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
 }>;

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

@@ -1,4 +1,3 @@
-import { readFile } from "node:fs/promises";
 import { type Agent } from "../agents/agent.js";
 import type { ChatModel } from "../models/chat-model.js";
 export interface LoadOptions {
@@ -8,15 +7,26 @@ export declare function load(options: LoadOptions): Promise<{
     model: ChatModel | undefined;
     agents: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
     tools: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
+    description?: 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;
 }>;
 export declare function loadAgent(path: string): Promise<Agent>;
-export declare function loadAIGNEFile(path: string, { readFile: _readFile }?: {
-    readFile?: typeof readFile;
-}): Promise<{
+export declare function loadAIGNEFile(path: string): Promise<{
+    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;

package/lib/esm/execution-engine/execution-engine.d.ts

@@ -5,6 +5,8 @@ import { ChatModel } from "../models/chat-model.js";
 import { type ContextLimits, ExecutionContext, type Runnable } from "./context.js";
 import { type MessagePayload, MessageQueue, type MessageQueueListener, type Unsubscribe } from "./message-queue.js";
 export interface ExecutionEngineOptions {
+    name?: string;
+    description?: string;
     model?: ChatModel;
     tools?: Agent[];
     agents?: Agent[];
@@ -15,6 +17,8 @@ export declare class ExecutionEngine extends EventEmitter {
         path: string;
     } & ExecutionEngineOptions): Promise<ExecutionEngine>;
     constructor(options?: ExecutionEngineOptions);
+    name?: string;
+    description?: string;
     readonly messageQueue: MessageQueue;
     model?: ChatModel;
     readonly tools: Agent<Message, Message>[] & {

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

@@ -8,10 +8,12 @@ import { ExecutionContext } from "./context.js";
 import { MessageQueue, } from "./message-queue.js";
 export class ExecutionEngine extends EventEmitter {
     static async load({ path, ...options }) {
-        const { model, agents, tools } = await load({ path });
+        const { model, agents, tools, ...aigne } = await load({ path });
         return new ExecutionEngine({
             model,
             ...options,
+            name: options.name || aigne.name || undefined,
+            description: options.description || aigne.description || undefined,
             agents: agents.concat(options.agents ?? []),
             tools: tools.concat(options.tools ?? []),
         });
@@ -20,6 +22,8 @@ export class ExecutionEngine extends EventEmitter {
         if (options)
             checkArguments("ExecutionEngine", executionEngineOptionsSchema, options);
         super();
+        this.name = options?.name;
+        this.description = options?.description;
         this.model = options?.model;
         this.limits = options?.limits;
         if (options?.tools?.length)
@@ -28,6 +32,8 @@ export class ExecutionEngine extends EventEmitter {
             this.addAgent(...options.agents);
         this.initProcessExitHandler();
     }
+    name;
+    description;
     messageQueue = new MessageQueue();
     model;
     tools = createAccessorArray([], (arr, name) => arr.find((i) => i.name === name));

package/lib/{dts/loader/function-agent.d.ts → esm/loader/agent-js.d.ts}

@@ -1,10 +1,6 @@
 import { type ZodObject, type ZodType, z } from "zod";
 import type { Message } from "../agents/agent.js";
-export declare function loadAgentFromJsFile(path: string, { import: _import }?: {
-    import?: (path: string) => Promise<{
-        default: unknown;
-    }>;
-}): Promise<{
+export declare function loadAgentFromJsFile(path: string): Promise<{
     name: string;
     fn: (args_0: Message) => Message;
     description?: string | undefined;

package/lib/esm/loader/{function-agent.js → agent-js.js}

@@ -16,8 +16,8 @@ const agentJsFileSchema = z.object({
         .transform((v) => (v ? jsonSchemaToZod(v) : undefined)),
     fn: z.function(),
 });
-export async function loadAgentFromJsFile(path, { import: _import } = {}) {
-    const { default: agent } = await tryOrThrow(() => (_import ? _import(path) : import(path)), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
+export async function loadAgentFromJsFile(path) {
+    const { default: agent } = await tryOrThrow(() => import(path), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
     if (typeof agent !== "function") {
         throw new Error(`Agent file ${path} must export a default function, but got ${typeof agent}`);
     }

package/lib/esm/loader/{ai-agent.d.ts → agent-yaml.d.ts}

@@ -1,8 +1,6 @@
-import { readFile } from "node:fs/promises";
 import { type ZodObject, type ZodType, z } from "zod";
-export declare function loadAgentFromYamlFile(path: string, { readFile: _readFile }?: {
-    readFile?: typeof readFile;
-}): Promise<{
+export declare function loadAgentFromYamlFile(path: string): Promise<{
+    type: "ai";
     name: string;
     description?: string | undefined;
     tools?: string[] | undefined;
@@ -18,4 +16,9 @@ export declare function loadAgentFromYamlFile(path: string, { readFile: _readFil
         [x: string]: any;
     }> | undefined;
     output_key?: string | undefined;
+} | {
+    type: "mcp";
+    url?: string | undefined;
+    command?: string | undefined;
+    args?: string[] | undefined;
 }>;

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

@@ -0,0 +1,55 @@
+import { readFile } from "node:fs/promises";
+import { jsonSchemaToZod } from "@aigne/json-schema-to-zod";
+import { parse } from "yaml";
+import { z } from "zod";
+import { tryOrThrow } from "../utils/type-utils.js";
+import { inputOutputSchema } from "./schema.js";
+const agentFileSchema = z.discriminatedUnion("type", [
+    z.object({
+        type: z.literal("ai"),
+        name: z.string(),
+        description: z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        instructions: z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        input_schema: inputOutputSchema
+            .nullish()
+            .transform((v) => (v ? jsonSchemaToZod(v) : undefined)),
+        output_schema: inputOutputSchema
+            .nullish()
+            .transform((v) => (v ? jsonSchemaToZod(v) : undefined)),
+        output_key: z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        tools: z
+            .array(z.string())
+            .nullish()
+            .transform((v) => v ?? undefined),
+    }),
+    z.object({
+        type: z.literal("mcp"),
+        url: z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        command: z
+            .string()
+            .nullish()
+            .transform((v) => v ?? undefined),
+        args: z
+            .array(z.string())
+            .nullish()
+            .transform((v) => v ?? undefined),
+    }),
+]);
+export async function loadAgentFromYamlFile(path) {
+    const raw = await tryOrThrow(() => readFile(path, "utf8"), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
+    const json = await tryOrThrow(() => parse(raw), (error) => new Error(`Failed to parse agent definition from ${path}: ${error.message}`));
+    const agent = tryOrThrow(() => agentFileSchema.parse({ ...json, type: json.type ?? "ai" }), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
+    return agent;
+}

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

@@ -1,4 +1,3 @@
-import { readFile } from "node:fs/promises";
 import { type Agent } from "../agents/agent.js";
 import type { ChatModel } from "../models/chat-model.js";
 export interface LoadOptions {
@@ -8,15 +7,26 @@ export declare function load(options: LoadOptions): Promise<{
     model: ChatModel | undefined;
     agents: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
     tools: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
+    description?: 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;
 }>;
 export declare function loadAgent(path: string): Promise<Agent>;
-export declare function loadAIGNEFile(path: string, { readFile: _readFile }?: {
-    readFile?: typeof readFile;
-}): Promise<{
+export declare function loadAIGNEFile(path: string): Promise<{
+    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;

package/lib/esm/loader/index.js

@@ -1,22 +1,27 @@
-import { readFile } from "node:fs/promises";
+import { exists, readFile, stat } from "node:fs/promises";
 import { dirname, extname, join } from "node:path";
 import { parse } from "yaml";
 import { z } from "zod";
 import { FunctionAgent } from "../agents/agent.js";
 import { AIAgent } from "../agents/ai-agent.js";
+import { MCPAgent } from "../agents/mcp-agent.js";
+import { ClaudeChatModel } from "../models/claude-chat-model.js";
 import { OpenAIChatModel } from "../models/openai-chat-model.js";
+import { XAIChatModel } from "../models/xai-chat-model.js";
 import { tryOrThrow } from "../utils/type-utils.js";
-import { loadAgentFromYamlFile } from "./ai-agent.js";
-import { loadAgentFromJsFile } from "./function-agent.js";
-const AIGNE_FILE_NAME = "aigne.yaml";
+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;
-    const aigneFilePath = path.endsWith(AIGNE_FILE_NAME) ? path : join(path, AIGNE_FILE_NAME);
+    const aigneFilePath = await getAIGNEFilePath(path);
     const rootDir = dirname(aigneFilePath);
     const aigne = await loadAIGNEFile(aigneFilePath);
     const agents = await Promise.all((aigne.agents ?? []).map((filename) => loadAgent(join(rootDir, filename))));
     const tools = await Promise.all((aigne.tools ?? []).map((filename) => loadAgent(join(rootDir, filename))));
     return {
+        ...aigne,
         model: await loadModel(aigne.chat_model),
         agents,
         tools,
@@ -35,15 +40,31 @@ export async function loadAgent(path) {
     }
     if (extname(path) === ".yaml" || extname(path) === ".yml") {
         const agent = await loadAgentFromYamlFile(path);
-        return AIAgent.from({
-            name: agent.name,
-            description: agent.description,
-            instructions: agent.instructions,
-            inputSchema: agent.input_schema,
-            outputSchema: agent.output_schema,
-            outputKey: agent.output_key,
-            tools: await Promise.all((agent.tools ?? []).map((filename) => loadAgent(join(dirname(path), filename)))),
-        });
+        if (agent.type === "ai") {
+            return AIAgent.from({
+                name: agent.name,
+                description: agent.description,
+                instructions: agent.instructions,
+                inputSchema: agent.input_schema,
+                outputSchema: agent.output_schema,
+                outputKey: agent.output_key,
+                tools: await Promise.all((agent.tools ?? []).map((filename) => loadAgent(join(dirname(path), filename)))),
+            });
+        }
+        if (agent.type === "mcp") {
+            if (agent.url) {
+                return MCPAgent.from({
+                    url: agent.url,
+                });
+            }
+            if (agent.command) {
+                return MCPAgent.from({
+                    command: agent.command,
+                    args: agent.args,
+                });
+            }
+            throw new Error(`Missing url or command in mcp agent: ${path}`);
+        }
     }
     throw new Error(`Unsupported agent file type: ${path}`);
 }
@@ -57,17 +78,20 @@ async function loadModel(model) {
         frequencyPenalty: model.frequent_penalty ?? undefined,
         presencePenalty: model.presence_penalty ?? undefined,
     };
-    // TODO: add support for other models such as AutoChatModel, ClaudeChatModel, etc.
-    if (/^o1|gpt-/.test(model.name)) {
-        return new OpenAIChatModel(params);
-    }
-    throw new Error(`Unsupported model: ${model.name}`);
+    const availableModels = [OpenAIChatModel, ClaudeChatModel, XAIChatModel];
+    const M = availableModels.find((m) => m.name.toLowerCase().includes(model.provider || DEFAULT_MODEL_PROVIDER));
+    if (!M)
+        throw new Error(`Unsupported model: ${model.provider} ${model.name}`);
+    return new M(params);
 }
 const aigneFileSchema = z.object({
+    name: z.string().nullish(),
+    description: z.string().nullish(),
     chat_model: z
         .union([
         z.string(),
         z.object({
+            provider: z.string().nullish(),
             name: z.string().nullish(),
             temperature: z.number().min(0).max(2).nullish(),
             top_p: z.number().min(0).nullish(),
@@ -80,9 +104,20 @@ const aigneFileSchema = z.object({
     agents: z.array(z.string()).nullish(),
     tools: z.array(z.string()).nullish(),
 });
-export async function loadAIGNEFile(path, { readFile: _readFile = readFile } = {}) {
-    const raw = await tryOrThrow(() => _readFile(path, "utf8"), (error) => new Error(`Failed to load aigne.yaml from ${path}: ${error.message}`));
+export async function loadAIGNEFile(path) {
+    const raw = await tryOrThrow(() => readFile(path, "utf8"), (error) => new Error(`Failed to load aigne.yaml from ${path}: ${error.message}`));
     const json = await tryOrThrow(() => parse(raw), (error) => new Error(`Failed to parse aigne.yaml from ${path}: ${error.message}`));
     const agent = tryOrThrow(() => aigneFileSchema.parse(json), (error) => new Error(`Failed to validate aigne.yaml from ${path}: ${error.message}`));
     return agent;
 }
+async function getAIGNEFilePath(path) {
+    const s = await stat(path);
+    if (s.isDirectory()) {
+        for (const file of AIGNE_FILE_NAME) {
+            const filePath = join(path, file);
+            if (await exists(filePath))
+                return filePath;
+        }
+    }
+    return path;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.5.1-2",
+  "version": "1.6.0",
   "description": "AIGNE core library for building AI-powered applications",
   "publishConfig": {
     "access": "public"
@@ -83,20 +83,21 @@
     "@types/bun": "^1.2.8",
     "@types/express": "^5.0.1",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^22.13.17",
+    "@types/node": "^22.14.0",
     "detect-port": "^2.1.0",
     "express": "^5.1.0",
     "npm-run-all": "^4.1.5",
     "openai": "^4.91.1",
     "rimraf": "^6.0.1",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.2",
+    "@aigne/test-utils": "^1.0.0"
   },
   "scripts": {
     "lint": "tsc --noEmit",
     "build": "tsc --build scripts/tsconfig.build.json",
     "clean": "rimraf lib test/coverage",
-    "test": "cd test && bun test",
-    "test:coverage": "cd test && bun test --coverage --coverage-reporter=lcov --coverage-reporter=text",
+    "test": "bun --cwd test test",
+    "test:coverage": "bun --cwd test test --coverage --coverage-reporter=lcov --coverage-reporter=text",
     "postbuild": "echo '{\"type\": \"module\"}' > lib/esm/package.json && echo '{\"type\": \"commonjs\"}' > lib/cjs/package.json"
   }
 }

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

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadAgentFromYamlFile = loadAgentFromYamlFile;
-const promises_1 = require("node:fs/promises");
-const json_schema_to_zod_1 = require("@aigne/json-schema-to-zod");
-const yaml_1 = require("yaml");
-const zod_1 = require("zod");
-const type_utils_js_1 = require("../utils/type-utils.js");
-const schema_js_1 = require("./schema.js");
-const agentFileSchema = zod_1.z.object({
-    name: zod_1.z.string(),
-    description: zod_1.z
-        .string()
-        .nullish()
-        .transform((v) => v ?? undefined),
-    instructions: zod_1.z
-        .string()
-        .nullish()
-        .transform((v) => v ?? undefined),
-    input_schema: schema_js_1.inputOutputSchema
-        .nullish()
-        .transform((v) => (v ? (0, json_schema_to_zod_1.jsonSchemaToZod)(v) : undefined)),
-    output_schema: schema_js_1.inputOutputSchema
-        .nullish()
-        .transform((v) => (v ? (0, json_schema_to_zod_1.jsonSchemaToZod)(v) : undefined)),
-    output_key: zod_1.z
-        .string()
-        .nullish()
-        .transform((v) => v ?? undefined),
-    tools: zod_1.z
-        .array(zod_1.z.string())
-        .nullish()
-        .transform((v) => v ?? undefined),
-});
-async function loadAgentFromYamlFile(path, { readFile: _readFile = promises_1.readFile } = {}) {
-    const raw = await (0, type_utils_js_1.tryOrThrow)(() => _readFile(path, "utf8"), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
-    const json = await (0, type_utils_js_1.tryOrThrow)(() => (0, yaml_1.parse)(raw), (error) => new Error(`Failed to parse agent definition from ${path}: ${error.message}`));
-    const agent = (0, type_utils_js_1.tryOrThrow)(() => agentFileSchema.parse(json), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
-    return agent;
-}

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

@@ -1,37 +0,0 @@
-import { readFile } from "node:fs/promises";
-import { jsonSchemaToZod } from "@aigne/json-schema-to-zod";
-import { parse } from "yaml";
-import { z } from "zod";
-import { tryOrThrow } from "../utils/type-utils.js";
-import { inputOutputSchema } from "./schema.js";
-const agentFileSchema = z.object({
-    name: z.string(),
-    description: z
-        .string()
-        .nullish()
-        .transform((v) => v ?? undefined),
-    instructions: z
-        .string()
-        .nullish()
-        .transform((v) => v ?? undefined),
-    input_schema: inputOutputSchema
-        .nullish()
-        .transform((v) => (v ? jsonSchemaToZod(v) : undefined)),
-    output_schema: inputOutputSchema
-        .nullish()
-        .transform((v) => (v ? jsonSchemaToZod(v) : undefined)),
-    output_key: z
-        .string()
-        .nullish()
-        .transform((v) => v ?? undefined),
-    tools: z
-        .array(z.string())
-        .nullish()
-        .transform((v) => v ?? undefined),
-});
-export async function loadAgentFromYamlFile(path, { readFile: _readFile = readFile } = {}) {
-    const raw = await tryOrThrow(() => _readFile(path, "utf8"), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
-    const json = await tryOrThrow(() => parse(raw), (error) => new Error(`Failed to parse agent definition from ${path}: ${error.message}`));
-    const agent = tryOrThrow(() => agentFileSchema.parse(json), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
-    return agent;
-}