evolclaw 2.7.3 → 2.8.1

package/dist/channels/aun.js

@@ -35,16 +35,45 @@ export class AUNChannel {
     recallHandler;
     connected = false;
     traceStream = null;
-    traceDate = ''; // 当前 trace 文件对应的日期 (YYYYMMDD)
+    traceHourTag = ''; // 当前 trace 文件对应的小时标识 (YYYYMMDD-HH)
     trace(dir, event, data) {
         if (!this.config.aunTrace)
             return;
         this.rotateTraceIfNeeded();
         if (!this.traceStream)
             return;
-        const line = JSON.stringify({ ts: localTimestamp(), dir, event, data });
+        // 自动从 data 推断顶层字段（self_aid / peer_aid / group_id / task_id / chatmode），
+        // 便于 jq 过滤：`jq 'select(.task_id == "task-xxx")'`
+        const d = (data && typeof data === 'object') ? data : {};
+        const payload = d.payload ?? {};
+        const topContext = {
+            self_aid: this._aid ?? this.config.aid,
+        };
+        // peer / group 识别
+        const peerAid = d.to ?? d.from ?? d.sender_aid ?? payload.to;
+        if (peerAid)
+            topContext.peer_aid = peerAid;
+        const groupId = d.group_id ?? payload.group_id;
+        if (groupId)
+            topContext.group_id = groupId;
+        // task_id / chatmode（message.send / thought.put / status 都可能有）
+        const taskId = payload.task_id ?? d.context?.id ?? d.data?.task_id;
+        if (taskId)
+            topContext.task_id = taskId;
+        const chatmode = payload.chatmode;
+        if (chatmode)
+            topContext.chatmode = chatmode;
+        const line = JSON.stringify({ ts: localTimestamp(), dir, event, ...topContext, data });
         this.traceStream.write(line + '\n');
     }
+    /** 日志前缀（含 self aid 简称，多实例可识别） */
+    logPrefix() {
+        const aid = this._aid ?? this.config.aid;
+        if (!aid)
+            return '[AUN]';
+        const short = aid.split('.')[0] || aid;
+        return `[AUN ${short}]`;
+    }
     /**
      * 统一的 RPC 调用包装：自动记录 OUT 发送、.ok 结果、.error 错误（含 trace + evolclaw.log 失败日志）。
      * 所有 client.call() 都应通过此方法调用，保证 aun-trace 里每个 OUT 调用都有"发+收/错"成对记录。
@@ -68,22 +97,43 @@ export class AUNChannel {
                 code: e?.code,
                 name: e?.name,
             });
-            logger.warn(`[AUN] rpc ${method} failed: ${e?.name ?? ''}(${e?.code ?? ''}) ${e?.message ?? e}`);
+            logger.warn(`${this.logPrefix()} rpc ${method} failed: ${e?.name ?? ''}(${e?.code ?? ''}) ${e?.message ?? e}`);
             throw e;
         }
     }
+    static AUN_TRACE_RE = /^aun-\d{8}-\d{2}\.log$/;
+    static AUN_RETAIN_HOURS = 12;
     rotateTraceIfNeeded() {
         const d = new Date();
-        const today = `${d.getFullYear()}${String(d.getMonth() + 1).padStart(2, '0')}${String(d.getDate()).padStart(2, '0')}`;
-        if (this.traceDate === today && this.traceStream)
+        const pad = (n) => String(n).padStart(2, '0');
+        const hourTag = `${d.getFullYear()}${pad(d.getMonth() + 1)}${pad(d.getDate())}-${pad(d.getHours())}`;
+        if (this.traceHourTag === hourTag && this.traceStream)
             return;
         if (this.traceStream) {
             this.traceStream.end();
             this.traceStream = null;
         }
-        this.traceDate = today;
-        const logPath = path.join(resolvePaths().logs, `aun-${today}.log`);
+        this.traceHourTag = hourTag;
+        const logPath = path.join(resolvePaths().logs, `aun-${hourTag}.log`);
         this.traceStream = fs.createWriteStream(logPath, { flags: 'a' });
+        this.cleanupOldTraceLogs();
+    }
+    cleanupOldTraceLogs() {
+        const logsDir = resolvePaths().logs;
+        const cutoff = Date.now() - AUNChannel.AUN_RETAIN_HOURS * 60 * 60 * 1000;
+        try {
+            for (const name of fs.readdirSync(logsDir)) {
+                if (!AUNChannel.AUN_TRACE_RE.test(name))
+                    continue;
+                try {
+                    const full = path.join(logsDir, name);
+                    if (fs.statSync(full).mtimeMs < cutoff)
+                        fs.unlinkSync(full);
+                }
+                catch { }
+            }
+        }
+        catch { }
     }
     /** 判断 channelId 是否为群组 ID
      *  - 新格式：group.{issuer}/{group_no|group_name}
@@ -104,6 +154,18 @@ export class AUNChannel {
             return undefined;
         return trimmed.split('.')[0] || trimmed;
     }
+    /** 同步获取对端显示名（仅从缓存，不触发网络请求）。用于日志中补充对端标识。
+     *  返回 `shortAid(displayName)` 或 `shortAid`，若 aid 为空返回 '?'
+     */
+    peerLabel(aid) {
+        if (!aid)
+            return '?';
+        const bareAid = aid.includes(':') ? aid.substring(0, aid.indexOf(':')) : aid;
+        const short = this.getShortAid(bareAid) ?? bareAid;
+        const cached = this.peerInfoCache.get(bareAid);
+        const name = cached?.name;
+        return name && name !== short ? `${short}(${name})` : short;
+    }
     extractTextPayload(payload) {
         if (typeof payload === 'string')
             return payload;
@@ -131,8 +193,41 @@ export class AUNChannel {
             .replace(/[ \t]+/g, ' ')
             .trim();
     }
-    buildGroupReplyContext(taskId, senderAid) {
-        const replyContext = {};
+    extractMentionAids(mentions) {
+        const aids = [];
+        for (const m of mentions) {
+            if (typeof m === 'string')
+                aids.push(m);
+            else if (m && typeof m === 'object' && typeof m.aid === 'string')
+                aids.push(m.aid);
+        }
+        return aids;
+    }
+    hasMentionAll(mentions) {
+        for (const m of mentions) {
+            if (m === 'all')
+                return true;
+            if (m && typeof m === 'object' && m.scope === 'all')
+                return true;
+        }
+        return false;
+    }
+    /** 从正文提取 @aid（AID 格式：至少三段域名），用于出站填充 payload.mentions */
+    static MENTION_AID_RE = /@([a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?){2,})/g;
+    extractMentionAidsFromText(text) {
+        const out = [];
+        const seen = new Set();
+        for (const m of text.matchAll(AUNChannel.MENTION_AID_RE)) {
+            const aid = m[1];
+            if (!seen.has(aid)) {
+                seen.add(aid);
+                out.push(aid);
+            }
+        }
+        return out;
+    }
+    buildGroupReplyContext(taskId, senderAid, encrypted) {
+        const replyContext = { metadata: { encrypted } };
         if (taskId)
             replyContext.threadId = taskId;
         replyContext.peerId = senderAid;
@@ -141,7 +236,7 @@ export class AUNChannel {
     acknowledgeImmediately(messageId, seq) {
         if (seq != null && this.client) {
             this.client.call('message.ack', { seq }).catch(e => {
-                logger.debug(`[AUN] Immediate ack failed: ${e}`);
+                logger.debug(`${this.logPrefix()} Immediate ack failed: ${e}`);
             });
         }
         if (messageId)
@@ -167,6 +262,11 @@ export class AUNChannel {
     peerE2ee = new Map();
     static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
     plaintextRecv = 0;
+    sessionModeResolver;
+    static PROACTIVE_ALLOW_TYPES = new Set([
+        'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
+        'merge', 'link', 'location', 'personal_card',
+    ]);
     // Reconnect state (TS-layer fallback, on top of SDK auto_reconnect)
     intentionalDisconnect = false;
     reconnectAttempt = 0;
@@ -183,7 +283,7 @@ export class AUNChannel {
         this.config = config;
         if (config.aunTrace) {
             this.rotateTraceIfNeeded();
-            logger.info(`[AUN] Trace logging enabled (daily rotation): ${resolvePaths().logs}/aun-YYYYMMDD.log`);
+            logger.info(`${this.logPrefix()} Trace logging enabled (hourly rotation, 12h retention): ${resolvePaths().logs}/aun-YYYYMMDD-HH.log`);
         }
     }
     async connect() {
@@ -216,17 +316,17 @@ export class AUNChannel {
             try {
                 const discovery = new GatewayDiscovery({});
                 gateway = await discovery.discover(wellKnownUrl);
-                logger.info(`[AUN] Gateway discovered: ${gateway}`);
+                logger.info(`${this.logPrefix()} Gateway discovered: ${gateway}`);
             }
             catch (e) {
-                logger.warn(`[AUN] Well-known discovery failed (${e}), no fallback available`);
+                logger.warn(`${this.logPrefix()} Well-known discovery failed (${e}), no fallback available`);
             }
         }
         if (!gateway) {
-            logger.error('[AUN] Cannot resolve gateway URL from AID');
+            logger.error(`${this.logPrefix()} Cannot resolve gateway URL from AID`);
             throw new Error('Cannot resolve gateway URL from AID');
         }
-        logger.info(`[AUN] Initializing: aid=${aidName}, gateway=${gateway}, aun_path=${aunPath}`);
+        logger.info(`${this.logPrefix()} Initializing: aid=${aidName}, gateway=${gateway}, aun_path=${aunPath}`);
         // Create client with FileSecretStore (AES-256-GCM)
         // 不传 encryption_seed 时，SDK 自动从 {aun_path}/.seed 文件派生密钥（与 aun_cli.py 对齐）
         const rootCaPath = path.join(aunPath, 'CA', 'root', 'root.crt');
@@ -242,14 +342,14 @@ export class AUNChannel {
             this.trace('IN', 'message.received', data);
             const kind = (data && typeof data === 'object') ? data.kind ?? '' : '';
             const keys = (data && typeof data === 'object') ? Object.keys(data).join(',') : typeof data;
-            logger.debug(`[AUN][DIAG] message.received: kind=${kind} keys=${keys}`);
+            logger.debug(`${this.logPrefix()}[DIAG] message.received: kind=${kind} keys=${keys}`);
             this.handleIncomingPrivateMessage(data);
         });
         this.client.on('group.message_created', (data) => {
             this.trace('IN', 'group.message_created', data);
             const gid = (data && typeof data === 'object') ? data.group_id ?? '' : '';
             const sender = (data && typeof data === 'object') ? data.sender_aid ?? '' : '';
-            logger.debug(`[AUN][DIAG] group.message_created: group_id=${gid} sender=${sender}`);
+            logger.debug(`${this.logPrefix()}[DIAG] group.message_created: group_id=${gid} sender=${sender}`);
             this.handleIncomingGroupMessage(data);
         });
         this.client.on('connection.state', (data) => {
@@ -263,7 +363,7 @@ export class AUNChannel {
                 if (Array.isArray(ids)) {
                     for (const id of ids) {
                         if (typeof id === 'string') {
-                            logger.info(`[AUN] Message recalled: ${id}`);
+                            logger.info(`${this.logPrefix()} Message recalled: ${id}`);
                             this.recallHandler?.(id);
                         }
                     }
@@ -273,12 +373,12 @@ export class AUNChannel {
         this.client.on('message.undecryptable', (data) => {
             this.trace('IN', 'message.undecryptable', data);
             const d = data;
-            logger.warn(`[AUN] Message undecryptable: from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
+            logger.warn(`${this.logPrefix()} Message undecryptable: from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
         });
         this.client.on('group.message_undecryptable', (data) => {
             this.trace('IN', 'group.message_undecryptable', data);
             const d = data;
-            logger.warn(`[AUN] Group message undecryptable: group=${d.group_id} from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
+            logger.warn(`${this.logPrefix()} Group message undecryptable: group=${d.group_id} from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
         });
         // Authenticate
         // Workaround: SDK 0.3.x _loadIdentityOrRaise doesn't set identity.aid from requested aid,
@@ -295,7 +395,7 @@ export class AUNChannel {
         }
         let accessToken;
         try {
-            logger.info(`[AUN] Authenticating as ${aidName}...`);
+            logger.info(`${this.logPrefix()} Authenticating as ${aidName}...`);
             this.trace('OUT', 'auth.authenticate', { aid: aidName });
             const auth = await this.client.auth.authenticate(aidName ? { aid: aidName } : undefined);
             this.trace('OUT', 'auth.authenticate.ok', { aid: auth.aid, gateway: auth.gateway, hasToken: !!auth.access_token });
@@ -303,23 +403,23 @@ export class AUNChannel {
             accessToken = auth.access_token;
             const resolvedGateway = auth.gateway || gateway;
             this.client._gatewayUrl = resolvedGateway;
-            logger.info(`[AUN] Authenticated as ${auth.aid ?? '?'}, gateway=${resolvedGateway}`);
+            logger.info(`${this.logPrefix()} Authenticated as ${auth.aid ?? '?'}, gateway=${resolvedGateway}`);
         }
         catch (e) {
             const errMsg = e.message || String(e);
             const errName = e.constructor?.name || 'Error';
             this.trace('OUT', 'auth.authenticate.error', { error: errMsg, name: errName });
-            logger.error(`[AUN] Authentication failed (${errName}): ${errMsg}`);
+            logger.error(`${this.logPrefix()} Authentication failed (${errName}): ${errMsg}`);
             if (e.stack)
-                logger.debug(`[AUN] Auth stack: ${e.stack}`);
+                logger.debug(`${this.logPrefix()} Auth stack: ${e.stack}`);
             // Fallback: try direct token from env/config (legacy)
             accessToken = this.config.accessToken || process.env.AUN_ACCESS_TOKEN || '';
             if (!accessToken) {
-                logger.error(`[AUN] No accessToken fallback available, scheduling retry`);
+                logger.error(`${this.logPrefix()} No accessToken fallback available, scheduling retry`);
                 this.scheduleReconnect();
                 throw new Error('Authentication failed and no accessToken fallback available');
             }
-            logger.warn(`[AUN] Using accessToken fallback`);
+            logger.warn(`${this.logPrefix()} Using accessToken fallback`);
         }
         // Connect (SDK auto_reconnect handles transient failures)
         try {
@@ -340,16 +440,16 @@ export class AUNChannel {
                 const cert = clientAny._keystore?.loadCert?.(aidName);
                 if (cert) {
                     clientAny._identity.cert = cert;
-                    logger.info('[AUN] Backfilled identity.cert from keystore for e2ee fingerprint');
+                    logger.info(`${this.logPrefix()} Backfilled identity.cert from keystore for e2ee fingerprint`);
                 }
             }
-            logger.info(`[AUN] Connected as ${this._aid}`);
+            logger.info(`${this.logPrefix()} Connected as ${this._aid}`);
             // Send welcome message to owner after first connection
             await this.sendWelcomeMessage();
         }
         catch (e) {
             this.trace('OUT', 'client.connect.error', { error: String(e) });
-            logger.error(`[AUN] Connection failed: ${e}`);
+            logger.error(`${this.logPrefix()} Connection failed: ${e}`);
             this.scheduleReconnect();
             throw e;
         }
@@ -358,7 +458,7 @@ export class AUNChannel {
         try {
             const owner = this.config.owner;
             if (!owner) {
-                logger.info('[AUN] No owner configured, skipping welcome message');
+                logger.info(`${this.logPrefix()} No owner configured, skipping welcome message`);
                 return;
             }
             // Check agent.md initialized field
@@ -366,25 +466,25 @@ export class AUNChannel {
             const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
             const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
             if (!fs.existsSync(agentMdPath)) {
-                logger.warn('[AUN] agent.md not found, skipping welcome message');
+                logger.warn(`${this.logPrefix()} agent.md not found, skipping welcome message`);
                 return;
             }
             const agentMdContent = fs.readFileSync(agentMdPath, 'utf-8');
             const match = agentMdContent.match(/^---\n([\s\S]*?)\n---/);
             if (!match) {
-                logger.warn('[AUN] agent.md frontmatter not found');
+                logger.warn(`${this.logPrefix()} agent.md frontmatter not found`);
                 return;
             }
             const frontmatter = match[1];
             const initializedMatch = frontmatter.match(/^initialized:\s*(true|false)/m);
             if (!initializedMatch || initializedMatch[1] === 'true') {
-                logger.info('[AUN] Agent already initialized, skipping welcome message');
+                logger.info(`${this.logPrefix()} Agent already initialized, skipping welcome message`);
                 return;
             }
             // Fetch owner's agent.md to derive name and validate type
             const ownerInfo = await this.fetchPeerInfo(owner);
             if (ownerInfo.type !== null && ownerInfo.type !== 'human') {
-                logger.warn(`[AUN] Owner ${owner} type is "${ownerInfo.type}" (not human). Consider using a human AID as owner.`);
+                logger.warn(`${this.logPrefix()} Owner ${owner} type is "${ownerInfo.type}" (not human). Consider using a human AID as owner.`);
             }
             // Name: prefer existing agent.md name if user has customized it,
             // otherwise generate "{ownerName}的Evol助手 ({aidLabel})" for disambiguation
@@ -428,14 +528,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 `;
             // Write locally
             fs.writeFileSync(agentMdPath, newAgentMd, 'utf-8');
-            logger.info('[AUN] Updated agent.md with initialized=true');
+            logger.info(`${this.logPrefix()} Updated agent.md with initialized=true`);
             // Publish to AUN network via auth.uploadAgentMd
             try {
                 await this.client.auth.uploadAgentMd(newAgentMd);
-                logger.info('[AUN] Published agent.md to AUN network');
+                logger.info(`${this.logPrefix()} Published agent.md to AUN network`);
             }
             catch (e) {
-                logger.warn(`[AUN] Failed to publish agent.md: ${e}`);
+                logger.warn(`${this.logPrefix()} Failed to publish agent.md: ${e}`);
             }
             // Send welcome message
             const welcomeText = `🎉 欢迎使用 EvolClaw！
@@ -463,7 +563,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             // pull if the initial E2EE push still arrives before the cert resolves.
             await new Promise(resolve => setTimeout(resolve, 3000));
             if (!this.client) {
-                logger.warn('[AUN] Client disconnected before welcome message could be sent');
+                logger.warn(`${this.logPrefix()} Client disconnected before welcome message could be sent`);
                 return;
             }
             await this.callAndTrace('message.send', {
@@ -472,10 +572,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 encrypt: true,
                 persist_required: true,
             });
-            logger.info(`[AUN] Welcome message sent to owner: ${owner}`);
+            logger.info(`${this.logPrefix()} Welcome message sent to owner: ${owner}`);
         }
         catch (e) {
-            logger.warn(`[AUN] Failed to send welcome message: ${e}`);
+            logger.warn(`${this.logPrefix()} Failed to send welcome message: ${e}`);
         }
     }
     // ── Event handlers ──────────────────────────────────────────
@@ -484,7 +584,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const objectKey = att.object_key;
         const filename = att.filename || objectKey.split('/').pop() || 'unknown';
         if (!objectKey) {
-            logger.warn('[AUN] Attachment missing object_key, skipping');
+            logger.warn(`${this.logPrefix()} Attachment missing object_key, skipping`);
             return null;
         }
         let downloadUrl;
@@ -495,32 +595,32 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             });
             downloadUrl = ticket.download_url || '';
             if (!downloadUrl) {
-                logger.warn(`[AUN] No download_url for attachment: ${filename}`);
+                logger.warn(`${this.logPrefix()} No download_url for attachment: ${filename}`);
                 return null;
             }
         }
         catch (e) {
-            logger.warn(`[AUN] create_download_ticket failed for ${filename}: ${e}`);
+            logger.warn(`${this.logPrefix()} create_download_ticket failed for ${filename}: ${e}`);
             return null;
         }
         let buffer;
         try {
             const res = await fetch(downloadUrl);
             if (!res.ok) {
-                logger.warn(`[AUN] Download failed for ${filename}: HTTP ${res.status}`);
+                logger.warn(`${this.logPrefix()} Download failed for ${filename}: HTTP ${res.status}`);
                 return null;
             }
             buffer = Buffer.from(await res.arrayBuffer());
         }
         catch (e) {
-            logger.warn(`[AUN] Download error for ${filename}: ${e}`);
+            logger.warn(`${this.logPrefix()} Download error for ${filename}: ${e}`);
             return null;
         }
         if (att.sha256) {
             const { createHash } = await import('node:crypto');
             const actual = createHash('sha256').update(buffer).digest('hex');
             if (actual !== att.sha256) {
-                logger.warn(`[AUN] SHA256 mismatch for ${filename}: expected ${att.sha256.slice(0, 8)}… got ${actual.slice(0, 8)}…`);
+                logger.warn(`${this.logPrefix()} SHA256 mismatch for ${filename}: expected ${att.sha256.slice(0, 8)}… got ${actual.slice(0, 8)}…`);
                 return null;
             }
         }
@@ -529,11 +629,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             : process.cwd();
         try {
             const result = saveToUploads(buffer, filename, projectPath);
-            logger.info(`[AUN] Saved attachment: ${result.filePath} (${result.size} bytes)`);
+            logger.info(`${this.logPrefix()} Saved attachment: ${result.filePath} (${result.size} bytes)`);
             return result.filePath;
         }
         catch (e) {
-            logger.warn(`[AUN] saveToUploads failed for ${filename}: ${e}`);
+            logger.warn(`${this.logPrefix()} saveToUploads failed for ${filename}: ${e}`);
             return null;
         }
     }
@@ -552,19 +652,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const msgChatId = typeof payload === 'object' && payload !== null && payload.chat_id;
         if (this._aid && fromAid === this._aid && (!msgChatId || !this._chatId || msgChatId !== this._chatId)) {
             this.acknowledgeImmediately(messageId, seq);
-            logger.debug(`[AUN] P2P dropped: echo from self (from=${fromAid} mid=${messageId})`);
+            logger.debug(`${this.logPrefix()} P2P dropped: echo from self (from=${fromAid} mid=${messageId})`);
             return;
         }
-        // E2EE 能力探测：收到加密消息则标记对端支持，明文则计数审计
+        // 记录入站消息加密状态，透传到出站 ReplyContext
         const msgEncrypted = !!(msg.e2ee);
-        if (fromAid) {
-            if (msgEncrypted) {
-                this.peerE2ee.set(fromAid, { ok: true, ts: Date.now() });
-            }
-            else {
-                this.plaintextRecv++;
-            }
-        }
+        if (!msgEncrypted)
+            this.plaintextRecv++;
         // Detect @mentions
         const mentions = [];
         if (this._aid && text.includes(`@${this._aid}`)) {
@@ -600,7 +694,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const peerInfo = await this.fetchPeerInfo(fromAid);
         const shortAid = this.getShortAid(fromAid);
         const displayName = peerInfo.name || shortAid;
-        logger.info(`[AUN] P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} text=${finalText.slice(0, 60)}`);
+        // 详细 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 dispatched: from=${shortAid}(${displayName}) mid=${messageId} encrypt=${msgEncrypted} text=${finalText.slice(0, 60)}`);
+        const replyContext = { metadata: { encrypted: msgEncrypted } };
+        if (taskId)
+            replyContext.threadId = taskId;
         this.dispatchMessage({
             channelId: chatId,
             userId: fromAid,
@@ -612,6 +712,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             mentions,
             peerName: displayName || undefined,
             peerType: peerInfo.type || 'unknown',
+            replyContext,
         });
     }
     async handleIncomingGroupMessage(data) {
@@ -629,37 +730,56 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const payloadMentions = Array.isArray(payload?.mentions)
             ? payload.mentions.filter((m) => typeof m === 'string')
             : [];
-        logger.debug(`[AUN][DIAG-GRP] full_msg=${JSON.stringify(msg).substring(0, 500)}`);
+        logger.debug(`${this.logPrefix()}[DIAG-GRP] full_msg=${JSON.stringify(msg).substring(0, 500)}`);
         if (!groupId || !senderAid) {
             this.acknowledgeImmediately(messageId, seq);
-            logger.debug(`[AUN] Group dropped: missing groupId or senderAid (mid=${messageId})`);
+            logger.debug(`${this.logPrefix()} Group dropped: missing groupId or senderAid (mid=${messageId})`);
             return;
         }
         if (this._aid && senderAid === this._aid) {
             this.acknowledgeImmediately(messageId, seq);
-            logger.debug(`[AUN] Group dropped: own message (group=${groupId} mid=${messageId})`);
+            logger.debug(`${this.logPrefix()} Group dropped: own message (group=${groupId} mid=${messageId})`);
             return;
         }
-        // E2EE 能力探测：收到加密群消息则标记发送者支持
-        const msgEncrypted = !!(msg.e2ee);
-        if (senderAid) {
-            if (msgEncrypted) {
-                this.peerE2ee.set(senderAid, { ok: true, ts: Date.now() });
-            }
-            else {
-                this.plaintextRecv++;
+        // ── proactive 模式入站白名单 ──
+        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;
+                }
+                const rawText = typeof payloadObj?.text === 'string' ? payloadObj.text : '';
+                const rawMentions = Array.isArray(payloadObj?.mentions) ? payloadObj.mentions : [];
+                const mentionAids = this.extractMentionAids(rawMentions);
+                const mentionsSelf = !!this._aid && (this.hasExplicitMention(rawText, this._aid) || mentionAids.includes(this._aid));
+                // @all 仅认结构化 mentions（payload.mentions），不扫描正文 — 避免引述性 "@all" 误判
+                const mentionsAll = this.hasMentionAll(rawMentions);
+                if (!mentionsSelf && !mentionsAll) {
+                    this.acknowledgeImmediately(messageId, seq);
+                    logger.info(`${this.logPrefix()} Group dropped (proactive whitelist): type=${payloadType} group=${groupId} sender=${senderAid} mid=${messageId} textPreview=${JSON.stringify(rawText.slice(0, 80))}`);
+                    return;
+                }
             }
         }
+        // 记录入站消息加密状态，透传到出站 ReplyContext
+        const msgEncrypted = !!(msg.e2ee);
+        if (!msgEncrypted)
+            this.plaintextRecv++;
         // dispatch_mode from server tells agent how to work in this group
         const dispatchMode = msg.dispatch_mode ?? payload?.dispatch_mode ?? 'mention';
         const mentionedSelf = this._aid
             ? (this.hasExplicitMention(text, this._aid) || payloadMentions.includes(this._aid))
             : false;
-        const mentionedAll = this.hasExplicitMention(text, 'all') || payloadMentions.includes('all');
+        // @all 仅认结构化 mentions（payload.mentions），不扫描正文 — 避免引述性 "@all" 误判
+        const mentionedAll = payloadMentions.includes('all');
         // In mention mode, only respond when explicitly mentioned; in broadcast mode, respond to all
         if (dispatchMode === 'mention' && !mentionedSelf && !mentionedAll) {
             this.acknowledgeImmediately(messageId, seq);
-            logger.debug(`[AUN] Group missed: unmentioned in mention-mode (group=${groupId} sender=${senderAid} mid=${messageId})`);
+            logger.info(`${this.logPrefix()} Group dropped: unmentioned in mention-mode (group=${groupId} sender=${senderAid} mid=${messageId} textPreview=${JSON.stringify(text.slice(0, 80))})`);
             return;
         }
         const strippedText = this.stripSelfMentionIfOnly(text, this._aid);
@@ -671,7 +791,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // Allow through if there's text OR attachments; both-empty messages are silently dropped
         if (!strippedText && !hasAttachments) {
             this.acknowledgeImmediately(messageId, seq);
-            logger.debug(`[AUN] Group dropped: empty text and no attachments (group=${groupId} sender=${senderAid} mid=${messageId})`);
+            logger.debug(`${this.logPrefix()} Group dropped: empty text and no attachments (group=${groupId} sender=${senderAid} mid=${messageId})`);
             return;
         }
         const mentions = mentionedAll
@@ -700,7 +820,19 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const peerInfo = await this.fetchPeerInfo(senderAid);
         const shortAid = this.getShortAid(senderAid);
         const displayName = peerInfo.name || shortAid;
-        logger.info(`[AUN] Group dispatched: group=${groupId} sender=${shortAid}(${displayName}) mode=${dispatchMode} mid=${messageId} text=${finalText.slice(0, 60)}`);
+        // 详细 dispatch 决策日志：记录消息为何被路由到 agent
+        const payloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
+        const textMentionSelf = this._aid ? this.hasExplicitMention(text, this._aid) : false;
+        const textMentionAll = this.hasExplicitMention(text, 'all');
+        const structMentionSelf = this._aid ? payloadMentions.includes(this._aid) : false;
+        const structMentionAll = payloadMentions.includes('all');
+        const reason = mentionedAll
+            ? 'mention.all(struct)'
+            : 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 dispatched: group=${groupId} sender=${shortAid}(${displayName}) mode=${dispatchMode} mid=${messageId} text=${finalText.slice(0, 60)}`);
         this.dispatchMessage({
             channelId: groupId,
             userId: senderAid,
@@ -712,7 +844,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             seq,
             taskId,
             mentions,
-            replyContext: this.buildGroupReplyContext(taskId, senderAid),
+            replyContext: this.buildGroupReplyContext(taskId, senderAid, msgEncrypted),
         });
     }
     dispatchMessage(event) {
@@ -748,7 +880,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             mentions: mentionObjects,
             replyContext,
         }).catch(err => {
-            logger.error('[AUN] Message handler error:', err);
+            logger.error(`${this.logPrefix()} Message handler error:`, err);
         });
     }
     handleConnectionState(data) {
@@ -761,14 +893,15 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.lastReconnectLogTime = 0;
             this.lastReconnectLogAttempt = 0;
             this.trace('IN', 'connection.state', data);
-            logger.info('[AUN] Connected');
+            logger.info(`${this.logPrefix()} Connected`);
         }
         else if (state === 'disconnected') {
             this.connected = false;
             this.trace('IN', 'connection.state', data);
-            logger.warn(`[AUN] Disconnected: ${data.error ?? 'unknown'}`);
+            logger.warn(`${this.logPrefix()} Disconnected: ${data.error ?? 'unknown'}`);
         }
         else if (state === 'reconnecting') {
+            this.connected = false;
             const attempt = data.attempt ?? 0;
             const now = Date.now();
             // Throttled logging: first attempt, every N attempts, or every M seconds
@@ -778,14 +911,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (isFirst || isStep || isInterval) {
                 const suppressed = attempt - this.lastReconnectLogAttempt - 1;
                 const suffix = suppressed > 0 ? `, ${suppressed} suppressed since last log` : '';
-                logger.info(`[AUN] SDK reconnecting (attempt ${attempt}${suffix})`);
+                logger.info(`${this.logPrefix()} SDK reconnecting (attempt ${attempt}${suffix})`);
                 this.lastReconnectLogTime = now;
                 this.lastReconnectLogAttempt = attempt;
                 this.trace('IN', 'connection.state', data);
             }
             // Detect runaway SDK reconnect loop: force disconnect and use TS-layer backoff
             if (attempt >= AUNChannel.SDK_RECONNECT_GIVEUP && !this.intentionalDisconnect) {
-                logger.warn(`[AUN] SDK reconnect stuck at attempt ${attempt}, forcing TS-layer reconnect with backoff`);
+                logger.warn(`${this.logPrefix()} SDK reconnect stuck at attempt ${attempt}, forcing TS-layer reconnect with backoff`);
                 this.connected = false;
                 if (this.client) {
                     this.trace('OUT', 'client.close', { reason: 'sdk_reconnect_stuck' });
@@ -799,7 +932,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.connected = false;
             this.trace('IN', 'connection.state', data);
             const reason = data.reason ?? '';
-            logger.error(`[AUN] Terminal failure: ${data.error ?? 'unknown'}${reason ? ` (${reason})` : ''}`);
+            logger.error(`${this.logPrefix()} Terminal failure: ${data.error ?? 'unknown'}${reason ? ` (${reason})` : ''}`);
             if (!this.intentionalDisconnect) {
                 this.scheduleReconnect();
             }
@@ -812,16 +945,19 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     onMessage(handler) {
         this.messageHandler = handler;
     }
+    setSessionModeResolver(resolver) {
+        this.sessionModeResolver = resolver;
+    }
     onRecall(handler) {
         this.recallHandler = handler;
     }
     async sendMessage(channelId, text, context) {
         if (!this.connected || !this.client) {
-            logger.warn('[AUN] Cannot send: not connected');
+            logger.warn(`${this.logPrefix()} Cannot send: not connected`);
             return;
         }
         if (!text?.trim()) {
-            logger.warn('[AUN] Attempted to send empty message, skipping');
+            logger.warn(`${this.logPrefix()} Attempted to send empty message, skipping`);
             return;
         }
         let finalText = text;
@@ -837,6 +973,12 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
         }
         const payload = { type: 'text', text: finalText };
+        // 出站群消息：从正文提取 @aid 填入结构化 mentions（与 aun CLI 对齐，方便对端按 mentions 过滤）
+        if (this.isGroupId(channelId)) {
+            const extracted = this.extractMentionAidsFromText(finalText);
+            if (extracted.length > 0)
+                payload.mentions = extracted;
+        }
         if (context?.threadId)
             payload.thread_id = context.threadId;
         if (context?.metadata?.taskId)
@@ -851,34 +993,42 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             payload.chat_id = channelId;
         }
         const encryptTarget = isGroup ? channelId : targetAid;
-        const encrypt = this.shouldEncrypt(encryptTarget);
+        const encrypt = context?.metadata?.encrypted != null
+            ? !!(context.metadata.encrypted)
+            : this.shouldEncrypt(encryptTarget);
         const params = { payload, encrypt };
         try {
             if (isGroup) {
                 params.group_id = channelId;
                 const result = await this.callAndTrace('group.send', params);
                 if (!result || !result.message_id) {
-                    logger.warn(`[AUN] group.send returned no message_id: ${JSON.stringify(result)}`);
+                    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)}`);
+                    }
+                    else {
+                        logger.warn(`${this.logPrefix()} group.send returned no message_id: ${JSON.stringify(result)}`);
+                    }
                 }
                 else {
-                    logger.info(`[AUN] group.send ok: group=${channelId} mid=${result.message_id} text=${finalText.slice(0, 60)}`);
+                    logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                 }
             }
             else {
                 params.to = targetAid;
                 const result = await this.callAndTrace('message.send', params);
                 if (!result || !result.message_id) {
-                    logger.warn(`[AUN] message.send returned no message_id: ${JSON.stringify(result)}`);
+                    logger.warn(`${this.logPrefix()} message.send returned no message_id: ${JSON.stringify(result)}`);
                 }
                 else {
-                    logger.info(`[AUN] message.send ok: to=${targetAid} mid=${result.message_id} text=${finalText.slice(0, 60)}`);
+                    logger.info(`${this.logPrefix()} message.send ok: to=${this.peerLabel(targetAid)} mid=${result.message_id} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                 }
             }
         }
         catch (e) {
             if (encrypt && e instanceof E2EEError) {
                 this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
-                logger.warn(`[AUN] E2EE send failed to ${channelId}, retrying plaintext: ${e}`);
+                logger.warn(`${this.logPrefix()} E2EE send failed to ${channelId}, retrying plaintext: ${e}`);
                 params.encrypt = false;
                 try {
                     if (isGroup) {
@@ -886,7 +1036,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                         const result = await this.client.call('group.send', params);
                         this.trace('OUT', 'group.send.fallback.ok', { message_id: result?.message_id });
                         if (!result || !result.message_id) {
-                            logger.warn(`[AUN] group.send fallback returned no message_id: ${JSON.stringify(result)}`);
+                            logger.warn(`${this.logPrefix()} group.send fallback returned no message_id: ${JSON.stringify(result)}`);
                         }
                     }
                     else {
@@ -894,18 +1044,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                         const result = await this.client.call('message.send', params);
                         this.trace('OUT', 'message.send.fallback.ok', { message_id: result?.message_id });
                         if (!result || !result.message_id) {
-                            logger.warn(`[AUN] message.send fallback returned no message_id: ${JSON.stringify(result)}`);
+                            logger.warn(`${this.logPrefix()} message.send fallback returned no message_id: ${JSON.stringify(result)}`);
                         }
                     }
                 }
                 catch (e2) {
                     this.trace('OUT', 'send.fallback.error', { channelId, error: String(e2) });
-                    logger.error(`[AUN] Plaintext fallback also failed to ${channelId}: ${e2}`);
+                    logger.error(`${this.logPrefix()} Plaintext fallback also failed to ${channelId}: ${e2}`);
                 }
             }
             else {
                 this.trace('OUT', 'send.error', { channelId, error: String(e) });
-                logger.error(`[AUN] Send failed to ${channelId}: ${e}`);
+                logger.error(`${this.logPrefix()} Send failed to ${channelId}: ${e}`);
             }
         }
     }
@@ -917,7 +1067,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
      * selector 使用 context: { type: 'task', id: taskId }
      * 存储键：group_id/peer_aid + sender_aid + context.type + context.id
      */
-    async sendThought(channelId, taskId, payload) {
+    async sendThought(channelId, taskId, payload, context) {
         if (!this.connected || !this.client)
             return;
         if (!taskId)
@@ -925,46 +1075,49 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // Multi-instance routing
         const colonIdx = channelId.indexOf(':');
         const targetId = colonIdx > 0 ? channelId.substring(0, colonIdx) : channelId;
+        const encrypt = context?.metadata?.encrypted != null
+            ? !!(context.metadata.encrypted)
+            : this.shouldEncrypt(targetId);
         const params = {
             context: { type: 'task', id: taskId },
             payload,
-            encrypt: true,
+            encrypt,
         };
         try {
             const stage = payload?.stage ?? 'unknown';
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
                 await this.callAndTrace('group.thought.put', params);
-                logger.info(`[AUN] thought.put ok group=${targetId} task=${taskId} stage=${stage}`);
+                logger.info(`${this.logPrefix()} thought.put ok group=${targetId} task=${taskId} stage=${stage} encrypt=${encrypt}`);
             }
             else {
                 params.to = targetId;
                 await this.callAndTrace('message.thought.put', params);
-                logger.info(`[AUN] thought.put ok p2p=${targetId} task=${taskId} stage=${stage}`);
+                logger.info(`${this.logPrefix()} thought.put ok p2p=${this.peerLabel(targetId)} task=${taskId} stage=${stage} encrypt=${encrypt}`);
             }
         }
         catch (e) {
             const err = e;
-            logger.debug(`[AUN] thought.put failed to ${channelId}: ${err?.name}(${err?.code})=${err?.message}`);
+            logger.debug(`${this.logPrefix()} thought.put failed to ${channelId}: ${err?.name}(${err?.code})=${err?.message}`);
         }
     }
     async sendFile(channelId, filePath, context) {
         if (!this.connected || !this.client) {
-            logger.warn('[AUN] Cannot sendFile: not connected');
+            logger.warn(`${this.logPrefix()} Cannot sendFile: not connected`);
             return;
         }
         const absPath = path.resolve(filePath);
         if (!fs.existsSync(absPath)) {
-            logger.warn(`[AUN] sendFile: file not found: ${absPath}`);
+            logger.warn(`${this.logPrefix()} sendFile: file not found: ${absPath}`);
             return;
         }
         const stat = fs.statSync(absPath);
         if (stat.size === 0) {
-            logger.warn('[AUN] sendFile: file is empty');
+            logger.warn(`${this.logPrefix()} sendFile: file is empty`);
             return;
         }
         if (stat.size > 10 * 1024 * 1024) {
-            logger.warn(`[AUN] sendFile: file too large (${formatSize(stat.size)}, max 10 MB)`);
+            logger.warn(`${this.logPrefix()} sendFile: file too large (${formatSize(stat.size)}, max 10 MB)`);
             return;
         }
         const filename = path.basename(absPath);
@@ -1035,7 +1188,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 filePayload.chat_id = channelId;
             }
             const encryptTarget = isGroup ? channelId : fileTargetAid;
-            const encrypt = this.shouldEncrypt(encryptTarget);
+            const encrypt = context?.metadata?.encrypted != null
+                ? !!(context.metadata.encrypted)
+                : this.shouldEncrypt(encryptTarget);
             const params = { payload: filePayload, encrypt };
             try {
                 if (isGroup) {
@@ -1044,7 +1199,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     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) {
-                        logger.warn(`[AUN] group.send.file returned no message_id: ${JSON.stringify(result)}`);
+                        logger.warn(`${this.logPrefix()} group.send.file returned no message_id: ${JSON.stringify(result)}`);
                     }
                 }
                 else {
@@ -1053,7 +1208,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     const result = await this.client.call('message.send', params);
                     this.trace('OUT', 'message.send.file.ok', { message_id: result?.message_id });
                     if (!result || !result.message_id) {
-                        logger.warn(`[AUN] message.send.file returned no message_id: ${JSON.stringify(result)}`);
+                        logger.warn(`${this.logPrefix()} message.send.file returned no message_id: ${JSON.stringify(result)}`);
                     }
                 }
             }
@@ -1064,14 +1219,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 });
                 if (encrypt && sendErr instanceof E2EEError) {
                     this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
-                    logger.warn(`[AUN] E2EE sendFile failed to ${channelId}, retrying plaintext: ${sendErr}`);
+                    logger.warn(`${this.logPrefix()} E2EE sendFile failed to ${channelId}, retrying plaintext: ${sendErr}`);
                     params.encrypt = false;
                     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) {
-                            logger.warn(`[AUN] group.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
+                            logger.warn(`${this.logPrefix()} group.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
                         }
                     }
                     else {
@@ -1079,7 +1234,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                         const result = await this.client.call('message.send', params);
                         this.trace('OUT', 'message.send.file.fallback.ok', { message_id: result?.message_id });
                         if (!result || !result.message_id) {
-                            logger.warn(`[AUN] message.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
+                            logger.warn(`${this.logPrefix()} message.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
                         }
                     }
                 }
@@ -1087,11 +1242,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     throw sendErr;
                 }
             }
-            logger.info(`[AUN] File sent: ${filename} (${formatSize(stat.size)}) → ${channelId}`);
+            logger.info(`${this.logPrefix()} File sent: ${filename} (${formatSize(stat.size)}) → ${channelId}`);
         }
         catch (e) {
             this.trace('OUT', 'sendFile.error', { channelId, filePath, error: String(e) });
-            logger.error(`[AUN] sendFile failed for ${channelId}: ${e}`);
+            logger.error(`${this.logPrefix()} sendFile failed for ${channelId}: ${e}`);
         }
     }
     acknowledge(messageId) {
@@ -1127,20 +1282,22 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             payload.chat_id = channelId;
         }
         const encryptTarget = isGroup ? channelId : statusTargetAid;
-        const encrypt = this.shouldEncrypt(encryptTarget);
+        const encrypt = context?.metadata?.encrypted != null
+            ? !!(context.metadata.encrypted)
+            : this.shouldEncrypt(encryptTarget);
         const params = { payload, encrypt };
         const sendWithFallback = (method) => {
             this.client.call(method, params).catch(e => {
                 if (encrypt && e instanceof E2EEError) {
                     this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
-                    logger.warn(`[AUN] E2EE status send failed to ${channelId}, retrying plaintext`);
+                    logger.warn(`${this.logPrefix()} E2EE status send failed to ${channelId}, retrying plaintext`);
                     params.encrypt = false;
                     this.client.call(method, params).catch(e2 => {
-                        logger.debug(`[AUN] Processing status fallback failed: ${e2}`);
+                        logger.debug(`${this.logPrefix()} Processing status fallback failed: ${e2}`);
                     });
                 }
                 else {
-                    logger.debug(`[AUN] Processing status failed: ${e}`);
+                    logger.debug(`${this.logPrefix()} Processing status failed: ${e}`);
                 }
             });
         };
@@ -1154,7 +1311,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.trace('OUT', 'message.send.status', params);
             sendWithFallback('message.send');
         }
-        logger.info(`[AUN] task.${status} task=${taskId} session=${sessionId} target=${channelId}`);
+        // 群聊显示 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} encrypt=${encrypt} target=${targetLabel}`);
     }
     sendCustomPayload(channelId, payload) {
         if (!this.client || !this.connected)
@@ -1184,7 +1344,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.trace('OUT', 'message.send.custom.ok', { message_id: result?.message_id });
         }).catch(e => {
             this.trace('OUT', 'message.send.custom.error', { error: String(e) });
-            logger.warn(`[AUN] Custom payload failed: ${e}`);
+            logger.warn(`${this.logPrefix()} Custom payload failed: ${e}`);
         });
     }
     async disconnect() {
@@ -1205,12 +1365,12 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.client = null;
         }
         this.connected = false;
-        logger.info('[AUN] Disconnected');
+        logger.info(`${this.logPrefix()} Disconnected`);
         if (this.traceStream) {
             this.traceStream.end();
             this.traceStream = null;
         }
-        logger.info('[AUN] Disconnected');
+        logger.info(`${this.logPrefix()} Disconnected`);
     }
     // ── TS-layer reconnect (fallback when SDK auto_reconnect exhausted) ──
     scheduleReconnect() {
@@ -1220,25 +1380,25 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return;
         const delays = AUNChannel.RECONNECT_DELAYS;
         if (this.reconnectAttempt >= delays.length) {
-            logger.error(`[AUN] All ${delays.length} reconnect attempts exhausted, giving up`);
+            logger.error(`${this.logPrefix()} All ${delays.length} reconnect attempts exhausted, giving up`);
             this.onChannelDown?.();
             return;
         }
         const delay = delays[this.reconnectAttempt];
         this.reconnectAttempt++;
-        logger.info(`[AUN] Scheduling reconnect #${this.reconnectAttempt}/${delays.length} in ${delay}s`);
+        logger.info(`${this.logPrefix()} Scheduling reconnect #${this.reconnectAttempt}/${delays.length} in ${delay}s`);
         this.reconnectTimer = setTimeout(async () => {
             this.reconnectTimer = null;
             try {
-                logger.info(`[AUN] Reconnect #${this.reconnectAttempt} starting...`);
+                logger.info(`${this.logPrefix()} Reconnect #${this.reconnectAttempt} starting...`);
                 this.trace('OUT', 'reconnect.start', { attempt: this.reconnectAttempt });
                 await this.initClient();
                 this.trace('OUT', 'reconnect.ok', { attempt: this.reconnectAttempt });
-                logger.info(`[AUN] Reconnect #${this.reconnectAttempt} succeeded`);
+                logger.info(`${this.logPrefix()} Reconnect #${this.reconnectAttempt} succeeded`);
             }
             catch (err) {
                 this.trace('OUT', 'reconnect.error', { attempt: this.reconnectAttempt, error: String(err) });
-                logger.error(`[AUN] Reconnect #${this.reconnectAttempt} failed:`, err);
+                logger.error(`${this.logPrefix()} Reconnect #${this.reconnectAttempt} failed:`, err);
                 this.scheduleReconnect();
             }
         }, delay * 1000);
@@ -1314,7 +1474,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return info;
         }
         catch (e) {
-            logger.debug(`[AUN] fetchPeerInfo failed for ${aid}: ${e}`);
+            logger.debug(`${this.logPrefix()} fetchPeerInfo failed for ${aid}: ${e}`);
             return { type: null }; // no agent.md → unknown
         }
     }
@@ -1367,7 +1527,7 @@ export class AUNChannelPlugin {
                 sendCustomPayload: (id, payload) => channel.sendCustomPayload(id, payload),
                 uploadAgentMd: (content) => channel.uploadAgentMd(content),
                 downloadAgentMd: (aid) => channel.downloadAgentMd(aid),
-                putThought: (id, taskId, payload) => channel.sendThought(id, taskId, payload),
+                putThought: (id, taskId, payload, context) => channel.sendThought(id, taskId, payload, context),
                 _selfAid: () => channel.getStatus().aid,
                 _selfName: () => channel.getSelfName(),
             };