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

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

@@ -35,10 +35,13 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AIAgent = exports.aiAgentOptionsSchema = exports.aiAgentToolChoiceSchema = exports.AIAgentToolChoice = exports.DEFAULT_OUTPUT_FILE_KEY = exports.DEFAULT_OUTPUT_KEY = void 0;
 const zod_1 = require("zod");
+const agent_yaml_js_1 = require("../loader/agent-yaml.js");
+const schema_js_1 = require("../loader/schema.js");
 const prompt_builder_js_1 = require("../prompt/prompt-builder.js");
 const structured_stream_instructions_js_1 = require("../prompt/prompts/structured-stream-instructions.js");
-const template_js_1 = require("../prompt/template.js");
+const agent_skill_js_1 = require("../prompt/skills/afs/agent-skill/agent-skill.js");
 const fastq = __importStar(require("../utils/queue.js"));
+const stream_utils_js_1 = require("../utils/stream-utils.js");
 const structured_stream_extractor_js_1 = require("../utils/structured-stream-extractor.js");
 const type_utils_js_1 = require("../utils/type-utils.js");
 const agent_js_1 = require("./agent.js");
@@ -120,6 +123,91 @@ exports.aiAgentOptionsSchema = agent_js_1.agentOptionsSchema.extend({
  */
 class AIAgent extends agent_js_1.Agent {
     tag = "AIAgent";
+    static schema({ filepath }) {
+        const instructionsSchema = (0, schema_js_1.getInstructionsSchema)({ filepath });
+        const nestAgentSchema = (0, agent_yaml_js_1.getNestAgentSchema)({ filepath });
+        const schema = (0, schema_js_1.camelizeSchema)(zod_1.z.object({
+            instructions: (0, schema_js_1.optionalize)(instructionsSchema),
+            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(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()),
+            session: (0, schema_js_1.optionalize)((0, schema_js_1.camelizeSchema)(zod_1.z.object({
+                mode: (0, schema_js_1.optionalize)(zod_1.z.enum(["auto", "disabled"])),
+                sessionMemory: (0, schema_js_1.optionalize)((0, schema_js_1.camelizeSchema)(zod_1.z.object({
+                    mode: (0, schema_js_1.optionalize)(zod_1.z.enum(["auto", "disabled"])),
+                    memoryRatio: (0, schema_js_1.optionalize)(zod_1.z.number().min(0).max(1)),
+                    queryLimit: (0, schema_js_1.optionalize)(zod_1.z.number().int().min(0)),
+                    async: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
+                    extractor: (0, schema_js_1.optionalize)(nestAgentSchema),
+                }))),
+                userMemory: (0, schema_js_1.optionalize)((0, schema_js_1.camelizeSchema)(zod_1.z.object({
+                    mode: (0, schema_js_1.optionalize)(zod_1.z.enum(["auto", "disabled"])),
+                    memoryRatio: (0, schema_js_1.optionalize)(zod_1.z.number().min(0).max(1)),
+                    queryLimit: (0, schema_js_1.optionalize)(zod_1.z.number().int().min(0)),
+                    async: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
+                    extractor: (0, schema_js_1.optionalize)(nestAgentSchema),
+                }))),
+                compact: (0, schema_js_1.optionalize)((0, schema_js_1.camelizeSchema)(zod_1.z.object({
+                    mode: (0, schema_js_1.optionalize)(zod_1.z.enum(["auto", "disabled"])),
+                    maxTokens: zod_1.z.number().int().min(0).optional(),
+                    keepRecentRatio: (0, schema_js_1.optionalize)(zod_1.z.number().min(0).max(1)),
+                    async: (0, schema_js_1.optionalize)(zod_1.z.boolean()),
+                    compactor: (0, schema_js_1.optionalize)(nestAgentSchema),
+                }))),
+            }))),
+        }));
+        return schema;
+    }
+    static async load(options) {
+        const schema = AIAgent.schema(options);
+        const valid = await schema.parseAsync(options.parsed);
+        // Load nested agents from session config if present
+        const sessionCompactor = valid.session?.compact?.compactor
+            ? await options.options?.loadNestAgent(options.filepath, valid.session.compact.compactor, options.options)
+            : undefined;
+        const sessionMemoryExtractor = valid.session?.sessionMemory?.extractor
+            ? await options.options?.loadNestAgent(options.filepath, valid.session.sessionMemory.extractor, options.options)
+            : undefined;
+        const userMemoryExtractor = valid.session?.userMemory?.extractor
+            ? await options.options?.loadNestAgent(options.filepath, valid.session.userMemory.extractor, options.options)
+            : undefined;
+        // Build session configuration with loaded agents
+        const sessionConfig = valid.session
+            ? {
+                ...valid.session,
+                compact: valid.session.compact
+                    ? {
+                        ...valid.session.compact,
+                        compactor: sessionCompactor,
+                    }
+                    : undefined,
+                sessionMemory: valid.session.sessionMemory
+                    ? {
+                        ...valid.session.sessionMemory,
+                        extractor: sessionMemoryExtractor,
+                    }
+                    : undefined,
+                userMemory: valid.session.userMemory
+                    ? {
+                        ...valid.session.userMemory,
+                        extractor: userMemoryExtractor,
+                    }
+                    : undefined,
+            }
+            : undefined;
+        return new AIAgent({
+            ...options.parsed,
+            ...valid,
+            instructions: valid.instructions && (0, schema_js_1.instructionsToPromptBuilder)(valid.instructions),
+            session: sessionConfig,
+        });
+    }
     /**
      * Create an AIAgent with the specified options
      *
@@ -147,8 +235,6 @@ class AIAgent extends agent_js_1.Agent {
             typeof options.instructions === "string"
                 ? prompt_builder_js_1.PromptBuilder.from(options.instructions)
                 : (options.instructions ?? new prompt_builder_js_1.PromptBuilder());
-        this.autoReorderSystemMessages = options.autoReorderSystemMessages ?? true;
-        this.autoMergeSystemMessages = options.autoMergeSystemMessages ?? true;
         this.inputKey = options.inputKey;
         this.inputFileKey = options.inputFileKey;
         this.outputKey = options.outputKey || exports.DEFAULT_OUTPUT_KEY;
@@ -160,6 +246,7 @@ class AIAgent extends agent_js_1.Agent {
         this.memoryAgentsAsTools = options.memoryAgentsAsTools;
         this.memoryPromptTemplate = options.memoryPromptTemplate;
         this.useMemoriesFromContext = options.useMemoriesFromContext;
+        this.session = options.session;
         if (typeof options.catchToolsError === "boolean")
             this.catchToolsError = options.catchToolsError;
         this.structuredStreamMode = options.structuredStreamMode;
@@ -185,8 +272,6 @@ class AIAgent extends agent_js_1.Agent {
      * {@includeCode ../../test/agents/ai-agent.test.ts#example-ai-agent-prompt-builder}
      */
     instructions;
-    autoReorderSystemMessages;
-    autoMergeSystemMessages;
     /**
      * Pick a message from input to use as the user's message
      */
@@ -277,6 +362,10 @@ class AIAgent extends agent_js_1.Agent {
      * which outputs structured data in YAML format within <metadata> tags.
      */
     customStructuredStreamInstructions;
+    /**
+     * Agent session configuration
+     */
+    session;
     get inputSchema() {
         let schema = super.inputSchema;
         if (this.inputKey) {
@@ -303,7 +392,7 @@ class AIAgent extends agent_js_1.Agent {
         const model = this.model || options.model || options.context.model;
         if (!model)
             throw new Error("model is required to run AIAgent");
-        const { toolAgents, ...modelInput } = await this.instructions.build({
+        const { toolAgents, session, userMessage, ...modelInput } = await this.instructions.build({
             ...options,
             agent: this,
             input,
@@ -312,25 +401,35 @@ class AIAgent extends agent_js_1.Agent {
         modelInput.modelOptions = await model.getModelOptions(input, options);
         const toolsMap = new Map(toolAgents?.map((i) => [i.name, i]));
         if (this.toolChoice === "router") {
-            return yield* this._processRouter(input, model, modelInput, options, toolsMap);
+            return yield* this._processRouter(input, model, { messages: [...(await session.getMessages()), userMessage], ...modelInput }, options, toolsMap);
+        }
+        const inputMessage = this.inputKey ? input[this.inputKey] : undefined;
+        if (inputMessage) {
+            yield {
+                progress: {
+                    event: "message",
+                    message: { role: "user", content: [{ type: "text", text: inputMessage }] },
+                },
+            };
         }
-        const toolCallMessages = [];
+        await session.startMessage(input, userMessage, options);
+        // const toolCallMessages: ChatModelInputMessage[] = [];
         const outputKey = this.outputKey;
         for (;;) {
             const modelOutput = {};
-            let stream = await this.invokeChildAgent(model, { ...modelInput, messages: modelInput.messages.concat(toolCallMessages) }, { ...options, streaming: true });
+            let stream = await this.invokeChildAgent(model, { messages: await session.getMessages(), ...modelInput }, { ...options, streaming: true });
             if (this.structuredStreamMode) {
                 const { metadataStart, metadataEnd, parse } = this.customStructuredStreamInstructions || structured_stream_instructions_js_1.STRUCTURED_STREAM_INSTRUCTIONS;
                 stream = stream.pipeThrough(new structured_stream_extractor_js_1.ExtractMetadataTransform({ start: metadataStart, end: metadataEnd, parse }));
             }
             let isTextIgnored = false;
             for await (const value of stream) {
+                (0, stream_utils_js_1.mergeAgentResponseChunk)(modelOutput, value);
                 if ((0, agent_js_1.isAgentResponseDelta)(value)) {
                     if (!isTextIgnored && value.delta.text?.text) {
                         yield { delta: { text: { [outputKey]: value.delta.text.text } } };
                     }
                     if (value.delta.json) {
-                        Object.assign(modelOutput, value.delta.json);
                         if (this.structuredStreamMode) {
                             yield { delta: { json: value.delta.json.json } };
                             if (!isTextIgnored && modelOutput.json && this.ignoreTextOfStructuredStreamMode) {
@@ -340,14 +439,39 @@ class AIAgent extends agent_js_1.Agent {
                     }
                 }
             }
-            const { toolCalls, json, text, files } = modelOutput;
-            if (toolCalls?.length) {
+            const { toolCalls, json, text, thoughts, files } = modelOutput;
+            if (text || thoughts) {
+                const content = [];
+                if (thoughts) {
+                    content.push({ type: "text", text: thoughts, isThinking: true });
+                }
+                if (text) {
+                    content.push({ type: "text", text });
+                }
+                if (content.length) {
+                    const message = { role: "agent", content };
+                    yield { progress: { event: "message", message } };
+                    await session.appendCurrentMessages(message, options);
+                }
+            }
+            const toolCallsWithTools = toolCalls?.map((call) => {
+                const tool = toolsMap.get(call.function.name);
+                if (!tool)
+                    throw new Error(`Tool not found: ${call.function.name}`);
+                return {
+                    ...call,
+                    tool,
+                };
+            });
+            if (toolCallsWithTools?.length) {
                 if (this.keepTextInToolUses !== true) {
                     yield { delta: { json: { [outputKey]: "" } } };
                 }
                 else {
-                    yield { delta: { text: { [outputKey]: "\n" } } };
+                    yield { delta: { text: { [outputKey]: "\n\n" } } };
                 }
+                const toolCallMessage = { role: "agent", toolCalls };
+                yield { progress: { event: "message", message: toolCallMessage } };
                 const executedToolCalls = [];
                 let error;
                 const queue = fastq.promise(async ({ tool, call }) => {
@@ -364,7 +488,7 @@ class AIAgent extends agent_js_1.Agent {
                                 },
                             };
                         });
-                        executedToolCalls.push({ call, output });
+                        executedToolCalls.push({ call, tool, output });
                     }
                     catch (e) {
                         error = e;
@@ -372,21 +496,30 @@ class AIAgent extends agent_js_1.Agent {
                     }
                 }, this.toolCallsConcurrency || 1);
                 // Execute tools
-                for (const call of toolCalls) {
-                    const tool = toolsMap.get(call.function.name);
-                    if (!tool)
-                        throw new Error(`Tool not found: ${call.function.name}`);
-                    queue.push({ tool, call });
+                for (const call of toolCallsWithTools) {
+                    queue.push({ tool: call.tool, call });
                 }
                 await queue.drained();
                 if (error)
                     throw error;
+                const toolResultMessages = [];
                 // Continue LLM function calling loop if any tools were executed
                 if (executedToolCalls.length) {
+                    for (const { call, tool, output } of executedToolCalls) {
+                        const isAgentSkill = !output.isError && tool instanceof agent_skill_js_1.AgentSkill ? true : undefined;
+                        const text = await tool.formatOutput(output);
+                        const message = {
+                            role: "tool",
+                            toolCallId: call.id,
+                            content: [{ type: "text", text, isAgentSkill }],
+                        };
+                        yield { progress: { event: "message", message: message } };
+                        toolResultMessages.push(message);
+                    }
                     const transferOutput = executedToolCalls.find((i) => (0, types_js_1.isTransferAgentOutput)(i.output))?.output;
                     if (transferOutput)
                         return transferOutput;
-                    toolCallMessages.push(await template_js_1.AgentMessageTemplate.from(undefined, executedToolCalls.map(({ call }) => call)).format(), ...(await Promise.all(executedToolCalls.map(({ call, output }) => template_js_1.ToolMessageTemplate.from(output, call.id).format()))));
+                    await session.appendCurrentMessages([toolCallMessage, ...toolResultMessages], options);
                     continue;
                 }
             }
@@ -403,6 +536,7 @@ class AIAgent extends agent_js_1.Agent {
             if (!(0, type_utils_js_1.isEmpty)(result)) {
                 yield { delta: { json: result } };
             }
+            await session.endMessage(result, undefined, options);
             return;
         }
     }

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

@@ -57,7 +57,9 @@ export declare abstract class ChatModel extends Model<ChatModelInput, ChatModelO
     getModelCapabilities(): {
         supportsParallelToolCalls: boolean;
     };
+    getModelOptions(input: Message, options: AgentInvokeOptions): Promise<ChatModelInputOptions>;
     private validateToolNames;
+    countTokens(input: ChatModelInput): Promise<number>;
     /**
      * Normalizes tool names to ensure compatibility with language models
      *
@@ -203,6 +205,13 @@ export interface ChatModelInputMessage {
      * Name of the message sender (for multi-agent scenarios)
      */
     name?: string;
+    /**
+     * Cache control marker for the entire message (only supported by Claude)
+     *
+     * This is syntactic sugar that applies cacheControl to the last content block
+     * of the message. See {@link CacheControl} for details.
+     */
+    cacheControl?: CacheControl;
 }
 /**
  * Type of input message content
@@ -218,27 +227,66 @@ export type ChatModelInputMessageContent = string | UnionContent[];
 export type TextContent = {
     type: "text";
     text: string;
+    isThinking?: boolean;
+    isAgentSkill?: boolean;
+    /**
+     * Cache control marker (only supported by Claude)
+     *
+     * When set, this content block will be marked as a cache breakpoint.
+     * See {@link CacheControl} for details.
+     */
+    cacheControl?: CacheControl;
 };
 export declare const textContentSchema: z.ZodObject<{
     type: z.ZodLiteral<"text">;
     text: z.ZodString;
+    cacheControl: ZodType<{
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined, z.ZodTypeDef, {
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined>;
 }, "strip", z.ZodTypeAny, {
     type: "text";
     text: string;
+    cacheControl?: {
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined;
 }, {
     type: "text";
     text: string;
+    cacheControl?: {
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined;
 }>;
 export type UnionContent = TextContent | FileUnionContent;
 export declare const unionContentSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"text">;
     text: z.ZodString;
+    cacheControl: ZodType<{
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined, z.ZodTypeDef, {
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined>;
 }, "strip", z.ZodTypeAny, {
     type: "text";
     text: string;
+    cacheControl?: {
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined;
 }, {
     type: "text";
     text: string;
+    cacheControl?: {
+        type: "ephemeral";
+        ttl?: "5m" | "1h" | undefined;
+    } | undefined;
 }>, z.ZodObject<{
     filename: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
     mimeType: ZodType<string | undefined, z.ZodTypeDef, string | undefined>;
@@ -340,6 +388,14 @@ export interface ChatModelInputTool {
      * For example, Gemini's thought_signature
      */
     metadata?: Record<string, any>;
+    /**
+     * Cache control marker (only supported by Claude)
+     *
+     * When set, this tool definition will be marked as a cache breakpoint.
+     * Typically applied to the last tool in the tools array.
+     * See {@link CacheControl} for details.
+     */
+    cacheControl?: CacheControl;
 }
 /**
  * Tool selection strategy
@@ -362,6 +418,82 @@ export type ChatModelInputToolChoice = "auto" | "none" | "required" | {
     };
 };
 export type Modality = "text" | "image" | "audio";
+/**
+ * Cache control marker for prompt caching
+ *
+ * Used to mark content blocks, messages, or tools for caching.
+ * Currently only supported by Anthropic (Claude) models.
+ */
+export interface CacheControl {
+    /**
+     * Cache type (currently only "ephemeral" is supported)
+     */
+    type: "ephemeral";
+    /**
+     * Cache TTL (Time To Live)
+     * - "5m": 5 minutes (default)
+     * - "1h": 1 hour
+     */
+    ttl?: "5m" | "1h";
+}
+/**
+ * Cache configuration options
+ *
+ * Controls how prompt caching is used for supported providers.
+ * Prompt caching can significantly reduce costs and latency by reusing
+ * previously processed prompts (system messages, tool definitions, etc.).
+ */
+export interface CacheConfig {
+    /**
+     * Whether to enable prompt caching
+     *
+     * - OpenAI: Ignored (always enabled automatically)
+     * - Gemini: Controls explicit caching
+     * - Claude: Controls whether to add cache_control markers
+     *
+     * @default true
+     */
+    enabled?: boolean;
+    /**
+     * Cache TTL (Time To Live)
+     *
+     * - OpenAI: Ignored (automatic)
+     * - Gemini: Supports custom seconds
+     * - Claude: Only supports "5m" or "1h"
+     *
+     * @default "5m"
+     */
+    ttl?: "5m" | "1h" | number;
+    /**
+     * Caching strategy
+     *
+     * - "auto": Automatically add cache breakpoints at optimal locations
+     * - "manual": Require explicit cacheControl markers on messages/tools
+     *
+     * @default "auto"
+     */
+    strategy?: "auto" | "manual";
+    /**
+     * Auto cache breakpoint locations (only effective when strategy="auto")
+     *
+     * @default { tools: true, system: true, lastMessage: false }
+     */
+    autoBreakpoints?: {
+        /** Cache tool definitions */
+        tools?: boolean;
+        /** Cache system messages */
+        system?: boolean;
+        /** Cache last message in conversation history */
+        lastMessage?: boolean;
+    };
+}
+/**
+ * Default cache configuration
+ *
+ * Enables automatic caching for system messages and tool definitions,
+ * which typically provides the best cost/performance tradeoff.
+ */
+export declare const DEFAULT_CACHE_CONFIG: CacheConfig;
 /**
  * Model-specific configuration options
  *
@@ -395,6 +527,15 @@ export interface ChatModelInputOptions extends Record<string, unknown> {
     modalities?: Modality[];
     preferInputFileType?: "file" | "url";
     reasoningEffort?: number | "minimal" | "low" | "medium" | "high";
+    /**
+     * Cache configuration for prompt caching
+     *
+     * Enables caching of system messages, tool definitions, and conversation history
+     * to reduce costs and latency. See {@link CacheConfig} for details.
+     *
+     * @default DEFAULT_CACHE_CONFIG (enabled with auto strategy)
+     */
+    cacheConfig?: CacheConfig;
 }
 export type ChatModelInputOptionsWithGetter = GetterSchema<ChatModelInputOptions>;
 /**
@@ -492,6 +633,16 @@ export interface ChatModelOutputUsage {
      * AIGNE Hub credit usage
      */
     aigneHubCredits?: number;
+    /**
+     * Number of tokens written to cache (first time caching)
+     * Only applicable for providers that support explicit cache creation (e.g., Anthropic)
+     */
+    cacheCreationInputTokens?: number;
+    /**
+     * Number of tokens read from cache (cache hit)
+     * Supported by OpenAI, Anthropic, and Gemini
+     */
+    cacheReadInputTokens?: number;
     /**
      * Credit prefix
      */
@@ -501,15 +652,21 @@ export declare const chatModelOutputUsageSchema: 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;
 }>;