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

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

@@ -5,6 +5,7 @@ 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";
@@ -97,6 +98,9 @@ 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"
@@ -106,6 +110,50 @@ export class PromptBuilder {
         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 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),
+                },
+            })));
+        }
+        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" &&
+                    (typeof i.content === "string"
+                        ? i.content.includes(message)
+                        : i.content?.some((c) => c.type === "text" && c.text.includes(message))))) {
+                content.push({ type: "text", text: message });
+            }
+            if (files.length)
+                content.push(...files);
+            if (content.length) {
+                messages.push({ role: "user", content });
+            }
+        }
+        return this.refineMessages(options, messages);
+    }
+    async deprecatedMemories(message, options) {
+        const messages = [];
         const memories = [];
         if (options.agent && options.context) {
             memories.push(...(await options.agent.retrieveMemories({ search: message }, { context: options.context })));
@@ -114,7 +162,7 @@ export class PromptBuilder {
             memories.push(...options.context.memories);
         }
         const afs = options.agent?.afs;
-        if (afs && options.agent?.historyConfig?.disabled !== true) {
+        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, {
@@ -160,38 +208,9 @@ export class PromptBuilder {
         }
         if (memories.length)
             messages.push(...(await this.convertMemoriesToMessages(memories, options)));
-        // 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),
-                },
-            })));
-        }
-        if (message || files.length) {
-            const content = [];
-            if (message &&
-                // avoid duplicate user messages: developer may have already included the message in the custom user messages
-                !otherCustomMessages.some((i) => i.role === "user" &&
-                    (typeof i.content === "string"
-                        ? i.content.includes(message)
-                        : i.content?.some((c) => c.type === "text" && c.text.includes(message))))) {
-                content.push({ type: "text", text: message });
-            }
-            if (files.length)
-                content.push(...files);
-            if (content.length) {
-                messages.push({ role: "user", content });
-            }
-        }
-        messages.push(...otherCustomMessages);
-        return this.refineMessages(options, messages);
+        return messages;
     }
-    async getHistories(options) {
+    async getHistories({ agentId, userId, sessionId, ...options }) {
         const { agent } = options;
         const afs = agent?.afs;
         if (!afs)
@@ -200,24 +219,21 @@ export class PromptBuilder {
         if (!historyModule)
             return [];
         const history = (await afs.list(historyModule.path, {
+            filter: { agentId, userId, sessionId },
             limit: agent.historyConfig?.maxItems || 10,
             orderBy: [["createdAt", "desc"]],
-        })).data;
-        return history
-            .reverse()
-            .map((i) => {
-            if (!i.content)
-                return;
-            const { input, output } = i.content;
-            if (!input || !output)
-                return;
-            return [
-                { role: "user", content: input },
-                { role: "agent", content: output },
-            ];
-        })
-            .filter(isNonNullable)
-            .flat();
+        })).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 ?? {};

package/package.json

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