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

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

@@ -2,12 +2,8 @@ import { jsonSchemaToZod } from "@aigne/json-schema-to-zod";
 import { nodejs } from "@aigne/platform-helpers/nodejs/index.js";
 import { parse } from "yaml";
 import { z } from "zod";
-import { AIAgentToolChoice } from "../agents/ai-agent.js";
-import { roleSchema } from "../agents/chat-model.js";
-import { ProcessMode } from "../agents/team-agent.js";
 import { tryOrThrow } from "../utils/type-utils.js";
-import { codeToFunctionAgentFn } from "./function-agent.js";
-import { camelizeSchema, chatModelSchema, defaultInputSchema, imageModelSchema, inputOutputSchema, optionalize, preprocessSchema, } from "./schema.js";
+import { camelizeSchema, chatModelSchema, defaultInputSchema, imageModelSchema, inputOutputSchema, optionalize, } from "./schema.js";
 export async function parseAgentFile(path, data, options) {
     const agentSchema = getAgentSchema({ filepath: path, options });
     return agentSchema.parseAsync({
@@ -25,51 +21,7 @@ export async function loadAgentFromYamlFile(path, options) {
     }, options), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
     return agent;
 }
-const instructionItemSchema = camelizeSchema(z.union([
-    z.object({
-        role: roleSchema.default("system"),
-        url: z.string(),
-        cacheControl: optionalize(z.object({
-            type: z.literal("ephemeral"),
-            ttl: optionalize(z.union([z.literal("5m"), z.literal("1h")])),
-        })),
-    }),
-    z.object({
-        role: roleSchema.default("system"),
-        content: z.string(),
-        cacheControl: optionalize(z.object({
-            type: z.literal("ephemeral"),
-            ttl: optionalize(z.union([z.literal("5m"), z.literal("1h")])),
-        })),
-    }),
-]));
-const parseInstructionItem = ({ filepath }) => async ({ role, cacheControl, ...v }) => {
-    if (role === "tool")
-        throw new Error(`'tool' role is not allowed in instruction item in agent file ${filepath}`);
-    if ("content" in v && typeof v.content === "string") {
-        return { role, content: v.content, path: filepath, cacheControl };
-    }
-    if ("url" in v && typeof v.url === "string") {
-        const url = nodejs.path.isAbsolute(v.url)
-            ? v.url
-            : nodejs.path.join(nodejs.path.dirname(filepath), v.url);
-        return nodejs.fs
-            .readFile(url, "utf8")
-            .then((content) => ({ role, content, path: url, cacheControl }));
-    }
-    throw new Error(`Invalid instruction item in agent file ${filepath}. Expected 'content' or 'url' property`);
-};
-export const getInstructionsSchema = ({ filepath }) => z
-    .union([z.string(), instructionItemSchema, z.array(instructionItemSchema)])
-    .transform(async (v) => {
-    if (typeof v === "string")
-        return [{ role: "system", content: v, path: filepath }];
-    if (Array.isArray(v)) {
-        return Promise.all(v.map((item) => parseInstructionItem({ filepath })(item)));
-    }
-    return [await parseInstructionItem({ filepath })(v)];
-});
-export const getAgentSchema = ({ filepath, options, }) => {
+export const getAgentSchema = ({ filepath }) => {
     const agentSchema = z.lazy(() => {
         const nestAgentSchema = z.lazy(() => z.union([
             agentSchema,
@@ -105,6 +57,7 @@ export const getAgentSchema = ({ filepath, options, }) => {
             }))),
         });
         const baseAgentSchema = z.object({
+            type: z.string(),
             name: optionalize(z.string()),
             alias: optionalize(z.array(z.string())),
             description: optionalize(z.string()),
@@ -143,94 +96,7 @@ export const getAgentSchema = ({ filepath, options, }) => {
             ])),
             shareAFS: optionalize(z.boolean()),
         });
-        const instructionsSchema = getInstructionsSchema({ filepath: filepath });
-        return camelizeSchema(preprocessSchema(async (json) => {
-            if (typeof json === "object" &&
-                json &&
-                "type" in json &&
-                typeof json.type === "string" &&
-                !["ai", "image", "mcp", "team", "transform", "function"].includes(json.type)) {
-                if (!options?.require)
-                    throw new Error(`Module loader is not provided to load agent type module ${json.type} from ${filepath}`);
-                const Mod = await options.require(json.type, { parent: filepath });
-                if (typeof Mod?.default?.prototype?.constructor !== "function") {
-                    throw new Error(`The agent type module ${json.type} does not export a default Agent class`);
-                }
-                Object.assign(json, { agentClass: Mod.default });
-            }
-            return json;
-        }, z.union([
-            z
-                .object({
-                type: z.string(),
-                agentClass: z.custom((v) => typeof v?.prototype?.constructor === "function"),
-            })
-                .extend(baseAgentSchema.shape)
-                .passthrough(),
-            z.discriminatedUnion("type", [
-                z
-                    .object({
-                    type: z.literal("ai"),
-                    instructions: optionalize(instructionsSchema),
-                    autoReorderSystemMessages: optionalize(z.boolean()),
-                    autoMergeSystemMessages: optionalize(z.boolean()),
-                    inputKey: optionalize(z.string()),
-                    outputKey: optionalize(z.string()),
-                    inputFileKey: optionalize(z.string()),
-                    outputFileKey: optionalize(z.string()),
-                    toolChoice: optionalize(z.nativeEnum(AIAgentToolChoice)),
-                    toolCallsConcurrency: optionalize(z.number().int().min(0)),
-                    keepTextInToolUses: optionalize(z.boolean()),
-                    catchToolsError: optionalize(z.boolean()),
-                    structuredStreamMode: optionalize(z.boolean()),
-                })
-                    .extend(baseAgentSchema.shape),
-                z
-                    .object({
-                    type: z.literal("image"),
-                    instructions: instructionsSchema,
-                    inputFileKey: optionalize(z.string()),
-                })
-                    .extend(baseAgentSchema.shape),
-                z
-                    .object({
-                    type: z.literal("mcp"),
-                    url: optionalize(z.string()),
-                    command: optionalize(z.string()),
-                    args: optionalize(z.array(z.string())),
-                })
-                    .extend(baseAgentSchema.shape),
-                z
-                    .object({
-                    type: z.literal("team"),
-                    mode: optionalize(z.nativeEnum(ProcessMode)),
-                    iterateOn: optionalize(z.string()),
-                    concurrency: optionalize(z.number().int().min(1)),
-                    iterateWithPreviousOutput: optionalize(z.boolean()),
-                    includeAllStepsOutput: optionalize(z.boolean()),
-                    reflection: camelizeSchema(optionalize(z.object({
-                        reviewer: nestAgentSchema,
-                        isApproved: z.string(),
-                        maxIterations: optionalize(z.number().int().min(1)),
-                        returnLastOnMaxIterations: optionalize(z.boolean()),
-                        customErrorMessage: optionalize(z.string()),
-                    }))),
-                })
-                    .extend(baseAgentSchema.shape),
-                z
-                    .object({
-                    type: z.literal("transform"),
-                    jsonata: z.string(),
-                })
-                    .extend(baseAgentSchema.shape),
-                z
-                    .object({
-                    type: z.literal("function"),
-                    process: z.preprocess((v) => (typeof v === "string" ? codeToFunctionAgentFn(v) : v), z.custom()),
-                })
-                    .extend(baseAgentSchema.shape),
-            ]),
-        ])));
+        return camelizeSchema(baseAgentSchema.passthrough());
     });
     return agentSchema;
 };

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

