foliko 2.0.4 → 2.0.6

package/src/agent/chat.js

@@ -16,6 +16,7 @@ const {
   ToolLoopAgent,
   isLoopFinished,
 } = require('ai');
+const { z } = require('zod');
 const { autoSplitToolResult } = require('../../plugins/executors/data-splitter');
 const { cleanResponse } = require('../utils');
 const { ChatQueueManager } = require('../common/queue');
@@ -32,6 +33,8 @@ const {
   DEFAULT_MAX_CONCURRENT,
   DEFAULT_RETRY_ATTEMPTS,
   DEFAULT_RETRY_DELAY_MS,
+  SIMPLE_COMPRESS_TOKEN_RATIO,
+  SMART_COMPRESS_TOKEN_RATIO,
 } = require('../common/constants');
 
 class AgentChatHandler extends EventEmitter {
@@ -135,26 +138,22 @@ class AgentChatHandler extends EventEmitter {
     this._setupEventForwarding();
 
     // 转发 queueManager 事件到 ChatSession（让 SessionScope 能收到 stream:chunk 和 queue:completed 等）
-    this.queueManager.on('stream:chunk', (data) => {
-      this._chatSession.emit('stream:chunk', data);
-    });
-    this.queueManager.on('queue:completed', (data) => {
-      this._chatSession.emit('queue:completed', data);
-    });
-    this.queueManager.on('queue:failed', (data) => {
-      this._chatSession.emit('queue:failed', data);
-    });
+    // 保存引用以便 destroy 时能正确移除
+    this._onStreamChunk = (data) => this._chatSession.emit('stream:chunk', data);
+    this._onQueueCompleted = (data) => this._chatSession.emit('queue:completed', data);
+    this._onQueueFailed = (data) => this._chatSession.emit('queue:failed', data);
+    this.queueManager.on('stream:chunk', this._onStreamChunk);
+    this.queueManager.on('queue:completed', this._onQueueCompleted);
+    this.queueManager.on('queue:failed', this._onQueueFailed);
 
     // 转发 message:complete 和 message:error 到 ChatSession（让 SessionScope 能收到）
-    this.on('message:start', (data) => {                                                                                                                                      
-      this._chatSession.emit('message:start', data);                                                                                                                          
-    }); 
-    this.on('message:complete', (data) => {
-      this._chatSession.emit('message:complete', data);
-    });
-    this.on('message:error', (data) => {
-      this._chatSession.emit('message:error', data);
-    });
+    // 保存引用以便 destroy 时能正确移除
+    this._onMessageStart = (data) => this._chatSession.emit('message:start', data);
+    this._onMessageComplete = (data) => this._chatSession.emit('message:complete', data);
+    this._onMessageError = (data) => this._chatSession.emit('message:error', data);
+    this.on('message:start', this._onMessageStart);
+    this.on('message:complete', this._onMessageComplete);
+    this.on('message:error', this._onMessageError);
 
     // 设置消息处理器（使用 bind 保持 this 引用）
     this._chatSession.setMessageProcessor(this._processMessage.bind(this));
@@ -476,7 +475,7 @@ class AgentChatHandler extends EventEmitter {
         throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
-      const systemPrompt = framework.getSystemPrompt();
+      const systemPrompt = framework.prompts.build();
       //await fs.promises.writeFile(`.${sessionId}_systemPrompt.md`, systemPrompt); // 调试用：保存系统提示词
       const tools = this._getAITools(aiTool);
       const agent = new ToolLoopAgent({
@@ -628,6 +627,14 @@ class AgentChatHandler extends EventEmitter {
    * 销毁
    */
   destroy() {
+    // Remove listeners from queueManager
+    this.queueManager.off('stream:chunk', this._onStreamChunk);
+    this.queueManager.off('queue:completed', this._onQueueCompleted);
+    this.queueManager.off('queue:failed', this._onQueueFailed);
+    // Remove listeners from this (message forwarding)
+    this.off('message:start', this._onMessageStart);
+    this.off('message:complete', this._onMessageComplete);
+    this.off('message:error', this._onMessageError);
     if (this._chatSession) {
       this._chatSession.removeAllListeners();
     }
@@ -659,7 +666,7 @@ class AgentChatHandler extends EventEmitter {
         throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
-      const systemPrompt = framework.getSystemPrompt();
+      const systemPrompt = framework.prompts.build();
       const tools = this._getAITools(aiTool);
 
       // DeepSeek thinking mode: 处理参数
@@ -763,7 +770,7 @@ class AgentChatHandler extends EventEmitter {
     const toolsTokens = this._getCachedToolsTokens();
     const systemPromptTokens = this._getCachedSystemPromptTokens();
     const totalTokens = cachedMsgTokens + toolsTokens + systemPromptTokens;
-    const limit = this._maxContextTokens * 0.5;
+    const limit = this._maxContextTokens * SIMPLE_COMPRESS_TOKEN_RATIO;
 
     // logger.info(`BEFORE: messages=${messages.length}, tokens=${totalTokens}/${limit}`);
 
@@ -924,8 +931,8 @@ class AgentChatHandler extends EventEmitter {
         name: toolName,
         description: toolDef.description || '',
         execute: async (args) => {
-          // 清理参数
-          const cleanedArgs = this._cleanToolArgs(args);
+          // 清理参数并验证类型
+          const cleanedArgs = this._cleanToolArgs(args, toolDef.inputSchema);
 
           // 执行工具
           this.emit('tool-call', { name: toolName, args: cleanedArgs });
@@ -954,7 +961,7 @@ class AgentChatHandler extends EventEmitter {
           } catch (err) {
             this.emit('tool-error', { name: toolName, args: cleanedArgs, error: err.message });
             // 返回错误信息字符串，而不是抛出异常
-            return { success: false,error: err.message}
+            return { success: false, error: err.message }
           }
         },
       };
@@ -976,10 +983,13 @@ class AgentChatHandler extends EventEmitter {
   }
 
   /**
-   * 清理工具参数
+   * 清理工具参数并根据 inputSchema 验证类型
    * @private
+   * @param {Object} args - 工具参数
+   * @param {Object} inputSchema - Zod schema (optional)
+   * @returns {Object} 清理后的参数
    */
-  _cleanToolArgs(args) {
+  _cleanToolArgs(args, inputSchema) {
     if (!args || typeof args !== 'object') {
       return {};
     }
@@ -991,6 +1001,17 @@ class AgentChatHandler extends EventEmitter {
       }
       cleaned[key] = value;
     }
+
+    // Validate against inputSchema if provided and is a Zod schema
+    if (inputSchema && inputSchema._def && inputSchema.parse) {
+      try {
+        return inputSchema.parse(cleaned);
+      } catch (err) {
+        // If Zod validation fails, return cleaned args (backward compat)
+        logger.warn(`[Tool] Args validation failed: ${err.message}`);
+      }
+    }
+
     return cleaned;
   }
 
@@ -1002,7 +1023,7 @@ class AgentChatHandler extends EventEmitter {
     return async ({ stepNumber, messages: inputMessages }) => {
       try {
         const tokenCount = this._countMessagesTokens(inputMessages);
-        const tokenLimit = this._maxContextTokens * 0.75;
+        const tokenLimit = this._maxContextTokens * SMART_COMPRESS_TOKEN_RATIO;
 
         // 超过限制时，保留三分之一的消息
         if (tokenCount > tokenLimit) {

package/src/agent/main.js

@@ -99,7 +99,29 @@ class MainAgent extends BaseAgent {
       }
       return metaParts.join('\n');
     }, 'USER');
-    registerBoth('capabilities', PROMPT_PRIORITY.CAPABILITIES, () => this._buildCapabilitiesDescription(), 'CAPABILITY');
+
+    // capabilities 从文件加载（动态内容通过 interpolate 注入）
+    const capsProvider = () => {
+      const list = this._buildCapabilitiesList();
+      return list ? `## 系统能力\n\n${list}` : '';
+    };
+    registerBoth('capabilities', PROMPT_PRIORITY.CAPABILITIES, capsProvider, 'CAPABILITY');
+  }
+
+  _buildCapabilitiesList() {
+    const plugins = this.framework.pluginManager.getAll();
+    if (!plugins || plugins.length === 0) return '';
+    const keyPlugins = plugins.filter(p => p.name !== 'defaults' && p.name !== 'agent');
+    if (keyPlugins.length === 0) return '';
+
+    const lines = [];
+    keyPlugins.forEach((plugin) => {
+      const name = plugin.instance?.name || plugin.name || 'unknown';
+      const description = plugin.instance?.description || '无描述';
+      lines.push(`- **${name}**：${description}`);
+    });
+
+    return lines.join('\n');
   }
 
   _getMetadataValue(key) {
@@ -156,27 +178,26 @@ class MainAgent extends BaseAgent {
   _buildSystemPrompt() {
     if (!this._systemPromptDirty && this._systemPromptCache !== null) return this._systemPromptCache;
 
-    // 1. Agent 自己的 originalPrompt（per-Agent）
-    const parts = [this._originalPrompt];
-
-    // 2. 全局注册表（skills, tools, extensions 等共享部分，跳过 _main 的 original-prompt）
-    const reg = this.framework?.promptRegistry;
-    if (reg && reg.count() > 0) {
+    // 统一走 framework.prompts.build()：自动包含 _originalPrompt + 注册表所有 parts
+    // （PromptRegistry.build() 已处理两段拼接，PromptPart 自带 _dirty 缓存）
+    if (this.framework?.prompts?.build) {
       try {
-        for (const part of reg.list()) {
-          if (part.owner === '_main' && part.name === 'original-prompt') continue;
-          const content = part.get();
-          if (content && content.trim()) parts.push(content.trim());
+        const text = this.framework.prompts.build();
+        if (text) {
+          this._systemPromptCache = text;
+          this._systemPromptDirty = false;
+          return this._systemPromptCache;
         }
       } catch (err) {
-        // 注册表 build 失败时降级到旧 builder
+        // 降级到旧 builder
         this._systemPromptCache = this._systemPromptBuilder.build();
         this._systemPromptDirty = false;
         return this._systemPromptCache;
       }
     }
 
-    this._systemPromptCache = parts.join('\n\n');
+    // 没有 framework 时：只返回 _originalPrompt
+    this._systemPromptCache = this._originalPrompt || '';
     this._systemPromptDirty = false;
     return this._systemPromptCache;
   }

package/src/agent/prompt-registry.js

@@ -3,40 +3,29 @@
 /**
  * PromptRegistry — 全局系统提示词注册表
  *
- * 设计目标：
- *  - 单一注册入口（替代散落在各 Plugin 的 registerPromptPart 调用）
- *  - owner 命名空间隔离（避免 part 名冲突）
- *  - 用语义槽位（PROMPT_SLOT）排序，替代魔法数字
- *  - 可观测：list / preview / getPart / getSlots
- *
- * 与旧 API 的关系：
- *  - 完全独立的新 API，不破坏 MainAgent._systemPromptBuilder
- *  - 旧 registerPromptPart 调用继续工作（写入各 agent 自己的 builder）
- *  - 新代码推荐使用 framework.prompts.register(owner, name, provider, { slot })
- *
- * 渐进迁移路径：
- *  - P0：注册表可独立使用（plugins 主动注册，外部可预览）
- *  - P2：Plugin 基类支持声明式 prompts 字段
- *  - P5：MainAgent 完全切换到本注册表
+ * 简化设计：
+ * - priority: 数字越小越靠前（默认 100）
+ * - scope: 'global'（公用）| 'main'（主 agent）| agentId（特定子 agent）
+ * - 去掉槽位概念
  */
 
 const { EventEmitter } = require('../common/events');
-const { PROMPT_SLOT } = require('../common/constants');
+const fs = require('fs');
+const path = require('path');
 
 /**
  * 单个 prompt part
- * - provider 是 () => string|null，返回 null/空串时被 build 跳过
- * - 内部带缓存，失效后才重新计算
  */
 class PromptPart {
   constructor(owner, name, provider, options = {}) {
     this.owner = owner;
     this.name = name;
     this.provider = provider;
-    this.slot = options.slot || 'CUSTOM';
-    this.order = options.order ?? null; // 显式 order 覆盖 slot 默认
+    // scope: 'global' | 'main' | string (agentId)
+    this.scope = options.scope || 'global';
+    // priority: 数字越小越靠前，默认 100
+    this.priority = options.priority ?? 100;
     this.description = options.description || '';
-    this.metadata = options.metadata || {};
     this._cached = null;
     this._dirty = true;
     this._error = null;
@@ -53,8 +42,6 @@ class PromptPart {
         this._error = e;
         this._cached = null;
         this._dirty = false;
-        // 警告但不抛错 — 避免单个 part 失败导致整个 prompt 渲染失败
-        // eslint-disable-next-line no-console
         console.warn(`[PromptRegistry:${this.owner}::${this.name}] provider failed:`, e.message);
       }
     }
@@ -70,61 +57,31 @@ class PromptPart {
  * PromptRegistry 主类
  */
 class PromptRegistry extends EventEmitter {
-  constructor(options = {}) {
+  constructor(framework = null) {
     super();
-
     // key = "owner::name"
     this._parts = new Map();
-
-    // slot 名称 → { order, label }
-    this._slots = new Map();
-
-    // 注入 slots：优先用参数，否则用全局 PROMPT_SLOT
-    const slots = options.slots || PROMPT_SLOT;
-    for (const [name, def] of Object.entries(slots)) {
-      if (!def || typeof def.order !== 'number') continue;
-      this._slots.set(name, {
-        order: def.order,
-        label: def.label || name,
-      });
-    }
-
-    // 用于 render 时检测循环依赖
+    // 用于 build 时检测循环依赖
     this._building = false;
+    // 关联 framework（用于 build 时自动追加 main agent 的 originalPrompt）
+    this._framework = framework;
   }
 
-  // ==================== 槽位管理 ====================
-
-  /**
-   * 定义/覆盖一个槽位
-   */
-  defineSlot(name, order, label) {
-    if (typeof order !== 'number') throw new Error('slot order must be a number');
-    this._slots.set(name, { order, label: label || name });
-    this.emit('slot-defined', { name, order, label });
-    return this;
-  }
-
-  /**
-   * 获取所有槽位定义
-   */
-  getSlots() {
-    return new Map(this._slots);
+  setFramework(framework) {
+    this._framework = framework;
   }
 
   // ==================== 注册/注销 ====================
 
   /**
    * 注册一个 prompt part
-   * @param {string} owner 拥有者标识（通常是 plugin name 或 '_main'）
+   * @param {string} owner 拥有者标识
    * @param {string} name part 名（在 owner 内唯一）
    * @param {Function} provider () => string|null
    * @param {Object} [options]
-   * @param {string} [options.slot='CUSTOM'] 槽位名
-   * @param {number} [options.order] 自定义 order（覆盖 slot 默认）
-   * @param {string} [options.description] 描述（用于 list/debug）
-   * @param {Object} [options.metadata] 额外元数据
-   * @returns {PromptPart}
+   * @param {string} [options.scope='global'] 作用域: 'global'|'main'|agentId
+   * @param {number} [options.priority=100] 优先级（越小越靠前）
+   * @param {string} [options.description] 描述
    */
   register(owner, name, provider, options = {}) {
     if (!owner || typeof owner !== 'string') {
@@ -140,13 +97,59 @@ class PromptRegistry extends EventEmitter {
     const key = `${owner}::${name}`;
     const part = new PromptPart(owner, name, provider, options);
     this._parts.set(key, part);
-    this.emit('register', { owner, name, slot: part.slot });
+    this.emit('register', { owner, name, scope: part.scope, priority: part.priority });
     return part;
   }
 
+  /**
+   * 注册一个 prompt part（从文件读取，支持变量插值）
+   * @param {string} owner 拥有者标识
+   * @param {string} filePath 文件路径
+   * @param {Object|Function} [vars] 变量对象或函数，模板中用 {{varName}} 引用
+   *   - Object: 静态变量，注册时替换
+   *   - Function: 动态变量，每次渲染时调用函数获取最新值
+   * @param {Object} [options] 同 register 选项
+   */
+  registerFile(owner, filePath, vars = null, options = {}) {
+    if (!owner || typeof owner !== 'string') {
+      throw new Error('PromptRegistry.registerFile: owner is required');
+    }
+    if (!filePath || typeof filePath !== 'string') {
+      throw new Error('PromptRegistry.registerFile: filePath is required');
+    }
+
+    // 读取文件内容
+    const fullPath = path.resolve(filePath);
+    if (!fs.existsSync(fullPath)) {
+      throw new Error(`PromptRegistry.registerFile: file not found: ${fullPath}`);
+    }
+    const rawContent = fs.readFileSync(fullPath, 'utf-8');
+
+    // 转为 provider，渲染时动态插值
+    const provider = () => {
+      let content = rawContent;
+      if (vars) {
+        const varsObj = typeof vars === 'function' ? vars() : vars;
+        if (varsObj && typeof varsObj === 'object') {
+          content = content.replace(/\{\{(\w+)\}\}/g, (match, varName) => {
+            if (Object.prototype.hasOwnProperty.call(varsObj, varName)) {
+              return String(varsObj[varName]);
+            }
+            return match; // 未找到的变量保留原样
+          });
+        }
+      }
+      return content;
+    };
+
+    // 从文件名生成 name
+    const name = options.name || path.basename(filePath, path.extname(filePath));
+
+    return this.register(owner, name, provider, options);
+  }
+
   /**
    * 注销一个 part
-   * @returns {boolean} 是否真的删除了
    */
   unregister(owner, name) {
     const key = `${owner}::${name}`;
@@ -157,7 +160,6 @@ class PromptRegistry extends EventEmitter {
 
   /**
    * 清空指定 owner 的所有 parts
-   * @returns {number} 删除的 part 数
    */
   clearOwner(owner) {
     const prefix = `${owner}::`;
@@ -173,7 +175,7 @@ class PromptRegistry extends EventEmitter {
   }
 
   /**
-   * 失效指定 part（下次 build 时重新计算）
+   * 失效指定 part
    */
   invalidate(owner, name) {
     const part = this._parts.get(`${owner}::${name}`);
@@ -210,10 +212,14 @@ class PromptRegistry extends EventEmitter {
   }
 
   /**
-   * 列出所有 parts（按 order 排序）
+   * 列出所有 parts（按 priority 排序）
    */
   list() {
-    return Array.from(this._parts.values()).sort((a, b) => this._compareOrder(a, b));
+    return Array.from(this._parts.values()).sort((a, b) => {
+      if (a.priority !== b.priority) return a.priority - b.priority;
+      if (a.owner !== b.owner) return a.owner.localeCompare(b.owner);
+      return a.name.localeCompare(b.name);
+    });
   }
 
   /**
@@ -224,19 +230,24 @@ class PromptRegistry extends EventEmitter {
   }
 
   /**
-   * 按 slot 过滤
+   * 按 scope 过滤
    */
-  listBySlot(slot) {
-    return this.list().filter((p) => p.slot === slot);
+  listByScope(scope) {
+    return this.list().filter((p) => p.scope === scope);
   }
 
-  _compareOrder(a, b) {
-    const oa = a.order != null ? a.order : this._slots.get(a.slot)?.order ?? 999;
-    const ob = b.order != null ? b.order : this._slots.get(b.slot)?.order ?? 999;
-    if (oa !== ob) return oa - ob;
-    // 同 order 时按 owner → name 字母序，保证稳定
-    if (a.owner !== b.owner) return a.owner.localeCompare(b.owner);
-    return a.name.localeCompare(b.name);
+  /**
+   * 获取适用于指定 agent 的 parts
+   * @param {string|null} agentId agent ID，null 表示主 agent
+   */
+  listForAgent(agentId = null) {
+    const isMain = agentId === null || agentId === 'main';
+    return this.list().filter((p) => {
+      if (p.scope === 'global') return true;
+      if (p.scope === 'main' && isMain) return true;
+      if (p.scope === agentId) return true;
+      return false;
+    });
   }
 
   count() {
@@ -246,16 +257,39 @@ class PromptRegistry extends EventEmitter {
   // ==================== 渲染 ====================
 
   /**
-   * 渲染完整 prompt 文本（按 slot order 拼接）
+   * 渲染完整 prompt（按 priority 拼接）
+   * 自动包含 main agent 的 originalPrompt（作为首段）
    */
   build() {
+    return this.buildForAgent(null);
+  }
+
+  /**
+   * 渲染适用于指定 agent 的 prompt
+   * - main agent (agentId 为 null 或 'main')：自动在首段追加 `_originalPrompt`
+   * - 其他 agent：不追加（subagent 自己有 _customSystemPrompt）
+   *
+   * @param {string|null} agentId agent ID
+   */
+  buildForAgent(agentId = null) {
     if (this._building) {
       throw new Error('PromptRegistry.build() re-entered — check provider for circular calls');
     }
     this._building = true;
     try {
       const sections = [];
-      for (const part of this.list()) {
+
+      // 1. main agent 的 originalPrompt 作为首段（per-Agent，identity）
+      const isMain = agentId === null || agentId === 'main';
+      if (isMain) {
+        const originalPrompt = this._getMainAgentOriginalPrompt();
+        if (originalPrompt && originalPrompt.trim()) {
+          sections.push(originalPrompt.trim());
+        }
+      }
+
+      // 2. 全局注册表的所有 parts
+      for (const part of this.listForAgent(agentId)) {
         const content = part.get();
         if (content && content.trim()) sections.push(content.trim());
       }
@@ -266,15 +300,27 @@ class PromptRegistry extends EventEmitter {
   }
 
   /**
-   * build() 的语义化别名，调试用
+   * 获取 main agent 的 originalPrompt
+   */
+  _getMainAgentOriginalPrompt() {
+    const main = this._framework?.getMainAgent?.();
+    if (!main) return '';
+    // 优先用 _originalPrompt（per-Agent 私有），回退到 getOriginalPrompt()
+    if (typeof main.getOriginalPrompt === 'function') {
+      return main.getOriginalPrompt() || main._originalPrompt || '';
+    }
+    return main._originalPrompt || '';
+  }
+
+  /**
+   * build() 的别名
    */
   preview() {
     return this.build();
   }
 
   /**
-   * 渲染结构化清单（调试 / 文档生成）
-   * 返回 [{ owner, name, slot, order, length, contentPreview }]
+   * 渲染结构化清单（调试用）
    */
   inspect() {
     return this.list().map((part) => {
@@ -282,8 +328,8 @@ class PromptRegistry extends EventEmitter {
       return {
         owner: part.owner,
         name: part.name,
-        slot: part.slot,
-        order: part.order != null ? part.order : this._slots.get(part.slot)?.order ?? 999,
+        scope: part.scope,
+        priority: part.priority,
         description: part.description,
         hasContent: Boolean(content && content.trim()),
         length: content ? content.length : 0,
@@ -293,4 +339,4 @@ class PromptRegistry extends EventEmitter {
   }
 }
 
-module.exports = { PromptRegistry, PromptPart };
+module.exports = { PromptRegistry, PromptPart };

package/src/agent/prompts/PROMPT.md

@@ -0,0 +1,3 @@
+## 系统能力
+
+{{capabilities}}

package/src/agent/sub.js

@@ -27,7 +27,7 @@ class SubAgent extends BaseAgent {
     this.baseURL = config.baseURL;
     this.providerOptions = config.providerOptions || {};
 
-    this.defaulTools = ['ext_skill', 'skill_load', 'ext_call', 'subagent_call', 'mcp_call', 'mcp_tool_schema'];
+    this.defaulTools = ['ext_skill', 'skill_load', 'ext_call', 'subagent_call'];
     this.bindTools = {
       read: 'read_file', write: 'write_file', edit: 'modify_file',
       glob: 'read_directory', grep: 'search_file', bash: 'shell_exec',

package/src/cli/ui/chat-ui-old.js

@@ -129,10 +129,13 @@ class ChatUIOld {
     if (trimmed.startsWith('/') && trimmed.includes(':')) {
       const cmdName = trimmed.slice(1).split(' ')[0];
       const cmdArgs = trimmed.slice(cmdName.length + 2);
+      const [skillName, ...rest] = cmdName.split(':');
+      const commandName = rest.join(':');
       try {
+        // 新格式：plugin = `skill:<name>`, tool = command name
         const result = await this.agent.framework.executeTool('ext_call', {
-          plugin: 'skill',
-          tool: cmdName,
+          plugin: `skill:${skillName}`,
+          tool: commandName,
           args: { command: cmdArgs }
         });
         if (result.success !== false) {

package/src/cli/ui/chat-ui.js

@@ -374,10 +374,13 @@ class ChatUI {
     if (trimmed.startsWith('/') && cmdName) {
       // 检查 skill 命令 (格式: skillname:cmdname)
       if (cmdName.includes(':')) {
+        const [skillName, ...rest] = cmdName.split(':');
+        const commandName = rest.join(':');
         try {
+          // 新格式：plugin = `skill:<name>`, tool = command name
           const result = await this.agent.framework.executeTool('ext_call', {
-            plugin: 'skill',
-            tool: cmdName,
+            plugin: `skill:${skillName}`,
+            tool: commandName,
             args: { command: cmdArgs }
           });
           if (result.success !== false) {

package/src/common/constants.js

@@ -53,6 +53,9 @@ const DEFAULT_MAX_MESSAGES_PER_SESSION = 1000;
 /** 保留最近的 N 条消息 */
 const KEEP_RECENT_MESSAGES = 20;
 
+/** 压缩消息数量阈值 */
+const COMPRESSION_MESSAGE_THRESHOLD = 200;
+
 /** 智能压缩启用 */
 const ENABLE_SMART_COMPRESS = true;
 
@@ -191,6 +194,12 @@ const TOKENS_PER_TOOL = 500;
 /** 每消息固定开销 token */
 const TOKENS_PER_MESSAGE_OVERHEAD = 4;
 
+/** 简单压缩模式 token 限制比例（50%） */
+const SIMPLE_COMPRESS_TOKEN_RATIO = 0.5;
+
+/** 智能压缩模式 token 限制比例（75%） */
+const SMART_COMPRESS_TOKEN_RATIO = 0.75;
+
 // ============================================================================
 // 导出
 // ============================================================================
@@ -211,6 +220,7 @@ module.exports = {
 
   // Compression
   KEEP_RECENT_MESSAGES,
+  COMPRESSION_MESSAGE_THRESHOLD,
   ENABLE_SMART_COMPRESS,
   COMPRESSION_TIMEOUT_MS,
   MAX_TOOL_RESULT_SIZE,
@@ -244,4 +254,6 @@ module.exports = {
   TOKENS_PER_CHAR,
   TOKENS_PER_TOOL,
   TOKENS_PER_MESSAGE_OVERHEAD,
+  SIMPLE_COMPRESS_TOKEN_RATIO,
+  SMART_COMPRESS_TOKEN_RATIO,
 };