@aigne/core 1.72.0-beta.7 → 1.72.0-beta.9

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

@@ -1,17 +1,16 @@
-import { AFSHistory } from "@aigne/afs-history";
 import { nodejs } from "@aigne/platform-helpers/nodejs/index.js";
+import { v7 } from "@aigne/uuid";
 import { stringify } from "yaml";
 import { ZodObject } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import { Agent } from "../agents/agent.js";
 import { DEFAULT_OUTPUT_FILE_KEY, DEFAULT_OUTPUT_KEY } from "../agents/ai-agent.js";
-import { roleSchema, } from "../agents/chat-model.js";
 import { fileUnionContentsSchema } from "../agents/model.js";
 import { optionalize } from "../loader/schema.js";
 import { outputSchemaToResponseFormatSchema } from "../utils/json-schema.js";
-import { checkArguments, flat, isNonNullable, isRecord, partition, unique, } from "../utils/type-utils.js";
+import { checkArguments, flat, isRecord, partition, unique } from "../utils/type-utils.js";
+import { AgentSession } from "./agent-session.js";
 import { createPromptBuilderContext } from "./context/index.js";
-import { AFS_EXECUTABLE_TOOLS_PROMPT_TEMPLATE } from "./prompts/afs-builtin-prompt.js";
 import { MEMORY_MESSAGE_TEMPLATE } from "./prompts/memory-message-template.js";
 import { STRUCTURED_STREAM_INSTRUCTIONS } from "./prompts/structured-stream-instructions.js";
 import { getAFSSkills } from "./skills/afs/index.js";