@@ -0,0 +1,4 @@
+import type { AgentClass } from "../agents/types.ts";
+export declare const builtinAgents: {
+    [type: string]: AgentClass;
+};

package/lib/esm/loader/agents.js

@@ -0,0 +1,14 @@
+import { FunctionAgent } from "../agents/agent.js";
+import { AIAgent } from "../agents/ai-agent.js";
+import { ImageAgent } from "../agents/image-agent.js";
+import { MCPAgent } from "../agents/mcp-agent.js";
+import { TeamAgent } from "../agents/team-agent.js";
+import { TransformAgent } from "../agents/transform-agent.js";
+export const builtinAgents = {
+    ai: AIAgent,
+    function: FunctionAgent,
+    image: ImageAgent,
+    mcp: MCPAgent,
+    team: TeamAgent,
+    transform: TransformAgent,
+};

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

@@ -5,9 +5,8 @@ import type { ChatModel } from "../agents/chat-model.js";
 import type { ImageModel } from "../agents/image-model.js";
 import type { AIGNEOptions } from "../aigne/aigne.js";
 import type { MemoryAgent, MemoryAgentOptions } from "../memory/memory.js";
-import { PromptBuilder } from "../prompt/prompt-builder.js";
 import { type PromiseOrValue } from "../utils/type-utils.js";
