@aigne/core 1.72.0-beta.2 → 1.72.0-beta.4

package/lib/cjs/agents/image-model.d.ts

@@ -91,6 +91,7 @@ export declare const imageModelInputSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     prompt: string;
     modelOptions?: Record<string, unknown> | undefined;
+    outputFileType?: "local" | "url" | "file" | undefined;
     image?: ({
         type: "url";
         url: string;
@@ -107,11 +108,11 @@ export declare const imageModelInputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     })[] | undefined;
-    outputFileType?: "local" | "file" | "url" | undefined;
     n?: number | undefined;
 }, {
     prompt: string;
     modelOptions?: Record<string, unknown> | undefined;
+    outputFileType?: "local" | "url" | "file" | undefined;
     image?: ({
         type: "url";
         url: string;
@@ -128,7 +129,6 @@ export declare const imageModelInputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     })[] | undefined;
-    outputFileType?: "local" | "file" | "url" | undefined;
     n?: number | undefined;
 }>;
 export interface ImageModelOutput extends Message {
@@ -196,16 +196,22 @@ export declare const imageModelOutputSchema: z.ZodObject<{
         inputTokens: z.ZodNumber;
         outputTokens: z.ZodNumber;
         aigneHubCredits: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+        cacheCreationInputTokens: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+        cacheReadInputTokens: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
         creditPrefix: ZodType<"$" | "€" | "¥" | undefined, z.ZodTypeDef, "$" | "€" | "¥" | undefined>;
     }, "strip", z.ZodTypeAny, {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     }, {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     }>>;
     model: z.ZodOptional<z.ZodString>;
@@ -226,13 +232,15 @@ export declare const imageModelOutputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     })[];
-    model?: string | undefined;
     usage?: {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     } | undefined;
+    model?: string | undefined;
 }, {
     images: ({
         type: "url";
@@ -250,11 +258,13 @@ export declare const imageModelOutputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     })[];
-    model?: string | undefined;
     usage?: {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     } | undefined;
+    model?: string | undefined;
 }>;

package/lib/cjs/agents/mcp-agent.d.ts

