foliko 1.1.78 → 1.1.80

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

@@ -6,7 +6,9 @@
 const readline = require('readline');
 const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../utils/ansi');
 const { renderLine } = require('../utils/markdown');
-const { cleanResponse } = require('../../../src/utils');
+const { cleanResponse, logger } = require('../../../src/utils');
+const { logEmitter } = require('../../../src/utils/logger');
+const Queue = require('js-queue');
 
 class ChatUI {
   constructor(agent, options = {}) {
@@ -21,6 +23,9 @@ class ChatUI {
     this.sessionId = options.sessionId || 'cli_default';
     this.sessionPlugin = null;
 
+    // 队列系统
+    this.queue = new Queue();
+
     // 中断状态（供监听器访问）
     this.interrupted = false;
 
@@ -30,6 +35,15 @@ class ChatUI {
     // 流式输出缓冲区（可重置）
     this._lineBuffer = '';
 
+    // 基础命令
+    this.baseCommands = [
+      { 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');
@@ -42,6 +56,246 @@ class ChatUI {
       // 创建 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);
+      this._logHandler = null;
+    }
+    if (this._notificationHandler && this.agent.framework) {
+      this.agent.framework.off('notification', this._notificationHandler);
+      this._notificationHandler = null;
+    }
+    if (this._usageHandler && this.agent.framework) {
+      this.agent.framework.off('agent:usage', this._usageHandler);
+      this._usageHandler = null;
+    }
+    if (this._skillReloadedHandler && this.agent.framework) {
+      this.agent.framework.off('skill:reloaded', this._skillReloadedHandler);
+      this._skillReloadedHandler = null;
+    }
+  }
+
+  /**
+   * 设置 framework 事件监听（日志、通知、Usage、热重载）
+   */
+  _setupFrameworkListeners() {
+    const levelDict = {
+      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));
+    };
+    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));
+      }
+    };
+    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));
+      return true;
+    }
+    if (cmd === '/compress') {
+      await this._compressContext();
+      return true;
+    }
+    if (cmd === '/exit') {
+      console.log(colored('[再见] 感谢使用 Foliko！', CYAN));
+      this.rl?.close();
+      setTimeout(() => process.exit(0), 500);
+      return true;
+    }
+    if (cmd === '/help') {
+      await this._showHelp();
+      return true;
+    }
+    if (cmd === '/reload') {
+      await this._reloadSkills();
+      return true;
+    }
+
+    // Skill 命令 (格式: skillname:cmdname)
+    if (trimmed.startsWith('/') && trimmed.includes(':')) {
+      const cmdName = trimmed.slice(1).split(' ')[0];
+      const cmdArgs = trimmed.slice(cmdName.length + 2);
+      try {
+        const result = await this.agent.framework.executeTool('ext_call', {
+          plugin: 'skill',
+          tool: cmdName,
+          args: { args: cmdArgs }
+        });
+        if (result.success !== false) {
+          console.log(colored(`[指令] ${cmdName}`, GREEN));
+          console.log(result.data || result);
+        } else {
+          console.log(colored(`[错误] ${result.error || '未知错误'}`, RED));
+        }
+      } catch (err) {
+        console.log(colored(`[错误] ${err.message}`, RED));
+      }
+      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) {
+        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 || '无描述'}`);
+      }
+    }
+  }
+
+  /**
+   * 重载技能
+   */
+  async _reloadSkills() {
+    try {
+      const result = await this.agent.framework.executeTool('reloadSkills', {});
+      if (result.success !== false) {
+        console.log(colored('[提示] 技能已重载', CYAN));
+      } else {
+        console.log(colored(`[错误] 重载失败: ${result.error}`, RED));
+      }
+    } catch (err) {
+      console.log(colored(`[错误] 重载失败: ${err.message}`, RED));
+    }
+  }
+
+  /**
+   * 清除上下文
+   */
+  _clearContext() {
+    const { sessionId } = this;
+    this.agent.clearContext(sessionId);
+
+    if (this.sessionPlugin) {
+      const manager = this.sessionPlugin._getSessionManager(sessionId);
+      if (manager) manager.clearMessages();
+    }
+  }
+
+  /**
+   * 压缩上下文
+   */
+  async _compressContext() {
+    console.log(colored('[压缩] 压缩中...', YELLOW));
+    try {
+      const { sessionId } = this;
+      const result = await this.agent.compressContext(sessionId);
+      console.log(colored(`[压缩] 压缩后: ${result.after} 条 (保留${result.keepRecent}条)`, YELLOW));
+    } catch (err) {
+      const msg = err.message || String(err);
+      if (msg.includes('No messages')) {
+        console.log(colored('[提示] 无消息可压缩', CYAN));
+      } else {
+        console.log(colored(`[错误] ${msg}`, RED));
+      }
     }
   }
 
@@ -67,7 +321,39 @@ class ChatUI {
             console.log(renderLine(line, renderState));
           }
         }
+      } else if (chunk.type === 'tool-call') {
+        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);
+        }
+      }
+    });
+
+    this.sessionScope.on('message:start', async () => {
+      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('queue:completed', () => {
+      // 清理状态
+      if (this._lineBuffer.trim() && !this.interrupted) {
+        console.log(renderLine(this._lineBuffer, renderState));
       }
+      this._lineBuffer = '';
     });
 
     this.sessionScope.on('queue:failed', ({ error }) => {
@@ -145,53 +431,20 @@ class ChatUI {
         return;
       }
 
-      // 退出命令
-      if (input.toLowerCase() === 'exit' || input.toLowerCase() === 'quit') {
-        console.log('再见！');
-        this.rl.close();
+      // 尝试执行命令
+      if (await this._executeCommand(input.trim())) {
+        await this.promptUser();
         return;
       }
 
-      // 清除上下文命令
-      if (input.toLowerCase() === '/clean' || input.toLowerCase() === '/clear') {
-        const { sessionId } = this;
-        // 清除 AgentChatHandler 的消息存储（需要传 sessionId）
-        if (this.agent._chatSession) {
-          this.agent._chatSession.clearSessionMessages(sessionId, true);
-        }
-        if (this.agent._chatHandler) {
-          this.agent._chatHandler.clearHistory(sessionId);
-        }
-        // 清除 SessionContext 的消息和压缩计数
-        if (this.agent.framework) {
-          const sessionCtx = this.agent.framework.getSessionContext(sessionId);
-          if (sessionCtx) {
-            sessionCtx.clearMessages();
-            if (sessionCtx.compressionState) {
-              sessionCtx.compressionState.count = 0;
-            }
-            if (sessionCtx.metadata) {
-              sessionCtx.metadata.compressionCount = 0;
-            }
-          }
-          // 同步清除 framework 缓存的 sessionContexts
-          const cachedCtx = this.agent.framework._sessionContexts?.get(sessionId);
-          if (cachedCtx) {
-            cachedCtx.clearMessages();
-            if (cachedCtx.compressionState) {
-              cachedCtx.compressionState.count = 0;
-            }
-            if (cachedCtx.metadata) {
-              cachedCtx.metadata.compressionCount = 0;
-            }
-          }
-        }
-        console.log(`${colored('[提示]', CYAN)} 对话上下文已清除\n`);
-        await this.promptUser();
+      // 退出命令
+      if (input.toLowerCase() === 'exit' || input.toLowerCase() === 'quit') {
+        console.log(colored('[再见] 感谢使用 Foliko！', CYAN));
+        this.rl.close();
         return;
       }
 
-      // 发送消息
+      // 发送消息（不等待，响应通过事件处理）
       await this.sendMessage(input);
 
       // 继续等待下一条消息
@@ -206,65 +459,10 @@ class ChatUI {
    * 发送消息并显示响应
    */
   async sendMessage(message) {
-    this.interrupted = false;
-
-    const interruptHandler = () => {
-      if (!this.interrupted) {
-        this.interrupted = true;
-        console.log(`\n${colored('[中断]', RED)} 输出已中断`);
-      }
-    };
-
-    process.on('SIGINT', interruptHandler);
-
-    try {
-      const { sessionId } = this;
-
-      if (this.stream) {
-        // 流式模式 - 使用已初始化的 sessionScope 监听器
-        console.log(colored('● ', GREEN));
-
-        // 清空缓冲区
-        this._lineBuffer = '';
-
-        // 调用 sendMessage 触发事件
-        await this.agent.sendMessage(message, { sessionId });
-
-        // 输出剩余内容
-        if (this._lineBuffer.trim() && !this.interrupted) {
-          console.log(renderLine(this._lineBuffer, { inThink: false, inCodeBlock: false }));
-        }
-      } else {
-        // 非流式模式
-        console.log(colored('○ ', CYAN) + '处理中...\n');
-
-        const result = await this.agent.chat(message, { sessionId });
-
-        if (this.interrupted) return;
-
-        const lines = result.message.split('\n');
-        for (const line of lines) {
-          if (line.trim()) {
-            console.log(renderLine(line, { inThink: false, inCodeBlock: false }));
-          } else {
-            console.log();
-          }
-        }
-      }
-    } catch (err) {
-      // 只打印简洁错误消息，不打印堆栈
-      if (!this.interrupted) {
-        const errName = err?.name || '';
-        const isRetryError = errName === 'AI_RetryError' || errName === 'RetryError';
-        const friendlyMessage = isRetryError
-          ? 'AI 服务暂时不可用，请稍后重试'
-          : (err.message || '未知错误').split('\n')[0];
-
-        console.error(`\n${colored('[错误]', RED)} ${friendlyMessage}\n`);
-      }
-    } finally {
-      process.removeListener('SIGINT', interruptHandler);
-    }
+    const self = this;
+    const e=await this.agent.sendMessage(message, { sessionId: self.sessionId })
+    self._lineBuffer = '';
+    // 注意：不等待，直接返回。响应通过 sessionScope 事件处理
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.78",
+  "version": "1.1.80",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",

package/plugins/weixin-plugin.js

@@ -378,7 +378,7 @@ class WeixinPlugin extends Plugin {
   }
 
   _on_event_message(){
-    const {sessionId}=this.ge
+    const {sessionId}=this
     const sessionScope = this.agent.createSessionScope(sessionId);
     sessionScope.on('stream:chunk', ({ chunk }) => {})
   }
@@ -388,25 +388,58 @@ class WeixinPlugin extends Plugin {
    */
   _setupSessionScopeListeners(agent, sessionId, originalMsg, userId) {
     const sessionScope = agent.createSessionScope(sessionId)
+    const renderState = { inThink: false, inCodeBlock: false };
+    const lineBuffer = { value: '' };
+
+    // 流式文本处理
+    sessionScope.on('stream:chunk', ({ chunk }) => {
+      if (chunk.type === 'text') {
+        lineBuffer.value += chunk.text;
+      } else if (chunk.type === 'tool-call') {
+        const args = chunk.input ? JSON.stringify(chunk.input).slice(0, 30) : '';
+        log.info(`[Tool] ${chunk.toolName} ${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);
+        log.info(`[Tool] ${chunk.toolName} ${shortResult}...`);
+      } else if (chunk.type === 'usage') {
+        log.debug(`[Usage] input: ${chunk.inputTokens || 0}, output: ${chunk.outputTokens || 0}`);
+      }
+    });
+
+    // 消息开始
+    sessionScope.on('message:start', async () => {
+      this.startTypingInterval();
+    });
 
