@aigne/core 1.20.1 → 1.21.0

package/CHANGELOG.md

@@ -5,6 +5,13 @@
 
 * add user context support ([#131](https://github.com/AIGNE-io/aigne-framework/issues/131)) ([4dd9d20](https://github.com/AIGNE-io/aigne-framework/commit/4dd9d20953f6ac33933723db56efd9b44bafeb02))
 
+## [1.21.0](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.20.1...core-v1.21.0) (2025-06-20)
+
+
+### Features
+
+* **cli:** support pass named input to agent by --input-xxx ([#167](https://github.com/AIGNE-io/aigne-framework/issues/167)) ([cda5bb6](https://github.com/AIGNE-io/aigne-framework/commit/cda5bb6baab680787de1a042664fe34c17a84bb1))
+
 ## [1.20.1](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.20.0...core-v1.20.1) (2025-06-19)
 
 

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

@@ -341,7 +341,7 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * Here's an example of invoking an agent with regular mode:
      * {@includeCode ../../test/agents/agent.test.ts#example-invoke}
      */
-    invoke(input: I, options?: Partial<AgentInvokeOptions> & {
+    invoke(input: I & Message, options?: Partial<AgentInvokeOptions> & {
         streaming?: false;
     }): Promise<O>;
     /**
@@ -359,7 +359,7 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * Here's an example of invoking an agent with streaming response:
      * {@includeCode ../../test/agents/agent.test.ts#example-invoke-streaming}
      */
-    invoke(input: I, options: Partial<AgentInvokeOptions> & {
+    invoke(input: I & Message, options: Partial<AgentInvokeOptions> & {
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
     /**
@@ -371,8 +371,8 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * @param options Invocation options
      * @returns Agent response (streaming or regular)
      */
-    invoke(input: I, options?: Partial<AgentInvokeOptions>): Promise<AgentResponse<O>>;
-    protected invokeSkill<I extends Message, O extends Message>(skill: Agent<I, O>, input: I, options: AgentInvokeOptions): Promise<O>;
+    invoke(input: I & Message, options?: Partial<AgentInvokeOptions>): Promise<AgentResponse<O>>;
+    protected invokeSkill<I extends Message, O extends Message>(skill: Agent<I, O>, input: I & Message, options: AgentInvokeOptions): Promise<O>;
     /**
      * Process agent output
      *

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

@@ -3,6 +3,7 @@ import { PromptBuilder } from "../prompt/prompt-builder.js";
 import { Agent, type AgentInvokeOptions, type AgentOptions, type AgentProcessAsyncGenerator, type Message } from "./agent.js";
 import { ChatModel, type ChatModelInput } from "./chat-model.js";
 import type { GuideRailAgentOutput } from "./guide-rail-agent.js";
+export declare const DEFAULT_OUTPUT_KEY = "message";
 /**
  * Configuration options for an AI Agent
  *
@@ -12,7 +13,7 @@ import type { GuideRailAgentOutput } from "./guide-rail-agent.js";
  * @template I The input message type the agent accepts
  * @template O The output message type the agent returns
  */
-export interface AIAgentOptions<InputKey extends string = string, I extends Message & InputMessage<InputKey> = Message & InputMessage<InputKey>, O extends Message = Message> extends AgentOptions<Omit<I, InputKey> & Partial<InputMessage<InputKey>>, O> {
+export interface AIAgentOptions<I extends Message = Message, O extends Message = Message> extends AgentOptions<I, O> {
     /**
      * The language model to use for this agent
      *
@@ -29,7 +30,7 @@ export interface AIAgentOptions<InputKey extends string = string, I extends Mess
     /**
      * Pick a message from input to use as the user's message
      */
-    inputKey?: InputKey;
+    inputKey?: string;
     /**
      * Custom key to use for text output in the response
      *
@@ -110,9 +111,6 @@ export declare const aiAgentToolChoiceSchema: z.ZodUnion<[z.ZodNativeEnum<typeof
 export declare const aiAgentOptionsSchema: ZodObject<{
     [key in keyof AIAgentOptions]: ZodType<AIAgentOptions[key]>;
 }>;
-type InputMessage<K> = K extends string ? {
-    [key in K]: string;
-} : Message;
 /**
  * AI-powered agent that leverages language models
  *
@@ -133,7 +131,7 @@ type InputMessage<K> = K extends string ? {
  * Basic AIAgent creation:
  * {@includeCode ../../test/agents/ai-agent.test.ts#example-ai-agent-basic}
  */
-export declare class AIAgent<InputKey extends string = string, I extends Message & InputMessage<InputKey> = Message & InputMessage<InputKey>, O extends Message = Message> extends Agent<I, O> {
+export declare class AIAgent<I extends Message = Message, O extends Message = Message> extends Agent<I, O> {
     /**
      * Create an AIAgent with the specified options
      *
@@ -146,13 +144,13 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
      * AI agent with custom instructions:
      * {@includeCode ../../test/agents/ai-agent.test.ts#example-ai-agent-instructions}
      */
-    static from<InputKey extends string, I extends Message & InputMessage<InputKey>, O extends Message>(options: AIAgentOptions<InputKey, I, O>): AIAgent<InputKey, I, O>;
+    static from<I extends Message, O extends Message>(options: AIAgentOptions<I, O>): AIAgent<I, O>;
     /**
      * Create an AIAgent instance
      *
      * @param options Configuration options for the AI agent
      */
-    constructor(options: AIAgentOptions<InputKey, I, O>);
+    constructor(options: AIAgentOptions<I, O>);
     /**
      * The language model used by this agent
      *
@@ -173,7 +171,7 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
     /**
      * Pick a message from input to use as the user's message
      */
-    inputKey?: InputKey;
+    inputKey?: string;
     /**
      * Custom key to use for text output in the response
      *
@@ -235,4 +233,3 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
      */
     _processRouter(input: I, model: ChatModel, modelInput: ChatModelInput, options: AgentInvokeOptions, toolsMap: Map<string, Agent>): AgentProcessAsyncGenerator<O>;
 }
-export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AIAgent = exports.aiAgentOptionsSchema = exports.aiAgentToolChoiceSchema = exports.AIAgentToolChoice = void 0;
+exports.AIAgent = exports.aiAgentOptionsSchema = exports.aiAgentToolChoiceSchema = exports.AIAgentToolChoice = exports.DEFAULT_OUTPUT_KEY = void 0;
 const zod_1 = require("zod");
 const prompt_builder_js_1 = require("../prompt/prompt-builder.js");
 const template_js_1 = require("../prompt/template.js");
@@ -8,7 +8,7 @@ const type_utils_js_1 = require("../utils/type-utils.js");
 const agent_js_1 = require("./agent.js");
 const chat_model_js_1 = require("./chat-model.js");
 const types_js_1 = require("./types.js");
-const DEFAULT_OUTPUT_KEY = "message";
+exports.DEFAULT_OUTPUT_KEY = "message";
 /**
  * Tool choice options for AI agents
  *
@@ -101,7 +101,7 @@ class AIAgent extends agent_js_1.Agent {
      * @param options Configuration options for the AI agent
      */
     constructor(options) {
-        super({ ...options, inputSchema: options.inputSchema });
+        super(options);
         (0, type_utils_js_1.checkArguments)("AIAgent", exports.aiAgentOptionsSchema, options);
         this.model = options.model;
         this.instructions =
@@ -109,7 +109,7 @@ class AIAgent extends agent_js_1.Agent {
                 ? prompt_builder_js_1.PromptBuilder.from(options.instructions)
                 : (options.instructions ?? new prompt_builder_js_1.PromptBuilder());
         this.inputKey = options.inputKey;
-        this.outputKey = options.outputKey || DEFAULT_OUTPUT_KEY;
+        this.outputKey = options.outputKey || exports.DEFAULT_OUTPUT_KEY;
         this.toolChoice = options.toolChoice;
         this.memoryAgentsAsTools = options.memoryAgentsAsTools;
         this.memoryPromptTemplate = options.memoryPromptTemplate;
@@ -264,7 +264,7 @@ class AIAgent extends agent_js_1.Agent {
         }
     }
     async onGuideRailError(error) {
-        const outputKey = this.outputKey || DEFAULT_OUTPUT_KEY;
+        const outputKey = this.outputKey || exports.DEFAULT_OUTPUT_KEY;
         return {
             [outputKey]: error.reason,
         };

package/lib/cjs/aigne/aigne.d.ts

@@ -134,7 +134,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @param options.streaming - Must be false to return a response stream
      * @returns A promise resolving to a tuple containing the agent's response and the final active agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent: true;
         streaming?: false;
     }): Promise<[O, Agent]>;
@@ -148,7 +148,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @param options.streaming - Must be true to return a response stream
      * @returns A promise resolving to a tuple containing the agent's response stream and a promise for the final agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent: true;
         streaming: true;
     }): Promise<[AgentResponseStream<O>, Promise<Agent>]>;
@@ -165,7 +165,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * Here's a simple example of how to invoke an agent:
      * {@includeCode ../../test/aigne/aigne.test.ts#example-simple}
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options?: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options?: InvokeOptions<U> & {
         returnActiveAgent?: false;
         streaming?: false;
     }): Promise<O>;
@@ -182,7 +182,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * Here's an example of how to invoke an agent with streaming response:
      * {@includeCode ../../test/aigne/aigne.test.ts#example-streaming}
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent?: false;
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
@@ -196,7 +196,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @returns Either a UserAgent (when no message provided) or a promise resolving to the agent's response
      * with optional active agent information based on the provided options
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I, options?: InvokeOptions<U>): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I & Message, options?: InvokeOptions<U>): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
     /**
      * Publishes a message to the message queue for inter-agent communication.
      * This method broadcasts a message to all subscribers of the specified topic(s).

package/lib/cjs/aigne/context.d.ts

@@ -78,11 +78,11 @@ export interface Context<U extends UserContext = UserContext> extends TypedEvent
      * @param options.streaming return a stream of the output
      * @returns the output of the agent and the final active agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         returnActiveAgent: true;
         streaming?: false;
     }): Promise<[O, Agent]>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         returnActiveAgent: true;
         streaming: true;
     }): Promise<[AgentResponseStream<O>, Promise<Agent>]>;
@@ -92,13 +92,13 @@ export interface Context<U extends UserContext = UserContext> extends TypedEvent
      * @param message Message to pass to the agent
      * @returns the output of the agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options?: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options?: InvokeOptions & {
         streaming?: false;
     }): Promise<O>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I, options?: InvokeOptions): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I & Message, options?: InvokeOptions): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
     /**
      * Publish a message to a topic, the aigne will invoke the listeners of the topic
      * @param topic topic name, or an array of topic names
@@ -169,7 +169,7 @@ declare class AIGNEContextShared {
     private timer?;
     private initTimeout;
     get status(): "normal" | "timeout";
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, input: I, context: Context, options?: InvokeOptions): AgentProcessAsyncGenerator<O & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, input: I & Message, context: Context, options?: InvokeOptions): AgentProcessAsyncGenerator<O & {
         __activeAgent__: Agent;
     }>;
     private invokeAgent;

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

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

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

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadAgentFromJsFile = loadAgentFromJsFile;
 const json_schema_to_zod_1 = require("@aigne/json-schema-to-zod");
 const zod_1 = require("zod");
+const agent_js_1 = require("../agents/agent.js");
 const camelize_js_1 = require("../utils/camelize.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
 const schema_js_1 = require("./schema.js");
@@ -55,6 +56,8 @@ const agentJsFileSchema = zod_1.z.object({
 });
 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 (agent instanceof agent_js_1.Agent)
+        return agent;
     if (typeof agent !== "function") {
         throw new Error(`Agent file ${path} must export a default function, but got ${typeof agent}`);
     }

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

@@ -1,6 +1,29 @@
 import { type ZodObject, type ZodType, z } from "zod";
 import { AIAgentToolChoice } from "../agents/ai-agent.js";
+import { ProcessMode } from "../agents/team-agent.js";
 export declare function loadAgentFromYamlFile(path: string): Promise<{
+    type: "mcp";
+    url?: string | undefined;
+    args?: string[] | undefined;
+    command?: string | undefined;
+} | {
+    type: "team";
+    name: string;
+    description?: string | undefined;
+    skills?: string[] | undefined;
+    mode?: ProcessMode | undefined;
+    inputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+        [x: string]: any;
+    }, {
+        [x: string]: any;
+    }> | undefined;
+    outputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+        [x: string]: any;
+    }, {
+        [x: string]: any;
+    }> | undefined;
+} | {
+    instructions: string | undefined;
     type: "ai";
     name: string;
     description?: string | undefined;
@@ -9,7 +32,6 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
         provider: string;
         subscribeTopic?: string[] | undefined;
     } | undefined;
-    instructions?: string | undefined;
     inputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {
@@ -23,9 +45,4 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
     inputKey?: string | undefined;
     outputKey?: string | undefined;
     toolChoice?: AIAgentToolChoice | undefined;
-} | {
-    type: "mcp";
-    url?: string | undefined;
-    args?: string[] | undefined;
-    command?: string | undefined;
 }>;

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

@@ -6,6 +6,7 @@ const index_js_1 = require("@aigne/platform-helpers/nodejs/index.js");
 const yaml_1 = require("yaml");
 const zod_1 = require("zod");
 const ai_agent_js_1 = require("../agents/ai-agent.js");
+const team_agent_js_1 = require("../agents/team-agent.js");
 const camelize_js_1 = require("../utils/camelize.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
 const schema_js_1 = require("./schema.js");
@@ -18,7 +19,12 @@ const agentFileSchema = zod_1.z.discriminatedUnion("type", [
             .nullish()
             .transform((v) => v ?? undefined),
         instructions: zod_1.z
-            .string()
+            .union([
+            zod_1.z.string(),
+            zod_1.z.object({
+                url: zod_1.z.string(),
+            }),
+        ])
             .nullish()
             .transform((v) => v ?? undefined),
         input_key: zod_1.z
@@ -72,16 +78,46 @@ const agentFileSchema = zod_1.z.discriminatedUnion("type", [
             .nullish()
             .transform((v) => v ?? undefined),
     }),
+    zod_1.z.object({
+        type: zod_1.z.literal("team"),
+        name: zod_1.z.string(),
+        description: 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)),
+        skills: zod_1.z
+            .array(zod_1.z.string())
+            .nullish()
+            .transform((v) => v ?? undefined),
+        mode: zod_1.z
+            .nativeEnum(team_agent_js_1.ProcessMode)
+            .nullish()
+            .transform((v) => v ?? undefined),
+    }),
 ]);
 async function loadAgentFromYamlFile(path) {
     const raw = await (0, type_utils_js_1.tryOrThrow)(() => index_js_1.nodejs.fs.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)(() => (0, camelize_js_1.customCamelize)(agentFileSchema.parse({
+    const agent = await (0, type_utils_js_1.tryOrThrow)(async () => (0, camelize_js_1.customCamelize)(await agentFileSchema.parseAsync({
         ...json,
         type: json.type ?? "ai",
         skills: json.skills ?? json.tools,
     }), {
         shallowKeys: ["input_schema", "output_schema"],
     }), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
+    if (agent.type === "ai") {
+        return {
+            ...agent,
+            instructions: typeof agent.instructions === "object" && "url" in agent.instructions
+                ? await index_js_1.nodejs.fs.readFile(index_js_1.nodejs.path.join(index_js_1.nodejs.path.dirname(path), agent.instructions.url), "utf8")
+                : agent.instructions,
+        };
+    }
     return agent;
 }

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

@@ -1,6 +1,6 @@
 import type { Camelize } from "camelize-ts";
 import { z } from "zod";
-import { type Agent } from "../agents/agent.js";
+import { Agent } from "../agents/agent.js";
 import type { ChatModel, ChatModelOptions } from "../agents/chat-model.js";
 import type { MemoryAgent, MemoryAgentOptions } from "../memory/memory.js";
 export interface LoadOptions {

package/lib/cjs/loader/index.js

@@ -10,6 +10,7 @@ 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 team_agent_js_1 = require("../agents/team-agent.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");
@@ -28,20 +29,25 @@ async function load(options) {
     };
 }
 async function loadAgent(path, options) {
-    if (index_js_1.nodejs.path.extname(path) === ".js") {
+    if ([".js", ".mjs", ".ts", ".mts"].includes(index_js_1.nodejs.path.extname(path))) {
         const agent = await (0, agent_js_js_1.loadAgentFromJsFile)(path);
+        if (agent instanceof agent_js_1.Agent)
+            return agent;
         return agent_js_1.FunctionAgent.from(agent);
     }
-    if (index_js_1.nodejs.path.extname(path) === ".yaml" || index_js_1.nodejs.path.extname(path) === ".yml") {
+    if ([".yml", ".yaml"].includes(index_js_1.nodejs.path.extname(path))) {
         const agent = await (0, agent_yaml_js_1.loadAgentFromYamlFile)(path);
+        const skills = "skills" in agent
+            ? agent.skills &&
+                (await Promise.all(agent.skills.map((filename) => loadAgent(index_js_1.nodejs.path.join(index_js_1.nodejs.path.dirname(path), filename), options))))
+            : undefined;
         if (agent.type === "ai") {
             return ai_agent_js_1.AIAgent.from({
                 ...agent,
                 memory: !options?.memories?.length || !agent.memory
                     ? undefined
                     : await loadMemory(options.memories, typeof agent.memory === "object" ? agent.memory.provider : undefined, typeof agent.memory === "object" ? agent.memory : {}),
-                skills: agent.skills &&
-                    (await Promise.all(agent.skills.map((filename) => loadAgent(index_js_1.nodejs.path.join(index_js_1.nodejs.path.dirname(path), filename), options)))),
+                skills,
             });
         }
         if (agent.type === "mcp") {
@@ -58,6 +64,12 @@ async function loadAgent(path, options) {
             }
             throw new Error(`Missing url or command in mcp agent: ${path}`);
         }
+        if (agent.type === "team") {
+            return team_agent_js_1.TeamAgent.from({
+                ...agent,
+                skills,
+            });
+        }
     }
     throw new Error(`Unsupported agent file type: ${path}`);
 }

package/lib/cjs/prompt/prompt-builder.d.ts

@@ -7,7 +7,7 @@ export interface PromptBuilderOptions {
     instructions?: string | ChatMessagesTemplate;
 }
 export interface PromptBuildOptions extends Pick<AgentInvokeOptions, "context"> {
-    agent?: AIAgent<any, any, any>;
+    agent?: AIAgent;
     input?: Message;
     model?: ChatModel;
     outputSchema?: Agent["outputSchema"];

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

@@ -341,7 +341,7 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * Here's an example of invoking an agent with regular mode:
      * {@includeCode ../../test/agents/agent.test.ts#example-invoke}
      */
-    invoke(input: I, options?: Partial<AgentInvokeOptions> & {
+    invoke(input: I & Message, options?: Partial<AgentInvokeOptions> & {
         streaming?: false;
     }): Promise<O>;
     /**
@@ -359,7 +359,7 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * Here's an example of invoking an agent with streaming response:
      * {@includeCode ../../test/agents/agent.test.ts#example-invoke-streaming}
      */
-    invoke(input: I, options: Partial<AgentInvokeOptions> & {
+    invoke(input: I & Message, options: Partial<AgentInvokeOptions> & {
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
     /**
@@ -371,8 +371,8 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * @param options Invocation options
      * @returns Agent response (streaming or regular)
      */
-    invoke(input: I, options?: Partial<AgentInvokeOptions>): Promise<AgentResponse<O>>;
-    protected invokeSkill<I extends Message, O extends Message>(skill: Agent<I, O>, input: I, options: AgentInvokeOptions): Promise<O>;
+    invoke(input: I & Message, options?: Partial<AgentInvokeOptions>): Promise<AgentResponse<O>>;
+    protected invokeSkill<I extends Message, O extends Message>(skill: Agent<I, O>, input: I & Message, options: AgentInvokeOptions): Promise<O>;
     /**
      * Process agent output
      *

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

@@ -3,6 +3,7 @@ import { PromptBuilder } from "../prompt/prompt-builder.js";
 import { Agent, type AgentInvokeOptions, type AgentOptions, type AgentProcessAsyncGenerator, type Message } from "./agent.js";
 import { ChatModel, type ChatModelInput } from "./chat-model.js";
 import type { GuideRailAgentOutput } from "./guide-rail-agent.js";
+export declare const DEFAULT_OUTPUT_KEY = "message";
 /**
  * Configuration options for an AI Agent
  *
@@ -12,7 +13,7 @@ import type { GuideRailAgentOutput } from "./guide-rail-agent.js";
  * @template I The input message type the agent accepts
  * @template O The output message type the agent returns
  */
-export interface AIAgentOptions<InputKey extends string = string, I extends Message & InputMessage<InputKey> = Message & InputMessage<InputKey>, O extends Message = Message> extends AgentOptions<Omit<I, InputKey> & Partial<InputMessage<InputKey>>, O> {
+export interface AIAgentOptions<I extends Message = Message, O extends Message = Message> extends AgentOptions<I, O> {
     /**
      * The language model to use for this agent
      *
@@ -29,7 +30,7 @@ export interface AIAgentOptions<InputKey extends string = string, I extends Mess
     /**
      * Pick a message from input to use as the user's message
      */
-    inputKey?: InputKey;
+    inputKey?: string;
     /**
      * Custom key to use for text output in the response
      *
@@ -110,9 +111,6 @@ export declare const aiAgentToolChoiceSchema: z.ZodUnion<[z.ZodNativeEnum<typeof
 export declare const aiAgentOptionsSchema: ZodObject<{
     [key in keyof AIAgentOptions]: ZodType<AIAgentOptions[key]>;
 }>;
-type InputMessage<K> = K extends string ? {
-    [key in K]: string;
-} : Message;
 /**
  * AI-powered agent that leverages language models
  *
@@ -133,7 +131,7 @@ type InputMessage<K> = K extends string ? {
  * Basic AIAgent creation:
  * {@includeCode ../../test/agents/ai-agent.test.ts#example-ai-agent-basic}
  */
-export declare class AIAgent<InputKey extends string = string, I extends Message & InputMessage<InputKey> = Message & InputMessage<InputKey>, O extends Message = Message> extends Agent<I, O> {
+export declare class AIAgent<I extends Message = Message, O extends Message = Message> extends Agent<I, O> {
     /**
      * Create an AIAgent with the specified options
      *
@@ -146,13 +144,13 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
      * AI agent with custom instructions:
      * {@includeCode ../../test/agents/ai-agent.test.ts#example-ai-agent-instructions}
      */
-    static from<InputKey extends string, I extends Message & InputMessage<InputKey>, O extends Message>(options: AIAgentOptions<InputKey, I, O>): AIAgent<InputKey, I, O>;
+    static from<I extends Message, O extends Message>(options: AIAgentOptions<I, O>): AIAgent<I, O>;
     /**
      * Create an AIAgent instance
      *
      * @param options Configuration options for the AI agent
      */
-    constructor(options: AIAgentOptions<InputKey, I, O>);
+    constructor(options: AIAgentOptions<I, O>);
     /**
      * The language model used by this agent
      *
@@ -173,7 +171,7 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
     /**
      * Pick a message from input to use as the user's message
      */
-    inputKey?: InputKey;
+    inputKey?: string;
     /**
      * Custom key to use for text output in the response
      *
@@ -235,4 +233,3 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
      */
     _processRouter(input: I, model: ChatModel, modelInput: ChatModelInput, options: AgentInvokeOptions, toolsMap: Map<string, Agent>): AgentProcessAsyncGenerator<O>;
 }
-export {};

package/lib/dts/aigne/aigne.d.ts

@@ -134,7 +134,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @param options.streaming - Must be false to return a response stream
      * @returns A promise resolving to a tuple containing the agent's response and the final active agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent: true;
         streaming?: false;
     }): Promise<[O, Agent]>;
@@ -148,7 +148,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @param options.streaming - Must be true to return a response stream
      * @returns A promise resolving to a tuple containing the agent's response stream and a promise for the final agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent: true;
         streaming: true;
     }): Promise<[AgentResponseStream<O>, Promise<Agent>]>;
@@ -165,7 +165,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * Here's a simple example of how to invoke an agent:
      * {@includeCode ../../test/aigne/aigne.test.ts#example-simple}
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options?: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options?: InvokeOptions<U> & {
         returnActiveAgent?: false;
         streaming?: false;
     }): Promise<O>;
@@ -182,7 +182,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * Here's an example of how to invoke an agent with streaming response:
      * {@includeCode ../../test/aigne/aigne.test.ts#example-streaming}
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent?: false;
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
@@ -196,7 +196,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @returns Either a UserAgent (when no message provided) or a promise resolving to the agent's response
      * with optional active agent information based on the provided options
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I, options?: InvokeOptions<U>): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I & Message, options?: InvokeOptions<U>): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
     /**
      * Publishes a message to the message queue for inter-agent communication.
      * This method broadcasts a message to all subscribers of the specified topic(s).

package/lib/dts/aigne/context.d.ts

@@ -78,11 +78,11 @@ export interface Context<U extends UserContext = UserContext> extends TypedEvent
      * @param options.streaming return a stream of the output
      * @returns the output of the agent and the final active agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         returnActiveAgent: true;
         streaming?: false;
     }): Promise<[O, Agent]>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         returnActiveAgent: true;
         streaming: true;
     }): Promise<[AgentResponseStream<O>, Promise<Agent>]>;
@@ -92,13 +92,13 @@ export interface Context<U extends UserContext = UserContext> extends TypedEvent
      * @param message Message to pass to the agent
      * @returns the output of the agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options?: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options?: InvokeOptions & {
         streaming?: false;
     }): Promise<O>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I, options?: InvokeOptions): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I & Message, options?: InvokeOptions): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
     /**
      * Publish a message to a topic, the aigne will invoke the listeners of the topic
      * @param topic topic name, or an array of topic names
@@ -169,7 +169,7 @@ declare class AIGNEContextShared {
     private timer?;
     private initTimeout;
     get status(): "normal" | "timeout";
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, input: I, context: Context, options?: InvokeOptions): AgentProcessAsyncGenerator<O & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, input: I & Message, context: Context, options?: InvokeOptions): AgentProcessAsyncGenerator<O & {
         __activeAgent__: Agent;
     }>;
     private invokeAgent;

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

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

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

@@ -1,6 +1,29 @@
 import { type ZodObject, type ZodType, z } from "zod";
 import { AIAgentToolChoice } from "../agents/ai-agent.js";
+import { ProcessMode } from "../agents/team-agent.js";
 export declare function loadAgentFromYamlFile(path: string): Promise<{
+    type: "mcp";
+    url?: string | undefined;
+    args?: string[] | undefined;
+    command?: string | undefined;
+} | {
+    type: "team";
+    name: string;
+    description?: string | undefined;
+    skills?: string[] | undefined;
+    mode?: ProcessMode | undefined;
+    inputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+        [x: string]: any;
+    }, {
+        [x: string]: any;
+    }> | undefined;
+    outputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+        [x: string]: any;
+    }, {
+        [x: string]: any;
+    }> | undefined;
+} | {
+    instructions: string | undefined;
     type: "ai";
     name: string;
     description?: string | undefined;
@@ -9,7 +32,6 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
         provider: string;
         subscribeTopic?: string[] | undefined;
     } | undefined;
-    instructions?: string | undefined;
     inputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {
@@ -23,9 +45,4 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
     inputKey?: string | undefined;
     outputKey?: string | undefined;
     toolChoice?: AIAgentToolChoice | undefined;
-} | {
-    type: "mcp";
-    url?: string | undefined;
-    args?: string[] | undefined;
-    command?: string | undefined;
 }>;

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

@@ -1,6 +1,6 @@
 import type { Camelize } from "camelize-ts";
 import { z } from "zod";
-import { type Agent } from "../agents/agent.js";
+import { Agent } from "../agents/agent.js";
 import type { ChatModel, ChatModelOptions } from "../agents/chat-model.js";
 import type { MemoryAgent, MemoryAgentOptions } from "../memory/memory.js";
 export interface LoadOptions {

package/lib/dts/prompt/prompt-builder.d.ts

@@ -7,7 +7,7 @@ export interface PromptBuilderOptions {
     instructions?: string | ChatMessagesTemplate;
 }
 export interface PromptBuildOptions extends Pick<AgentInvokeOptions, "context"> {
-    agent?: AIAgent<any, any, any>;
+    agent?: AIAgent;
     input?: Message;
     model?: ChatModel;
     outputSchema?: Agent["outputSchema"];

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

@@ -341,7 +341,7 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * Here's an example of invoking an agent with regular mode:
      * {@includeCode ../../test/agents/agent.test.ts#example-invoke}
      */
-    invoke(input: I, options?: Partial<AgentInvokeOptions> & {
+    invoke(input: I & Message, options?: Partial<AgentInvokeOptions> & {
         streaming?: false;
     }): Promise<O>;
     /**
@@ -359,7 +359,7 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * Here's an example of invoking an agent with streaming response:
      * {@includeCode ../../test/agents/agent.test.ts#example-invoke-streaming}
      */
-    invoke(input: I, options: Partial<AgentInvokeOptions> & {
+    invoke(input: I & Message, options: Partial<AgentInvokeOptions> & {
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
     /**
@@ -371,8 +371,8 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * @param options Invocation options
      * @returns Agent response (streaming or regular)
      */
-    invoke(input: I, options?: Partial<AgentInvokeOptions>): Promise<AgentResponse<O>>;
-    protected invokeSkill<I extends Message, O extends Message>(skill: Agent<I, O>, input: I, options: AgentInvokeOptions): Promise<O>;
+    invoke(input: I & Message, options?: Partial<AgentInvokeOptions>): Promise<AgentResponse<O>>;
+    protected invokeSkill<I extends Message, O extends Message>(skill: Agent<I, O>, input: I & Message, options: AgentInvokeOptions): Promise<O>;
     /**
      * Process agent output
      *

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

@@ -3,6 +3,7 @@ import { PromptBuilder } from "../prompt/prompt-builder.js";
 import { Agent, type AgentInvokeOptions, type AgentOptions, type AgentProcessAsyncGenerator, type Message } from "./agent.js";
 import { ChatModel, type ChatModelInput } from "./chat-model.js";
 import type { GuideRailAgentOutput } from "./guide-rail-agent.js";
+export declare const DEFAULT_OUTPUT_KEY = "message";
 /**
  * Configuration options for an AI Agent
  *
@@ -12,7 +13,7 @@ import type { GuideRailAgentOutput } from "./guide-rail-agent.js";
  * @template I The input message type the agent accepts
  * @template O The output message type the agent returns
  */
-export interface AIAgentOptions<InputKey extends string = string, I extends Message & InputMessage<InputKey> = Message & InputMessage<InputKey>, O extends Message = Message> extends AgentOptions<Omit<I, InputKey> & Partial<InputMessage<InputKey>>, O> {
+export interface AIAgentOptions<I extends Message = Message, O extends Message = Message> extends AgentOptions<I, O> {
     /**
      * The language model to use for this agent
      *
@@ -29,7 +30,7 @@ export interface AIAgentOptions<InputKey extends string = string, I extends Mess
     /**
      * Pick a message from input to use as the user's message
      */
-    inputKey?: InputKey;
+    inputKey?: string;
     /**
      * Custom key to use for text output in the response
      *
@@ -110,9 +111,6 @@ export declare const aiAgentToolChoiceSchema: z.ZodUnion<[z.ZodNativeEnum<typeof
 export declare const aiAgentOptionsSchema: ZodObject<{
     [key in keyof AIAgentOptions]: ZodType<AIAgentOptions[key]>;
 }>;
-type InputMessage<K> = K extends string ? {
-    [key in K]: string;
-} : Message;
 /**
  * AI-powered agent that leverages language models
  *
@@ -133,7 +131,7 @@ type InputMessage<K> = K extends string ? {
  * Basic AIAgent creation:
  * {@includeCode ../../test/agents/ai-agent.test.ts#example-ai-agent-basic}
  */
-export declare class AIAgent<InputKey extends string = string, I extends Message & InputMessage<InputKey> = Message & InputMessage<InputKey>, O extends Message = Message> extends Agent<I, O> {
+export declare class AIAgent<I extends Message = Message, O extends Message = Message> extends Agent<I, O> {
     /**
      * Create an AIAgent with the specified options
      *
@@ -146,13 +144,13 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
      * AI agent with custom instructions:
      * {@includeCode ../../test/agents/ai-agent.test.ts#example-ai-agent-instructions}
      */
-    static from<InputKey extends string, I extends Message & InputMessage<InputKey>, O extends Message>(options: AIAgentOptions<InputKey, I, O>): AIAgent<InputKey, I, O>;
+    static from<I extends Message, O extends Message>(options: AIAgentOptions<I, O>): AIAgent<I, O>;
     /**
      * Create an AIAgent instance
      *
      * @param options Configuration options for the AI agent
      */
-    constructor(options: AIAgentOptions<InputKey, I, O>);
+    constructor(options: AIAgentOptions<I, O>);
     /**
      * The language model used by this agent
      *
@@ -173,7 +171,7 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
     /**
      * Pick a message from input to use as the user's message
      */
-    inputKey?: InputKey;
+    inputKey?: string;
     /**
      * Custom key to use for text output in the response
      *
@@ -235,4 +233,3 @@ export declare class AIAgent<InputKey extends string = string, I extends Message
      */
     _processRouter(input: I, model: ChatModel, modelInput: ChatModelInput, options: AgentInvokeOptions, toolsMap: Map<string, Agent>): AgentProcessAsyncGenerator<O>;
 }
-export {};

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

@@ -5,7 +5,7 @@ import { checkArguments, isEmpty } from "../utils/type-utils.js";
 import { Agent, agentOptionsSchema, isAgentResponseDelta, } from "./agent.js";
 import { ChatModel, } from "./chat-model.js";
 import { isTransferAgentOutput } from "./types.js";
-const DEFAULT_OUTPUT_KEY = "message";
+export const DEFAULT_OUTPUT_KEY = "message";
 /**
  * Tool choice options for AI agents
  *
@@ -98,7 +98,7 @@ export class AIAgent extends Agent {
      * @param options Configuration options for the AI agent
      */
     constructor(options) {
-        super({ ...options, inputSchema: options.inputSchema });
+        super(options);
         checkArguments("AIAgent", aiAgentOptionsSchema, options);
         this.model = options.model;
         this.instructions =

package/lib/esm/aigne/aigne.d.ts

@@ -134,7 +134,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @param options.streaming - Must be false to return a response stream
      * @returns A promise resolving to a tuple containing the agent's response and the final active agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent: true;
         streaming?: false;
     }): Promise<[O, Agent]>;
@@ -148,7 +148,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @param options.streaming - Must be true to return a response stream
      * @returns A promise resolving to a tuple containing the agent's response stream and a promise for the final agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent: true;
         streaming: true;
     }): Promise<[AgentResponseStream<O>, Promise<Agent>]>;
@@ -165,7 +165,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * Here's a simple example of how to invoke an agent:
      * {@includeCode ../../test/aigne/aigne.test.ts#example-simple}
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options?: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options?: InvokeOptions<U> & {
         returnActiveAgent?: false;
         streaming?: false;
     }): Promise<O>;
@@ -182,7 +182,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * Here's an example of how to invoke an agent with streaming response:
      * {@includeCode ../../test/aigne/aigne.test.ts#example-streaming}
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions<U> & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions<U> & {
         returnActiveAgent?: false;
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
@@ -196,7 +196,7 @@ export declare class AIGNE<U extends UserContext = UserContext> {
      * @returns Either a UserAgent (when no message provided) or a promise resolving to the agent's response
      * with optional active agent information based on the provided options
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I, options?: InvokeOptions<U>): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I & Message, options?: InvokeOptions<U>): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
     /**
      * Publishes a message to the message queue for inter-agent communication.
      * This method broadcasts a message to all subscribers of the specified topic(s).

package/lib/esm/aigne/context.d.ts

@@ -78,11 +78,11 @@ export interface Context<U extends UserContext = UserContext> extends TypedEvent
      * @param options.streaming return a stream of the output
      * @returns the output of the agent and the final active agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         returnActiveAgent: true;
         streaming?: false;
     }): Promise<[O, Agent]>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         returnActiveAgent: true;
         streaming: true;
     }): Promise<[AgentResponseStream<O>, Promise<Agent>]>;
@@ -92,13 +92,13 @@ export interface Context<U extends UserContext = UserContext> extends TypedEvent
      * @param message Message to pass to the agent
      * @returns the output of the agent
      */
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options?: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options?: InvokeOptions & {
         streaming?: false;
     }): Promise<O>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I, options: InvokeOptions & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message: I & Message, options: InvokeOptions & {
         streaming: true;
     }): Promise<AgentResponseStream<O>>;
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I, options?: InvokeOptions): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, message?: I & Message, options?: InvokeOptions): UserAgent<I, O> | Promise<AgentResponse<O> | [AgentResponse<O>, Agent]>;
     /**
      * Publish a message to a topic, the aigne will invoke the listeners of the topic
      * @param topic topic name, or an array of topic names
@@ -169,7 +169,7 @@ declare class AIGNEContextShared {
     private timer?;
     private initTimeout;
     get status(): "normal" | "timeout";
-    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, input: I, context: Context, options?: InvokeOptions): AgentProcessAsyncGenerator<O & {
+    invoke<I extends Message, O extends Message>(agent: Agent<I, O>, input: I & Message, context: Context, options?: InvokeOptions): AgentProcessAsyncGenerator<O & {
         __activeAgent__: Agent;
     }>;
     private invokeAgent;

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

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

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

@@ -1,5 +1,6 @@
 import { jsonSchemaToZod } from "@aigne/json-schema-to-zod";
 import { z } from "zod";
+import { Agent } from "../agents/agent.js";
 import { customCamelize } from "../utils/camelize.js";
 import { tryOrThrow } from "../utils/type-utils.js";
 import { inputOutputSchema } from "./schema.js";
@@ -19,6 +20,8 @@ const agentJsFileSchema = z.object({
 });
 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 (agent instanceof Agent)
+        return agent;
     if (typeof agent !== "function") {
         throw new Error(`Agent file ${path} must export a default function, but got ${typeof agent}`);
     }

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

@@ -1,6 +1,29 @@
 import { type ZodObject, type ZodType, z } from "zod";
 import { AIAgentToolChoice } from "../agents/ai-agent.js";
+import { ProcessMode } from "../agents/team-agent.js";
 export declare function loadAgentFromYamlFile(path: string): Promise<{
+    type: "mcp";
+    url?: string | undefined;
+    args?: string[] | undefined;
+    command?: string | undefined;
+} | {
+    type: "team";
+    name: string;
+    description?: string | undefined;
+    skills?: string[] | undefined;
+    mode?: ProcessMode | undefined;
+    inputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+        [x: string]: any;
+    }, {
+        [x: string]: any;
+    }> | undefined;
+    outputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+        [x: string]: any;
+    }, {
+        [x: string]: any;
+    }> | undefined;
+} | {
+    instructions: string | undefined;
     type: "ai";
     name: string;
     description?: string | undefined;
@@ -9,7 +32,6 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
         provider: string;
         subscribeTopic?: string[] | undefined;
     } | undefined;
-    instructions?: string | undefined;
     inputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {
@@ -23,9 +45,4 @@ export declare function loadAgentFromYamlFile(path: string): Promise<{
     inputKey?: string | undefined;
     outputKey?: string | undefined;
     toolChoice?: AIAgentToolChoice | undefined;
-} | {
-    type: "mcp";
-    url?: string | undefined;
-    args?: string[] | undefined;
-    command?: string | undefined;
 }>;

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

@@ -3,6 +3,7 @@ import { nodejs } from "@aigne/platform-helpers/nodejs/index.js";
 import { parse } from "yaml";
 import { z } from "zod";
 import { AIAgentToolChoice } from "../agents/ai-agent.js";
+import { ProcessMode } from "../agents/team-agent.js";
 import { customCamelize } from "../utils/camelize.js";
 import { tryOrThrow } from "../utils/type-utils.js";
 import { inputOutputSchema } from "./schema.js";
@@ -15,7 +16,12 @@ const agentFileSchema = z.discriminatedUnion("type", [
             .nullish()
             .transform((v) => v ?? undefined),
         instructions: z
-            .string()
+            .union([
+            z.string(),
+            z.object({
+                url: z.string(),
+            }),
+        ])
             .nullish()
             .transform((v) => v ?? undefined),
         input_key: z
@@ -69,16 +75,46 @@ const agentFileSchema = z.discriminatedUnion("type", [
             .nullish()
             .transform((v) => v ?? undefined),
     }),
+    z.object({
+        type: z.literal("team"),
+        name: z.string(),
+        description: 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)),
+        skills: z
+            .array(z.string())
+            .nullish()
+            .transform((v) => v ?? undefined),
+        mode: z
+            .nativeEnum(ProcessMode)
+            .nullish()
+            .transform((v) => v ?? undefined),
+    }),
 ]);
 export async function loadAgentFromYamlFile(path) {
     const raw = await tryOrThrow(() => nodejs.fs.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(() => customCamelize(agentFileSchema.parse({
+    const agent = await tryOrThrow(async () => customCamelize(await agentFileSchema.parseAsync({
         ...json,
         type: json.type ?? "ai",
         skills: json.skills ?? json.tools,
     }), {
         shallowKeys: ["input_schema", "output_schema"],
     }), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
+    if (agent.type === "ai") {
+        return {
+            ...agent,
+            instructions: typeof agent.instructions === "object" && "url" in agent.instructions
+                ? await nodejs.fs.readFile(nodejs.path.join(nodejs.path.dirname(path), agent.instructions.url), "utf8")
+                : agent.instructions,
+        };
+    }
     return agent;
 }

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

@@ -1,6 +1,6 @@
 import type { Camelize } from "camelize-ts";
 import { z } from "zod";
-import { type Agent } from "../agents/agent.js";
+import { Agent } from "../agents/agent.js";
 import type { ChatModel, ChatModelOptions } from "../agents/chat-model.js";
 import type { MemoryAgent, MemoryAgentOptions } from "../memory/memory.js";
 export interface LoadOptions {

package/lib/esm/loader/index.js

@@ -1,9 +1,10 @@
 import { nodejs } from "@aigne/platform-helpers/nodejs/index.js";
 import { parse } from "yaml";
 import { z } from "zod";
-import { FunctionAgent } from "../agents/agent.js";
+import { Agent, FunctionAgent } from "../agents/agent.js";
 import { AIAgent } from "../agents/ai-agent.js";
 import { MCPAgent } from "../agents/mcp-agent.js";
+import { TeamAgent } from "../agents/team-agent.js";
 import { tryOrThrow } from "../utils/type-utils.js";
 import { loadAgentFromJsFile } from "./agent-js.js";
 import { loadAgentFromYamlFile } from "./agent-yaml.js";
@@ -22,20 +23,25 @@ export async function load(options) {
     };
 }
 export async function loadAgent(path, options) {
-    if (nodejs.path.extname(path) === ".js") {
+    if ([".js", ".mjs", ".ts", ".mts"].includes(nodejs.path.extname(path))) {
         const agent = await loadAgentFromJsFile(path);
+        if (agent instanceof Agent)
+            return agent;
         return FunctionAgent.from(agent);
     }
-    if (nodejs.path.extname(path) === ".yaml" || nodejs.path.extname(path) === ".yml") {
+    if ([".yml", ".yaml"].includes(nodejs.path.extname(path))) {
         const agent = await loadAgentFromYamlFile(path);
+        const skills = "skills" in agent
+            ? agent.skills &&
+                (await Promise.all(agent.skills.map((filename) => loadAgent(nodejs.path.join(nodejs.path.dirname(path), filename), options))))
+            : undefined;
         if (agent.type === "ai") {
             return AIAgent.from({
                 ...agent,
                 memory: !options?.memories?.length || !agent.memory
                     ? undefined
                     : await loadMemory(options.memories, typeof agent.memory === "object" ? agent.memory.provider : undefined, typeof agent.memory === "object" ? agent.memory : {}),
-                skills: agent.skills &&
-                    (await Promise.all(agent.skills.map((filename) => loadAgent(nodejs.path.join(nodejs.path.dirname(path), filename), options)))),
+                skills,
             });
         }
         if (agent.type === "mcp") {
@@ -52,6 +58,12 @@ export async function loadAgent(path, options) {
             }
             throw new Error(`Missing url or command in mcp agent: ${path}`);
         }
+        if (agent.type === "team") {
+            return TeamAgent.from({
+                ...agent,
+                skills,
+            });
+        }
     }
     throw new Error(`Unsupported agent file type: ${path}`);
 }

package/lib/esm/prompt/prompt-builder.d.ts

@@ -7,7 +7,7 @@ export interface PromptBuilderOptions {
     instructions?: string | ChatMessagesTemplate;
 }
 export interface PromptBuildOptions extends Pick<AgentInvokeOptions, "context"> {
-    agent?: AIAgent<any, any, any>;
+    agent?: AIAgent;
     input?: Message;
     model?: ChatModel;
     outputSchema?: Agent["outputSchema"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.20.1",
+  "version": "1.21.0",
   "description": "AIGNE core library for building AI-powered applications",
   "publishConfig": {
     "access": "public"