@aigne/core 1.1.0-beta.6 → 1.3.0

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

@@ -1,196 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserAgent = exports.ExecutionEngine = void 0;
-const node_events_1 = __importDefault(require("node:events"));
-const nanoid_1 = require("nanoid");
-const agent_1 = require("../agents/agent");
-const types_1 = require("../agents/types");
-const prompt_builder_1 = require("../prompt/prompt-builder");
-const type_utils_1 = require("../utils/type-utils");
-const message_queue_1 = require("./message-queue");
-class ExecutionEngine extends node_events_1.default {
-    constructor(options) {
-        super();
-        this.model = options?.model;
-        this.tools = options?.tools ?? [];
-        if (options?.agents?.length)
-            this.addAgent(...options.agents);
-        this.initProcessExitHandler();
-    }
-    messageQueue = new message_queue_1.MessageQueue();
-    model;
-    tools;
-    agents = [];
-    agentListeners = new Map();
-    addAgent(...agents) {
-        for (const agent of agents) {
-            this.agents.push(agent);
-            this.attachAgentSubscriptions(agent);
-        }
-    }
-    attachAgentSubscriptions(agent) {
-        for (const topic of (0, type_utils_1.orArrayToArray)(agent.subscribeTopic)) {
-            const listener = async (input) => {
-                try {
-                    const { output } = await this.callAgent(input, agent);
-                    const topics = typeof agent.publishTopic === "function"
-                        ? await agent.publishTopic(output)
-                        : agent.publishTopic;
-                    for (const topic of (0, type_utils_1.orArrayToArray)(topics)) {
-                        this.publish(topic, output);
-                    }
-                }
-                catch (error) {
-                    this.emit("error", error);
-                }
-            };
-            this.subscribe(topic, listener);
-            const listeners = this.agentListeners.get(agent) || [];
-            listeners.push({ topic, listener });
-            this.agentListeners.set(agent, listeners);
-        }
-    }
-    publish(topic, message) {
-        this.messageQueue.emit(topic, message);
-    }
-    subscribe(topic, listener) {
-        this.messageQueue.on(topic, listener);
-    }
-    unsubscribe(topic, listener) {
-        this.messageQueue.off(topic, listener);
-    }
-    async run(_input, _options, ..._agents) {
-        if (_input instanceof agent_1.Agent)
-            return this.runChatLoop(_input);
-        const [options, agents] = this.splitOptionsAndAgents(_options, ..._agents);
-        const input = typeof _input === "string" ? (0, prompt_builder_1.userInput)(_input) : _input;
-        if (agents.length === 0)
-            return this.publishUserInputTopic(input);
-        if (options?.concurrency)
-            return this.runParallel(input, ...agents);
-        return this.runSequential(input, ...agents);
-    }
-    splitOptionsAndAgents(options, ...agents) {
-        if (options instanceof agent_1.Agent) {
-            return [{}, [options, ...agents]];
-        }
-        return [options, agents];
-    }
-    async runSequential(input, ...agents) {
-        const output = {};
-        for (const agent of agents.flat()) {
-            const { output: o } = await this.callAgent({ ...input, ...output }, agent);
-            Object.assign(output, o);
-        }
-        return output;
-    }
-    async runParallel(input, ...agents) {
-        const outputs = await Promise.all(agents.map((agent) => this.callAgent(input, agent).then((res) => res.output)));
-        return Object.assign({}, ...outputs);
-    }
-    async publishUserInputTopic(input) {
-        this.publish(message_queue_1.UserInputTopic, input);
-        // TODO: 处理超时、错误、无限循环、饿死等情况
-        const result = await new Promise((resolve) => {
-            this.messageQueue.on(message_queue_1.UserOutputTopic, (result) => resolve(result));
-        });
-        return result;
-    }
-    async runChatLoop(agent) {
-        const inputStream = new TransformStream({});
-        const inputWriter = inputStream.writable.getWriter();
-        const userAgent = new UserAgent({
-            async run(input) {
-                const wait = Promise.withResolvers();
-                inputWriter.write({ ...wait, input });
-                return wait.promise;
-            },
-        });
-        // Run the loop in a separate async function, so that we can return the userAgent
-        (async () => {
-            let activeAgent = agent;
-            const reader = inputStream.readable.getReader();
-            for (;;) {
-                const { value, done } = await reader.read();
-                if (done)
-                    break;
-                const { input, resolve } = value;
-                const { agent, output } = await this.callAgent(input, activeAgent);
-                if (agent)
-                    activeAgent = agent;
-                resolve(output);
-            }
-        })();
-        return userAgent;
-    }
-    async callAgent(input, agent) {
-        let activeAgent = agent;
-        let output;
-        for (;;) {
-            output = await activeAgent.call(input, this);
-            if ((0, types_1.isTransferAgentOutput)(output)) {
-                // TODO: 不要修改原始对象，可能被外部丢弃
-                const transferToolCallId = (0, nanoid_1.nanoid)();
-                Object.assign(input, (0, prompt_builder_1.addMessagesToInput)(input, [
-                    {
-                        role: "agent",
-                        name: agent.name,
-                        toolCalls: [
-                            {
-                                id: transferToolCallId,
-                                type: "function",
-                                function: {
-                                    name: "transfer_to_agent",
-                                    arguments: {
-                                        to: output[types_1.transferAgentOutputKey].agent.name,
-                                    },
-                                },
-                            },
-                        ],
-                    },
-                    {
-                        role: "tool",
-                        toolCallId: transferToolCallId,
-                        content: `Transferred to ${output[types_1.transferAgentOutputKey].agent.name}. Adopt persona immediately.`,
-                    },
-                ]));
-                activeAgent = output[types_1.transferAgentOutputKey].agent;
-            }
-            else {
-                break;
-            }
-        }
-        return {
-            agent: activeAgent,
-            output,
-        };
-    }
-    async shutdown() {
-        for (const tool of this.tools) {
-            await tool.shutdown();
-        }
-        for (const agent of this.agents) {
-            await agent.shutdown();
-        }
-    }
-    initProcessExitHandler() {
-        const shutdownAndExit = () => this.shutdown().finally(() => process.exit(0));
-        process.on("SIGINT", shutdownAndExit);
-        process.on("exit", shutdownAndExit);
-    }
-}
-exports.ExecutionEngine = ExecutionEngine;
-class UserAgent extends agent_1.Agent {
-    options;
-    constructor(options) {
-        super({ ...options, disableLogging: true });
-        this.options = options;
-    }
-    process(input) {
-        return this.options.run(input);
-    }
-}
-exports.UserAgent = UserAgent;
+__exportStar(require("./context.js"), exports);
+__exportStar(require("./execution-engine.js"), exports);
+__exportStar(require("./message-queue.js"), exports);
+__exportStar(require("./utils.js"), exports);

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

