foliko 2.0.2 → 2.0.4

package/src/agent/prompt-registry.js

@@ -0,0 +1,296 @@
+'use strict';
+
+/**
+ * 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 完全切换到本注册表
+ */
+
+const { EventEmitter } = require('../common/events');
+const { PROMPT_SLOT } = require('../common/constants');
+
+/**
+ * 单个 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 默认
+    this.description = options.description || '';
+    this.metadata = options.metadata || {};
+    this._cached = null;
+    this._dirty = true;
+    this._error = null;
+  }
+
+  get() {
+    if (this._dirty || this._cached === null) {
+      try {
+        const result = this.provider();
+        this._cached = result == null ? null : String(result);
+        this._dirty = false;
+        this._error = null;
+      } catch (e) {
+        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);
+      }
+    }
+    return this._cached;
+  }
+
+  invalidate() {
+    this._dirty = true;
+  }
+}
+
+/**
+ * PromptRegistry 主类
+ */
+class PromptRegistry extends EventEmitter {
+  constructor(options = {}) {
+    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 时检测循环依赖
+    this._building = false;
+  }
+
+  // ==================== 槽位管理 ====================
+
+  /**
+   * 定义/覆盖一个槽位
+   */
+  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);
+  }
+
+  // ==================== 注册/注销 ====================
+
+  /**
+   * 注册一个 prompt part
+   * @param {string} owner 拥有者标识（通常是 plugin name 或 '_main'）
+   * @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}
+   */
+  register(owner, name, provider, options = {}) {
+    if (!owner || typeof owner !== 'string') {
+      throw new Error('PromptRegistry.register: owner is required');
+    }
+    if (!name || typeof name !== 'string') {
+      throw new Error('PromptRegistry.register: name is required');
+    }
+    if (typeof provider !== 'function') {
+      throw new Error('PromptRegistry.register: provider must be a function');
+    }
+
+    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 });
+    return part;
+  }
+
+  /**
+   * 注销一个 part
+   * @returns {boolean} 是否真的删除了
+   */
+  unregister(owner, name) {
+    const key = `${owner}::${name}`;
+    const existed = this._parts.delete(key);
+    if (existed) this.emit('unregister', { owner, name });
+    return existed;
+  }
+
+  /**
+   * 清空指定 owner 的所有 parts
+   * @returns {number} 删除的 part 数
+   */
+  clearOwner(owner) {
+    const prefix = `${owner}::`;
+    let count = 0;
+    for (const key of Array.from(this._parts.keys())) {
+      if (key.startsWith(prefix)) {
+        this._parts.delete(key);
+        count++;
+      }
+    }
+    if (count > 0) this.emit('clear-owner', { owner, count });
+    return count;
+  }
+
+  /**
+   * 失效指定 part（下次 build 时重新计算）
+   */
+  invalidate(owner, name) {
+    const part = this._parts.get(`${owner}::${name}`);
+    if (part) {
+      part.invalidate();
+      this.emit('invalidate', { owner, name });
+    }
+    return this;
+  }
+
+  /**
+   * 失效所有 parts
+   */
+  invalidateAll() {
+    for (const part of this._parts.values()) part.invalidate();
+    this.emit('invalidate-all');
+    return this;
+  }
+
+  // ==================== 查询 ====================
+
+  /**
+   * 获取单个 part 实例
+   */
+  getPart(owner, name) {
+    return this._parts.get(`${owner}::${name}`) || null;
+  }
+
+  /**
+   * 是否有指定 part
+   */
+  has(owner, name) {
+    return this._parts.has(`${owner}::${name}`);
+  }
+
+  /**
+   * 列出所有 parts（按 order 排序）
+   */
+  list() {
+    return Array.from(this._parts.values()).sort((a, b) => this._compareOrder(a, b));
+  }
+
+  /**
+   * 按 owner 过滤
+   */
+  listByOwner(owner) {
+    return this.list().filter((p) => p.owner === owner);
+  }
+
+  /**
+   * 按 slot 过滤
+   */
+  listBySlot(slot) {
+    return this.list().filter((p) => p.slot === slot);
+  }
+
+  _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);
+  }
+
+  count() {
+    return this._parts.size;
+  }
+
+  // ==================== 渲染 ====================
+
+  /**
+   * 渲染完整 prompt 文本（按 slot order 拼接）
+   */
+  build() {
+    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()) {
+        const content = part.get();
+        if (content && content.trim()) sections.push(content.trim());
+      }
+      return sections.join('\n\n');
+    } finally {
+      this._building = false;
+    }
+  }
+
+  /**
+   * build() 的语义化别名，调试用
+   */
+  preview() {
+    return this.build();
+  }
+
+  /**
+   * 渲染结构化清单（调试 / 文档生成）
+   * 返回 [{ owner, name, slot, order, length, contentPreview }]
+   */
+  inspect() {
+    return this.list().map((part) => {
+      const content = part.get();
+      return {
+        owner: part.owner,
+        name: part.name,
+        slot: part.slot,
+        order: part.order != null ? part.order : this._slots.get(part.slot)?.order ?? 999,
+        description: part.description,
+        hasContent: Boolean(content && content.trim()),
+        length: content ? content.length : 0,
+        contentPreview: content ? content.slice(0, 80).replace(/\n/g, ' ') : null,
+      };
+    });
+  }
+}
+
+module.exports = { PromptRegistry, PromptPart };

