foliko 1.1.57 → 1.1.60

package/.claude/settings.local.json

@@ -217,7 +217,11 @@
       "Bash(cd cli/src && node -e \"console.log\\(require.resolve\\('../../src'\\)\\)\")",
       "Bash(node -e \"console.log\\(require.resolve\\('./src'\\)\\)\")",
       "Bash(cd /d/Code/foliko/cli/src && node -e \"console.log\\(require.resolve\\('../../src'\\)\\)\")",
-      "Bash(node -c cli/src/daemon.js 2>&1)"
+      "Bash(node -c cli/src/daemon.js 2>&1)",
+      "WebFetch(domain:github.com)",
+      "Bash(node -e \"const { codeToANSI } = require\\('@shikijs/cli'\\); console.log\\(typeof codeToANSI\\)\")",
+      "Bash(node -e ' *)",
+      "Bash(node -e \"const hl = require\\('cli-highlight'\\); console.log\\(hl.highlight\\('const a = 1', { language: 'javascript', theme: 'nord' }\\)\\)\")"
     ]
   }
 }

package/cli/src/index.js

@@ -2,6 +2,9 @@
  * Foliko CLI 主逻辑
  */
 
+// 启用 cli-highlight 颜色输出
+process.env.FORCE_COLOR = '1';
+
 const { chatCommand } = require('./commands/chat');
 const { listCommand } = require('./commands/list');
 const { pluginCommand } = require('./commands/plugin');

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

@@ -10,6 +10,7 @@ const { cleanResponse } = require('../../../src/utils');
 const { renderLine } = require('../utils/markdown');
 const { MessageBubble } = require('./message-bubble');
 const Queue=require('js-queue');
+const hl = require('cli-highlight');
 const queue=new Queue();
 // Foliko 主色（蓝绿）
 const folikoPrimary = chalk.hex('#2A9D8F');
@@ -53,8 +54,11 @@ const markdownTheme = {
   italic: (text) => chalk.italic(text),
   strikethrough: (text) => chalk.strikethrough(text),
   underline: (text) => chalk.underline(text),
-  highlightCode: (code, lang) => [chalk.green(code)],
-  codeBlockIndent:2
+  highlightCode: (code, lang) => {
+    const highlighted = hl.highlight(code, { language: lang || 'text', theme: 'nord' });
+    return highlighted.split('\n');
+  },
+  codeBlockIndent: "",
 };
 
 class ChatUI {
@@ -114,9 +118,9 @@ class ChatUI {
           }
     )
     // Spacer 占位，用于隐藏时保持布局
-    const toolerSpacer = new Spacer(1);
-    const loaderSpacer = new Spacer(1);
-    const notifierSpacer = new Spacer(1);
+    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 位置
@@ -449,7 +453,7 @@ class ChatUI {
             }
             setTimeout(() => {
               this.tooler.hide();
-              this.create_message(`${colored('[提示]', CYAN)} 上下文已压缩\n`,colored('● ', RED))
+              this.create_message(`${colored('[提示]', CYAN)} 上下文已压缩`,chalk.dim('● '))
               this.tui.requestRender();
             }, 2000);
           }).catch(err => {

package/cli/src/ui/message-bubble.js

@@ -67,7 +67,7 @@ class MessageBubble {
         return ' '.repeat(this.paddingX) + this.icon + truncated + ' '.repeat(this.paddingX);
       }
       // 后续行缩进到图标后面（3个字符），并保持左右 padding
-      return ' '.repeat(this.paddingX) + '   ' + truncated + ' '.repeat(this.paddingX);
+      return ' '.repeat(this.paddingX) + '  ' + truncated + ' '.repeat(this.paddingX);
     });
 
     // 添加上下 padding

package/cli/src/utils/markdown.js

@@ -94,29 +94,44 @@ function renderInline(text) {
   return result;
 }
 
-function renderThink(line, state = { inThink: false },thinking) {
+function renderThink(line, state = { inThink: false }, thinking) {
+  // 处理只有开始标签的情况（line = "<think>" 这样单独一行）
+  // 这种情况在流式输出时很常见
+  if (line === '<think>' || line === '<think>\n') {
+    state.inThink = true;
+    return STYLES.think.prefix + line;
+  }
+
   let result = line;
 
   // 匹配 <think>...</think> 以及可能的跨行情况
   result = result.replace(/<think>([\s\S]*?)<\/think>/g, (match, content) => {
-    const prefix=result.indexOf('<think>')>0?'\n':""
-    return prefix+STYLES.think.prefix + match + STYLES.think.suffix;
+    // 去掉 content 中的空行（保留最多一个换行）
+    const compressed = content.replace(/\n+/g, '\n').replace(/^\n|\n$/g, '');
+    const prefix = result.indexOf('<think>') > 0 ? '\n' : "";
+    return prefix + STYLES.think.prefix + '<think>' + compressed + '</think>' + STYLES.think.suffix;
   });
 
   // 处理未闭合的 think 标签 - 更新状态
-  if (result.includes('<think>')) {
+  if (result.includes('<think>') && !result.includes('</think>')) {
     state.inThink = true;
   }
   if (result.includes('</think>')) {
     state.inThink = false;
+    // 如果只有 </think> 标签（没有开始标签）
+    if (!result.includes('<think>')) {
+      return STYLES.think.prefix + line + STYLES.think.suffix;
+    }
   }
 
   // 处理未闭合的 think 标签（开始但没结束）
   if (state.inThink && !result.includes('<think>')) {
-    result = STYLES.think.prefix + result;
+    // 去掉空行
+    const compressed = result.replace(/\n+/g, '\n').replace(/^\n|\n$/g, '');
+    result = STYLES.think.prefix + compressed + STYLES.think.suffix;
   }
 
-  return thinking?result:renderInline(result);
+  return thinking ? result : renderInline(result);
 }
 
 /**
@@ -157,6 +172,11 @@ function renderLine(line, state = { inThink: false, inCodeBlock: false },thinkin
     return result;
   }
 
+  // 如果是 continuation 行（在思考块中但没有思考标签）
+  if (state.inThink && !line.includes('<think>') && !line.includes('</think>')) {
+    return STYLES.think.prefix + leadingNL + renderThink(line, state, thinking) + trailingNL + STYLES.think.suffix;
+  }
+
   // 标题
   if (line.startsWith('### ')) {
     return `${STYLES.h3.prefix}${renderInline(line.substring(4))}${STYLES.h3.suffix}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foliko",
-  "version": "1.1.57",
+  "version": "1.1.60",
   "description": "简约的插件化 Agent 框架",
   "main": "src/index.js",
   "type": "commonjs",
@@ -63,6 +63,7 @@
     "@modelcontextprotocol/sdk": "^1.27.1",
     "ai": "^6.0.146",
     "chalk": "^5.6.2",
+    "cli-highlight": "^2.1.11",
     "crypto": "^1.0.1",
     "dotenv": "^17.3.1",
     "figlet": "^1.11.0",

package/plugins/think-plugin.js

@@ -203,7 +203,7 @@ class ThinkPlugin extends Plugin {
 
         // 发送通知
         const level = mode === 'brainstorm' ? 'success' : 'info'
-        this._emitNotification(level, '🧠 思考完成', thought.result.slice(0, 200))
+        this._emitNotification(level, '🧠 思考完成', thought.result)
       }
 
       return {