foliko 1.1.67 → 1.1.69

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

@@ -5,8 +5,8 @@
 const chalk = require('chalk').default;
 const figlet = require('figlet');
 const { CLEAR_LINE, CYAN, DIM, GREEN, RED, YELLOW, colored } = require('../utils/ansi');
-const { TUI, ProcessTerminal, Editor, Markdown, Loader, Text, Spacer, CombinedAutocompleteProvider, matchesKey, Container, TruncatedText, visibleWidth } = require('@earendil-works/pi-tui');
-const { cleanResponse } = require('../../../src/utils');
+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 { renderLine } = require('../utils/markdown');
 const { MessageBubble } = require('./message-bubble');
@@ -14,6 +14,7 @@ const Queue=require('js-queue');
 const hl = require('cli-highlight');
 const { renderDiffWithHeader } = require('../utils/render-diff');
 const { FooterBar } = require('./footer-bar');
+const { StatusBar } = require('./status-bar');
 const queue=new Queue();
 // Foliko 主色（蓝绿）
 const folikoPrimary = chalk.hex('#2A9D8F');
@@ -70,15 +71,15 @@ class ChatUI {
     const terminal = new ProcessTerminal();
     const tui=this.tui = new TUI(terminal);
     this.messageContainer= new Container(0)
-    this.statusContainer= new Container(0)
     const text=`${folikoTerracotta("Ctrl+C")} 退出 | ${folikoTerracotta("/")} 指令列表 | ${folikoTerracotta("Enter")} 发送 | ${folikoTerracotta("Shift+Enter")} 换行`
     this.messageContainer.addChild(
       new Text(FOLIKO_LOGO + folikoGold(`\n欢迎使用Foliko！\n`)+folikoSand(text),3,2),
     );
     this.tui.addChild(this.messageContainer)
-    this.tui.addChild(this.statusContainer)
-    
 
+    // 状态栏组件（通知/工具调用/思考中），插在消息区和编辑器之间
+    this.statusBar = new StatusBar(tui, this.editor);
+    this.tui.addChild(this.statusBar.container);
 
     this._currentBotMessage=null
 
@@ -88,12 +89,24 @@ class ChatUI {
     // 会话管理
     this.sessionId = options.sessionId || 'cli_default';
     this.sessionPlugin = null;
+
+    // 获取 skill 命令列表
+    const skillCommands = [];
+    if (agent.framework) {
+      const extExecutor = agent.framework.pluginManager?.get('extension-executor');
+      if (extExecutor && typeof extExecutor.getSkillCommands === 'function') {
+        skillCommands.push(...extExecutor.getSkillCommands());
+      }
+    }
+
+    const baseCommands = [
+      { name: "compress", description: "压缩记录" },
+      { name: "clear", description: "清除记录" },
+      { name: "exit", description: "退出" },
+    ];
+
     const autocompleteProvider = new CombinedAutocompleteProvider(
-      [
-        { name: "compress", description: "压缩记录" },
-        { name: "clear", description: "清除记录" },
-        { name: "exit", description: "退出" },
-      ],
+      [...baseCommands, ...skillCommands],
       process.cwd(),
     );
     
@@ -135,132 +148,6 @@ class ChatUI {
     if (initialFooter.length > 0) {
       this._footerText.setText(initialFooter[0]);
     }
-    const tooler=new Loader(
-          tui,
-          (s) => chalk.green(s),       // indicatorColorFn
-          (s) => chalk.yellow(s),        // messageColorFn
-          "工具调用...",
-          {
-            frames:["|", "/", "-", "\\"].map(str=>folikoTerracotta(str))
-          }
-    )
-    const loader=new Loader(
-          tui,
-          (s) => chalk.cyan(s),       // indicatorColorFn
-          (s) => chalk.dim(s),        // messageColorFn
-          "正在思考中...",
-          {
-            frames:["⣾", "⣽", "⣻", "⢿", "⡿", "⣟", "⣯", "⣷"].map(str=>folikoPrimary(str))
-          }
-    )
-    // Spacer 占位，用于隐藏时保持布局
-    const toolerSpacer = new Spacer(0);
-    const loaderSpacer = new Spacer(0);
-    const notifierSpacer = new Spacer(0);
-
-    this.statusContainer.addChild(toolerSpacer);  // tooler 位置
-    this.statusContainer.addChild(loaderSpacer);  // loader 位置
-    this.statusContainer.addChild(notifierSpacer); // notifier 位置
-
-    const self = this;
-
-    this.tooler = {
-      dom: tooler,
-      spacer: toolerSpacer,
-      showed:false,
-      index:1,
-      show(text) {
-        this.showed = true;
-        self.statusContainer.children[this.index] = self.tooler.dom;
-        this.dom.setMessage(text);
-        tui.requestRender();
-        return self.tooler.dom;
-      },
-      hide() {
-        this.showed = false;
-        self.statusContainer.children[this.index] = self.tooler.spacer;
-        tui.requestRender();
-      },
-      setText(text) {
-        if(!this.showed){
-          this.show(text);
-        } else {
-          this.dom.setMessage(text);
-        }
-      }
-    };
-
-    this.notifier = {
-      dom: null,
-      spacer: notifierSpacer,
-      showed: false,
-      _timeout: null,
-      index:0,
-      show(text, duration = 5000) {
-        if (self.notifier._timeout) {
-          clearTimeout(self.notifier._timeout);
-        }
-        if (!self.notifier.dom) {
-          self.notifier.dom = new Loader(
-            tui,
-            (s) => chalk.cyan(s),
-            (s) => chalk.yellow(s),
-            text,
-          );
-        }
-        self.notifier.dom.setMessage(text);
-        self.statusContainer.children[this.index] = self.notifier.dom;
-        self.notifier.showed = true;
-        tui.requestRender();
-        self.notifier._timeout = setTimeout(() => {
-          self.notifier.hide();
-        }, duration);
-      },
-      hide() {
-        if (self.notifier._timeout) {
-          clearTimeout(self.notifier._timeout);
-          self.notifier._timeout = null;
-        }
-        self.notifier.showed = false;
-        self.statusContainer.children[this.index] = self.notifier.spacer;
-        tui.requestRender();
-      },
-    };
-
-    this.loader = {
-      dom: loader,
-      spacer: loaderSpacer,
-      startTime: null,
-      timer: null,
-      index:2,
-      show() {
-        self.statusContainer.children[this.index] = self.loader.dom;
-        editor.disableSubmit = true;
-        self.startTime = Date.now();
-        self.loader.dom.setMessage("正在思考中... (0秒)");
-        self.loader.dom.start();
-        // 每秒更新计时
-        self.loader.timer = setInterval(() => {
-          const elapsed = Math.floor((Date.now() - self.startTime) / 1000);
-          const seconds = elapsed % 60;
-          const minutes = Math.floor(elapsed / 60);
-          const timeStr = minutes > 0 ? `${minutes}分${seconds}秒` : `${seconds}秒`;
-          self.loader.dom.setMessage(`正在思考中... (${timeStr})`);
-        }, 1000);
-        tui.requestRender();
-        return self.loader.dom;
-      },
-      hide() {
-        editor.disableSubmit = false;
-        if (self.loader.timer) {
-          clearInterval(self.loader.timer);
-          self.loader.timer = null;
-        }
-        self.loader.dom.stop();
-        self.statusContainer.children[this.index] = self.loader.spacer;
-        tui.requestRender();
-      }
-    };
     tui.requestRender();
     // 中断状态（供监听器访问）
     this.interrupted = false;
@@ -270,6 +157,11 @@ class ChatUI {
 
     // 流式输出缓冲区（可重置）
     this._lineBuffer = '';
+    // 流式渲染缓冲区：合并高频 chunk 后统一刷新 Markdown，减少重复解析
+    this._streamBufferTimer = null;
+    this._pendingTextUpdate = false;
+    // renderLine 的共享状态（引用传递，跨调用保持 codeBlock/think 状态）
+    this._renderState = { inThink: true, inCodeBlock: false };
     // agent.framework.on("console:log",async (...args)=>{
     //   this.create_message(args.join(' '),chalk.dim('● '),true);
     // })
@@ -296,18 +188,19 @@ class ChatUI {
       this._setupSessionListeners();
       const level_dict={
         DEBUG: 'cyan',
-        // INFO: 'dim',
+        INFO: 'dim',
+        LOG: 'dim',
         WARN: 'yellow',
         ERROR: 'red',
       }
       // 监听错误日志，显示到 tooler
-      // this._logHandler = (data) => {
-      //   if(!Object.keys(level_dict).includes(data.level))return;
-      //   const level=folikoTerracotta(`[${data.level}]`)
-      //   const level_key=level_dict[data.level]||'dim'
-      //   this.notifier.show(`${level} ${chalk[level_key](data.message)}`);
-      // };
-      // logEmitter.on('log', this._logHandler);
+      this._logHandler = (data) => {
+        if(!Object.keys(level_dict).includes(data.level))return;
+        const level=folikoTerracotta(`[${data.level}]`)
+        const level_key=level_dict[data.level]||'dim'
+        this.statusBar.notifier.show(`${level} ${chalk[level_key](data.message)}`)
+      };
+      logger.on('log', this._logHandler);
 
       // 监听通知事件，显示到通知区域
       this._notificationHandler = (data) => {
@@ -318,7 +211,7 @@ class ChatUI {
         }
         const time = timestamp ? new Date(timestamp).toLocaleTimeString('zh-CN') : '';
         const notificationText = `🔔 [${source}] ${title}${time ? ` (${time})` : ''}`;
-        this.notifier.show(notificationText);
+        this.statusBar.notifier.show(notificationText);
         // 显示消息内容
         this.create_message(`**${title}**\n${message}`, "🔔 ");
       };
@@ -344,8 +237,13 @@ class ChatUI {
    * 清理监听器
    */
   dispose() {
+    // 清理流式缓冲区定时器
+    if (this._streamBufferTimer) {
+      clearTimeout(this._streamBufferTimer);
+      this._streamBufferTimer = null;
+    }
     if (this._logHandler && this.agent.framework) {
-      logEmitter.off('log', this._logHandler);
+      logger.off('log', this._logHandler);
       this._logHandler = null;
     }
     if (this._notificationHandler && this.agent.framework) {
@@ -359,8 +257,14 @@ class ChatUI {
   }
 
   clear_message_done(){
-    this.loader.hide();
-    this.tooler.hide();
+    this._flushStreamBuffer();  // 确保最后的文本被刷新
+    if (this._streamBufferTimer) {
+      clearTimeout(this._streamBufferTimer);
+      this._streamBufferTimer = null;
+    }
+    this._pendingTextUpdate = false;
+    this.statusBar.loader.hide();
+    this.statusBar.tooler.hide();
     this._lineBuffer=""
     this.isResponding=false
     this._currentBotMessage=null
@@ -379,6 +283,106 @@ class ChatUI {
     return
   }
 
+  /**
+   * 统一命令执行入口
+   */
+  async _executeCommand(trimmed) {
+    // 基础命令
+    const cmd = trimmed.toLowerCase();
+    if (cmd === '/clear') {
+      this._clearContext()
+      this.create_message(`${colored('[提示]', CYAN)} 对话上下文已清除\n`,chalk.dim('● '))
+      return true;
+    }
+    if (cmd === '/compress') {
+      this._compressContext()
+      return true;
+    }
+    if (cmd === '/exit') {
+      this.create_message(`${colored('[再见]', CYAN)} 感谢使用 Foliko！\n`,chalk.dim('● '))
+      this.tui.stop();
+      setTimeout(() => process.exit(0), 500);
+      return true;
+    }
+
+    // /help 命令显示所有注册的命令
+    if (cmd === '/help') {
+      const { getCommandRegistry } = require('../../../src/core/command-registry');
+      const registry = getCommandRegistry();
+      const commands = registry.getAllCommands();
+
+      let helpText = `${colored('[帮助]', CYAN)} 可用命令:\n`;
+      helpText += `  ${colored('/clear', CYAN)} - 清除对话上下文\n`;
+      helpText += `  ${colored('/compress', CYAN)} - 压缩上下文\n`;
+      helpText += `  ${colored('/exit', CYAN)} - 退出\n`;
+
+      // 添加 skill 命令
+      const extExecutor = this.agent.framework?.pluginManager?.get('extension-executor');
+      if (extExecutor && typeof extExecutor.getSkillCommandsHelp === 'function') {
+        const skillHelp = extExecutor.getSkillCommandsHelp();
+        if (skillHelp) {
+          helpText += `\n${colored('[技能命令]', CYAN)}\n`;
+          helpText += skillHelp.split('\n').map(line => `  ${line}`).join('\n') + '\n';
+        }
+      }
+
+      if (commands.length > 0) {
+        helpText += `\n${colored('[扩展命令]', CYAN)}\n`;
+        for (const cmd of commands) {
+          const pluginTag = cmd.registeredBy ? ` [${cmd.registeredBy}]` : '';
+          helpText += `  ${colored('/' + cmd.name, CYAN)}${pluginTag} - ${cmd.description || '无描述'}\n`;
+        }
+      }
+      this.create_message(helpText, chalk.dim('● '));
+      return true;
+    }
+
+    // 尝试通过 CommandRegistry 执行命令
+    const cmdName = trimmed.slice(1).split(' ')[0];
+    const cmdArgs = trimmed.slice(cmdName.length + 2);
+    if (trimmed.startsWith('/') && cmdName) {
+      // 检查 skill 命令 (格式: skillname:cmdname)
+      if (cmdName.includes(':')) {
+        try {
+          const result = await this.agent.framework.executeTool('ext_call', {
+            plugin: 'skill',
+            tool: cmdName,
+            args: { args: cmdArgs }
+          });
+          if (result.success !== false) {
+            this.create_message(`${colored('[结果]', CYAN)} ${result.data || result}\n`, chalk.dim('● '));
+            return true;
+          }
+        } catch (err) {
+          log.warn('Skill command failed:', err.message);
+        }
+      }
+
+      // 检查 CommandRegistry 中的命令
+      const { getCommandRegistry } = require('../../../src/core/command-registry');
+      const registry = getCommandRegistry();
+      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 => {
+            this.create_message(`${colored('[命令错误]', 'red')} ${err.message}\n`, chalk.dim('● '));
+          });
+        } catch (err) {
+          this.create_message(`${colored('[命令错误]', 'red')} ${err.message}\n`, chalk.dim('● '));
+        }
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   async handleOnSubmit(value){
     try{
       if (this.isResponding) {
@@ -389,21 +393,8 @@ class ChatUI {
         return;
       }
 
-      // 处理快捷命令
-      const cmd = trimmed.toLowerCase();
-      if (cmd === '/clear') {
-        this._clearContext()
-        this.create_message(`${colored('[提示]', CYAN)} 对话上下文已清除\n`,chalk.dim('● '))
-        return;
-      }
-      if (cmd === '/compress') {
-        this._compressContext()
-        return;
-      }
-      if (cmd === '/exit') {
-        this.create_message(`${colored('[再见]', CYAN)} 感谢使用 Foliko！\n`,chalk.dim('● '))
-        this.tui.stop();
-        setTimeout(() => process.exit(0), 500);
+      // 尝试执行命令
+      if (await this._executeCommand(trimmed)) {
         return;
       }
 
@@ -427,11 +418,8 @@ class ChatUI {
   }
 
   create_message(text, icon="", isBot=false, bgFn=null){
-    // 使用 MessageBubble 组件实现左侧图标 + 右侧 markdown 布局
-    // bgFn: 可选背景色函数 (line) => coloredLine，用于代码块等整块背景
     const bubble = new MessageBubble(icon, text, isBot, markdownTheme, 0, 0, 1, bgFn);
-    const children = this.messageContainer.children;
-    children.splice(children.length, 0, bubble);
+    this.messageContainer.addChild(bubble);
     this.tui.requestRender();
     return bubble
   }
@@ -440,11 +428,16 @@ class ChatUI {
 
    _clearContext() {
     // 隐藏 loader 和 tooler
-    this.tooler.hide();
-    this.loader.hide();
+    this.statusBar.tooler.hide();
+    this.statusBar.loader.hide();
 
     const { sessionId } = this;
 
+    // Clear ChatSession message store (memory + file)
+    if (this.agent._chatSession) {
+      this.agent._chatSession.clearSessionMessages(sessionId, true);
+    }
+
     // 1. 清除 AgentChatHandler 的消息存储（需要传 sessionId）
     if (this.agent._chatHandler) {
       this.agent._chatHandler.clearHistory(sessionId);
@@ -455,29 +448,38 @@ class ChatUI {
       const sessionCtx = this.agent.framework.getSessionContext(sessionId);
       if (sessionCtx) {
         sessionCtx.clearMessages();
-        sessionCtx.compressionState.count = 0;
-        sessionCtx.metadata.compressionCount = 0;
+        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();
-        cachedCtx.compressionState.count = 0;
-        cachedCtx.metadata.compressionCount = 0;
+        if (cachedCtx.compressionState) {
+          cachedCtx.compressionState.count = 0;
+        }
+        if (cachedCtx.metadata) {
+          cachedCtx.metadata.compressionCount = 0;
+        }
       }
       // 清除 SessionPlugin 中的消息
       if (this.sessionPlugin) {
-        const session = this.sessionPlugin.getSession(sessionId);
-        if (session) {
-          session.messages = [];
+        const manager = this.sessionPlugin._getSessionManager(sessionId);
+        if (manager) {
+          manager.clearMessages();
         }
       }
     }
 
     // 清空 messageContainer 中的消息，保留 welcome
-    const msgChildren = this.messageContainer.children;
-    while (msgChildren.length > 1) {
-      msgChildren.splice(1, 1);
+    const welcomeChild = this.messageContainer.children[0];
+    this.messageContainer.clear();
+    if (welcomeChild) {
+      this.messageContainer.addChild(welcomeChild);
     }
 
     // 重置 footer 统计
@@ -493,8 +495,8 @@ class ChatUI {
 
   _compressContext() {
     // 隐藏 loader 和 tooler
-    this.tooler.hide();
-    this.loader.hide();
+    this.statusBar.tooler.hide();
+    this.statusBar.loader.hide();
 
     const { sessionId } = this;
 
@@ -522,14 +524,14 @@ class ChatUI {
       }
 
       const beforeCount = messages ? messages.length : 0;
-      this.tooler.show(`${colored('[压缩]', YELLOW)} 压缩前: ${beforeCount} 条`);
+      this.statusBar.tooler.show(`${colored('[压缩]', YELLOW)} 压缩前: ${beforeCount} 条`);
 
       if (messages && messages.length > 0) {
         // 使用 ContextCompressor 压缩
         if (chatHandler._contextCompressor) {
           chatHandler._contextCompressor.compress(sessionId, messages, messageStore).then(() => {
             const afterCount = messages.length;
-            this.tooler.setText(`${colored('[压缩]', YELLOW)} 压缩后: ${afterCount} 条 (保留${chatHandler._contextCompressor._keepRecentMessages}条)`);
+            this.statusBar.tooler.setText(`${colored('[压缩]', YELLOW)} 压缩后: ${afterCount} 条 (保留${chatHandler._contextCompressor._keepRecentMessages}条)`);
             // 同步回 SessionContext
             if (this.agent.framework) {
               const sessionCtx = this.agent.framework.getSessionContext(sessionId);
@@ -538,49 +540,79 @@ class ChatUI {
               }
             }
             setTimeout(() => {
-              this.tooler.hide();
+              this.statusBar.tooler.hide();
               this.create_message(`${colored('[提示]', CYAN)} 上下文已压缩`,chalk.dim('● '))
               this.tui.requestRender();
             }, 2000);
           }).catch(err => {
-            this.tooler.setText(`${colored('[错误]', RED)} 压缩失败: ${err.message}`);
+            this.statusBar.tooler.setText(`${colored('[错误]', RED)} 压缩失败: ${err.message}`);
           });
         } else {
-          this.tooler.setText(`${colored('[错误]', RED)} 无 ContextCompressor`);
+          this.statusBar.tooler.setText(`${colored('[错误]', RED)} 无 ContextCompressor`);
         }
       } else {
-        this.tooler.setText(`${colored('[提示]', CYAN)} 无消息可压缩`);
+        this.statusBar.tooler.setText(`${colored('[提示]', CYAN)} 无消息可压缩`);
       }
     } else {
-      this.tooler.setText(`${colored('[错误]', RED)} 无 AgentChatHandler`);
+      this.statusBar.tooler.setText(`${colored('[错误]', RED)} 无 AgentChatHandler`);
     }
   }
+  /**
+   * 刷新流式输出缓冲区：合并高频 chunk 后统一渲染，减少 Markdown 重复解析
+   */
+  _flushStreamBuffer() {
+    this._streamBufferTimer = null;
+    if (!this._lineBuffer) return;
+
+    // 渲染剩余的 partial line（没有 \n 结尾的尾部文字）
+    const rendered = renderLine(this._lineBuffer, this._renderState, true);
+    if (!this._currentBotMessage) {
+      this._currentBotMessage = this.create_message(rendered, colored('● ', GREEN), true);
+    } else {
+      this._currentBotMessage.appendContent(rendered);
+    }
+    this._lineBuffer = '';
+  }
+
   /**
    * 设置 session scope 事件监听
    */
   _setupSessionListeners() {
-    const renderState = { inThink: true, inCodeBlock: false };
-
     this.sessionScope.on('stream:chunk', ({ chunk }) => {
       if (this.interrupted) return;
 
       if (chunk.type === 'text') {
-        this._lineBuffer += chunk.text;
-
-        if(!this._currentBotMessage){
-          // AI 回复，让 create_message 添加前缀
-          this._currentBotMessage = this.create_message(renderLine(this._lineBuffer,renderState,true), colored('● ', GREEN),true);
-        }else{
-          // 已经有前缀，直接更新内容
-          this._currentBotMessage.setText(renderLine(this._lineBuffer,renderState,true));
+        this._lineBuffer += chunk.text
+
+        // 逐行处理：遇到 \n 立即渲染完整行，实现即时反馈
+        // 行尾补回 \n 确保 TUI 正确换行（空行也要渲染，保留段落分隔）
+        // 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);
+
+        //   const rendered = line;
+        //   if (!this._currentBotMessage) {
+        //     this._currentBotMessage = this.create_message(rendered, colored('● ', GREEN), true);
+        //   } else {
+        //     this._currentBotMessage.appendContent(rendered);
+        //   }
+          
+        // }
+
+        // 兜底：partial line（无 \n 结尾）用 timer 刷新，防止尾部文字卡住
+        if (this._lineBuffer && !this._streamBufferTimer) {
+          this._streamBufferTimer = setTimeout(() => this._flushStreamBuffer(), 0);
         }
       } else if (chunk.type === 'tool-call') {
         const args = chunk.input ? JSON.stringify(chunk.input).slice(0, 50) : '';
-        this.tooler.show(`${chalk.yellow('[Tool]')} ${folikoGold(chunk.toolName)} ${chalk.gray(args+'...')}`)
+        this.statusBar.tooler.show(`${chalk.yellow('[Tool]')} ${folikoGold(chunk.toolName)} ${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.tooler.show(`${chalk.green('[Tool]')} ${folikoGold(chunk.toolName)} ${chalk.gray(shortResult+'...')}`)
+        this.statusBar.tooler.show(`${chalk.green('[Tool]')} ${folikoGold(chunk.toolName)} ${chalk.gray(shortResult+'...')}`)
 
         // 如果是 edit/edit_file 的结果并且包含 diff，渲染彩色 diff
         if (chunk.toolName === 'edit' || chunk.toolName === 'edit_file') {
@@ -592,8 +624,9 @@ class ChatUI {
           if (resultObj && resultObj.diff) {
             const diffContent = renderDiffWithHeader(resultObj.diff, resultObj.filePath);
             const bgColor = chalk.bgHex('#1a1a2e');
-            this.create_message(diffContent, chalk.yellow('▸ '), true, (line) => bgColor(line));
-            this.tooler.show(`${chalk.green('[Diff]')} ${folikoGold(resultObj.filePath)}`);
+            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)}`);
           }
         }
         // setTimeout(() => this.tooler.hide(), 3000);
@@ -610,7 +643,7 @@ class ChatUI {
       }
     });
     this.sessionScope.on('message:start', async () => {
-      this.loader.show();
+      this.statusBar.loader.show();
     })
     this.sessionScope.on('message:complete', async ({ content, requestId }) => {
       try{