package/src/agent/sub-config.js

@@ -6,84 +6,7 @@
 
 const fs = require('fs');
 const path = require('path');
-
-/**
- * 解析 YAML frontmatter
- */
-function parseFrontmatter(content) {
-  const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-  if (!match) return null;
-
-  const frontmatter = {};
-  const lines = match[1].split('\n');
-  let currentKey = null;
-
-  for (const line of lines) {
-    // 处理 metadata 嵌套
-    if (currentKey === 'metadata') {
-      if (line.match(/^ {2}[a-zA-Z]/)) {
-        const colonIndex = line.indexOf(':');
-        if (colonIndex > 0) {
-          const key = line.substring(2, colonIndex).trim();
-          const value = line
-            .substring(colonIndex + 1)
-            .trim()
-            .replace(/^["']|["']$/g, '');
-          frontmatter[currentKey][key] = value;
-          continue;
-        }
-      } else if (line.match(/^[a-zA-Z]/)) {
-        currentKey = null;
-        continue;
-      }
-    }
-
-    const colonIndex = line.indexOf(':');
-    if (colonIndex === -1) continue;
-
-    const key = line.substring(0, colonIndex).trim();
-    let value = line.substring(colonIndex + 1).trim();
-
-    // 移除引号
-    if (
-      (value.startsWith('"') && value.endsWith('"')) ||
-      (value.startsWith("'") && value.endsWith("'"))
-    ) {
-      value = value.slice(1, -1);
-    }
-
-    if (key === 'metadata') {
-      currentKey = 'metadata';
-      frontmatter.metadata = {};
-    } else if (key === 'allowed-tools') {
-      frontmatter[key] = value
-        .split(',')
-        .map((v) => v.trim())
-        .filter(Boolean);
-    } else if (key === 'skills') {
-      frontmatter[key] = value
-        .split(',')
-        .map((v) => v.trim())
-        .filter(Boolean);
-    } else if (key === 'tools') {
-      frontmatter[key] = value
-        .split(',')
-        .map((v) => v.trim())
-        .filter(Boolean);
-    } else {
-      frontmatter[key] = value;
-    }
-  }
-
-  return frontmatter;
-}
-
-/**
- * 移除 frontmatter，只保留正文内容
- */
-function stripFrontmatter(content) {
-  return content.replace(/^---\r?\n[\s\S]*?\r?\n---\r?\n/, '');
-}
+const { parseFrontmatter, stripFrontmatter } = require('../utils');
 
 class SubAgentConfig {
   constructor(name, filePath) {

package/src/agent/sub.js

@@ -27,10 +27,10 @@ class SubAgent extends BaseAgent {
     this.baseURL = config.baseURL;
     this.providerOptions = config.providerOptions || {};
 
-    this.defaulTools = ['ext_skill', 'loadSkill', 'ext_call', 'subagent_call', 'mcp_call', 'mcp_tool_schema'];
+    this.defaulTools = ['ext_skill', 'skill_load', 'ext_call', 'subagent_call', 'mcp_call', 'mcp_tool_schema'];
     this.bindTools = {
       read: 'read_file', write: 'write_file', edit: 'modify_file',
-      glob: 'read_directory', grep: 'search_file', bash: 'bash',
+      glob: 'read_directory', grep: 'search_file', bash: 'shell_exec',
     };
 
     this._customSystemPrompt = config.systemPrompt || null;
@@ -39,24 +39,13 @@ class SubAgent extends BaseAgent {
     this.maxRetries = config.maxRetries ?? 2;
     this.retryDelay = config.retryDelay ?? 5000;
     this.disableTools = config.disableTools ?? false;
-    this._promptParts = [];
+    this.hidden = config.hidden || false;  // 隐藏子Agent，不在指令系统中显示
     this._isSubagent = true;
 
     this.providerOptions.deepseek = this.providerOptions.deepseek || {};
     this.providerOptions.deepseek.thinking = { type: 'disabled' };
 
-    if (this.framework) {
-      this.framework.once('framework:ready', () => {
-        const extExecutor = this.framework?.pluginManager?.get('extension-executor');
-        extExecutor?._refreshAllAgentsExtPrompt?.(this.framework);
-      });
-    }
-  }
-
-  registerPromptPart(name, priority = 100, provider) {
-    this._promptParts.push({ name, priority, provider });
-    this._promptParts.sort((a, b) => a.priority - b.priority);
-    return this;
+    // 扩展工具 prompt 由 _syncPromptParts 同步到 promptRegistry，无需显式刷新
   }
 
   _validateMessagesPairing(messages) { return validateAll(messages); }
@@ -74,7 +63,15 @@ class SubAgent extends BaseAgent {
 
   _getAIProvider() {
     const { createAI } = require('../llm/provider');
-    return createAI({ provider: this.provider, model: this.model, apiKey: this.apiKey, baseURL: this.baseURL });
+    // 优先从 framework 的 ai 插件拿最新配置（避免构造时拿到 stale apiKey）
+    const aiPlugin = this.framework?.pluginManager?.get('ai');
+    const aiConfig = aiPlugin ? aiPlugin.getConfig() : {};
+    return createAI({
+      provider: aiConfig.provider || this.provider,
+      model: aiConfig.model || this.model,
+      apiKey: aiConfig.apiKey || this.apiKey,
+      baseURL: aiConfig.baseURL || this.baseURL,
+    });
   }
 
   _buildAITools() {
@@ -111,15 +108,13 @@ class SubAgent extends BaseAgent {
       const mainPrompt = mainAgent.getOriginalPrompt();
       if (mainPrompt) { lines.push('## 主Agent的系统提示词'); lines.push(mainPrompt); lines.push(''); }
     }
-    const subagentManager = this.framework?.pluginManager?.get('subagent-manager');
-    if (subagentManager?._buildDescription) lines.push(subagentManager._buildDescription());
     lines.push('');
-    const extExecutor = this.framework?.pluginManager?.get('extension-executor');
-    const extDesc = extExecutor?._buildExtensionsDescription?.();
-    if (extDesc) { lines.push(extDesc); lines.push(''); }
-    for (const part of this._promptParts) {
+    // 渲染通过 promptRegistry 注册的 prompt part（按 slot/order 排序）
+    // 扩展工具描述、子Agent 描述等都由 _syncPromptParts 同步到 promptRegistry，
+    // 无需再单独硬编码调用 _buildExtensionsDescription / _buildDescription
+    for (const part of (this.promptRegistry?.list() || [])) {
       try {
-        const content = typeof part.provider === 'function' ? part.provider() : '';
+        const content = part.get();
         if (content?.trim()) lines.push('', content.trim());
       } catch (err) {
         logger.warn(`[SubAgent:${this.name}] Prompt part '${part.name}' failed:`, err.message);
@@ -127,7 +122,7 @@ class SubAgent extends BaseAgent {
     }
     lines.push('', '## 核心职责', `- **专注本职**：只完成与 ${this.role} 相关的任务`, '- **不越界**：不要代替其他子Agent完成任务', '- **返回结果**：返回简洁明确的操作结果', '');
     lines.push('当你被调用时，你应该：', '1. 仔细理解任务要求', '2. 如果任务不在职责范围内，返回"此任务不在我的职责范围内"', '3. 使用你的工具集完成任务', '4. 返回完整结果');
-    lines.push('', '## 禁止事项', '- 处理本职外的任务', '- 代替其他子Agent执行操作', '- 在回复中透露内部实现细节', '- 不先调用 ext_skill/loadSkill 就直接使用 ext_call');
+    lines.push('', '## 禁止事项', '- 处理本职外的任务', '- 代替其他子Agent执行操作', '- 在回复中透露内部实现细节', '- 不先调用 ext_skill/skill_load 就直接使用 ext_call');
     return lines.join('\n');
   }
 
@@ -162,7 +157,7 @@ class SubAgent extends BaseAgent {
       } catch (err) {
         lastError = err;
         if (isNetworkError(err) && attempt < maxRetries) {
-          logger.warn(`[SubAgent:${this.name}] AI unavailable, retrying (${attempt + 1}/${maxRetries})`);
+          logger.warn(`[SubAgent:${this.name}] AI 服务不可用，重试中 (${attempt + 1}/${maxRetries})`);
           await new Promise(resolve => setTimeout(resolve, retryDelay * Math.pow(2, attempt)));
           continue;
         }

package/src/cli/commands/plugin.js

@@ -5,70 +5,11 @@
 
 const fs = require('fs');
 const path = require('path');
-const { execSync } = require('child_process');
 const https = require('https');
 const http = require('http');
-const { DEFAULT_REPO, shouldIgnore } = require('../utils/plugin-config');
+const { DEFAULT_REPO, shouldIgnore, copyDirRecursive, parseGitUrl, gitCommand } = require('../../utils');
 const { AGENT_DIR_NAME } = require('../utils/config');
 
-/**
- * 递归复制目录（带过滤）
- */
-function copyDirRecursive(src, dest, ignorePatterns = []) {
-  if (!fs.existsSync(src)) return;
-
-  fs.mkdirSync(dest, { recursive: true });
-
-  const entries = fs.readdirSync(src, { withFileTypes: true });
-
-  for (const entry of entries) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-
-    // 检查是否忽略
-    if (shouldIgnore(entry.name)) {
-      console.log(`  Ignoring: ${entry.name}`);
-      continue;
-    }
-
-    if (entry.isDirectory()) {
-      copyDirRecursive(srcPath, destPath, ignorePatterns);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
-  }
-}
-
-/**
- * 解析 Git URL 获取信息
- */
-function parseGitUrl(url) {
-  // 支持多种格式
-  const patterns = [
-    /^https:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?$/,
-    /^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/,
-  ];
-
-  for (const pattern of patterns) {
-    const match = url.match(pattern);
-    if (match) {
-      return { owner: match[1], repo: match[2] };
-    }
-  }
-  return null;
-}
-
-/**
- * 执行 Git 命令
- */
-function gitCommand(args, cwd) {
-  try {
-    return execSync(`git ${args}`, { cwd, encoding: 'utf-8', stdio: 'pipe' });
-  } catch (err) {
-    return err.stdout || err.stderr || '';
-  }
-}
-
 /**
  * 下载文件
  */

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

@@ -168,7 +168,7 @@ class ChatUIOld {
 
   async _reloadSkills() {
     try {
-      const result = await this.agent.framework.executeTool('reloadSkills', {});
+      const result = await this.agent.framework.executeTool('skill_reload', {});
       if (result.success !== false) {
         console.log(colored('[提示] 技能已重载', CYAN));
       } else {

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

@@ -287,9 +287,11 @@ class ChatUI {
     const self=this;
     queue.add(function(){
       var next = this.next;
+      self.interrupted = false; // 新消息重置中断状态，确保 stream chunks 正常处理
       self.agent.sendMessage(message, { sessionId:self.sessionId }).then(next).catch(function(e){
-        self.create_message(chalk.red(`[错误] ${e?.message || e || '发送消息失败'}\n`), colored('● ', RED))
+        // 错误由 sessionScope.on('queue:failed') 统一显示，此处只需清理状态
         self.clear_message_done();
+        next(); // 必须调 next() 推进队列，否则后续消息卡死
       });
     })
     
@@ -321,7 +323,7 @@ class ChatUI {
 
     if (cmd === '/reload') {
       try {
-        const result = await this.agent.framework.executeTool('reloadSkills', {});
+        const result = await this.agent.framework.executeTool('skill_reload', {});
         if (result.success !== false) {
           this.create_message(`${colored('[提示]', CYAN)} 技能已重载\n`,chalk.dim('● '))
         } else {
@@ -592,11 +594,11 @@ class ChatUI {
         }
       } else if (chunk.type === 'tool-call') {
         const args = chunk.input ? JSON.stringify(chunk.input).slice(0, 30) : '';
-        this.statusBar.tooler.show(`${chalk.yellow('[Tool]')} ${folikoGold(chunk.toolName)} ${chalk.gray(args+'...')}`)
+        this.statusBar.tooler.show(`${folikoGold(chunk.toolName.toLocaleUpperCase())} ${chalk.gray(args+'...')}`)
       } else if(chunk.type==='tool-result'){
         const result = chunk.result;
         const shortResult = typeof result === 'string' ? result.slice(0, 30) : JSON.stringify(result).slice(0, 30);
-        this.statusBar.tooler.show(`${chalk.green('[Tool]')} ${folikoGold(chunk.toolName)} ${chalk.gray(shortResult+'...')}`)
+        this.statusBar.tooler.show(`${folikoGold(chunk.toolName.toLocaleUpperCase())} ${chalk.gray(shortResult+'...')}`)
 
         // 如果是 edit/edit_file 的结果并且包含 diff，渲染彩色 diff
         if (chunk.toolName === 'edit' || chunk.toolName === 'edit_file') {
@@ -610,7 +612,7 @@ class ChatUI {
             const bgColor = chalk.bgHex('#1a1a2e');
             this._currentBotMessage.appendContent(['\n',diffContent,'\n\n'].join(''));
             // this.create_message(diffContent, chalk.yellow('▸ '), true, (line) => bgColor(line));
-            this.statusBar.tooler.show(`${chalk.green('[Diff]')} ${folikoGold(resultObj.filePath)}`);
+            this.statusBar.tooler.show(`${chalk.green('[差异]')} ${folikoGold(resultObj.filePath)}`);
           }
         }
         // setTimeout(() => this.tooler.hide(), 3000);
@@ -662,23 +664,25 @@ class ChatUI {
    
     this.interrupted = false;
 
-    const interruptHandler = () => {
-      if (!this.interrupted) {
-        this.interrupted = true;
-        console.log(`\n${colored('[中断]', RED)} 输出已中断`);
-      }
-    };
-
-
     this.tui.addInputListener((data) => {
       if (matchesKey(data, 'ctrl+c')) {
-        this.tui.stop();
-        process.exit(0);
+        if (this.isResponding) {
+          // 正在响应中：中断对话但不退出
+          this.isResponding = false;
+          this.interrupted = true;
+          this.agent?.framework?.stop();
+        } else {
+          // 空闲状态：退出
+          this.tui.stop();
+          process.exit(0);
+        }
       }
     });
     this.tui.start();
-    
-    //process.on('SIGINT', interruptHandler);
+
+    process.on('SIGINT', () => {
+      // 防止默认 SIGINT 退出（由 tui 的 ctrl+c 处理）
+    });
   }
 
 

package/src/cli/ui/components/agent-mention-provider.js

@@ -78,7 +78,7 @@ class AgentMentionProvider {
 
         const mainAgent = this.framework._mainAgent;
         return this.framework._agents
-            .filter(agent => agent !== mainAgent && agent.name)
+            .filter(agent => agent !== mainAgent && agent.name && !agent.hidden)
             .map(agent => ({
                 name: agent.name.replace(/^subagent_/, '').replace(/^session_/, ''),
                 description: agent._role || agent.description || agent.name,