@aigne/core 1.10.0 → 1.11.0

package/lib/esm/loader/agent-js.js

@@ -1,5 +1,6 @@
 import { jsonSchemaToZod } from "@aigne/json-schema-to-zod";
 import { z } from "zod";
+import { customCamelize } from "../utils/camelize.js";
 import { tryOrThrow } from "../utils/type-utils.js";
 import { inputOutputSchema } from "./schema.js";
 const agentJsFileSchema = z.object({
@@ -21,11 +22,9 @@ export async function loadAgentFromJsFile(path) {
     if (typeof agent !== "function") {
         throw new Error(`Agent file ${path} must export a default function, but got ${typeof agent}`);
     }
-    return tryOrThrow(() => agentJsFileSchema.parse({
+    return tryOrThrow(() => customCamelize(agentJsFileSchema.parse({
+        ...agent,
         name: agent.agent_name || agent.name,
-        description: agent.description,
-        input_schema: agent.input_schema,
-        output_schema: agent.output_schema,
         fn: agent,
-    }), (error) => new Error(`Failed to parse agent from ${path}: ${error.message}`));
+    }), { shallowKeys: ["input_schema", "output_schema"] }), (error) => new Error(`Failed to parse agent from ${path}: ${error.message}`));
 }

package/lib/esm/loader/agent-yaml.d.ts

@@ -2,21 +2,24 @@ import { type ZodObject, type ZodType, z } from "zod";
 export declare function loadAgentFromYamlFile(path: string): Promise<{
     type: "ai";
     name: string;
-    description?: string | undefined;
     tools?: string[] | undefined;
+    description?: string | undefined;
     instructions?: string | undefined;
-    input_schema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+    memory?: true | {
+        subscribeTopic: string[];
+    } | undefined;
+    inputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {
         [x: string]: any;
     }> | undefined;
-    tool_choice?: "auto" | "none" | "required" | "router" | undefined;
-    output_schema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
+    toolChoice?: "auto" | "none" | "required" | "router" | undefined;
+    outputSchema?: ZodObject<Record<string, ZodType<any, z.ZodTypeDef, any>>, z.UnknownKeysParam, z.ZodTypeAny, {
         [x: string]: any;
     }, {
         [x: string]: any;
     }> | undefined;
-    output_key?: string | undefined;
+    outputKey?: string | undefined;
 } | {
     type: "mcp";
     url?: string | undefined;

package/lib/esm/loader/agent-yaml.js

@@ -2,6 +2,7 @@ import { readFile } from "node:fs/promises";
 import { jsonSchemaToZod } from "@aigne/json-schema-to-zod";
 import { parse } from "yaml";
 import { z } from "zod";
+import { customCamelize } from "../utils/camelize.js";
 import { tryOrThrow } from "../utils/type-utils.js";
 import { inputOutputSchema } from "./schema.js";
 const agentFileSchema = z.discriminatedUnion("type", [
@@ -34,6 +35,15 @@ const agentFileSchema = z.discriminatedUnion("type", [
             .union([z.literal("auto"), z.literal("none"), z.literal("required"), z.literal("router")])
             .nullish()
             .transform((v) => v ?? undefined),
+        memory: z
+            .union([
+            z.boolean(),
+            z.object({
+                subscribe_topic: z.array(z.string()),
+            }),
+        ])
+            .nullish()
+            .transform((v) => v || undefined),
     }),
     z.object({
         type: z.literal("mcp"),
@@ -54,6 +64,8 @@ const agentFileSchema = z.discriminatedUnion("type", [
 export async function loadAgentFromYamlFile(path) {
     const raw = await tryOrThrow(() => readFile(path, "utf8"), (error) => new Error(`Failed to load agent definition from ${path}: ${error.message}`));
     const json = await tryOrThrow(() => parse(raw), (error) => new Error(`Failed to parse agent definition from ${path}: ${error.message}`));
-    const agent = tryOrThrow(() => agentFileSchema.parse({ ...json, type: json.type ?? "ai" }), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
+    const agent = tryOrThrow(() => customCamelize(agentFileSchema.parse({ ...json, type: json.type ?? "ai" }), {
+        shallowKeys: ["input_schema", "output_schema"],
+    }), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
     return agent;
 }

package/lib/esm/loader/index.d.ts

@@ -8,8 +8,8 @@ export declare function load(options: LoadOptions): Promise<{
     model: ChatModel | undefined;
     agents: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
     tools: Agent<import("../agents/agent.js").Message, import("../agents/agent.js").Message>[];
-    description?: string | null | undefined;
     name?: string | null | undefined;
+    description?: string | null | undefined;
     chat_model?: {
         name?: string | null | undefined;
         temperature?: number | null | undefined;
@@ -63,9 +63,9 @@ declare const aigneFileSchema: z.ZodObject<{
     agents: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
     tools: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodString, "many">>>;
 }, "strip", z.ZodTypeAny, {
-    description?: string | null | undefined;
     tools?: string[] | null | undefined;
     name?: string | null | undefined;
+    description?: string | null | undefined;
     chat_model?: {
         name?: string | null | undefined;
         temperature?: number | null | undefined;
@@ -76,9 +76,9 @@ declare const aigneFileSchema: z.ZodObject<{
     } | null | undefined;
     agents?: string[] | null | undefined;
 }, {
-    description?: string | null | undefined;
     tools?: string[] | null | undefined;
     name?: string | null | undefined;
+    description?: string | null | undefined;
     chat_model?: string | {
         name?: string | null | undefined;
         temperature?: number | null | undefined;
@@ -90,9 +90,9 @@ declare const aigneFileSchema: z.ZodObject<{
     agents?: string[] | null | undefined;
 }>;
 export declare function loadAIGNEFile(path: string): Promise<{
-    description?: string | null | undefined;
     tools?: string[] | null | undefined;
     name?: string | null | undefined;
+    description?: string | null | undefined;
     chat_model?: {
         name?: string | null | undefined;
         temperature?: number | null | undefined;

package/lib/esm/loader/index.js

@@ -33,26 +33,15 @@ export async function load(options) {
 export async function loadAgent(path) {
     if (extname(path) === ".js") {
         const agent = await loadAgentFromJsFile(path);
-        return FunctionAgent.from({
-            name: agent.name,
-            description: agent.description,
-            inputSchema: agent.input_schema,
-            outputSchema: agent.output_schema,
-            fn: agent.fn,
-        });
+        return FunctionAgent.from(agent);
     }
     if (extname(path) === ".yaml" || extname(path) === ".yml") {
         const agent = await loadAgentFromYamlFile(path);
         if (agent.type === "ai") {
             return AIAgent.from({
-                name: agent.name,
-                description: agent.description,
-                instructions: agent.instructions,
-                inputSchema: agent.input_schema,
-                outputSchema: agent.output_schema,
-                outputKey: agent.output_key,
-                tools: await Promise.all((agent.tools ?? []).map((filename) => loadAgent(join(dirname(path), filename)))),
-                toolChoice: agent.tool_choice,
+                ...agent,
+                tools: agent.tools &&
+                    (await Promise.all(agent.tools.map((filename) => loadAgent(join(dirname(path), filename))))),
             });
         }
         if (agent.type === "mcp") {

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

@@ -1,5 +1,7 @@
 import Anthropic from "@anthropic-ai/sdk";
 import { z } from "zod";
+import type { AgentCallOptions, AgentResponse } from "../agents/agent.js";
+import type { Context } from "../execution-engine/context.js";
 import { ChatModel, type ChatModelInput, type ChatModelOptions, type ChatModelOutput } from "./chat-model.js";
 export interface ClaudeChatModelOptions {
     apiKey?: string;
@@ -60,7 +62,7 @@ export declare class ClaudeChatModel extends ChatModel {
     protected _client?: Anthropic;
     get client(): Anthropic;
     get modelOptions(): ChatModelOptions | undefined;
-    process(input: ChatModelInput): Promise<ChatModelOutput>;
+    process(input: ChatModelInput, _context: Context, options?: AgentCallOptions): Promise<AgentResponse<ChatModelOutput>>;
     private extractResultFromClaudeStream;
     private requestStructuredOutput;
 }

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

@@ -1,8 +1,8 @@
 import Anthropic from "@anthropic-ai/sdk";
 import { z } from "zod";
 import { parseJSON } from "../utils/json-schema.js";
-import { logger } from "../utils/logger.js";
 import { mergeUsage } from "../utils/model-utils.js";
+import { agentResponseStreamToObject } from "../utils/stream-utils.js";
 import { checkArguments, isEmpty, isNonNullable } from "../utils/type-utils.js";
 import { ChatModel, } from "./chat-model.js";
 const CHAT_MODEL_CLAUDE_DEFAULT_MODEL = "claude-3-7-sonnet-latest";
@@ -39,7 +39,7 @@ export class ClaudeChatModel extends ChatModel {
     get modelOptions() {
         return this.options?.modelOptions;
     }
-    async process(input) {
+    async process(input, _context, options) {
         const model = this.options?.model || CHAT_MODEL_CLAUDE_DEFAULT_MODEL;
         const disableParallelToolUse = input.modelOptions?.parallelToolCalls === false ||
             this.modelOptions?.parallelToolCalls === false;
@@ -56,6 +56,9 @@ export class ClaudeChatModel extends ChatModel {
             ...body,
             stream: true,
         });
+        if (options?.streaming && input.responseFormat?.type !== "json_schema") {
+            return this.extractResultFromClaudeStream(stream, true);
+        }
         const result = await this.extractResultFromClaudeStream(stream);
         // Claude doesn't support json_schema response and tool calls in the same request,
         // so we need to make a separate request for json_schema response when the tool calls is empty
@@ -69,67 +72,79 @@ export class ClaudeChatModel extends ChatModel {
         }
         return result;
     }
-    async extractResultFromClaudeStream(stream) {
+    async extractResultFromClaudeStream(stream, streaming) {
         const logs = [];
-        try {
-            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 = {
-                        inputTokens: input_tokens,
-                        outputTokens: output_tokens,
-                    };
-                }
-                if (chunk.type === "message_delta" && usage) {
-                    usage.outputTokens = chunk.usage.output_tokens;
-                }
-                logs.push(JSON.stringify(chunk));
-                // handle streaming text
-                if (chunk.type === "content_block_delta" && chunk.delta.type === "text_delta") {
-                    text += chunk.delta.text;
+        const result = new ReadableStream({
+            async start(controller) {
+                try {
+                    const toolCalls = [];
+                    let usage;
+                    let model;
+                    for await (const chunk of stream) {
+                        if (chunk.type === "message_start") {
+                            if (!model) {
+                                model = chunk.message.model;
+                                controller.enqueue({ delta: { json: { model } } });
+                            }
+                            const { input_tokens, output_tokens } = chunk.message.usage;
+                            usage = {
+                                inputTokens: input_tokens,
+                                outputTokens: output_tokens,
+                            };
+                        }
+                        if (chunk.type === "message_delta" && usage) {
+                            usage.outputTokens = chunk.usage.output_tokens;
+                        }
+                        logs.push(JSON.stringify(chunk));
+                        // handle streaming text
+                        if (chunk.type === "content_block_delta" && chunk.delta.type === "text_delta") {
+                            controller.enqueue({ delta: { text: { text: chunk.delta.text } } });
+                        }
+                        if (chunk.type === "content_block_start" && chunk.content_block.type === "tool_use") {
+                            toolCalls[chunk.index] = {
+                                type: "function",
+                                id: chunk.content_block.id,
+                                function: {
+                                    name: chunk.content_block.name,
+                                    arguments: {},
+                                },
+                                args: "",
+                            };
+                        }
+                        if (chunk.type === "content_block_delta" && chunk.delta.type === "input_json_delta") {
+                            const call = toolCalls[chunk.index];
+                            if (!call)
+                                throw new Error("Tool call not found");
+                            call.args += chunk.delta.partial_json;
+                        }
+                    }
+                    controller.enqueue({ delta: { json: { usage } } });
+                    if (toolCalls.length) {
+                        controller.enqueue({
+                            delta: {
+                                json: {
+                                    toolCalls: toolCalls
+                                        .map(({ args, ...c }) => ({
+                                        ...c,
+                                        function: {
+                                            ...c.function,
+                                            // NOTE: claude may return a blank string for empty object (the tool's input schema is a empty object)
+                                            arguments: args.trim() ? parseJSON(args) : {},
+                                        },
+                                    }))
+                                        .filter(isNonNullable),
+                                },
+                            },
+                        });
+                    }
+                    controller.close();
                 }
-                if (chunk.type === "content_block_start" && chunk.content_block.type === "tool_use") {
-                    toolCalls[chunk.index] = {
-                        type: "function",
-                        id: chunk.content_block.id,
-                        function: {
-                            name: chunk.content_block.name,
-                            arguments: {},
-                        },
-                        args: "",
-                    };
+                catch (error) {
+                    controller.error(error);
                 }
-                if (chunk.type === "content_block_delta" && chunk.delta.type === "input_json_delta") {
-                    const call = toolCalls[chunk.index];
-                    if (!call)
-                        throw new Error("Tool call not found");
-                    call.args += chunk.delta.partial_json;
-                }
-            }
-            const result = { usage, model, text };
-            if (toolCalls.length) {
-                result.toolCalls = toolCalls
-                    .map(({ args, ...c }) => ({
-                    ...c,
-                    function: {
-                        ...c.function,
-                        // NOTE: claude may return a blank string for empty object (the tool's input schema is a empty object)
-                        arguments: args.trim() ? parseJSON(args) : {},
-                    },
-                }))
-                    .filter(isNonNullable);
-            }
-            return result;
-        }
-        catch (error) {
-            logger.core("Failed to process Claude stream", { error, logs });
-            throw error;
-        }
+            },
+        });
+        return streaming ? result : await agentResponseStreamToObject(result);
     }
     async requestStructuredOutput(body, responseFormat) {
         if (responseFormat?.type !== "json_schema") {

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

@@ -323,13 +323,11 @@ async function extractResultFromStream(stream, jsonMode, streaming) {
                         },
                     });
                 }
+                controller.close();
             }
             catch (error) {
                 controller.error(error);
             }
-            finally {
-                controller.close();
-            }
         },
     });
     return streaming ? result : await agentResponseStreamToObject(result);

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

@@ -0,0 +1,13 @@
+export declare function customCamelize<T extends Record<string, unknown>, K extends KeyofUnion<T> = never>(obj: T, { shallowKeys }?: {
+    shallowKeys?: K[];
+}): CustomCamelize<T, K>;
+type KeyofUnion<U> = U extends Record<string, unknown> ? keyof U : never;
+type CamelCase<S extends string> = S extends `${infer P1}_${infer P2}${infer P3}` ? `${P1}${Uppercase<P2>}${CamelCase<P3>}` : S;
+declare const _unique: unique symbol;
+type _never = typeof _unique;
+type ExtractTypeFromUnion<T, U> = Extract<T, U> extends never ? _never : Extract<T, U> extends Array<infer E> ? Array<E> : U;
+type ExtractTypeWithConstFromUnion<T, U> = Exclude<T, Exclude<T, U>>;
+export type CustomCamelize<T, ShallowKeys extends KeyofUnion<T> | undefined = undefined> = ExtractTypeFromUnion<T, never> extends never ? never : ExtractTypeFromUnion<T, Date> extends Date ? ExtractTypeWithConstFromUnion<T, Date> | CustomCamelize<Exclude<T, Date>> : ExtractTypeFromUnion<T, RegExp> extends RegExp ? ExtractTypeWithConstFromUnion<T, RegExp> | CustomCamelize<Exclude<T, RegExp>> : ExtractTypeFromUnion<T, Array<unknown>> extends Array<infer U> ? Array<CustomCamelize<U>> | CustomCamelize<Exclude<T, Array<U>>> : ExtractTypeFromUnion<T, Function> extends Function ? ExtractTypeWithConstFromUnion<T, Function> | CustomCamelize<Exclude<T, Function>> : ExtractTypeFromUnion<T, object> extends object ? {
+    [K in keyof T as Uncapitalize<CamelCase<string & K>>]: K extends Exclude<ShallowKeys, undefined> ? T[K] : CustomCamelize<T[K]>;
+} : T;
+export {};

package/lib/esm/utils/camelize.js

@@ -0,0 +1,10 @@
+import camelize from "camelize-ts";
+export function customCamelize(obj, { shallowKeys = [] } = {}) {
+    const shallow = Object.fromEntries(shallowKeys?.filter((key) => key in obj).map((key) => [key, obj[key]]) ?? []);
+    const deep = Object.fromEntries(Object.entries(obj).filter(([key]) => !shallowKeys?.includes(key)));
+    return {
+        ...camelize(shallow, true),
+        ...camelize(deep),
+    };
+}
+const _unique = Symbol();

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;
@@ -13,3 +14,4 @@ export declare function arrayToAgentProcessAsyncGenerator<T extends Message>(chu
 export declare function arrayToAgentResponseStream<T>(chunks: (AgentResponseChunk<T> | Error)[]): AgentResponseStream<T>;
 export declare function readableStreamToArray<T>(stream: ReadableStream<T>): 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,4 +1,5 @@
 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({
@@ -63,13 +64,11 @@ export function asyncGeneratorToReadableStream(generator) {
                     if (chunk.done)
                         break;
                 }
+                controller.close();
             }
             catch (error) {
                 controller.error(error);
             }
-            finally {
-                controller.close();
-            }
         },
     });
 }
@@ -80,7 +79,8 @@ export function onAgentResponseStreamEnd(stream, callback, options) {
                 const json = {};
                 for await (const value of readableStreamToAsyncIterator(stream)) {
                     const chunk = options?.processChunk ? options.processChunk(value) : value;
-                    controller.enqueue(chunk);
+                    if (!isEmptyChunk(chunk))
+                        controller.enqueue(chunk);
                     mergeAgentResponseChunk(json, value);
                 }
                 const result = await callback(json);
@@ -142,3 +142,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 arrayToAgentResponseStream(Array.from(segments).map((segment) => ({ delta: { text: { [key]: segment.segment } } })));
+}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@aigne/core",
-  "version": "1.10.0",
+  "version": "1.11.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"
@@ -65,6 +65,7 @@
     "@aigne/json-schema-to-zod": "^1.3.3",
     "@modelcontextprotocol/sdk": "^1.9.0",
     "@types/debug": "^4.1.12",
+    "camelize-ts": "^3.0.0",
     "debug": "^4.4.0",
     "fast-deep-equal": "^3.1.3",
     "inquirer": "^12.5.2",