+    // 消息完成
     sessionScope.on('message:complete', async ({ content }) => {
-      this.stopTypingInterval()
-      if (content) {
-        await this._sendMessageBatch(originalMsg, userId, content, true)
-      } else {
-        const msg = '继续进行下一步'
-        await this._sendMessageBatch(originalMsg, userId, msg, true)
-        await agent.sendMessage(msg, { sessionId, priority: 1 })
+      
+      if (!content) {
+        const msg = '继续进行下一步';
+        //await this._sendMessageBatch(originalMsg, userId, msg, true);
+        await agent.sendMessage(msg, { sessionId, priority: 1 });
       }
-    })
+    });
+
+    // 队列完成
+    sessionScope.on('queue:completed', async () => {
+      this.stopTypingInterval();
+      if (lineBuffer.value.trim()) {
+        await this._sendMessageBatch(originalMsg, userId, lineBuffer.value.trim(), true);
+        //log.debug(`[Queue] Remaining buffer: ${lineBuffer.value}`);
+      }
+      lineBuffer.value = '';
+    });
 
+    // 队列失败
     sessionScope.on('queue:failed', async ({ error }) => {
-      this.stopTypingInterval()
-      await this._sendMessageBatch(originalMsg, userId, error, true)
-    })
+      this.stopTypingInterval();
+      await this._sendMessageBatch(originalMsg, userId, error, true);
+    });
 
