@aigne/core 1.10.0 → 1.12.0

package/lib/esm/utils/event-stream.js

@@ -0,0 +1,85 @@
+import { createParser } from "eventsource-parser";
+import { produce } from "immer";
+import { tryOrThrow } from "./type-utils.js";
+export class EventStreamParser extends TransformStream {
+    constructor() {
+        let parser;
+        super({
+            start(controller) {
+                parser = createParser({
+                    onEvent: (event) => {
+                        const json = tryOrThrow(() => JSON.parse(event.data), (e) => {
+                            controller.enqueue(new Error(`Parse response chunk json error: ${e.message} ${event.data}`));
+                        });
+                        if (json) {
+                            if (event.event === "error") {
+                                controller.enqueue(new Error(json.message));
+                            }
+                            else {
+                                controller.enqueue(json);
+                            }
+                        }
+                    },
+                });
+            },
+            transform(chunk) {
+                parser?.feed(chunk);
+            },
+        });
+    }
+}
+export class AgentResponseStreamParser extends TransformStream {
+    json = {};
+    constructor() {
+        super({
+            transform: (chunk, controller) => {
+                if (chunk instanceof Error) {
+                    controller.error(chunk);
+                    controller.terminate();
+                    return;
+                }
+                this.json = produce(this.json, (draft) => {
+                    if (chunk.delta.json)
+                        Object.assign(draft, chunk.delta.json);
+                    if (chunk.delta.text) {
+                        for (const [key, text] of Object.entries(chunk.delta.text)) {
+                            const original = draft[key];
+                            const t = (original || "") + (text || "");
+                            if (t)
+                                Object.assign(draft, { [key]: t });
+                        }
+                    }
+                });
+                controller.enqueue({
+                    ...chunk,
+                    delta: {
+                        ...chunk.delta,
+                        json: this.json,
+                    },
+                });
+            },
+        });
+    }
+}
+export class AgentResponseStreamSSE extends ReadableStream {
+    constructor(stream) {
+        let reader;
+        super({
+            async pull(controller) {
+                reader ??= stream.getReader();
+                try {
+                    const { value, done } = await reader.read();
+                    if (done) {
+                        controller.close();
+                        return;
+                    }
+                    controller.enqueue(`data: ${JSON.stringify(value)}\n\n`);
+                }
+                catch (error) {
+                    controller.enqueue(`event: error\ndata: ${JSON.stringify({ message: error.message })}\n\n`);
+                    controller.close();
+                }
+            },
+        });
+    }
+}

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

@@ -3,12 +3,15 @@ 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";
+import { isEmpty } from "./type-utils.js";
 export function toolFromMCPTool(tool, options) {
     return new MCPTool({
         ...options,
         name: tool.name,
         description: tool.description,
-        inputSchema: jsonSchemaToZod(tool.inputSchema),
+        inputSchema: isEmpty(tool.inputSchema.properties)
+            ? z.object({})
+            : jsonSchemaToZod(tool.inputSchema),
         outputSchema: CallToolResultSchema,
     });
 }

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

@@ -1,4 +1,5 @@
-import type { AgentProcessAsyncGenerator, AgentResponseChunk, AgentResponseStream, Message } from "../agents/agent.js";
+import { type AgentProcessAsyncGenerator, type AgentResponseChunk, type AgentResponseStream, type Message } from "../agents/agent.js";
+import type { MESSAGE_KEY } from "../prompt/prompt-builder.js";
 import { type PromiseOrValue } from "./type-utils.js";
 export declare function objectToAgentResponseStream<T extends Message>(json: T): AgentResponseStream<T>;
 export declare function mergeAgentResponseChunk<T extends Message>(output: T, chunk: AgentResponseChunk<T>): T;