-import { type Instructions, loadAgentFromYamlFile, type NestAgentSchema } from "./agent-yaml.js";
+import { loadAgentFromYamlFile, type NestAgentSchema } from "./agent-yaml.js";
 export interface LoadOptions {
     memories?: {
         new (parameters?: MemoryAgentOptions): MemoryAgent;
@@ -19,7 +18,10 @@ export interface LoadOptions {
         availableModules?: {
             module: string;
             alias?: string[];
-            create: (options?: Record<string, any>) => PromiseOrValue<AFSModule>;
+            load: (options: {
+                filepath: string;
+                parsed?: object;
+            }) => PromiseOrValue<AFSModule>;
         }[];
     };
     aigne?: z.infer<typeof aigneFileSchema>;
@@ -27,6 +29,9 @@ export interface LoadOptions {
         parent?: string;
     }) => Promise<any>;
 }
+export interface AgentLoadOptions extends LoadOptions {
+    loadNestAgent: (path: string, agent: NestAgentSchema, options: LoadOptions, agentOptions?: AgentOptions<any, any> & Record<string, unknown>) => Promise<Agent>;
+}
 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 loadNestAgent(path: string, agent: NestAgentSchema, options: LoadOptions, agentOptions?: AgentOptions<any, any> & Record<string, unknown>): Promise<Agent>;
@@ -67,9 +72,9 @@ declare const aigneFileSchema: z.ZodObject<{
         } | undefined, z.ZodTypeDef, number | {
             $get: string;
         } | undefined>;
-        thinkingEffort: ZodType<number | "high" | "medium" | "low" | "minimal" | {
+        thinkingEffort: ZodType<number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
-        } | undefined, z.ZodTypeDef, number | "high" | "medium" | "low" | "minimal" | {
+        } | undefined, z.ZodTypeDef, number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
         } | undefined>;
     }, z.ZodTypeAny, "passthrough"> | undefined, z.ZodTypeDef, z.objectInputType<{
@@ -98,9 +103,9 @@ declare const aigneFileSchema: z.ZodObject<{
         } | undefined, z.ZodTypeDef, number | {
             $get: string;
         } | undefined>;
-        thinkingEffort: ZodType<number | "high" | "medium" | "low" | "minimal" | {
+        thinkingEffort: ZodType<number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
-        } | undefined, z.ZodTypeDef, number | "high" | "medium" | "low" | "minimal" | {
+        } | undefined, z.ZodTypeDef, number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
         } | undefined>;
     }, z.ZodTypeAny, "passthrough"> | undefined>;
