@aigne/core 1.57.0 → 1.57.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.57.1](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.57.0...core-v1.57.1) (2025-08-29)
+
+
+### Bug Fixes
+
+* **core:** load nested prompt files with relative paths correctly ([#432](https://github.com/AIGNE-io/aigne-framework/issues/432)) ([036ffa7](https://github.com/AIGNE-io/aigne-framework/commit/036ffa72391d3f27870a5022b7964739805a6161))
+
 ## [1.57.0](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.56.0...core-v1.57.0) (2025-08-28)
 
 

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

@@ -14,7 +14,9 @@ export interface LoadOptions {
     key?: string | number;
 }
 export declare function load(path: string, options?: LoadOptions): Promise<AIGNEOptions>;
-export declare function loadAgent(path: string, options?: LoadOptions, agentOptions?: AgentOptions): Promise<Agent>;
+export declare function loadAgent(path: string, options?: LoadOptions & {
+    rootDir?: string;
+}, agentOptions?: AgentOptions): Promise<Agent>;
 declare const aigneFileSchema: z.ZodObject<{
     name: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
     description: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;

package/lib/cjs/loader/index.js

@@ -22,7 +22,10 @@ async function load(path, options = {}) {
     options.key ??= Date.now();
     const { aigne, rootDir } = await loadAIGNEFile(path);
     const allAgentPaths = new Set((0, type_utils_js_1.flat)(aigne.agents, aigne.skills, aigne.mcpServer?.agents, aigne.cli?.agents, aigne.cli?.chat).map((i) => index_js_1.nodejs.path.join(rootDir, i)));
-    const allAgents = Object.fromEntries(await Promise.all(Array.from(allAgentPaths).map(async (path) => [path, await loadAgent(path, options)])));
+    const allAgents = Object.fromEntries(await Promise.all(Array.from(allAgentPaths).map(async (path) => [
+        path,
+        await loadAgent(path, { ...options, rootDir }),
+    ])));
     const pickAgents = (paths) => paths.map((filename) => allAgents[index_js_1.nodejs.path.join(rootDir, filename)]).filter(type_utils_js_1.isNonNullable);
     return {
         ...aigne,
@@ -85,6 +88,7 @@ async function parseHooks(path, hooks, options) {
     })));
 }
 async function parseAgent(path, agent, options, agentOptions) {
+    const workingDir = options?.rootDir ?? index_js_1.nodejs.path.dirname(path);
     const skills = "skills" in agent
         ? agent.skills &&
             (await Promise.all(agent.skills.map((skill) => loadNestAgent(path, skill, options))))
@@ -106,16 +110,13 @@ async function parseAgent(path, agent, options, agentOptions) {
         case "ai": {
             return ai_agent_js_1.AIAgent.from({
                 ...baseOptions,
-                instructions: agent.instructions &&
-                    prompt_builder_js_1.PromptBuilder.from(agent.instructions, { workingDir: index_js_1.nodejs.path.dirname(path) }),
+                instructions: agent.instructions && prompt_builder_js_1.PromptBuilder.from(agent.instructions, { workingDir }),
             });
         }
         case "image": {
             return image_agent_js_1.ImageAgent.from({
                 ...baseOptions,
-                instructions: prompt_builder_js_1.PromptBuilder.from(agent.instructions, {
-                    workingDir: index_js_1.nodejs.path.dirname(path),
-                }),
+                instructions: prompt_builder_js_1.PromptBuilder.from(agent.instructions, { workingDir }),
             });
         }
         case "mcp": {

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

@@ -17,6 +17,7 @@ export declare class CustomLoader extends nunjucks.Loader {
         workingDir: string;
     });
     async: boolean;
+    private findFile;
     getSource(name: string, callback: Callback<Error, LoaderSource>): LoaderSource;
 }
 export declare class ChatMessageTemplate {

package/lib/cjs/prompt/template.js

@@ -45,17 +45,38 @@ class CustomLoader extends nunjucks_1.default.Loader {
         this.options = options;
     }
     async = true;
+    async findFile(dir, name) {
+        name = index_js_1.nodejs.path.basename(name);
+        const files = await index_js_1.nodejs.fs.readdir(dir, { withFileTypes: true });
+        const file = files.find((f) => f.name === name);
+        if (file)
+            return index_js_1.nodejs.path.join(file.parentPath, file.name);
+        for (const dir of files) {
+            if (dir.isDirectory()) {
+                const result = await this.findFile(index_js_1.nodejs.path.join(dir.parentPath, dir.name), name);
+                if (result)
+                    return result;
+            }
+        }
+        return null;
+    }
     getSource(name, callback) {
         let result = null;
-        index_js_1.nodejs.fs.readFile(index_js_1.nodejs.path.join(this.options.workingDir, name), "utf-8").then((content) => {
-            result = {
-                src: content,
-                path: name,
-                noCache: true,
-            };
-            callback(null, result);
-        }, (error) => {
-            callback(error, null);
+        this.findFile(this.options.workingDir, name).then((path) => {
+            if (!path) {
+                callback(new Error(`Template not found: ${name}`), null);
+                return;
+            }
+            return index_js_1.nodejs.fs.readFile(path, "utf-8").then((content) => {
+                result = {
+                    src: content,
+                    path: name,
+                    noCache: true,
+                };
+                callback(null, result);
+            }, (error) => {
+                callback(error, null);
+            });
         });
         // nunjucks expects return LoaderSource synchronously, but we handle it asynchronously.
         return result;

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

@@ -14,7 +14,9 @@ export interface LoadOptions {
     key?: string | number;
 }
 export declare function load(path: string, options?: LoadOptions): Promise<AIGNEOptions>;
-export declare function loadAgent(path: string, options?: LoadOptions, agentOptions?: AgentOptions): Promise<Agent>;
+export declare function loadAgent(path: string, options?: LoadOptions & {
+    rootDir?: string;
+}, agentOptions?: AgentOptions): Promise<Agent>;
 declare const aigneFileSchema: z.ZodObject<{
     name: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
     description: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;

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

@@ -17,6 +17,7 @@ export declare class CustomLoader extends nunjucks.Loader {
         workingDir: string;
     });
     async: boolean;
+    private findFile;
     getSource(name: string, callback: Callback<Error, LoaderSource>): LoaderSource;
 }
 export declare class ChatMessageTemplate {

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

@@ -14,7 +14,9 @@ export interface LoadOptions {
     key?: string | number;
 }
 export declare function load(path: string, options?: LoadOptions): Promise<AIGNEOptions>;
-export declare function loadAgent(path: string, options?: LoadOptions, agentOptions?: AgentOptions): Promise<Agent>;
+export declare function loadAgent(path: string, options?: LoadOptions & {
+    rootDir?: string;
+}, agentOptions?: AgentOptions): Promise<Agent>;
 declare const aigneFileSchema: z.ZodObject<{
     name: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
     description: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;

package/lib/esm/loader/index.js

@@ -17,7 +17,10 @@ export async function load(path, options = {}) {
     options.key ??= Date.now();
     const { aigne, rootDir } = await loadAIGNEFile(path);
     const allAgentPaths = new Set(flat(aigne.agents, aigne.skills, aigne.mcpServer?.agents, aigne.cli?.agents, aigne.cli?.chat).map((i) => nodejs.path.join(rootDir, i)));
-    const allAgents = Object.fromEntries(await Promise.all(Array.from(allAgentPaths).map(async (path) => [path, await loadAgent(path, options)])));
+    const allAgents = Object.fromEntries(await Promise.all(Array.from(allAgentPaths).map(async (path) => [
+        path,
+        await loadAgent(path, { ...options, rootDir }),
+    ])));
     const pickAgents = (paths) => paths.map((filename) => allAgents[nodejs.path.join(rootDir, filename)]).filter(isNonNullable);
     return {
         ...aigne,
@@ -80,6 +83,7 @@ async function parseHooks(path, hooks, options) {
     })));
 }
 async function parseAgent(path, agent, options, agentOptions) {
+    const workingDir = options?.rootDir ?? nodejs.path.dirname(path);
     const skills = "skills" in agent
         ? agent.skills &&
             (await Promise.all(agent.skills.map((skill) => loadNestAgent(path, skill, options))))
@@ -101,16 +105,13 @@ async function parseAgent(path, agent, options, agentOptions) {
         case "ai": {
             return AIAgent.from({
                 ...baseOptions,
-                instructions: agent.instructions &&
-                    PromptBuilder.from(agent.instructions, { workingDir: nodejs.path.dirname(path) }),
+                instructions: agent.instructions && PromptBuilder.from(agent.instructions, { workingDir }),
             });
         }
         case "image": {
             return ImageAgent.from({
                 ...baseOptions,
-                instructions: PromptBuilder.from(agent.instructions, {
-                    workingDir: nodejs.path.dirname(path),
-                }),
+                instructions: PromptBuilder.from(agent.instructions, { workingDir }),
             });
         }
         case "mcp": {

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

@@ -17,6 +17,7 @@ export declare class CustomLoader extends nunjucks.Loader {
         workingDir: string;
     });
     async: boolean;
+    private findFile;
     getSource(name: string, callback: Callback<Error, LoaderSource>): LoaderSource;
 }
 export declare class ChatMessageTemplate {

package/lib/esm/prompt/template.js

@@ -37,17 +37,38 @@ export class CustomLoader extends nunjucks.Loader {
         this.options = options;
     }
     async = true;
+    async findFile(dir, name) {
+        name = nodejs.path.basename(name);
+        const files = await nodejs.fs.readdir(dir, { withFileTypes: true });
+        const file = files.find((f) => f.name === name);
+        if (file)
+            return nodejs.path.join(file.parentPath, file.name);
+        for (const dir of files) {
+            if (dir.isDirectory()) {
+                const result = await this.findFile(nodejs.path.join(dir.parentPath, dir.name), name);
+                if (result)
+                    return result;
+            }
+        }
+        return null;
+    }
     getSource(name, callback) {
         let result = null;
-        nodejs.fs.readFile(nodejs.path.join(this.options.workingDir, name), "utf-8").then((content) => {
-            result = {
-                src: content,
-                path: name,
-                noCache: true,
-            };
-            callback(null, result);
-        }, (error) => {
-            callback(error, null);
+        this.findFile(this.options.workingDir, name).then((path) => {
+            if (!path) {
+                callback(new Error(`Template not found: ${name}`), null);
+                return;
+            }
+            return nodejs.fs.readFile(path, "utf-8").then((content) => {
+                result = {
+                    src: content,
+                    path: name,
+                    noCache: true,
+                };
+                callback(null, result);
+            }, (error) => {
+                callback(error, null);
+            });
         });
         // nunjucks expects return LoaderSource synchronously, but we handle it asynchronously.
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigne/core",
-  "version": "1.57.0",
+  "version": "1.57.1",
   "description": "The functional core of agentic AI",
   "publishConfig": {
     "access": "public"
@@ -91,8 +91,8 @@
     "yaml": "^2.8.0",
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.6",
-    "@aigne/observability-api": "^0.10.1",
-    "@aigne/platform-helpers": "^0.6.2"
+    "@aigne/platform-helpers": "^0.6.2",
+    "@aigne/observability-api": "^0.10.1"
   },
   "devDependencies": {
     "@types/bun": "^1.2.18",