@@ -10,6 +11,12 @@ export declare function onAgentResponseStreamEnd<T extends Message>(stream: Agen
 }): ReadableStream<any>;
 export declare function isAsyncGenerator<T extends AsyncGenerator>(value: AsyncGenerator | unknown): value is T;
 export declare function arrayToAgentProcessAsyncGenerator<T extends Message>(chunks: (AgentResponseChunk<T> | Error)[], result?: Partial<T>): AgentProcessAsyncGenerator<T>;
-export declare function arrayToAgentResponseStream<T>(chunks: (AgentResponseChunk<T> | Error)[]): AgentResponseStream<T>;
-export declare function readableStreamToArray<T>(stream: ReadableStream<T>): Promise<T[]>;
+export declare function arrayToReadableStream<T>(chunks: (T | Error)[]): ReadableStream<T>;
+export declare function readableStreamToArray<T>(stream: ReadableStream<T>, options: {
+    catchError: true;
+}): Promise<(T | Error)[]>;
+export declare function readableStreamToArray<T>(stream: ReadableStream<T>, options?: {
+    catchError?: false;
+}): Promise<T[]>;
 export declare function readableStreamToAsyncIterator<T>(stream: ReadableStream<T>): AsyncIterable<T>;
+export declare function stringToAgentResponseStream(str: string, key?: "text" | typeof MESSAGE_KEY | string): AgentResponseStream<Message>;

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

@@ -1,8 +1,9 @@
 import equal from "fast-deep-equal";