@@ -132,6 +137,7 @@ declare const aigneFileSchema: z.ZodObject<{
         chat?: string | undefined;
     } | undefined>;
 }, "strip", z.ZodTypeAny, {
+    name?: string | undefined;
     model?: z.objectInputType<{
         model: ZodType<string | {
             $get: string;
@@ -158,13 +164,12 @@ declare const aigneFileSchema: z.ZodObject<{
         } | undefined, z.ZodTypeDef, number | {
             $get: string;
         } | undefined>;
-        thinkingEffort: ZodType<number | "high" | "medium" | "low" | "minimal" | {
+        thinkingEffort: ZodType<number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
-        } | undefined, z.ZodTypeDef, number | "high" | "medium" | "low" | "minimal" | {
+        } | undefined, z.ZodTypeDef, number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
         } | undefined>;
     }, z.ZodTypeAny, "passthrough"> | undefined;
-    name?: string | undefined;
     description?: string | undefined;
     imageModel?: z.objectInputType<{
         model: ZodType<string | {
@@ -183,6 +188,7 @@ declare const aigneFileSchema: z.ZodObject<{
         chat?: string | undefined;
     } | undefined;
 }, {
+    name?: string | undefined;
     model?: z.objectInputType<{
         model: ZodType<string | {
             $get: string;
@@ -209,13 +215,12 @@ declare const aigneFileSchema: z.ZodObject<{
         } | undefined, z.ZodTypeDef, number | {
             $get: string;
         } | undefined>;
-        thinkingEffort: ZodType<number | "high" | "medium" | "low" | "minimal" | {
+        thinkingEffort: ZodType<number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
-        } | undefined, z.ZodTypeDef, number | "high" | "medium" | "low" | "minimal" | {
+        } | undefined, z.ZodTypeDef, number | "high" | "low" | "medium" | "minimal" | {
             $get: string;
         } | undefined>;
     }, z.ZodTypeAny, "passthrough"> | undefined;
-    name?: string | undefined;
     description?: string | undefined;
     imageModel?: z.objectInputType<{
         model: ZodType<string | {
@@ -239,5 +244,4 @@ export declare function loadAIGNEFile(path: string): Promise<{
     rootDir: string;
 }>;
 export declare function findAIGNEFile(path: string): Promise<string>;
-export declare function instructionsToPromptBuilder(instructions: Instructions): PromptBuilder;
 export {};

package/lib/esm/loader/index.js

@@ -2,18 +2,12 @@ import { AFS } from "@aigne/afs";
 import { nodejs } from "@aigne/platform-helpers/nodejs/index.js";
 import { parse } from "yaml";
 import { z } from "zod";
-import { Agent, FunctionAgent } from "../agents/agent.js";
-import { AIAgent } from "../agents/ai-agent.js";
-import { ImageAgent } from "../agents/image-agent.js";
-import { MCPAgent } from "../agents/mcp-agent.js";
-import { TeamAgent } from "../agents/team-agent.js";
-import { TransformAgent } from "../agents/transform-agent.js";
-import { PromptBuilder } from "../prompt/prompt-builder.js";
-import { ChatMessagesTemplate, parseChatMessages } from "../prompt/template.js";
+import { Agent } from "../agents/agent.js";
 import { isAgent } from "../utils/agent-utils.js";
 import { flat, isNil, isNonNullable, omitBy, tryOrThrow, } from "../utils/type-utils.js";
 import { loadAgentFromJsFile } from "./agent-js.js";
 import { loadAgentFromYamlFile, } from "./agent-yaml.js";
+import { builtinAgents } from "./agents.js";
 import { camelizeSchema, chatModelSchema, imageModelSchema, optionalize } from "./schema.js";
 const AIGNE_FILE_NAME = ["aigne.yaml", "aigne.yml"];
 export async function load(path, options = {}) {
@@ -154,7 +148,10 @@ export async function parseAgent(path, agent, options, agentOptions) {
             const mod = options?.afs?.availableModules?.find((mod) => mod.module === moduleName || mod.alias?.includes(moduleName));
             if (!mod)
                 throw new Error(`AFS module not found: ${typeof m === "string" ? m : m.module}`);
-            const module = await mod.create(typeof m === "string" ? {} : m.options);
+            const module = await mod.load({
+                filepath: path,
+                parsed: typeof m === "string" ? {} : m.options,
+            });
             afs.mount(module);
         }
     }
@@ -186,73 +183,24 @@ export async function parseAgent(path, agent, options, agentOptions) {
         skills: [...(agentOptions?.skills || []), ...skills],
         afs: afs || agentOptions?.afs,
     };
-    let instructions;
-    if ("instructions" in agent && agent.instructions && ["ai", "image"].includes(agent.type)) {
-        instructions = instructionsToPromptBuilder(agent.instructions);
-    }
-    switch (agent.type) {
-        case "ai": {
-            return AIAgent.from({
-                ...baseOptions,
-                instructions,
-            });
-        }
-        case "image": {
-            if (!instructions)
-                throw new Error(`Missing required instructions for image agent at path: ${path}`);
-            return ImageAgent.from({
-                ...baseOptions,
-                instructions,
-            });
-        }
-        case "mcp": {
-            if (agent.url) {
-                return MCPAgent.from({
-                    ...baseOptions,
-                    url: agent.url,
-                });
-            }
-            if (agent.command) {
-                return MCPAgent.from({
-                    ...baseOptions,
-                    command: agent.command,
-                    args: agent.args,
-                });
-            }
-            throw new Error(`Missing url or command in mcp agent: ${path}`);
-        }
-        case "team": {
-            return TeamAgent.from({
-                ...baseOptions,
-                mode: agent.mode,
-                iterateOn: agent.iterateOn,
-                reflection: agent.reflection && {
-                    ...agent.reflection,
-                    reviewer: await loadNestAgent(path, agent.reflection.reviewer, options),
-                },
-            });
-        }
-        case "transform": {
-            return TransformAgent.from({
-                ...baseOptions,
-                jsonata: agent.jsonata,
-            });
-        }
-        case "function": {
-            return FunctionAgent.from({
-                ...baseOptions,
-                process: agent.process,
-            });
+    let agentClass = builtinAgents[agent.type];
+    if (!agentClass) {
+        if (!options?.require)
+            throw new Error(`Module loader is not provided to load agent type module ${agent.type} from ${path}`);
+        const Mod = await options.require(agent.type, { parent: path });
+        if (typeof Mod?.default?.prototype?.constructor !== "function") {
+            throw new Error(`The agent type module ${agent.type} does not export a default Agent class`);
         }
+        agentClass = Mod.default;
     }
-    if ("agentClass" in agent && agent.agentClass) {
-        return await agent.agentClass.load({
-            filepath: path,
-            parsed: baseOptions,
-            options,
-        });
+    if (!agentClass) {
+        throw new Error(`Unsupported agent type: ${agent.type} from ${path}`);
     }
-    throw new Error(`Unsupported agent type: ${"type" in agent ? agent.type : "unknown"} at path: ${path}`);
+    return await agentClass.load({
+        filepath: path,
+        parsed: baseOptions,
+        options: { ...options, loadNestAgent },
+    });
 }
 async function loadMemory(memories, provider, options) {
     const M = !provider
@@ -308,11 +256,3 @@ export async function findAIGNEFile(path) {
     }
     throw new Error(`aigne.yaml not found in ${path}. Please ensure you are in the correct directory or provide a valid path.`);
 }
-export function instructionsToPromptBuilder(instructions) {
-    return new PromptBuilder({
-        instructions: ChatMessagesTemplate.from(parseChatMessages(instructions.map((i) => ({
-            ...i,
-            options: { workingDir: nodejs.path.dirname(i.path) },
-        })))),
-    });
-}

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

@@ -1,4 +1,6 @@
 import { type ZodType, z } from "zod";
+import { type Role } from "../agents/chat-model.js";
+import { PromptBuilder } from "../prompt/prompt-builder.js";
 export declare const inputOutputSchema: ({ path }: {
     path: string;
 }) => z.ZodUnion<[ZodType<any, z.ZodTypeDef, any>, z.ZodEffects<z.ZodObject<{
@@ -55,9 +57,9 @@ declare const chatModelObjectSchema: z.ZodObject<{
     } | undefined, z.ZodTypeDef, number | {
         $get: string;
     } | undefined>;
-    thinkingEffort: ZodType<number | "high" | "medium" | "low" | "minimal" | {
+    thinkingEffort: ZodType<number | "high" | "low" | "medium" | "minimal" | {
         $get: string;
-    } | undefined, z.ZodTypeDef, number | "high" | "medium" | "low" | "minimal" | {
+    } | undefined, z.ZodTypeDef, number | "high" | "low" | "medium" | "minimal" | {
         $get: string;
     } | undefined>;
 }, "passthrough", z.ZodTypeAny, z.objectOutputType<{
@@ -86,9 +88,9 @@ declare const chatModelObjectSchema: z.ZodObject<{
     } | undefined, z.ZodTypeDef, number | {
         $get: string;
     } | undefined>;
-    thinkingEffort: ZodType<number | "high" | "medium" | "low" | "minimal" | {
+    thinkingEffort: ZodType<number | "high" | "low" | "medium" | "minimal" | {
         $get: string;
-    } | undefined, z.ZodTypeDef, number | "high" | "medium" | "low" | "minimal" | {
+    } | undefined, z.ZodTypeDef, number | "high" | "low" | "medium" | "minimal" | {
         $get: string;
     } | undefined>;
 }, z.ZodTypeAny, "passthrough">, z.objectInputType<{
@@ -117,9 +119,9 @@ declare const chatModelObjectSchema: z.ZodObject<{
     } | undefined, z.ZodTypeDef, number | {
         $get: string;
     } | undefined>;
-    thinkingEffort: ZodType<number | "high" | "medium" | "low" | "minimal" | {
+    thinkingEffort: ZodType<number | "high" | "low" | "medium" | "minimal" | {
         $get: string;
-    } | undefined, z.ZodTypeDef, number | "high" | "medium" | "low" | "minimal" | {
+    } | undefined, z.ZodTypeDef, number | "high" | "low" | "medium" | "minimal" | {
         $get: string;
     } | undefined>;
 }, z.ZodTypeAny, "passthrough">>;
@@ -149,4 +151,17 @@ export declare function camelizeSchema<T extends ZodType>(schema: T, { shallow }
     shallow?: boolean;
 }): T;
 export declare function preprocessSchema<T extends ZodType>(fn: (data: unknown) => unknown, schema: T): T;
+export type Instructions = {
+    role: Exclude<Role, "tool">;
+    content: string;
+    path: string;
+    cacheControl?: {
+        type: "ephemeral";
+        ttl?: "5m" | "1h";
+    };
+}[];
+export declare const getInstructionsSchema: ({ filepath }: {
+    filepath: string;
+}) => ZodType<Instructions>;
+export declare function instructionsToPromptBuilder(instructions: Instructions | string): PromptBuilder;
 export {};

package/lib/esm/loader/schema.js

@@ -2,6 +2,9 @@ import { nodejs } from "@aigne/platform-helpers/nodejs/index.js";
 import { parse } from "yaml";
 import { z } from "zod";
 import { getterSchema } from "../agents/agent.js";
+import { roleSchema } from "../agents/chat-model.js";
+import { PromptBuilder } from "../prompt/prompt-builder.js";
+import { ChatMessagesTemplate, parseChatMessages } from "../prompt/template.js";
 import { camelize } from "../utils/camelize.js";
 import { isRecord } from "../utils/type-utils.js";
 export const inputOutputSchema = ({ path }) => {
@@ -94,3 +97,57 @@ export function camelizeSchema(schema, { shallow = true } = {}) {
 export function preprocessSchema(fn, schema) {
     return z.preprocess(fn, schema);
 }
+const instructionItemSchema = camelizeSchema(z.union([
+    z.object({
+        role: roleSchema.default("system"),
+        url: z.string(),
+        cacheControl: optionalize(z.object({
+            type: z.literal("ephemeral"),
+            ttl: optionalize(z.union([z.literal("5m"), z.literal("1h")])),
+        })),
+    }),
+    z.object({
+        role: roleSchema.default("system"),
+        content: z.string(),
+        cacheControl: optionalize(z.object({
+            type: z.literal("ephemeral"),
+            ttl: optionalize(z.union([z.literal("5m"), z.literal("1h")])),
+        })),
+    }),
+]));
+const parseInstructionItem = ({ filepath }) => async ({ role, cacheControl, ...v }) => {
+    if (role === "tool")
+        throw new Error(`'tool' role is not allowed in instruction item in agent file ${filepath}`);
+    if ("content" in v && typeof v.content === "string") {
+        return { role, content: v.content, path: filepath, cacheControl };
+    }
+    if ("url" in v && typeof v.url === "string") {
+        const url = nodejs.path.isAbsolute(v.url)
+            ? v.url
+            : nodejs.path.join(nodejs.path.dirname(filepath), v.url);
+        return nodejs.fs
+            .readFile(url, "utf8")
+            .then((content) => ({ role, content, path: url, cacheControl }));
+    }
+    throw new Error(`Invalid instruction item in agent file ${filepath}. Expected 'content' or 'url' property`);
+};
+export const getInstructionsSchema = ({ filepath }) => z
+    .union([z.string(), instructionItemSchema, z.array(instructionItemSchema)])
+    .transform(async (v) => {
+    if (typeof v === "string")
+        return [{ role: "system", content: v, path: filepath }];
+    if (Array.isArray(v)) {
+        return Promise.all(v.map((item) => parseInstructionItem({ filepath })(item)));
+    }
+    return [await parseInstructionItem({ filepath })(v)];
+});
+export function instructionsToPromptBuilder(instructions) {
+    return new PromptBuilder({
+        instructions: typeof instructions === "string"
+            ? instructions
+            : ChatMessagesTemplate.from(parseChatMessages(instructions.map((i) => ({
+                ...i,
+                options: { workingDir: nodejs.path.dirname(i.path) },
+            })))),
+    });
+}

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

@@ -10,7 +10,7 @@ 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 { createPromptBuilderContext } from "./context/index.js";
-import { AFS_EXECUTABLE_TOOLS_PROMPT_TEMPLATE, getAFSSystemPrompt, } from "./prompts/afs-builtin-prompt.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";
@@ -116,7 +116,6 @@ export class PromptBuilder {
         const afs = options.agent?.afs;
         if (afs && options.agent?.historyConfig?.disabled !== true) {
             const historyModule = (await afs.listModules()).find((m) => m.module instanceof AFSHistory);
-            messages.push(await SystemMessageTemplate.from(await getAFSSystemPrompt(afs)).format({}));
             if (historyModule) {
                 const history = await afs.list(historyModule.path, {
                     limit: options.agent?.maxRetrieveMemoryCount || 10,

package/lib/esm/prompt/skills/afs/agent-skill/agent-skill.d.ts

@@ -0,0 +1,17 @@
+import { Agent, type AgentOptions, type Message } from "../../../../agents/agent.js";
+import type { Skill } from "./skill-loader.js";
+export interface SkillToolInput extends Message {
+    skill: string;
+    args?: string;
+}
+export interface SkillToolOutput extends Message {
+    result: string;
+}
+export interface SkillToolOptions extends AgentOptions<SkillToolInput, SkillToolOutput> {
+    agentSkills: Skill[];
+}
+export declare class AgentSkill extends Agent<SkillToolInput, SkillToolOutput> {
+    constructor(options: SkillToolOptions);
+    private agentSkills;
+    process(input: SkillToolInput): Promise<SkillToolOutput>;
+}

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

@@ -0,0 +1,59 @@
+import { z } from "zod";
+import { Agent } from "../../../../agents/agent.js";
+const skillToolInputSchema = z.object({
+    skill: z.string().describe("The name of the skill agent to invoke."),
+    args: z.string().optional().describe("The arguments to pass to the skill."),
+});
+export class AgentSkill extends Agent {
+    constructor(options) {
+        super({
+            name: "Skill",
+            taskTitle: "Invoke {{skill}}: {{args}}",
+            ...options,
+            description: `\
+Execute a skill within the main conversation
+
+<skills_instructions>
+When users ask you to perform tasks, check if any of the available skills below can help complete the task more effectively. Skills provide specialized capabilities and domain knowledge.
+
+When users ask you to run a "slash command" or reference "/" (e.g., "/commit", "/review-pr"), they are referring to a skill. Use this tool to invoke the corresponding skill.
+
+User: "run /commit" Assistant: [Calls Skill tool with skill: "commit"]
+How to invoke:
+
+Use this tool with the skill name and optional arguments
+
+Important:
+
+When a skill is relevant, you must invoke this tool IMMEDIATELY as your first action
+NEVER just announce or mention a skill in your text response without actually calling this tool
+This is a BLOCKING REQUIREMENT: invoke the relevant Skill tool BEFORE generating any other response about the task
+Only use skills listed in <available_skills> below
+Do not invoke a skill that is already running
+Do not use this tool for built-in CLI commands (like /help, /clear, etc.)
+</skills_instructions>
+
+<available_skills>
+${options.agentSkills.map((s) => `${s.name}: ${s.description}`).join("\n\n")}
+</available_skills>
+`,
+            inputSchema: skillToolInputSchema,
+        });
+        this.agentSkills = options.agentSkills;
+    }
+    agentSkills;
+    async process(input) {
+        const skill = this.agentSkills.find((s) => s.name === input.skill);
+        if (!skill)
+            throw new Error(`Skill not found: ${input.skill}`);
+        return {
+            result: `\
+Base directory for this skill: ${skill.path}
+
+${skill.content}
+
+${input.args ? `ARGUMENTS: ${input.args ?? "None"}` : ""}
+`,
+        };
+    }
+}