foliko 1.1.63 → 1.1.64

package/cli/src/ui/status-bar.js

@@ -0,0 +1,177 @@
+/**
+ * StatusBar — 状态栏组件
+ *
+ * 封装三个状态槽位：通知(notifier) / 工具调用(tooler) / 思考中(loader)
+ * 每个槽位通过子 Container 管理显示/隐藏
+ */
+
+const { Container, Spacer,Loader } = require('@earendil-works/pi-tui');
+const chalk = require('chalk').default;
+
+// Foliko 配色
+const folikoPrimary = chalk.hex('#2A9D8F');
+const folikoGold = chalk.hex('#E9C46A');
+
+/**
+ * NoMarginLoader — 去掉 Loader 默认的上方空行
+ */
+class NoMarginLoader extends Loader {
+  render(width) {
+    return super.render(width).slice(1); // 去掉 Loader 自动追加的空行
+  }
+}
+
+class StatusBar {
+  constructor(tui, editor) {
+    this.tui = tui;
+    this.editor = editor;
+
+    // 顶层容器
+    this.container = new Container();
+
+    // 三个子 Container 槽位
+    this._notifierSlot = new Container();
+    this._toolerSlot = new Container();
+    this._loaderSlot = new Container();
+
+    // 工具调用 Loader
+    const tooler = new NoMarginLoader(
+      tui,
+      (s) => chalk.green(s),
+      (s) => chalk.yellow(s),
+      '工具调用...',
+      { frames: ['|', '/', '-', '\\'].map((str) => folikoGold(str)) },
+    );
+
+    // 思考中 Loader
+    const loader = new NoMarginLoader(
+      tui,
+      (s) => chalk.cyan(s),
+      (s) => chalk.dim(s),
+      '正在思考中...',
+      { frames: ['⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷'].map((str) => folikoPrimary(str)) },
+    );
+
+    // Spacer 占位（隐藏时填充）
+    const toolerSpacer = new Spacer(0);
+    const loaderSpacer = new Spacer(0);
+    const notifierSpacer = new Spacer(0);
+
+    // 初始化所有槽位为 Spacer
+    this._notifierSlot.addChild(notifierSpacer);
+    this._toolerSlot.addChild(toolerSpacer);
+    this._loaderSlot.addChild(loaderSpacer);
+
+    // 挂载到顶层容器
+    this.container.addChild(this._notifierSlot);
+    this.container.addChild(this._toolerSlot);
+    this.container.addChild(this._loaderSlot);
+
+    // ——— 公开 API ———
+    const self = this;
+
+    /** 工具调用状态 */
+    this.tooler = {
+      dom: tooler,
+      _spacer: toolerSpacer,
+      _showed: false,
+      show(text) {
+        this._showed = true;
+        self._toolerSlot.clear();
+        self._toolerSlot.addChild(this.dom);
+        this.dom.setMessage(text);
+        return this.dom;
+      },
+      hide() {
+        this._showed = false;
+        self._toolerSlot.clear();
+        self._toolerSlot.addChild(this._spacer);
+        self.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,
+      show(text, duration = 5000) {
+        if (this._timeout) clearTimeout(this._timeout);
+
+        if (!this.dom) {
+          this.dom = new NoMarginLoader(tui, (s) => chalk.cyan(s), (s) => chalk.yellow(s), text);
+        }
+        this.dom.setMessage(text);
+        self._notifierSlot.clear();
+        self._notifierSlot.addChild(this.dom);
+        this._showed = true;
+
+        this._timeout = setTimeout(() => this.hide(), duration);
+      },
+      hide() {
+        if (this._timeout) {
+          clearTimeout(this._timeout);
+          this._timeout = null;
+        }
+        this._showed = false;
+        self._notifierSlot.clear();
+        self._notifierSlot.addChild(this._spacer);
+        self.tui.requestRender();
+      },
+    };
+
+    /** 思考中 Loader（带计时） */
+    this.loader = {
+      dom: loader,
+      _spacer: loaderSpacer,
+      _startTime: null,
+      _timer: null,
+      show() {
+        self._loaderSlot.clear();
+        self._loaderSlot.addChild(this.dom);
+        if (self.editor) self.editor.disableSubmit = true;
+
+        this._startTime = Date.now();
+        this.dom.setMessage('正在思考中... (0秒)');
+        this.dom.start();
+
+        this._timer = setInterval(() => {
+          const elapsed = Math.floor((Date.now() - this._startTime) / 1000);
+          const seconds = elapsed % 60;
+          const minutes = Math.floor(elapsed / 60);
+          const timeStr = minutes > 0 ? `${minutes}分${seconds}秒` : `${seconds}秒`;
+          this.dom.setMessage(`正在思考中... (${timeStr})`);
+        }, 1000);
+
+        return this.dom;
+      },
+      hide() {
+        if (self.editor) self.editor.disableSubmit = false;
+        if (this._timer) {
+          clearInterval(this._timer);
+          this._timer = null;
+        }
+        this.dom.stop();
+        self._loaderSlot.clear();
+        self._loaderSlot.addChild(this._spacer);
+        self.tui.requestRender();
+      },
+    };
+  }
+
+  invalidate() {
+    for (const child of this.container.children) {
+      child.invalidate?.();
+    }
+  }
+}
+
+module.exports = { StatusBar };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.63",
+  "version": "1.1.64",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -83,7 +83,6 @@
     "nodemailer": "^6.10.0",
     "qrcode-terminal": "^0.12.0",
     "remove-markdown": "^0.6.3",
-    "vm2": "^3.10.5",
     "zod": "^3.25.76"
   },
   "devDependencies": {

package/plugins/qq-plugin.js

@@ -919,7 +919,7 @@ class QQPlugin extends Plugin {
     for (const streamSession of this._streamSessions.values()) {
       try {
         streamSession.done?.()
-      } catch {}
+      } catch (e) { /* streamSession.done 可能已完成 */ }
     }
     this._streamSessions.clear()
 

package/src/core/agent-chat.js

@@ -14,20 +14,23 @@ const {
   tool: aiTool,
   ToolLoopAgent,
   isLoopFinished,
-  generateText,
-  streamText,
-  RetryError,
-  APICallError,
 } = require('ai');
-const { prepareMessagesForAPI, cleanResponse } = require('../utils');
+const { cleanResponse } = require('../utils');
 const { ChatQueueManager } = require('../utils/chat-queue');
 const { TokenCounter } = require('./token-counter');
 const { isThinkingModel } = require('./provider');
-const fs = require('fs/promises');
 // 新模块
 const { ChatSession } = require('./chat-session');
 const { ToolExecutor } = require('./tool-executor');
 const { ContextCompressor } = require('./context-compressor');
+const {
+  DEFAULT_MAX_OUTPUT_TOKENS,
+  DEFAULT_TEMPERATURE,
+  DEFAULT_MAX_STEPS,
+  DEFAULT_MAX_CONCURRENT,
+  DEFAULT_RETRY_ATTEMPTS,
+  DEFAULT_RETRY_DELAY_MS,
+} = require('./constants');
 
 class AgentChatHandler extends EventEmitter {
   /**
@@ -104,9 +107,9 @@ class AgentChatHandler extends EventEmitter {
 
     // ChatQueueManager: 队列管理
     this.queueManager = new ChatQueueManager({
-      maxConcurrent: config.maxConcurrent || 1,
-      retryAttempts: config.retryAttempts || 3,
-      retryDelay: config.retryDelay || 1000,
+      maxConcurrent: config.maxConcurrent || DEFAULT_MAX_CONCURRENT,
+      retryAttempts: config.retryAttempts || DEFAULT_RETRY_ATTEMPTS,
+      retryDelay: config.retryDelay || DEFAULT_RETRY_DELAY_MS,
     });
 
     // AI client
@@ -183,10 +186,15 @@ class AgentChatHandler extends EventEmitter {
 
   // ==================== 工具管理（委托给 ToolExecutor） ====================
 
+  /** AI tools 格式缓存 (避免每次 chat 重建) */
+  _aiToolsCache = null;
+  _aiToolsCacheKey = ''; // 工具列表的哈希摘要
+
   registerTool(tool) {
     this._toolExecutor.registerTool(tool);
     // 工具列表变了，清除缓存
     this._toolsTokensCacheVersion = 0;
+    this._aiToolsCache = null; // 清除 AI tools 缓存
     return this;
   }
 
@@ -463,8 +471,7 @@ class AgentChatHandler extends EventEmitter {
         throw new Error('AI client not configured.');
       }
 
-      const systemPrompt = framework._mainAgent._buildSystemPrompt();
-      // await fs.writeFile('system.md',systemPrompt)
+      const systemPrompt = framework.getSystemPrompt();
       const tools = this._getAITools(aiTool);
       const agent = new ToolLoopAgent({
         model: this._aiClient,
@@ -576,7 +583,9 @@ class AgentChatHandler extends EventEmitter {
       yield { type: 'error', error: friendlyMessage };
     } finally {
       const messageStore = this._getSessionMessageStore(sessionId);
-      messageStore.save();
+      messageStore.save().catch((err) => {
+        logger.error(`[${sessionId}] Failed to save message store: ${err.message}`);
+      });
     }
   }
 
@@ -602,10 +611,14 @@ class AgentChatHandler extends EventEmitter {
   }
 
   /**
-   * 入队消息
+   * 入队消息（走共享的 ChatQueueManager，与 sendMessage 共用同一队列）
    */
   enqueue(sessionId, message, options = {}) {
-    return this._chatSession.enqueue(sessionId, message, options);
+    const requestId = this.generateRequestId();
+    return this.queueManager.enqueue(requestId, sessionId, message, {
+      ...options,
+      executeFunction: this.chatStream.bind(this),
+    });
   }
 
   /**
@@ -621,7 +634,7 @@ class AgentChatHandler extends EventEmitter {
       if (!this._aiClient) {
         throw new Error('AI client not configured.');
       }
-      const systemPrompt = framework._mainAgent._buildSystemPrompt();
+      const systemPrompt = framework.getSystemPrompt();
       const tools = this._getAITools(aiTool);
 
       // DeepSeek thinking mode: 处理参数
@@ -688,7 +701,11 @@ class AgentChatHandler extends EventEmitter {
       };
     } finally {
       const messageStore = this._getSessionMessageStore(sessionId);
-      messageStore.save();
+      try {
+        await messageStore.save();
+      } catch (err) {
+        logger.error(`[${sessionId}] Failed to save message store: ${err.message}`);
+      }
     }
   }
 
@@ -799,11 +816,25 @@ class AgentChatHandler extends EventEmitter {
   }
 
   /**
-   * 获取 AI 工具格式
+   * 计算工具列表缓存 key
+   * @private
+   */
+  _computeToolsCacheKey() {
+    const allTools = this.agent.framework.getTools();
+    return allTools.map((t) => `${t.name}:${t.description ? t.description.length : 0}`).join('|');
+  }
+
+  /**
+   * 获取 AI 工具格式（带缓存）
    * 使用 AI SDK 的 tool() 格式
    * @private
    */
   _getAITools(toolFn) {
+    const currentKey = this._computeToolsCacheKey();
+    if (this._aiToolsCache && this._aiToolsCacheKey === currentKey) {
+      return this._aiToolsCache;
+    }
+
     const tools = {};
     const allTools = this.agent.framework.getTools();
     for (const toolDef of allTools) {
@@ -850,6 +881,8 @@ class AgentChatHandler extends EventEmitter {
       tools[toolName] = toolFn(toolConfig);
     }
 
+    this._aiToolsCache = tools;
+    this._aiToolsCacheKey = currentKey;
     return tools;
   }
 

package/src/core/agent.js

@@ -9,39 +9,21 @@ const { SystemPromptBuilder } = require('./system-prompt-builder');
 const { NotificationManager } = require('./notification-manager');
 const { Logger, LOG_LEVELS } = require('../utils/logger');
 const os = require('os');
-
-/**
- * System Prompt 优先级常量
- * 统一管理所有 prompt 部分的优先级，避免魔法数字
- */
-const PROMPT_PRIORITY = {
-  DATETIME: 50,
-  ORIGINAL_PROMPT: 100,
-  SHARED_PROMPT: 200,
-  METADATA: 300,
-  TOOLS: 400,
-  SKILLS: 500,
-  SUB_AGENTS: 600,
-  CAPABILITIES: 700,
-  MCP_TOOLS: 750,
-  EXTENSION_TOOLS: 800,
-  TOOL_CORE_RULES: 1000,
-};
+const {
+  PROMPT_PRIORITY,
+  DEFAULT_MAX_OUTPUT_TOKENS,
+  DEFAULT_TEMPERATURE,
+} = require('./constants');
 
 /**
  * Agent 配置常量
- * 统一管理配置参数，避免魔法数字
  */
 const AGENT_CONFIG = {
-  // AI 模型配置
-  MAX_OUTPUT_TOKENS: 8192,
-  TEMPERATURE: 0.3,
-  // 通知数量限制
+  MAX_OUTPUT_TOKENS: DEFAULT_MAX_OUTPUT_TOKENS,
+  TEMPERATURE: DEFAULT_TEMPERATURE,
   MAX_NOTIFICATIONS: 5,
-  // 元数据提取配置
   CAPABILITY_MAX_LENGTH: 50,
   CAPABILITY_MAX_PARTS: 3,
-  // 错误重试配置
   MAX_RETRIES: 3,
 };
 
@@ -77,8 +59,8 @@ class Agent extends EventEmitter {
     this.provider = config.provider || 'deepseek';
     this.providerOptions = {
       ...config.providerOptions,
-      maxOutputTokens: config.providerOptions?.maxOutputTokens ?? AGENT_CONFIG.MAX_OUTPUT_TOKENS,
-      temperature: config.providerOptions?.temperature ?? AGENT_CONFIG.TEMPERATURE,
+      maxOutputTokens: config.providerOptions?.maxOutputTokens ?? DEFAULT_MAX_OUTPUT_TOKENS,
+      temperature: config.providerOptions?.temperature ?? DEFAULT_TEMPERATURE,
     };
     // 原始 system prompt
     this._originalPrompt =
@@ -439,6 +421,14 @@ class Agent extends EventEmitter {
     this._syncTools();
   }
 
+  /**
+   * 获取原始系统提示文本
+   * @returns {string}
+   */
+  getOriginalPrompt() {
+    return this._originalPrompt;
+  }
+
   /**
    * 设置系统提示
    */

package/src/core/chat-session.js

@@ -9,7 +9,6 @@
  */
 
 const { EventEmitter } = require('../utils/event-emitter');
-const { ChatQueueManager } = require('../utils/chat-queue');
 const { logger } = require('../utils/logger');
 
 /**
@@ -113,21 +112,8 @@ class ChatSession extends EventEmitter {
     // Session 消息存储 Map: sessionId -> { messages: [], historyLoaded: false, compressionState: {} }
     this._sessionMessageStores = new Map();
 
-    // Session 队列: sessionId -> Queue of {message, options, resolve, reject}
-    this._sessionQueues = new Map();
-    this._processingSessions = new Set();
-
     // Session 事件作用域 Map: sessionId -> Set<{event, handler}>
     this._sessionScopes = new Map();
-
-    // 队列管理器
-    this.queueManager = new ChatQueueManager({
-      maxConcurrent: config.maxConcurrent || 1,
-      retryAttempts: config.retryAttempts || 3,
-      retryDelay: config.retryDelay || 1000,
-    });
-
-    this._setupQueueEvents();
   }
 
   /**
@@ -138,29 +124,7 @@ class ChatSession extends EventEmitter {
     this._messageProcessor = processor;
   }
 
-  /**
-   * 设置队列事件转发
-   * @private
-   */
-  _setupQueueEvents() {
-    const events = [
-      'queue:added',
-      'queue:processing',
-      'queue:completed',
-      'queue:failed',
-      'queue:retry',
-      'queue:empty',
-      'queue:cleared',
-      'queue:session-removed',
-      'stream:chunk',
-    ];
 
-    events.forEach((eventName) => {
-      this.queueManager.on(eventName, (data) => {
-        this.emit(eventName, data);
-      });
-    });
-  }
 
   /**
    * 获取或创建 SessionScope
@@ -219,6 +183,7 @@ class ChatSession extends EventEmitter {
         },
         save: () => {
           this.saveHistory(sessionId, store.messages);
+          return Promise.resolve();
         },
       };
       this._sessionMessageStores.set(sessionId, store);
@@ -310,123 +275,24 @@ class ChatSession extends EventEmitter {
   }
 
   /**
-   * 入队消息
+   * 入队消息（直接调用消息处理器，排队由上层 ChatQueueManager 处理）
    * @param {string} sessionId - Session ID
    * @param {Object} message - 消息
    * @param {Object} options - 选项
    * @returns {Promise}
    */
   enqueue(sessionId, message, options = {}) {
-    if (!this._sessionQueues.has(sessionId)) {
-      this._sessionQueues.set(sessionId, []);
-    }
-
-    return new Promise((resolve, reject) => {
-      const item = {
-        message,
-        options,
-        resolve,
-        reject,
-        timestamp: Date.now(),
-        executeFunction: options.executeFunction,
-      };
-      this._sessionQueues.get(sessionId).push(item);
-      this.emit('queue:added', {
-        sessionId,
-        message,
-        queueSize: this._sessionQueues.get(sessionId).length,
-      });
-
-      // 触发队列处理
-      this._processNext(sessionId);
-    });
+    return this._processMessageDirect(sessionId, message, options);
   }
 
   /**
-   * 处理队列中的下一条消息
-   * @param {string} sessionId - Session ID
+   * 直接处理消息（不经过额外的队列）
    * @private
    */
-  async _processNext(sessionId) {
-    if (this._processingSessions.has(sessionId)) {
-      return;
-    }
-
-    const queue = this._sessionQueues.get(sessionId);
-    if (!queue || queue.length === 0) {
-      this.emit('queue:empty', { sessionId });
-      return;
-    }
-
-    this._processingSessions.add(sessionId);
-    this.emit('queue:processing', { sessionId });
-
-    const item = queue.shift();
-    try {
-      // 如果有 executeFunction，使用流式处理
-      if (item.executeFunction) {
-        const chunks = [];
-        const stream = item.executeFunction(item.message, { ...item.options, sessionId });
-        let hasError = false;
-        let errorMessage = '';
-
-        for await (const chunk of stream) {
-          // 检查是否是错误 chunk，如果是立即拒绝并终止
-          if (chunk.type === 'error') {
-            hasError = true;
-            errorMessage = chunk.error || 'Unknown error';
-            this.emit('message:error', { sessionId, error: errorMessage });
-            item.reject(new Error(errorMessage));
-            return; // 立即返回，不继续迭代
-          }
-          chunks.push(chunk);
-          this.emit('stream:chunk', {
-            sessionId,
-            chunk,
-            accumulated: chunks.length,
-          });
-        }
-
-        if (hasError) {
-          // 有错误 chunk，拒绝 Promise
-          this.emit('message:error', { sessionId, error: errorMessage });
-          item.reject(new Error(errorMessage));
-        } else {
-          const fullText = chunks
-            .filter((a) => a.type === 'text')
-            .map((item) => item.text)
-            .join('');
-
-          item.resolve({ text: fullText, chunks });
-        }
-      } else {
-        const result = await this._processMessage(sessionId, item.message, item.options);
-        item.resolve(result);
-      }
-    } catch (err) {
-      this.emit('message:error', { sessionId, error: err.message });
-      item.reject(err);
-    } finally {
-      this._processingSessions.delete(sessionId);
-      // 处理下一条
-      setImmediate(() => this._processNext(sessionId));
-    }
-  }
-
-  /**
-   * 处理单条消息（子类实现）
-   * @param {string} sessionId - Session ID
-   * @param {Object} message - 消息
-   * @param {Object} options - 选项
-   * @returns {Promise}
-   * @protected
-   */
-  async _processMessage(sessionId, message, options) {
-    // 如果设置了处理器，使用处理器
+  async _processMessageDirect(sessionId, message, options) {
     if (this._messageProcessor) {
       return this._messageProcessor(sessionId, message, options);
     }
-    // 否则使用 agent 的处理逻辑
     if (this.agent?._chatHandler) {
       return this.agent._chatHandler._processMessage(sessionId, message, options);
     }
@@ -434,18 +300,10 @@ class ChatSession extends EventEmitter {
   }
 
   /**
-   * 取消会话队列
+   * 取消会话队列（委托给 ChatQueueManager）
    * @param {string} sessionId - Session ID
    */
   cancelSession(sessionId) {
-    const queue = this._sessionQueues.get(sessionId);
-    if (queue) {
-      queue.forEach((item) => {
-        item.reject(new Error('Session cancelled'));
-      });
-      queue.length = 0;
-    }
-    this._processingSessions.delete(sessionId);
     this.emit('queue:session-removed', { sessionId });
   }
 
@@ -455,12 +313,7 @@ class ChatSession extends EventEmitter {
    * @returns {Object}
    */
   getQueueStatus(sessionId) {
-    const queue = this._sessionQueues.get(sessionId) || [];
-    return {
-      sessionId,
-      size: queue.length,
-      processing: this._processingSessions.has(sessionId),
-    };
+    return { sessionId, size: 0, processing: false };
   }
 
   /**
@@ -468,13 +321,6 @@ class ChatSession extends EventEmitter {
    * @param {string} sessionId - Session ID
    */
   clearQueue(sessionId) {
-    const queue = this._sessionQueues.get(sessionId);
-    if (queue) {
-      queue.forEach((item) => {
-        item.reject(new Error('Queue cleared'));
-      });
-      queue.length = 0;
-    }
     this.emit('queue:cleared', { sessionId });
   }