@aigne/core 1.72.0-beta.10 → 1.72.0-beta.12

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [1.72.0-beta.12](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.72.0-beta.11...core-v1.72.0-beta.12) (2026-01-07)
+
+
+### Bug Fixes
+
+* **afs:** support `~` in the local path for local-fs & add agent-skill example ([#877](https://github.com/AIGNE-io/aigne-framework/issues/877)) ([c86293f](https://github.com/AIGNE-io/aigne-framework/commit/c86293f3d70447974395d02e238305a42b256b66))
+
+## [1.72.0-beta.11](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.72.0-beta.10...core-v1.72.0-beta.11) (2026-01-06)
+
+
+### Bug Fixes
+
+* **core:** preserve Agent Skill in session compact and support complex tool result content ([#876](https://github.com/AIGNE-io/aigne-framework/issues/876)) ([edb86ae](https://github.com/AIGNE-io/aigne-framework/commit/edb86ae2b9cfe56a8f08b276f843606e310566cf))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @aigne/afs bumped to 1.4.0-beta.6
+    * @aigne/afs-history bumped to 1.2.0-beta.7
+
 ## [1.72.0-beta.10](https://github.com/AIGNE-io/aigne-framework/compare/core-v1.72.0-beta.9...core-v1.72.0-beta.10) (2026-01-06)
 
 

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

@@ -513,6 +513,7 @@ export declare abstract class Agent<I extends Message = any, O extends Message =
      */
     protected postprocess(input: I, output: O, options: AgentInvokeOptions): Promise<void>;
     protected publishToTopics(output: Message, options: AgentInvokeOptions): Promise<void>;
+    formatOutput(output: O): PromiseOrValue<string>;
     /**
      * Core processing method of the agent, must be implemented in subclasses
      *

package/lib/cjs/agents/agent.js

@@ -715,6 +715,9 @@ class Agent {
             });
         }
     }
+    formatOutput(output) {
+        return JSON.stringify(output);
+    }
     /**
      * Shut down the agent and clean up resources
      *

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

@@ -454,21 +454,6 @@ class AIAgent extends agent_js_1.Agent {
                 }
                 const message = { role: "agent", toolCalls };
                 yield { progress: { event: "message", message } };
-                const skillToolUse = toolCallsWithTools.find((i) => i.tool instanceof agent_skill_js_1.AgentSkill);
-                if (skillToolUse) {
-                    await session.endMessage(skillToolUse.function, {
-                        role: "agent",
-                        content: JSON.stringify({ ...skillToolUse.function }),
-                    }, options);
-                    const skillResult = await this.invokeSkill(skillToolUse.tool, { ...input, ...skillToolUse.function.arguments }, options);
-                    await session.startMessage(skillToolUse.function.arguments, {
-                        role: "user",
-                        content: [
-                            { type: "text", text: agent_skill_js_1.AgentSkill.formatOutput(skillResult), isAgentSkill: true },
-                        ],
-                    }, options);
-                    continue;
-                }
                 await session.appendCurrentMessages(message, options);
                 const executedToolCalls = [];
                 let error;
@@ -502,11 +487,13 @@ class AIAgent extends agent_js_1.Agent {
                     throw error;
                 // Continue LLM function calling loop if any tools were executed
                 if (executedToolCalls.length) {
-                    for (const { call, output } of executedToolCalls) {
+                    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: JSON.stringify(output),
+                            content: [{ type: "text", text, isAgentSkill }],
                         };
                         yield { progress: { event: "message", message: message } };
                         await session.appendCurrentMessages(message, options);

package/lib/cjs/prompt/agent-session.d.ts

@@ -103,8 +103,8 @@ export declare class AgentSession {
      */
     private loadUserMemory;
     /**
-     * Load session history including compact summary and history entries
-     * @returns Object containing compact summary and history entries
+     * Load session history including compact content and history entries
+     * @returns Object containing history compact and history entries
      */
     private loadSessionHistory;
     /**
@@ -125,6 +125,24 @@ export declare class AgentSession {
      * Internal method that performs the actual user memory extraction
      */
     private doUpdateUserMemory;
+    /**
+     * Find Agent Skill content from a single message
+     * @param msg - Message to search in
+     * @returns The skill content text if found, undefined otherwise
+     */
+    private findSkillContentInMessage;
+    /**
+     * Find the last Agent Skill from a list of messages
+     * @param messages - Messages to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    private findLastAgentSkillFromMessages;
+    /**
+     * Find the last Agent Skill from a list of history entries
+     * @param entries - History entries to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    private findLastAgentSkill;
     private initializeDefaultCompactor;
     private initializeDefaultSessionMemoryExtractor;
     private initializeDefaultUserMemoryExtractor;

package/lib/cjs/prompt/agent-session.js

@@ -87,42 +87,59 @@ class AgentSession {
     }
     async getMessages() {
         await this.ensureInitialized();
-        const { systemMessages, userMemory, sessionMemory, compactSummary, historyEntries, currentEntry, currentEntryCompression, } = this.runtimeState;
+        const { systemMessages, userMemory, sessionMemory, historyCompact, historyEntries, currentEntry, currentEntryCompact, } = this.runtimeState;
         let currentMessages = [];
         if (currentEntry?.messages?.length) {
-            if (currentEntryCompression) {
-                const { compressedCount, summary } = currentEntryCompression;
-                const firstMsg = currentEntry.messages[0];
-                const hasSkill = firstMsg?.role === "user" &&
-                    Array.isArray(firstMsg.content) &&
-                    firstMsg.content.some((block) => block.type === "text" && block.isAgentSkill === true);
-                const skillMessage = hasSkill ? [firstMsg] : [];
+            if (currentEntryCompact) {
+                const { compressedCount, summary } = currentEntryCompact;
                 const summaryMessage = {
                     role: "user",
                     content: `[Earlier messages in this conversation (${compressedCount} messages compressed)]\n${summary}`,
                 };
                 const remainingMessages = currentEntry.messages.slice(compressedCount);
-                currentMessages = [...skillMessage, summaryMessage, ...remainingMessages];
+                currentMessages = [summaryMessage, ...remainingMessages];
             }
             else {
                 currentMessages = currentEntry.messages;
             }
         }
+        // Flatten history entries messages once
+        const historyMessages = historyEntries.flatMap((entry) => entry.content?.messages ?? []);
+        // Check if there's an Agent Skill in current uncompressed messages
+        const hasSkillInCurrentMessages = [...historyMessages, ...currentMessages].some((msg) => msg.role === "user" &&
+            Array.isArray(msg.content) &&
+            msg.content.some((block) => block.type === "text" && block.isAgentSkill === true));
+        // Prefer currentEntryCompact's lastAgentSkill over historyCompact's (newer takes priority)
+        const lastAgentSkillToInject = currentEntryCompact?.lastAgentSkill ?? historyCompact?.lastAgentSkill;
         const messages = [
             ...(systemMessages ?? []),
             ...(userMemory && userMemory.length > 0 ? [this.formatUserMemory(userMemory)] : []),
             ...(sessionMemory && sessionMemory.length > 0
                 ? [this.formatSessionMemory(sessionMemory)]
                 : []),
-            ...(compactSummary
+            ...(historyCompact?.summary
                 ? [
                     {
                         role: "system",
-                        content: `Previous conversation summary:\n${compactSummary}`,
+                        content: `Previous conversation summary:\n${historyCompact.summary}`,
                     },
                 ]
                 : []),
-            ...historyEntries.flatMap((entry) => entry.content?.messages ?? []),
+            // Only inject lastAgentSkill if there's no skill in current messages
+            ...(lastAgentSkillToInject && !hasSkillInCurrentMessages
+                ? [
+                    {
+                        role: "user",
+                        content: [
+                            {
+                                type: "text",
+                                text: lastAgentSkillToInject.content,
+                            },
+                        ],
+                    },
+                ]
+                : []),
+            ...historyMessages,
             ...currentMessages,
         ];
         // Filter out thinking messages and truncate large messages
@@ -213,7 +230,7 @@ ${"```"}
             if (this.compactionPromise)
                 await this.compactionPromise;
         }
-        this.runtimeState.currentEntryCompression = undefined;
+        this.runtimeState.currentEntryCompact = undefined;
         this.runtimeState.currentEntry = { input, messages: [message] };
     }
     async endMessage(output, message, options) {
@@ -249,7 +266,7 @@ ${"```"}
         }
         this.runtimeState.historyEntries.push(newEntry);
         this.runtimeState.currentEntry = null;
-        this.runtimeState.currentEntryCompression = undefined;
+        this.runtimeState.currentEntryCompact = undefined;
         // Only run compact and memory extraction if mode is not disabled
         if (this.mode !== "disabled") {
             await Promise.all([
@@ -333,7 +350,7 @@ ${"```"}
         // Split into batches to avoid context overflow
         const batches = this.splitIntoBatches(entriesToCompact, maxTokens);
         // Process batches incrementally, each summary becomes input for the next
-        let currentSummary = this.runtimeState.compactSummary;
+        let currentSummary = this.runtimeState.historyCompact?.summary;
         for (const batch of batches) {
             const messages = batch
                 .flatMap((e) => e.content?.messages ?? [])
@@ -345,19 +362,30 @@ ${"```"}
             });
             currentSummary = result.summary;
         }
+        // Extract last Agent Skill from entries to compact
+        let lastAgentSkill = this.findLastAgentSkill(entriesToCompact);
+        // If no skill found in entries to compact, inherit from previous compact
+        if (!lastAgentSkill && this.runtimeState.historyCompact?.lastAgentSkill) {
+            lastAgentSkill = this.runtimeState.historyCompact.lastAgentSkill;
+        }
+        // Create compact content
+        const historyCompact = {
+            summary: currentSummary ?? "",
+            lastAgentSkill,
+        };
         // Write compact entry to AFS
         if (this.afs && this.historyModulePath) {
             await this.afs.write((0, ufo_1.joinURL)(this.historyModulePath, "by-session", this.sessionId, "@metadata/compact/new"), {
                 userId: this.userId,
                 agentId: this.agentId,
-                content: { summary: currentSummary },
+                content: historyCompact,
                 metadata: {
                     latestEntryId: latestCompactedEntry.id,
                 },
             });
         }
         // Update runtime state: keep the summary and recent entries
-        this.runtimeState.compactSummary = currentSummary;
+        this.runtimeState.historyCompact = historyCompact;
         this.runtimeState.historyEntries = entriesToKeep;
     }
     async compactCurrentEntry(options) {
@@ -367,7 +395,7 @@ ${"```"}
         const currentEntry = this.runtimeState.currentEntry;
         if (!currentEntry?.messages?.length)
             return;
-        const alreadyCompressedCount = this.runtimeState.currentEntryCompression?.compressedCount ?? 0;
+        const alreadyCompressedCount = this.runtimeState.currentEntryCompact?.compressedCount ?? 0;
         const uncompressedMessages = currentEntry.messages.slice(alreadyCompressedCount);
         if (uncompressedMessages.length === 0)
             return;
@@ -415,13 +443,17 @@ ${"```"}
         if (messagesToCompact.length === 0)
             return;
         const result = await options.context.invoke(compactor, {
-            previousSummary: this.runtimeState.currentEntryCompression?.summary
-                ? [this.runtimeState.currentEntryCompression.summary]
+            previousSummary: this.runtimeState.currentEntryCompact?.summary
+                ? [this.runtimeState.currentEntryCompact.summary]
                 : undefined,
             messages: messagesToCompact,
         });
-        this.runtimeState.currentEntryCompression = {
+        // Find last Agent Skill from messages being compacted
+        const lastAgentSkill = this.findLastAgentSkillFromMessages(messagesToCompact) ??
+            this.runtimeState.currentEntryCompact?.lastAgentSkill;
+        this.runtimeState.currentEntryCompact = {
             summary: result.summary,
+            lastAgentSkill,
             compressedCount: alreadyCompressedCount + messagesToCompact.length,
         };
     }
@@ -429,7 +461,7 @@ ${"```"}
         const currentEntry = this.runtimeState.currentEntry;
         if (!currentEntry?.messages?.length)
             return;
-        const compressedCount = this.runtimeState.currentEntryCompression?.compressedCount ?? 0;
+        const compressedCount = this.runtimeState.currentEntryCompact?.compressedCount ?? 0;
         const uncompressedMessages = currentEntry.messages.slice(compressedCount);
         const threshold = this.keepTokenBudget;
         const currentTokens = this.estimateMessagesTokens(uncompressedMessages, this.singleMessageLimit);
@@ -546,7 +578,7 @@ ${"```"}
             // Update runtime state with loaded data
             this.runtimeState.userMemory = userMemory;
             this.runtimeState.sessionMemory = sessionMemory;
-            this.runtimeState.compactSummary = sessionHistory.compactSummary;
+            this.runtimeState.historyCompact = sessionHistory.historyCompact;
             this.runtimeState.historyEntries = sessionHistory.historyEntries;
         }
     }
@@ -599,8 +631,8 @@ ${"```"}
         return facts;
     }
     /**
-     * Load session history including compact summary and history entries
-     * @returns Object containing compact summary and history entries
+     * Load session history including compact content and history entries
+     * @returns Object containing history compact and history entries
      */
     async loadSessionHistory() {
         if (!this.afs || !this.historyModulePath) {
@@ -614,7 +646,7 @@ ${"```"}
             limit: 1,
         });
         const latestCompact = compactResult.data[0];
-        const compactSummary = latestCompact?.content?.summary;
+        const historyCompact = latestCompact?.content;
         // Load history entries (after compact point if exists)
         const afsEntries = (await this.afs.list((0, ufo_1.joinURL)(this.historyModulePath, "by-session", this.sessionId), {
             filter: {
@@ -630,7 +662,7 @@ ${"```"}
         })).data;
         const historyEntries = afsEntries.reverse().filter((entry) => (0, type_utils_js_1.isNonNullable)(entry.content));
         return {
-            compactSummary,
+            historyCompact,
             historyEntries,
         };
     }
@@ -864,6 +896,50 @@ ${"```"}
             }
         }
     }
+    /**
+     * Find Agent Skill content from a single message
+     * @param msg - Message to search in
+     * @returns The skill content text if found, undefined otherwise
+     */
+    findSkillContentInMessage(msg) {
+        if (msg.role === "user" && Array.isArray(msg.content)) {
+            const skillBlock = msg.content.find((block) => block.type === "text" && block.isAgentSkill === true);
+            if (skillBlock && skillBlock.type === "text") {
+                return skillBlock.text;
+            }
+        }
+        return undefined;
+    }
+    /**
+     * Find the last Agent Skill from a list of messages
+     * @param messages - Messages to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    findLastAgentSkillFromMessages(messages) {
+        // Search backwards through messages to find the last Agent Skill
+        for (let i = messages.length - 1; i >= 0; i--) {
+            const msg = messages[i];
+            if (!msg)
+                continue;
+            const skillContent = this.findSkillContentInMessage(msg);
+            if (skillContent) {
+                return {
+                    content: skillContent,
+                };
+            }
+        }
+        return undefined;
+    }
+    /**
+     * Find the last Agent Skill from a list of history entries
+     * @param entries - History entries to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    findLastAgentSkill(entries) {
+        // Flatten all messages from entries
+        const allMessages = entries.flatMap((entry) => entry.content?.messages ?? []);
+        return this.findLastAgentSkillFromMessages(allMessages);
+    }
     async initializeDefaultCompactor() {
         this.compactConfig.compactor ??= await Promise.resolve().then(() => __importStar(require("./compact/compactor.js"))).then((m) => new m.AISessionCompactor());
     }

package/lib/cjs/prompt/compact/types.d.ts

@@ -37,6 +37,13 @@ export interface EntryContent {
  */
 export interface CompactContent extends Message {
     summary: string;
+    /**
+     * Last Agent Skill content in the session
+     * Preserved across compactions to maintain skill instructions
+     */
+    lastAgentSkill?: {
+        content: string;
+    };
 }
 /**
  * Input structure for the compactor agent

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

@@ -1,4 +1,5 @@
 import { Agent, type AgentOptions, type Message } from "../../../../agents/agent.js";
+import type { PromiseOrValue } from "../../../../utils/type-utils.js";
 import type { Skill } from "./skill-loader.js";
 export interface SkillToolInput extends Message {
     skill: string;
@@ -11,7 +12,7 @@ export interface SkillToolOptions extends AgentOptions<SkillToolInput, SkillTool
     agentSkills: Skill[];
 }
 export declare class AgentSkill extends Agent<SkillToolInput, SkillToolOutput> {
-    static formatOutput(output: SkillToolOutput | Message): string;
+    formatOutput(output: SkillToolOutput | Message): PromiseOrValue<string>;
     constructor(options: SkillToolOptions);
     private agentSkills;
     process(input: SkillToolInput): Promise<SkillToolOutput>;

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

@@ -8,11 +8,11 @@ const skillToolInputSchema = zod_1.z.object({
     args: zod_1.z.string().optional().describe("The arguments to pass to the skill."),
 });
 class AgentSkill extends agent_js_1.Agent {
-    static formatOutput(output) {
-        if (!("result" in output) || typeof output.result !== "string") {
-            throw new Error("Invalid SkillToolOutput: missing 'result' field");
+    formatOutput(output) {
+        if ("result" in output && typeof output.result === "string") {
+            return output.result;
         }
-        return output.result;
+        return super.formatOutput(output);
     }
     constructor(options) {
         super({

package/lib/cjs/prompt/skills/afs/agent-skill/skill-loader.js

@@ -42,10 +42,12 @@ async function loadAgentSkillFromAFS({ afs, }) {
         return;
     const skills = [];
     for (const module of filtered) {
-        const data = (await afs.list(module.path, {
+        const data = (await afs
+            .list(module.path, {
             pattern: "**/SKILL.md",
             maxDepth: 10,
-        })).data;
+        })
+            .catch(() => ({ data: [] }))).data;
         for (const entry of data) {
             const { data: file } = await afs.read(entry.path);
             if (typeof file?.content !== "string")

package/lib/dts/agents/agent.d.ts

@@ -513,6 +513,7 @@ export declare abstract class Agent<I extends Message = any, O extends Message =
      */
     protected postprocess(input: I, output: O, options: AgentInvokeOptions): Promise<void>;
     protected publishToTopics(output: Message, options: AgentInvokeOptions): Promise<void>;
+    formatOutput(output: O): PromiseOrValue<string>;
     /**
      * Core processing method of the agent, must be implemented in subclasses
      *

package/lib/dts/prompt/agent-session.d.ts

@@ -103,8 +103,8 @@ export declare class AgentSession {
      */
     private loadUserMemory;
     /**
-     * Load session history including compact summary and history entries
-     * @returns Object containing compact summary and history entries
+     * Load session history including compact content and history entries
+     * @returns Object containing history compact and history entries
      */
     private loadSessionHistory;
     /**
@@ -125,6 +125,24 @@ export declare class AgentSession {
      * Internal method that performs the actual user memory extraction
      */
     private doUpdateUserMemory;
+    /**
+     * Find Agent Skill content from a single message
+     * @param msg - Message to search in
+     * @returns The skill content text if found, undefined otherwise
+     */
+    private findSkillContentInMessage;
+    /**
+     * Find the last Agent Skill from a list of messages
+     * @param messages - Messages to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    private findLastAgentSkillFromMessages;
+    /**
+     * Find the last Agent Skill from a list of history entries
+     * @param entries - History entries to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    private findLastAgentSkill;
     private initializeDefaultCompactor;
     private initializeDefaultSessionMemoryExtractor;
     private initializeDefaultUserMemoryExtractor;

package/lib/dts/prompt/compact/types.d.ts

@@ -37,6 +37,13 @@ export interface EntryContent {
  */
 export interface CompactContent extends Message {
     summary: string;
+    /**
+     * Last Agent Skill content in the session
+     * Preserved across compactions to maintain skill instructions
+     */
+    lastAgentSkill?: {
+        content: string;
+    };
 }
 /**
  * Input structure for the compactor agent

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

@@ -1,4 +1,5 @@
 import { Agent, type AgentOptions, type Message } from "../../../../agents/agent.js";
+import type { PromiseOrValue } from "../../../../utils/type-utils.js";
 import type { Skill } from "./skill-loader.js";
 export interface SkillToolInput extends Message {
     skill: string;
@@ -11,7 +12,7 @@ export interface SkillToolOptions extends AgentOptions<SkillToolInput, SkillTool
     agentSkills: Skill[];
 }
 export declare class AgentSkill extends Agent<SkillToolInput, SkillToolOutput> {
-    static formatOutput(output: SkillToolOutput | Message): string;
+    formatOutput(output: SkillToolOutput | Message): PromiseOrValue<string>;
     constructor(options: SkillToolOptions);
     private agentSkills;
     process(input: SkillToolInput): Promise<SkillToolOutput>;

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

@@ -513,6 +513,7 @@ export declare abstract class Agent<I extends Message = any, O extends Message =
      */
     protected postprocess(input: I, output: O, options: AgentInvokeOptions): Promise<void>;
     protected publishToTopics(output: Message, options: AgentInvokeOptions): Promise<void>;
+    formatOutput(output: O): PromiseOrValue<string>;
     /**
      * Core processing method of the agent, must be implemented in subclasses
      *

package/lib/esm/agents/agent.js

@@ -667,6 +667,9 @@ export class Agent {
             });
         }
     }
+    formatOutput(output) {
+        return JSON.stringify(output);
+    }
     /**
      * Shut down the agent and clean up resources
      *

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

@@ -418,21 +418,6 @@ export class AIAgent extends Agent {
                 }
                 const message = { role: "agent", toolCalls };
                 yield { progress: { event: "message", message } };
-                const skillToolUse = toolCallsWithTools.find((i) => i.tool instanceof AgentSkill);
-                if (skillToolUse) {
-                    await session.endMessage(skillToolUse.function, {
-                        role: "agent",
-                        content: JSON.stringify({ ...skillToolUse.function }),
-                    }, options);
-                    const skillResult = await this.invokeSkill(skillToolUse.tool, { ...input, ...skillToolUse.function.arguments }, options);
-                    await session.startMessage(skillToolUse.function.arguments, {
-                        role: "user",
-                        content: [
-                            { type: "text", text: AgentSkill.formatOutput(skillResult), isAgentSkill: true },
-                        ],
-                    }, options);
-                    continue;
-                }
                 await session.appendCurrentMessages(message, options);
                 const executedToolCalls = [];
                 let error;
@@ -466,11 +451,13 @@ export class AIAgent extends Agent {
                     throw error;
                 // Continue LLM function calling loop if any tools were executed
                 if (executedToolCalls.length) {
-                    for (const { call, output } of executedToolCalls) {
+                    for (const { call, tool, output } of executedToolCalls) {
+                        const isAgentSkill = !output.isError && tool instanceof AgentSkill ? true : undefined;
+                        const text = await tool.formatOutput(output);
                         const message = {
                             role: "tool",
                             toolCallId: call.id,
-                            content: JSON.stringify(output),
+                            content: [{ type: "text", text, isAgentSkill }],
                         };
                         yield { progress: { event: "message", message: message } };
                         await session.appendCurrentMessages(message, options);

package/lib/esm/prompt/agent-session.d.ts

@@ -103,8 +103,8 @@ export declare class AgentSession {
      */
     private loadUserMemory;
     /**
-     * Load session history including compact summary and history entries
-     * @returns Object containing compact summary and history entries
+     * Load session history including compact content and history entries
+     * @returns Object containing history compact and history entries
      */
     private loadSessionHistory;
     /**
@@ -125,6 +125,24 @@ export declare class AgentSession {
      * Internal method that performs the actual user memory extraction
      */
     private doUpdateUserMemory;
+    /**
+     * Find Agent Skill content from a single message
+     * @param msg - Message to search in
+     * @returns The skill content text if found, undefined otherwise
+     */
+    private findSkillContentInMessage;
+    /**
+     * Find the last Agent Skill from a list of messages
+     * @param messages - Messages to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    private findLastAgentSkillFromMessages;
+    /**
+     * Find the last Agent Skill from a list of history entries
+     * @param entries - History entries to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    private findLastAgentSkill;
     private initializeDefaultCompactor;
     private initializeDefaultSessionMemoryExtractor;
     private initializeDefaultUserMemoryExtractor;

package/lib/esm/prompt/agent-session.js

@@ -48,42 +48,59 @@ export class AgentSession {
     }
     async getMessages() {
         await this.ensureInitialized();
-        const { systemMessages, userMemory, sessionMemory, compactSummary, historyEntries, currentEntry, currentEntryCompression, } = this.runtimeState;
+        const { systemMessages, userMemory, sessionMemory, historyCompact, historyEntries, currentEntry, currentEntryCompact, } = this.runtimeState;
         let currentMessages = [];
         if (currentEntry?.messages?.length) {
-            if (currentEntryCompression) {
-                const { compressedCount, summary } = currentEntryCompression;
-                const firstMsg = currentEntry.messages[0];
-                const hasSkill = firstMsg?.role === "user" &&
-                    Array.isArray(firstMsg.content) &&
-                    firstMsg.content.some((block) => block.type === "text" && block.isAgentSkill === true);
-                const skillMessage = hasSkill ? [firstMsg] : [];
+            if (currentEntryCompact) {
+                const { compressedCount, summary } = currentEntryCompact;
                 const summaryMessage = {
                     role: "user",
                     content: `[Earlier messages in this conversation (${compressedCount} messages compressed)]\n${summary}`,
                 };
                 const remainingMessages = currentEntry.messages.slice(compressedCount);
-                currentMessages = [...skillMessage, summaryMessage, ...remainingMessages];
+                currentMessages = [summaryMessage, ...remainingMessages];
             }
             else {
                 currentMessages = currentEntry.messages;
             }
         }
+        // Flatten history entries messages once
+        const historyMessages = historyEntries.flatMap((entry) => entry.content?.messages ?? []);
+        // Check if there's an Agent Skill in current uncompressed messages
+        const hasSkillInCurrentMessages = [...historyMessages, ...currentMessages].some((msg) => msg.role === "user" &&
+            Array.isArray(msg.content) &&
+            msg.content.some((block) => block.type === "text" && block.isAgentSkill === true));
+        // Prefer currentEntryCompact's lastAgentSkill over historyCompact's (newer takes priority)
+        const lastAgentSkillToInject = currentEntryCompact?.lastAgentSkill ?? historyCompact?.lastAgentSkill;
         const messages = [
             ...(systemMessages ?? []),
             ...(userMemory && userMemory.length > 0 ? [this.formatUserMemory(userMemory)] : []),
             ...(sessionMemory && sessionMemory.length > 0
                 ? [this.formatSessionMemory(sessionMemory)]
                 : []),
-            ...(compactSummary
+            ...(historyCompact?.summary
                 ? [
                     {
                         role: "system",
-                        content: `Previous conversation summary:\n${compactSummary}`,
+                        content: `Previous conversation summary:\n${historyCompact.summary}`,
                     },
                 ]
                 : []),
-            ...historyEntries.flatMap((entry) => entry.content?.messages ?? []),
+            // Only inject lastAgentSkill if there's no skill in current messages
+            ...(lastAgentSkillToInject && !hasSkillInCurrentMessages
+                ? [
+                    {
+                        role: "user",
+                        content: [
+                            {
+                                type: "text",
+                                text: lastAgentSkillToInject.content,
+                            },
+                        ],
+                    },
+                ]
+                : []),
+            ...historyMessages,
             ...currentMessages,
         ];
         // Filter out thinking messages and truncate large messages
@@ -174,7 +191,7 @@ ${"```"}
             if (this.compactionPromise)
                 await this.compactionPromise;
         }
-        this.runtimeState.currentEntryCompression = undefined;
+        this.runtimeState.currentEntryCompact = undefined;
         this.runtimeState.currentEntry = { input, messages: [message] };
     }
     async endMessage(output, message, options) {
@@ -210,7 +227,7 @@ ${"```"}
         }
         this.runtimeState.historyEntries.push(newEntry);
         this.runtimeState.currentEntry = null;
-        this.runtimeState.currentEntryCompression = undefined;
+        this.runtimeState.currentEntryCompact = undefined;
         // Only run compact and memory extraction if mode is not disabled
         if (this.mode !== "disabled") {
             await Promise.all([
@@ -294,7 +311,7 @@ ${"```"}
         // Split into batches to avoid context overflow
         const batches = this.splitIntoBatches(entriesToCompact, maxTokens);
         // Process batches incrementally, each summary becomes input for the next
-        let currentSummary = this.runtimeState.compactSummary;
+        let currentSummary = this.runtimeState.historyCompact?.summary;
         for (const batch of batches) {
             const messages = batch
                 .flatMap((e) => e.content?.messages ?? [])
@@ -306,19 +323,30 @@ ${"```"}
             });
             currentSummary = result.summary;
         }
+        // Extract last Agent Skill from entries to compact
+        let lastAgentSkill = this.findLastAgentSkill(entriesToCompact);
+        // If no skill found in entries to compact, inherit from previous compact
+        if (!lastAgentSkill && this.runtimeState.historyCompact?.lastAgentSkill) {
+            lastAgentSkill = this.runtimeState.historyCompact.lastAgentSkill;
+        }
+        // Create compact content
+        const historyCompact = {
+            summary: currentSummary ?? "",
+            lastAgentSkill,
+        };
         // Write compact entry to AFS
         if (this.afs && this.historyModulePath) {
             await this.afs.write(joinURL(this.historyModulePath, "by-session", this.sessionId, "@metadata/compact/new"), {
                 userId: this.userId,
                 agentId: this.agentId,
-                content: { summary: currentSummary },
+                content: historyCompact,
                 metadata: {
                     latestEntryId: latestCompactedEntry.id,
                 },
             });
         }
         // Update runtime state: keep the summary and recent entries
-        this.runtimeState.compactSummary = currentSummary;
+        this.runtimeState.historyCompact = historyCompact;
         this.runtimeState.historyEntries = entriesToKeep;
     }
     async compactCurrentEntry(options) {
@@ -328,7 +356,7 @@ ${"```"}
         const currentEntry = this.runtimeState.currentEntry;
         if (!currentEntry?.messages?.length)
             return;
-        const alreadyCompressedCount = this.runtimeState.currentEntryCompression?.compressedCount ?? 0;
+        const alreadyCompressedCount = this.runtimeState.currentEntryCompact?.compressedCount ?? 0;
         const uncompressedMessages = currentEntry.messages.slice(alreadyCompressedCount);
         if (uncompressedMessages.length === 0)
             return;
@@ -376,13 +404,17 @@ ${"```"}
         if (messagesToCompact.length === 0)
             return;
         const result = await options.context.invoke(compactor, {
-            previousSummary: this.runtimeState.currentEntryCompression?.summary
-                ? [this.runtimeState.currentEntryCompression.summary]
+            previousSummary: this.runtimeState.currentEntryCompact?.summary
+                ? [this.runtimeState.currentEntryCompact.summary]
                 : undefined,
             messages: messagesToCompact,
         });
-        this.runtimeState.currentEntryCompression = {
+        // Find last Agent Skill from messages being compacted
+        const lastAgentSkill = this.findLastAgentSkillFromMessages(messagesToCompact) ??
+            this.runtimeState.currentEntryCompact?.lastAgentSkill;
+        this.runtimeState.currentEntryCompact = {
             summary: result.summary,
+            lastAgentSkill,
             compressedCount: alreadyCompressedCount + messagesToCompact.length,
         };
     }
@@ -390,7 +422,7 @@ ${"```"}
         const currentEntry = this.runtimeState.currentEntry;
         if (!currentEntry?.messages?.length)
             return;
-        const compressedCount = this.runtimeState.currentEntryCompression?.compressedCount ?? 0;
+        const compressedCount = this.runtimeState.currentEntryCompact?.compressedCount ?? 0;
         const uncompressedMessages = currentEntry.messages.slice(compressedCount);
         const threshold = this.keepTokenBudget;
         const currentTokens = this.estimateMessagesTokens(uncompressedMessages, this.singleMessageLimit);
@@ -507,7 +539,7 @@ ${"```"}
             // Update runtime state with loaded data
             this.runtimeState.userMemory = userMemory;
             this.runtimeState.sessionMemory = sessionMemory;
-            this.runtimeState.compactSummary = sessionHistory.compactSummary;
+            this.runtimeState.historyCompact = sessionHistory.historyCompact;
             this.runtimeState.historyEntries = sessionHistory.historyEntries;
         }
     }
@@ -560,8 +592,8 @@ ${"```"}
         return facts;
     }
     /**
-     * Load session history including compact summary and history entries
-     * @returns Object containing compact summary and history entries
+     * Load session history including compact content and history entries
+     * @returns Object containing history compact and history entries
      */
     async loadSessionHistory() {
         if (!this.afs || !this.historyModulePath) {
@@ -575,7 +607,7 @@ ${"```"}
             limit: 1,
         });
         const latestCompact = compactResult.data[0];
-        const compactSummary = latestCompact?.content?.summary;
+        const historyCompact = latestCompact?.content;
         // Load history entries (after compact point if exists)
         const afsEntries = (await this.afs.list(joinURL(this.historyModulePath, "by-session", this.sessionId), {
             filter: {
@@ -591,7 +623,7 @@ ${"```"}
         })).data;
         const historyEntries = afsEntries.reverse().filter((entry) => isNonNullable(entry.content));
         return {
-            compactSummary,
+            historyCompact,
             historyEntries,
         };
     }
@@ -825,6 +857,50 @@ ${"```"}
             }
         }
     }
