evolclaw 3.0.0 → 3.1.0

package/dist/core/channel-loader.js

@@ -89,23 +89,36 @@ export class ChannelLoader {
         }
         return instances;
     }
-    async connectAll(instances, delayMs = 150) {
+    async connectAll(instances, { concurrency = 3, intervalMs = 50 } = {}) {
         const connected = [];
         const failed = [];
+        const inflight = new Set();
         for (const inst of instances) {
-            try {
-                await inst.connect();
-                connected.push(inst.adapter.channelName);
-            }
-            catch (e) {
-                failed.push(e);
+            // 等待并发数降到 concurrency 以下
+            while (inflight.size >= concurrency) {
+                await Promise.race(inflight);
             }
-            if (delayMs > 0 && inst !== instances[instances.length - 1]) {
-                await new Promise(r => setTimeout(r, delayMs));
+            const task = (async () => {
+                try {
+                    await inst.connect();
+                    connected.push(inst.adapter.channelName);
+                }
+                catch (e) {
+                    failed.push({ name: inst.adapter.channelName, error: e });
+                    logger.warn(`[connectAll] ${inst.adapter.channelName} connect failed: ${e}`);
+                }
+            })();
+            const tracked = task.then(() => { inflight.delete(tracked); });
+            inflight.add(tracked);
+            // 间隔发起，避免瞬间并发冲击网关
+            if (intervalMs > 0) {
+                await new Promise(r => setTimeout(r, intervalMs));
             }
         }
+        // 等待所有剩余任务完成
+        await Promise.allSettled(inflight);
         if (failed.length > 0) {
-            logger.warn(`Some channels failed to connect:`, failed);
+            logger.warn(`[connectAll] ${failed.length} channel(s) failed initial connect (will retry in background): ${failed.map(f => f.name).join(', ')}`);
         }
         return connected;
     }

package/dist/core/command-handler.js

@@ -10,6 +10,7 @@ import fs from 'fs';
 import os from 'os';
 import { parseTriggerSet } from './trigger/parser.js';
 import { calcNextFireAt } from './trigger/scheduler.js';
+import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../utils/npm-ops.js';
 const allEfforts = ['low', 'medium', 'high', 'max'];
 const nonMaxEfforts = allEfforts.filter(e => e !== 'max');
 function getAvailableEfforts(agent, model) {
@@ -108,7 +109,7 @@ function formatIdleTime(ms) {
     return '刚刚';
 }
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger'];
+const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger', '/upgrade'];
 // 命令别名映射
 const aliases = {
     '/p': '/project',
@@ -117,7 +118,7 @@ const aliases = {
     '/rw': '/rewind'
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger'];
+const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger', '/upgrade'];
 export class CommandHandler {
     sessionManager;
     messageCache;
@@ -340,7 +341,6 @@ export class CommandHandler {
             return renderCommandCardAsText(card);
         if (!adapter?.send)
             return renderCommandCardAsText(card);
-        // session 忙碌时降级到文本，避免并发触发带参写操作
         if (this.isSessionBusy(opts.interaction.sessionId))
             return renderCommandCardAsText(card);
         try {
@@ -526,7 +526,7 @@ export class CommandHandler {
                             ] } },
                     { cmd: '/dispatch', label: '切换分发模式', desc: '控制群聊消息过滤（仅@提及或广播响应）', next: { type: 'select', items: [
                                 { value: 'mention', label: '@ 提及', desc: '仅在被 @ 提及时响应' },
-                                { value: 'all', label: '广播', desc: '响应群内所有消息' },
+                                { value: 'broadcast', label: '广播', desc: '响应群内所有消息' },
                             ] } },
                 ]
             });
@@ -694,14 +694,14 @@ export class CommandHandler {
             return { data: { mode: arg } };
         }
         if (cmdBase === '/dispatch') {
-            const currentMode = session.metadata?.dispatchMode || 'mention';
+            const currentMode = session.metadata?.dispatchMode;
             if (mode === 'query') {
-                return { data: { mode: currentMode } };
+                return { data: { mode: currentMode ?? null } };
             }
             // update
             if (!arg)
                 return { error: '缺少目标模式' };
-            if (arg !== 'mention' && arg !== 'all')
+            if (arg !== 'mention' && arg !== 'broadcast')
                 return { error: `无效模式: ${arg}` };
             const identity = this.sessionManager.resolveIdentity(channel, userId);
             const chatType = session.chatType || 'private';
@@ -893,7 +893,7 @@ export class CommandHandler {
                 '💬 聊天设置：',
                 '  /activity [all|dm|owner|none] - 查看/控制中间输出显示模式',
                 '  /chatmode [interactive|proactive] - 查看/切换会话模式（被动响应或主动推进）',
-                '  /dispatch [mention|all] - 查看/切换群聊分发模式（仅@响应或广播响应，仅群聊）',
+                '  /dispatch [mention|broadcast] - 查看/切换群聊分发模式（仅@响应或广播响应，仅群聊）',
                 '',
                 '🔐 权限管理：',
                 '  /perm - 查看当前权限模式',
@@ -970,7 +970,7 @@ export class CommandHandler {
             // 聊天设置
             if (isAdmin) {
                 cmds.push({ command: '/chatmode', args: '[interactive|proactive]', description: '查看/切换会话模式（被动响应或主动推进）', category: '聊天设置', roles: ['admin', 'owner'] });
-                cmds.push({ command: '/dispatch', args: '[mention|all]', description: '查看/切换群聊分发模式（仅@响应或广播响应）', category: '聊天设置', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/dispatch', args: '[mention|broadcast]', description: '查看/切换群聊分发模式（仅@响应或广播响应）', category: '聊天设置', roles: ['admin', 'owner'] });
             }
             // 交互
             cmds.push({ command: '/ask', args: '<选项>', description: '回答 Agent 的交互式问题', category: '运维', roles: ['guest', 'admin', 'owner'] });
@@ -1750,7 +1750,7 @@ export class CommandHandler {
             this.eventBus.publish({ type: 'session:chat-mode-changed', sessionId: chatmodeSession.id, mode: arg, timestamp: Date.now() });
             return { kind: 'command.result', text: `✅ 会话模式已切换: ${arg}` };
         }
-        // /dispatch 命令：查看/切换群聊分发模式（mention | all）
+        // /dispatch 命令：查看/切换群聊分发模式（mention | broadcast）
         // 仅群聊可用；群聊中设置需管理员权限
         if (normalizedContent === '/dispatch' || normalizedContent.startsWith('/dispatch ')) {
             const dispatchResult = await this.ensureSession(channel, channelId, threadId, chatType);
@@ -1762,13 +1762,14 @@ export class CommandHandler {
                 return { kind: 'command.error', text: '❌ /dispatch 仅在群聊中可用' };
             }
             const arg = normalizedContent.slice(9).trim();
-            const currentMode = dispatchSession.metadata?.dispatchMode || 'mention';
+            const currentMode = dispatchSession.metadata?.dispatchMode;
             if (!arg) {
+                const displayMode = currentMode ?? '未设置（跟随群设置）';
                 // 尝试发送 CommandCard 卡片
                 if (isAdmin) {
                     const modes = [
                         { key: 'mention', name: '提及模式', desc: '仅当被 @ 提及（含 @all）时响应群消息' },
-                        { key: 'all', name: '广播模式', desc: '群内所有消息都触发响应' },
+                        { key: 'broadcast', name: '广播模式', desc: '群内所有消息都触发响应' },
                     ];
                     const interaction = {
                         type: 'interaction',
@@ -1796,19 +1797,19 @@ export class CommandHandler {
                 }
                 // 降级：文本
                 const lines = [];
-                lines.push(`📋 分发模式: ${currentMode}`);
+                lines.push(`📋 分发模式: ${displayMode}`);
                 lines.push('');
                 lines.push('模式说明：');
-                lines.push('  • mention — 提及模式：仅当被@提及时响应群消息(含@all)');
-                lines.push('  • all     — 广播模式：群内所有消息都触发响应');
+                lines.push('  • mention   — 提及模式：仅当被@提及时响应群消息(含@all)');
+                lines.push('  • broadcast — 广播模式：群内所有消息都触发响应');
                 if (isAdmin) {
                     lines.push('');
-                    lines.push('用法: /dispatch <mention|all>');
+                    lines.push('用法: /dispatch <mention|broadcast>');
                 }
                 return { kind: 'command.result', text: lines.join('\n') };
             }
-            if (arg !== 'mention' && arg !== 'all') {
-                return { kind: 'command.error', text: `❌ 无效模式: ${arg}\n可选: mention / all\n用法: /dispatch <模式>` };
+            if (arg !== 'mention' && arg !== 'broadcast') {
+                return { kind: 'command.error', text: `❌ 无效模式: ${arg}\n可选: mention / broadcast\n用法: /dispatch <模式>` };
             }
             if (!isAdmin) {
                 return { kind: 'command.error', text: '❌ 无权限：群聊中切换分发模式仅限管理员使用' };
@@ -1819,7 +1820,7 @@ export class CommandHandler {
             const metadata = { ...(dispatchSession.metadata || {}), dispatchMode: arg };
             await this.sessionManager.updateSession(dispatchSession.id, { metadata });
             this.eventBus.publish({ type: 'session:dispatch-mode-changed', sessionId: dispatchSession.id, mode: arg, timestamp: Date.now() });
-            return { kind: 'command.result', text: `✅ 分发模式已切换: ${currentMode} → ${arg}` };
+            return { kind: 'command.result', text: `✅ 分发模式已切换: ${currentMode ?? '未设置'} → ${arg}` };
         }
         // /stop 命令：中断当前任务
         if (normalizedContent === '/stop') {
@@ -1970,7 +1971,7 @@ export class CommandHandler {
             }
             const lines = [];
             const sessionMode = session.sessionMode || 'interactive';
-            const dispatchMode = session.metadata?.dispatchMode || 'mention';
+            const dispatchMode = session.metadata?.dispatchMode ?? '未设置（跟随群设置）';
             const chatModeLine = `会话模式: ${sessionMode}`;
             const dispatchModeLine = session.chatType === 'group' ? `分发模式: ${dispatchMode}` : null;
             if (isAdmin) {
@@ -2218,6 +2219,23 @@ export class CommandHandler {
             await executeRestart();
             return { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' };
         }
+        // /upgrade 命令：检查版本更新，提示用户手动重启
+        if (normalizedContent === '/upgrade') {
+            if (!isAdmin)
+                return { kind: 'command.error', text: '❌ 无权限：升级检查仅限管理员使用' };
+            if (isLinkedInstall()) {
+                return { kind: 'command.result', text: '⏭ 开发模式，跳过升级检查' };
+            }
+            const localVer = getLocalVersion();
+            const remoteVer = await checkLatestVersion();
+            if (!remoteVer) {
+                return { kind: 'command.result', text: `⚠️ 无法连接 npm registry（当前版本 ${localVer}）` };
+            }
+            if (compareVersions(localVer, remoteVer) >= 0) {
+                return { kind: 'command.result', text: `✓ 已是最新版本 (${localVer})` };
+            }
+            return { kind: 'command.result', text: `📦 发现新版本 ${localVer} → ${remoteVer}\n执行 /restart 升级` };
+        }
         // /pwd 命令：显示当前项目路径
         if (normalizedContent === '/pwd') {
             // session 现在总是存在（上面已自动创建）
@@ -3256,7 +3274,8 @@ export class CommandHandler {
         '/help', '/status', '/check', '/pwd',
         '/model', '/effort', '/perm', '/agent',
         '/compact', '/file', '/send', '/restart', '/bind', '/aid', '/rpc', '/storage',
-        '/rename', '/name', '/evolagent',
+        '/rename', '/name', '/evolagent', '/trigger',
+        '/chatmode', '/dispatch', '/activity',
     ];
     /** ctl 中仅允许查询形态的指令；写形态（带参）一律拒绝 */
     static CTL_READONLY = new Set(['/agent']);
@@ -3278,6 +3297,8 @@ export class CommandHandler {
         const taskId = this.sessionManager.getActiveTaskId(session.id);
         const chatmode = session.sessionMode || 'interactive';
         const encrypted = this.sessionManager.getSessionEncrypt(session.id);
+        // 诊断日志：记录 task_id 解析结果
+        logger.info(`[CommandHandler] buildCtlReplyContext: sessionId=${session.id} taskId=${taskId ?? 'none'} chatmode=${chatmode} threadId=${ctx.threadId ?? 'none'}`);
         if (taskId || chatmode !== 'interactive' || encrypted != null) {
             ctx.metadata = {};
             if (taskId)
@@ -3294,6 +3315,7 @@ export class CommandHandler {
      * 复用现有 slash cmd 逻辑，权限继承 session 用户角色
      */
     async handleCtl(cmd, sessionId) {
+        logger.info(`[ctl] cmd="${cmd}" sessionId=${sessionId}`);
         // 1. 白名单检查
         const inputCmd = cmd.split(' ')[0];
         if (!CommandHandler.CTL_COMMANDS.includes(inputCmd)) {
@@ -3362,7 +3384,9 @@ export class CommandHandler {
                 return { ok: false, error: `adapter 未找到: ${session.channel}` };
             try {
                 const replyContext = this.buildCtlReplyContext(session);
-                await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: session.channelId, replyContext: replyContext }), { kind: 'result.text', text, isFinal: true });
+                const taskId = replyContext?.metadata?.taskId;
+                const chatmode = replyContext?.metadata?.chatmode ?? 'interactive';
+                await adapter.send(buildEnvelope({ taskId, channel: adapter.channelName, channelId: session.channelId, chatmode, replyContext }), { kind: 'result.text', text, isFinal: true });
                 return { ok: true, result: '已发送' };
             }
             catch (err) {

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,4 +1,5 @@
 import { logger } from '../../utils/logger.js';
+import { summarizeToolInput } from '../permission.js';
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths } from '../../paths.js';
@@ -29,8 +30,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 +76,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,9 +120,9 @@ 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, '');
             }
         }
@@ -106,13 +134,13 @@ export class IMRenderer {
             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;
@@ -241,17 +269,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 +304,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 +318,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 +327,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;
@@ -334,14 +357,14 @@ export class IMRenderer {
         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 payload = { kind: 'activity.batch', items: [item] };
@@ -355,9 +378,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(),
@@ -437,23 +460,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) {

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

@@ -87,5 +87,7 @@ export function buildOutboundEntry(opts) {
         permMode: null,
         cmdParsed: null,
         durationMs: opts.durationMs ?? null,
+        numTurns: opts.numTurns ?? null,
+        usage: opts.usage ?? null,
     };
 }