@aigne/core 1.6.0 → 1.7.0

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

@@ -1,134 +1,179 @@
 import EventEmitter from "node:events";
+import { v7 } from "uuid";
 import { z } from "zod";
 import { Agent } from "../agents/agent.js";
 import { isTransferAgentOutput, transferAgentOutputKey } from "../agents/types.js";
 import { UserAgent } from "../agents/user-agent.js";
 import { createMessage } from "../prompt/prompt-builder.js";
-import { checkArguments, isNil } from "../utils/type-utils.js";
+import { checkArguments, isNil, } from "../utils/type-utils.js";
 import { MessageQueue, } from "./message-queue.js";
-export class ExecutionContext extends EventEmitter {
-    engine;
-    constructor(engine) {
-        super();
-        this.engine = engine;
-        this.limits = engine?.limits;
-        this.messageQueue = engine?.messageQueue ?? new MessageQueue();
+import { newEmptyContextUsage } from "./usage.js";
+export function createPublishMessage(message, from) {
+    return {
+        role: !from || from instanceof UserAgent ? "user" : "agent",
+        source: from?.name,
+        message: createMessage(message),
+    };
+}
+export class ExecutionContext {
+    constructor(parent) {
+        if (parent instanceof ExecutionContext) {
+            this.parentId = parent.id;
+            this.internal = parent.internal;
+        }
+        else {
+            this.internal = new ExecutionContextInternal(parent);
+        }
     }
-    messageQueue;
+    parentId;
+    id = v7();
+    internal;
     get model() {
-        return this.engine?.model;
+        return this.internal.model;
     }
     get tools() {
-        return this.engine?.tools;
+        return this.internal.tools;
     }
-    usage = {
-        promptTokens: 0,
-        completionTokens: 0,
-        agentCalls: 0,
-    };
-    limits;
-    abortController = new AbortController();
-    timer;
-    initTimeout() {
-        if (this.timer)
-            return;
-        const timeout = this.limits?.timeout;
-        if (timeout) {
-            this.timer = setTimeout(() => {
-                this.abortController.abort();
-            }, timeout);
-        }
+    get limits() {
+        return this.internal.limits;
     }
     get status() {
-        return this.abortController.signal.aborted ? "timeout" : "normal";
+        return this.internal.status;
+    }
+    get usage() {
+        return this.internal.usage;
+    }
+    newContext({ reset } = {}) {
+        if (reset)
+            return new ExecutionContext(this.internal);
+        return new ExecutionContext(this);
     }
-    call(agent, message, options) {
-        checkArguments("ExecutionEngine._call", executionEngineCallArgsSchema, {
+    call = ((agent, message, options) => {
+        checkArguments("ExecutionContext.call", executionContextCallArgsSchema, {
             agent,
             message,
             options,
         });
         if (isNil(message)) {
-            let activeAgent = agent;
             return UserAgent.from({
                 context: this,
-                process: async (input, context) => {
-                    const [output, agent] = await context.call(activeAgent, input, {
-                        returnActiveAgent: true,
-                    });
-                    activeAgent = agent;
-                    return output;
-                },
+                activeAgent: agent,
             });
         }
-        return withAbortSignal(this.abortController.signal, new Error("ExecutionEngine is timeout"), async () => {
-            this.initTimeout();
-            const msg = createMessageFromInput(message);
-            return this.callAgent(agent, msg).then(async ({ output, agent: activeAgent }) => {
-                if (activeAgent instanceof Agent) {
-                    const publishTopics = typeof activeAgent.publishTopic === "function"
-                        ? await activeAgent.publishTopic(output)
-                        : activeAgent.publishTopic;
-                    if (publishTopics?.length) {
-                        this.publish(publishTopics, output, activeAgent);
-                    }
+        const newContext = this.newContext();
+        const msg = createMessage(message);
+        return newContext.internal
+            .call(agent, msg, newContext, options)
+            .then(async ({ output, agent: activeAgent }) => {
+            if (activeAgent instanceof Agent) {
+                const publishTopics = typeof activeAgent.publishTopic === "function"
+                    ? await activeAgent.publishTopic(output)
+                    : activeAgent.publishTopic;
+                if (publishTopics?.length) {
+                    newContext.publish(publishTopics, createPublishMessage(output, activeAgent));
                 }
-                if (options?.returnActiveAgent) {
-                    return [output, activeAgent];
-                }
-                return output;
-            });
-        });
-    }
-    publish(topic, message, from) {
-        checkArguments("ExecutionEngineContext.publish", executionEnginePublishArgsSchema, {
-            topic,
-            message,
-            from,
+            }
+            if (options?.returnActiveAgent) {
+                return [output, activeAgent];
+            }
+            return output;
         });
-        const request = {
-            role: !from || from instanceof UserAgent ? "user" : "agent",
-            source: from?.name,
-            message: createMessageFromInput(message),
-            context: this,
+    });
+    publish = ((topic, payload) => {
+        return this.internal.messageQueue.publish(topic, { ...payload, context: this });
+    });
+    subscribe = ((...args) => {
+        return this.internal.messageQueue.subscribe(...args);
+    });
+    unsubscribe = ((...args) => {
+        return this.internal.messageQueue.unsubscribe(...args);
+    });
+    emit(eventName, ...args) {
+        const b = {
+            ...args[0],
+            contextId: this.id,
+            parentContextId: this.parentId,
+            timestamp: Date.now(),
         };
-        this.messageQueue.publish(topic, request);
+        const newArgs = [b, ...args.slice(1)];
+        return this.internal.events.emit(eventName, ...newArgs);
     }
-    subscribe(topic, listener) {
-        return this.messageQueue.subscribe(topic, listener);
+    on(eventName, listener) {
+        this.internal.events.on(eventName, listener);
+        return this;
     }
-    unsubscribe(topic, listener) {
-        this.messageQueue.unsubscribe(topic, listener);
+    once(eventName, listener) {
+        this.internal.events.once(eventName, listener);
+        return this;
     }
-    emit(eventName, ...args) {
-        if (this.engine?.emit)
-            return this.engine.emit(eventName, ...args);
-        return super.emit(eventName, ...args);
+    off(eventName, listener) {
+        this.internal.events.off(eventName, listener);
+        return this;
+    }
+}
+class ExecutionContextInternal {
+    parent;
+    constructor(parent) {
+        this.parent = parent;
+        this.messageQueue = this.parent?.messageQueue ?? new MessageQueue();
+    }
+    messageQueue;
+    events = new EventEmitter();
+    get model() {
+        return this.parent?.model;
+    }
+    get tools() {
+        return this.parent?.tools;
     }
-    async callAgent(agent, input) {
+    get limits() {
+        return this.parent?.limits;
+    }
+    usage = newEmptyContextUsage();
+    abortController = new AbortController();
+    timer;
+    initTimeout() {
+        if (this.timer)
+            return;
+        const timeout = this.limits?.timeout;
+        if (timeout) {
+            this.timer = setTimeout(() => {
+                this.abortController.abort();
+            }, timeout);
+        }
+    }
+    get status() {
+        return this.abortController.signal.aborted ? "timeout" : "normal";
+    }
+    async call(agent, input, context, options) {
+        this.initTimeout();
+        return withAbortSignal(this.abortController.signal, new Error("ExecutionContext is timeout"), () => this.callAgent(agent, input, context, options));
+    }
+    async callAgent(agent, input, context, options) {
         let activeAgent = agent;
         let output;
         for (;;) {
             let result;
             if (typeof activeAgent === "function") {
-                result = await activeAgent(input, this);
+                result = await activeAgent(input, context);
             }
             else {
-                result = await activeAgent.call(input, this);
+                result = await activeAgent.call(input, context);
+            }
+            if (result instanceof Agent) {
+                activeAgent = result;
+                continue;
             }
-            if (!(result instanceof Agent))
-                output = result;
-            const transferToAgent = result instanceof Agent
-                ? result
-                : isTransferAgentOutput(result)
+            if (!options?.disableTransfer) {
+                const transferToAgent = isTransferAgentOutput(result)
                     ? result[transferAgentOutputKey].agent
                     : undefined;
-            if (transferToAgent) {
-                activeAgent = transferToAgent;
-            }
-            else {
-                break;
+                if (transferToAgent) {
+                    activeAgent = transferToAgent;
+                    continue;
+                }
             }
+            output = result;
+            break;
         }
         if (!output)
             throw new Error("Unexpected empty output");
@@ -149,15 +194,7 @@ function withAbortSignal(signal, error, fn) {
         });
     });
 }
-function createMessageFromInput(message) {
-    return typeof message === "string" ? createMessage(message) : message;
-}
-const executionEnginePublishArgsSchema = z.object({
-    topic: z.union([z.string(), z.array(z.string())]),
-    message: z.union([z.string(), z.record(z.unknown())]),
-    from: z.instanceof(Agent).optional(),
-});
-const executionEngineCallArgsSchema = z.object({
+const executionContextCallArgsSchema = z.object({
     agent: z.union([z.function(), z.instanceof(Agent)]),
     message: z.union([z.record(z.unknown()), z.string()]).optional(),
     options: z.object({ returnActiveAgent: z.boolean().optional() }).optional(),

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

@@ -1,9 +1,8 @@
-import EventEmitter from "node:events";
-import { Agent, type Message } from "../agents/agent.js";
-import type { UserAgent } from "../agents/user-agent.js";
+import { Agent } from "../agents/agent.js";
 import { ChatModel } from "../models/chat-model.js";
-import { type ContextLimits, ExecutionContext, type Runnable } from "./context.js";
-import { type MessagePayload, MessageQueue, type MessageQueueListener, type Unsubscribe } from "./message-queue.js";
+import { type Context, ExecutionContext } from "./context.js";
+import { MessageQueue } from "./message-queue.js";
+import type { ContextLimits } from "./usage.js";
 export interface ExecutionEngineOptions {
     name?: string;
     description?: string;
@@ -12,7 +11,10 @@ export interface ExecutionEngineOptions {
     agents?: Agent[];
     limits?: ContextLimits;
 }
-export declare class ExecutionEngine extends EventEmitter {
+export interface ExecutionEngineRunOptions {
+    returnActiveAgent?: boolean;
+}
+export declare class ExecutionEngine {
     static load({ path, ...options }: {
         path: string;
     } & ExecutionEngineOptions): Promise<ExecutionEngine>;
@@ -21,52 +23,19 @@ export declare class ExecutionEngine extends EventEmitter {
     description?: string;
     readonly messageQueue: MessageQueue;
     model?: ChatModel;
-    readonly tools: Agent<Message, Message>[] & {
-        [key: string]: Agent<Message, Message>;
+    readonly tools: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[] & {
+        [key: string]: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>;
     };
-    readonly agents: Agent<Message, Message>[] & {
-        [key: string]: Agent<Message, Message>;
+    readonly agents: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[] & {
+        [key: string]: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>;
     };
     limits?: ContextLimits;
     addAgent(...agents: Agent[]): void;
     newContext(): ExecutionContext;
-    /**
-     * Publish a message to a topic, the engine will call the listeners of the topic
-     * @param topic topic name, or an array of topic names
-     * @param message message to publish
-     * @param from the agent who publish the message, if not provided, it will be treated as a user message
-     */
-    publish(topic: string | string[], message: Message | string, from?: Agent): void;
-    /**
-     * Create a user agent to consistently call an agent
-     * @param agent Agent to call
-     * @returns User agent
-     */
-    call<I extends Message, O extends Message>(agent: Runnable<I, O>): UserAgent<I, O>;
-    /**
-     * Call an agent with a message
-     * @param agent Agent to call
-     * @param message Message to pass to the agent
-     * @returns the output of the agent
-     */
-    call<I extends Message, O extends Message>(agent: Runnable<I, O>, message: I | string): Promise<O>;
-    /**
-     * Call an agent with a message and return the output and the active agent
-     * @param agent Agent to call
-     * @param message Message to pass to the agent
-     * @param options.returnActiveAgent return the active agent
-     * @returns the output of the agent and the final active agent
-     */
-    call<I extends Message, O extends Message>(agent: Runnable<I, O>, message: I | string, options: {
-        returnActiveAgent: true;
-    }): Promise<[O, Runnable]>;
-    call<I extends Message, O extends Message>(agent: Runnable<I, O>, message?: I | string, options?: {
-        returnActiveAgent?: boolean;
-    }): UserAgent<I, O> | Promise<O | [O, Runnable]>;
-    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;
+    publish: Context["publish"];
+    call: Context["call"];
+    subscribe: Context["subscribe"];
+    unsubscribe: Context["unsubscribe"];
     shutdown(): Promise<void>;
     private initProcessExitHandler;
 }

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

@@ -1,12 +1,11 @@
-import EventEmitter from "node:events";
 import { z } from "zod";
 import { Agent } from "../agents/agent.js";
 import { load } from "../loader/index.js";
 import { ChatModel } from "../models/chat-model.js";
 import { checkArguments, createAccessorArray } from "../utils/type-utils.js";
 import { ExecutionContext } from "./context.js";
-import { MessageQueue, } from "./message-queue.js";
-export class ExecutionEngine extends EventEmitter {
+import { MessageQueue } from "./message-queue.js";
+export class ExecutionEngine {
     static async load({ path, ...options }) {
         const { model, agents, tools, ...aigne } = await load({ path });
         return new ExecutionEngine({
@@ -21,7 +20,6 @@ export class ExecutionEngine extends EventEmitter {
     constructor(options) {
         if (options)
             checkArguments("ExecutionEngine", executionEngineOptionsSchema, options);
-        super();
         this.name = options?.name;
         this.description = options?.description;
         this.model = options?.model;
@@ -49,32 +47,18 @@ export class ExecutionEngine extends EventEmitter {
     newContext() {
         return new ExecutionContext(this);
     }
-    /**
-     * Publish a message to a topic, the engine will call the listeners of the topic
-     * @param topic topic name, or an array of topic names
-     * @param message message to publish
-     * @param from the agent who publish the message, if not provided, it will be treated as a user message
-     */
-    publish(topic, message, from) {
-        return new ExecutionContext(this).publish(topic, message, from);
-    }
-    call(agent, message, options) {
-        return new ExecutionContext(this).call(agent, message, options);
-    }
-    subscribe(topic, listener) {
-        checkArguments("ExecutionEngine.subscribe", executionEngineSubscribeArgsSchema, {
-            topic,
-            listener,
-        });
-        return this.messageQueue.subscribe(topic, listener);
-    }
-    unsubscribe(topic, listener) {
-        checkArguments("ExecutionEngine.unsubscribe", executionEngineUnsubscribeArgsSchema, {
-            topic,
-            listener,
-        });
-        this.messageQueue.unsubscribe(topic, listener);
-    }
+    publish = ((...args) => {
+        return new ExecutionContext(this).publish(...args);
+    });
+    call = ((...args) => {
+        return new ExecutionContext(this).call(...args);
+    });
+    subscribe = ((...args) => {
+        return this.messageQueue.subscribe(...args);
+    });
+    unsubscribe = ((...args) => {
+        this.messageQueue.unsubscribe(...args);
+    });
     async shutdown() {
         for (const tool of this.tools) {
             await tool.shutdown();
@@ -95,11 +79,3 @@ const executionEngineOptionsSchema = z.object({
     agents: z.array(z.instanceof(Agent)).optional(),
 });
 const executionEngineAddAgentArgsSchema = z.array(z.instanceof(Agent));
-const executionEngineSubscribeArgsSchema = z.object({
-    topic: z.string(),
-    listener: z.function(z.tuple([z.any()]), z.any()).optional(),
-});
-const executionEngineUnsubscribeArgsSchema = z.object({
-    topic: z.string(),
-    listener: z.function(z.tuple([z.any()]), z.any()),
-});

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

@@ -1,3 +1,4 @@
+import { EventEmitter } from "node:events";
 import type { Message } from "../agents/agent.js";
 import type { Context } from "./context.js";
 export declare const UserInputTopic = "UserInputTopic";
@@ -9,11 +10,10 @@ export interface MessagePayload {
     context: Context;
 }
 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;
+    events: EventEmitter<[never]>;
+    publish(topic: string | string[], payload: MessagePayload): void;
     error(error: Error): void;
     subscribe(topic: string, listener?: undefined): Promise<MessagePayload>;
     subscribe(topic: string, listener: MessageQueueListener): Unsubscribe;

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

@@ -1,18 +1,27 @@
 import { EventEmitter } from "node:events";
-import { orArrayToArray } from "../utils/type-utils.js";
+import { z } from "zod";
+import { checkArguments, orArrayToArray } from "../utils/type-utils.js";
 export const UserInputTopic = "UserInputTopic";
 export const UserOutputTopic = "UserOutputTopic";
 export class MessageQueue {
     events = new EventEmitter();
-    publish(topic, message) {
+    publish(topic, payload) {
+        checkArguments("MessageQueue.publish", publishArgsSchema, {
+            topic,
+            payload,
+        });
         for (const t of orArrayToArray(topic)) {
-            this.events.emit(t, message);
+            this.events.emit(t, payload);
         }
     }
     error(error) {
         this.events.emit("error", error);
     }
     subscribe(topic, listener) {
+        checkArguments("MessageQueue.subscribe", subscribeArgsSchema, {
+            topic,
+            listener,
+        });
         if (!listener) {
             return new Promise((resolve, reject) => {
                 const unsubscribe1 = once(this.events, topic, (message) => {
@@ -28,6 +37,10 @@ export class MessageQueue {
         return on(this.events, topic, listener);
     }
     unsubscribe(topic, listener) {
+        checkArguments("MessageQueue.unsubscribe", unsubscribeArgsSchema, {
+            topic,
+            listener,
+        });
         this.events.off(topic, listener);
     }
 }
@@ -39,3 +52,20 @@ function once(events, event, listener) {
     events.once(event, listener);
     return () => events.off(event, listener);
 }
+const subscribeArgsSchema = z.object({
+    topic: z.string(),
+    listener: z.function(z.tuple([z.any()]), z.any()).optional(),
+});
+const unsubscribeArgsSchema = z.object({
+    topic: z.string(),
+    listener: z.function(z.tuple([z.any()]), z.any()),
+});
+const publishArgsSchema = z.object({
+    topic: z.union([z.string(), z.array(z.string())]),
+    payload: z.object({
+        role: z.union([z.literal("user"), z.literal("agent")]),
+        source: z.string().optional(),
+        message: z.union([z.string(), z.record(z.unknown())]),
+        context: z.any(),
+    }),
+});

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

@@ -0,0 +1,11 @@
+export interface ContextUsage {
+    inputTokens: number;
+    outputTokens: number;
+    agentCalls: number;
+}
+export declare function newEmptyContextUsage(): ContextUsage;
+export interface ContextLimits {
+    maxTokens?: number;
+    maxAgentCalls?: number;
+    timeout?: number;
+}

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

@@ -0,0 +1,7 @@
+export function newEmptyContextUsage() {
+    return {
+        inputTokens: 0,
+        outputTokens: 0,
+        agentCalls: 0,
+    };
+}

package/lib/esm/loader/index.js

@@ -1,4 +1,4 @@
-import { exists, readFile, stat } from "node:fs/promises";
+import { readFile, stat } from "node:fs/promises";
 import { dirname, extname, join } from "node:path";
 import { parse } from "yaml";
 import { z } from "zod";
@@ -115,7 +115,7 @@ async function getAIGNEFilePath(path) {
     if (s.isDirectory()) {
         for (const file of AIGNE_FILE_NAME) {
             const filePath = join(path, file);
-            if (await exists(filePath))
+            if ((await stat(filePath)).isFile())
                 return filePath;
         }
     }

package/lib/esm/models/chat-model.d.ts

@@ -75,6 +75,7 @@ export interface ChatModelOutput extends Message {
     json?: object;
     toolCalls?: ChatModelOutputToolCall[];
     usage?: ChatModelOutputUsage;
+    model?: string;
 }
 export interface ChatModelOutputToolCall {
     id: string;
@@ -85,6 +86,6 @@ export interface ChatModelOutputToolCall {
     };
 }
 export interface ChatModelOutputUsage {
-    promptTokens: number;
-    completionTokens: number;
+    inputTokens: number;
+    outputTokens: number;
 }

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

@@ -10,7 +10,7 @@ export class ChatModel extends Agent {
     preprocess(input, context) {
         super.preprocess(input, context);
         const { limits, usage } = context;
-        const usedTokens = usage.completionTokens + usage.promptTokens;
+        const usedTokens = usage.outputTokens + usage.inputTokens;
         if (limits?.maxTokens && usedTokens >= limits.maxTokens) {
             throw new Error(`Exceeded max tokens ${usedTokens}/${limits.maxTokens}`);
         }
@@ -19,8 +19,8 @@ export class ChatModel extends Agent {
         super.postprocess(input, output, context);
         const { usage } = output;
         if (usage) {
-            context.usage.completionTokens += usage.completionTokens;
-            context.usage.promptTokens += usage.promptTokens;
+            context.usage.outputTokens += usage.outputTokens;
+            context.usage.inputTokens += usage.inputTokens;
         }
     }
 }
@@ -98,12 +98,13 @@ const chatModelOutputToolCallSchema = z.object({
     }),
 });
 const chatModelOutputUsageSchema = z.object({
-    promptTokens: z.number(),
-    completionTokens: z.number(),
+    inputTokens: z.number(),
+    outputTokens: z.number(),
 });
 const chatModelOutputSchema = z.object({
     text: z.string().optional(),
     json: z.record(z.unknown()).optional(),
     toolCalls: z.array(chatModelOutputToolCallSchema).optional(),
     usage: chatModelOutputUsageSchema.optional(),
+    model: z.string().optional(),
 });