evolclaw 3.0.0 → 3.1.1

package/dist/channels/aun.js

@@ -6,13 +6,17 @@ import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
-import { resolvePaths, getPackageRoot } from '../paths.js';
+import { resolvePaths, getPackageRoot, agentDir as agentDirPath } from '../paths.js';
 import { saveToUploads, sanitizeFileName } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
+import { appendMessageLog, buildOutboundEntry } from '../core/message/message-log.js';
+import { chatDirPath } from '../core/session/session-fs-store.js';
+import { appendAidLifecycle } from '../aun/aid/identity.js';
 import { loadAgent, saveAgent } from '../config-store.js';
 import { getProcessStartTime } from '../utils/process-introspect.js';
 import * as outbox from '../aun/outbox.js';
 import { guessMime, formatSize } from '../utils/media-cache.js';
+import { PeerIdentityCache } from '../core/relation/peer-identity.js';
 /**
  * 构造 connect extra_info：自描述本进程身份。
  *
@@ -63,8 +67,10 @@ export class AUNChannel {
     traceWriter = null;
     eventBus = null;
     ownerBoundHandler = null;
+    queuedHandler = null;
     pendingEchoMessages = new Map();
     isEchoSending = false;
+    agentDir;
     trace(dir, event, data) {
         if (!this.config.aunTrace)
             return;
@@ -168,7 +174,7 @@ export class AUNChannel {
         const name = cached?.name;
         return name && name !== short ? `${short}(${name})` : short;
     }
-    extractTextPayload(payload, channelId) {
+    extractTextPayload(payload, channelId, senderAid) {
         if (typeof payload === 'string')
             return payload;
         if (payload && typeof payload === 'object') {
@@ -176,21 +182,38 @@ export class AUNChannel {
             const text = typeof obj.text === 'string' ? obj.text : '';
             // action_card_reply：卡片交互回复，触发 interactionCallback，不分发给 agent
             if (obj.type === 'action_card_reply') {
-                const cardMsgId = typeof obj.card_message_id === 'string' ? obj.card_message_id : '';
+                const cardMsgId = typeof obj.ref_message_id === 'string' ? obj.ref_message_id
+                    : typeof obj.card_message_id === 'string' ? obj.card_message_id : '';
                 const cardInfo = cardMsgId ? this.cardMessageIdMap.get(cardMsgId) : undefined;
                 if (cardInfo) {
-                    const actionValue = typeof obj.action_value === 'string' ? obj.action_value : text;
+                    const actionValue = typeof obj.value === 'string' ? obj.value
+                        : typeof obj.action_value === 'string' ? obj.action_value : text;
                     if (cardInfo.isCommandCard) {
                         // CommandCard：action_value 是完整 slash 命令，构造伪入站消息
                         this.cardMessageIdMap.delete(cardMsgId);
                         if (this.messageHandler && actionValue.startsWith('/')) {
                             const chatType = channelId ? (this.isGroupId(channelId) ? 'group' : 'private') : 'private';
+                            // 卡片点击者身份：优先 payload.from / payload.sender_aid / payload.user_id，
+                            // 再 fallback 到外层 senderAid，最后用 cardInfo 中记录的原始命令发起者
+                            const cardClickerAid = (typeof obj.from === 'string' && obj.from)
+                                || (typeof obj.sender_aid === 'string' && obj.sender_aid)
+                                || (typeof obj.user_id === 'string' && obj.user_id)
+                                || senderAid
+                                || cardInfo.initiatorAid
+                                || channelId || '';
+                            // Initiator 校验：群聊中仅卡片发起者可操作（与飞书行为对齐）
+                            if (cardInfo.initiatorAid && cardClickerAid
+                                && cardClickerAid !== cardInfo.initiatorAid
+                                && !this.isGroupId(cardClickerAid)) {
+                                logger.info(`${this.logPrefix()} CommandCard rejected: clicker=${cardClickerAid} initiator=${cardInfo.initiatorAid} mid=${cardMsgId}`);
+                                return '';
+                            }
                             this.messageHandler({
                                 channelId: channelId || '',
                                 chatType,
                                 content: actionValue,
-                                peerId: channelId || '',
-                                peerName: typeof obj.action_label === 'string' ? obj.action_label : undefined,
+                                peerId: cardClickerAid,
+                                peerName: typeof obj.label === 'string' ? obj.label : typeof obj.action_label === 'string' ? obj.action_label : undefined,
                                 messageId: `card-trigger-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
                                 source: 'card-trigger',
                             });
@@ -205,7 +228,7 @@ export class AUNChannel {
                                 type: 'interaction.response',
                                 id: cardInfo.requestId,
                                 action: actionValue,
-                                values: { text, action_label: obj.action_label, behavior: obj.behavior },
+                                values: { text, action_label: obj.label ?? obj.action_label, behavior: obj.behavior },
                             });
                         }
                     }
@@ -216,23 +239,126 @@ export class AUNChannel {
                 // 始终返回空字符串，阻止消息分发给 agent
                 return '';
             }
-            // quote 类型：拼接被引用内容
+            // quote 类型：拼接被引用内容（支持 text / image / file attachments）
             if (obj.type === 'quote' && obj.quote && typeof obj.quote === 'object') {
                 const q = obj.quote;
                 const quotedText = typeof q.text === 'string' ? q.text : '';
-                if (quotedText) {
-                    const sender = typeof q.sender_display === 'string' ? q.sender_display : '';
-                    const prefix = sender ? `${sender}: ` : '';
-                    const quoted = quotedText.split('\n').map(line => `> ${prefix}${line}`).join('\n');
+                const sender = typeof q.sender_display === 'string' ? q.sender_display : '';
+                const prefix = sender ? `${sender}: ` : '';
+                // 构建引用内容：文本 + 附件描述
+                const quoteParts = [];
+                if (quotedText)
+                    quoteParts.push(quotedText);
+                if (Array.isArray(q.attachments)) {
+                    for (const att of q.attachments) {
+                        if (att && typeof att === 'object') {
+                            const ct = typeof att.content_type === 'string' ? att.content_type : '';
+                            const fn = typeof att.filename === 'string' ? att.filename : '';
+                            if (ct.startsWith('image/')) {
+                                quoteParts.push(fn ? `[图片: ${fn}]` : '[图片]');
+                            }
+                            else {
+                                quoteParts.push(fn ? `[文件: ${fn}]` : '[文件]');
+                            }
+                        }
+                    }
+                }
+                if (quoteParts.length > 0) {
+                    const lines = quoteParts.join('\n').split('\n');
+                    const quoted = lines.map((line, i) => `> ${i === 0 ? prefix : ''}${line}`).join('\n');
                     return text ? `${quoted}\n\n${text}` : quoted;
                 }
             }
+            // merge 类型：合并转发消息，展开子消息为可读文本
+            if (obj.type === 'merge') {
+                const title = typeof obj.title === 'string' ? obj.title : '合并转发消息';
+                const parts = [`以下是转发的合并消息「${title}」：\n---`];
+                if (Array.isArray(obj.items)) {
+                    for (const item of obj.items) {
+                        if (item && typeof item === 'object') {
+                            const sender = typeof item.sender_display === 'string' ? item.sender_display : '';
+                            const itemText = typeof item.text === 'string' ? item.text : '';
+                            const itemType = typeof item.type === 'string' ? item.type : '';
+                            // 根据子消息类型构建展示
+                            const lineParts = [];
+                            if (itemText)
+                                lineParts.push(itemText);
+                            // 子消息附件（image/file）
+                            if (Array.isArray(item.attachments)) {
+                                for (const att of item.attachments) {
+                                    if (att && typeof att === 'object') {
+                                        const ct = typeof att.content_type === 'string' ? att.content_type : '';
+                                        const fn = typeof att.filename === 'string' ? att.filename : '';
+                                        if (ct.startsWith('image/') || itemType === 'image') {
+                                            lineParts.push(fn ? `[图片: ${fn}]` : '[图片]');
+                                        }
+                                        else if (ct.startsWith('video/') || itemType === 'video') {
+                                            lineParts.push(fn ? `[视频: ${fn}]` : '[视频]');
+                                        }
+                                        else {
+                                            lineParts.push(fn ? `[文件: ${fn}]` : '[文件]');
+                                        }
+                                    }
+                                }
+                            }
+                            const content = lineParts.join(' ') || `[${itemType || '未知类型'}]`;
+                            parts.push(sender ? `${sender}: ${content}` : content);
+                        }
+                    }
+                }
+                if (typeof obj.summary === 'string' && obj.summary) {
+                    parts.push(`\n[摘要] ${obj.summary}`);
+                }
+                parts.push('---');
+                return parts.join('\n');
+            }
             if (typeof obj.text === 'string')
                 return text;
             return JSON.stringify(payload);
         }
         return '';
     }
+    /** 收集 payload 中所有需要下载的 attachments（顶层 + merge.items + quote.quote），按 url 去重 */
+    collectAllAttachments(payload) {
+        if (!payload || typeof payload !== 'object')
+            return [];
+        const obj = payload;
+        const result = [];
+        const seen = new Set();
+        const add = (att) => {
+            if (!att || typeof att !== 'object')
+                return;
+            const key = att.url || att.object_key || '';
+            if (key && seen.has(key))
+                return;
+            if (key)
+                seen.add(key);
+            result.push(att);
+        };
+        // 顶层 attachments
+        if (Array.isArray(obj.attachments)) {
+            for (const att of obj.attachments)
+                add(att);
+        }
+        // merge.items 中的子消息 attachments
+        if (obj.type === 'merge' && Array.isArray(obj.items)) {
+            for (const item of obj.items) {
+                if (item && typeof item === 'object' && Array.isArray(item.attachments)) {
+                    for (const att of item.attachments)
+                        add(att);
+                }
+            }
+        }
+        // quote.quote 中的 attachments
+        if (obj.type === 'quote' && obj.quote && typeof obj.quote === 'object') {
+            const q = obj.quote;
+            if (Array.isArray(q.attachments)) {
+                for (const att of q.attachments)
+                    add(att);
+            }
+        }
+        return result;
+    }
     hasExplicitMention(text, target) {
         const escaped = target.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
         return new RegExp(`(^|\\s)@${escaped}(?=$|\\s|[.,!?;:，。！？；：]|[\\u4e00-\\u9fff])`).test(text);
@@ -282,31 +408,24 @@ export class AUNChannel {
         }
         return out;
     }
