@aigne/core 1.20.1 → 1.22.0

package/lib/cjs/aigne/context.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AIGNEContext = void 0;
+const api_1 = require("@opentelemetry/api");
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
 const strict_event_emitter_1 = require("strict-event-emitter");
 const uuid_1 = require("uuid");
@@ -12,6 +13,7 @@ const agent_js_1 = require("../agents/agent.js");
 const types_js_1 = require("../agents/types.js");
 const user_agent_js_1 = require("../agents/user-agent.js");
 const event_stream_js_1 = require("../utils/event-stream.js");
+const logger_js_1 = require("../utils/logger.js");
 const promise_js_1 = require("../utils/promise.js");
 const stream_utils_js_1 = require("../utils/stream-utils.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
@@ -21,24 +23,47 @@ const usage_js_1 = require("./usage.js");
  * @hidden
  */
 class AIGNEContext {
-    constructor(...[parent, ...args]) {
-        if (parent instanceof AIGNEContext) {
-            this.parentId = parent.id;
+    constructor(parent, { reset } = {}) {
+        const tracer = parent?.observer?.tracer;
+        if (parent instanceof AIGNEContext && !reset) {
             this.internal = parent.internal;
+            this.parentId = parent.id;
+            this.rootId = parent.rootId;
+            if (parent.span) {
+                const parentContext = api_1.trace.setSpan(api_1.context.active(), parent.span);
+                this.span = tracer?.startSpan("childAIGNEContext", undefined, parentContext);
+            }
+            else {
+                if (!process.env.AIGNE_OBSERVABILITY_DISABLED) {
+                    throw new Error("parent span is not set");
+                }
+            }
         }
         else {
-            this.internal = new AIGNEContextShared(parent, ...args);
+            this.internal = new AIGNEContextShared(parent);
+            this.span = tracer?.startSpan("AIGNEContext");
+            // 修改了 rootId 是否会之前的有影响？，之前为 this.id
+            this.rootId = this.span?.spanContext?.().traceId ?? (0, uuid_1.v7)();
         }
+        this.id = this.span?.spanContext()?.spanId ?? (0, uuid_1.v7)();
     }
+    id;
     parentId;
-    id = (0, uuid_1.v7)();
+    rootId;
+    span;
     internal;
+    get messageQueue() {
+        return this.internal.messageQueue;
+    }
     get model() {
         return this.internal.model;
     }
     get skills() {
         return this.internal.skills;
     }
+    get observer() {
+        return this.internal.observer;
+    }
     get limits() {
         return this.internal.limits;
     }
@@ -61,9 +86,7 @@ class AIGNEContext {
         this.internal.memories = memories;
     }
     newContext({ reset } = {}) {
-        if (reset)
-            return new AIGNEContext(this, { userContext: {} });
-        return new AIGNEContext(this);
+        return new AIGNEContext(this, { reset });
     }
     invoke = ((agent, message, options) => {
         (0, type_utils_js_1.checkArguments)("AIGNEContext.invoke", aigneContextInvokeArgsSchema, {
@@ -85,7 +108,7 @@ class AIGNEContext {
                 activeAgent: agent,
             });
         }
-        const newContext = this.newContext();
+        const newContext = options?.newContext === false ? this : this.newContext();
         return Promise.resolve(newContext.internal.invoke(agent, message, newContext, options)).then(async (response) => {
             if (!options?.streaming) {
                 let { __activeAgent__: activeAgent, ...output } = await (0, stream_utils_js_1.agentResponseStreamToObject)(response);
@@ -162,8 +185,55 @@ class AIGNEContext {
             timestamp: Date.now(),
         };
         const newArgs = [b, ...args.slice(1)];
+        this.trace(eventName, args, b);
         return this.internal.events.emit(eventName, ...newArgs);
     }
+    async trace(eventName, args, b) {
+        const span = this.span;
+        if (!span)
+            return;
+        try {
+            switch (eventName) {
+                case "agentStarted": {
+                    const { agent, input } = args[0];
+                    span.updateName(agent.name);
+                    span.setAttribute("custom.trace_id", this.rootId);
+                    span.setAttribute("custom.span_id", this.id);
+                    if (this.parentId) {
+                        span.setAttribute("custom.parent_id", this.parentId);
+                    }
+                    span.setAttribute("custom.started_at", b.timestamp);
+                    span.setAttribute("input", JSON.stringify(input));
+                    span.setAttribute("agentTag", agent.tag ?? "UnknownAgent");
+                    break;
+                }
+                case "agentSucceed": {
+                    const { output } = args[0];
+                    try {
+                        span.setAttribute("output", JSON.stringify(output));
+                    }
+                    catch (_e) {
+                        logger_js_1.logger.error("parse output error", _e.message);
+                        span.setAttribute("output", JSON.stringify({}));
+                    }
+                    span.setStatus({ code: api_1.SpanStatusCode.OK, message: "Agent succeed" });
+                    span.end();
+                    await this.observer?.traceExporter?.forceFlush?.();
+                    break;
+                }
+                case "agentFailed": {
+                    const { error } = args[0];
+                    span.setStatus({ code: api_1.SpanStatusCode.ERROR, message: error.message });
+                    span.end();
+                    await this.observer?.traceExporter?.forceFlush?.();
+                    break;
+                }
+            }
+        }
+        catch (err) {
+            logger_js_1.logger.error("AIGNEContext.trace observer error", { eventName, error: err });
+        }
+    }
     on(eventName, listener) {
         this.internal.events.on(eventName, listener);
         return this;
@@ -180,11 +250,10 @@ class AIGNEContext {
 exports.AIGNEContext = AIGNEContext;
 class AIGNEContextShared {
     parent;
-    constructor(parent, overrides) {
+    span;
+    constructor(parent) {
         this.parent = parent;
         this.messageQueue = this.parent?.messageQueue ?? new message_queue_js_1.MessageQueue();
-        this.userContext = overrides?.userContext ?? {};
-        this.memories = overrides?.memories ?? [];
     }
     messageQueue;
     events = new strict_event_emitter_1.Emitter();
@@ -194,12 +263,15 @@ class AIGNEContextShared {
     get skills() {
         return this.parent?.skills;
     }
+    get observer() {
+        return this.parent?.observer;
+    }
     get limits() {
         return this.parent?.limits;
     }
     usage = (0, usage_js_1.newEmptyContextUsage)();
-    userContext;
-    memories;
+    userContext = {};
+    memories = [];
     abortController = new AbortController();
     timer;
     initTimeout() {

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;
+    command?: string | undefined;
+    args?: 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/memory/memory.d.ts

@@ -21,6 +21,7 @@ export interface MemoryAgentOptions extends Partial<Pick<MemoryAgent, "recorder"
  * instead provides memory management capabilities to the system.
  */
 export declare class MemoryAgent extends Agent {
+    tag: string;
     /**
      * Creates a new MemoryAgent instance.
      */

package/lib/cjs/memory/memory.js

@@ -16,6 +16,7 @@ exports.newMemoryId = newMemoryId;
  * instead provides memory management capabilities to the system.
  */
 class MemoryAgent extends agent_js_1.Agent {
+    tag = "MemoryAgent";
     /**
      * Creates a new MemoryAgent instance.
      */

package/lib/cjs/memory/recorder.d.ts

@@ -77,6 +77,7 @@ export declare const memoryRecorderOutputSchema: z.ZodObject<{
  * implementations of the process method to handle the actual storage logic.
  */
 export declare abstract class MemoryRecorder extends Agent<MemoryRecorderInput, MemoryRecorderOutput> {
+    tag: string;
     /**
      * Creates a new MemoryRecorder instance with predefined input and output schemas.
      *

package/lib/cjs/memory/recorder.js

@@ -34,6 +34,7 @@ exports.memoryRecorderOutputSchema = zod_1.z.object({
  * implementations of the process method to handle the actual storage logic.
  */
 class MemoryRecorder extends agent_js_1.Agent {
+    tag = "MemoryRecorderAgent";
     /**
      * Creates a new MemoryRecorder instance with predefined input and output schemas.
      *

package/lib/cjs/memory/retriever.d.ts

@@ -90,6 +90,7 @@ export declare const memoryRetrieverOutputSchema: z.ZodObject<{
  * implementations of the process method to handle the actual retrieval logic.
  */
 export declare abstract class MemoryRetriever extends Agent<MemoryRetrieverInput, MemoryRetrieverOutput> {
+    tag: string;
     /**
      * Creates a new MemoryRetriever instance with predefined input and output schemas.
      *

package/lib/cjs/memory/retriever.js

@@ -35,6 +35,7 @@ exports.memoryRetrieverOutputSchema = zod_1.z.object({
  * implementations of the process method to handle the actual retrieval logic.
  */
 class MemoryRetriever extends agent_js_1.Agent {
+    tag = "MemoryRetrieverAgent";
     /**
      * Creates a new MemoryRetriever instance with predefined input and output schemas.
      *

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

@@ -176,6 +176,7 @@ export declare abstract class Agent<I extends Message = Message, O extends Messa
      * List of memories this agent can use
      */
     readonly memories: MemoryAgent[];
+    tag?: string;
     /**
      * Maximum number of memory items to retrieve
      */
@@ -341,7 +342,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 +360,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 +372,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
      *
@@ -723,6 +724,7 @@ export interface FunctionAgentOptions<I extends Message = Message, O extends Mes
  * {@includeCode ../../test/agents/agent.test.ts#example-function-agent}
  */
 export declare class FunctionAgent<I extends Message = Message, O extends Message = Message> extends Agent<I, O> {
+    tag: string;
     /**
      * Create a function agent from a function or options
      *

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,8 @@ 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> {
+    tag: string;
     /**
      * Create an AIAgent with the specified options
      *
@@ -146,13 +145,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 +172,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 +234,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/agents/chat-model.d.ts

@@ -24,6 +24,7 @@ import { Agent, type AgentInvokeOptions, type AgentProcessResult, type Message }
  * {@includeCode ../../test/agents/chat-model.test.ts#example-chat-model-tools}
  */
 export declare abstract class ChatModel extends Agent<ChatModelInput, ChatModelOutput> {
+    tag: string;
     constructor();
     /**
      * Indicates whether the model supports parallel tool calls

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

@@ -57,6 +57,7 @@ export type SSEServerParameters = {
  * {@includeCode ../../test/agents/mcp-agent.test.ts#example-mcp-agent-from-sse}
  */
 export declare class MCPAgent extends Agent {
+    tag: string;
     /**
      * Create an MCPAgent from a connection to an SSE server.
      *
@@ -186,22 +187,26 @@ export interface MCPBaseOptions<I extends Message = Message, O extends Message =
     client: ClientWithReconnect;
 }
 export declare abstract class MCPBase<I extends Message, O extends Message> extends Agent<I, O> {
+    tag: string;
     constructor(options: MCPBaseOptions<I, O>);
     protected client: ClientWithReconnect;
 }
 export declare class MCPTool extends MCPBase<Message, CallToolResult> {
+    tag: string;
     process(input: Message): Promise<CallToolResult>;
 }
 export interface MCPPromptInput extends Record<string, unknown> {
     [key: string]: string;
 }
 export declare class MCPPrompt extends MCPBase<MCPPromptInput, GetPromptResult> {
+    tag: string;
     process(input: MCPPromptInput): Promise<GetPromptResult>;
 }
 export interface MCPResourceOptions extends MCPBaseOptions<MCPPromptInput, ReadResourceResult> {
     uri: string;
 }
 export declare class MCPResource extends MCPBase<MCPPromptInput, ReadResourceResult> {
+    tag: string;
     constructor(options: MCPResourceOptions);
     uri: string;
     process(input: MCPPromptInput): Promise<ReadResourceResult>;

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

@@ -52,6 +52,7 @@ export interface TeamAgentOptions<I extends Message, O extends Message> extends
  * {@includeCode ../../test/agents/team-agent.test.ts#example-team-agent-sequential}
  */
 export declare class TeamAgent<I extends Message, O extends Message> extends Agent<I, O> {
+    tag: string;
     /**
      * Create a TeamAgent from the provided options.
      *

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

@@ -7,6 +7,7 @@ export interface UserAgentOptions<I extends Message = Message, O extends Message
     activeAgent?: Agent;
 }
 export declare class UserAgent<I extends Message = Message, O extends Message = Message> extends Agent<I, O> {
+    tag: string;
     static from<I extends Message, O extends Message>(options: UserAgentOptions<I, O>): UserAgent<I, O>;
     constructor(options: UserAgentOptions<I, O>);
     context: Context;