@@ -71,13 +70,28 @@ export class PromptBuilder {
         });
     }
     async build(options) {
+        let { userId, sessionId } = options.context?.userContext || {};
+        const agentId = options.agent?.name;
+        const afs = options.agent?.afs;
+        sessionId ||= v7();
+        const session = new AgentSession({
+            agentId,
+            userId,
+            sessionId,
+            afs,
+            compact: options.agent?.compact,
+        });
+        const { systemMessage, userMessage } = await this.buildMessages(options);
+        if (systemMessage)
+            await session.setSystemMessages(systemMessage);
         return {
-            messages: await this.buildMessages(options),
+            userMessage,
             responseFormat: options.agent?.structuredStreamMode
                 ? undefined
                 : this.buildResponseFormat(options),
             outputFileType: options.agent?.outputFileType,
             ...(await this.buildTools(options)),
+            session,
         };
     }
     async buildPrompt(options) {
@@ -98,47 +112,43 @@ export class PromptBuilder {
     }
     async buildMessages(options) {
         const { input } = options;
-        const agentId = options.agent?.name;
-        const userId = options.context?.userContext.userId;
-        const sessionId = options.context?.userContext.sessionId;
         const inputKey = options.agent?.inputKey;
         const message = inputKey && typeof input?.[inputKey] === "string" ? input[inputKey] : undefined;
-        const [messages, otherCustomMessages] = partition((await (typeof this.instructions === "string"
+        const template = typeof this.instructions === "string"
             ? ChatMessagesTemplate.from([SystemMessageTemplate.from(this.instructions)])
-            : this.instructions)?.format(this.getTemplateVariables(options), { workingDir: this.workingDir })) ?? [], (i) => i.role === "system");
+            : this.instructions;
+        const [systemMessages, userMessages] = partition((await template?.format(this.getTemplateVariables(options), {
+            workingDir: this.workingDir,
+        })) ?? [], (i) => i.role === "system");
         const inputFileKey = options.agent?.inputFileKey;
         const files = flat(inputFileKey
             ? checkArguments("Check input files", optionalize(fileUnionContentsSchema), input?.[inputFileKey])
             : null);
-        const historyConfig = options.agent?.historyConfig;
-        const injectHistory = historyConfig?.inject === true || (historyConfig?.inject !== false && historyConfig?.enabled);
-        if (injectHistory) {
-            if (historyConfig.useOldMemory) {
-                messages.push(...(await this.deprecatedMemories(message, options)));
-            }
-            else {
-                const history = await this.getHistories({ ...options, agentId, userId, sessionId });
-                messages.push(...history);
-            }
+        if (options.agent?.memories.length || options.context?.memories.length) {
+            const deprecatedMemories = await this.deprecatedMemories(message, options);
+            if (deprecatedMemories.length)
+                systemMessages.push(...deprecatedMemories);
         }
         // if the agent is using structured stream mode, add the instructions
         const { structuredStreamMode, outputSchema } = options.agent || {};
         if (structuredStreamMode && outputSchema) {
             const instructions = options.agent?.customStructuredStreamInstructions?.instructions ||
                 PromptBuilder.from(STRUCTURED_STREAM_INSTRUCTIONS.instructions);
-            messages.push(...(await instructions.buildMessages({
-                input: {
-                    ...input,
-                    outputJsonSchema: zodToJsonSchema(outputSchema),
-                },
-            })));
+            systemMessages.push({
+                role: "system",
+                content: (await instructions.buildPrompt({
+                    input: {
+                        ...input,
+                        outputJsonSchema: zodToJsonSchema(outputSchema),
+                    },
+                })).prompt,
+            });
         }
-        messages.push(...otherCustomMessages);
         if (message || files.length) {
             const content = [];
             if (message &&
                 // avoid duplicate user messages: developer may have already included the message in the messages
-                !otherCustomMessages.some((i) => i.role === "user" &&
+                !userMessages.some((i) => i.role === "user" &&
                     (typeof i.content === "string"
                         ? i.content.includes(message)
                         : i.content?.some((c) => c.type === "text" && c.text.includes(message))))) {
@@ -147,10 +157,38 @@ export class PromptBuilder {
             if (files.length)
                 content.push(...files);
             if (content.length) {
-                messages.push({ role: "user", content });
+                userMessages.push({ role: "user", content });
             }
         }
-        return this.refineMessages(options, messages);
+        let systemMessage = this.mergeMessages(systemMessages, "system");
+        if (!systemMessage.content?.length)
+            systemMessage = undefined;
+        let userMessage = this.mergeMessages(userMessages, "user");
+        if (!userMessage.content?.length) {
+            userMessage = { role: "user", content: systemMessage?.content };
+            systemMessage = undefined;
+        }
+        if (!userMessage.content?.length)
+            throw new Error("User message cannot be empty.");
+        return {
+            systemMessage,
+            userMessage,
+        };
+    }
+    mergeMessages(messages, role) {
+        const content = [];
+        for (const message of messages) {
+            if (typeof message.content === "string") {
+                content.push({ type: "text", text: message.content });
+            }
+            else if (Array.isArray(message.content)) {
+                content.push(...message.content);
+            }
+            else if (message.content) {
+                throw new Error(`Unsupported message content type: ${typeof message.content}`);
+            }
+        }
+        return { role, content };
     }
     async deprecatedMemories(message, options) {
         const messages = [];
@@ -161,104 +199,10 @@ export class PromptBuilder {
         if (options.agent?.useMemoriesFromContext && options.context?.memories?.length) {
             memories.push(...options.context.memories);
         }
-        const afs = options.agent?.afs;
-        if (afs && options.agent?.historyConfig?.enabled) {
-            const historyModule = (await afs.listModules()).find((m) => m.module instanceof AFSHistory);
-            if (historyModule) {
-                const history = await afs.list(historyModule.path, {
-                    limit: options.agent?.maxRetrieveMemoryCount || 10,
-                    orderBy: [["createdAt", "desc"]],
-                });
-                memories.push(...history.data
-                    .reverse()
-                    .filter((i) => isNonNullable(i.content)));
-                if (message) {
-                    const result = (await afs.search("/", message)).data;
-                    const ms = result
-                        .map((entry) => {
-                        if (entry.metadata?.execute)
-                            return null;
-                        const content = entry.content || entry.summary;
-                        if (!content)
-                            return null;
-                        return {
-                            content,
-                            description: entry.description,
-                        };
-                    })
-                        .filter(isNonNullable);
-                    memories.push(...ms);
-                    const executable = result.filter((i) => !!i.metadata?.execute);
-                    if (executable.length) {
-                        messages.push({
-                            role: "system",
-                            content: await PromptTemplate.from(AFS_EXECUTABLE_TOOLS_PROMPT_TEMPLATE).format({
-                                tools: executable.map((entry) => ({
-                                    path: entry.path,
-                                    name: entry.metadata.execute.name,
-                                    description: entry.metadata.execute.description,
-                                    inputSchema: entry.metadata.execute.inputSchema,
-                                    outputSchema: entry.metadata.execute.outputSchema,
-                                })),
-                            }),
-                        });
-                    }
-                }
-            }
-        }
         if (memories.length)
             messages.push(...(await this.convertMemoriesToMessages(memories, options)));
         return messages;
     }
-    async getHistories({ agentId, userId, sessionId, ...options }) {
-        const { agent } = options;
-        const afs = agent?.afs;
-        if (!afs)
-            return [];
-        const historyModule = (await afs.listModules()).find((m) => m.module instanceof AFSHistory);
-        if (!historyModule)
-            return [];
-        const history = (await afs.list(historyModule.path, {
-            filter: { agentId, userId, sessionId },
-            limit: agent.historyConfig?.maxItems || 10,
-            orderBy: [["createdAt", "desc"]],
-        })).data.reverse();
-        return (await Promise.all(history.map(async (i) => {
-            if (Array.isArray(i.content?.messages) &&
-                i.content.messages.every((m) => roleSchema.parse(m?.role))) {
-                return i.content.messages;
-            }
-            const { input, output } = i.content || {};
-            if (input && output) {
-                return await this.convertMemoriesToMessages([{ content: { input, output } }], options);
-            }
-            return [];
-        }))).flat();
-    }
-    refineMessages(options, messages) {
-        const { autoReorderSystemMessages, autoMergeSystemMessages } = options.agent ?? {};
-        if (!autoReorderSystemMessages && !autoMergeSystemMessages)
-            return messages;
-        const [systemMessages, otherMessages] = partition(messages, (m) => m.role === "system");
-        if (!autoMergeSystemMessages) {
-            return systemMessages.concat(otherMessages);
-        }
-        const result = [];
-        if (systemMessages.length) {
-            result.push({
-                role: "system",
-                content: systemMessages
-                    .map((i) => typeof i.content === "string"
-                    ? i.content
-                    : i.content
-                        ?.map((c) => (c.type === "text" ? c.text : null))
-                        .filter(isNonNullable)
-                        .join("\n"))
-                    .join("\n"),
-            });
-        }
-        return result.concat(otherMessages);
-    }
     async convertMemoriesToMessages(memories, options) {
         const messages = [];
         const other = [];

package/lib/esm/prompt/skills/afs/agent-skill/skill-loader.js

@@ -36,6 +36,7 @@ export async function loadAgentSkillFromAFS({ afs, }) {
     for (const module of filtered) {
         const data = (await afs.list(module.path, {
             pattern: "**/SKILL.md",
+            maxDepth: 10,
         })).data;
         for (const entry of data) {
             const { data: file } = await afs.read(entry.path);

package/lib/esm/prompt/template.d.ts

@@ -42,7 +42,7 @@ export declare class AgentMessageTemplate extends ChatMessageTemplate {
     static from(template?: ChatModelInputMessage["content"], toolCalls?: ChatModelOutputToolCall[], name?: string, options?: FormatOptions, cacheControl?: ChatModelInputMessage["cacheControl"]): AgentMessageTemplate;
     constructor(content?: ChatModelInputMessage["content"], toolCalls?: ChatModelOutputToolCall[] | undefined, name?: string, options?: FormatOptions, cacheControl?: ChatModelInputMessage["cacheControl"]);
     format(_variables?: Record<string, unknown>, _options?: FormatOptions): Promise<{
-        role: "system" | "user" | "agent" | "tool";
+        role: "agent" | "user" | "system" | "tool";
         name: string | undefined;
         content: ChatModelInputMessageContent | undefined;
         toolCalls: ChatModelOutputToolCall[] | undefined;
@@ -54,7 +54,7 @@ export declare class ToolMessageTemplate extends ChatMessageTemplate {
     static from(content: object | string, toolCallId: string, name?: string, options?: FormatOptions, cacheControl?: ChatModelInputMessage["cacheControl"]): ToolMessageTemplate;
     constructor(content: object | string, toolCallId: string, name?: string, options?: FormatOptions, cacheControl?: ChatModelInputMessage["cacheControl"]);
     format(_variables?: Record<string, unknown>, _options?: FormatOptions): Promise<{
-        role: "system" | "user" | "agent" | "tool";
+        role: "agent" | "user" | "system" | "tool";
         name: string | undefined;
         content: ChatModelInputMessageContent | undefined;
         toolCallId: string;
@@ -83,21 +83,21 @@ declare const chatMessageSchema: z.ZodUnion<[z.ZodObject<{
         ttl?: "5m" | "1h" | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    content: string;
     role: "system";
+    content: string;
+    name?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
         ttl?: "5m" | "1h" | undefined;
     } | undefined;
-    name?: string | undefined;
 }, {
-    content: string;
     role: "system";
+    content: string;
+    name?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
         ttl?: "5m" | "1h" | undefined;
     } | undefined;
-    name?: string | undefined;
 }>, z.ZodObject<{
     role: z.ZodLiteral<"user">;
     content: z.ZodString;
@@ -113,21 +113,21 @@ declare const chatMessageSchema: z.ZodUnion<[z.ZodObject<{
         ttl?: "5m" | "1h" | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    content: string;
     role: "user";
+    content: string;
+    name?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
         ttl?: "5m" | "1h" | undefined;
     } | undefined;
-    name?: string | undefined;
 }, {
-    content: string;
     role: "user";
+    content: string;
+    name?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
         ttl?: "5m" | "1h" | undefined;
     } | undefined;
-    name?: string | undefined;
 }>, z.ZodObject<{
     role: z.ZodLiteral<"agent">;
     content: z.ZodOptional<z.ZodString>;
@@ -172,6 +172,7 @@ declare const chatMessageSchema: z.ZodUnion<[z.ZodObject<{
     }>>;
 }, "strip", z.ZodTypeAny, {
     role: "agent";
+    name?: string | undefined;
     content?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
@@ -185,9 +186,9 @@ declare const chatMessageSchema: z.ZodUnion<[z.ZodObject<{
         type: "function";
         id: string;
     }[] | undefined;
-    name?: string | undefined;
 }, {
     role: "agent";
+    name?: string | undefined;
     content?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
@@ -201,7 +202,6 @@ declare const chatMessageSchema: z.ZodUnion<[z.ZodObject<{
         type: "function";
         id: string;
     }[] | undefined;
-    name?: string | undefined;
 }>, z.ZodObject<{
     role: z.ZodLiteral<"tool">;
     content: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnknown>]>, string, string | Record<string, unknown>>;
@@ -218,23 +218,23 @@ declare const chatMessageSchema: z.ZodUnion<[z.ZodObject<{
         ttl?: "5m" | "1h" | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    content: string;
     role: "tool";
+    content: string;
     toolCallId: string;
+    name?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
         ttl?: "5m" | "1h" | undefined;
     } | undefined;
-    name?: string | undefined;
 }, {
-    content: string | Record<string, unknown>;
     role: "tool";
+    content: string | Record<string, unknown>;
     toolCallId: string;
+    name?: string | undefined;
     cacheControl?: {
         type: "ephemeral";
         ttl?: "5m" | "1h" | undefined;
     } | undefined;
-    name?: string | undefined;
 }>]>;
 export declare function safeParseChatMessages(messages: unknown): ChatMessageTemplate[] | undefined;
 export declare function parseChatMessages(messages: (z.infer<typeof chatMessageSchema> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.72.0-beta.7",
+  "version": "1.72.0-beta.9",
   "description": "The functional core of agentic AI",
   "publishConfig": {
     "access": "public"
@@ -93,10 +93,10 @@
     "zod": "^3.25.67",
     "zod-from-json-schema": "^0.0.5",
     "zod-to-json-schema": "^3.24.6",
-    "@aigne/afs": "^1.4.0-beta.4",
-    "@aigne/afs-history": "^1.2.0-beta.4",
+    "@aigne/afs": "^1.4.0-beta.5",
+    "@aigne/platform-helpers": "^0.6.7-beta",
     "@aigne/observability-api": "^0.11.14-beta.1",
-    "@aigne/platform-helpers": "^0.6.7-beta"
+    "@aigne/afs-history": "^1.2.0-beta.5"
   },
   "devDependencies": {
     "@types/bun": "^1.2.22",