-    buildGroupReplyContext(taskId, senderAid, encrypted) {
-        const replyContext = { metadata: { encrypted } };
+    buildGroupReplyContext(taskId, senderAid, encrypted, messageId, chatmode) {
+        const replyContext = { metadata: { encrypted, chatmode } };
         if (taskId)
             replyContext.threadId = taskId;
         replyContext.peerId = senderAid;
+        if (messageId)
+            replyContext.replyToMessageId = messageId;
         return replyContext;
     }
-    acknowledgeImmediately(messageId, seq) {
-        if (seq != null && this.client) {
-            this.client.call('message.ack', { seq }).catch(e => {
-                logger.debug(`${this.logPrefix()} Immediate ack failed: ${e}`);
-            });
-        }
+    acknowledgeImmediately(messageId, _seq) {
+        // SDK internally manages seq tracking and ack — do not call message.ack RPC directly,
+        // as it corrupts the SDK's seqTracker state and breaks V2 e2ee message pull.
         if (messageId)
             this.messageSeqMap.delete(messageId);
     }
-    shouldEncrypt(peerId) {
-        const cached = this.peerE2ee.get(peerId);
-        if (!cached)
-            return true;
-        if (Date.now() - cached.ts > AUNChannel.E2EE_PROBE_TTL) {
-            this.peerE2ee.delete(peerId);
-            return true;
-        }
-        return cached.ok;
+    shouldEncrypt(_peerId) {
+        // Default to plaintext; only encrypt when session is explicitly marked encrypted
+        return false;
     }
     _aid;
     _selfName; // 本地 agent.md 中的 name，首次 connect 时读取
@@ -318,7 +437,6 @@ export class AUNChannel {
     peerE2ee = new Map();
     static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
     plaintextRecv = 0;
-    sessionModeResolver;
     interactionCallback;
     // action_card message_id → { requestId, isCommandCard }（用于关联 action_card_reply）
     cardMessageIdMap = new Map();
@@ -356,6 +474,7 @@ export class AUNChannel {
     aidStatsCollector;
     constructor(config) {
         this.config = config;
+        this.agentDir = agentDirPath(config.aid);
         if (config.aunTrace) {
             this.traceWriter = new LogWriter({
                 baseName: 'aun',
@@ -579,6 +698,7 @@ export class AUNChannel {
             }
             logger.info(`${this.logPrefix()} Connected as ${this._aid}`);
             appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.client._gatewayUrl });
+            appendAidLifecycle({ ts: Date.now(), iso: new Date().toISOString(), event: 'connected', aid: this.config.aid, gateway: this.client._gatewayUrl });
             // Send welcome message to owner after first connection
             await this.sendWelcomeMessage();
         }
@@ -625,7 +745,7 @@ export class AUNChannel {
             const ownerAidClean = owner.startsWith('@') ? owner.slice(1) : owner;
             const ownerDisplayName = (ownerInfo.name || ownerAidClean.split('.')[0]).slice(0, 12);
             const currentNameMatch = existingFrontmatter.match(/^name:\s*"?([^"\n]+)/m);
-            const currentName = currentNameMatch?.[1]?.trim();
+            const currentName = currentNameMatch?.[1]?.trim().replace(/"$/, '');
             const aidLabel = aidName.split('.')[0];
             let agentDisplayName;
             if (currentName && currentName !== aidLabel) {
@@ -634,13 +754,19 @@ export class AUNChannel {
             else {
                 agentDisplayName = `${ownerDisplayName}的Evol助手 (${aidLabel})`;
             }
+            // Preserve user-provided description (from `agent new --description`), fallback to default
+            const currentDescMatch = existingFrontmatter.match(/^description:\s*"?([^"\n]*)/m);
+            const currentDesc = currentDescMatch?.[1]?.trim().replace(/"$/, '');
+            const agentDescription = currentDesc
+                ? currentDesc
+                : 'EvolClaw AI Agent Gateway - 连接 Claude/Codex 到消息通道';
             // Generate new agent.md (no `initialized` frontmatter — that's now in config.json)
             const newAgentMd = `---
 aid: "${aid}"
 name: "${agentDisplayName}"
 type: "codeagent"
 version: "1.0.0"
-description: "EvolClaw AI Agent Gateway - 连接 Claude/Codex 到消息通道"
+description: "${agentDescription}"
 tags:
   - evolclaw
   - ai-agent
@@ -720,11 +846,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     async downloadAttachment(att, channelId) {
         const ownerAid = att.owner_aid || this._aid || '';
         const objectKey = att.object_key;
-        const filename = att.filename || objectKey.split('/').pop() || 'unknown';
         if (!objectKey) {
             logger.warn(`${this.logPrefix()} Attachment missing object_key, skipping`);
             return null;
         }
+        const filename = att.filename || objectKey.split('/').pop() || 'unknown';
         let downloadUrl;
         try {
             const ticket = await this.callAndTrace('storage.create_download_ticket', {
@@ -802,10 +928,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (this._aid && text.includes(`@${this._aid}`)) {
             mentions.push(this._aid);
         }
-        // Process attachments
-        const rawAttachments = Array.isArray(payload?.attachments)
-            ? payload.attachments
-            : [];
+        // Process attachments (顶层 + 嵌套在 merge.items / quote.quote 中的)
+        const rawAttachments = this.collectAllAttachments(payload);
         let finalText = text;
         if (rawAttachments.length > 0 && this.client) {
             const fileParts = [];
@@ -828,20 +952,40 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // 私聊 channelId = 对端 AID（不再读 payload.chat_id 含 device 三段式）
         // device_id 仅 SDK 内部多实例去重用，evolclaw session 层面跨端共享会话
         const chatId = fromAid;
-        const peerInfo = await this.fetchPeerInfo(fromAid);
+        // 解析对端身份（30天缓存）
+        const peerIdentity = await PeerIdentityCache.resolve('aun', fromAid, this.agentDir, this.client, false);
         const shortAid = this.getShortAid(fromAid);
-        const displayName = peerInfo.name || shortAid;
+        const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
         const p2pPayloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
-        logger.info(`${this.logPrefix()} P2P dispatch decision: mid=${messageId} from=${shortAid}(${displayName}) peerType=${peerInfo.type || 'unknown'} payloadType=${p2pPayloadType} chatId=${chatId} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
+        logger.info(`${this.logPrefix()} P2P dispatch decision: mid=${messageId} from=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${p2pPayloadType} chatId=${chatId} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (p2pPayloadType === 'action_card_reply')
             return;
-        logger.info(`${this.logPrefix()} P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} encrypt=${msgEncrypted} text=${finalText.slice(0, 60)}`);
+        // menu.query：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
+        if (p2pPayloadType === 'menu.query') {
+            this.acknowledgeImmediately(messageId, seq);
+            this.dispatchMessage({
+                channelId: chatId, userId: fromAid,
+                text: JSON.stringify(payload),
+                chatType: 'private', messageId, seq,
+                peerName: displayName || undefined,
+                peerType: peerIdentity.type,
+            });
+            return;
+        }
+        // payload 类型白名单：信号类消息（status / event / thought 等）不进 Agent
+        if (p2pPayloadType && !AUNChannel.PROACTIVE_ALLOW_TYPES.has(p2pPayloadType)) {
+            this.acknowledgeImmediately(messageId, seq);
+            logger.info(`${this.logPrefix()} P2P dropped (type deny): type=${p2pPayloadType} from=${shortAid}(${displayName}) mid=${messageId}`);
+            return;
+        }
+        const msgChatmode = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
+        logger.info(`${this.logPrefix()} P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} encrypt=${msgEncrypted} chatmode=${msgChatmode ?? 'none'} text=${finalText.slice(0, 60)}`);
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_in', aid: this.config.aid, from: fromAid, msgId: messageId, kind: 'text', len: finalText.length });
         const isSystemP2P = p2pPayloadType === 'event';
-        this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P);
-        const replyContext = { metadata: { encrypted: msgEncrypted } };
+        this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P, msgEncrypted, msgChatmode);
+        const replyContext = { metadata: { encrypted: msgEncrypted, chatmode: msgChatmode } };
         if (taskId)
             replyContext.threadId = taskId;
         this.dispatchMessage({
@@ -854,7 +998,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             taskId,
             mentions,
             peerName: displayName || undefined,
-            peerType: peerInfo.type || 'unknown',
+            peerType: peerIdentity.type,
             replyContext,
         });
     }
@@ -865,7 +1009,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const groupId = msg.group_id ?? '';
         const senderAid = msg.sender_aid ?? '';
         const payload = msg.payload ?? '';
-        const text = this.extractTextPayload(payload, groupId);
+        const text = this.extractTextPayload(payload, groupId, senderAid);
         const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
@@ -884,13 +1028,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             logger.debug(`${this.logPrefix()} Group dropped: own message (group=${groupId} mid=${messageId})`);
             return;
         }
-        // 短 echo 快速通道：连通性测试要尽量低延迟，命中后绕过所有 await（sessionModeResolver / 后续 mention 过滤）
+        // 短 echo 快速通道：连通性测试要尽量低延迟，命中后绕过所有 await（后续 mention 过滤）
         {
             const firstLineFast = text.split('\n')[0] || '';
             const hasEvolClawTrace = /\[EvolClaw\.(receive|reply|agent)\]/.test(text);
             if (/echo/i.test(firstLineFast) && firstLineFast.trim().length <= 10 && !hasEvolClawTrace) {
                 this.acknowledgeImmediately(messageId, seq);
                 const msgEncryptedFast = !!(msg.e2ee);
+                const msgChatmodeFast = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
                 const peerInfo = this.peerInfoCached(senderAid);
                 const shortAid = this.getShortAid(senderAid);
                 const displayName = peerInfo?.name || shortAid;
@@ -906,25 +1051,37 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     peerName: displayName,
                     peerType: peerInfo?.type || 'unknown',
                     seq,
-                    replyContext: this.buildGroupReplyContext(undefined, senderAid, msgEncryptedFast),
+                    replyContext: this.buildGroupReplyContext(undefined, senderAid, msgEncryptedFast, messageId, msgChatmodeFast),
                     createdAt,
                 });
                 return;
             }
         }
-        // ── proactive 模式 payload 类型白名单 ──
-        // 仅做类型层面的防噪（task.update / status.ping 等信号类消息不进 Agent）；
-        // mention 过滤统一交给后面的 dispatchMode 一段处理（避免双层语义）。
-        if (this.sessionModeResolver) {
-            const sessionMode = await this.sessionModeResolver(groupId).catch(() => undefined);
-            if (sessionMode === 'proactive') {
-                const payloadObj = (payload && typeof payload === 'object') ? payload : null;
-                const payloadType = payloadObj?.type ?? '';
-                if (!AUNChannel.PROACTIVE_ALLOW_TYPES.has(payloadType)) {
-                    this.acknowledgeImmediately(messageId, seq);
-                    logger.info(`${this.logPrefix()} Group dropped (proactive deny): type=${payloadType} group=${groupId} sender=${senderAid} mid=${messageId}`);
-                    return;
-                }
+        // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
+        {
+            const payloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
+            if (payloadType === 'action_card_reply')
+                return;
+        }
+        // ── payload 类型白名单（所有模式生效） ──
+        // 信号类消息（status / event / thought / task.update 等）不进 Agent
+        {
+            const payloadObj = (payload && typeof payload === 'object') ? payload : null;
+            const payloadType = payloadObj?.type ?? '';
+            // menu.query：自定义消息快速路径
+            if (payloadType === 'menu.query') {
+                this.acknowledgeImmediately(messageId, seq);
+                this.dispatchMessage({
+                    channelId: groupId, userId: senderAid,
+                    text: JSON.stringify(payload),
+                    chatType: 'group', messageId, seq, groupId,
+                });
+                return;
+            }
+            if (payloadType && !AUNChannel.PROACTIVE_ALLOW_TYPES.has(payloadType)) {
+                this.acknowledgeImmediately(messageId, seq);
+                logger.info(`${this.logPrefix()} Group dropped (type deny): type=${payloadType} group=${groupId} sender=${senderAid} mid=${messageId}`);
+                return;
             }
         }
         // 记录入站消息加密状态，透传到出站 ReplyContext
@@ -955,16 +1112,17 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             };
             let echoText = text;
             echoText += `\n${echoTs()} [EvolClaw.receive] from=${senderAid} mid=${messageId} chat=group self=${this._aid || 'unknown'} conn_uptime=${this.connectedAt ? Math.round((Date.now() - this.connectedAt) / 1000) + 's' : 'unknown'}`;
+            const msgChatmodeEcho = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
             this.pendingEchoMessages.set(messageId, {
                 text: echoText,
                 channelId: groupId,
-                context: this.buildGroupReplyContext(undefined, senderAid, msgEncrypted),
+                context: this.buildGroupReplyContext(undefined, senderAid, msgEncrypted, messageId, msgChatmodeEcho),
                 receiveTs: Date.now(),
             });
             // 继续走正常 Agent 流程（下面的代码会 dispatch）
         }
         else if (/echo/i.test(firstLineGroup) && hasEvolClawTraceGroup) {
-            // 回声炸弹：已被 trace 过的 echo，直接丢弃
+            // 回声炸弹：已被任何 EvolClaw 节点 trace 过的 echo，直接丢弃
             this.acknowledgeImmediately(messageId, seq);
             logger.info(`${this.logPrefix()} Group dropped: echo bomb (already-traced group=${groupId} sender=${senderAid} mid=${messageId})`);
             return;
@@ -978,10 +1136,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
         }
         const strippedText = this.stripSelfMentionIfOnly(text, this._aid);
-        // Detect attachments before the empty-text guard
-        const rawAttachments = Array.isArray(payload?.attachments)
-            ? payload.attachments
-            : [];
+        // Detect attachments before the empty-text guard (顶层 + 嵌套)
+        const rawAttachments = this.collectAllAttachments(payload);
         const hasAttachments = rawAttachments.length > 0;
         // Allow through if there's text OR attachments; both-empty messages are silently dropped
         if (!strippedText && !hasAttachments) {
@@ -1012,9 +1168,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 finalText = parts.join('\n\n');
             }
         }
-        const peerInfo = await this.fetchPeerInfo(senderAid);
+        const peerIdentity = await PeerIdentityCache.resolve('aun', senderAid, this.agentDir, this.client, false);
         const shortAid = this.getShortAid(senderAid);
-        const displayName = peerInfo.name || shortAid;
+        const displayName = peerIdentity.name || shortAid;
         // 详细 dispatch 决策日志：记录消息为何被路由到 agent
         const payloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
         const textMentionSelf = this._aid ? this.hasExplicitMention(text, this._aid) : false;
@@ -1026,26 +1182,27 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             : mentionedSelf
                 ? (structMentionSelf ? 'mention.self(struct)' : 'mention.self(text)')
                 : `${dispatchMode}.no-mention`;
-        logger.info(`${this.logPrefix()} Group dispatch decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerInfo.type || 'unknown'} payloadType=${payloadType} dispatchMode=${dispatchMode} reason=${reason} structMentions=${JSON.stringify(payloadMentions)} textMentionSelf=${textMentionSelf} textMentionAll=${textMentionAll} structMentionSelf=${structMentionSelf} structMentionAll=${structMentionAll} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
+        logger.info(`${this.logPrefix()} Group dispatch decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${payloadType} dispatchMode=${dispatchMode} reason=${reason} structMentions=${JSON.stringify(payloadMentions)} textMentionSelf=${textMentionSelf} textMentionAll=${textMentionAll} structMentionSelf=${structMentionSelf} structMentionAll=${structMentionAll} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (payloadType === 'action_card_reply')
             return;
-        logger.info(`${this.logPrefix()} Group dispatched: group=${groupId} sender=${shortAid}(${displayName}) mode=${dispatchMode} mid=${messageId} text=${finalText.slice(0, 60)}`);
+        const msgChatmode = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
+        logger.info(`${this.logPrefix()} Group dispatched: group=${groupId} sender=${shortAid}(${displayName}) mode=${dispatchMode} mid=${messageId} chatmode=${msgChatmode ?? 'none'} text=${finalText.slice(0, 60)}`);
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_in', aid: this.config.aid, from: senderAid, msgId: messageId, kind: 'text', len: finalText.length, groupId });
-        this.aidStatsCollector?.recordInbound(this.config.aid, senderAid, Buffer.byteLength(finalText, 'utf-8'), finalText, payloadType === 'event');
+        this.aidStatsCollector?.recordInbound(this.config.aid, senderAid, Buffer.byteLength(finalText, 'utf-8'), finalText, payloadType === 'event', msgEncrypted, msgChatmode);
         this.dispatchMessage({
             channelId: groupId,
             groupId,
             userId: senderAid,
             peerName: displayName || undefined,
-            peerType: peerInfo.type || 'unknown',
+            peerType: peerIdentity.type,
             text: finalText,
             chatType: 'group',
             messageId,
             seq,
             taskId,
             mentions,
-            replyContext: this.buildGroupReplyContext(taskId, senderAid, msgEncrypted),
+            replyContext: this.buildGroupReplyContext(taskId, senderAid, msgEncrypted, messageId, msgChatmode),
         });
     }
     dispatchMessage(event) {
@@ -1068,7 +1225,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.handleEcho(event);
             return;
         }
-        // 回声炸弹：已被本系统 trace 过的 echo，直接丢弃
+        // 回声炸弹：已被任何 EvolClaw 节点 trace 过的 echo，直接丢弃（防止多 agent 间无限回声）
         if (/echo/i.test(firstLine) && hasEvolClawTracePrivate) {
             logger.info(`${this.logPrefix()} Dropped: echo bomb (already-traced mid=${event.messageId} chat=${event.chatType})`);
             return;
@@ -1258,16 +1415,46 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             const d = data;
             const reason = d.reason ?? '';
             const error = d.error ?? 'unknown';
+            const code = d.code ?? d.detail?.code ?? 0;
+            const detail = (d.detail && typeof d.detail === 'object') ? d.detail : {};
             if (this.intentionalDisconnect)
                 return;
-            // 被踢类（server kicked / close code 4001-4011）→ ERROR + 5min 长退避
-            if (this.isKickReason(reason)) {
-                logger.error(`${this.logPrefix()} Kicked by server: ${reason} (${error}), backing off ${AUNChannel.TAKEOVER_DELAY_MS / 1000}s`);
-                this.setAidStatus('kicked', { lastError: `kicked: ${error}`.slice(0, 80) });
-                this.takeoverReconnect(AUNChannel.TAKEOVER_DELAY_MS, 'kicked');
+            if (this.isKickReason(reason) || code >= 4001) {
+                // @ts-ignore — methods defined below in same class
+                const kickDetail = this.buildKickDetail(code, reason, detail);
+                // @ts-ignore — methods defined below in same class
+                const action = this.classifyKickAction(code);
+                appendAidEvent({
+                    ts: Date.now(), iso: new Date().toISOString(),
+                    event: 'kicked', aid: this.config.aid,
+                    code, reason, action,
+                    evictedBy: kickDetail.evictedBy,
+                    quotaKind: kickDetail.quotaKind,
+                });
+                appendAidLifecycle({
+                    ts: Date.now(), iso: new Date().toISOString(),
+                    event: 'kicked', aid: this.config.aid,
+                    code, reason, action,
+                    evictedBy: kickDetail.evictedBy,
+                    newExtra: kickDetail.newExtra,
+                    quotaKind: kickDetail.quotaKind,
+                });
+                if (action === 'no_retry') {
+                    logger.error(`${this.logPrefix()} Kicked (code=${code}): ${reason} — will NOT retry`);
+                    this.setAidStatus('kicked_no_retry', { lastError: `kicked(${code}): ${reason}`.slice(0, 80), kickDetail });
+                }
+                else if (action === 'retry_once') {
+                    logger.warn(`${this.logPrefix()} Kicked (code=${code}): ${reason} — retrying once after ${AUNChannel.FALLBACK_DELAY_MS / 1000}s`);
+                    this.setAidStatus('kicked', { lastError: `kicked(${code}): ${reason}`.slice(0, 80), kickDetail });
+                    this.takeoverReconnect(AUNChannel.FALLBACK_DELAY_MS, 'kicked');
+                }
+                else {
+                    logger.warn(`${this.logPrefix()} Kicked (code=${code}): ${reason} — retrying after ${AUNChannel.TAKEOVER_DELAY_MS / 1000}s`);
+                    this.setAidStatus('kicked', { lastError: `kicked(${code}): ${reason}`.slice(0, 80), kickDetail });
+                    this.takeoverReconnect(AUNChannel.TAKEOVER_DELAY_MS, 'kicked');
+                }
             }
             else {
-                // 其他 terminal failure（含 max_attempts_exhausted 兜底）→ 1min 后再试
                 logger.error(`${this.logPrefix()} Terminal failure: ${error}${reason ? ` (${reason})` : ''}, retrying in ${AUNChannel.FALLBACK_DELAY_MS / 1000}s`);
                 this.setAidStatus('failed', { lastError: `${error}`.slice(0, 80) });
                 this.takeoverReconnect(AUNChannel.FALLBACK_DELAY_MS, 'terminal');
@@ -1281,11 +1468,58 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const r = reason.toLowerCase();
         if (r.includes('kicked') || r.includes('kick'))
             return true;
-        // close code 4001/4003/4008/4009/4010/4011 都是 SDK _NO_RECONNECT_CODES
-        if (/close code 40(0[13]|0[89]|1[01])/.test(r))
+        if (/close code 40\d{2}/.test(r))
             return true;
         return false;
     }
+    /**
+     * 根据 close code 决定重试策略：
+     * - 'no_retry': 不重试（被挤掉、AID 无效、ACL 拒绝、长连接已存在、配额超限）
+     * - 'retry_once': 重试一次（auth 失败可能 token 刚过期、nonce 无效）
+     * - 'retry_delay': 延迟重试（短连接容量超限、空闲超时）
+     */
+    classifyKickAction(code) {
+        switch (code) {
+            case 4003: // AID 无效
+            case 4009: // 服务端主动踢
+            case 4011: // ACL 拒绝
+            case 4012: // 长连接已存在（自己另一个实例在线）
+            case 4015: // 被新连接挤掉
+                return 'no_retry';
+            case 4001: // auth 失败（token 可能刚过期）
+            case 4010: // nonce 无效
+                return 'retry_once';
+            case 4008: // auth 超时
+            case 4013: // 短连接容量超限
+            case 4014: // 短连接空闲超时
+                return 'retry_delay';
+            default:
+                return 'retry_delay';
+        }
+    }
+    buildKickDetail(code, reason, detail) {
+        const evictedByRaw = detail.evicted_by || detail.new_extra_info;
+        let evictedBy;
+        if (evictedByRaw && typeof evictedByRaw === 'object') {
+            evictedBy = {
+                aid: evictedByRaw.aid,
+                deviceId: evictedByRaw.device_id,
+                slotId: evictedByRaw.slot_id,
+                app: evictedByRaw.app,
+                hostname: evictedByRaw.hostname,
+            };
+        }
+        return {
+            code,
+            reason,
+            ts: Date.now(),
+            evictedBy,
+            quotaKind: detail.quota_kind,
+            limit: detail.limit,
+            selfExtra: detail.self_extra_info,
+            newExtra: detail.new_extra_info,
+        };
+    }
     /**
      * TS 层接管重连：force close 当前 SDK client，安排 delayMs 后重新 initClient。
      * 用于 flap / kicked / terminal_failed 三类场景，统一退避路径。
@@ -1347,7 +1581,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (this.eventBus && this.ownerBoundHandler && typeof this.eventBus.unsubscribe === 'function') {
             this.eventBus.unsubscribe('channel:owner-bound', this.ownerBoundHandler);
         }
+        if (this.eventBus && this.queuedHandler && typeof this.eventBus.unsubscribe === 'function') {
+            this.eventBus.unsubscribe('task:queued', this.queuedHandler);
+        }
         this.ownerBoundHandler = null;
+        this.queuedHandler = null;
         this.eventBus = bus;
         if (bus && typeof bus.subscribe === 'function') {
             const handler = (event) => {
@@ -1365,6 +1603,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             };
             bus.subscribe('channel:owner-bound', handler);
             this.ownerBoundHandler = handler;
+            const queuedHandler = (event) => {
+                if (event.channel !== this.config.channelName)
+                    return;
+                this.sendProcessingStatus(event.channelId, 'queued', '', '', event.replyContext);
+            };
+            bus.subscribe('task:queued', queuedHandler);
+            this.queuedHandler = queuedHandler;
         }
     }
     onProjectPathRequest(provider) {
@@ -1373,9 +1618,6 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     onMessage(handler) {
         this.messageHandler = handler;
     }
-    setSessionModeResolver(resolver) {
-        this.sessionModeResolver = resolver;
-    }
     setDispatchModeResolver(resolver) {
         this.dispatchModeResolver = resolver;
     }
@@ -1392,9 +1634,6 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             await this.flushPendingEcho(channelId);
         }
         let finalText = text;
-        if (context?.title && (this.sentCount.get(channelId) || 0) > 0) {
-            finalText = '最终回复\n' + text;
-        }
         this.sentCount.set(channelId, (this.sentCount.get(channelId) || 0) + 1);
         if (this.isGroupId(channelId) && context?.peerId) {
             if (!finalText.includes(`@${context.peerId}`)) {
@@ -1480,6 +1719,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             payload.task_id = context.metadata.taskId;
         if (context?.metadata?.chatmode)
             payload.chatmode = context.metadata.chatmode;
+        // 诊断日志：记录 payload 构造结果（含 task_id / thread_id / chatmode）
+        logger.info(`${this.logPrefix()} deliverTextEntry: channelId=${channelId} thread_id=${payload.thread_id ?? 'none'} task_id=${payload.task_id ?? 'none'} chatmode=${payload.chatmode ?? 'none'} textLen=${finalText.length}`);
         const isGroup = this.isGroupId(channelId);
         const targetAid = channelId;
         const encryptTarget = isGroup ? channelId : targetAid;
@@ -1491,7 +1732,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (isGroup) {
                 params.group_id = channelId;
                 const result = await this.callAndTrace('group.send', params);
-                if (!result || !result.message_id) {
+                const mid = result?.message?.message_id ?? result?.message_id ?? null;
+                if (!mid) {
                     const dispatchStatus = result?.message_dispatch?.status;
                     if (dispatchStatus === 'debounced' || dispatchStatus === 'dispatched') {
                         logger.info(`${this.logPrefix()} group.send ok (${dispatchStatus}): group=${channelId} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
@@ -1501,9 +1743,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     }
                 }
                 else {
-                    logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
-                    appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: result.message_id, kind: 'text', len: finalText.length, groupId: channelId });
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText);
+                    logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${mid} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
+                    appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
+                    this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true);
                 }
             }
             else {
@@ -1515,7 +1758,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 else {
                     logger.info(`${this.logPrefix()} message.send ok: to=${this.peerLabel(targetAid)} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: targetAid, msgId: result.message_id, kind: 'text', len: finalText.length });
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText);
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
+                    this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false);
                 }
             }
             return true;
@@ -1529,7 +1773,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     if (isGroup) {
                         this.trace('OUT', 'group.send.fallback', params);
                         const result = await this.client.call('group.send', params);
-                        this.trace('OUT', 'group.send.fallback.ok', { message_id: result?.message_id });
+                        this.trace('OUT', 'group.send.fallback.ok', { message_id: result?.message?.message_id ?? result?.message_id });
                         if (!result || !result.message_id) {
                             logger.warn(`${this.logPrefix()} group.send fallback returned no message_id: ${JSON.stringify(result)}`);
                         }
@@ -1557,6 +1801,33 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
         }
     }
+    /** 出站消息写入 messages.jsonl（message.send/group.send/thought.put 成功后调用） */
+    appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text') {
+        try {
+            const sessionsDir = resolvePaths().sessionsDir;
+            const selfId = this.config.aid;
+            const chatDir = chatDirPath(sessionsDir, 'aun', channelId, selfId);
+            const chatmode = context?.metadata?.chatmode;
+            appendMessageLog(chatDir, buildOutboundEntry({
+                from: selfId,
+                to: channelId,
+                chatType: isGroup ? 'group' : 'private',
+                groupId: isGroup ? channelId : null,
+                msgId,
+                content: text,
+                replyTo: null,
+                agent: null,
+                model: null,
+                durationMs: null,
+                encrypt,
+                chatmode,
+                msgType,
+            }));
+        }
+        catch (e) {
+            logger.debug(`${this.logPrefix()} appendOutboundJsonl failed: ${e}`);
+        }
+    }
     /**
      * 发送 thought 内容（Proactive 模式可观测）
      * 群聊：调用 group.thought.put
@@ -1583,15 +1854,28 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         try {
             const itemCount = Array.isArray(payload?.items) ? payload.items.length : 0;
             const stage = payload?.stage ?? `items=${itemCount}`;
+            // 提取 thought 文本（取最后一项的 text 或 content 字段）
+            const items = payload?.items;
+            let thoughtText;
+            if (Array.isArray(items) && items.length > 0) {
+                const lastItem = items[items.length - 1];
+                thoughtText = lastItem?.text || lastItem?.content || (typeof lastItem === 'string' ? lastItem : undefined);
+            }
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
-                await this.callAndTrace('group.thought.put', params);
-                logger.info(`${this.logPrefix()} thought.put ok group=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt}`);
+                const putRes = await this.callAndTrace('group.thought.put', params);
+                const tid = putRes?.thought_id;
+                logger.info(`${this.logPrefix()} thought.put ok group=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
+                this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
+                // thought jsonl 写入已改为按 LLM 调用次数统计（在 complete 事件处写入），此处不再写
             }
             else {
                 params.to = targetId;
-                await this.callAndTrace('message.thought.put', params);
-                logger.info(`${this.logPrefix()} thought.put ok p2p=${this.peerLabel(targetId)} task=${taskId} stage=${stage} encrypt=${encrypt}`);
+                const putRes = await this.callAndTrace('message.thought.put', params);
+                const tid = putRes?.thought_id;
+                logger.info(`${this.logPrefix()} thought.put ok p2p=${this.peerLabel(targetId)} task=${taskId} stage=${stage} encrypt=${encrypt} tid=${tid ?? '?'}`);
+                this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
+                // thought jsonl 写入已改为按 LLM 调用次数统计（在 complete 事件处写入），此处不再写
             }
         }
         catch (e) {
@@ -1622,8 +1906,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (isGroup) {
                 params.group_id = channelId;
                 const result = await this.callAndTrace('group.send', params);
-                logger.info(`${this.logPrefix()} group.send (${payload.type}) ok: group=${channelId} mid=${result?.message_id} encrypt=${encrypt}`);
-                return result?.message_id ?? null;
+                const mid = result?.message?.message_id ?? result?.message_id ?? null;
+                logger.info(`${this.logPrefix()} group.send (${payload.type}) ok: group=${channelId} mid=${mid} encrypt=${encrypt}`);
+                return mid;
             }
             else {
                 params.to = targetAid;
@@ -1750,8 +2035,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     params.group_id = channelId;
                     this.trace('OUT', 'group.send.file', params);
                     const result = await this.client.call('group.send', params);
-                    this.trace('OUT', 'group.send.file.ok', { message_id: result?.message_id });
-                    if (!result || !result.message_id) {
+                    const fileMid = result?.message?.message_id ?? result?.message_id;
+                    this.trace('OUT', 'group.send.file.ok', { message_id: fileMid });
+                    if (!fileMid) {
                         logger.warn(`${this.logPrefix()} group.send.file returned no message_id: ${JSON.stringify(result)}`);
                     }
                 }
@@ -1777,8 +2063,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     if (isGroup) {
                         this.trace('OUT', 'group.send.file.fallback', params);
                         const result = await this.client.call('group.send', params);
-                        this.trace('OUT', 'group.send.file.fallback.ok', { message_id: result?.message_id });
-                        if (!result || !result.message_id) {
+                        const fbMid = result?.message?.message_id ?? result?.message_id;
+                        this.trace('OUT', 'group.send.file.fallback.ok', { message_id: fbMid });
+                        if (!fbMid) {
                             logger.warn(`${this.logPrefix()} group.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
                         }
                     }
@@ -1845,35 +2132,20 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // to avoid duplicate "已送达" at the sender CLI
         this.messageSeqMap.delete(messageId);
     }
-    sendProcessingStatus(channelId, status, sessionId, taskId, context) {
+    sendProcessingStatus(channelId, status, sessionId, taskId, context, extraMeta) {
         if (status === 'start')
             this.sentCount.delete(channelId); // 新任务开始，重置计数
         if (!this.client || !this.connected)
             return;
-        // 旧路 payload（type='event', event='task.*'）—— 前后兼容保留，未来废弃
-        const eventMap = {
-            start: 'task.started',
-            done: 'task.completed',
-            interrupted: 'task.interrupted',
-            error: 'task.error',
-            timeout: 'task.timeout',
-        };
         const severity = status === 'error' || status === 'timeout' ? 'error' : 'info';
-        const eventPayload = {
-            type: 'event',
-            event: eventMap[status] ?? `task.${status}`,
-            data: { task_id: taskId, session_id: sessionId },
-            severity,
-        };
-        if (context?.threadId)
-            eventPayload.thread_id = context.threadId;
-        // 新路 payload（type='status'）—— 结构化任务状态，下游直接读字段不用解析 event 字符串
         const stateMap = {
             start: 'started',
             done: 'completed',
             interrupted: 'interrupted',
             error: 'error',
             timeout: 'timeout',
+            queued: 'queued',
+            progress: 'progress',
         };
         const statusPayload = {
             type: 'status',
@@ -1881,15 +2153,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             task_id: taskId,
             session_id: sessionId,
             severity,
+            ...(extraMeta && Object.keys(extraMeta).length > 0 && { metadata: extraMeta }),
         };
         if (context?.threadId)
             statusPayload.thread_id = context.threadId;
+        if (context?.peerId)
+            statusPayload.initiator = context.peerId;
+        if (context?.replyToMessageId)
+            statusPayload.ref_message_id = context.replyToMessageId;
         const isGroup = this.isGroupId(channelId);
         // 私聊 channelId = 对端 AID（不含 device_id）
         const statusTargetAid = channelId;
         const encryptTarget = isGroup ? channelId : statusTargetAid;
-        // 计算 encrypt 标志（每次调用读最新 peerE2ee 状态，
-        // 这样第二条 send 能受益于第一条触发的 peerE2ee 标记）
         const computeEncrypt = () => context?.metadata?.encrypted != null
             ? !!(context.metadata.encrypted)
             : this.shouldEncrypt(encryptTarget);
@@ -1922,17 +2197,15 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             });
         };
         const method = isGroup ? 'group.send' : 'message.send';
-        // 串行：等第一条完成（或失败更新 peerE2ee 标记）后再发第二条，
-        // 保证两路 payload 到达顺序（event 在前，status 在后）+ 第二条能用最新 encrypt 状态
-        sendOne(method, eventPayload, 'event')
-            .then(() => sendOne(method, statusPayload, 'status'));
-        // 统计为系统消息（按两条独立消息分别记账）
-        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, JSON.stringify(eventPayload).length, undefined, true);
+        sendOne(method, statusPayload, 'status');
         this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, JSON.stringify(statusPayload).length, undefined, true);
         // 群聊显示 group id 简称，P2P 显示 peer label；从 context.metadata 读取 chatmode
         const targetLabel = this.isGroupId(channelId) ? channelId : this.peerLabel(channelId);
         const chatmode = context?.metadata?.chatmode ?? '?';
-        logger.info(`${this.logPrefix()} task.${status} task=${taskId} session=${sessionId} chatmode=${chatmode} target=${targetLabel}`);
+        const initiator = statusPayload.initiator ?? '';
+        const refMsgId = statusPayload.ref_message_id ?? '';
+        const metaStr = statusPayload.metadata ? ` meta=${JSON.stringify(statusPayload.metadata)}` : '';
+        logger.info(`${this.logPrefix()} task.${status} task=${taskId} session=${sessionId} chatmode=${chatmode} target=${targetLabel} initiator=${initiator} ref_msg=${refMsgId}${metaStr}`);
     }
     sendCustomPayload(channelId, payload) {
         if (!this.client || !this.connected)
@@ -1980,6 +2253,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }
         this.connected = false;
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'disconnected', aid: this.config.aid, reason: 'intentional' });
+        appendAidLifecycle({ ts: Date.now(), iso: new Date().toISOString(), event: 'disconnected', aid: this.config.aid, reason: 'intentional' });
         this.setAidStatus('disabled');
         if (this.traceWriter) {
             this.traceWriter.close();
@@ -2159,7 +2433,7 @@ export class AUNChannelPlugin {
                         case 'result.error': {
                             const sendCtx = { ...(ctx ?? {}) };
                             if (payload.kind === 'result.text' && payload.isFinal)
-                                sendCtx.title = '✓ 最终回复:';
+                                sendCtx.title = '✅ 最终回复:';
                             await channel.sendMessage(channelId, payload.text, sendCtx);
                             return;
                         }
@@ -2186,16 +2460,26 @@ export class AUNChannelPlugin {
                             };
                             if (ctx?.threadId)
                                 aunPayload.thread_id = ctx.threadId;
-                            // 双发：thought.put（前端实时渲染） + message.send（消息历史持久化）
-                            await Promise.all([
-                                channel.sendThought(channelId, envelope.taskId, aunPayload, ctx),
-                                channel.sendStructured(channelId, aunPayload, ctx),
-                            ]);
+                            if (envelope.chatmode === 'proactive') {
+                                await channel.sendThought(channelId, envelope.taskId, aunPayload, ctx);
+                            }
+                            else {
+                                await Promise.all([
+                                    channel.sendThought(channelId, envelope.taskId, aunPayload, ctx),
+                                    channel.sendStructured(channelId, aunPayload, ctx),
+                                ]);
+                            }
                             return;
                         }
+                        case 'status.progress':
+                            channel.sendProcessingStatus(channelId, 'progress', envelope.taskId, envelope.taskId, ctx, payload.metadata);
+                            return;
                         case 'status.started':
                             channel.sendProcessingStatus(channelId, 'start', envelope.taskId, envelope.taskId, ctx);
                             return;
+                        case 'status.queued':
+                            channel.sendProcessingStatus(channelId, 'queued', envelope.taskId, envelope.taskId, ctx);
+                            return;
                         case 'status.completed':
                             channel.sendProcessingStatus(channelId, 'done', envelope.taskId, envelope.taskId, ctx);
                             return;
@@ -2215,7 +2499,6 @@ export class AUNChannelPlugin {
                                 const aunCard = {
                                     type: 'action_card',
                                     title: action.title,
-                                    description: action.body,
                                     actions: action.buttons.map(btn => ({
                                         label: btn.label,
                                         value: btn.key,
@@ -2223,6 +2506,8 @@ export class AUNChannelPlugin {
                                         behavior: 'reply',
                                     })),
                                 };
+                                if (action.body)
+                                    aunCard.description = action.body;
                                 if (ctx?.threadId)
                                     aunCard.thread_id = ctx.threadId;
                                 const msgId = await channel.sendStructured(channelId, aunCard, ctx);
@@ -2236,7 +2521,6 @@ export class AUNChannelPlugin {
                                 const aunCard = {
                                     type: 'action_card',
                                     title: card.title,
-                                    description: card.body,
                                     actions: card.buttons.map(btn => ({
                                         label: btn.label,
                                         value: btn.command,
@@ -2244,11 +2528,13 @@ export class AUNChannelPlugin {
                                         behavior: 'reply',
                                     })),
                                 };
+                                if (card.body)
+                                    aunCard.description = card.body;
                                 if (ctx?.threadId)
                                     aunCard.thread_id = ctx.threadId;
                                 const msgId = await channel.sendStructured(channelId, aunCard, ctx);
                                 if (msgId) {
-                                    channel.cardMessageIdMap.set(msgId, { requestId: req.id, isCommandCard: true });
+                                    channel.cardMessageIdMap.set(msgId, { requestId: req.id, isCommandCard: true, initiatorAid: req.initiatorId });
                                     setTimeout(() => channel.cardMessageIdMap.delete(msgId), 20 * 60 * 1000);
                                 }
                             }
@@ -2323,6 +2609,7 @@ export class AUNChannelPlugin {
                             chatType: opts.chatType || 'private',
                             peerId: opts.peerId || '',
                             peerName: opts.peerName,
+                            peerType: opts.peerType,
                             messageId: opts.messageId,
                             mentions: opts.mentions,
                             threadId: opts.threadId,
@@ -2345,12 +2632,6 @@ export class AUNChannelPlugin {
                             });
                         });
                     }
-                    if (typeof channel.setSessionModeResolver === 'function') {
-                        channel.setSessionModeResolver(async (channelId) => {
-                            const session = await ctx.sessionManager.getActiveSession(adapter.channelName, channelId);
-                            return session?.sessionMode;
-                        });
-                    }
                     if (typeof channel.setDispatchModeResolver === 'function') {
                         channel.setDispatchModeResolver(async (channelId) => {
                             const session = await ctx.sessionManager.getActiveSession(adapter.channelName, channelId);