-    this._sessionScopes.set(sessionId, sessionScope)
-    return sessionScope
+    this._sessionScopes.set(sessionId, sessionScope);
+    return sessionScope;
   }
 
   /**

package/src/core/agent-chat.js

@@ -486,7 +486,7 @@ class AgentChatHandler extends EventEmitter {
 
       // AI SDK 错误回调：仅记录日志，不在这里处理（统一由 catch/yield 处理）
       const handleSDKError = ({ error }) => {
-        logger.debug(`[AgentChat] SDK onError: ${error?.message}`);
+        //logger.debug(`[AgentChat] SDK onError: ${error?.message}`);
       };
 
       // DeepSeek thinking mode: 收集 reasoning_content

package/src/core/subagent.js

@@ -359,7 +359,7 @@ class Subagent extends EventEmitter {
           messages,  // 返回完整消息历史，用于持续对话上下文
         };
       } catch (err) {
-        logger.warn(`[Subagent:${this.name}] generateText error: ${err.message}`);
+        
         lastError = err;
           // 统一使用 retry.js 的错误判断
         if (isNetworkError(err) && attempt < maxRetries) {
@@ -369,7 +369,7 @@ class Subagent extends EventEmitter {
           await new Promise((resolve) => setTimeout(resolve, retryDelay * Math.pow(2, attempt)));
           continue;
         }
-
+        logger.warn(`[Subagent:${this.name}] generateText error: ${err.message}`);
         // 最终失败，转换为友好消息
         const friendlyMessage = this._getFriendlyError(err);
         this.emit('error', { error: friendlyMessage });

package/src/utils/chat-queue.js

@@ -127,12 +127,13 @@ class ChatQueueManager extends EventEmitter {
 
         return result;
       } catch (error) {
-        log.warn('[ChatQueue] executeWithRetry: ', attempt, 'error:', error.message);
+       
         lastError = error;
         if (attempt < this.retryAttempts && this.isRetryableError(error)) {
           await this.sleep(calculateDelay(attempt, { baseDelay: this.retryDelay }));
           continue;
         }
+        log.warn('[ChatQueue] executeWithRetry: ', attempt, 'error:', error.message);
         break;
       }
     }
@@ -177,7 +178,7 @@ class ChatQueueManager extends EventEmitter {
         ? 'AI 服务暂时不可用，请稍后重试'
         : (err.message || err.toString()).split('\n')[0];
 
-      log.warn('[ChatQueue] executeStream Error:', friendlyMessage);
+      //log.warn('[ChatQueue] executeStream Error:', friendlyMessage);
       chunks.push({ type: 'error', error: friendlyMessage });
       this.emit('stream:chunk', {
         requestId: item.id,
@@ -195,7 +196,7 @@ class ChatQueueManager extends EventEmitter {
       const error = new Error(errorChunk.error || 'Stream error');
       error.chunks = chunks;
       error.isStreamError = true;
-      log.warn('[ChatQueue] executeStream Error:', error.message);
+      //log.warn('[ChatQueue] executeStream Error:', error.message);
       return {
         chunks,
         content: cleanResponse(''),