@aigne/core 1.5.1-1 → 1.6.0

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

@@ -1,3 +1,4 @@
+import OpenAI from "openai";
 import { OpenAIChatModel } from "./openai-chat-model.js";
 const XAI_DEFAULT_CHAT_MODEL = "grok-2-latest";
 const XAI_BASE_URL = "https://api.x.ai/v1";
@@ -9,4 +10,14 @@ export class XAIChatModel extends OpenAIChatModel {
             baseURL: options?.baseURL || XAI_BASE_URL,
         });
     }
+    get client() {
+        const apiKey = this.options?.apiKey || process.env.XAI_API_KEY;
+        if (!apiKey)
+            throw new Error("Api Key is required for XAIChatModel");
+        this._client ??= new OpenAI({
+            baseURL: this.options?.baseURL,
+            apiKey,
+        });
+        return this._client;
+    }
 }

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

@@ -7,7 +7,7 @@ function setAdditionPropertiesDeep(schema, additionalProperties) {
     if (Array.isArray(schema)) {
         return schema.map((s) => setAdditionPropertiesDeep(s, additionalProperties));
     }
-    if (schema && typeof schema === "object" && !Array.isArray(schema)) {
+    if (schema !== null && typeof schema === "object" && !Array.isArray(schema)) {
         return Object.entries(schema).reduce((acc, [key, value]) => {
             acc[key] = setAdditionPropertiesDeep(value, additionalProperties);
             if (acc.type === "object") {

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

@@ -1,4 +1,5 @@
 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;
@@ -10,9 +11,10 @@ export declare const logger: debug.Debug & {
     debug: debug.Debug;
     default: debug.Debug;
 } & {
-    globalSpinner: import("@aigne/ora").Ora;
+    globalSpinner: Ora | undefined;
     base: DebugWithSpinner;
     debug: DebugWithSpinner;
     spinner: typeof spinner;
+    setSpinner: (spinner: Ora) => void;
 };
 export {};

package/lib/esm/utils/logger.js

@@ -1,12 +1,11 @@
-import ora from "@aigne/ora";
 import debug from "debug";
 debug.log = (...args) => {
-    const { isSpinning } = globalSpinner;
+    const { isSpinning } = globalSpinner ?? {};
     if (isSpinning)
-        globalSpinner.stop();
+        globalSpinner?.stop();
     console.log(...args);
     if (isSpinning)
-        globalSpinner.start();
+        globalSpinner?.start();
 };
 function createDebugger(namespace) {
     const i = debug(namespace);
@@ -26,12 +25,12 @@ function createDebugger(namespace) {
     overrideExtend(i);
     return i;
 }
-const globalSpinner = ora();
+let globalSpinner;
 const globalSpinnerTasks = [];
 async function spinner(promise, message, callback) {
     const task = { promise, message, callback };
     globalSpinnerTasks.push(task);
-    globalSpinner.start(message || " ");
+    globalSpinner?.start(message || " ");
     await promise
         .then((result) => {
         task.result = result;
@@ -48,18 +47,18 @@ async function spinner(promise, message, callback) {
             break;
         // Recover spinner state for last running task
         if (!task.status) {
-            globalSpinner.start(task.message || " ");
+            globalSpinner?.start(task.message || " ");
             break;
         }
         globalSpinnerTasks.pop();
         if (task.message) {
             if (task.status === "fail")
-                globalSpinner.fail(task.message);
+                globalSpinner?.fail(task.message);
             else
-                globalSpinner.succeed(task.message);
+                globalSpinner?.succeed(task.message);
         }
         else {
-            globalSpinner.stop();
+            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));
@@ -74,4 +73,8 @@ export const logger = Object.assign(debug, {
     base,
     debug: base.extend("core"),
     spinner,
+    setSpinner: (spinner) => {
+        globalSpinner = spinner;
+        logger.globalSpinner = spinner;
+    },
 });

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

@@ -1,6 +1,5 @@
-import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { type ListPromptsResult, type ListResourceTemplatesResult, type ListResourcesResult, type ListToolsResult } from "@modelcontextprotocol/sdk/types.js";
-import { MCPPrompt, MCPResource, MCPTool } from "../agents/mcp-agent.js";
-export declare function toolFromMCPTool(client: Client, tool: ListToolsResult["tools"][number]): MCPTool;
-export declare function promptFromMCPPrompt(client: Client, prompt: ListPromptsResult["prompts"][number]): MCPPrompt;
-export declare function resourceFromMCPResource(client: Client, resource: ListResourcesResult["resources"][number] | ListResourceTemplatesResult["resourceTemplates"][number]): MCPResource;
+import { type MCPBaseOptions, MCPPrompt, MCPResource, MCPTool } from "../agents/mcp-agent.js";
+export declare function toolFromMCPTool(tool: ListToolsResult["tools"][number], options: MCPBaseOptions): MCPTool;
+export declare function promptFromMCPPrompt(prompt: ListPromptsResult["prompts"][number], options: MCPBaseOptions): MCPPrompt;
+export declare function resourceFromMCPResource(resource: ListResourcesResult["resources"][number] | ListResourceTemplatesResult["resourceTemplates"][number], options: MCPBaseOptions): MCPResource;

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

@@ -3,18 +3,18 @@ import { UriTemplate } from "@modelcontextprotocol/sdk/shared/uriTemplate.js";
 import { CallToolResultSchema, GetPromptResultSchema, ReadResourceResultSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
 import { MCPPrompt, MCPResource, MCPTool } from "../agents/mcp-agent.js";
-export function toolFromMCPTool(client, tool) {
+export function toolFromMCPTool(tool, options) {
     return new MCPTool({
-        client,
+        ...options,
         name: tool.name,
         description: tool.description,
         inputSchema: jsonSchemaToZod(tool.inputSchema),
         outputSchema: CallToolResultSchema,
     });
 }
-export function promptFromMCPPrompt(client, prompt) {
+export function promptFromMCPPrompt(prompt, options) {
     return new MCPPrompt({
-        client,
+        ...options,
         name: prompt.name,
         description: prompt.description,
         inputSchema: jsonSchemaToZod({
@@ -26,7 +26,7 @@ export function promptFromMCPPrompt(client, prompt) {
         outputSchema: GetPromptResultSchema,
     });
 }
-export function resourceFromMCPResource(client, resource) {
+export function resourceFromMCPResource(resource, options) {
     const [uri, variables] = isResourceTemplate(resource)
         ? [
             resource.uriTemplate,
@@ -35,7 +35,7 @@ export function resourceFromMCPResource(client, resource) {
         ]
         : [resource.uri, []];
     return new MCPResource({
-        client,
+        ...options,
         name: resource.name,
         uri,
         description: resource.description,

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

@@ -1,6 +1,8 @@
 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)
@@ -13,7 +15,7 @@ export async function runChatLoopInTerminal(userAgent, { log = console.log.bind(
             if (isLoopExited)
                 return;
             if (options?.onResponse)
-                options.onResponse(output);
+                options.onResponse(output.message);
             else
                 log(output);
             prompt?.ui.close();

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

@@ -5,8 +5,10 @@ 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>;
 export declare function isNotEmpty<T>(arr: T[]): arr is [T, ...T[]];
+export declare function duplicates<T>(arr: T[], key?: (item: T) => unknown): T[];
 export declare function orArrayToArray<T>(value?: T | T[]): T[];
 export declare function createAccessorArray<T>(array: T[], accessor: (array: T[], name: string) => T | undefined): T[] & {
     [key: string]: T;
 };
 export declare function checkArguments<T>(prefix: string, schema: ZodType<T>, args: T): void;
+export declare function tryOrThrow<P extends PromiseOrValue<unknown>>(fn: () => P, error: string | Error | ((error: Error) => Error)): P;

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

@@ -8,7 +8,7 @@ export function isEmpty(obj) {
     if (typeof obj === "string" || Array.isArray(obj))
         return obj.length === 0;
     if (typeof obj === "object")
-        Object.keys(obj).length === 0;
+        return Object.keys(obj).length === 0;
     return false;
 }
 export function isNonNullable(value) {
@@ -17,6 +17,20 @@ export function isNonNullable(value) {
 export function isNotEmpty(arr) {
     return arr.length > 0;
 }
+export function duplicates(arr, key = (item) => item) {
+    const seen = new Set();
+    const duplicates = new Set();
+    for (const item of arr) {
+        const k = key(item);
+        if (seen.has(k)) {
+            duplicates.add(item);
+        }
+        else {
+            seen.add(k);
+        }
+    }
+    return Array.from(duplicates);
+}
 export function orArrayToArray(value) {
     if (isNil(value))
         return [];
@@ -69,3 +83,24 @@ export function checkArguments(prefix, schema, args) {
         throw error;
     }
 }
+export function tryOrThrow(fn, error) {
+    const createError = (e) => {
+        return typeof error === "function"
+            ? error(e)
+            : typeof error === "string"
+                ? new Error(error)
+                : error;
+    };
+    try {
+        const result = fn();
+        if (result instanceof Promise) {
+            return result.catch((e) => {
+                throw createError(e);
+            });
+        }
+        return result;
+    }
+    catch (e) {
+        throw createError(e);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.5.1-1",
+  "version": "1.6.0",
   "description": "AIGNE core library for building AI-powered applications",
   "publishConfig": {
     "access": "public"
@@ -60,13 +60,15 @@
   },
   "dependencies": {
     "@aigne/json-schema-to-zod": "^1.3.3",
-    "@aigne/ora": "^8.2.0",
     "@modelcontextprotocol/sdk": "^1.8.0",
     "@types/debug": "^4.1.12",
     "debug": "^4.4.0",
     "inquirer": "^12.5.0",
     "mustache": "^4.2.0",
     "nanoid": "^5.1.5",
+    "ora": "^8.2.0",
+    "p-retry": "^6.2.1",
+    "yaml": "^2.7.1",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.5"
   },
@@ -78,20 +80,24 @@
   "devDependencies": {
     "@anthropic-ai/sdk": "^0.39.0",
     "@google/generative-ai": "^0.24.0",
-    "@types/bun": "^1.2.6",
+    "@types/bun": "^1.2.8",
+    "@types/express": "^5.0.1",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^22.13.14",
+    "@types/node": "^22.14.0",
+    "detect-port": "^2.1.0",
+    "express": "^5.1.0",
     "npm-run-all": "^4.1.5",
-    "openai": "^4.89.1",
+    "openai": "^4.91.1",
     "rimraf": "^6.0.1",
-    "typescript": "^5.8.2"
+    "typescript": "^5.8.2",
+    "@aigne/test-utils": "^1.0.0"
   },
   "scripts": {
     "lint": "tsc --noEmit",
     "build": "tsc --build scripts/tsconfig.build.json",
-    "clean": "rimraf lib coverage",
-    "test": "bun test",
-    "test:coverage": "bun test --coverage --coverage-reporter=lcov --coverage-reporter=text",
+    "clean": "rimraf lib test/coverage",
+    "test": "bun --cwd test test",
+    "test:coverage": "bun --cwd test test --coverage --coverage-reporter=lcov --coverage-reporter=text",
     "postbuild": "echo '{\"type\": \"module\"}' > lib/esm/package.json && echo '{\"type\": \"commonjs\"}' > lib/cjs/package.json"
   }
 }