foliko 1.1.71 → 1.1.72

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

@@ -59,7 +59,8 @@ const markdownTheme = {
   strikethrough: (text) => chalk.strikethrough(text),
   underline: (text) => chalk.underline(text),
   highlightCode: (code, lang) => {
-    const highlighted = hl.highlight(code, { language: lang || 'text', theme: 'nord' });
+    const language = lang && hl.supportsLanguage(lang) ? lang : 'text';
+    const highlighted = hl.highlight(code, { language, theme: 'nord' });
     return highlighted.split('\n');
   },
   codeBlockIndent: "",
@@ -191,13 +192,13 @@ class ChatUI {
         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.statusBar.notifier.show(`${level} ${chalk[level_key](data.message)}`)
-      };
-      logger.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) => {
@@ -246,10 +247,10 @@ class ChatUI {
       clearTimeout(this._streamBufferTimer);
       this._streamBufferTimer = null;
     }
-    if (this._logHandler && this.agent.framework) {
-      logger.off('log', this._logHandler);
-      this._logHandler = null;
-    }
+    // 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;
@@ -283,6 +284,7 @@ class ChatUI {
     queue.add(function(){
       var next = this.next;
       self.agent.sendMessage(message, { sessionId:self.sessionId }).then(next).catch(function(e){
+        self.create_message(chalk.red(`[错误] ${e?.message || e || '发送消息失败'}\n`), colored('● ', RED))
         self.clear_message_done();
       });
     })
@@ -659,7 +661,7 @@ class ChatUI {
           this._streamBufferTimer = setTimeout(() => this._flushStreamBuffer(), 0);
         }
       } else if (chunk.type === 'tool-call') {
-        const args = chunk.input ? JSON.stringify(chunk.input).slice(0, 50) : '';
+        const args = chunk.input ? JSON.stringify(chunk.input).slice(0, 30) : '';
         this.statusBar.tooler.show(`${chalk.yellow('[Tool]')} ${folikoGold(chunk.toolName)} ${chalk.gray(args+'...')}`)
       } else if(chunk.type==='tool-result'){
         const result = chunk.result;

package/package.json

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

package/plugins/extension-executor-plugin.js

@@ -159,7 +159,7 @@ class ExtensionExecutorPlugin extends Plugin {
         if (plugin === 'mcp' && this._mcpExecutor) {
           const mcpToolDef = this._mcpExecutor.tools?.[tool];
           if (mcpToolDef && mcpToolDef.execute) {
-            log.info(` ext_call [MCP]: tool=${tool}`);
+            //log.info(` ext_call [MCP]: tool=${tool}`);
             return await mcpToolDef.execute(toolArgs || {});
           }
           return { success: false, error: `MCP tool '${tool}' not found` };

package/src/capabilities/skill-manager.js

@@ -10,6 +10,39 @@ const { logger } = require('../utils/logger');
 const log = logger.child('SkillManager');
 const { z } = require('zod');
 const { Command } = require('commander');
+
+/**
+ * 简单的 shell 参数解析器（处理带引号的参数）
+ * @param {string} str - 参数字符串
+ * @returns {string[]} 参数数组
+ */
+function parseShellArgs(str) {
+  if (!str || !str.trim()) return [];
+  const args = [];
+  let current = '';
+  let inQuote = false;
+  let quoteChar = '';
+
+  for (let i = 0; i < str.length; i++) {
+    const char = str[i];
+    if (!inQuote && (char === '"' || char === "'")) {
+      inQuote = true;
+      quoteChar = char;
+    } else if (inQuote && char === quoteChar) {
+      inQuote = false;
+    } else if (!inQuote && char === ' ') {
+      if (current.trim()) {
+        args.push(current.trim());
+        current = '';
+      }
+    } else {
+      current += char;
+    }
+  }
+  if (current.trim()) args.push(current.trim());
+  return args;
+}
+
 /**
  * 验证 skill 名称
  * 1-64字符，字母数字、下划线和连字符，不能以连字符或下划线开头或结尾
@@ -185,14 +218,20 @@ class Skill {
         let argumentParser = cmd.argumentParser;
         if (!argumentParser && Array.isArray(cmd.options) && cmd.options.length > 0) {
           argumentParser = (rawArgs) => {
-
-            const program = new Command();
-            for (const opt of cmd.options) {
-              program.option(opt.flags, opt.description, opt.defaultValue);
+            try {
+              const program = new Command();
+              program.exitOverride(); // 不自动退出
+              program.configureOutput({ writeErr: () => {} }); // 隐藏错误输出
+              for (const opt of cmd.options) {
+                program.option(opt.flags, opt.description, opt.defaultValue);
+              }
+              program.arguments('[args...]');
+              program.parse(['node', 'cmd', ...parseShellArgs(rawArgs)]);
+              return { ...program.opts(), args: program.args };
+            } catch (err) {
+              log.warn(`[SkillManager] Command parse error: ${err.message}`);
+              return { args: rawArgs };
             }
-            program.arguments('[args...]');
-            program.parse(['node', 'cmd', ...(rawArgs || '').split(' ').filter(Boolean)]);
-            return { ...program.opts(), args: program.args };
           };
         }
 

package/src/core/agent-chat.js

@@ -500,6 +500,8 @@ class AgentChatHandler extends EventEmitter {
       const stream = result.fullStream;
       let fullText = '';
       const iterator = stream[Symbol.asyncIterator] ? stream : stream.fullStream;
+      // 追踪发送的 tool-call ID，过滤 API 返回的不匹配 tool-result
+      const sentToolCallIds = new Set();
 
       for await (const part of iterator || stream) {
         if (part.type === 'text-delta') {
@@ -510,8 +512,16 @@ class AgentChatHandler extends EventEmitter {
           reasoningContent += part.text || '';
           yield { type: 'thinking', text: part.text };
         } else if (part.type === 'tool-call') {
+          const toolCallId = part.toolCallId;
+          if (toolCallId) sentToolCallIds.add(toolCallId);
           yield { type: 'tool-call', toolName: part.toolName, input: part.input };
         } else if (part.type === 'tool-result') {
+          // 过滤 toolCallId 不匹配的 tool-result（API bug）
+          const resultToolCallId = part.toolCallId;
+          if (resultToolCallId && !sentToolCallIds.has(resultToolCallId)) {
+            logger.debug(`[stream]过滤不匹配的 tool-result: ${resultToolCallId}`);
+            continue;
+          }
           yield { type: 'tool-result', toolName: part.toolName, result: part.output };
         } else if (part.type === 'error') {
           // 统一错误消息