evolclaw 2.8.3 → 3.0.0

package/dist/channels/aun.js

@@ -4,28 +4,54 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
-import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
-import { resolvePaths } from '../paths.js';
+import { LogWriter } from '../utils/log-writer.js';
+import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
+import { resolvePaths, getPackageRoot } from '../paths.js';
 import { saveToUploads, sanitizeFileName } from '../utils/media-cache.js';
-function guessMime(filename) {
-    const ext = path.extname(filename).toLowerCase();
-    const map = {
-        '.txt': 'text/plain', '.md': 'text/markdown', '.json': 'application/json',
-        '.js': 'text/javascript', '.ts': 'text/typescript', '.py': 'text/x-python',
-        '.html': 'text/html', '.css': 'text/css', '.csv': 'text/csv',
-        '.pdf': 'application/pdf', '.zip': 'application/zip', '.gz': 'application/gzip',
-        '.png': 'image/png', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg',
-        '.gif': 'image/gif', '.webp': 'image/webp', '.svg': 'image/svg+xml',
-        '.xml': 'application/xml', '.yaml': 'application/x-yaml', '.yml': 'application/x-yaml',
+import { appendAidEvent } from '../utils/instance-registry.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';
+/**
+ * 构造 connect extra_info：自描述本进程身份。
+ *
+ * 用途：另一个进程踢掉本连接时，本进程会从 SDK 'gateway.disconnect' 事件的
+ * detail.new_extra_info 里看到对方的 extra_info；同时 detail.self_extra_info
+ * 是本进程当时连接时上报的内容。把双方信息打到日志便于诊断"谁踢了谁"。
+ *
+ * 字段需保持稳定（被踢方靠它分辨对方身份）。
+ */
+function buildConnectExtraInfo(opts) {
+    const startedAt = getProcessStartTime(process.pid) ?? Date.now();
+    return {
+        app: 'evolclaw',
+        version: getEvolclawVersion(),
+        pid: process.pid,
+        started_at: startedAt,
+        started_at_iso: new Date(startedAt).toISOString(),
+        hostname: os.hostname(),
+        platform: process.platform,
+        node_version: process.version,
+        evolclaw_home: process.env.EVOLCLAW_HOME || '',
+        launched_by: process.env.EVOLCLAW_LAUNCHED_BY || '',
+        aid: opts.aid,
+        agent_name: opts.agentName ?? '',
+        channel_name: opts.channelName ?? '',
     };
-    return map[ext] || 'application/octet-stream';
 }
-function formatSize(bytes) {
-    if (bytes < 1024)
-        return `${bytes} B`;
-    if (bytes < 1048576)
-        return `${(bytes / 1024).toFixed(1)} KB`;
-    return `${(bytes / 1048576).toFixed(1)} MB`;
+let _cachedVersion = null;
+function getEvolclawVersion() {
+    if (_cachedVersion !== null)
+        return _cachedVersion;
+    try {
+        const pkg = JSON.parse(fs.readFileSync(path.join(getPackageRoot(), 'package.json'), 'utf-8'));
+        _cachedVersion = String(pkg.version ?? '');
+    }
+    catch {
+        _cachedVersion = '';
+    }
+    return _cachedVersion;
 }
 export class AUNChannel {
     config;
@@ -34,13 +60,15 @@ export class AUNChannel {
     messageHandler;
     recallHandler;
     connected = false;
-    traceStream = null;
-    traceHourTag = ''; // 当前 trace 文件对应的小时标识 (YYYYMMDD-HH)
+    traceWriter = null;
+    eventBus = null;
+    ownerBoundHandler = null;
+    pendingEchoMessages = new Map();
+    isEchoSending = false;
     trace(dir, event, data) {
         if (!this.config.aunTrace)
             return;
-        this.rotateTraceIfNeeded();
-        if (!this.traceStream)
+        if (!this.traceWriter)
             return;
         // 自动从 data 推断顶层字段（self_aid / peer_aid / group_id / task_id / chatmode），
         // 便于 jq 过滤：`jq 'select(.task_id == "task-xxx")'`
@@ -64,7 +92,7 @@ export class AUNChannel {
         if (chatmode)
             topContext.chatmode = chatmode;
         const line = JSON.stringify({ ts: localTimestamp(), dir, event, ...topContext, data });
-        this.traceStream.write(line + '\n');
+        this.traceWriter.write(line);
     }
     /** 日志前缀（含 self aid 简称，多实例可识别） */
     logPrefix() {
@@ -109,40 +137,6 @@ export class AUNChannel {
             throw e;
         }
     }
-    static AUN_TRACE_RE = /^aun-\d{8}-\d{2}\.log$/;
-    static AUN_RETAIN_HOURS = 12;
-    rotateTraceIfNeeded() {
-        const d = new Date();
-        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.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}
      *  - 数字群号：{group_no}.{issuer}（如 11117.agentid.pub）
@@ -174,12 +168,66 @@ export class AUNChannel {
         const name = cached?.name;
         return name && name !== short ? `${short}(${name})` : short;
     }
-    extractTextPayload(payload) {
+    extractTextPayload(payload, channelId) {
         if (typeof payload === 'string')
             return payload;
         if (payload && typeof payload === 'object') {
-            const text = payload.text;
-            if (typeof text === 'string')
+            const obj = payload;
+            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 cardInfo = cardMsgId ? this.cardMessageIdMap.get(cardMsgId) : undefined;
+                if (cardInfo) {
+                    const actionValue = 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';
+                            this.messageHandler({
+                                channelId: channelId || '',
+                                chatType,
+                                content: actionValue,
+                                peerId: channelId || '',
+                                peerName: typeof obj.action_label === 'string' ? obj.action_label : undefined,
+                                messageId: `card-trigger-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+                                source: 'card-trigger',
+                            });
+                        }
+                    }
+                    else {
+                        // ActionInteraction：走 interactionCallback → InteractionRouter
+                        // callback 未注册时保留 map entry（TTL 清理），给 router 留重试机会
+                        if (this.interactionCallback) {
+                            this.cardMessageIdMap.delete(cardMsgId);
+                            this.interactionCallback({
+                                type: 'interaction.response',
+                                id: cardInfo.requestId,
+                                action: actionValue,
+                                values: { text, action_label: obj.action_label, behavior: obj.behavior },
+                            });
+                        }
+                    }
+                }
+                else {
+                    logger.debug(`${this.logPrefix()} action_card_reply dropped: cardMsgId=${cardMsgId} hasCallback=${!!this.interactionCallback}`);
+                }
+                // 始终返回空字符串，阻止消息分发给 agent
+                return '';
+            }
+            // quote 类型：拼接被引用内容
+            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');
+                    return text ? `${quoted}\n\n${text}` : quoted;
+                }
+            }
+            if (typeof obj.text === 'string')
                 return text;
             return JSON.stringify(payload);
         }
@@ -271,35 +319,96 @@ export class AUNChannel {
     static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
     plaintextRecv = 0;
     sessionModeResolver;
+    interactionCallback;
+    // action_card message_id → { requestId, isCommandCard }（用于关联 action_card_reply）
+    cardMessageIdMap = new Map();
+    dispatchModeResolver;
     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)
+    // Reconnect state
+    // SDK 自己跑无限指数退避（1s → 5min）；TS 层只在 SDK 够不到的两类场景下接管：
+    //  1. flap：短命 connected 反复出现（SDK 不记忆跨轮 base delay，会从 1s 重新开始）
+    //  2. terminal_failed with kick reason：直接 5min 后重试，不刷屏
     intentionalDisconnect = false;
-    reconnectAttempt = 0;
     reconnectTimer = null;
-    static RECONNECT_DELAYS = [60, 120, 300, 600]; // seconds
+    reconnectGeneration = 0; // 防止并发 initClient：每次 takeoverReconnect 递增，回调中校验
     onChannelDown;
-    // SDK reconnect throttling — avoid log spam when SDK enters tight reconnect loop
+    // initClient concurrency guard: 防止多个 initClient 并发执行
+    initInProgress = false;
+    // Flap detection: 连接寿命 < FLAP_WINDOW_MS 累计 FLAP_THRESHOLD 次，判定为持续被踢
+    connectedAt = 0;
+    flapCount = 0;
+    static FLAP_WINDOW_MS = 30_000;
+    static FLAP_THRESHOLD = 3;
+    // 接管后的统一退避时间（kicked / flap / terminal_failed）
+    static TAKEOVER_DELAY_MS = 5 * 60 * 1000; // 5min
+    // 一般 terminal_failed（非 kick）的兜底退避
+    static FALLBACK_DELAY_MS = 60 * 1000; // 1min
+    // SDK reconnect logging throttle（避免 attempt 自增刷屏）
     lastReconnectLogTime = 0;
     lastReconnectLogAttempt = 0;
-    static RECONNECT_LOG_INTERVAL = 60_000; // log at most every 60s
-    static RECONNECT_LOG_STEP = 100; // or every 100 attempts
-    static SDK_RECONNECT_GIVEUP = 50; // force TS-layer fallback after this many SDK attempts
+    static RECONNECT_LOG_INTERVAL = 60_000;
+    static RECONNECT_LOG_STEP = 100;
+    // AID 连接状态（供 status 命令聚合展示）
+    aidState;
+    aidStatsCollector;
     constructor(config) {
         this.config = config;
         if (config.aunTrace) {
-            this.rotateTraceIfNeeded();
-            logger.info(`${this.logPrefix()} Trace logging enabled (hourly rotation, 12h retention): ${resolvePaths().logs}/aun-YYYYMMDD-HH.log`);
-        }
+            this.traceWriter = new LogWriter({
+                baseName: 'aun',
+                logDir: resolvePaths().logs,
+                rotation: 'hourly',
+                retention: { hours: 12 },
+            });
+            logger.info(`${this.logPrefix()} Trace logging enabled (hourly rotation, 12h retention): ${this.traceWriter.activePath()}`);
+        }
+        this.aidState = {
+            aid: config.aid,
+            agentName: config.agentName ?? '<unknown>',
+            channelName: config.channelName ?? 'aun',
+            status: 'disabled',
+            reconnectCount: 0,
+            flapCount: 0,
+        };
+    }
+    /** Snapshot of AID connection state for status / IPC aggregation */
+    getAidState() {
+        return { ...this.aidState, flapCount: this.flapCount };
+    }
+    setAidStatsCollector(collector) {
+        this.aidStatsCollector = collector;
+    }
+    setAidStatus(status, extra) {
+        this.aidState.status = status;
+        if (extra)
+            Object.assign(this.aidState, extra);
     }
     async connect() {
         this.intentionalDisconnect = false;
-        this.reconnectAttempt = 0;
+        this.flapCount = 0;
+        this.connectedAt = 0;
+        this.setAidStatus('reconnecting', { lastAttemptAt: Date.now() });
         await this.initClient();
+        this.startOutboxTimer();
     }
     async initClient() {
+        // 防止并发 initClient（sendMessage 触发 + timer 触发同时进入）
+        if (this.initInProgress) {
+            logger.info(`${this.logPrefix()} initClient already in progress, skipping`);
+            return;
+        }
+        this.initInProgress = true;
+        try {
+            await this._initClientInner();
+        }
+        finally {
+            this.initInProgress = false;
+        }
+    }
+    async _initClientInner() {
         // Clean up existing client if any
         if (this.client) {
             this.trace('OUT', 'client.close', { reason: 'initClient' });
@@ -364,6 +473,11 @@ export class AUNChannel {
             // trace is handled inside handleConnectionState with throttling
             this.handleConnectionState(data);
         });
+        // gateway 被踢/服务端主动断开（含同槽位互踢的 self/new extra_info）
+        this.client.on('gateway.disconnect', (data) => {
+            this.trace('IN', 'gateway.disconnect', data);
+            this.handleGatewayDisconnect(data);
+        });
         this.client.on('message.recalled', (data) => {
             this.trace('IN', 'message.recalled', data);
             if (data && typeof data === 'object') {
@@ -424,6 +538,7 @@ export class AUNChannel {
             accessToken = this.config.accessToken || process.env.AUN_ACCESS_TOKEN || '';
             if (!accessToken) {
                 logger.error(`${this.logPrefix()} No accessToken fallback available, scheduling retry`);
+                this.setAidStatus('failed', { lastError: `${errName}: ${errMsg}`.slice(0, 80) });
                 this.scheduleReconnect();
                 throw new Error('Authentication failed and no accessToken fallback available');
             }
@@ -431,15 +546,26 @@ export class AUNChannel {
         }
         // Connect (SDK auto_reconnect handles transient failures)
         try {
-            this.trace('OUT', 'client.connect', { gateway: this.client._gatewayUrl });
-            await this.client.connect({ access_token: accessToken, gateway: this.client._gatewayUrl }, { auto_reconnect: true, retry: { max_attempts: 5, initial_delay: 1.0, max_delay: 30.0 } });
+            const extraInfo = buildConnectExtraInfo({
+                aid: this.config.aid,
+                agentName: this.config.agentName,
+                channelName: this.config.channelName,
+            });
+            this.trace('OUT', 'client.connect', { gateway: this.client._gatewayUrl, extra_info: extraInfo });
+            await this.client.connect({ access_token: accessToken, gateway: this.client._gatewayUrl, extra_info: extraInfo }, 
+            // max_attempts=0 = 无限重试（与 Go/Python 对齐），交由 SDK 自己跑指数退避
+            // initial_delay=1s，max_delay=300s（5min 封顶）
+            { auto_reconnect: true, retry: { max_attempts: 0, initial_delay: 1.0, max_delay: 300.0 } });
             this.trace('OUT', 'client.connect.ok', { aid: this.client.aid });
             this._aid = this.client.aid ?? undefined;
             const deviceId = this.client._device_id ?? '';
             this._chatId = this._aid ? `${this._aid}:${deviceId}:` : '';
             this._selfName = this.loadSelfName(aidName);
+            if (this._selfName && this.aidStatsCollector)
+                this.aidStatsCollector.setSelfName(this.config.aid, this._selfName);
             this.connected = true;
-            this.reconnectAttempt = 0;
+            this.connectedAt = Date.now();
+            this.setAidStatus('connected', { lastConnectedAt: Date.now(), lastError: undefined, gatewayUrl: this.client?._gatewayUrl });
             // Workaround: SDK e2ee uses _identity.cert for sender_cert_fingerprint;
             // if cert is missing, it falls back to public key SPKI fingerprint which
             // causes peer cert lookup failures. Backfill from keystore if needed.
@@ -452,43 +578,43 @@ 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 });
             // Send welcome message to owner after first connection
             await this.sendWelcomeMessage();
         }
         catch (e) {
             this.trace('OUT', 'client.connect.error', { error: String(e) });
             logger.error(`${this.logPrefix()} Connection failed: ${e}`);
+            this.setAidStatus('failed', { lastError: String(e).slice(0, 80) });
             this.scheduleReconnect();
             throw e;
         }
     }
     async sendWelcomeMessage() {
         try {
-            const owner = this.config.owner;
-            if (!owner) {
-                logger.info(`${this.logPrefix()} No owner configured, skipping welcome message`);
-                return;
-            }
-            // Check agent.md initialized field
             const aid = this.config.aid;
             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(`${this.logPrefix()} agent.md not found, skipping welcome message`);
+            // Read initialized + owners from per-agent config.json
+            // (config.json 是 owner 的真相来源——auto-bind 后会更新这里，但 this.config 是
+            // channel 启动时的快照，不会自动同步)
+            const agentConfig = loadAgent(aidName);
+            if (!agentConfig) {
+                logger.warn(`${this.logPrefix()} agent config not found for ${aidName}, skipping welcome message`);
                 return;
             }
-            const agentMdContent = fs.readFileSync(agentMdPath, 'utf-8');
-            const match = agentMdContent.match(/^---\n([\s\S]*?)\n---/);
-            if (!match) {
-                logger.warn(`${this.logPrefix()} agent.md frontmatter not found`);
+            if (agentConfig.initialized === true) {
+                logger.info(`${this.logPrefix()} Agent already initialized, skipping welcome message`);
                 return;
             }
-            const frontmatter = match[1];
-            const initializedMatch = frontmatter.match(/^initialized:\s*(true|false)/m);
-            if (!initializedMatch || initializedMatch[1] === 'true') {
-                logger.info(`${this.logPrefix()} Agent already initialized, skipping welcome message`);
+            const owner = agentConfig.owners?.[0] ?? this.config.owner;
+            if (!owner) {
+                logger.info(`${this.logPrefix()} No owner configured, skipping welcome message (will retry after auto-bind)`);
                 return;
             }
+            const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
+            const existingAgentMd = fs.existsSync(agentMdPath) ? fs.readFileSync(agentMdPath, 'utf-8') : '';
+            const existingFrontmatterMatch = existingAgentMd.match(/^---\n([\s\S]*?)\n---/);
+            const existingFrontmatter = existingFrontmatterMatch?.[1] ?? '';
             // Fetch owner's agent.md to derive name and validate type
             const ownerInfo = await this.fetchPeerInfo(owner);
             if (ownerInfo.type !== null && ownerInfo.type !== 'human') {
@@ -497,26 +623,18 @@ export class AUNChannel {
             // Name: prefer existing agent.md name if user has customized it,
             // otherwise generate "{ownerName}的Evol助手 ({aidLabel})" for disambiguation
             const ownerAidClean = owner.startsWith('@') ? owner.slice(1) : owner;
-            let ownerDisplayName;
-            if (ownerInfo.name) {
-                ownerDisplayName = ownerInfo.name.slice(0, 12);
-            }
-            else {
-                ownerDisplayName = ownerAidClean.split('.')[0].slice(0, 12);
-            }
-            // Check if init wrote a meaningful name (vs just the aid first label default)
-            const currentNameMatch = frontmatter.match(/^name:\s*"?([^"\n]+)/m);
+            const ownerDisplayName = (ownerInfo.name || ownerAidClean.split('.')[0]).slice(0, 12);
+            const currentNameMatch = existingFrontmatter.match(/^name:\s*"?([^"\n]+)/m);
             const currentName = currentNameMatch?.[1]?.trim();
             const aidLabel = aidName.split('.')[0];
             let agentDisplayName;
             if (currentName && currentName !== aidLabel) {
-                // User or previous init set a custom name — keep it
                 agentDisplayName = currentName;
             }
             else {
                 agentDisplayName = `${ownerDisplayName}的Evol助手 (${aidLabel})`;
             }
-            // Generate new agent.md with proper fields
+            // Generate new agent.md (no `initialized` frontmatter — that's now in config.json)
             const newAgentMd = `---
 aid: "${aid}"
 name: "${agentDisplayName}"
@@ -527,7 +645,6 @@ tags:
   - evolclaw
   - ai-agent
   - gateway
-initialized: true
 ---
 
 # ${agentDisplayName}
@@ -535,8 +652,9 @@ initialized: true
 EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 `;
             // Write locally
+            fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
             fs.writeFileSync(agentMdPath, newAgentMd, 'utf-8');
-            logger.info(`${this.logPrefix()} Updated agent.md with initialized=true`);
+            logger.info(`${this.logPrefix()} Updated agent.md for ${aidName}`);
             // Publish to AUN network via auth.uploadAgentMd
             try {
                 await this.client.auth.uploadAgentMd(newAgentMd);
@@ -581,6 +699,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 persist_required: true,
             });
             logger.info(`${this.logPrefix()} Welcome message sent to owner: ${owner}`);
+            // Mark agent as initialized in config.json (replaces old agent.md frontmatter flag)
+            try {
+                const fresh = loadAgent(aidName);
+                if (fresh) {
+                    fresh.initialized = true;
+                    saveAgent(fresh);
+                    logger.info(`${this.logPrefix()} Marked ${aidName} as initialized in config.json`);
+                }
+            }
+            catch (e) {
+                logger.warn(`${this.logPrefix()} Failed to update initialized flag in config.json: ${e}`);
+            }
         }
         catch (e) {
             logger.warn(`${this.logPrefix()} Failed to send welcome message: ${e}`);
@@ -651,7 +781,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const msg = data;
         const fromAid = msg.from ?? '';
         const payload = msg.payload ?? '';
-        const text = this.extractTextPayload(payload);
+        const text = this.extractTextPayload(payload, fromAid);
         const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
@@ -695,17 +825,22 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 finalText = parts.join('\n\n');
             }
         }
-        // Extract chat_id from payload for multi-instance routing (falls back to fromAid)
-        const chatId = (typeof payload === 'object' && payload !== null && payload.chat_id)
-            ? String(payload.chat_id)
-            : fromAid;
+        // 私聊 channelId = 对端 AID（不再读 payload.chat_id 含 device 三段式）
+        // device_id 仅 SDK 内部多实例去重用，evolclaw session 层面跨端共享会话
+        const chatId = fromAid;
         const peerInfo = await this.fetchPeerInfo(fromAid);
         const shortAid = this.getShortAid(fromAid);
         const displayName = peerInfo.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))}`);
+        // 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)}`);
+        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 } };
         if (taskId)
             replyContext.threadId = taskId;
@@ -730,7 +865,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const groupId = msg.group_id ?? '';
         const senderAid = msg.sender_aid ?? '';
         const payload = msg.payload ?? '';
-        const text = this.extractTextPayload(payload);
+        const text = this.extractTextPayload(payload, groupId);
         const taskId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const messageId = msg.message_id ?? '';
         const seq = msg.seq;
@@ -749,7 +884,37 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             logger.debug(`${this.logPrefix()} Group dropped: own message (group=${groupId} mid=${messageId})`);
             return;
         }
-        // ── proactive 模式入站白名单 ──
+        // 短 echo 快速通道：连通性测试要尽量低延迟，命中后绕过所有 await（sessionModeResolver / 后续 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 peerInfo = this.peerInfoCached(senderAid);
+                const shortAid = this.getShortAid(senderAid);
+                const displayName = peerInfo?.name || shortAid;
+                const createdAt = data.created_at;
+                if (!peerInfo)
+                    this.prefetchPeerInfo(senderAid);
+                this.handleEcho({
+                    channelId: groupId,
+                    userId: senderAid,
+                    text,
+                    chatType: 'group',
+                    messageId,
+                    peerName: displayName,
+                    peerType: peerInfo?.type || 'unknown',
+                    seq,
+                    replyContext: this.buildGroupReplyContext(undefined, senderAid, msgEncryptedFast),
+                    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') {
@@ -760,36 +925,58 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     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';
+        // dispatch_mode: 本地设置优先，fallback 到服务器参数
+        const serverDispatchMode = msg.dispatch_mode ?? payload?.dispatch_mode ?? 'mention';
+        const localDispatchMode = this.dispatchModeResolver
+            ? await this.dispatchModeResolver(groupId).catch(() => undefined)
+            : undefined;
+        const dispatchMode = localDispatchMode || serverDispatchMode;
         const mentionedSelf = this._aid
             ? (this.hasExplicitMention(text, this._aid) || payloadMentions.includes(this._aid))
             : false;
         // @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) {
+        // Echo 机制优先于 mention 过滤：消息第一行包含 echo 时触发
+        // 包含 [EvolClaw.xxx] trace 说明已被本系统处理过，是回声的回声，丢弃防止链式爆炸
+        const firstLineGroup = text.split('\n')[0] || '';
+        const hasEvolClawTraceGroup = /\[EvolClaw\.(receive|reply|agent)\]/.test(text);
+        if (/echo/i.test(firstLineGroup) && !hasEvolClawTraceGroup) {
+            // 短 echo（≤10 字符）已在前面的快速通道命中并 return，这里只处理长 echo
+            // >10 字符：追加 trace,存 pending echo,跳过 mention 过滤继续走 Agent 流程
+            const echoTs = () => {
+                const d = new Date();
+                return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}.${String(d.getMilliseconds()).padStart(3, '0')}`;
+            };
+            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'}`;
+            this.pendingEchoMessages.set(messageId, {
+                text: echoText,
+                channelId: groupId,
+                context: this.buildGroupReplyContext(undefined, senderAid, msgEncrypted),
+                receiveTs: Date.now(),
+            });
+            // 继续走正常 Agent 流程（下面的代码会 dispatch）
+        }
+        else if (/echo/i.test(firstLineGroup) && hasEvolClawTraceGroup) {
+            // 回声炸弹：已被 trace 过的 echo，直接丢弃
             this.acknowledgeImmediately(messageId, seq);
-            logger.info(`${this.logPrefix()} Group dropped: unmentioned in mention-mode (group=${groupId} sender=${senderAid} mid=${messageId} textPreview=${JSON.stringify(text.slice(0, 80))})`);
+            logger.info(`${this.logPrefix()} Group dropped: echo bomb (already-traced group=${groupId} sender=${senderAid} mid=${messageId})`);
             return;
         }
+        else {
+            // 非 echo 消息：正常 mention 过滤
+            if (dispatchMode === 'mention' && !mentionedSelf && !mentionedAll) {
+                this.acknowledgeImmediately(messageId, seq);
+                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);
         // Detect attachments before the empty-text guard
         const rawAttachments = Array.isArray(payload?.attachments)
@@ -840,9 +1027,15 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 ? (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))}`);
+        // 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)}`);
+        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.dispatchMessage({
             channelId: groupId,
+            groupId,
             userId: senderAid,
             peerName: displayName || undefined,
             peerType: peerInfo.type || 'unknown',
@@ -867,6 +1060,35 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 this.messageSeqMap.set(event.messageId, event.seq);
             }
         }
+        // Echo 机制：消息第一行包含 "echo"（不区分大小写）且原始内容 ≤10 字符时，直接回声
+        // 包含 [EvolClaw.xxx] trace 说明已被本系统处理过，是回声的回声，丢弃防止链式爆炸
+        const firstLine = event.text.split('\n')[0] || '';
+        const hasEvolClawTracePrivate = /\[EvolClaw\.(receive|reply|agent)\]/.test(event.text);
+        if (/echo/i.test(firstLine) && firstLine.trim().length <= 10 && !hasEvolClawTracePrivate) {
+            this.handleEcho(event);
+            return;
+        }
+        // 回声炸弹：已被本系统 trace 过的 echo，直接丢弃
+        if (/echo/i.test(firstLine) && hasEvolClawTracePrivate) {
+            logger.info(`${this.logPrefix()} Dropped: echo bomb (already-traced mid=${event.messageId} chat=${event.chatType})`);
+            return;
+        }
+        // 长 echo（>10 字符）：存 pending,继续交给 agent 处理
+        if (/echo/i.test(firstLine) && firstLine.trim().length > 10 && !hasEvolClawTracePrivate) {
+            const echoTs = () => {
+                const d = new Date();
+                return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}.${String(d.getMilliseconds()).padStart(3, '0')}`;
+            };
+            let echoText = event.text;
+            echoText += `\n${echoTs()} [EvolClaw.receive] from=${event.userId}${event.peerName ? `(${event.peerName})` : ''} mid=${event.messageId} chat=${event.chatType} self=${this._aid || 'unknown'} conn_uptime=${this.connectedAt ? Math.round((Date.now() - this.connectedAt) / 1000) + 's' : 'unknown'}`;
+            this.pendingEchoMessages.set(event.messageId, {
+                text: echoText,
+                channelId: event.channelId,
+                context: event.replyContext ? { metadata: event.replyContext.metadata } : undefined,
+                receiveTs: Date.now(),
+            });
+            logger.info(`${this.logPrefix()} [Echo] long echo stored: mid=${event.messageId} channelId=${event.channelId}`);
+        }
         if (!this.messageHandler)
             return;
         const mentionObjects = event.mentions?.map(aid => ({ userId: aid }));
@@ -878,7 +1100,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }
         this.messageHandler({
             channelId: event.channelId || '',
+            channelType: 'aun',
             content: event.text || '',
+            selfId: this._aid,
+            groupId: event.groupId,
             chatType: event.chatType,
             peerId: event.userId || event.channelId || '',
             peerName: event.peerName,
@@ -891,6 +1116,71 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             logger.error(`${this.logPrefix()} Message handler error:`, err);
         });
     }
+    handleEcho(event) {
+        const ts = () => {
+            const d = new Date();
+            return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}.${String(d.getMilliseconds()).padStart(3, '0')}`;
+        };
+        // 在收到的消息文本末尾追加 trace 行（只追加,不修改原文）
+        let echoText = event.text;
+        echoText += `\n${ts()} [EvolClaw.receive] from=${event.userId}${event.peerName ? `(${event.peerName})` : ''} mid=${event.messageId} chat=${event.chatType} self=${this._aid || 'unknown'} conn_uptime=${this.connectedAt ? Math.round((Date.now() - this.connectedAt) / 1000) + 's' : 'unknown'}`;
+        echoText += `\n${ts()} [EvolClaw.reply] echo回声发出 conn_uptime=${this.connectedAt ? Math.round((Date.now() - this.connectedAt) / 1000) + 's' : 'unknown'}`;
+        if (Buffer.byteLength(echoText, 'utf-8') > 4096) {
+            echoText += `\n[TRUNCATED]`;
+        }
+        const replyTarget = event.channelId;
+        // 不传 peerId,避免 sendMessage 在头部追加 @peer
+        const context = { metadata: event.replyContext?.metadata };
+        const sendStart = Date.now();
+        this.isEchoSending = true;
+        this.sendMessage(replyTarget, echoText, context).then(() => {
+            this.isEchoSending = false;
+            const elapsed = Date.now() - sendStart;
+            logger.info(`${this.logPrefix()} Echo reply sent to ${replyTarget} (${elapsed}ms)`);
+        }).catch(e => {
+            this.isEchoSending = false;
+            logger.error(`${this.logPrefix()} Echo reply failed: ${e}`);
+        });
+    }
+    /**
+     * 处理 SDK 'gateway.disconnect' 事件 — 服务端主动断开（含同槽位互踢）。
+     *
+     * 当另一个进程用同 AID + 同 slot 抢连接时，老连接会被踢，detail 字段含：
+     *   - self_extra_info: 本进程当时 connect 上报的内容（可证明"是我自己被踢了"）
+     *   - new_extra_info:  挤掉本连接的新进程上报的内容（指出"谁踢的我"）
+     *
+     * 把这些信息打到 logger.warn，便于通过 evolclaw watch / 日志查看。
+     */
+    handleGatewayDisconnect(data) {
+        if (!data || typeof data !== 'object')
+            return;
+        const d = data;
+        const code = d.code;
+        const reason = d.reason ?? '';
+        const detail = (d.detail && typeof d.detail === 'object' && !Array.isArray(d.detail)) ? d.detail : {};
+        const selfExtra = detail.self_extra_info;
+        const newExtra = detail.new_extra_info;
+        const fmtExtra = (e) => {
+            if (!e || typeof e !== 'object')
+                return '<none>';
+            const obj = e;
+            const parts = [];
+            const keys = ['app', 'version', 'pid', 'started_at_iso', 'hostname', 'launched_by', 'evolclaw_home', 'agent_name', 'channel_name'];
+            for (const k of keys) {
+                if (obj[k] !== undefined && obj[k] !== '')
+                    parts.push(`${k}=${String(obj[k])}`);
+            }
+            return parts.length ? parts.join(' ') : JSON.stringify(obj);
+        };
+        if (selfExtra || newExtra) {
+            logger.warn(`${this.logPrefix()} 🥊 Kicked by another connection (code=${code} reason=${reason})`);
+            logger.warn(`${this.logPrefix()}   ↳ me  : ${fmtExtra(selfExtra)}`);
+            logger.warn(`${this.logPrefix()}   ↳ them: ${fmtExtra(newExtra)}`);
+        }
+        else {
+            logger.warn(`${this.logPrefix()} Server-initiated disconnect: code=${code} reason=${reason} detail=${JSON.stringify(detail)}`);
+        }
+    }
     handleConnectionState(data) {
         if (!data || typeof data !== 'object')
             return;
@@ -902,56 +1192,181 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         logger.info(`[AUN][DIAG-STALE] connection.state event: state=${state} attempt=${data.attempt ?? '-'} | connected_before=${connectedBefore} sdk_state=${sdkState}`);
         if (state === 'connected') {
             this.connected = true;
-            this.reconnectAttempt = 0;
+            this.connectedAt = Date.now();
             this.lastReconnectLogTime = 0;
             this.lastReconnectLogAttempt = 0;
+            this.setAidStatus('connected', { lastConnectedAt: Date.now(), lastError: undefined, gatewayUrl: this.client?._gatewayUrl });
             this.trace('IN', 'connection.state', data);
             logger.info(`${this.logPrefix()} Connected`);
+            // 不在这里清 flapCount —— 短命连接一上来就会触发本分支，
+            // 必须等 disconnected 时根据 lifetime 决定是否清零
+            this.drainOutbox();
         }
-        else if (state === 'disconnected') {
-            this.connected = false;
-            this.trace('IN', 'connection.state', data);
-            logger.warn(`${this.logPrefix()} Disconnected: ${data.error ?? 'unknown'}`);
-        }
-        else if (state === 'reconnecting') {
+        else if (state === 'disconnected' || state === 'reconnecting') {
+            const wasConnected = this.connected;
             this.connected = false;
-            const attempt = data.attempt ?? 0;
-            const now = Date.now();
-            // Throttled logging: first attempt, every N attempts, or every M seconds
-            const isFirst = attempt <= 1;
-            const isStep = attempt - this.lastReconnectLogAttempt >= AUNChannel.RECONNECT_LOG_STEP;
-            const isInterval = now - this.lastReconnectLogTime >= AUNChannel.RECONNECT_LOG_INTERVAL;
-            if (isFirst || isStep || isInterval) {
-                const suppressed = attempt - this.lastReconnectLogAttempt - 1;
-                const suffix = suppressed > 0 ? `, ${suppressed} suppressed since last log` : '';
-                logger.info(`${this.logPrefix()} SDK reconnecting (attempt ${attempt}${suffix})`);
-                this.lastReconnectLogTime = now;
-                this.lastReconnectLogAttempt = attempt;
+            this.aidState.reconnectCount++;
+            this.aidState.lastAttemptAt = Date.now();
+            this.setAidStatus('reconnecting');
+            // Flap 检测：仅在从 connected 状态过渡时统计
+            if (wasConnected && this.connectedAt > 0) {
+                const lifetime = Date.now() - this.connectedAt;
+                this.connectedAt = 0;
+                if (lifetime < AUNChannel.FLAP_WINDOW_MS) {
+                    this.flapCount++;
+                    logger.warn(`${this.logPrefix()} Flap #${this.flapCount}/${AUNChannel.FLAP_THRESHOLD}: connection lived ${lifetime}ms (< ${AUNChannel.FLAP_WINDOW_MS}ms)`);
+                    if (this.flapCount >= AUNChannel.FLAP_THRESHOLD && !this.intentionalDisconnect) {
+                        logger.error(`${this.logPrefix()} Persistent kick detected (${this.flapCount} flaps), taking over from SDK with ${AUNChannel.TAKEOVER_DELAY_MS / 1000}s backoff`);
+                        this.flapCount = 0;
+                        this.takeoverReconnect(AUNChannel.TAKEOVER_DELAY_MS, 'flap');
+                        return;
+                    }
+                }
+                else {
+                    // 连接稳定过 ≥ FLAP_WINDOW_MS，重置 flap 计数
+                    if (this.flapCount > 0) {
+                        logger.info(`${this.logPrefix()} Stable connection (lived ${lifetime}ms), resetting flap counter`);
+                    }
+                    this.flapCount = 0;
+                }
+            }
+            if (state === 'disconnected') {
                 this.trace('IN', 'connection.state', data);
+                logger.warn(`${this.logPrefix()} Disconnected: ${data.error ?? 'unknown'}`);
             }
-            // Detect runaway SDK reconnect loop: force disconnect and use TS-layer backoff
-            if (attempt >= AUNChannel.SDK_RECONNECT_GIVEUP && !this.intentionalDisconnect) {
-                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' });
-                    this.client.close().catch(() => { });
-                    this.client = null;
+            else {
+                // reconnecting：节流日志（SDK 自己已经在跑指数退避，不刷屏）
+                const attempt = data.attempt ?? 0;
+                const now = Date.now();
+                const isFirst = attempt <= 1;
+                const isStep = attempt - this.lastReconnectLogAttempt >= AUNChannel.RECONNECT_LOG_STEP;
+                const isInterval = now - this.lastReconnectLogTime >= AUNChannel.RECONNECT_LOG_INTERVAL;
+                if (isFirst || isStep || isInterval) {
+                    const suppressed = attempt - this.lastReconnectLogAttempt - 1;
+                    const suffix = suppressed > 0 ? `, ${suppressed} suppressed since last log` : '';
+                    logger.info(`${this.logPrefix()} SDK reconnecting (attempt ${attempt}${suffix})`);
+                    this.lastReconnectLogTime = now;
+                    this.lastReconnectLogAttempt = attempt;
+                    this.trace('IN', 'connection.state', data);
                 }
-                this.scheduleReconnect();
             }
         }
         else if (state === 'terminal_failed') {
             this.connected = false;
+            this.connectedAt = 0;
             this.trace('IN', 'connection.state', data);
-            const reason = data.reason ?? '';
-            logger.error(`${this.logPrefix()} Terminal failure: ${data.error ?? 'unknown'}${reason ? ` (${reason})` : ''}`);
-            if (!this.intentionalDisconnect) {
-                this.scheduleReconnect();
+            const d = data;
+            const reason = d.reason ?? '';
+            const error = d.error ?? 'unknown';
+            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');
             }
+            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');
+            }
+        }
+    }
+    /** 判断 terminal_failed 的 reason 是否属于"被踢"类 */
+    isKickReason(reason) {
+        if (!reason)
+            return false;
+        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))
+            return true;
+        return false;
+    }
+    /**
+     * TS 层接管重连：force close 当前 SDK client，安排 delayMs 后重新 initClient。
+     * 用于 flap / kicked / terminal_failed 三类场景，统一退避路径。
+     */
+    takeoverReconnect(delayMs, reason) {
+        if (this.intentionalDisconnect)
+            return;
+        // 递增 generation，使任何正在进行的旧 initClient 回调失效
+        const gen = ++this.reconnectGeneration;
+        // 清掉已有 timer，避免叠加
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+        // Force close SDK client，中断它内部的重连循环
+        if (this.client) {
+            this.trace('OUT', 'client.close', { reason: `takeover_${reason}` });
+            this.client.close().catch(() => { });
+            this.client = null;
         }
+        this.connected = false;
+        const delaySec = Math.round(delayMs / 1000);
+        logger.info(`${this.logPrefix()} Scheduling TS-layer reconnect (${reason}) in ${delaySec}s`);
+        this.trace('OUT', 'reconnect.scheduled', { reason, delayMs, generation: gen });
+        this.reconnectTimer = setTimeout(async () => {
+            this.reconnectTimer = null;
+            // 如果在等待期间又触发了新的 takeoverReconnect，本次作废
+            if (gen !== this.reconnectGeneration) {
+                logger.info(`${this.logPrefix()} TS-layer reconnect (${reason}) cancelled: generation stale (${gen} vs ${this.reconnectGeneration})`);
+                return;
+            }
+            try {
+                logger.info(`${this.logPrefix()} TS-layer reconnect (${reason}) starting...`);
+                this.trace('OUT', 'reconnect.start', { reason, generation: gen });
+                await this.initClient();
+                // initClient 完成后再次校验 generation，防止 initClient 期间被新的 takeover 取代
+                if (gen !== this.reconnectGeneration) {
+                    logger.info(`${this.logPrefix()} TS-layer reconnect (${reason}) succeeded but generation stale, closing stale client`);
+                    if (this.client) {
+                        this.client.close().catch(() => { });
+                        this.client = null;
+                    }
+                    this.connected = false;
+                    return;
+                }
+                this.trace('OUT', 'reconnect.ok', { reason, generation: gen });
+                logger.info(`${this.logPrefix()} TS-layer reconnect (${reason}) succeeded`);
+            }
+            catch (err) {
+                this.trace('OUT', 'reconnect.error', { reason, error: String(err), generation: gen });
+                logger.error(`${this.logPrefix()} TS-layer reconnect (${reason}) failed: ${err}`);
+                // initClient 内部已经在失败路径触发 scheduleReconnect 了，这里不重复
+            }
+        }, delayMs);
     }
     // ── Public API (same interface as before) ───────────────────
+    setEventBus(bus) {
+        // 重新订阅前先解掉旧的——避免 reload/重连后 listener 累积
+        if (this.eventBus && this.ownerBoundHandler && typeof this.eventBus.unsubscribe === 'function') {
+            this.eventBus.unsubscribe('channel:owner-bound', this.ownerBoundHandler);
+        }
+        this.ownerBoundHandler = null;
+        this.eventBus = bus;
+        if (bus && typeof bus.subscribe === 'function') {
+            const handler = (event) => {
+                if (event.channelName !== this.config.channelName)
+                    return;
+                // sendWelcomeMessage 内部读 config.json 中最新的 owners[0]，并幂等检查 initialized
+                // 自身做 client 健康检查后再发
+                if (!this.client) {
+                    logger.info(`${this.logPrefix()} owner-bound event received but client not connected; skip welcome retry`);
+                    return;
+                }
+                this.sendWelcomeMessage().catch(e => {
+                    logger.warn(`${this.logPrefix()} owner-bound welcome retry failed: ${e}`);
+                });
+            };
+            bus.subscribe('channel:owner-bound', handler);
+            this.ownerBoundHandler = handler;
+        }
+    }
     onProjectPathRequest(provider) {
         this.projectPathProvider = provider;
     }
@@ -961,41 +1376,99 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     setSessionModeResolver(resolver) {
         this.sessionModeResolver = resolver;
     }
+    setDispatchModeResolver(resolver) {
+        this.dispatchModeResolver = resolver;
+    }
     onRecall(handler) {
         this.recallHandler = handler;
     }
     async sendMessage(channelId, text, context) {
-        // [DIAG-STALE] 进入 sendMessage 时记录 evolclaw connected 标志和 SDK _state，
-        // 用于检测两者是否一致：若 connected=true 但 sdk_state != 'connected'，即为 stale 状态
-        const sdkStateOnEntry = this.client?._state ?? 'no-client';
-        if (this.connected !== (sdkStateOnEntry === 'connected')) {
-            logger.warn(`[AUN][DIAG-STALE] sendMessage entry MISMATCH: connected=${this.connected} sdk_state=${sdkStateOnEntry} channel=${channelId} text=${text.slice(0, 40)}`);
-        }
-        else {
-            logger.debug(`[AUN][DIAG-STALE] sendMessage entry: connected=${this.connected} sdk_state=${sdkStateOnEntry} channel=${channelId}`);
-        }
-        if (!this.connected || !this.client) {
-            logger.warn(`${this.logPrefix()} Cannot send: not connected`);
-            return;
-        }
         if (!text?.trim()) {
             logger.warn(`${this.logPrefix()} Attempted to send empty message, skipping`);
             return;
         }
+        // 长 echo: agent 首次回复前先发 echo trace（echo 自身发送时跳过）
+        if (!this.isEchoSending) {
+            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);
-        // 群聊 @ 兜底：提示词已告知 agent 要 @，但如果 agent 没写，系统自动补上
         if (this.isGroupId(channelId) && context?.peerId) {
             if (!finalText.includes(`@${context.peerId}`)) {
                 finalText = `@${context.peerId} ` + finalText;
             }
         }
+        // Write-ahead: persist to outbox before attempting send
+        const entry = outbox.enqueue(this.config.aid, {
+            channelId,
+            type: 'text',
+            text: finalText,
+            context,
+        });
+        logger.debug(`${this.logPrefix()} Outbox enqueued: id=${entry.id} channel=${channelId} text=${finalText.slice(0, 40)}`);
+        if (!this.connected || !this.client) {
+            logger.warn(`${this.logPrefix()} Not connected, message queued in outbox (id=${entry.id}). Triggering reconnect.`);
+            if (!this.reconnectTimer && !this.client) {
+                this.initClient().catch(e => logger.error(`${this.logPrefix()} Reconnect from sendMessage failed: ${e}`));
+            }
+            return;
+        }
+        // Attempt immediate delivery
+        const ok = await this.deliverTextEntry(entry);
+        if (ok) {
+            outbox.remove(this.config.aid, entry.id);
+        }
+    }
+    async flushPendingEcho(channelId) {
+        // 查找该 channelId 是否有 pending echo（长 echo 等待 agent 首次回复）
+        for (const [key, echo] of this.pendingEchoMessages) {
+            if (echo.channelId === channelId) {
+                this.pendingEchoMessages.delete(key);
+                logger.info(`${this.logPrefix()} [Echo] flushPendingEcho triggered: key=${key} channelId=${channelId} pendingCount=${this.pendingEchoMessages.size}`);
+                const ts = () => {
+                    const d = new Date();
+                    return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}:${String(d.getSeconds()).padStart(2, '0')}.${String(d.getMilliseconds()).padStart(3, '0')}`;
+                };
+                const agentDuration = Date.now() - echo.receiveTs;
+                let echoText = echo.text;
+                echoText += `\n${ts()} [EvolClaw.agent] duration=${agentDuration}ms`;
+                echoText += `\n${ts()} [EvolClaw.reply] echo回声发出 conn_uptime=${this.connectedAt ? Math.round((Date.now() - this.connectedAt) / 1000) + 's' : 'unknown'}`;
+                if (Buffer.byteLength(echoText, 'utf-8') > 4096) {
+                    echoText += `\n[TRUNCATED]`;
+                }
+                // 直接投递 echo trace（不经过 sendMessage 避免 @peer 前缀和递归）
+                if (this.connected && this.client) {
+                    const echoEntry = {
+                        id: `echo-${Date.now()}-${crypto.randomBytes(2).toString('hex')}`,
+                        ts: Date.now(),
+                        aid: this.config.aid,
+                        channelId,
+                        type: 'text',
+                        text: echoText,
+                        ttl: 300_000,
+                    };
+                    const ok = await this.deliverTextEntry(echoEntry);
+                    if (!ok) {
+                        outbox.enqueue(this.config.aid, { channelId, type: 'text', text: echoText });
+                    }
+                    logger.info(`${this.logPrefix()} [Echo] long echo trace delivered=${ok} to ${channelId} (agent ${agentDuration}ms)`);
+                }
+                else {
+                    outbox.enqueue(this.config.aid, { channelId, type: 'text', text: echoText });
+                    logger.warn(`${this.logPrefix()} [Echo] not connected, echo trace queued in outbox`);
+                }
+                break;
+            }
+        }
+    }
+    async deliverTextEntry(entry) {
+        const channelId = entry.channelId;
+        const finalText = entry.text;
+        const context = entry.context;
         const payload = { type: 'text', text: finalText };
-        // 出站群消息：从正文提取 @aid 填入结构化 mentions（与 aun CLI 对齐，方便对端按 mentions 过滤）
         if (this.isGroupId(channelId)) {
             const extracted = this.extractMentionAidsFromText(finalText);
             if (extracted.length > 0)
@@ -1008,12 +1481,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (context?.metadata?.chatmode)
             payload.chatmode = context.metadata.chatmode;
         const isGroup = this.isGroupId(channelId);
-        // Multi-instance routing: channelId may be "aid:device_id:slot_id"
-        const colonIdx = channelId.indexOf(':');
-        const targetAid = colonIdx > 0 ? channelId.substring(0, colonIdx) : channelId;
-        if (colonIdx > 0) {
-            payload.chat_id = channelId;
-        }
+        const targetAid = channelId;
         const encryptTarget = isGroup ? channelId : targetAid;
         const encrypt = context?.metadata?.encrypted != null
             ? !!(context.metadata.encrypted)
@@ -1034,6 +1502,8 @@ 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);
                 }
             }
             else {
@@ -1044,8 +1514,11 @@ 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);
                 }
             }
+            return true;
         }
         catch (e) {
             if (encrypt && e instanceof E2EEError) {
@@ -1069,15 +1542,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                             logger.warn(`${this.logPrefix()} message.send fallback returned no message_id: ${JSON.stringify(result)}`);
                         }
                     }
+                    return true;
                 }
                 catch (e2) {
                     this.trace('OUT', 'send.fallback.error', { channelId, error: String(e2) });
                     logger.error(`${this.logPrefix()} Plaintext fallback also failed to ${channelId}: ${e2}`);
+                    return false;
                 }
             }
             else {
                 this.trace('OUT', 'send.error', { channelId, error: String(e) });
-                logger.error(`${this.logPrefix()} Send failed to ${channelId}: ${e}`);
+                logger.error(`${this.logPrefix()} Send failed to ${channelId} (outbox id=${entry.id}): ${e}`);
+                return false;
             }
         }
     }
@@ -1094,9 +1570,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return;
         if (!taskId)
             return;
-        // Multi-instance routing
-        const colonIdx = channelId.indexOf(':');
-        const targetId = colonIdx > 0 ? channelId.substring(0, colonIdx) : channelId;
+        // 私聊 channelId = 对端 AID（不含 device_id）
+        const targetId = channelId;
         const encrypt = context?.metadata?.encrypted != null
             ? !!(context.metadata.encrypted)
             : this.shouldEncrypt(targetId);
@@ -1106,7 +1581,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             encrypt,
         };
         try {
-            const stage = payload?.stage ?? 'unknown';
+            const itemCount = Array.isArray(payload?.items) ? payload.items.length : 0;
+            const stage = payload?.stage ?? `items=${itemCount}`;
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
                 await this.callAndTrace('group.thought.put', params);
@@ -1123,11 +1599,46 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             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(`${this.logPrefix()} Cannot sendFile: not connected`);
-            return;
+    /**
+     * 发送结构化 payload（type='thought' 等）作为消息历史持久化。
+     * 与 sendThought（thought.put）配对：thought.put 用于前端实时渲染（不入消息历史），
+     * sendStructured 用于把同一内容写入消息历史。
+     * 返回服务端分配的 message_id（失败时返回 null）。
+     */
+    async sendStructured(channelId, payload, context) {
+        if (!this.connected || !this.client)
+            return null;
+        const isGroup = this.isGroupId(channelId);
+        const targetAid = channelId;
+        const encryptTarget = isGroup ? channelId : targetAid;
+        const encrypt = context?.metadata?.encrypted != null
+            ? !!(context.metadata.encrypted)
+            : this.shouldEncrypt(encryptTarget);
+        const finalPayload = { ...payload };
+        if (context?.threadId && !finalPayload.thread_id)
+            finalPayload.thread_id = context.threadId;
+        const params = { payload: finalPayload, encrypt };
+        try {
+            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;
+            }
+            else {
+                params.to = targetAid;
+                const result = await this.callAndTrace('message.send', params);
+                logger.info(`${this.logPrefix()} message.send (${payload.type}) ok: to=${this.peerLabel(targetAid)} mid=${result?.message_id} encrypt=${encrypt}`);
+                return result?.message_id ?? null;
+            }
         }
+        catch (e) {
+            const err = e;
+            logger.warn(`${this.logPrefix()} sendStructured failed (${payload.type}) to ${channelId}: ${err?.name}(${err?.code})=${err?.message}`);
+            return null;
+        }
+    }
+    async sendFile(channelId, filePath, context) {
         const absPath = path.resolve(filePath);
         if (!fs.existsSync(absPath)) {
             logger.warn(`${this.logPrefix()} sendFile: file not found: ${absPath}`);
@@ -1142,15 +1653,42 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             logger.warn(`${this.logPrefix()} sendFile: file too large (${formatSize(stat.size)}, max 10 MB)`);
             return;
         }
+        // Write-ahead: persist to outbox
+        const entry = outbox.enqueue(this.config.aid, {
+            channelId,
+            type: 'file',
+            filePath: absPath,
+            context,
+        });
+        logger.debug(`${this.logPrefix()} Outbox enqueued file: id=${entry.id} channel=${channelId} file=${absPath}`);
+        if (!this.connected || !this.client) {
+            logger.warn(`${this.logPrefix()} Not connected, file send queued in outbox (id=${entry.id}). Triggering reconnect.`);
+            if (!this.reconnectTimer && !this.client) {
+                this.initClient().catch(e => logger.error(`${this.logPrefix()} Reconnect from sendFile failed: ${e}`));
+            }
+            return;
+        }
+        const ok = await this.deliverFileEntry(entry);
+        if (ok) {
+            outbox.remove(this.config.aid, entry.id);
+        }
+    }
+    async deliverFileEntry(entry) {
+        const channelId = entry.channelId;
+        const absPath = entry.filePath;
+        const context = entry.context;
+        if (!fs.existsSync(absPath)) {
+            logger.warn(`${this.logPrefix()} deliverFileEntry: file gone: ${absPath}`);
+            return true; // remove from outbox, file no longer exists
+        }
         const filename = path.basename(absPath);
         const fileData = fs.readFileSync(absPath);
+        const stat = fs.statSync(absPath);
         const sha256 = crypto.createHash('sha256').update(fileData).digest('hex');
         const contentType = guessMime(filename);
         const objectKey = `shared/${crypto.randomUUID()}/${filename}`;
         try {
-            // Upload to storage
             if (stat.size <= 64 * 1024) {
-                // Inline upload for small files (≤64KB)
                 await this.callAndTrace('storage.put_object', {
                     object_key: objectKey,
                     content: fileData.toString('base64'),
@@ -1160,7 +1698,6 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 });
             }
             else {
-                // Ticket upload for large files
                 const session = await this.callAndTrace('storage.create_upload_session', {
                     object_key: objectKey,
                     size_bytes: stat.size,
@@ -1182,7 +1719,6 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     size_bytes: stat.size,
                 });
             }
-            // Send message with attachment
             const attachment = {
                 owner_aid: this._aid || '',
                 object_key: objectKey,
@@ -1203,12 +1739,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             if (context?.metadata?.chatmode)
                 filePayload.chatmode = context.metadata.chatmode;
             const isGroup = this.isGroupId(channelId);
-            // Multi-instance routing
-            const fileColonIdx = channelId.indexOf(':');
-            const fileTargetAid = fileColonIdx > 0 ? channelId.substring(0, fileColonIdx) : channelId;
-            if (fileColonIdx > 0) {
-                filePayload.chat_id = channelId;
-            }
+            const fileTargetAid = channelId;
             const encryptTarget = isGroup ? channelId : fileTargetAid;
             const encrypt = context?.metadata?.encrypted != null
                 ? !!(context.metadata.encrypted)
@@ -1265,10 +1796,48 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 }
             }
             logger.info(`${this.logPrefix()} File sent: ${filename} (${formatSize(stat.size)}) → ${channelId}`);
+            return true;
         }
         catch (e) {
-            this.trace('OUT', 'sendFile.error', { channelId, filePath, error: String(e) });
-            logger.error(`${this.logPrefix()} sendFile failed for ${channelId}: ${e}`);
+            this.trace('OUT', 'sendFile.error', { channelId, filePath: absPath, error: String(e) });
+            logger.error(`${this.logPrefix()} sendFile failed for ${channelId} (outbox id=${entry.id}): ${e}`);
+            return false;
+        }
+    }
+    // ── Outbox drain ───────────────────────────────────────────
+    outboxTimer = null;
+    startOutboxTimer() {
+        if (this.outboxTimer)
+            return;
+        this.outboxTimer = setInterval(() => {
+            if (this.connected && this.client && outbox.hasPending(this.config.aid)) {
+                this.drainOutbox();
+            }
+        }, 30_000);
+    }
+    stopOutboxTimer() {
+        if (this.outboxTimer) {
+            clearInterval(this.outboxTimer);
+            this.outboxTimer = null;
+        }
+    }
+    async drainOutbox() {
+        if (!this.connected || !this.client)
+            return;
+        if (!outbox.hasPending(this.config.aid))
+            return;
+        logger.info(`${this.logPrefix()} Draining outbox...`);
+        const result = await outbox.drain(this.config.aid, async (entry) => {
+            if (entry.type === 'text') {
+                return this.deliverTextEntry(entry);
+            }
+            else if (entry.type === 'file') {
+                return this.deliverFileEntry(entry);
+            }
+            return true; // unknown type, discard
+        });
+        if (result.sent > 0 || result.expired > 0) {
+            logger.info(`${this.logPrefix()} Outbox drained: sent=${result.sent} expired=${result.expired} failed=${result.failed}`);
         }
     }
     acknowledge(messageId) {
@@ -1281,6 +1850,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.sentCount.delete(channelId); // 新任务开始，重置计数
         if (!this.client || !this.connected)
             return;
+        // 旧路 payload（type='event', event='task.*'）—— 前后兼容保留，未来废弃
         const eventMap = {
             start: 'task.started',
             done: 'task.completed',
@@ -1288,55 +1858,81 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             error: 'task.error',
             timeout: 'task.timeout',
         };
-        const payload = {
+        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: status === 'error' || status === 'timeout' ? 'error' : 'info',
+            severity,
         };
         if (context?.threadId)
-            payload.thread_id = context.threadId;
+            eventPayload.thread_id = context.threadId;
+        // 新路 payload（type='status'）—— 结构化任务状态，下游直接读字段不用解析 event 字符串
+        const stateMap = {
+            start: 'started',
+            done: 'completed',
+            interrupted: 'interrupted',
+            error: 'error',
+            timeout: 'timeout',
+        };
+        const statusPayload = {
+            type: 'status',
+            state: stateMap[status] ?? status,
+            task_id: taskId,
+            session_id: sessionId,
+            severity,
+        };
+        if (context?.threadId)
+            statusPayload.thread_id = context.threadId;
         const isGroup = this.isGroupId(channelId);
-        // Multi-instance routing
-        const statusColonIdx = channelId.indexOf(':');
-        const statusTargetAid = statusColonIdx > 0 ? channelId.substring(0, statusColonIdx) : channelId;
-        if (statusColonIdx > 0) {
-            payload.chat_id = channelId;
-        }
+        // 私聊 channelId = 对端 AID（不含 device_id）
+        const statusTargetAid = channelId;
         const encryptTarget = isGroup ? channelId : statusTargetAid;
-        const encrypt = context?.metadata?.encrypted != null
+        // 计算 encrypt 标志（每次调用读最新 peerE2ee 状态，
+        // 这样第二条 send 能受益于第一条触发的 peerE2ee 标记）
+        const computeEncrypt = () => context?.metadata?.encrypted != null
             ? !!(context.metadata.encrypted)
             : this.shouldEncrypt(encryptTarget);
-        const params = { payload, encrypt };
-        const sendWithFallback = (method) => {
-            this.client.call(method, params).catch(e => {
+        const sendOne = (method, payload, label) => {
+            const c = this.client;
+            if (!c) {
+                logger.debug(`${this.logPrefix()} ${label} skipped: client gone`);
+                return Promise.resolve();
+            }
+            const encrypt = computeEncrypt();
+            const params = { payload, encrypt };
+            if (isGroup)
+                params.group_id = channelId;
+            else
+                params.to = statusTargetAid;
+            this.trace('OUT', `${method}.task_${label}`, params);
+            return c.call(method, params).catch(e => {
                 if (encrypt && e instanceof E2EEError) {
                     this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
-                    logger.warn(`${this.logPrefix()} E2EE status send failed to ${channelId}, retrying plaintext`);
-                    params.encrypt = false;
-                    this.client.call(method, params).catch(e2 => {
-                        logger.debug(`${this.logPrefix()} Processing status fallback failed: ${e2}`);
+                    logger.warn(`${this.logPrefix()} E2EE task_${label} send failed to ${channelId}, retrying plaintext`);
+                    const c2 = this.client;
+                    if (!c2)
+                        return;
+                    const fallbackParams = { ...params, encrypt: false };
+                    return c2.call(method, fallbackParams).catch(e2 => {
+                        logger.debug(`${this.logPrefix()} task_${label} fallback failed: ${e2}`);
                     });
                 }
-                else {
-                    logger.debug(`${this.logPrefix()} Processing status failed: ${e}`);
-                }
+                logger.debug(`${this.logPrefix()} task_${label} failed: ${e}`);
             });
         };
-        if (isGroup) {
-            params.group_id = channelId;
-            this.trace('OUT', 'group.send.status', params);
-            sendWithFallback('group.send');
-        }
-        else {
-            params.to = statusTargetAid;
-            this.trace('OUT', 'message.send.status', params);
-            sendWithFallback('message.send');
-        }
+        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);
+        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} encrypt=${encrypt} target=${targetLabel}`);
+        logger.info(`${this.logPrefix()} task.${status} task=${taskId} session=${sessionId} chatmode=${chatmode} target=${targetLabel}`);
     }
     sendCustomPayload(channelId, payload) {
         if (!this.client || !this.connected)
@@ -1351,12 +1947,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         catch {
             payloadObj = { text: payload };
         }
-        // Multi-instance routing
-        const customColonIdx = channelId.indexOf(':');
-        const customTargetAid = customColonIdx > 0 ? channelId.substring(0, customColonIdx) : channelId;
-        if (customColonIdx > 0) {
-            payloadObj.chat_id = channelId;
-        }
+        // 私聊 channelId = 对端 AID（不含 device_id）
+        const customTargetAid = channelId;
         const sendParams = {
             to: customTargetAid, payload: payloadObj,
             encrypt: true,
@@ -1387,43 +1979,20 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             this.client = null;
         }
         this.connected = false;
-        logger.info(`${this.logPrefix()} Disconnected`);
-        if (this.traceStream) {
-            this.traceStream.end();
-            this.traceStream = null;
+        appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'disconnected', aid: this.config.aid, reason: 'intentional' });
+        this.setAidStatus('disabled');
+        if (this.traceWriter) {
+            this.traceWriter.close();
+            this.traceWriter = null;
         }
         logger.info(`${this.logPrefix()} Disconnected`);
     }
-    // ── TS-layer reconnect (fallback when SDK auto_reconnect exhausted) ──
+    // ── TS-layer reconnect ─────────────────────────────────────
+    // SDK 内部已经跑无限指数退避（max_attempts=0, max_delay=300s），
+    // TS 层只负责：(1) initClient 失败时安排兜底重试；(2) flap/kicked 接管路径见 takeoverReconnect。
     scheduleReconnect() {
-        if (this.intentionalDisconnect)
-            return;
-        if (this.reconnectTimer)
-            return;
-        const delays = AUNChannel.RECONNECT_DELAYS;
-        if (this.reconnectAttempt >= delays.length) {
-            logger.error(`${this.logPrefix()} All ${delays.length} reconnect attempts exhausted, giving up`);
-            this.onChannelDown?.();
-            return;
-        }
-        const delay = delays[this.reconnectAttempt];
-        this.reconnectAttempt++;
-        logger.info(`${this.logPrefix()} Scheduling reconnect #${this.reconnectAttempt}/${delays.length} in ${delay}s`);
-        this.reconnectTimer = setTimeout(async () => {
-            this.reconnectTimer = null;
-            try {
-                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(`${this.logPrefix()} Reconnect #${this.reconnectAttempt} succeeded`);
-            }
-            catch (err) {
-                this.trace('OUT', 'reconnect.error', { attempt: this.reconnectAttempt, error: String(err) });
-                logger.error(`${this.logPrefix()} Reconnect #${this.reconnectAttempt} failed:`, err);
-                this.scheduleReconnect();
-            }
-        }, delay * 1000);
+        // initClient 早期失败（auth / connect 阶段）走这里：用 fallback 延迟兜底
+        this.takeoverReconnect(AUNChannel.FALLBACK_DELAY_MS, 'terminal');
     }
     /** Manually trigger reconnect (e.g. from /check reconnect command) */
     async reconnect() {
@@ -1433,7 +2002,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             clearTimeout(this.reconnectTimer);
             this.reconnectTimer = null;
         }
-        this.reconnectAttempt = 0;
+        this.flapCount = 0;
         try {
             await this.initClient();
             return `重连成功 (${this._aid})`;
@@ -1443,7 +2012,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return `重连失败: ${err}，已安排自动重试`;
         }
     }
-    /** Set callback for when all reconnect attempts are exhausted */
+    /** Set callback for when all reconnect attempts are exhausted (deprecated: 现在无限重试，不会触发) */
     setOnChannelDown(callback) {
         this.onChannelDown = callback;
     }
@@ -1452,18 +2021,20 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         return {
             connected: this.connected,
             aid: this._aid,
-            reconnectAttempt: this.reconnectAttempt,
-            maxAttempts: AUNChannel.RECONNECT_DELAYS.length,
+            flapCount: this.flapCount,
             plaintextRecv: this.plaintextRecv,
         };
     }
-    /** 读取本地 agent.md 中的 name（用于身份上下文展示） */
+    /** 读取本地 agent.md 中的 name（用于身份上下文展示），若本地不存在则尝试远程拉取 */
     loadSelfName(aid) {
         try {
             const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
             const agentMdPath = path.join(os.homedir(), '.aun', 'AIDs', aidName, 'agent.md');
-            if (!fs.existsSync(agentMdPath))
+            if (!fs.existsSync(agentMdPath)) {
+                // 异步拉取，不阻塞连接流程
+                this.fetchAndCacheSelfName(aidName);
                 return undefined;
+            }
             const content = fs.readFileSync(agentMdPath, 'utf-8');
             const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
             if (!fmMatch)
@@ -1475,6 +2046,27 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return undefined;
         }
     }
+    async fetchAndCacheSelfName(aidName) {
+        try {
+            const { agentmdGet } = await import('../aun/aid/index.js');
+            const content = await agentmdGet(aidName);
+            if (content) {
+                const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
+                if (fmMatch) {
+                    const nameMatch = fmMatch[1].match(/^name:\s*["']?(.+?)["']?\s*$/m);
+                    const name = nameMatch?.[1]?.trim();
+                    if (name) {
+                        this._selfName = name;
+                        if (this.aidStatsCollector)
+                            this.aidStatsCollector.setSelfName(this.config.aid, name);
+                    }
+                }
+            }
+        }
+        catch {
+            // ignore — name will remain undefined
+        }
+    }
     getSelfName() {
         return this._selfName;
     }
@@ -1500,6 +2092,16 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return { type: null }; // no agent.md → unknown
         }
     }
+    /** 同步取 peerInfo 缓存，未命中返回 undefined，不发起任何网络请求。 */
+    peerInfoCached(aid) {
+        return this.peerInfoCache.get(aid);
+    }
+    /** 后台预取 peerInfo（下次需要时缓存已就绪），任何错误吞掉。 */
+    prefetchPeerInfo(aid) {
+        if (this.peerInfoCache.has(aid))
+            return;
+        void this.fetchPeerInfo(aid).catch(() => { });
+    }
     async uploadAgentMd(content) {
         if (!this.client)
             throw new Error('not connected');
@@ -1537,20 +2139,134 @@ export class AUNChannelPlugin {
                 flushDelay: inst.flushDelay,
                 encryptionSeed: inst.encryptionSeed,
                 owner: inst.owner,
+                agentName: inst.agentName,
+                channelName: inst.name,
                 aunTrace: config.debug?.aunTrace,
                 aunSdkLog: config.debug?.aunSdkLog,
             });
             const adapter = {
                 channelName: inst.name,
-                sendText: (id, text, context) => channel.sendMessage(id, text, context),
-                sendFile: (id, filePath, context) => channel.sendFile(id, filePath, context),
-                acknowledge: (messageId) => { channel.acknowledge(messageId); return Promise.resolve(); },
-                sendProcessingStatus: (id, status, sessionId, taskId, context) => channel.sendProcessingStatus(id, status, sessionId, taskId, context),
-                sendCustomPayload: (id, payload) => channel.sendCustomPayload(id, payload),
-                uploadAgentMd: (content) => channel.uploadAgentMd(content),
-                downloadAgentMd: (aid) => channel.downloadAgentMd(aid),
-                putThought: (id, taskId, payload, context) => channel.sendThought(id, taskId, payload, context),
-                _selfAid: () => channel.getStatus().aid,
+                capabilities: { file: true, image: true, interaction: true, markdown: true, thought: true, status: true },
+                send: async (envelope, payload) => {
+                    const ctx = envelope.replyContext;
+                    const channelId = envelope.channelId;
+                    switch (payload.kind) {
+                        case 'result.text':
+                        case 'command.result':
+                        case 'command.error':
+                        case 'system.notice':
+                        case 'system.error':
+                        case 'result.error': {
+                            const sendCtx = { ...(ctx ?? {}) };
+                            if (payload.kind === 'result.text' && payload.isFinal)
+                                sendCtx.title = '✓ 最终回复:';
+                            await channel.sendMessage(channelId, payload.text, sendCtx);
+                            return;
+                        }
+                        case 'result.file':
+                            await channel.sendFile(channelId, payload.filePath, ctx);
+                            return;
+                        case 'result.image': {
+                            // AUN 支持 image，走 sendStructured 发 type=image payload
+                            const buf = payload.data;
+                            const b64 = buf.toString('base64');
+                            await channel.sendStructured(channelId, {
+                                type: 'image',
+                                alt: payload.alt,
+                                data_base64: b64,
+                                mime_type: payload.mimeType,
+                            }, ctx);
+                            return;
+                        }
+                        case 'activity.batch': {
+                            const aunPayload = {
+                                type: 'thought',
+                                items: payload.items,
+                                client_context: { task_id: envelope.taskId, chatmode: envelope.chatmode, agent_name: envelope.agentName },
+                            };
+                            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),
+                            ]);
+                            return;
+                        }
+                        case 'status.started':
+                            channel.sendProcessingStatus(channelId, 'start', envelope.taskId, envelope.taskId, ctx);
+                            return;
+                        case 'status.completed':
+                            channel.sendProcessingStatus(channelId, 'done', envelope.taskId, envelope.taskId, ctx);
+                            return;
+                        case 'status.interrupted':
+                            channel.sendProcessingStatus(channelId, 'interrupted', envelope.taskId, envelope.taskId, ctx);
+                            return;
+                        case 'status.error':
+                            channel.sendProcessingStatus(channelId, 'error', envelope.taskId, envelope.taskId, ctx);
+                            return;
+                        case 'status.timeout':
+                            channel.sendProcessingStatus(channelId, 'timeout', envelope.taskId, envelope.taskId, ctx);
+                            return;
+                        case 'interaction': {
+                            const req = payload.interaction;
+                            if (req.kind.kind === 'action') {
+                                const action = req.kind;
+                                const aunCard = {
+                                    type: 'action_card',
+                                    title: action.title,
+                                    description: action.body,
+                                    actions: action.buttons.map(btn => ({
+                                        label: btn.label,
+                                        value: btn.key,
+                                        style: btn.style ?? 'default',
+                                        behavior: 'reply',
+                                    })),
+                                };
+                                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: false });
+                                    setTimeout(() => channel.cardMessageIdMap.delete(msgId), 20 * 60 * 1000);
+                                }
+                            }
+                            else if (req.kind.kind === 'command-card') {
+                                const card = req.kind;
+                                const aunCard = {
+                                    type: 'action_card',
+                                    title: card.title,
+                                    description: card.body,
+                                    actions: card.buttons.map(btn => ({
+                                        label: btn.label,
+                                        value: btn.command,
+                                        style: btn.style ?? 'default',
+                                        behavior: 'reply',
+                                    })),
+                                };
+                                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 });
+                                    setTimeout(() => channel.cardMessageIdMap.delete(msgId), 20 * 60 * 1000);
+                                }
+                            }
+                            else if (payload.fallbackText) {
+                                await channel.sendMessage(channelId, payload.fallbackText, ctx);
+                            }
+                            return;
+                        }
+                        case 'custom': {
+                            const text = typeof payload.payload === 'string' ? payload.payload : JSON.stringify(payload.payload);
+                            channel.sendCustomPayload(channelId, text);
+                            return;
+                        }
+                        default:
+                            logger.warn(`[AUN] Unhandled payload kind: ${payload.kind}`);
+                    }
+                }, acknowledge: (messageId) => { channel.acknowledge(messageId); return Promise.resolve(); }, onInteraction: (cb) => { channel.interactionCallback = cb; }, uploadAgentMd: (content) => channel.uploadAgentMd(content),
+                downloadAgentMd: (aid) => channel.downloadAgentMd(aid), _selfAid: () => channel.getStatus().aid,
                 _selfName: () => channel.getSelfName(),
             };
             const policy = {
@@ -1595,6 +2311,53 @@ export class AUNChannelPlugin {
                 connect: () => channel.connect(),
                 disconnect: () => channel.disconnect(),
                 onProjectPathRequest: (channelId) => Promise.resolve(config.projects?.defaultPath || process.cwd()),
+                registerBridge(bridge, channelType) {
+                    bridge.register(adapter.channelName, (handler) => channel.onMessage(async (opts) => {
+                        handler({
+                            channel: adapter.channelName,
+                            channelType,
+                            channelId: opts.channelId,
+                            selfId: opts.selfId,
+                            groupId: opts.groupId,
+                            content: opts.content,
+                            chatType: opts.chatType || 'private',
+                            peerId: opts.peerId || '',
+                            peerName: opts.peerName,
+                            messageId: opts.messageId,
+                            mentions: opts.mentions,
+                            threadId: opts.threadId,
+                            replyContext: opts.replyContext,
+                            source: opts.source,
+                        });
+                    }), (channelId, text, replyContext) => channel.sendMessage(channelId, text, replyContext), adapter, channelType);
+                },
+                registerHooks(ctx) {
+                    channel.setEventBus(ctx.eventBus);
+                    if (channel.setOnChannelDown) {
+                        channel.setOnChannelDown(() => {
+                            ctx.eventBus.publish({
+                                type: 'channel:error',
+                                channel: 'aun',
+                                channelName: adapter.channelName,
+                                status: 'auth_error',
+                                message: `⚠️ AUN 渠道 ${adapter.channelName} 断连，自动重试已用尽。\n使用 /check rty aun 手动重连`,
+                                timestamp: Date.now(),
+                            });
+                        });
+                    }
+                    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);
+                            return session?.metadata?.dispatchMode;
+                        });
+                    }
+                },
             });
         }
         return result;