foliko 1.1.83 → 1.1.85

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

@@ -549,7 +549,7 @@ class ChatUI {
     if (!this._lineBuffer) return;
 
     // 渲染剩余的 partial line（没有 \n 结尾的尾部文字）
-    const rendered = renderLine(this._lineBuffer, this._renderState, true);
+    const rendered = this._lineBuffer//renderLine(this._lineBuffer, this._renderState, true);
     if (!this._currentBotMessage) {
       this._currentBotMessage = this.create_message(rendered, colored('● ', GREEN), true);
     } else {

package/package.json

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

package/src/core/agent-chat.js

@@ -95,11 +95,14 @@ class AgentChatHandler extends EventEmitter {
       model: this.model,
       maxContextTokens: config.maxContextTokens,
       keepRecentMessages: config.keepRecentMessages || 20,
+      compressionMessageThreshold: config.compressionMessageThreshold,
       enableSmartCompress: config.enableSmartCompress !== false,
     });
 
     // 上下文限制
     this._maxContextTokens = this._contextCompressor._maxContextTokens;
+    // 消息数量触发压缩的阈值（可配置，默认 100）
+    this._compressionMessageThreshold = this._contextCompressor._compressionMessageThreshold;
 
     // Token 计算缓存（避免每次请求重复计算）
     this._toolsTokensCache = null;
@@ -755,7 +758,7 @@ class AgentChatHandler extends EventEmitter {
 
     // logger.info(`BEFORE: messages=${messages.length}, tokens=${totalTokens}/${limit}`);
 
-    if (totalTokens > limit || messages.length > 100) {
+    if (totalTokens > limit || messages.length > this._compressionMessageThreshold) {
       // logger.info(
       //   `Context large (${messages.length} msgs, ${totalTokens}/${this._maxContextTokens} tokens), compressing...`
       // );

package/src/core/agent.js

@@ -403,6 +403,7 @@ class Agent extends EventEmitter {
       // 上下文压缩配置
       maxContextTokens: this.config.maxContextTokens,
       compressionThreshold: this.config.compressionThreshold,
+      compressionMessageThreshold: this.config.compressionMessageThreshold,
       keepRecentMessages: this.config.keepRecentMessages,
       enableSmartCompress: this.config.enableSmartCompress,
     });

package/src/core/context-compressor.js

@@ -659,6 +659,8 @@ class ContextCompressor {
     this.model = config.model || 'deepseek-chat';
     this._maxContextTokens = config.maxContextTokens || this._getDefaultContextLimit();
     this._keepRecentMessages = config.keepRecentMessages || 20;
+    // 消息数量阈值：超过该数量即触发压缩（与 token 阈值并联触发）
+    this._compressionMessageThreshold = config.compressionMessageThreshold || 200;
     this._enableSmartCompress = config.enableSmartCompress !== false;
     this._compactionSettings = config.compactionSettings || DEFAULT_COMPACTION_SETTINGS;
 
@@ -764,8 +766,11 @@ class ContextCompressor {
       content: summaryContent
     };
 
+    const combined = [...systemMessages, summary, ...recentMessages];
+    this._cleanupOrphanedToolResults(combined);
+
     messages.length = 0;
-    messages.push(...systemMessages, summary, ...recentMessages);
+    messages.push(...combined);
 
     this._compressionCount++;
     const tokenCount = this._tokenCounter.countMessages(messages);
@@ -794,19 +799,81 @@ class ContextCompressor {
       content: summaryContent
     };
 
+    const combined = [...systemMessages, summary, ...recentMessages];
+    this._cleanupOrphanedToolResults(combined);
+
     messages.length = 0;
-    messages.push(...systemMessages, summary, ...recentMessages);
+    messages.push(...combined);
 
     this._compressionCount++;
     if (messageStore.compressionState) {
       messageStore.compressionState.count++;
       messageStore.compressionState.lastCompressedAt = Date.now();
-      messageStore.compressionState.lastTokenCount = this._tokenCounter.countMessages(messages);
+      messageStore.compressionState.lastTokenCount = this._tokenCounter.countMessages(combined);
     }
 
     logger.info(`Context simple compressed. Messages: ${messages.length}`);
   }
 
+  /**
+   * 清理孤立的 tool-result 消息（没有对应 tool-call 的）
+   * 压缩/裁剪后 recentMessages 可能切碎 tool-call/tool-result 配对，
+   * 必须就地清理，否则下游 API 会报 "tool result's tool id not found"
+   */
+  _cleanupOrphanedToolResults(messages) {
+    const validToolCallIds = 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) {
+            validToolCallIds.add(item.toolCallId);
+          }
+        }
+      }
+      if (Array.isArray(msg.tool_calls)) {
+        for (const tc of msg.tool_calls) {
+          if (tc.id) validToolCallIds.add(tc.id);
+        }
+      }
+    }
+
+    let removedItems = 0;
+    let removedMsgs = 0;
+    for (const msg of messages) {
+      if (msg.role !== 'tool' || !Array.isArray(msg.content)) continue;
+      const originalLength = msg.content.length;
+      msg.content = msg.content.filter((item) => {
+        if (
+          item &&
+          (item.type === 'tool-result' || item.type === 'tool_result') &&
+          item.toolCallId &&
+          !validToolCallIds.has(item.toolCallId)
+        ) {
+          removedItems++;
+          return false;
+        }
+        return true;
+      });
+      if (msg.content.length === 0 && originalLength > 0) {
+        msg._orphaned = true;
+      }
+    }
+
+    for (let i = messages.length - 1; i >= 0; i--) {
+      if (messages[i]._orphaned) {
+        messages.splice(i, 1);
+        removedMsgs++;
+      }
+    }
+
+    if (removedItems > 0 || removedMsgs > 0) {
+      logger.debug(
+        `[ContextCompressor] cleanup: removed ${removedItems} orphaned tool-result items, ${removedMsgs} orphaned tool messages`
+      );
+    }
+  }
+
   async _summarizeMessages(messages) {
     if (!this.framework) {
       throw new Error('Framework not available');