foliko 2.0.3 → 2.0.4

package/package.json

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

package/plugins/executors/extension/index.js

@@ -302,7 +302,7 @@ class ExtensionExecutorPlugin extends Plugin {
       ext.tools.push(toolEntry);
     }
 
-    log.debug(` Registered tool '${toolDef.name}' for extension '${pluginName}'`);
+    //log.debug(` Registered tool '${toolDef.name}' for extension '${pluginName}'`);
 
     if (this._framework && this._framework._ready) {
       this._invalidatePromptCaches(this._framework);

package/src/agent/chat.js

@@ -473,7 +473,7 @@ class AgentChatHandler extends EventEmitter {
       const { messageStore, messages } = await this._prepareSession(message, sessionId);
 
       if (!this._aiClient) {
-        throw new Error('AI client not configured.');
+        throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
       const systemPrompt = framework.getSystemPrompt();
@@ -497,7 +497,12 @@ class AgentChatHandler extends EventEmitter {
       let reasoningContent = '';
 
       const result = await framework.runInSession(sessionId, {}, async () => {
-        return agent.stream({ messages, ...this.providerOptions, onError: handleSDKError });
+        return agent.stream({
+          messages,
+          ...this.providerOptions,
+          onError: handleSDKError,
+          abortSignal: framework.getAbortSignal?.(),
+        });
       });
 
       const stream = result.fullStream;
@@ -595,7 +600,10 @@ class AgentChatHandler extends EventEmitter {
       // 统一错误处理：提取简洁消息并通过 yield 传递
       const friendlyMessage = err?.message?.split('\n')[0] || '未知错误';
 
-      this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
+      // 用户主动中断（framework.stop()）不上报 message:error，避免与上游重复
+      if (err.name !== 'AbortError') {
+        this.emit('message:error', { sessionId, error: friendlyMessage, originalError: err });
+      }
       yield { type: 'error', error: friendlyMessage };
     } finally {
       const messageStore = this._getSessionMessageStore(sessionId);
@@ -648,7 +656,7 @@ class AgentChatHandler extends EventEmitter {
       const { messageStore, messages } = await this._prepareSession(message, sessionId);
 
       if (!this._aiClient) {
-        throw new Error('AI client not configured.');
+        throw new Error('AI 客户端未配置');
       }
       this._validateToolCalls(messages);
       const systemPrompt = framework.getSystemPrompt();
@@ -669,7 +677,7 @@ class AgentChatHandler extends EventEmitter {
       });
 
       const result = await framework.runInSession(sessionId, {}, async () => {
-        return agent.generate({ messages, ...apiOptions });
+        return agent.generate({ messages, ...apiOptions, abortSignal: framework.getAbortSignal?.() });
       });
 
       if (result.usage && (result.usage.promptTokens > 0 || result.usage.completionTokens > 0)) {
@@ -780,6 +788,9 @@ class AgentChatHandler extends EventEmitter {
     messages.push(userMessage);
     this._validateToolCalls(messages);
 
+    // 最终兜底：暴力清理所有 orphaned tool 消息，确保 AI SDK 不报错
+    this._stripOrphanedToolMessages(messages);
+
     return { messageStore, messages };
   }
 
@@ -832,6 +843,57 @@ class AgentChatHandler extends EventEmitter {
     messageStore._cacheMessageCount = messageStore.messages.length;
   }
 
+  /**
+   * 最终兜底：暴力清理所有 orphaned tool 消息
+   * 遍历所有 tool 角色消息，删除没有对应 tool-call 的
+   * 处理数组格式（AI SDK）、字符串格式（OpenAI 兼容）、tool_call_id 格式
+   */
+  _stripOrphanedToolMessages(messages) {
+    const validIds = new Set();
+    for (const msg of messages) {
+      if (msg.role !== 'assistant') continue;
+      if (Array.isArray(msg.content)) {
+        for (const item of msg.content) {
+          if ((item.type === 'tool-call' || item.type === 'tool-use') && item.toolCallId) validIds.add(item.toolCallId);
+        }
+      }
+      if (Array.isArray(msg.tool_calls)) {
+        for (const tc of msg.tool_calls) { if (tc.id) validIds.add(tc.id); }
+      }
+    }
+
+    let removed = 0;
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const msg = messages[i];
+      if (msg.role !== 'tool') continue;
+
+      let isOrphaned = false;
+      if (Array.isArray(msg.content)) {
+        msg.content = msg.content.filter(item => {
+          if (item && (item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId && !validIds.has(item.toolCallId)) {
+            return false;
+          }
+          return true;
+        });
+        if (msg.content.length === 0) isOrphaned = true;
+      } else if (msg.tool_call_id && !validIds.has(msg.tool_call_id)) {
+        isOrphaned = true;
+      } else if (!msg.tool_call_id && validIds.size === 0) {
+        // 没有任何 tool-call，所有 tool 消息都是 orphaned
+        isOrphaned = true;
+      }
+
+      if (isOrphaned) {
+        messages.splice(i, 1);
+        removed++;
+      }
+    }
+
+    if (removed > 0) {
+      logger.debug(`[_stripOrphanedToolMessages] removed ${removed} orphaned tool message(s)`);
+    }
+  }
+
   /**
    * 计算工具列表缓存 key
    * @private

package/src/agent/sub.js

@@ -157,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/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() 推进队列，否则后续消息卡死
       });
     })
     
@@ -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/common/queue.js

@@ -260,7 +260,7 @@ class ChatQueueManager extends EventEmitter {
     this.activeCount = 0;
 
     pendingItems.forEach((item) => {
-      item.reject(new Error('Queue cleared by user'));
+      item.reject(new Error('队列已清空'));
     });
 
     this.emit('queue:cleared', { count: pendingItems.length });

package/src/framework/framework.js

@@ -117,6 +117,9 @@ class Framework extends EventEmitter {
     // Coordinator
     this._coordinatorManager = null;
 
+    // Global abort controller for framework.stop()
+    this._abortController = null;
+
     // Session TTL
     this._sessionTTL = new SessionTTL({
       getSessionContexts: () => this._sessionContexts,
@@ -336,6 +339,36 @@ class Framework extends EventEmitter {
 
   getCwd() { return this._cwd; }
 
+  /**
+   * 获取全局 abort signal，用于中断正在运行的对话
+   */
+  getAbortSignal() {
+    if (!this._abortController || this._abortController.signal.aborted) {
+      this._abortController = new AbortController();
+    }
+    return this._abortController.signal;
+  }
+
+  /**
+   * 立即中断所有正在运行的 Agent 对话
+   */
+  stop() {
+    if (this._abortController) {
+      this._abortController.abort(new Error('用户中断'));
+      this._abortController = null;
+    }
+    // 清空消息队列
+    for (const agent of this._agents) {
+      if (agent._chatHandler?.queueManager) {
+        agent._chatHandler.queueManager.clear();
+      }
+      if (typeof agent.cancelSession === 'function') {
+        agent.cancelSession('default');
+      }
+    }
+    this.emit('framework:stopped');
+  }
+
   registerEventDescription(eventType, description, schema = null) { this.pluginManager.registerEventDescription(eventType, description, schema); return this; }
   getEventDescriptions() { return this.pluginManager.getEventDescriptions(); }
   getEventDescription(eventType) { return this.pluginManager.getEventDescription(eventType); }

package/src/session/chat.js

@@ -225,7 +225,7 @@ class ChatSession extends EventEmitter {
           messageStore.messages = messages;
           messageStore.historyLoaded = true;
           messageStore._hasMoreHistory = allMessages.length > MAX_INITIAL_LOAD;
-          logger.debug(`Loaded ${messages.length} msgs for session ${sessionId} (total: ${allMessages.length})`);
+          //logger.debug(`Loaded ${messages.length} msgs for session ${sessionId} (total: ${allMessages.length})`);
         }
       }
     }

package/src/tool/executor.js

@@ -35,7 +35,7 @@ class ToolExecutor extends EventEmitter {
       return;
     }
     this._tools.set(tool.name, tool);
-    logger.debug('ToolExecutor', `Registered tool: ${tool.name}`);
+    //logger.debug('ToolExecutor', `Registered tool: ${tool.name}`);
   }
 
   unregisterTool(name) {