+    /**
+     * Find Agent Skill content from a single message
+     * @param msg - Message to search in
+     * @returns The skill content text if found, undefined otherwise
+     */
+    findSkillContentInMessage(msg) {
+        if (msg.role === "user" && Array.isArray(msg.content)) {
+            const skillBlock = msg.content.find((block) => block.type === "text" && block.isAgentSkill === true);
+            if (skillBlock && skillBlock.type === "text") {
+                return skillBlock.text;
+            }
+        }
+        return undefined;
+    }
+    /**
+     * Find the last Agent Skill from a list of messages
+     * @param messages - Messages to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    findLastAgentSkillFromMessages(messages) {
+        // Search backwards through messages to find the last Agent Skill
+        for (let i = messages.length - 1; i >= 0; i--) {
+            const msg = messages[i];
+            if (!msg)
+                continue;
+            const skillContent = this.findSkillContentInMessage(msg);
+            if (skillContent) {
+                return {
+                    content: skillContent,
+                };
+            }
+        }
+        return undefined;
+    }
+    /**
+     * Find the last Agent Skill from a list of history entries
+     * @param entries - History entries to search through
+     * @returns The last Agent Skill found, or undefined if none found
+     */
+    findLastAgentSkill(entries) {
+        // Flatten all messages from entries
+        const allMessages = entries.flatMap((entry) => entry.content?.messages ?? []);
+        return this.findLastAgentSkillFromMessages(allMessages);
+    }
     async initializeDefaultCompactor() {
         this.compactConfig.compactor ??= await import("./compact/compactor.js").then((m) => new m.AISessionCompactor());
     }

