foliko 1.1.93 → 2.0.1

package/src/agent/worker.js

@@ -0,0 +1,104 @@
+'use strict';
+
+/**
+ * WorkerAgent - 独立 Worker Agent
+ * 用于 Coordinator 模式下的 Worker，基于 SubAgent 轻量级实现
+ */
+
+const { BaseAgent } = require('./base');
+
+class WorkerAgent extends BaseAgent {
+  constructor(framework, config) {
+    super(framework, config);
+
+    this.workerId = config.workerId;
+    this.coordinatorId = config.coordinatorId;
+    this._task = config.task || '';
+
+    const aiPlugin = framework.pluginManager?.get('ai');
+    const aiConfig = aiPlugin ? aiPlugin.getConfig() : {};
+    const mergedAIConfig = { ...aiConfig, ...config.llmConfig };
+
+    const toolList = [];
+    if (config.tools) {
+      const allTools = framework.getTools();
+      const allowedTools = new Set(config.tools);
+      for (const toolName of allowedTools) {
+        const toolDef = allTools.find(t => t.name === toolName);
+        if (toolDef) toolList.push(toolDef);
+      }
+    }
+
+    const { SubAgent } = require('./sub');
+    this._subagent = new SubAgent({
+      name: config.name || `worker_${this.workerId}`,
+      role: config.role || 'Worker',
+      description: config.description || '',
+      systemPrompt: config.systemPrompt || WorkerAgent.defaultPrompt(),
+      model: config.model || mergedAIConfig.model || 'deepseek-chat',
+      provider: config.provider || mergedAIConfig.provider || 'deepseek',
+      apiKey: config.apiKey || mergedAIConfig.apiKey,
+      baseURL: config.baseURL || mergedAIConfig.baseURL,
+      tools: toolList,
+      framework: framework,
+      maxRetries: config.maxRetries ?? 2,
+      disableTools: config.disableTools ?? false,
+    });
+
+    this._subagent.on('chunk', chunk => this.emit('chunk', chunk));
+    this._subagent.on('complete', data => { this._status = 'completed'; this.emit('complete', data); });
+    this._subagent.on('error', data => { this._status = 'error'; this.emit('error', data); });
+  }
+
+  getStatus() { return this._status; }
+  setStatus(status) { this._status = status; }
+  getSubagent() { return this._subagent; }
+
+  async runTask(task, options) {
+    this._task = task;
+    this._status = 'running';
+    try {
+      const result = await this._subagent.chat(task, options);
+      if (!result.success) this._status = 'error';
+      return result;
+    } catch (err) {
+      this._status = 'error';
+      throw err;
+    }
+  }
+
+  async sendMessage(message, options) {
+    if (this._status === 'stopped') throw new Error(`Worker ${this.workerId} has been stopped`);
+    this._status = 'running';
+    try { return await this._subagent.chat(message, options); }
+    catch (err) { this._status = 'error'; throw err; }
+  }
+
+  stop() {
+    this._status = 'stopped';
+    this._subagent.destroy();
+    this.emit('stopped', { workerId: this.workerId });
+  }
+
+  static formatNotification(workerId, status, result, error = null) {
+    const notification = { worker_id: workerId, status, timestamp: new Date().toISOString() };
+    if (error) notification.error = error;
+    else if (result) notification.result = result;
+    return JSON.stringify(notification);
+  }
+
+  static defaultPrompt() {
+    return `你是一个独立的Worker Agent。
+你的职责：
+1. 接收并理解Coordinator分配的任务
+2. 使用你的工具集完成任务
+3. 返回完整的任务结果
+
+重要规则：
+- 任务完成或出错时，在响应末尾添加JSON格式的<task-notification>说明状态
+- 不要主动联系Coordinator，由Coordinator主动查询结果
+- 如果需要更多信息，等待Coordinator发送continue消息`;
+  }
+}
+
+module.exports = { WorkerAgent };

package/{cli/bin/foliko.js → src/cli/bin.js}

@@ -6,6 +6,6 @@
 // 加载 .env 文件（覆盖系统环境变量，确保 .env 优先级最高）
 require('dotenv').config({ override: true });
 