@@ -58,6 +58,23 @@ export type SSEServerParameters = {
  */
 export declare class MCPAgent extends Agent {
     tag: string;
+    static schema(): z.ZodObject<{
+        url: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+        command: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+        args: ZodType<string[] | undefined, z.ZodTypeDef, string[] | undefined>;
+    }, "strip", z.ZodTypeAny, {
+        url?: string | undefined;
+        args?: string[] | undefined;
+        command?: string | undefined;
+    }, {
+        url?: string | undefined;
+        args?: string[] | undefined;
+        command?: string | undefined;
+    }>;
+    static load<I extends Message = any, O extends Message = any>(options: {
+        filepath: string;
+        parsed: object;
+    }): Promise<Agent<I, O>>;
     /**
      * Create an MCPAgent from a connection to an SSE server.
      *

package/lib/cjs/agents/mcp-agent.js

@@ -41,6 +41,7 @@ const sse_js_1 = require("@modelcontextprotocol/sdk/client/sse.js");
 const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
 const uriTemplate_js_1 = require("@modelcontextprotocol/sdk/shared/uriTemplate.js");
 const zod_1 = require("zod");
+const schema_js_1 = require("../loader/schema.js");
 const logger_js_1 = require("../utils/logger.js");
 const mcp_utils_js_1 = require("../utils/mcp-utils.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
@@ -85,6 +86,23 @@ function getMCPServerString(options) {
  */
 class MCPAgent extends agent_js_1.Agent {
     tag = "MCPAgent";
+    static schema() {
+        return zod_1.z.object({
+            url: (0, schema_js_1.optionalize)(zod_1.z.string()),
+            command: (0, schema_js_1.optionalize)(zod_1.z.string()),
+            args: (0, schema_js_1.optionalize)(zod_1.z.array(zod_1.z.string())),
+        });
+    }
+    static async load(options) {
+        const valid = await MCPAgent.schema().parseAsync(options.parsed);
+        if (!valid.url && !valid.command) {
+            throw new Error(`Missing url or command in mcp agent: ${options.filepath}`);
+        }
+        return MCPAgent.from({
+            ...options.parsed,
+            ...valid,
+        });
+    }
     static from(options) {
         (0, type_utils_js_1.checkArguments)("MCPAgent.from", mcpAgentOptionsSchema, options);
         if (isSSEServerParameters(options)) {

package/lib/cjs/agents/team-agent.d.ts

@@ -1,3 +1,5 @@
+import { z } from "zod";
+import type { AgentLoadOptions } from "../loader/index.js";
 import { type PromiseOrValue } from "../utils/type-utils.js";
 import { Agent, type AgentInvokeOptions, type AgentOptions, type AgentProcessResult, type Message } from "./agent.js";
 /**
@@ -200,6 +202,59 @@ export interface TeamAgentOptions<I extends Message, O extends Message> extends
  */
 export declare class TeamAgent<I extends Message, O extends Message> extends Agent<I, O> {
     tag: string;
+    static schema({ filepath }: {
+        filepath: string;
+    }): z.ZodObject<{
+        mode: z.ZodType<ProcessMode | undefined, z.ZodTypeDef, ProcessMode | undefined>;
+        iterateOn: z.ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
+        concurrency: z.ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+        iterateWithPreviousOutput: z.ZodType<boolean | undefined, z.ZodTypeDef, boolean | undefined>;
+        includeAllStepsOutput: z.ZodType<boolean | undefined, z.ZodTypeDef, boolean | undefined>;
+        reflection: z.ZodType<{
+            reviewer: import("../loader/agent-yaml.js").NestAgentSchema;
+            isApproved: string;
+            maxIterations?: number | undefined;
+            returnLastOnMaxIterations?: boolean | undefined;
+            customErrorMessage?: string | undefined;
+        } | undefined, z.ZodTypeDef, {
+            reviewer: import("../loader/agent-yaml.js").NestAgentSchema;
+            isApproved: string;
+            maxIterations?: number | undefined;
+            returnLastOnMaxIterations?: boolean | undefined;
+            customErrorMessage?: string | undefined;
+        } | undefined>;
+    }, "strip", z.ZodTypeAny, {
+        mode?: ProcessMode | undefined;
+        reflection?: {
+            reviewer: import("../loader/agent-yaml.js").NestAgentSchema;
+            isApproved: string;
+            maxIterations?: number | undefined;
+            returnLastOnMaxIterations?: boolean | undefined;
+            customErrorMessage?: string | undefined;
+        } | undefined;
+        iterateOn?: string | undefined;
+        concurrency?: number | undefined;
+        iterateWithPreviousOutput?: boolean | undefined;
+        includeAllStepsOutput?: boolean | undefined;
+    }, {
+        mode?: ProcessMode | undefined;
+        reflection?: {
+            reviewer: import("../loader/agent-yaml.js").NestAgentSchema;
+            isApproved: string;
+            maxIterations?: number | undefined;
+            returnLastOnMaxIterations?: boolean | undefined;
+            customErrorMessage?: string | undefined;
+        } | undefined;
+        iterateOn?: string | undefined;
+        concurrency?: number | undefined;
+        iterateWithPreviousOutput?: boolean | undefined;
+        includeAllStepsOutput?: boolean | undefined;
+    }>;
+    static load<I extends Message = any, O extends Message = any>(options: {
+        filepath: string;
+        parsed: object;
+        options: AgentLoadOptions;
+    }): Promise<Agent<I, O>>;
     /**
      * Create a TeamAgent from the provided options.
      *

package/lib/cjs/agents/team-agent.js

@@ -39,6 +39,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamAgent = exports.DEFAULT_REFLECTION_MAX_ITERATIONS = exports.ProcessMode = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
 const immer_1 = require("immer");
+const zod_1 = require("zod");
+const agent_yaml_js_1 = require("../loader/agent-yaml.js");
+const schema_js_1 = require("../loader/schema.js");
 const fastq = __importStar(require("../utils/queue.js"));
 const stream_utils_js_1 = require("../utils/stream-utils.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
@@ -86,6 +89,34 @@ exports.DEFAULT_REFLECTION_MAX_ITERATIONS = 3;
  */
 class TeamAgent extends agent_js_1.Agent {
     tag = "TeamAgent";
+    static schema({ filepath }) {
+        const nestAgentSchema = (0, agent_yaml_js_1.getNestAgentSchema)({ filepath });
+        return zod_1.z.object({
+            mode: (0, schema_js_1.optionalize)(zod_1.z.nativeEnum(ProcessMode)),
+            iterateOn: (0, schema_js_1.optionalize)(zod_1.z.string()),
+            concurrency: (0, schema_js_1.optionalize)(zod_1.z.number().int().min(1)),
+            iterateWithPreviousOutput: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
+            includeAllStepsOutput: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
+            reflection: (0, schema_js_1.camelizeSchema)((0, schema_js_1.optionalize)(zod_1.z.object({
+                reviewer: nestAgentSchema,
+                isApproved: zod_1.z.string(),
+                maxIterations: (0, schema_js_1.optionalize)(zod_1.z.number().int().min(1)),
+                returnLastOnMaxIterations: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
+                customErrorMessage: (0, schema_js_1.optionalize)(zod_1.z.string()),
+            }))),
+        });
+    }
+    static async load(options) {
+        const valid = await TeamAgent.schema({ filepath: options.filepath }).parseAsync(options.parsed);
+        return TeamAgent.from({
+            ...options.parsed,
+            ...valid,
+            reflection: valid.reflection && {
+                ...valid.reflection,
+                reviewer: await options.options.loadNestAgent(options.filepath, valid.reflection.reviewer, options.options),
+            },
+        });
+    }
     /**
      * Create a TeamAgent from the provided options.
      *

package/lib/cjs/agents/transform-agent.d.ts

@@ -1,3 +1,4 @@
+import { z } from "zod";
 import { Agent, type AgentOptions, type Message } from "./agent.js";
 /**
  * Configuration options for TransformAgent
@@ -47,6 +48,17 @@ export interface TransformAgentOptions<I extends Message, O extends Message> ext
  */
 export declare class TransformAgent<I extends Message = Message, O extends Message = Message> extends Agent<I, O> {
     static type: string;
+    static schema(): z.ZodObject<{
+        jsonata: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        jsonata: string;
+    }, {
+        jsonata: string;
+    }>;
+    static load<I extends Message = any, O extends Message = any>(options: {
+        filepath: string;
+        parsed: object;
+    }): Promise<Agent<I, O>>;
     /**
      * Factory method to create a new TransformAgent instance
      *

package/lib/cjs/agents/transform-agent.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransformAgent = void 0;
 const jsonata_1 = __importDefault(require("jsonata"));
+const zod_1 = require("zod");
 const agent_js_1 = require("./agent.js");
 /**
  * TransformAgent - A specialized agent for data transformation using JSONata expressions
@@ -23,6 +24,18 @@ const agent_js_1 = require("./agent.js");
  */
 class TransformAgent extends agent_js_1.Agent {
     static type = "TransformAgent";
+    static schema() {
+        return zod_1.z.object({
+            jsonata: zod_1.z.string(),
+        });
+    }
+    static async load(options) {
+        const parsed = await TransformAgent.schema().parseAsync(options.parsed);
+        return TransformAgent.from({
+            ...options.parsed,
+            ...parsed,
+        });
+    }
     /**
      * Factory method to create a new TransformAgent instance
      *

package/lib/cjs/agents/video-model.d.ts

@@ -94,6 +94,7 @@ export declare const videoModelInputSchema: z.ZodObject<{
     prompt: string;
     model?: string | undefined;
     modelOptions?: Record<string, unknown> | undefined;
+    outputFileType?: "local" | "url" | "file" | undefined;
     image?: {
         type: "url";
         url: string;
@@ -110,13 +111,13 @@ export declare const videoModelInputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     } | undefined;
-    outputFileType?: "local" | "file" | "url" | undefined;
     size?: string | undefined;
     seconds?: string | undefined;
 }, {
     prompt: string;
     model?: string | undefined;
     modelOptions?: Record<string, unknown> | undefined;
+    outputFileType?: "local" | "url" | "file" | undefined;
     image?: {
         type: "url";
         url: string;
@@ -133,7 +134,6 @@ export declare const videoModelInputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     } | undefined;
-    outputFileType?: "local" | "file" | "url" | undefined;
     size?: string | undefined;
     seconds?: string | undefined;
 }>;
@@ -203,16 +203,22 @@ export declare const videoModelOutputSchema: z.ZodObject<{
         inputTokens: z.ZodNumber;
         outputTokens: z.ZodNumber;
         aigneHubCredits: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+        cacheCreationInputTokens: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
+        cacheReadInputTokens: ZodType<number | undefined, z.ZodTypeDef, number | undefined>;
         creditPrefix: ZodType<"$" | "€" | "¥" | undefined, z.ZodTypeDef, "$" | "€" | "¥" | undefined>;
     }, "strip", z.ZodTypeAny, {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     }, {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     }>>;
     model: z.ZodOptional<z.ZodString>;
@@ -234,13 +240,15 @@ export declare const videoModelOutputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     })[];
-    model?: string | undefined;
     usage?: {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     } | undefined;
+    model?: string | undefined;
     seconds?: number | undefined;
 }, {
     videos: ({
@@ -259,12 +267,14 @@ export declare const videoModelOutputSchema: z.ZodObject<{
         filename?: string | undefined;
         mimeType?: string | undefined;
     })[];
-    model?: string | undefined;
     usage?: {
         inputTokens: number;
         outputTokens: number;
         aigneHubCredits?: number | undefined;
+        cacheCreationInputTokens?: number | undefined;
+        cacheReadInputTokens?: number | undefined;
         creditPrefix?: "$" | "€" | "¥" | undefined;
     } | undefined;
+    model?: string | undefined;
     seconds?: number | undefined;
 }>;

package/lib/cjs/aigne/usage.d.ts

@@ -8,6 +8,10 @@ export interface ContextUsage {
     creditPrefix?: "$" | "€" | "¥";
     agentCalls: number;
     duration: number;
+    /** Number of tokens written to cache (first time caching) */
+    cacheCreationInputTokens: number;
+    /** Number of tokens read from cache (cache hit) */
+    cacheReadInputTokens: number;
 }
 /**
  * @hidden

package/lib/cjs/aigne/usage.js

@@ -12,6 +12,8 @@ function newEmptyContextUsage() {
         aigneHubCredits: 0,
         agentCalls: 0,
         duration: 0,
+        cacheCreationInputTokens: 0,
+        cacheReadInputTokens: 0,
     };
 }
 function mergeContextUsage(usage, additional) {
@@ -25,4 +27,8 @@ function mergeContextUsage(usage, additional) {
         usage.agentCalls += additional.agentCalls;
     if (additional.duration)
         usage.duration += additional.duration;
+    if (additional.cacheCreationInputTokens)
+        usage.cacheCreationInputTokens += additional.cacheCreationInputTokens;
+    if (additional.cacheReadInputTokens)
+        usage.cacheReadInputTokens += additional.cacheReadInputTokens;
 }

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

@@ -1,9 +1,6 @@
 import type { AFSOptions } from "@aigne/afs";
 import { type ZodType, z } from "zod";
-import type { AgentClass, AgentHooks, FunctionAgentFn, TaskRenderMode } from "../agents/agent.js";
-import { AIAgentToolChoice } from "../agents/ai-agent.js";
-import { type Role } from "../agents/chat-model.js";
-import { ProcessMode, type ReflectionMode } from "../agents/team-agent.js";
+import type { AgentHooks, TaskRenderMode } from "../agents/agent.js";
 import type { LoadOptions } from "./index.js";
 import { chatModelSchema, imageModelSchema } from "./schema.js";
 export interface HooksSchema {
@@ -45,7 +42,8 @@ export interface AFSContextSchema {
         presets?: Record<string, AFSContextPresetSchema>;
     };
 }
-export interface BaseAgentSchema {
+export interface AgentSchema {
+    type: string;
     name?: string;
     description?: string;
     model?: z.infer<typeof chatModelSchema>;
@@ -67,67 +65,11 @@ export interface BaseAgentSchema {
         context?: AFSContextSchema;
     });
     shareAFS?: boolean;
+    [key: string]: unknown;
 }
-export type Instructions = {
-    role: Exclude<Role, "tool">;
-    content: string;
-    path: string;
-}[];
-export interface AIAgentSchema extends BaseAgentSchema {
-    type: "ai";
-    instructions?: Instructions;
-    autoReorderSystemMessages?: boolean;
-    autoMergeSystemMessages?: boolean;
-    inputKey?: string;
-    inputFileKey?: string;
-    outputKey?: string;
-    outputFileKey?: string;
-    toolChoice?: AIAgentToolChoice;
-    toolCallsConcurrency?: number;
-    keepTextInToolUses?: boolean;
-}
-export interface ImageAgentSchema extends BaseAgentSchema {
-    type: "image";
-    instructions: Instructions;
-    inputFileKey?: string;
-}
-export interface MCPAgentSchema extends BaseAgentSchema {
-    type: "mcp";
-    url?: string;
-    command?: string;
-    args?: string[];
-}
-export interface TeamAgentSchema extends BaseAgentSchema {
-    type: "team";
-    mode?: ProcessMode;
-    iterateOn?: string;
-    concurrency?: number;
-    iterateWithPreviousOutput?: boolean;
-    includeAllStepsOutput?: boolean;
-    reflection?: Omit<ReflectionMode, "reviewer"> & {
-        reviewer: NestAgentSchema;
-    };
-}
-export interface TransformAgentSchema extends BaseAgentSchema {
-    type: "transform";
-    jsonata: string;
-}
-export interface FunctionAgentSchema extends BaseAgentSchema {
-    type: "function";
-    process: FunctionAgentFn;
-}
-export interface ThirdAgentSchema extends BaseAgentSchema {
-    agentClass?: AgentClass;
-    type: "";
-    [key: string]: any;
-}
-export type AgentSchema = AIAgentSchema | ImageAgentSchema | MCPAgentSchema | TeamAgentSchema | TransformAgentSchema | FunctionAgentSchema | ThirdAgentSchema;
 export declare function parseAgentFile(path: string, data: any, options: LoadOptions): Promise<AgentSchema>;
 export declare function loadAgentFromYamlFile(path: string, options: LoadOptions): Promise<AgentSchema>;
-export declare const getInstructionsSchema: ({ filepath }: {
-    filepath: string;
-}) => ZodType<Instructions>;
-export declare const getAgentSchema: ({ filepath, options, }: {
+export declare const getAgentSchema: ({ filepath }: {
     filepath: string;
     options?: LoadOptions;
 }) => ZodType<AgentSchema, z.ZodTypeDef, AgentSchema>;

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

@@ -1,17 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNestAgentSchema = exports.getAgentSchema = exports.getInstructionsSchema = void 0;
+exports.getNestAgentSchema = exports.getAgentSchema = void 0;
 exports.parseAgentFile = parseAgentFile;
 exports.loadAgentFromYamlFile = loadAgentFromYamlFile;
 const json_schema_to_zod_1 = require("@aigne/json-schema-to-zod");
 const index_js_1 = require("@aigne/platform-helpers/nodejs/index.js");
 const yaml_1 = require("yaml");
 const zod_1 = require("zod");
-const ai_agent_js_1 = require("../agents/ai-agent.js");
-const chat_model_js_1 = require("../agents/chat-model.js");
-const team_agent_js_1 = require("../agents/team-agent.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
-const function_agent_js_1 = require("./function-agent.js");
 const schema_js_1 = require("./schema.js");
 async function parseAgentFile(path, data, options) {
     const agentSchema = (0, exports.getAgentSchema)({ filepath: path, options });
@@ -30,42 +26,7 @@ async function loadAgentFromYamlFile(path, options) {
     }, options), (error) => new Error(`Failed to validate agent definition from ${path}: ${error.message}`));
     return agent;
 }
-const instructionItemSchema = zod_1.z.union([
-    zod_1.z.object({
-        role: chat_model_js_1.roleSchema.default("system"),
-        url: zod_1.z.string(),
-    }),
-    zod_1.z.object({
-        role: chat_model_js_1.roleSchema.default("system"),
-        content: zod_1.z.string(),
-    }),
-]);
-const parseInstructionItem = ({ filepath }) => async ({ role, ...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 };
-    }
-    if ("url" in v && typeof v.url === "string") {
-        const url = index_js_1.nodejs.path.isAbsolute(v.url)
-            ? v.url
-            : index_js_1.nodejs.path.join(index_js_1.nodejs.path.dirname(filepath), v.url);
-        return index_js_1.nodejs.fs.readFile(url, "utf8").then((content) => ({ role, content, path: url }));
-    }
-    throw new Error(`Invalid instruction item in agent file ${filepath}. Expected 'content' or 'url' property`);
-};
-const getInstructionsSchema = ({ filepath }) => zod_1.z
-    .union([zod_1.z.string(), instructionItemSchema, zod_1.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)];
-});
-exports.getInstructionsSchema = getInstructionsSchema;
-const getAgentSchema = ({ filepath, options, }) => {
+const getAgentSchema = ({ filepath }) => {
     const agentSchema = zod_1.z.lazy(() => {
         const nestAgentSchema = zod_1.z.lazy(() => zod_1.z.union([
             agentSchema,
@@ -101,6 +62,7 @@ const getAgentSchema = ({ filepath, options, }) => {
             }))),
         });
         const baseAgentSchema = zod_1.z.object({
+            type: zod_1.z.string(),
             name: (0, schema_js_1.optionalize)(zod_1.z.string()),
             alias: (0, schema_js_1.optionalize)(zod_1.z.array(zod_1.z.string())),
             description: (0, schema_js_1.optionalize)(zod_1.z.string()),
@@ -139,94 +101,7 @@ const getAgentSchema = ({ filepath, options, }) => {
             ])),
             shareAFS: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
         });
-        const instructionsSchema = (0, exports.getInstructionsSchema)({ filepath: filepath });
-        return (0, schema_js_1.camelizeSchema)((0, schema_js_1.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;
-        }, zod_1.z.union([
-            zod_1.z
-                .object({
-                type: zod_1.z.string(),
-                agentClass: zod_1.z.custom((v) => typeof v?.prototype?.constructor === "function"),
-            })
-                .extend(baseAgentSchema.shape)
-                .passthrough(),
-            zod_1.z.discriminatedUnion("type", [
-                zod_1.z
-                    .object({
-                    type: zod_1.z.literal("ai"),
-                    instructions: (0, schema_js_1.optionalize)(instructionsSchema),
-                    autoReorderSystemMessages: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                    autoMergeSystemMessages: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                    inputKey: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    outputKey: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    inputFileKey: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    outputFileKey: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    toolChoice: (0, schema_js_1.optionalize)(zod_1.z.nativeEnum(ai_agent_js_1.AIAgentToolChoice)),
-                    toolCallsConcurrency: (0, schema_js_1.optionalize)(zod_1.z.number().int().min(0)),
-                    keepTextInToolUses: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                    catchToolsError: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                    structuredStreamMode: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                })
-                    .extend(baseAgentSchema.shape),
-                zod_1.z
-                    .object({
-                    type: zod_1.z.literal("image"),
-                    instructions: instructionsSchema,
-                    inputFileKey: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                })
-                    .extend(baseAgentSchema.shape),
-                zod_1.z
-                    .object({
-                    type: zod_1.z.literal("mcp"),
-                    url: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    command: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    args: (0, schema_js_1.optionalize)(zod_1.z.array(zod_1.z.string())),
-                })
-                    .extend(baseAgentSchema.shape),
-                zod_1.z
-                    .object({
-                    type: zod_1.z.literal("team"),
-                    mode: (0, schema_js_1.optionalize)(zod_1.z.nativeEnum(team_agent_js_1.ProcessMode)),
-                    iterateOn: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    concurrency: (0, schema_js_1.optionalize)(zod_1.z.number().int().min(1)),
-                    iterateWithPreviousOutput: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                    includeAllStepsOutput: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                    reflection: (0, schema_js_1.camelizeSchema)((0, schema_js_1.optionalize)(zod_1.z.object({
-                        reviewer: nestAgentSchema,
-                        isApproved: zod_1.z.string(),
-                        maxIterations: (0, schema_js_1.optionalize)(zod_1.z.number().int().min(1)),
-                        returnLastOnMaxIterations: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
-                        customErrorMessage: (0, schema_js_1.optionalize)(zod_1.z.string()),
-                    }))),
-                })
-                    .extend(baseAgentSchema.shape),
-                zod_1.z
-                    .object({
-                    type: zod_1.z.literal("transform"),
-                    jsonata: zod_1.z.string(),
-                })
-                    .extend(baseAgentSchema.shape),
-                zod_1.z
-                    .object({
-                    type: zod_1.z.literal("function"),
-                    process: zod_1.z.preprocess((v) => (typeof v === "string" ? (0, function_agent_js_1.codeToFunctionAgentFn)(v) : v), zod_1.z.custom()),
-                })
-                    .extend(baseAgentSchema.shape),
-            ]),
-        ])));
+        return (0, schema_js_1.camelizeSchema)(baseAgentSchema.passthrough());
     });
     return agentSchema;
 };