@aigne/core 1.6.0 → 1.7.0

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

@@ -75,16 +75,18 @@ export class ClaudeChatModel extends ChatModel {
             let text = "";
             const toolCalls = [];
             let usage;
+            let model;
             for await (const chunk of stream) {
                 if (chunk.type === "message_start") {
+                    model ??= chunk.message.model;
                     const { input_tokens, output_tokens } = chunk.message.usage;
                     usage = {
-                        promptTokens: input_tokens,
-                        completionTokens: output_tokens,
+                        inputTokens: input_tokens,
+                        outputTokens: output_tokens,
                     };
                 }
                 if (chunk.type === "message_delta" && usage) {
-                    usage.completionTokens = chunk.usage.output_tokens;
+                    usage.outputTokens = chunk.usage.output_tokens;
                 }
                 logs.push(JSON.stringify(chunk));
                 // handle streaming text
@@ -109,7 +111,7 @@ export class ClaudeChatModel extends ChatModel {
                     call.args += chunk.delta.partial_json;
                 }
             }
-            const result = { usage, text };
+            const result = { usage, model, text };
             if (toolCalls.length) {
                 result.toolCalls = toolCalls
                     .map(({ args, ...c }) => ({
@@ -125,7 +127,7 @@ export class ClaudeChatModel extends ChatModel {
             return result;
         }
         catch (error) {
-            logger.debug("Failed to process Claude stream", { error, logs });
+            logger.core("Failed to process Claude stream", { error, logs });
             throw error;
         }
     }
@@ -154,9 +156,10 @@ export class ClaudeChatModel extends ChatModel {
             throw new Error("Json tool not found");
         return {
             json: jsonTool.input,
+            model: result.model,
             usage: {
-                promptTokens: result.usage.input_tokens,
-                completionTokens: result.usage.output_tokens,
+                inputTokens: result.usage.input_tokens,
+                outputTokens: result.usage.output_tokens,
             },
         };
     }

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

@@ -72,8 +72,10 @@ export class OpenAIChatModel extends ChatModel {
         let text = "";
         const toolCalls = [];
         let usage;
+        let model;
         for await (const chunk of res) {
             const choice = chunk.choices?.[0];
+            model ??= chunk.model;
             if (choice?.delta.tool_calls?.length) {
                 for (const call of choice.delta.tool_calls) {
                     toolCalls[call.index] ??= {
@@ -95,13 +97,14 @@ export class OpenAIChatModel extends ChatModel {
                 text += choice.delta.content;
             if (chunk.usage) {
                 usage = {
-                    promptTokens: chunk.usage.prompt_tokens,
-                    completionTokens: chunk.usage.completion_tokens,
+                    inputTokens: chunk.usage.prompt_tokens,
+                    outputTokens: chunk.usage.completion_tokens,
                 };
             }
         }
         const result = {
             usage,
+            model,
         };
         if (input.responseFormat?.type === "json_schema" && text) {
             result.json = parseJSON(text);

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

@@ -7,7 +7,7 @@ import type { ChatModel, ChatModelInput } from "../models/chat-model.js";
 import { ChatMessagesTemplate } from "./template.js";
 export declare const MESSAGE_KEY = "$message";
 export declare const DEFAULT_MAX_HISTORY_MESSAGES = 10;
-export declare function createMessage(message: string | object): Message;
+export declare function createMessage<I extends Message>(message: string | I): I;
 export declare function getMessage(input: Message): string | undefined;
 export interface PromptBuilderOptions {
     instructions?: string | ChatMessagesTemplate;

package/lib/esm/prompt/prompt-builder.js

@@ -7,7 +7,9 @@ import { AgentMessageTemplate, ChatMessagesTemplate, SystemMessageTemplate, User
 export const MESSAGE_KEY = "$message";
 export const DEFAULT_MAX_HISTORY_MESSAGES = 10;
 export function createMessage(message) {
-    return { [MESSAGE_KEY]: message };
+    return typeof message === "string"
+        ? { [MESSAGE_KEY]: message }
+        : { ...message };
 }
 export function getMessage(input) {
     const userInputMessage = input[MESSAGE_KEY];

package/lib/esm/utils/json-schema.js

@@ -23,8 +23,8 @@ export function parseJSON(json) {
         return JSON.parse(json);
     }
     catch (error) {
-        logger.debug("Failed to parse JSON", { json, error });
-        throw new Error(`Failed to parse JSON ${error.message}`);
+        logger.core("Failed to parse JSON", { json, error });
+        throw error;
     }
 }
 /**

package/lib/esm/utils/logger.d.ts

@@ -1,20 +1,8 @@
-import debug, { type Debugger } from "debug";
-import type { Ora } from "ora";
-interface DebugWithSpinner extends Debugger {
-    spinner<T>(promise: Promise<T>, message?: string, callback?: (result: T) => void, options?: {
-        disabled?: boolean;
-    }): Promise<T>;
-    extend: (namespace: string) => DebugWithSpinner;
-}
-declare function spinner<T>(promise: Promise<T>, message?: string, callback?: (result: T) => void): Promise<T>;
+import debug from "debug";
 export declare const logger: debug.Debug & {
     debug: debug.Debug;
     default: debug.Debug;
 } & {
-    globalSpinner: Ora | undefined;
-    base: DebugWithSpinner;
-    debug: DebugWithSpinner;
-    spinner: typeof spinner;
-    setSpinner: (spinner: Ora) => void;
+    core: debug.Debugger;
+    mcp: debug.Debugger;
 };
-export {};

package/lib/esm/utils/logger.js

@@ -1,80 +1,6 @@
 import debug from "debug";
-debug.log = (...args) => {
-    const { isSpinning } = globalSpinner ?? {};
-    if (isSpinning)
-        globalSpinner?.stop();
-    console.log(...args);
-    if (isSpinning)
-        globalSpinner?.start();
-};
-function createDebugger(namespace) {
-    const i = debug(namespace);
-    function overrideExtend(debug) {
-        const originalExtend = debug.extend;
-        debug.extend = (namespace) => {
-            const extended = originalExtend.call(debug, namespace);
-            overrideExtend(extended);
-            extended.spinner = async (promise, message, callback, options) => {
-                if (!extended.enabled || options?.disabled)
-                    return promise;
-                return spinner(promise, message, callback);
-            };
-            return extended;
-        };
-    }
-    overrideExtend(i);
-    return i;
-}
-let globalSpinner;
-const globalSpinnerTasks = [];
-async function spinner(promise, message, callback) {
-    const task = { promise, message, callback };
-    globalSpinnerTasks.push(task);
-    globalSpinner?.start(message || " ");
-    await promise
-        .then((result) => {
-        task.result = result;
-        task.status = "succeed";
-    })
-        .catch(() => {
-        task.status = "fail";
-    });
-    // Once the promise resolves or rejects, it updates the spinner status and processes
-    // all completed tasks in a Last-In-First-Out (LIFO) order.
-    for (;;) {
-        const task = globalSpinnerTasks.at(-1);
-        if (!task)
-            break;
-        // Recover spinner state for last running task
-        if (!task.status) {
-            globalSpinner?.start(task.message || " ");
-            break;
-        }
-        globalSpinnerTasks.pop();
-        if (task.message) {
-            if (task.status === "fail")
-                globalSpinner?.fail(task.message);
-            else
-                globalSpinner?.succeed(task.message);
-        }
-        else {
-            globalSpinner?.stop();
-        }
-        // NOTE: This is a workaround to make sure the spinner stops spinning before the next tick
-        await new Promise((resolve) => setTimeout(resolve, 10));
-        if (task.status === "succeed")
-            task.callback?.(task.result);
-    }
-    return promise;
-}
-const base = createDebugger("aigne");
+const base = debug("aigne");
 export const logger = Object.assign(debug, {
-    globalSpinner,
-    base,
-    debug: base.extend("core"),
-    spinner,
-    setSpinner: (spinner) => {
-        globalSpinner = spinner;
-        logger.globalSpinner = spinner;
-    },
+    core: base.extend("core"),
+    mcp: base.extend("mcp"),
 });

package/lib/esm/utils/mcp-utils.js

@@ -28,11 +28,7 @@ export function promptFromMCPPrompt(prompt, options) {
 }
 export function resourceFromMCPResource(resource, options) {
     const [uri, variables] = isResourceTemplate(resource)
-        ? [
-            resource.uriTemplate,
-            // TODO: use template.variableNames when it's available https://github.com/modelcontextprotocol/typescript-sdk/pull/188
-            new UriTemplate(resource.uriTemplate).parts.flatMap((i) => (typeof i === "object" ? i.names : [])),
-        ]
+        ? [resource.uriTemplate, new UriTemplate(resource.uriTemplate).variableNames]
         : [resource.uri, []];
     return new MCPResource({
         ...options,

package/lib/esm/utils/model-utils.js

@@ -1,6 +1,6 @@
 export function mergeUsage(...usages) {
     return {
-        promptTokens: usages.reduce((acc, usage) => (usage ? acc + usage.promptTokens : acc), 0),
-        completionTokens: usages.reduce((acc, usage) => (usage ? acc + usage.completionTokens : acc), 0),
+        inputTokens: usages.reduce((acc, usage) => (usage ? acc + usage.inputTokens : acc), 0),
+        outputTokens: usages.reduce((acc, usage) => (usage ? acc + usage.outputTokens : acc), 0),
     };
 }

package/lib/esm/utils/type-utils.d.ts

@@ -1,6 +1,7 @@
 import { type ZodType } from "zod";
 export type PromiseOrValue<T> = T | Promise<T>;
 export type Nullish<T> = T | null | undefined;
+export type OmitPropertiesFromArrayFirstElement<T extends unknown[], K extends string | number | symbol> = T extends [infer U, ...infer Rest] ? [Omit<U, K>, ...Rest] : never;
 export declare function isNil(value: unknown): value is null | undefined;
 export declare function isEmpty(obj: unknown): boolean;
 export declare function isNonNullable<T>(value: T): value is NonNullable<T>;

package/lib/esm/utils/typed-event-emtter.d.ts

@@ -0,0 +1,10 @@
+type EventMap<T> = Record<keyof T, unknown[]>;
+export type Args<K, T> = K extends keyof T ? T[K] : never;
+export type Listener<K, T> = K extends keyof T ? T[K] extends unknown[] ? (...args: T[K]) => void : never : never;
+export interface TypedEventEmitter<T extends EventMap<T>, E extends EventMap<E> = T> {
+    emit<K extends keyof E>(eventName: K, ...args: Args<K, E>): boolean;
+    on<K extends keyof T>(eventName: K, listener: Listener<K, T>): this;
+    once<K extends keyof T>(eventName: K, listener: Listener<K, T>): this;
+    off<K extends keyof T>(eventName: K, listener: Listener<K, T>): this;
+}
+export {};

package/lib/esm/utils/typed-event-emtter.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "AIGNE core library for building AI-powered applications",
   "publishConfig": {
     "access": "public"
@@ -60,14 +60,14 @@
   },
   "dependencies": {
     "@aigne/json-schema-to-zod": "^1.3.3",
-    "@modelcontextprotocol/sdk": "^1.8.0",
+    "@modelcontextprotocol/sdk": "^1.9.0",
     "@types/debug": "^4.1.12",
     "debug": "^4.4.0",
-    "inquirer": "^12.5.0",
+    "inquirer": "^12.5.2",
     "mustache": "^4.2.0",
     "nanoid": "^5.1.5",
-    "ora": "^8.2.0",
     "p-retry": "^6.2.1",
+    "uuid": "^11.1.0",
     "yaml": "^2.7.1",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5"
@@ -80,17 +80,16 @@
   "devDependencies": {
     "@anthropic-ai/sdk": "^0.39.0",
     "@google/generative-ai": "^0.24.0",
-    "@types/bun": "^1.2.8",
+    "@types/bun": "^1.2.9",
     "@types/express": "^5.0.1",
     "@types/mustache": "^4.2.5",
     "@types/node": "^22.14.0",
     "detect-port": "^2.1.0",
     "express": "^5.1.0",
     "npm-run-all": "^4.1.5",
-    "openai": "^4.91.1",
+    "openai": "^4.93.0",
     "rimraf": "^6.0.1",
-    "typescript": "^5.8.2",
-    "@aigne/test-utils": "^1.0.0"
+    "typescript": "^5.8.3"
   },
   "scripts": {
     "lint": "tsc --noEmit",

package/lib/cjs/utils/run-chat-loop.d.ts

@@ -1,11 +0,0 @@
-import type { Message } from "../agents/agent.js";
-import type { UserAgent } from "../agents/user-agent.js";
-export interface ChatLoopOptions {
-    log?: typeof console.log;
-    initialCall?: Message | string;
-    welcome?: string;
-    defaultQuestion?: string;
-    onResponse?: (response: Message) => void;
-    inputKey?: string;
-}
-export declare function runChatLoopInTerminal(userAgent: UserAgent, { log, ...options }?: ChatLoopOptions): Promise<void>;

package/lib/cjs/utils/run-chat-loop.js

@@ -1,82 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runChatLoopInTerminal = runChatLoopInTerminal;
-const inquirer_1 = __importDefault(require("inquirer"));
-const ora_1 = __importDefault(require("ora"));
-const logger_js_1 = require("./logger.js");
-async function runChatLoopInTerminal(userAgent, { log = console.log.bind(console), ...options } = {}) {
-    logger_js_1.logger.setSpinner((0, ora_1.default)());
-    let isLoopExited = false;
-    let prompt;
-    if (options?.welcome)
-        log(options.welcome);
-    if (options?.initialCall) {
-        await callAgent(userAgent, options.initialCall, { ...options, log });
-    }
-    (async () => {
-        for await (const output of userAgent.stream) {
-            if (isLoopExited)
-                return;
-            if (options?.onResponse)
-                options.onResponse(output.message);
-            else
-                log(output);
-            prompt?.ui.close();
-        }
-    })();
-    for (let i = 0;; i++) {
-        prompt = inquirer_1.default.prompt([
-            {
-                type: "input",
-                name: "question",
-                message: "💬",
-                default: i === 0 ? options?.defaultQuestion : undefined,
-            },
-        ]);
-        let question;
-        try {
-            question = (await prompt).question;
-        }
-        catch {
-            // ignore abort error from inquirer
-        }
-        if (!question?.trim())
-            continue;
-        const cmd = COMMANDS[question.trim()];
-        if (cmd) {
-            const result = cmd();
-            if (result.message)
-                log(result.message);
-            if (result?.exit)
-                break;
-            continue;
-        }
-        await callAgent(userAgent, question, { ...options, log });
-    }
-    isLoopExited = true;
-}
-async function callAgent(agent, input, options) {
-    try {
-        const response = await logger_js_1.logger.spinner(agent.call(options.inputKey && typeof input === "string" ? { [options.inputKey]: input } : input), "🤖");
-        if (options?.onResponse)
-            options.onResponse(response);
-        else
-            options.log(response);
-    }
-    catch (error) {
-        options.log(`ERROR: ${error.message}`);
-    }
-}
-const COMMANDS = {
-    "/exit": () => ({ exit: true }),
-    "/help": () => ({
-        message: `\
-Commands:
-  /exit - exit the chat loop
-  /help - show this help message
-`,
-    }),
-};

package/lib/dts/utils/run-chat-loop.d.ts

@@ -1,11 +0,0 @@
-import type { Message } from "../agents/agent.js";
-import type { UserAgent } from "../agents/user-agent.js";
-export interface ChatLoopOptions {
-    log?: typeof console.log;
-    initialCall?: Message | string;
-    welcome?: string;
-    defaultQuestion?: string;
-    onResponse?: (response: Message) => void;
-    inputKey?: string;
-}
-export declare function runChatLoopInTerminal(userAgent: UserAgent, { log, ...options }?: ChatLoopOptions): Promise<void>;

package/lib/esm/utils/run-chat-loop.d.ts

@@ -1,11 +0,0 @@
-import type { Message } from "../agents/agent.js";
-import type { UserAgent } from "../agents/user-agent.js";
-export interface ChatLoopOptions {
-    log?: typeof console.log;
-    initialCall?: Message | string;
-    welcome?: string;
-    defaultQuestion?: string;
-    onResponse?: (response: Message) => void;
-    inputKey?: string;
-}
-export declare function runChatLoopInTerminal(userAgent: UserAgent, { log, ...options }?: ChatLoopOptions): Promise<void>;

package/lib/esm/utils/run-chat-loop.js

@@ -1,76 +0,0 @@
-import inquirer from "inquirer";
-import ora from "ora";
-import { logger } from "./logger.js";
-export async function runChatLoopInTerminal(userAgent, { log = console.log.bind(console), ...options } = {}) {
-    logger.setSpinner(ora());
-    let isLoopExited = false;
-    let prompt;
-    if (options?.welcome)
-        log(options.welcome);
-    if (options?.initialCall) {
-        await callAgent(userAgent, options.initialCall, { ...options, log });
-    }
-    (async () => {
-        for await (const output of userAgent.stream) {
-            if (isLoopExited)
-                return;
-            if (options?.onResponse)
-                options.onResponse(output.message);
-            else
-                log(output);
-            prompt?.ui.close();
-        }
-    })();
-    for (let i = 0;; i++) {
-        prompt = inquirer.prompt([
-            {
-                type: "input",
-                name: "question",
-                message: "💬",
-                default: i === 0 ? options?.defaultQuestion : undefined,
-            },
-        ]);
-        let question;
-        try {
-            question = (await prompt).question;
-        }
-        catch {
-            // ignore abort error from inquirer
-        }
-        if (!question?.trim())
-            continue;
-        const cmd = COMMANDS[question.trim()];
-        if (cmd) {
-            const result = cmd();
-            if (result.message)
-                log(result.message);
-            if (result?.exit)
-                break;
-            continue;
-        }
-        await callAgent(userAgent, question, { ...options, log });
-    }
-    isLoopExited = true;
-}
-async function callAgent(agent, input, options) {
-    try {
-        const response = await logger.spinner(agent.call(options.inputKey && typeof input === "string" ? { [options.inputKey]: input } : input), "🤖");
-        if (options?.onResponse)
-            options.onResponse(response);
-        else
-            options.log(response);
-    }
-    catch (error) {
-        options.log(`ERROR: ${error.message}`);
-    }
-}
-const COMMANDS = {
-    "/exit": () => ({ exit: true }),
-    "/help": () => ({
-        message: `\
-Commands:
-  /exit - exit the chat loop
-  /help - show this help message
-`,
-    }),
-};