-const { cli } = require('../src');
+const { cli } = require('./index');
 
 cli();

package/{cli/src → src/cli}/commands/chat.js

@@ -4,11 +4,10 @@
 
 const path = require('path');
 
-const { Framework } = require('../../../src');
+const foliko = require('../../../src');
 const { ChatUI } = require('../ui/chat-ui');
-const { ChatUI: OldChatUI } = require('../ui/chat-ui-old');
-const { logger, LOG_LEVELS } = require('../../../src/utils/logger');
-const { DEFAULT_PROVIDERS } = require('../../../src/core/provider');
+const { logger, LOG_LEVELS } = require('../../../src/common/logger');
+const { DEFAULT_PROVIDERS } = foliko.LLM;
 
 // // 加载 .env 文件
 // dotenv.config({ override: true,quiet: true});
@@ -80,7 +79,7 @@ function parseArgs(args) {
     } else if (arg === '--no-quiet') {
       options.quiet = false;
     } else if (arg === '--old') {
-      options.useOldUI = true;
+      options.oldUI = true;
     }
   }
 
@@ -151,21 +150,20 @@ async function chatCommand(args) {
   // console.log('输入 exit 或 quit 退出\n');
   // TUI 模式下抑制日志输出（静默 console.log 但保持 logEmitter 事件）
   
-  // 初始化框架
-  const framework = new Framework({ debug: false });
-  
-
-  await framework.bootstrap({
-    agentDir: process.cwd() + '/.foliko',
-    aiConfig: {
-      provider: options.provider,
-      model: options.model,
-      baseURL: options.baseURL,
-      apiKey: options.apiKey,
-      providerOptions: {
-        maxOutputTokens: 8192,
-        minimax: { // 这里的 key 必须和上面 createOpenAICompatible 里的 name 一致
-          reasoning_split: true, // MiniMax API 要求的参数
+  // 初始化框架 — 使用新门面 API
+  const framework = await foliko.bootstrap({
+    _config: {
+      agentDir: process.cwd() + '/.foliko',
+      ai: {
+        provider: options.provider,
+        model: options.model,
+        baseURL: options.baseURL,
+        apiKey: options.apiKey,
+        providerOptions: {
+          maxOutputTokens: 8192,
+          minimax: {
+            reasoning_split: true,
+          },
         },
       },
     },
@@ -203,7 +201,13 @@ async function chatCommand(args) {
 
 
   // 初始化 UI
-  const UI = options.useOldUI ? OldChatUI : ChatUI;
+  let UI;
+  if (options.oldUI) {
+    const { ChatUIOld } = require('../ui/chat-ui-old');
+    UI = ChatUIOld;
+  } else {
+    UI = ChatUI;
+  }
   const ui = new UI(agent, { stream: options.stream });
 
   // 监听通知事件，在 CLI 中显示

package/{cli/src → src/cli}/index.js

@@ -108,6 +108,7 @@ Chat Options:
   --model <name>    指定 AI 模型
   --provider <name> 指定 AI 提供商
   --base-url <url>  指定 API 基础地址
+  --old             使用传统 readline 界面（轻量，无 TUI 依赖）
 
 Examples:
   foliko chat

package/{cli/src → src/cli}/ui/chat-ui-old.js

@@ -1,68 +1,47 @@
 /**
- * 聊天界面组件
- * 使用 readline question() 实现多行输入
+ * 旧版聊天界面组件
+ * 使用 readline question() 实现多行输入，轻量无 TUI 依赖
  */
 
 const readline = require('readline');
 const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../utils/ansi');
 const { renderLine } = require('../utils/markdown');
-const { cleanResponse, logger } = require('../../../src/utils');
-const { logEmitter } = require('../../../src/utils/logger');
-const Queue = require('js-queue');
+const { logger } = require('../../../src/common/logger');
 
-class ChatUI {
+class ChatUIOld {
   constructor(agent, options = {}) {
     this.agent = agent;
     this.rl = null;
-    this.lines = []; // 多行输入的累积
+    this.lines = [];
 
-    // 流式模式（默认开启）
     this.stream = options.stream !== false;
-
-    // 会话管理
     this.sessionId = options.sessionId || 'cli_default';
     this.sessionPlugin = null;
-
-    // 队列系统
-    this.queue = new Queue();
-
-    // 中断状态（供监听器访问）
     this.interrupted = false;
-
-    // session scope 事件监听
     this.sessionScope = null;
-
-    // 流式输出缓冲区（可重置）
     this._lineBuffer = '';
 
-    // 基础命令
     this.baseCommands = [
-      { name: "compress", description: "压缩记录" },
-      { name: "clear", description: "清除记录" },
-      { name: "exit", description: "退出" },
-      { name: "help", description: "显示帮助信息" },
-      { name: "reload", description: "重载技能" },
+      { name: 'compress', description: '压缩记录' },
+      { name: 'clear', description: '清除记录' },
+      { name: 'exit', description: '退出' },
+      { name: 'help', description: '显示帮助信息' },
+      { name: 'reload', description: '重载技能' },
     ];
 
-    // 如果 agent 有 framework，获取 SessionPlugin
     if (agent.framework) {
       this.sessionPlugin = agent.framework.pluginManager.get('session');
-      // 确保会话存在
       if (this.sessionPlugin) {
         this.sessionPlugin.getOrCreateSession(this.sessionId, {
           metadata: { platform: 'cli' },
         });
       }
-      // 创建 session scope 并设置监听器（只需一次）
       this.sessionScope = this.agent.createSessionScope(this.sessionId);
       this._setupSessionListeners();
       this._setupFrameworkListeners();
     }
   }
 
-  /**
-   * 清理监听器
-   */
   dispose() {
     if (this._logHandler && this.agent.framework) {
       logger.off('log', this._logHandler);
@@ -82,67 +61,46 @@ class ChatUI {
     }
   }
 
-  /**
-   * 设置 framework 事件监听（日志、通知、Usage、热重载）
-   */
   _setupFrameworkListeners() {
     const levelDict = {
-      DEBUG: 'cyan',
-      INFO: 'dim',
-      LOG: 'dim',
-      WARN: 'yellow',
-      ERROR: 'red',
+      DEBUG: 'cyan', INFO: 'dim', LOG: 'dim',
+      WARN: 'yellow', ERROR: 'red',
     };
 
-    // 日志监听
     this._logHandler = (data) => {
       if (!Object.keys(levelDict).includes(data.level)) return;
-      const level = `[${data.level}]`;
-      const levelKey = levelDict[data.level] || 'dim';
-      console.log(colored(level, RED) + colored(data.message, levelKey));
+      const tag = colored(`[${data.level}]`, RED);
+      const msg = colored(data.message, levelDict[data.level] || 'dim');
+      console.log(tag + msg);
     };
     logger.on('log', this._logHandler);
 
-    // 通知监听
     this._notificationHandler = (data) => {
       if (data.sessionId && data.sessionId !== this.sessionId) return;
-      const time = data.timestamp ? new Date(data.timestamp).toLocaleTimeString('zh-CN') : '';
-      const notificationText = `[通知] ${data.title}${time ? ` (${time})` : ''}`;
-      console.log(colored(notificationText, CYAN));
-      if (data.message) {
-        console.log(colored(data.message, DIM));
-      }
+      const t = data.timestamp ? new Date(data.timestamp).toLocaleTimeString('zh-CN') : '';
+      console.log(colored(`[通知] ${data.title}${t ? ` (${t})` : ''}`, CYAN));
+      if (data.message) console.log(colored(data.message, DIM));
     };
     this.agent.framework.on('notification', this._notificationHandler);
 
-    // Usage 监听
     this._usageHandler = (data) => {
       if (data.usage) {
         const u = data.usage;
         const input = u.promptTokens || u.prompt_tokens || 0;
         const output = u.completionTokens || u.completion_tokens || 0;
-        // 更新 footerBar 如果存在
-        if (this.footerBar) {
-          this.footerBar.updateUsage(input, output);
-        }
       }
     };
     this.agent.framework.on('agent:usage', this._usageHandler);
 
-    // Skill 热重载监听
     this._skillReloadedHandler = () => {
       console.log(colored('[提示] 技能已重载', CYAN));
     };
     this.agent.framework.on('skill:reloaded', this._skillReloadedHandler);
   }
 
-  /**
-   * 统一命令执行入口
-   */
   async _executeCommand(trimmed) {
     const cmd = trimmed.toLowerCase();
 
-    // 基础命令
     if (cmd === '/clear' || cmd === '/clean') {
       this._clearContext();
       console.log(colored('[提示] 对话上下文已清除', CYAN));
@@ -167,7 +125,7 @@ class ChatUI {
       return true;
     }
 
-    // Skill 命令 (格式: skillname:cmdname)
+    // skill 命令 (格式: skillname:cmdname)
     if (trimmed.startsWith('/') && trimmed.includes(':')) {
       const cmdName = trimmed.slice(1).split(' ')[0];
       const cmdArgs = trimmed.slice(cmdName.length + 2);
@@ -189,71 +147,25 @@ class ChatUI {
       return true;
     }
 
-    // CommandRegistry 命令
-    const { getCommandRegistry } = require('../../../src/core/command-registry');
-    const registry = getCommandRegistry();
-    const cmdName = trimmed.slice(1).split(' ')[0];
-    const cmdArgs = trimmed.slice(cmdName.length + 2);
-    if (trimmed.startsWith('/') && cmdName) {
-      const cmd = registry.getCommand(cmdName);
-      if (cmd) {
-        try {
-          const context = {
-            sessionId: this.sessionId,
-            agent: this.agent,
-            ui: this,
-            framework: this.agent.framework,
-          };
-          registry.execute(cmdName, cmdArgs, context).catch(err => {
-            console.log(colored(`[命令错误] ${err.message}`, RED));
-          });
-        } catch (err) {
-          console.log(colored(`[命令错误] ${err.message}`, RED));
-        }
-        return true;
-      }
-    }
-
     return false;
   }
 
-  /**
-   * 显示帮助信息
-   */
   async _showHelp() {
-    const { getCommandRegistry } = require('../../../src/core/command-registry');
-    const registry = getCommandRegistry();
-    const commands = registry.getAllCommands();
-
     console.log(colored('[帮助] 可用命令:', CYAN));
     this.baseCommands.forEach(c => {
       console.log(`  ${colored('/' + c.name, CYAN)} - ${c.description}`);
     });
 
-    // Skill 命令
     const extExecutor = this.agent.framework?.pluginManager?.get('extension-executor');
     if (extExecutor && typeof extExecutor.getSkillCommands === 'function') {
-      const skillCommands = extExecutor.getSkillCommands();
-      if (skillCommands.length > 0) {
+      const cmds = extExecutor.getSkillCommands();
+      if (cmds.length > 0) {
         console.log(colored('\n[技能命令]', CYAN));
-        skillCommands.forEach(cmd => {
-          console.log(`  ${colored('/' + cmd.name, CYAN)} - ${cmd.description || '无描述'}`);
-        });
-      }
-    }
-
-    if (commands.length > 0) {
-      console.log(colored('\n[扩展命令]', CYAN));
-      for (const cmd of commands) {
-        const pluginTag = cmd.registeredBy ? ` [${cmd.registeredBy}]` : '';
-        console.log(`  ${colored('/' + cmd.name, CYAN)}${pluginTag} - ${cmd.description || '无描述'}`);
+        cmds.forEach(c => console.log(`  ${colored('/' + c.name, CYAN)} - ${c.description || '无描述'}`));
       }
     }
   }
 
-  /**
-   * 重载技能
-   */
   async _reloadSkills() {
     try {
       const result = await this.agent.framework.executeTool('reloadSkills', {});
@@ -267,27 +179,18 @@ class ChatUI {
     }
   }
 
-  /**
-   * 清除上下文
-   */
   _clearContext() {
-    const { sessionId } = this;
-    this.agent.clearContext(sessionId);
-
+    this.agent.clearContext(this.sessionId);
     if (this.sessionPlugin) {
-      const manager = this.sessionPlugin._getSessionManager(sessionId);
-      if (manager) manager.clearMessages();
+      const mgr = this.sessionPlugin._getSessionManager(this.sessionId);
+      if (mgr) mgr.clearMessages();
     }
   }
 
-  /**
-   * 压缩上下文
-   */
   async _compressContext() {
     console.log(colored('[压缩] 压缩中...', YELLOW));
     try {
-      const { sessionId } = this;
-      const result = await this.agent.compressContext(sessionId);
+      const result = await this.agent.compressContext(this.sessionId);
       console.log(colored(`[压缩] 压缩后: ${result.after} 条 (保留${result.keepRecent}条)`, YELLOW));
     } catch (err) {
       const msg = err.message || String(err);
@@ -299,9 +202,6 @@ class ChatUI {
     }
   }
 
-  /**
-   * 设置 session scope 事件监听
-   */
   _setupSessionListeners() {
     const renderState = { inThink: false, inCodeBlock: false };
 
@@ -310,10 +210,7 @@ class ChatUI {
 
       if (chunk.type === 'text') {
         this._lineBuffer += chunk.text;
-
         while (this._lineBuffer.includes('\n')) {
-          if (this.interrupted) break;
-
           const nlIndex = this._lineBuffer.indexOf('\n');
           const line = this._lineBuffer.substring(0, nlIndex);
           this._lineBuffer = this._lineBuffer.substring(nlIndex + 1);
@@ -325,13 +222,9 @@ class ChatUI {
         const args = chunk.input ? JSON.stringify(chunk.input).slice(0, 30) : '';
         console.log(colored(`[Tool] ${chunk.toolName} ${args}...`, YELLOW));
       } 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);
-        console.log(colored(`[Tool] ${chunk.toolName} ${shortResult}...`, GREEN));
-      } else if (chunk.type === 'usage') {
-        if (this.footerBar) {
-          this.footerBar.updateUsage(chunk.inputTokens || 0, chunk.outputTokens || 0);
-        }
+        const r = chunk.result;
+        const short = typeof r === 'string' ? r.slice(0, 30) : JSON.stringify(r).slice(0, 30);
+        console.log(colored(`[Tool] ${chunk.toolName} ${short}...`, GREEN));
       }
     });
 
@@ -339,17 +232,15 @@ class ChatUI {
       console.log(colored('● ', GREEN));
     });
 
-    this.sessionScope.on('message:complete', async ({ content, requestId }) => {
-      try {
-        if (!content) {
-          const msg = '继续';
-          await this.agent.sendMessage(msg, { sessionId: this.sessionId, priority: 1 });
-        }
-      } catch (err) {}
+    this.sessionScope.on('message:complete', async ({ content }) => {
+      if (!content) {
+        try {
+          await this.agent.sendMessage('继续', { sessionId: this.sessionId, priority: 1 });
+        } catch {}
+      }
     });
 
     this.sessionScope.on('queue:completed', () => {
-      // 清理状态
       if (this._lineBuffer.trim() && !this.interrupted) {
         console.log(renderLine(this._lineBuffer, renderState));
       }
@@ -361,9 +252,6 @@ class ChatUI {
     });
   }
 
-  /**
-   * 启动聊天界面
-   */
   start() {
     this.rl = readline.createInterface({
       input: process.stdin,
@@ -375,9 +263,6 @@ class ChatUI {
     this.promptUser();
   }
 
-  /**
-   * 打印欢迎信息
-   */
   printWelcome() {
     console.log(`${colored('Foliko', CYAN)} - 持续对话聊天`);
     console.log(
@@ -385,9 +270,6 @@ class ChatUI {
     );
   }
 
-  /**
-   * 获取多行输入
-   */
   getMultilineInput() {
     return new Promise((resolve) => {
       const lines = [];
@@ -395,21 +277,14 @@ class ChatUI {
       const question = (isFirst) => {
         const prompt = isFirst ? colored('> ', GREEN) : colored('- ', DIM);
         this.rl.question(prompt, (input) => {
-          // 输入 !! 立即结束
           if (input.trim() === '!!') {
-            const result = lines.join('\n').trim();
-            resolve(result);
+            resolve(lines.join('\n').trim());
             return;
           }
-
-          // 空行：结束输入并发送（第一次空行就发送）
           if (input.trim() === '') {
-            const result = lines.join('\n').trim();
-            resolve(result);
+            resolve(lines.join('\n').trim());
             return;
           }
-
-          // 非空行：添加到 lines，继续输入
           lines.push(input);
           question(false);
         });
@@ -419,9 +294,6 @@ class ChatUI {
     });
   }
 
-  /**
-   * 提示用户输入
-   */
   async promptUser() {
     try {
       const input = await this.getMultilineInput();
@@ -431,23 +303,18 @@ class ChatUI {
         return;
       }
 
-      // 尝试执行命令
       if (await this._executeCommand(input.trim())) {
         await this.promptUser();
         return;
       }
 
-      // 退出命令
       if (input.toLowerCase() === 'exit' || input.toLowerCase() === 'quit') {
         console.log(colored('[再见] 感谢使用 Foliko！', CYAN));
         this.rl.close();
         return;
       }
 
-      // 发送消息（不等待，响应通过事件处理）
       await this.sendMessage(input);
-
-      // 继续等待下一条消息
       await this.promptUser();
     } catch (err) {
       console.error(`\n${colored('[错误]', RED)} ${err.message}`);
@@ -455,15 +322,10 @@ class ChatUI {
     }
   }
 
-  /**
-   * 发送消息并显示响应
-   */
   async sendMessage(message) {
-    const self = this;
-    const e=await this.agent.sendMessage(message, { sessionId: self.sessionId })
-    self._lineBuffer = '';
-    // 注意：不等待，直接返回。响应通过 sessionScope 事件处理
+    await this.agent.sendMessage(message, { sessionId: this.sessionId });
+    this._lineBuffer = '';
   }
 }
 
-module.exports = { ChatUI };
+module.exports = { ChatUIOld };

package/{cli/src → src/cli}/ui/chat-ui.js

@@ -7,7 +7,7 @@ const figlet = require('figlet');
 const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../utils/ansi');
 const { TUI, ProcessTerminal, Editor, Text, CombinedAutocompleteProvider, matchesKey, Container } = require('@earendil-works/pi-tui');
 const { cleanResponse, logger } = require('../../../src/utils');
-const { logEmitter } = require('../../../src/utils/logger');
+const { logEmitter } = require('../../../src/common/logger');
 const { renderLine } = require('../utils/markdown');
 const { MessageBubble } = require('./components/message-bubble');
 const Queue=require('js-queue');
@@ -335,7 +335,7 @@ class ChatUI {
 
     // /help 命令显示所有注册的命令
     if (cmd === '/help') {
-      const { getCommandRegistry } = require('../../../src/core/command-registry');
+      const { getCommandRegistry } = require('../../../src/framework/command-registry');
       const registry = getCommandRegistry();
       const commands = registry.getAllCommands();
 
@@ -391,7 +391,7 @@ class ChatUI {
       }
 
       // 检查 CommandRegistry 中的命令
-      const { getCommandRegistry } = require('../../../src/core/command-registry');
+      const { getCommandRegistry } = require('../../../src/framework/command-registry');
       const registry = getCommandRegistry();
       const cmd = registry.getCommand(cmdName);
       if (cmd) {

package/{cli/src → src/cli}/ui/components/footer-bar.js

@@ -7,7 +7,7 @@
 
 const chalk = require('chalk').default;
 const { visibleWidth, truncateToWidth } = require('@earendil-works/pi-tui');
-const { TokenCounter } = require('../../../../src/core/token-counter');
+const { TokenCounter } = require('../../../../src/llm/tokens');
 
 // Foliko 配色
 const folikoDim = chalk.hex('#6B7280');