foliko 2.0.5 → 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

@@ -57,12 +57,18 @@ class PromptPart {
  * PromptRegistry 主类
  */
 class PromptRegistry extends EventEmitter {
-  constructor() {
+  constructor(framework = null) {
     super();
     // key = "owner::name"
     this._parts = new Map();
     // 用于 build 时检测循环依赖
     this._building = false;
+    // 关联 framework（用于 build 时自动追加 main agent 的 originalPrompt）
+    this._framework = framework;
+  }
+
+  setFramework(framework) {
+    this._framework = framework;
   }
 
   // ==================== 注册/注销 ====================
@@ -99,10 +105,12 @@ class PromptRegistry extends EventEmitter {
    * 注册一个 prompt part（从文件读取，支持变量插值）
    * @param {string} owner 拥有者标识
    * @param {string} filePath 文件路径
-   * @param {Object} [vars] 变量对象，模板中用 {{varName}} 引用
+   * @param {Object|Function} [vars] 变量对象或函数，模板中用 {{varName}} 引用
+   *   - Object: 静态变量，注册时替换
+   *   - Function: 动态变量，每次渲染时调用函数获取最新值
    * @param {Object} [options] 同 register 选项
    */
-  registerFile(owner, filePath, vars = {}, options = {}) {
+  registerFile(owner, filePath, vars = null, options = {}) {
     if (!owner || typeof owner !== 'string') {
       throw new Error('PromptRegistry.registerFile: owner is required');
     }
@@ -115,20 +123,24 @@ class PromptRegistry extends EventEmitter {
     if (!fs.existsSync(fullPath)) {
       throw new Error(`PromptRegistry.registerFile: file not found: ${fullPath}`);
     }
-    let content = fs.readFileSync(fullPath, 'utf-8');
-
-    // 变量插值
-    if (vars && typeof vars === 'object') {
-      content = content.replace(/\{\{(\w+)\}\}/g, (match, varName) => {
-        if (Object.prototype.hasOwnProperty.call(vars, varName)) {
-          return String(vars[varName]);
+    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 match; // 未找到的变量保留原样
-      });
-    }
-
-    // 转为 provider
-    const provider = () => content;
+      }
+      return content;
+    };
 
     // 从文件名生成 name
     const name = options.name || path.basename(filePath, path.extname(filePath));
@@ -246,6 +258,7 @@ class PromptRegistry extends EventEmitter {
 
   /**
    * 渲染完整 prompt（按 priority 拼接）
+   * 自动包含 main agent 的 originalPrompt（作为首段）
    */
   build() {
     return this.buildForAgent(null);
@@ -253,6 +266,9 @@ class PromptRegistry extends EventEmitter {
 
   /**
    * 渲染适用于指定 agent 的 prompt
+   * - main agent (agentId 为 null 或 'main')：自动在首段追加 `_originalPrompt`
+   * - 其他 agent：不追加（subagent 自己有 _customSystemPrompt）
+   *
    * @param {string|null} agentId agent ID
    */
   buildForAgent(agentId = null) {
@@ -262,6 +278,17 @@ class PromptRegistry extends EventEmitter {
     this._building = true;
     try {
       const sections = [];
+
+      // 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());
@@ -272,6 +299,19 @@ class PromptRegistry extends EventEmitter {
     }
   }
 
+  /**
+   * 获取 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() 的别名
    */

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,
 };

package/src/common/error-capture.js

@@ -0,0 +1,91 @@
+'use strict';
+
+/**
+ * 全局错误捕获 — 把 uncaughtException 和 unhandledRejection 的完整堆栈落盘
+ * 下次出现 Cannot read properties of undefined (reading 'delete') 这类异步错误,
+ * 用户直接看 .foliko/error.log 即可拿到带文件名/行号的完整堆栈,无需复现。
+ *
+ * 设计要点:
+ * - 静默写文件,不污染 console(避免和 TUI / CLI 抢输出)
+ * - 同时保留原始 process 监听器(若用户已注册),不会覆盖
+ * - 一次安装,重复 require 不会重复绑定
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const INSTALLED = Symbol.for('foliko.error-capture.installed');
+const PROJECT_LOG = path.join(process.cwd(), '.foliko', 'error.log');
+
+/**
+ * 获取当前活跃的 sessionId (兼容 AsyncLocalStorage)
+ */
+function getActiveSessionId() {
+  try {
+    const { requestContext, sessionContext } = require('./context-helpers');
+    if (typeof sessionContext?.getStore === 'function') {
+      const store = sessionContext.getStore();
+      if (store?.sessionId) return store.sessionId;
+    }
+  } catch (_) { /* 未安装 context 系统时跳过 */ }
+  return null;
+}
+
+/**
+ * 把一个事件载荷写为单条记录到 .foliko/error.log
+ */
+function dumpEvent(kind, error) {
+  let record;
+  try {
+    const ts = new Date().toISOString();
+    const sid = getActiveSessionId();
+    const cwd = process.cwd();
+    const node = process.version;
+    const pid = process.pid;
+
+    const errObj = error instanceof Error ? error : new Error(String(error));
+    const stack = errObj.stack || `(no stack; value=${String(error)})`;
+
+    record =
+      `\n${'='.repeat(72)}\n` +
+      `[${ts}] [pid=${pid}] [node=${node}] [cwd=${cwd}] [sessionId=${sid || '(none)'}] kind=${kind}\n` +
+      `error.name=${errObj.name || 'Error'}  error.message=${errObj.message || '(no message)'}\n` +
+      `stack:\n${stack}\n`;
+  } catch (innerErr) {
+    record = `\n[${new Date().toISOString()}] dump failed: ${innerErr?.message || innerErr}\n`;
+  }
+
+  try {
+    fs.mkdirSync(path.dirname(PROJECT_LOG), { recursive: true });
+    fs.appendFileSync(PROJECT_LOG, record, 'utf8');
+  } catch (_) {
+    // 连日志都写不了就别折腾了
+  }
+}
+
+/**
+ * 安装全局错误捕获。重复调用安全(no-op)。
+ */
+function install(options = {}) {
+  const logFile = options.logFile || PROJECT_LOG;
+
+  // 用 global symbol 标记,避免重复 require 时再次 process.on
+  if (process[INSTALLED]) return process[INSTALLED];
+  if (!process[INSTALLED]) process[INSTALLED] = new Set();
+  if (process[INSTALLED].has('core')) return 'core';
+  process[INSTALLED].add('core');
+
+  // 捕获 unhandledRejection —— 这正是用户报的 Promise 拒绝
+  process.on('unhandledRejection', (reason, promise) => {
+    dumpEvent('unhandledRejection', reason);
+  });
+
+  // 捕获 uncaughtException —— 同步抛错兜底
+  process.on('uncaughtException', (err, origin) => {
+    dumpEvent(`uncaughtException(${origin})`, err);
+  });
+
+  return 'core';
+}
+
+module.exports = { install, dumpEvent, PROJECT_LOG };

package/src/common/logger.js

@@ -23,7 +23,7 @@ function ensureLogDir(logDir) {
 function getLogFilePath(logDir) {
   ensureLogDir(logDir);
   const date = new Date().toISOString().split('T')[0];
-  return path.join(logDir, `vb-agent-${date}.log`);
+  return path.join(logDir, `foliko-${date}.log`);
 }
 
 // 当前日志文件路径
@@ -62,7 +62,7 @@ function initLogger(options = {}) {
   const {
     level = process.env.LOG_LEVEL || 'info',
     logDir = DEFAULT_LOG_DIR,
-    name = 'vb-agent',
+    name = 'foliko',
     silent = false, // 是否静默（不输出到控制台）
   } = options;
 

package/src/context/compressor.js

@@ -19,6 +19,10 @@ const {
   TURN_PREFIX_SUMMARIZATION_PROMPT, BRANCH_SUMMARY_PREAMBLE, BRANCH_SUMMARY_PROMPT,
   DEFAULT_COMPACTION_SETTINGS, MODEL_CONTEXT_LIMITS, COMPRESSION_TIMEOUT_MS,
 } = require('./compaction-prompts');
+const {
+  KEEP_RECENT_MESSAGES,
+  COMPRESSION_MESSAGE_THRESHOLD,
+} = require('../common/constants');
 
 // ─── Helper classes ───────────────────────────────────────────────────
 
@@ -184,8 +188,8 @@ class ContextCompressor {
 
     this.model = config.model || 'deepseek-chat';
     this._maxContextTokens = config.maxContextTokens || this._getDefaultContextLimit();
-    this._keepRecentMessages = config.keepRecentMessages || 20;
-    this._compressionMessageThreshold = config.compressionMessageThreshold || 200;
+    this._keepRecentMessages = config.keepRecentMessages || KEEP_RECENT_MESSAGES;
+    this._compressionMessageThreshold = config.compressionMessageThreshold || COMPRESSION_MESSAGE_THRESHOLD;
     this._enableSmartCompress = config.enableSmartCompress !== false;
     this._compactionSettings = config.compactionSettings || DEFAULT_COMPACTION_SETTINGS;