package/lib/esm/prompt/compact/types.d.ts

@@ -37,6 +37,13 @@ export interface EntryContent {
  */
 export interface CompactContent extends Message {
     summary: string;
+    /**
+     * Last Agent Skill content in the session
+     * Preserved across compactions to maintain skill instructions
+     */
+    lastAgentSkill?: {
+        content: string;
+    };
 }
 /**
  * Input structure for the compactor agent

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

@@ -1,4 +1,5 @@
 import { Agent, type AgentOptions, type Message } from "../../../../agents/agent.js";
+import type { PromiseOrValue } from "../../../../utils/type-utils.js";
 import type { Skill } from "./skill-loader.js";
 export interface SkillToolInput extends Message {
     skill: string;
@@ -11,7 +12,7 @@ export interface SkillToolOptions extends AgentOptions<SkillToolInput, SkillTool
     agentSkills: Skill[];
 }
 export declare class AgentSkill extends Agent<SkillToolInput, SkillToolOutput> {
-    static formatOutput(output: SkillToolOutput | Message): string;
+    formatOutput(output: SkillToolOutput | Message): PromiseOrValue<string>;
     constructor(options: SkillToolOptions);
     private agentSkills;
     process(input: SkillToolInput): Promise<SkillToolOutput>;

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

@@ -5,11 +5,11 @@ const skillToolInputSchema = z.object({
     args: z.string().optional().describe("The arguments to pass to the skill."),
 });
 export class AgentSkill extends Agent {
-    static formatOutput(output) {
-        if (!("result" in output) || typeof output.result !== "string") {
-            throw new Error("Invalid SkillToolOutput: missing 'result' field");
+    formatOutput(output) {
+        if ("result" in output && typeof output.result === "string") {
+            return output.result;
         }
-        return output.result;
+        return super.formatOutput(output);
     }
     constructor(options) {
         super({

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

@@ -34,10 +34,12 @@ export async function loadAgentSkillFromAFS({ afs, }) {
         return;
     const skills = [];
     for (const module of filtered) {
-        const data = (await afs.list(module.path, {
+        const data = (await afs
+            .list(module.path, {
             pattern: "**/SKILL.md",
             maxDepth: 10,
-        })).data;
+        })
+            .catch(() => ({ data: [] }))).data;
         for (const entry of data) {
             const { data: file } = await afs.read(entry.path);
             if (typeof file?.content !== "string")

package/package.json

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