evolclaw 2.1.0 → 2.1.1

package/dist/utils/stream-flusher.js

@@ -1,4 +1,19 @@
-import { logger } from './logger.js';
+import fs from 'fs';
+import path from 'path';
+import { resolvePaths } from '../paths.js';
+// 诊断日志（按需启用，通过 config.debug.flusherDiag 控制）
+let diagStream = null;
+function getDiagStream() {
+    if (!diagStream) {
+        const logDir = resolvePaths().logs;
+        diagStream = fs.createWriteStream(path.join(logDir, 'flusher-diag.log'), { flags: 'a' });
+    }
+    return diagStream;
+}
+function diag(instanceId, action, meta = {}) {
+    const line = JSON.stringify({ ts: new Date().toISOString(), id: instanceId, action, ...meta });
+    getDiagStream().write(line + '\n');
+}
 /**
  * 流式输出缓冲器
  * 按时间窗口批量推送文本和活动事件
@@ -12,6 +27,7 @@ import { logger } from './logger.js';
  *   - 下限：interval（额定值）
  *   - 上限：interval * 2.5
  */
+let instanceCounter = 0;
 export class StreamFlusher {
     send;
     interval;
@@ -24,19 +40,27 @@ export class StreamFlusher {
     fileMarkerPattern;
     flushCount = 0;
     messageTimestamps = [];
-    constructor(send, interval = 4000, fileMarkerPattern) {
+    instanceId;
+    createTime = Date.now();
+    diagEnabled;
+    constructor(send, interval = 4000, fileMarkerPattern, diagEnabled = false) {
         this.send = send;
         this.interval = interval;
         this.fileMarkerPattern = fileMarkerPattern;
+        this.diagEnabled = diagEnabled;
+        this.instanceId = `F${++instanceCounter}`;
+        if (this.diagEnabled)
+            diag(this.instanceId, 'created', { interval });
     }
     addText(text) {
         this.buffer += text;
         this.allText += text;
         this.messageTimestamps.push(Date.now());
+        if (this.diagEnabled)
+            diag(this.instanceId, 'addText', { len: text.length, preview: text.substring(0, 60), bufLen: this.buffer.length, actCount: this.activities.length });
         this.scheduleFlush();
     }
     addTextBlock(text) {
-        // 用于 assistant 事件的完整文本块，需要换行分隔
         if (this.buffer && !this.buffer.endsWith('\n')) {
             this.buffer += '\n\n';
             this.allText += '\n\n';
@@ -44,79 +68,69 @@ export class StreamFlusher {
         this.buffer += text;
         this.allText += text;
         this.messageTimestamps.push(Date.now());
+        if (this.diagEnabled)
+            diag(this.instanceId, 'addTextBlock', { len: text.length, preview: text.substring(0, 60), bufLen: this.buffer.length });
         this.scheduleFlush();
     }
     addActivity(desc) {
         this.activities.push(desc);
         this.messageTimestamps.push(Date.now());
+        if (this.diagEnabled)
+            diag(this.instanceId, 'addActivity', { desc: desc.substring(0, 80), actCount: this.activities.length });
         this.scheduleFlush();
     }
-    /** 当前 buffer 中是否有待发送内容 */
     hasContent() {
         return this.buffer.length > 0 || this.activities.length > 0;
     }
-    /** 是否曾经发送过任何内容 */
     hasSentContent() {
         return this.sentContent;
     }
-    /** 获取完整累积文本（用于文件标记提取） */
     getFinalText() {
         return this.allText;
     }
-    /** 获取当前未发送的剩余文本 */
     getRemainingText() {
         return this.buffer;
     }
-    /** 从当前 buffer 中移除匹配的模式 */
     stripFromBuffer(pattern) {
         this.buffer = this.buffer.replace(pattern, '').trim();
     }
     scheduleFlush() {
-        if (this.timer)
+        if (this.timer) {
+            if (this.diagEnabled)
+                diag(this.instanceId, 'scheduleFlush:skip', { reason: 'timer_exists' });
             return;
-        // 计算目标延迟
+        }
         let targetDelay;
         if (this.flushCount === 0) {
-            // 第1次：立即发送
             targetDelay = 0;
         }
         else if (this.flushCount <= 3) {
-            // 第2-4次：半延迟
             targetDelay = Math.ceil(this.interval / 2);
         }
         else if (this.messageTimestamps.length >= 5) {
-            // 第5次起：动态自适应
             targetDelay = this.calculateDynamicDelay();
         }
         else {
-            // 样本不足，使用额定延迟
             targetDelay = this.interval;
         }
         const elapsed = Date.now() - this.lastFlush;
         const delay = Math.max(0, targetDelay - elapsed);
+        if (this.diagEnabled)
+            diag(this.instanceId, 'scheduleFlush:set', { flushCount: this.flushCount, targetDelay, elapsed, actualDelay: delay });
         this.timer = setTimeout(() => this.flush(), delay);
     }
-    /**
-     * 计算动态延迟
-     * 基于最近10条消息的平均间隔
-     */
     calculateDynamicDelay() {
-        // 取最近10条（或实际条数）
         const recent = this.messageTimestamps.slice(-10);
-        // 计算平均间隔
         const intervals = [];
         for (let i = 1; i < recent.length; i++) {
             intervals.push(recent[i] - recent[i - 1]);
         }
-        if (intervals.length === 0) {
+        if (intervals.length === 0)
             return this.interval;
-        }
         const avgInterval = intervals.reduce((a, b) => a + b) / intervals.length;
-        // 动态延迟 = 平均间隔 * 3
         let dynamicDelay = avgInterval * 3;
-        // 边界限制
-        const minDelay = this.interval; // 下限：额定值
-        const maxDelay = this.interval * 2.5; // 上限：额定值 * 2.5
+        const minDelay = this.interval;
+        const maxDelay = this.interval * 2.5;
         return Math.max(minDelay, Math.min(maxDelay, dynamicDelay));
     }
     async flush(isFinal) {
@@ -133,15 +147,11 @@ export class StreamFlusher {
             output += this.buffer;
             this.buffer = '';
         }
-        // 移除文件标记（如果配置了）
         if (output && this.fileMarkerPattern) {
-            const before = output;
             output = output.replace(this.fileMarkerPattern, '').trim();
-            if (before !== output) {
-                logger.debug('[StreamFlusher] Removed file markers, before length:', before.length, 'after:', output.length);
-            }
         }
-        logger.debug('[StreamFlusher] flush called, output length:', output.length, 'isEmpty:', !output, 'preview:', output.substring(0, 100));
+        if (this.diagEnabled)
+            diag(this.instanceId, 'flush', { isFinal, outputLen: output.length, flushCount: this.flushCount, sinceLastFlush: Date.now() - this.lastFlush, preview: output.substring(0, 80) });
         if (output) {
             await this.send(output, isFinal);
             this.sentContent = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",