@@ -1,5 +1,20 @@
-import { EventEmitter } from "node:events";
+import type { Message } from "../agents/agent.js";
 export declare const UserInputTopic = "UserInputTopic";
 export declare const UserOutputTopic = "UserOutputTopic";
-export declare class MessageQueue extends EventEmitter {
+export interface MessagePayload {
+    role: "user" | "agent";
+    source?: string;
+    message: Message;
+}
+export type MessageQueueListener = (message: MessagePayload) => void;
+export type MessageRequest = MessagePayload;
+export type Unsubscribe = () => void;
+export declare class MessageQueue {
+    private events;
+    publish(topic: string | string[], message: MessageRequest): void;
+    error(error: Error): void;
+    subscribe(topic: string, listener?: undefined): Promise<MessagePayload>;
+    subscribe(topic: string, listener: MessageQueueListener): Unsubscribe;
+    subscribe(topic: string, listener?: MessageQueueListener): Unsubscribe | Promise<MessagePayload>;
+    unsubscribe(topic: string, listener: MessageQueueListener): void;
 }

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

@@ -2,8 +2,44 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageQueue = exports.UserOutputTopic = exports.UserInputTopic = void 0;
 const node_events_1 = require("node:events");
+const type_utils_js_1 = require("../utils/type-utils.js");
 exports.UserInputTopic = "UserInputTopic";
 exports.UserOutputTopic = "UserOutputTopic";
-class MessageQueue extends node_events_1.EventEmitter {
+class MessageQueue {
+    events = new node_events_1.EventEmitter();
+    publish(topic, message) {
+        for (const t of (0, type_utils_js_1.orArrayToArray)(topic)) {
+            this.events.emit(t, message);
+        }
+    }
+    error(error) {
+        this.events.emit("error", error);
+    }
+    subscribe(topic, listener) {
+        if (!listener) {
+            return new Promise((resolve, reject) => {
+                const unsubscribe1 = once(this.events, topic, (message) => {
+                    unsubscribe2();
+                    resolve(message);
+                });
+                const unsubscribe2 = once(this.events, "error", (error) => {
+                    unsubscribe1();
+                    reject(error);
+                });
+            });
+        }
+        return on(this.events, topic, listener);
+    }
+    unsubscribe(topic, listener) {
+        this.events.off(topic, listener);
+    }
 }
 exports.MessageQueue = MessageQueue;
+function on(events, event, listener) {
+    events.on(event, listener);
+    return () => events.off(event, listener);
+}
+function once(events, event, listener) {
+    events.once(event, listener);
+    return () => events.off(event, listener);
+}

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

@@ -0,0 +1,4 @@
+import type { FunctionAgentFn } from "../agents/agent.js";
+import type { Runnable } from "./context.js";
+export declare function sequential(..._agents: [Runnable, ...Runnable[]]): FunctionAgentFn;
+export declare function parallel(..._agents: [Runnable, ...Runnable[]]): FunctionAgentFn;

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

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sequential = sequential;
+exports.parallel = parallel;
+function sequential(..._agents) {
+    let agents = [..._agents];
+    return async (input, context) => {
+        if (!context)
+            throw new Error("Context is required for executing sequential agents. Please provide a valid context.");
+        const output = {};
+        // Clone the agents to run, so that we can update the agents list during the loop
+        const agentsToRun = [...agents];
+        agents = [];
+        for (const agent of agentsToRun) {
+            const [o, transferToAgent] = await context.call(agent, { ...input, ...output }, { returnActiveAgent: true });
+            Object.assign(output, o);
+            agents.push(transferToAgent);
+        }
+        return output;
+    };
+}
+function parallel(..._agents) {
+    let agents = [..._agents];
+    return async (input, context) => {
+        if (!context)
+            throw new Error("Context is required for executing parallel agents. Please provide a valid context.");
+        const result = await Promise.all(agents.map((agent) => context.call(agent, input, { returnActiveAgent: true })));
+        agents = result.map((i) => i[1]);
+        const outputs = result.map((i) => i[0]);
+        return Object.assign({}, ...outputs);
+    };
+}

package/lib/cjs/index.d.ts

@@ -1,12 +1,14 @@
-export * from "./agents/agent";
-export * from "./agents/ai-agent";
-export * from "./agents/mcp-agent";
-export * from "./execution-engine";
-export * from "./execution-engine/context";
-export * from "./execution-engine/message-queue";
-export * from "./models/chat";
-export * from "./models/chat-openai";
-export * from "./prompt/prompt-builder";
-export * from "./prompt/template";
-export * from "./utils/logger";
-export * from "./utils/run-chat-loop";
+export * from "./agents/agent.js";
+export * from "./agents/ai-agent.js";
+export * from "./agents/mcp-agent.js";
+export * from "./agents/memory.js";
+export * from "./agents/types.js";
+export * from "./agents/user-agent.js";
+export * from "./execution-engine/index.js";
+export * from "./models/chat-model.js";
+export * from "./models/claude-chat-model.js";
+export * from "./models/openai-chat-model.js";
+export * from "./prompt/prompt-builder.js";
+export * from "./prompt/template.js";
+export * from "./utils/logger.js";
+export * from "./utils/run-chat-loop.js";

package/lib/cjs/index.js

@@ -14,15 +14,17 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./agents/agent"), exports);
-__exportStar(require("./agents/ai-agent"), exports);
-__exportStar(require("./agents/mcp-agent"), exports);
-__exportStar(require("./execution-engine"), exports);
-__exportStar(require("./execution-engine/context"), exports);
-__exportStar(require("./execution-engine/message-queue"), exports);
-__exportStar(require("./models/chat"), exports);
-__exportStar(require("./models/chat-openai"), exports);
-__exportStar(require("./prompt/prompt-builder"), exports);
-__exportStar(require("./prompt/template"), exports);
-__exportStar(require("./utils/logger"), exports);
-__exportStar(require("./utils/run-chat-loop"), exports);
+__exportStar(require("./agents/agent.js"), exports);
+__exportStar(require("./agents/ai-agent.js"), exports);
+__exportStar(require("./agents/mcp-agent.js"), exports);
+__exportStar(require("./agents/memory.js"), exports);
+__exportStar(require("./agents/types.js"), exports);
+__exportStar(require("./agents/user-agent.js"), exports);
+__exportStar(require("./execution-engine/index.js"), exports);
+__exportStar(require("./models/chat-model.js"), exports);
+__exportStar(require("./models/claude-chat-model.js"), exports);
+__exportStar(require("./models/openai-chat-model.js"), exports);
+__exportStar(require("./prompt/prompt-builder.js"), exports);
+__exportStar(require("./prompt/template.js"), exports);
+__exportStar(require("./utils/logger.js"), exports);
+__exportStar(require("./utils/run-chat-loop.js"), exports);

package/lib/{dts/models/chat.d.ts → cjs/models/chat-model.d.ts}

@@ -1,8 +1,8 @@
-import { Agent, type AgentInput, type AgentOutput } from "../agents/agent";
+import { Agent, type Message } from "../agents/agent.js";
 export declare abstract class ChatModel extends Agent<ChatModelInput, ChatModelOutput> {
     constructor();
 }
-export interface ChatModelInput extends AgentInput {
+export interface ChatModelInput extends Message {
     messages: ChatModelInputMessage[];
     responseFormat?: ChatModelInputResponseFormat;
     tools?: ChatModelInputTool[];
@@ -12,24 +12,27 @@ export interface ChatModelInput extends AgentInput {
 export type Role = "system" | "user" | "agent" | "tool";
 export interface ChatModelInputMessage {
     role: Role;
-    content?: string | ({
-        type: "text";
-        text: string;
-    } | {
-        type: "image_url";
-        url: string;
-    })[];
+    content?: ChatModelInputMessageContent;
     toolCalls?: {
         id: string;
         type: "function";
         function: {
             name: string;
-            arguments: AgentInput;
+            arguments: Message;
         };
     }[];
     toolCallId?: string;
     name?: string;
 }
+export type ChatModelInputMessageContent = string | (TextContent | ImageUrlContent)[];
+export type TextContent = {
+    type: "text";
+    text: string;
+};
+export type ImageUrlContent = {
+    type: "image_url";
+    url: string;
+};
 export type ChatModelInputResponseFormat = {
     type: "text";
 } | {
@@ -63,7 +66,7 @@ export interface ChatModelOptions {
     frequencyPenalty?: number;
     presencePenalty?: number;
 }
-export interface ChatModelOutput extends AgentOutput {
+export interface ChatModelOutput extends Message {
     text?: string;
     json?: object;
     toolCalls?: ChatModelOutputToolCall[];
@@ -73,6 +76,6 @@ export interface ChatModelOutputToolCall {
     type: "function";
     function: {
         name: string;
-        arguments: AgentInput;
+        arguments: Message;
     };
 }

package/lib/cjs/models/{chat.js → chat-model.js}

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChatModel = void 0;
 const zod_1 = require("zod");
-const agent_1 = require("../agents/agent");
-class ChatModel extends agent_1.Agent {
+const agent_js_1 = require("../agents/agent.js");
+class ChatModel extends agent_js_1.Agent {
     constructor() {
         super({
             inputSchema: chatModelInputSchema,
@@ -36,8 +36,8 @@ const chatModelInputMessageSchema = zod_1.z.object({
     toolCallId: zod_1.z.string().optional(),
     name: zod_1.z.string().optional(),
 });
-const chatModelInputResponseFormatSchema = zod_1.z.union([
-    zod_1.z.literal("text"),
+const chatModelInputResponseFormatSchema = zod_1.z.discriminatedUnion("type", [
+    zod_1.z.object({ type: zod_1.z.literal("text") }),
     zod_1.z.object({
         type: zod_1.z.literal("json_schema"),
         jsonSchema: zod_1.z.object({
@@ -86,6 +86,6 @@ const chatModelOutputToolCallSchema = zod_1.z.object({
 });
 const chatModelOutputSchema = zod_1.z.object({
     text: zod_1.z.string().optional(),
-    json: zod_1.z.unknown().optional(),
+    json: zod_1.z.record(zod_1.z.unknown()).optional(),
     toolCalls: zod_1.z.array(chatModelOutputToolCallSchema).optional(),
 });

package/lib/cjs/models/claude-chat-model.d.ts

@@ -0,0 +1,17 @@
+import Anthropic from "@anthropic-ai/sdk";
+import { ChatModel, type ChatModelInput, type ChatModelOutput } from "./chat-model.js";
+export declare class ClaudeChatModel extends ChatModel {
+    config?: {
+        apiKey?: string;
+        model?: string;
+    } | undefined;
+    constructor(config?: {
+        apiKey?: string;
+        model?: string;
+    } | undefined);
+    private _client?;
+    get client(): Anthropic;
+    process(input: ChatModelInput): Promise<ChatModelOutput>;
+    private extractResultFromClaudeStream;
+    private requestStructuredOutput;
+}