+import { isEmptyChunk, } from "../agents/agent.js";
 import { omitBy } from "./type-utils.js";
 export function objectToAgentResponseStream(json) {
     return new ReadableStream({
-        start(controller) {
+        pull(controller) {
             controller.enqueue({ delta: { json } });
             controller.close();
         },
@@ -48,40 +49,40 @@ export async function agentResponseStreamToObject(stream) {
 }
 export function asyncGeneratorToReadableStream(generator) {
     return new ReadableStream({
-        async start(controller) {
+        async pull(controller) {
             try {
-                for (;;) {
-                    const chunk = await generator.next();
-                    if (chunk.value) {
-                        if (chunk.done) {
-                            controller.enqueue({ delta: { json: chunk.value } });
-                        }
-                        else {
-                            controller.enqueue(chunk.value);
-                        }
+                const chunk = await generator.next();
+                if (chunk.value) {
+                    if (chunk.done) {
+                        controller.enqueue({ delta: { json: chunk.value } });
                     }
-                    if (chunk.done)
-                        break;
+                    else {
+                        controller.enqueue(chunk.value);
+                    }
+                }
+                if (chunk.done) {
+                    controller.close();
                 }
             }
             catch (error) {
                 controller.error(error);
             }
-            finally {
-                controller.close();
-            }
         },
     });
 }
 export function onAgentResponseStreamEnd(stream, callback, options) {
+    const json = {};
+    const reader = stream.getReader();
     return new ReadableStream({
-        async start(controller) {
+        async pull(controller) {
             try {
-                const json = {};
-                for await (const value of readableStreamToAsyncIterator(stream)) {
+                const { value, done } = await reader.read();
+                if (!done) {
                     const chunk = options?.processChunk ? options.processChunk(value) : value;
-                    controller.enqueue(chunk);
+                    if (!isEmptyChunk(chunk))
+                        controller.enqueue(chunk);
                     mergeAgentResponseChunk(json, value);
+                    return;
                 }
                 const result = await callback(json);
                 if (result && !equal(result, json)) {
@@ -90,13 +91,11 @@ export function onAgentResponseStreamEnd(stream, callback, options) {
                         chunk = options.processChunk(chunk);
                     controller.enqueue(chunk);
                 }
+                controller.close();
             }
             catch (error) {
                 controller.error(options?.errorCallback?.(error) ?? error);
             }
-            finally {
-                controller.close();
-            }
         },
     });
 }
@@ -112,24 +111,34 @@ export async function* arrayToAgentProcessAsyncGenerator(chunks, result) {
     if (result !== undefined)
         return result;
 }
-export function arrayToAgentResponseStream(chunks) {
+export function arrayToReadableStream(chunks) {
+    const list = [...chunks];
     return new ReadableStream({
-        start(controller) {
-            for (const chunk of chunks) {
-                if (chunk instanceof Error) {
-                    controller.error(chunk);
-                    return;
-                }
-                controller.enqueue(chunk);
+        pull(controller) {
+            const item = list.shift();
+            if (!item) {
+                controller.close();
+                return;
             }
-            controller.close();
+            if (item instanceof Error) {
+                controller.error(item);
+                return;
+            }
+            controller.enqueue(item);
         },
     });
 }
-export async function readableStreamToArray(stream) {
+export async function readableStreamToArray(stream, options) {
     const result = [];
-    for await (const value of readableStreamToAsyncIterator(stream)) {
-        result.push(value);
+    try {
+        for await (const value of readableStreamToAsyncIterator(stream)) {
+            result.push(value);
+        }
+    }
+    catch (error) {
+        if (!options?.catchError)
+            throw error;
+        result.push(error);
     }
     return result;
 }
@@ -142,3 +151,8 @@ export async function* readableStreamToAsyncIterator(stream) {
         yield value;
     }
 }
+export function stringToAgentResponseStream(str, key = "text") {
+    const segmenter = new Intl.Segmenter(undefined, { granularity: "word" });
+    const segments = segmenter.segment(str);
+    return arrayToReadableStream(Array.from(segments).map((segment) => ({ delta: { text: { [key]: segment.segment } } })));
+}

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

@@ -1,8 +1,9 @@
 import { type ZodType } from "zod";
 export type PromiseOrValue<T> = T | Promise<T>;
-export type Nullish<T> = T | null | undefined;
+export type Nullish<T> = T | null | undefined | void;
 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 isRecord<T>(value: unknown): value is Record<string, T>;
 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[]];
@@ -12,5 +13,6 @@ 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): T;
+export declare function checkArguments<T>(prefix: string, schema: ZodType<T>, args: T | unknown): T;
 export declare function tryOrThrow<P extends PromiseOrValue<unknown>>(fn: () => P, error: string | Error | ((error: Error) => Error)): P;
+export declare function tryOrThrow<P extends PromiseOrValue<unknown>>(fn: () => P, error?: Nullish<string | Error | ((error: Error) => Nullish<Error>)>): P | undefined;

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

@@ -2,6 +2,9 @@ import { z } from "zod";
 export function isNil(value) {
     return value === null || value === undefined;
 }
+export function isRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
 export function isEmpty(obj) {
     if (isNil(obj))
         return true;
@@ -101,12 +104,16 @@ export function tryOrThrow(fn, error) {
         const result = fn();
         if (result instanceof Promise) {
             return result.catch((e) => {
-                throw createError(e);
+                const error = createError(e);
+                if (error)
+                    throw error;
             });
         }
         return result;
     }
     catch (e) {
-        throw createError(e);
+        const error = createError(e);
+        if (error)
+            throw error;
     }
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@aigne/core",
-  "version": "1.10.0",
+  "version": "1.12.0",
   "description": "AIGNE core library for building AI-powered applications",
   "publishConfig": {
     "access": "public"
   },
   "author": "Arcblock <blocklet@arcblock.io> https://github.com/blocklet",
   "homepage": "https://github.com/AIGNE-io/aigne-framework",
-  "license": "ISC",
+  "license": "Elastic-2.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/AIGNE-io/aigne-framework"
@@ -44,8 +44,8 @@
       "agents/*": [
         "./lib/dts/agents/*"
       ],
-      "execution-engine/*": [
-        "./lib/dts/execution-engine/*"
+      "aigne/*": [
+        "./lib/dts/aigne/*"
       ],
       "loader/*": [
         "./lib/dts/loader/*"
@@ -63,14 +63,20 @@
   },
   "dependencies": {
     "@aigne/json-schema-to-zod": "^1.3.3",
-    "@modelcontextprotocol/sdk": "^1.9.0",
+    "@modelcontextprotocol/sdk": "^1.10.2",
     "@types/debug": "^4.1.12",
+    "camelize-ts": "^3.0.0",
+    "content-type": "^1.0.5",
     "debug": "^4.4.0",
+    "eventsource-parser": "^3.0.1",
     "fast-deep-equal": "^3.1.3",
+    "immer": "^10.1.1",
     "inquirer": "^12.5.2",
     "mustache": "^4.2.0",
     "nanoid": "^5.1.5",
     "p-retry": "^6.2.1",
+    "raw-body": "^3.0.0",
+    "ufo": "^1.6.1",
     "uuid": "^11.1.0",
     "yaml": "^2.7.1",
     "zod": "^3.24.2",
@@ -85,11 +91,15 @@
     "@anthropic-ai/sdk": "^0.39.0",
     "@google/generative-ai": "^0.24.0",
     "@types/bun": "^1.2.9",
+    "@types/compression": "^1.7.5",
+    "@types/content-type": "^1.1.8",
     "@types/express": "^5.0.1",
     "@types/mustache": "^4.2.5",
     "@types/node": "^22.14.1",
+    "compression": "^1.8.0",
     "detect-port": "^2.1.0",
     "express": "^5.1.0",
+    "hono": "^4.7.7",
     "npm-run-all": "^4.1.5",
     "openai": "^4.94.0",
     "rimraf": "^6.0.1",

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

@@ -1,4 +0,0 @@
-export * from "./context.js";
-export * from "./execution-engine.js";
-export * from "./message-queue.js";
-export * from "./utils.js";

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

@@ -1,4 +0,0 @@
-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

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sequential = sequential;
-exports.parallel = parallel;
-const zod_1 = require("zod");
-const agent_js_1 = require("../agents/agent.js");
-const type_utils_js_1 = require("../utils/type-utils.js");
-function sequential(...agents) {
-    (0, type_utils_js_1.checkArguments)("sequential", agentArraySchema, agents);
-    let _agents = [...agents];
-    return async (input, 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) {
-    (0, type_utils_js_1.checkArguments)("parallel", agentArraySchema, agents);
-    let _agents = [...agents];
-    return async (input, 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);
-    };
-}
-const agentArraySchema = zod_1.z.array(zod_1.z.union([zod_1.z.function(), zod_1.z.instanceof(agent_js_1.Agent)]));

package/lib/dts/execution-engine/index.d.ts

@@ -1,4 +0,0 @@
-export * from "./context.js";
-export * from "./execution-engine.js";
-export * from "./message-queue.js";
-export * from "./utils.js";

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

@@ -1,4 +0,0 @@
-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/esm/execution-engine/index.d.ts

@@ -1,4 +0,0 @@
-export * from "./context.js";
-export * from "./execution-engine.js";
-export * from "./message-queue.js";
-export * from "./utils.js";

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

@@ -1,4 +0,0 @@
-export * from "./context.js";
-export * from "./execution-engine.js";
-export * from "./message-queue.js";
-export * from "./utils.js";

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

@@ -1,4 +0,0 @@
-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/esm/execution-engine/utils.js

@@ -1,30 +0,0 @@
-import { z } from "zod";
-import { Agent } from "../agents/agent.js";
-import { checkArguments } from "../utils/type-utils.js";
-export function sequential(...agents) {
-    checkArguments("sequential", agentArraySchema, agents);
-    let _agents = [...agents];
-    return async (input, 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;
-    };
-}
-export function parallel(...agents) {
-    checkArguments("parallel", agentArraySchema, agents);
-    let _agents = [...agents];
-    return async (input, 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);
-    };
-}
-const agentArraySchema = z.array(z.union([z.function(), z.instanceof(Agent)]));