evolclaw 3.0.0 → 3.1.1

package/dist/core/evolagent.js

@@ -150,17 +150,12 @@ export class EvolAgent {
         this.persist();
     }
     // ── ShowActivities ────────────────────────────────────────────────────
-    getShowActivities(channelKey) {
-        const inst = this.findChannelInstance(channelKey);
-        return inst?.showActivities ?? this.merged.show_activities ?? 'all';
+    getShowActivities(_channelKey) {
+        return this.merged.show_activities ?? 'all';
     }
-    setShowActivities(channelKey, mode) {
-        const inst = this.findRawChannelInstance(channelKey);
-        if (!inst) {
-            logger.warn(`[EvolAgent ${this.aid}] setShowActivities: channel "${channelKey}" not found`);
-            return;
-        }
-        inst.showActivities = mode;
+    setShowActivities(_channelKey, mode) {
+        this.rawAgent.show_activities = mode;
+        this.merged.show_activities = mode;
         this.persist();
     }
     // ── Baseagent 字段写入 ────────────────────────────────────────────────

package/dist/core/message/im-renderer.js

@@ -1,7 +1,23 @@
 import { logger } from '../../utils/logger.js';
+import { summarizeToolInput } from '../permission.js';
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../../paths.js';
+/**
+ * 检测是否为上下文过长错误
+ * 统一的检测逻辑，覆盖所有已知的错误文本模式
+ */
+function isContextTooLongError(text) {
+    if (!text)
+        return false;
+    const lower = text.toLowerCase();
+    return (lower.includes('prompt is too long') ||
+        lower.includes('input is too long') ||
+        lower.includes('context too long') ||
+        lower.includes('context limit') ||
+        lower.includes('context_length_exceeded') ||
+        text.includes('上下文过长'));
+}
 let diagStream = null;
 function getDiagStream() {
     if (!diagStream) {
@@ -29,8 +45,8 @@ export class IMRenderer {
     diagEnabled;
     /** 串行发送队列：保证消息按序到达 */
     sendChain = Promise.resolve();
-    /** proactive：是否已发过 thinking 文本（用于去重 complete.result） */
-    hasEmittedThinking = false;
+    /** proactive：是否已发过 text 文本（用于去重 complete.result） */
+    hasEmittedText = false;
     /** 自增 callId 兜底（runner 没提供时用） */
     syntheticCallSeq = 0;
     constructor(opts) {
@@ -75,7 +91,34 @@ export class IMRenderer {
     }
     /** 是否有 pending 内容 */
     hasContent() {
-        return this.textBuffer.length > 0 || this.itemsQueue.some(it => it.kind !== 'thinking');
+        return this.textBuffer.length > 0 || this.itemsQueue.some(it => it.kind !== 'text');
+    }
+    /** 是否有待发送的文本 */
+    hasTextPending() {
+        return this.textBuffer.length > 0;
+    }
+    /** flush 当前 textBuffer 作为独立的 result.text（非 final），然后清空 buffer */
+    async flushText() {
+        if (this.opts.envelope.chatmode === 'proactive')
+            return;
+        if (this.textBuffer.length === 0)
+            return;
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = undefined;
+        }
+        const text = this.textBuffer;
+        this.textBuffer = '';
+        // 清掉 itemsQueue 中的 text items（已发出）
+        this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
+        const payload = { kind: 'result.text', text, isFinal: false };
+        this.sentContent = true;
+        this.sendChain = this.sendChain
+            .then(() => this.opts.send(payload))
+            .catch(e => logger.warn('[IMRenderer] flushText send failed:', e));
+        await this.sendChain;
+        this.lastFlush = Date.now();
+        this.flushCount++;
     }
     /** 是否已发送过内容（用于决定最终 flush 是否带 isFinal 标题） */
     hasSentContent() {
@@ -92,27 +135,28 @@ export class IMRenderer {
     /** 从 buffer 中移除指定 pattern（用于文件标记预处理） */
     stripFromBuffer(pattern) {
         this.textBuffer = this.textBuffer.replace(pattern, '').trim();
-        // itemsQueue 中的 thinking items 也同步过滤
+        // itemsQueue 中的 text items 也同步过滤
         for (const item of this.itemsQueue) {
-            if (item.kind === 'thinking') {
+            if (item.kind === 'text') {
                 item.text = item.text.replace(pattern, '');
             }
         }
     }
     // ── 文本/活动注入（替代 StreamFlusher.addText/addActivity）──
     /** 添加文本片段（流式 text） */
-    addText(text) {
+    addText(text, outputTokens, turn) {
+        this.emitProgress('text', outputTokens, turn);
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         if (!text)
             return;
-        // 同一窗口内连续 text delta 合并到最后一个 thinking item
+        // 同一窗口内连续 text delta 合并到最后一个 text item
         const last = this.itemsQueue[this.itemsQueue.length - 1];
-        if (last && last.kind === 'thinking') {
+        if (last && last.kind === 'text') {
             last.text += text;
         }
         else {
-            this.itemsQueue.push({ kind: 'thinking', text });
+            this.itemsQueue.push({ kind: 'text', text });
         }
         this.textBuffer += text;
         this.allText += text;
@@ -127,7 +171,8 @@ export class IMRenderer {
         this.scheduleFlush();
     }
     /** 添加工具调用 */
-    addToolCall(name, input, callId, descText) {
+    addToolCall(name, input, callId, descText, turn, outputTokens) {
+        this.emitProgress('tool_call', outputTokens, turn);
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         if (this.opts.suppressActivities)
@@ -146,6 +191,7 @@ export class IMRenderer {
     }
     /** 添加工具结果 */
     addToolResult(name, ok, result, error, callId, durationMs, descText) {
+        this.emitProgress('tool_result');
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         if (this.opts.suppressActivities)
@@ -241,17 +287,17 @@ export class IMRenderer {
         const maxDelay = interval * 2.5;
         return Math.max(minDelay, Math.min(maxDelay, dynamicDelay));
     }
-    /** 仅 flush 非 thinking items（保留 textBuffer 用于后续 final flush） */
+    /** 仅 flush 非 text items（text items 和 textBuffer 保留，等待下次完整 flush） */
     async flushActivitiesInternal() {
-        const nonThinking = this.itemsQueue.filter(it => it.kind !== 'thinking');
+        const nonThinking = this.itemsQueue.filter(it => it.kind !== 'text');
         if (nonThinking.length === 0)
             return;
         if (this.timer) {
             clearTimeout(this.timer);
             this.timer = undefined;
         }
-        // 移除已 flush 的 non-thinking items，保留 thinking items
-        this.itemsQueue = this.itemsQueue.filter(it => it.kind === 'thinking');
+        // 移除已 flush 的 non-text items，保留 text items
+        this.itemsQueue = this.itemsQueue.filter(it => it.kind === 'text');
         const payload = { kind: 'activity.batch', items: nonThinking };
         if (this.diagEnabled)
             diag(this.instanceId, 'flushActivitiesOnly', { itemCount: nonThinking.length });
@@ -276,13 +322,13 @@ export class IMRenderer {
         if (this.opts.fileMarkerPattern) {
             this.textBuffer = this.textBuffer.replace(this.opts.fileMarkerPattern, '').trim();
             for (const item of this.itemsQueue) {
-                if (item.kind === 'thinking')
+                if (item.kind === 'text')
                     item.text = item.text.replace(this.opts.fileMarkerPattern, '');
             }
         }
-        // 清掉空 thinking items
+        // 清掉空 text items
         const items = this.itemsQueue.filter(it => {
-            if (it.kind === 'thinking')
+            if (it.kind === 'text')
                 return it.text.length > 0;
             return true;
         });
@@ -290,7 +336,6 @@ export class IMRenderer {
         const finalText = isFinal ? this.textBuffer : '';
         if (isFinal)
             this.textBuffer = '';
-        // 非 final flush 保留 textBuffer，供最终 result.text 使用
         if (this.diagEnabled) {
             diag(this.instanceId, 'flush', {
                 isFinal,
@@ -300,12 +345,8 @@ export class IMRenderer {
                 sinceLastFlush: Date.now() - this.lastFlush,
             });
         }
-        // 1. interactive 模式下：isFinal=true 时不发 thinking-only batch
-        //    （避免和最终 result.text 重复——最终回复已在 textBuffer 里）
-        let itemsForBatch = items;
-        if (isFinal) {
-            itemsForBatch = items.filter(it => it.kind !== 'thinking');
-        }
+        // 1. interactive 模式下：不发 text items（由 result.text 统一发送最终文本）
+        let itemsForBatch = items.filter(it => it.kind !== 'text');
         if (itemsForBatch.length > 0) {
             const payload = { kind: 'activity.batch', items: itemsForBatch };
             this.sentContent = true;
@@ -328,22 +369,31 @@ export class IMRenderer {
             this.flushCount++;
         }
     }
+    // ── 内部：status.progress 发送 ──
+    emitProgress(activityType, outputTokens, turn) {
+        const payload = { kind: 'status.progress', metadata: { activityType, ...(turn != null && { turn }), ...(outputTokens != null && { outputTokens }) } };
+        this.opts.send(payload).catch(() => { });
+    }
     // ── 内部：proactive 模式（逐事件 activity.batch[1 item]） ──
     emitProactive(event) {
         // 对齐 interactive 的 dedup：流式 text 已推过时，complete.result 不再重复发 summary
         if (event.type === 'complete' &&
             !event.isError &&
             event.result &&
-            this.hasEmittedThinking) {
+            this.hasEmittedText) {
             return;
         }
         const item = this.mapEventToItem(event);
         if (!item)
             return;
-        if (item.kind === 'thinking') {
-            this.hasEmittedThinking = true;
+        if (item.kind === 'text') {
+            this.hasEmittedText = true;
             this.allText += item.text;
         }
+        const outputTokens = event.outputTokens;
+        const turn = event.turn;
+        const activityType = item.kind === 'text' ? 'text' : item.kind === 'tool_call' ? 'tool_call' : 'tool_result';
+        this.emitProgress(activityType, outputTokens, turn);
         const payload = { kind: 'activity.batch', items: [item] };
         // fire-and-forget
         this.opts.send(payload).catch(err => {
@@ -355,9 +405,9 @@ export class IMRenderer {
             case 'text':
                 if (!event.text)
                     return null;
-                return { kind: 'thinking', text: event.text };
+                return { kind: 'text', text: event.text };
             case 'tool_use': {
-                const desc = this.summarizeInput(event.input, event.name);
+                const desc = summarizeToolInput(event.name, event.input || {});
                 return {
                     kind: 'tool_call',
                     call_id: event.callId || this.synthCallId(),
@@ -407,9 +457,20 @@ export class IMRenderer {
                     duration_ms: event.durationMs,
                 };
             }
-            case 'error':
+            case 'error': {
+                // 上下文过长错误不输出（留给外层 auto-compact 处理）
+                if (isContextTooLongError(event.error || ''))
+                    return null;
                 return { kind: 'notice', text: event.error, severity: 'warn' };
-            case 'complete':
+            }
+            case 'complete': {
+                // 上下文过长错误不输出（留给外层 auto-compact 处理）
+                const hasContextError = event.terminalReason === 'prompt_too_long'
+                    || isContextTooLongError(event.errors?.join(' ') || '')
+                    || isContextTooLongError(event.result || '');
+                if (event.isError && hasContextError) {
+                    return null;
+                }
                 if (event.isError) {
                     const errText = event.errors?.join('; ') || event.result || '任务失败';
                     return {
@@ -429,6 +490,7 @@ export class IMRenderer {
                     };
                 }
                 return null;
+            }
             case 'session_id':
             case 'state_changed':
             case 'status':
@@ -437,23 +499,6 @@ export class IMRenderer {
                 return null;
         }
     }
-    summarizeInput(input, toolName) {
-        if (!input || typeof input !== 'object')
-            return '';
-        if (toolName === 'Bash' && typeof input.command === 'string') {
-            const cmd = input.command;
-            if (cmd.includes('evolclaw ctl send') || cmd.includes('evolclaw ctl file')) {
-                return cmd;
-            }
-        }
-        return (input.description ||
-            input.file_path ||
-            input.pattern ||
-            (typeof input.command === 'string' ? input.command.substring(0, 80) : '') ||
-            (typeof input.prompt === 'string' ? input.prompt.substring(0, 80) : '') ||
-            (typeof input.query === 'string' ? input.query.substring(0, 80) : '') ||
-            '');
-    }
     stringifyResult(result) {
         if (result === null || result === undefined)
             return '';

package/dist/core/message/items-formatter.js

@@ -5,7 +5,7 @@
  */
 export function formatItemsAsText(items) {
     if (!items || items.length === 0)
-        return '';
+        return ''; // early exit
     const lines = [];
     for (const item of items) {
         const line = formatItem(item);
@@ -16,20 +16,27 @@ export function formatItemsAsText(items) {
 }
 function formatItem(item) {
     switch (item.kind) {
-        case 'thinking':
+        case 'text':
             return item.text;
         case 'reasoning':
             return `💭 ${item.text}`;
         case 'tool_call': {
             const desc = item.text || summarizeArgs(item.arguments);
-            return desc ? `🔧 ${item.name}: ${desc}` : `🔧 ${item.name}`;
+            if (!desc)
+                return `🔧 ${item.name}`;
+            // 多行 desc（如 Edit diff）：第一行跟工具名同行，代码块从新行开始
+            if (desc.includes('\n')) {
+                const nlIdx = desc.indexOf('\n');
+                return `🔧 ${item.name}  ${desc.slice(0, nlIdx)}\n${desc.slice(nlIdx + 1)}`;
+            }
+            return `🔧 ${item.name}: ${desc}`;
         }
         case 'tool_result': {
             if (!item.ok) {
                 const errMsg = item.error || (typeof item.result === 'string' ? item.result : '执行失败');
                 return `⚠️ ${item.name}: ${errMsg}`;
             }
-            return item.text ? `✅ ${item.name}: ${item.text}` : `✅ ${item.name}`;
+            return item.text ? `✓ ${item.name}: ${item.text}` : `✓ ${item.name}`;
         }
         case 'progress':
             return `⏳ ${item.text}`;

package/dist/core/message/message-bridge.js

@@ -63,6 +63,8 @@ export class MessageBridge {
         onMessage(async (msg) => {
             try {
                 let content = msg.content.trim();
+                // 渠道入站日志
+                logger.channelIn({ channel: channelName, channelId: msg.channelId, peerId: msg.peerId, peerName: msg.peerName, chatType: msg.chatType, msgId: msg.messageId, threadId: msg.threadId, content, images: msg.images?.length ?? 0, mentions: msg.mentions, replyContext: msg.replyContext });
                 // 0. 自定义消息快速路径（menu.query 等）
                 if (await this.handleCustomPayload(content, channelName, msg, sendReply, adapter))
                     return;
@@ -75,7 +77,10 @@ export class MessageBridge {
                 if (this.cmdHandler.isCommand(cmdContent)) {
                     logger.debug(`[MessageBridge] Command detected: "${cmdContent}", routing to handler`);
                 }
-                if (await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => sendReply(msg.channelId, text, msg.replyContext), msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext))
+                if (await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => {
+                    logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId: `cmd-${msg.messageId || Date.now()}`, payload: { kind: 'command.result', text } });
+                    return sendReply(msg.channelId, text, msg.replyContext);
+                }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext))
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 const chatType = msg.chatType || 'private';
@@ -104,7 +109,7 @@ export class MessageBridge {
                 const owningAgent = this.agentRegistry?.resolveByChannel(channelName);
                 const effectiveProjectPath = owningAgent?.projectPath
                     ?? this.defaultProjectPath;
-                const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, undefined, msg.peerId, chatType, undefined, msg.selfId, msg.channelType || effectiveChannelType);
+                const session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, undefined, msg.peerId, chatType, undefined, msg.selfId, msg.channelType || effectiveChannelType, msg.peerType);
                 // 4. 消息前缀（由 policy 决定）
                 const channelInfo = this.processor.getChannelInfo?.(channelName);
                 if (channelInfo?.policy) {
@@ -128,6 +133,8 @@ export class MessageBridge {
                 };
                 // 5.5 写入消息记录（入方向）
                 const chatDir = this.sessionManager.getChatDir(session);
+                const inboundEncrypt = msg.replyContext?.metadata?.encrypted != null ? !!(msg.replyContext.metadata.encrypted) : undefined;
+                const inboundChatmode = msg.replyContext?.metadata?.chatmode;
                 appendMessageLog(chatDir, buildInboundEntry({
                     from: msg.peerId || 'unknown',
                     to: msg.selfId || 'self',
@@ -138,6 +145,8 @@ export class MessageBridge {
                     replyTo: msg.replyContext?.replyToMessageId ?? null,
                     permMode: session.identity?.role ?? null,
                     timestamp: fullMessage.timestamp,
+                    encrypt: inboundEncrypt,
+                    chatmode: inboundChatmode,
                 }));
                 // 6. ACK + debounce/enqueue
                 //    ACK 在到达时立即做（每条独立 ACK），不等合并

package/dist/core/message/message-log.js

@@ -66,6 +66,8 @@ export function buildInboundEntry(opts) {
         permMode: opts.permMode ?? null,
         cmdParsed: isCommand ? opts.content.split(/\s/)[0] : null,
         durationMs: null,
+        encrypt: opts.encrypt,
+        chatmode: opts.chatmode,
     };
 }
 export function buildOutboundEntry(opts) {
@@ -79,7 +81,7 @@ export function buildOutboundEntry(opts) {
         chatType: opts.chatType,
         groupId: opts.groupId ?? null,
         msgId: opts.msgId ?? null,
-        msgType: 'text',
+        msgType: opts.msgType ?? 'text',
         content: opts.content,
         replyTo: opts.replyTo ?? null,
         agent: opts.agent ?? null,
@@ -87,5 +89,10 @@ export function buildOutboundEntry(opts) {
         permMode: null,
         cmdParsed: null,
         durationMs: opts.durationMs ?? null,
+        numTurns: opts.numTurns ?? null,
+        usage: opts.usage ?? null,
+        encrypt: opts.encrypt,
+        chatmode: opts.chatmode,
+        source: opts.source ?? 'daemon',
     };
 }