evolclaw 3.3.0 → 3.4.0

package/dist/channels/aun.js

@@ -206,6 +206,20 @@ export class AUNChannel {
         const name = cached?.name;
         return name && name !== short ? `${short}(${name})` : short;
     }
+    notifyCardActionFailure(channelId, text, operatorId, threadId) {
+        if (!channelId) {
+            logger.warn(`${this.logPrefix()} Card action failure without channelId: ${text}`);
+            return;
+        }
+        const context = {};
+        if (threadId)
+            context.threadId = threadId;
+        if (operatorId && this.isGroupId(channelId))
+            context.peerId = operatorId;
+        void this.sendMessage(channelId, text, context).catch((err) => {
+            logger.error(`${this.logPrefix()} Failed to send card action error:`, err);
+        });
+    }
     extractTextPayload(payload, channelId, senderAid) {
         if (typeof payload === 'string')
             return payload;
@@ -220,6 +234,7 @@ export class AUNChannel {
                 if (cardInfo) {
                     const actionValue = typeof obj.value === 'string' ? obj.value
                         : typeof obj.action_value === 'string' ? obj.action_value : text;
+                    const threadId = typeof obj.thread_id === 'string' ? obj.thread_id : undefined;
                     // 卡片点击者身份：只信认证信封（senderAid 参数，由调用方从 msg.from / msg.sender_aid 提取）。
                     // payload 自报字段（from / sender_aid / user_id）不可信，可被客户端伪造，不读取。
                     // 两类卡片共用：CommandCard → 伪入站消息的 peerId，ActionInteraction → operatorId。
@@ -234,9 +249,10 @@ export class AUNChannel {
                             if (chatType === 'group' && cardInfo.initiatorAid && cardClickerAid
                                 && cardClickerAid !== cardInfo.initiatorAid) {
                                 logger.info(`${this.logPrefix()} CommandCard rejected: clicker=${cardClickerAid} initiator=${cardInfo.initiatorAid} mid=${cardMsgId}`);
+                                this.notifyCardActionFailure(channelId, '⚠️ 仅卡片发起者可操作', cardClickerAid, threadId);
                                 return '';
                             }
-                            this.messageHandler({
+                            Promise.resolve(this.messageHandler({
                                 channelId: channelId || '',
                                 chatType,
                                 content: actionValue,
@@ -244,8 +260,18 @@ export class AUNChannel {
                                 peerName: typeof obj.label === 'string' ? obj.label : typeof obj.action_label === 'string' ? obj.action_label : undefined,
                                 messageId: `card-trigger-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
                                 source: 'card-trigger',
+                            })).catch((err) => {
+                                logger.error(`${this.logPrefix()} CommandCard handler failed: action=${actionValue} mid=${cardMsgId}`, err);
+                                const message = err instanceof Error && err.message ? err.message : String(err || '未知错误');
+                                this.notifyCardActionFailure(channelId, `❌ 操作失败: ${message}`, cardClickerAid, threadId);
                             });
                         }
+                        else if (!this.messageHandler) {
+                            this.notifyCardActionFailure(channelId, '❌ 操作失败：命令处理器未就绪', cardClickerAid, threadId);
+                        }
+                        else {
+                            this.notifyCardActionFailure(channelId, '❌ 操作失败：无效的卡片命令', cardClickerAid, threadId);
+                        }
                     }
                     else {
                         // ActionInteraction：走 interactionCallback → InteractionRouter
@@ -260,10 +286,19 @@ export class AUNChannel {
                                 operatorId: cardClickerAid || undefined,
                             });
                         }
+                        else {
+                            this.notifyCardActionFailure(channelId, '❌ 操作失败：交互处理器未就绪', cardClickerAid, threadId);
+                        }
                     }
                 }
+                else if (this.ownedCardMsgIds.has(cardMsgId)) {
+                    // 本 agent 发出的卡片，但 entry 已过期（20min TTL）
+                    logger.debug(`${this.logPrefix()} action_card_reply expired: cardMsgId=${cardMsgId}`);
+                    this.notifyCardActionFailure(channelId, '⚠️ 卡片已失效，请重新发起');
+                }
                 else {
-                    logger.debug(`${this.logPrefix()} action_card_reply dropped: cardMsgId=${cardMsgId} hasCallback=${!!this.interactionCallback}`);
+                    // 非本 agent 发出的卡片（broadcast 模式下其他 agent 的卡）→ 静默忽略
+                    logger.debug(`${this.logPrefix()} action_card_reply ignored (not owned): cardMsgId=${cardMsgId}`);
                 }
                 // 始终返回空字符串，阻止消息分发给 agent
                 return '';
@@ -404,6 +439,13 @@ export class AUNChannel {
             .replace(/[ \t]+/g, ' ')
             .trim();
     }
+    /** 剥离正文中所有 @aid（用于命令判定 + 命令消息进 agent 前的清理）。 */
+    stripAllMentions(text) {
+        return text
+            .replace(/(^|\s)@[\w.-]+(?=$|\s|[.,!?;:，。！？；：]|[\u4e00-\u9fff])/g, '$1')
+            .replace(/[ \t]+/g, ' ')
+            .trim();
+    }
     extractMentionAids(mentions) {
         const aids = [];
         for (const m of mentions) {
@@ -470,6 +512,8 @@ export class AUNChannel {
     interactionCallback;
     // action_card message_id → { requestId, isCommandCard }（用于关联 action_card_reply）
     cardMessageIdMap = new Map();
+    /** 本 agent 曾发出过的卡片 msgId（只增不删，用于区分"过期失效"vs"他人发的卡"） */
+    ownedCardMsgIds = new Set();
     dispatchModeResolver;
     static PROACTIVE_ALLOW_TYPES = new Set([
         'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
@@ -508,6 +552,7 @@ export class AUNChannel {
     // AID 连接状态（供 status 命令聚合展示）
     aidState;
     aidStatsCollector;
+    outboxInFlight = new Set();
     constructor(config) {
         this.config = config;
         this.agentDir = agentDirPath(config.aid);
@@ -1108,10 +1153,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         logger.info(`${this.logPrefix()} P2P dispatched: from=${shortAid}(${displayName}) mid=${messageId} encrypt=${msgEncrypted} chatmode=${msgChatmode ?? 'none'} text=${finalText.slice(0, 60)}`);
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_in', aid: this.config.aid, from: fromAid, msgId: messageId, kind: 'text', len: finalText.length });
         const isSystemP2P = p2pPayloadType === 'event';
-        this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P, msgEncrypted, msgChatmode);
+        this.aidStatsCollector?.recordInbound(this.config.aid, fromAid, Buffer.byteLength(finalText, 'utf-8'), finalText, isSystemP2P, msgEncrypted, msgChatmode, isSystemP2P ? 'notify' : 'send');
         const replyContext = { metadata: { encrypted: msgEncrypted, chatmode: msgChatmode } };
         if (threadId)
             replyContext.threadId = threadId;
+        replyContext.peerId = fromAid;
+        if (messageId)
+            replyContext.replyToMessageId = messageId;
         this.dispatchMessage({
             channelId: chatId,
             userId: fromAid,
@@ -1237,7 +1285,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // 包含 [EvolClaw.xxx] trace 说明已被本系统处理过，是回声的回声，丢弃防止链式爆炸
         const firstLineGroup = text.split('\n')[0] || '';
         const hasEvolClawTraceGroup = /\[EvolClaw\.(receive|reply|agent)\]/.test(text);
-        if (/echo/i.test(firstLineGroup) && !hasEvolClawTraceGroup) {
+        const isEchoMsg = /echo/i.test(firstLineGroup) && !hasEvolClawTraceGroup;
+        // 命令判定：剥离所有 @ 后看是否 / 开头（多 @ 场景如 @a @b /status 也能正确识别）。
+        // echo 消息走独立的 trace 流程，不参与命令语义判定。
+        const isCommandMsg = !isEchoMsg && this.stripAllMentions(text).startsWith('/');
+        if (isEchoMsg) {
             // 短 echo（≤10 字符）已在前面的快速通道命中并 return，这里只处理长 echo
             // >10 字符：追加 trace,存 pending echo,跳过 mention 过滤继续走 Agent 流程
             const echoTs = () => {
@@ -1262,14 +1314,21 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return;
         }
         else {
-            // 非 echo 消息：正常 mention 过滤
-            if (dispatchMode === 'mention' && !mentionedSelf && !mentionedAll) {
+            // 非 echo 消息：mention 过滤
+            // 命令豁免 broadcast：slash 命令在任何 dispatchMode 下都强制走 mention 语义，
+            // 即必须 @ 本 agent（或 @all）才处理，避免广播群里一条命令被全部 agent 各自执行。
+            const enforceMention = dispatchMode === 'mention' || isCommandMsg;
+            if (enforceMention && !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))})`);
+                logger.info(`${this.logPrefix()} Group dropped: unmentioned (group=${groupId} sender=${senderAid} mid=${messageId} mode=${dispatchMode} isCommand=${isCommandMsg} textPreview=${JSON.stringify(text.slice(0, 80))})`);
                 return;
             }
         }
-        const strippedText = this.stripSelfMentionIfOnly(text, this._aid);
+        // 命令消息：剥离所有 @（多 agent 被 @ 时各自拿到干净的 /status 各自执行）；
+        // 普通消息：仅在唯一 @ 是自己时剥离，保留其他 @ 供 agent 感知。
+        const strippedText = isCommandMsg
+            ? this.stripAllMentions(text)
+            : this.stripSelfMentionIfOnly(text, this._aid);
         // Detect attachments before the empty-text guard (顶层 + 嵌套)
         const rawAttachments = this.collectAllAttachments(payload);
         const hasAttachments = rawAttachments.length > 0;
@@ -1306,7 +1365,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         const msgChatmode = (payload && typeof payload === 'object') ? payload.chatmode : undefined;
         logger.info(`${this.logPrefix()} Group dispatched: group=${groupId} sender=${shortAid}(${displayName}) mode=${dispatchMode} mid=${messageId} chatmode=${msgChatmode ?? 'none'} text=${finalText.slice(0, 60)}`);
         appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_in', aid: this.config.aid, from: senderAid, msgId: messageId, kind: 'text', len: finalText.length, groupId });
-        this.aidStatsCollector?.recordInbound(this.config.aid, senderAid, Buffer.byteLength(finalText, 'utf-8'), finalText, payloadType === 'event', msgEncrypted, msgChatmode);
+        this.aidStatsCollector?.recordInbound(this.config.aid, senderAid, Buffer.byteLength(finalText, 'utf-8'), finalText, payloadType === 'event', msgEncrypted, msgChatmode, payloadType === 'event' ? 'notify' : 'send');
         // 渲染用完整 @ 列表：结构化 payload.mentions + 正文 @aid 兜底，去重（含 self / "all"）。
         // 与上面用于过滤/回复的精简 mentions 独立——这份不丢任何被 @ 的 AID。
         const renderMentionAids = Array.from(new Set([
@@ -1330,7 +1389,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             mentions,
             mentionAids: renderMentionAids.length > 0 ? renderMentionAids : undefined,
             replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmode),
-            dispatchMode,
+            dispatchMode: serverDispatchMode,
             images: inboundImages.length > 0 ? inboundImages : undefined,
         });
     }
@@ -1574,11 +1633,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             const len = Buffer.byteLength(text, 'utf-8');
             if (dir === 'in') {
                 appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_in', aid: this.config.aid, from: ownerAid, msgId, kind: 'text', len, inject: true });
-                this.aidStatsCollector?.recordInbound(this.config.aid, ownerAid, len, text, false, false, 'inject');
+                this.aidStatsCollector?.recordInbound(this.config.aid, ownerAid, len, text, false, false, 'inject', 'inject');
             }
             else {
                 appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: ownerAid, msgId, kind: 'text', len, inject: true });
-                this.aidStatsCollector?.recordOutbound(this.config.aid, ownerAid, len, text, false, false, 'inject');
+                this.aidStatsCollector?.recordOutbound(this.config.aid, ownerAid, len, text, false, false, 'inject', 'inject');
             }
         }
         catch (e) {
@@ -1935,6 +1994,219 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     onRecall(handler) {
         this.recallHandler = handler;
     }
+    async withOutboxInFlight(entry, run, busyValue) {
+        if (this.outboxInFlight.has(entry.id))
+            return busyValue;
+        this.outboxInFlight.add(entry.id);
+        try {
+            return await run();
+        }
+        finally {
+            this.outboxInFlight.delete(entry.id);
+        }
+    }
+    messageIdFromSendResult(result) {
+        return result?.message?.message_id ?? result?.message_id ?? null;
+    }
+    payloadLogText(payload, contentKind) {
+        if (typeof payload.text === 'string' && payload.text)
+            return payload.text;
+        switch (contentKind ?? payload.type) {
+            case 'image':
+                return payload.alt ? `[image] ${payload.alt}` : '[image]';
+            case 'card':
+            case 'action_card':
+                return payload.title ? `[card] ${payload.title}` : '[card]';
+            case 'file':
+                return payload.filename ? `[file] ${payload.filename}` : '[file]';
+            default:
+                return `[${String(payload.type ?? contentKind ?? 'payload')}]`;
+        }
+    }
+    payloadByteLength(payload, logText) {
+        if (payload.type === 'image' && typeof payload.data_base64 === 'string') {
+            return Buffer.byteLength(payload.data_base64, 'utf-8');
+        }
+        return Buffer.byteLength(logText, 'utf-8');
+    }
+    applyReplyContextToPayload(payload, context) {
+        const finalPayload = { ...payload };
+        if (context?.threadId && !finalPayload.thread_id)
+            finalPayload.thread_id = context.threadId;
+        if (context?.metadata?.taskId && !finalPayload.task_id)
+            finalPayload.task_id = context.metadata.taskId;
+        if (context?.metadata?.chatmode && !finalPayload.chatmode)
+            finalPayload.chatmode = context.metadata.chatmode;
+        return finalPayload;
+    }
+    registerCardPostSend(messageId, action) {
+        if (action.type !== 'register_interaction_card')
+            return;
+        this.cardMessageIdMap.set(messageId, {
+            requestId: action.requestId,
+            isCommandCard: action.isCommandCard,
+            initiatorAid: action.initiatorAid,
+        });
+        this.ownedCardMsgIds.add(messageId);
+        const now = Date.now();
+        const mapTtl = action.expiresAt && action.expiresAt > now
+            ? action.expiresAt - now
+            : 20 * 60 * 1000;
+        setTimeout(() => this.cardMessageIdMap.delete(messageId), mapTtl);
+        setTimeout(() => this.ownedCardMsgIds.delete(messageId), 24 * 60 * 60 * 1000);
+    }
+    runPostSend(entry, messageId) {
+        if (!entry.postSend)
+            return;
+        if (entry.postSend.type === 'register_interaction_card') {
+            this.registerCardPostSend(messageId, entry.postSend);
+        }
+    }
+    async sendAunPayload(channelId, payload, context, label) {
+        if (!this.client || !this.connected)
+            return { ok: false };
+        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 method = isGroup ? 'group.send' : 'message.send';
+        const params = { payload, encrypt };
+        if (isGroup)
+            params.group_id = channelId;
+        else
+            params.to = targetAid;
+        const callOnce = async (sendParams, fallback) => {
+            const result = fallback
+                ? await this.client.call(method, sendParams)
+                : await this.callAndTrace(method, sendParams);
+            const mid = this.messageIdFromSendResult(result);
+            if (!mid) {
+                logger.warn(`${this.logPrefix()} ${method}${fallback ? ' fallback' : ''} (${label}) returned no message_id: ${JSON.stringify(result)}`);
+                return { ok: false, result, encrypt: !!sendParams.encrypt };
+            }
+            return { ok: true, messageId: mid, result, encrypt: !!sendParams.encrypt };
+        };
+        try {
+            return await callOnce(params, false);
+        }
+        catch (e) {
+            if (encrypt && e instanceof E2EEError) {
+                this.peerE2ee.set(encryptTarget, { ok: false, ts: Date.now() });
+                logger.warn(`${this.logPrefix()} E2EE ${label} send failed to ${channelId}, retrying plaintext: ${e}`);
+                const fallbackParams = { ...params, encrypt: false };
+                try {
+                    this.trace('OUT', `${method}.${label}.fallback`, fallbackParams);
+                    const sent = await callOnce(fallbackParams, true);
+                    this.trace('OUT', `${method}.${label}.fallback.${sent.ok ? 'ok' : 'missing_id'}`, { message_id: sent.messageId });
+                    return sent;
+                }
+                catch (e2) {
+                    this.trace('OUT', `${method}.${label}.fallback.error`, { channelId, error: String(e2) });
+                    logger.error(`${this.logPrefix()} Plaintext ${label} fallback also failed to ${channelId}: ${e2}`);
+                    return { ok: false };
+                }
+            }
+            this.trace('OUT', `${method}.${label}.error`, { channelId, error: String(e) });
+            logger.error(`${this.logPrefix()} ${label} send failed to ${channelId}: ${e}`);
+            return { ok: false };
+        }
+    }
+    recordDurableOutbound(channelId, payload, messageId, encrypt, context, isGroup, contentKind, logText, result) {
+        const kind = contentKind ?? payload.type ?? 'custom';
+        appendAidEvent({
+            ts: Date.now(),
+            iso: new Date().toISOString(),
+            event: 'message_out',
+            aid: this.config.aid,
+            to: channelId,
+            msgId: messageId,
+            kind,
+            len: Buffer.byteLength(logText, 'utf-8'),
+            ...(isGroup && { groupId: channelId }),
+        });
+        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, this.payloadByteLength(payload, logText), logText, false, encrypt, context?.metadata?.chatmode);
+        const source = context?.metadata?.source ?? 'daemon';
+        this.appendOutboundJsonl(channelId, logText, messageId, encrypt, context, isGroup, 'text', source);
+        this.forwardOutbound(result);
+    }
+    async sendContentPayload(channelId, payload, opts) {
+        const finalPayload = this.applyReplyContextToPayload(payload, opts.context);
+        const logText = opts.logText ?? this.payloadLogText(finalPayload, opts.contentKind);
+        const entry = outbox.enqueue(this.config.aid, {
+            channelId,
+            type: 'payload',
+            contentKind: opts.contentKind,
+            payload: finalPayload,
+            context: opts.context,
+            logText,
+            ttl: opts.ttl,
+            postSend: opts.postSend,
+        });
+        logger.debug(`${this.logPrefix()} Outbox enqueued payload: id=${entry.id} kind=${opts.contentKind} channel=${channelId} text=${logText.slice(0, 40)}`);
+        if (!this.connected || !this.client) {
+            logger.warn(`${this.logPrefix()} Not connected, payload queued in outbox (id=${entry.id}, kind=${opts.contentKind}). Triggering reconnect.`);
+            if (!this.reconnectTimer && !this.client) {
+                this.initClient().catch(e => logger.error(`${this.logPrefix()} Reconnect from sendContentPayload failed: ${e}`));
+            }
+            return { queued: true };
+        }
+        const result = await this.withOutboxInFlight(entry, () => this.deliverPayloadEntry(entry), { ok: false });
+        if (result.ok) {
+            outbox.remove(this.config.aid, entry.id);
+            return { messageId: result.messageId };
+        }
+        return { queued: true };
+    }
+    buildTaskPayloadBase(envelope, context) {
+        const base = {};
+        if (envelope.taskId)
+            base.task_id = envelope.taskId;
+        if (envelope.sessionId)
+            base.session_id = envelope.sessionId;
+        if (envelope.agentName)
+            base.agent_name = envelope.agentName;
+        if (envelope.chatmode)
+            base.chatmode = envelope.chatmode;
+        if (context?.threadId)
+            base.thread_id = context.threadId;
+        if (context?.peerId)
+            base.initiator = context.peerId;
+        if (context?.replyToMessageId)
+            base.ref_message_id = context.replyToMessageId;
+        return base;
+    }
+    activityLogText(raw) {
+        // 兼容两种入参：原始 ThoughtItem（顶层字段），或已构建的 activity payload（字段收在 .item 里）
+        const item = raw?.item && typeof raw.item === 'object' ? raw.item : raw;
+        if (typeof item?.text === 'string' && item.text)
+            return item.text;
+        if (item?.kind === 'tool_call')
+            return `[tool_call] ${item.name ?? ''}`.trim();
+        if (item?.kind === 'tool_result')
+            return `[tool_result] ${item.name ?? ''} ${item.ok === false ? 'failed' : 'ok'}`.trim();
+        if (item?.kind)
+            return `[activity:${item.kind}]`;
+        return '[activity]';
+    }
+    buildActivityPayload(envelope, context, item) {
+        const activityItem = item && typeof item === 'object' && !Array.isArray(item)
+            ? { ...item }
+            : { kind: 'unknown', text: String(item ?? '') };
+        return {
+            ...this.buildTaskPayloadBase(envelope, context),
+            type: 'activity',
+            item: activityItem,
+        };
+    }
+    async sendReliableStructured(channelId, payload, context, logText) {
+        await this.sendContentPayload(channelId, payload, {
+            contentKind: 'custom',
+            context,
+            logText: logText ?? this.payloadLogText(payload, 'custom'),
+        });
+    }
     async sendMessage(channelId, text, context) {
         if (!text?.trim()) {
             logger.warn(`${this.logPrefix()} Attempted to send empty message, skipping`);
@@ -1967,7 +2239,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return;
         }
         // Attempt immediate delivery
-        const ok = await this.deliverTextEntry(entry);
+        const ok = await this.withOutboxInFlight(entry, () => this.deliverTextEntry(entry), false);
         if (ok) {
             outbox.remove(this.config.aid, entry.id);
         }
@@ -2049,16 +2321,17 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 if (!mid) {
                     const dispatchStatus = result?.message_dispatch?.status;
                     if (dispatchStatus === 'debounced' || dispatchStatus === 'dispatched') {
-                        logger.info(`${this.logPrefix()} group.send ok (${dispatchStatus}): group=${channelId} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
+                        logger.warn(`${this.logPrefix()} group.send returned ${dispatchStatus} without message_id; keeping outbox entry: group=${channelId} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     }
                     else {
                         logger.warn(`${this.logPrefix()} group.send returned no message_id: ${JSON.stringify(result)}`);
                     }
+                    return false;
                 }
                 else {
                     logger.info(`${this.logPrefix()} group.send ok: group=${channelId} mid=${mid} encrypt=${encrypt} text=${finalText.slice(0, 60)}`);
                     appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode);
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode, 'send');
                     this.appendOutboundJsonl(channelId, finalText, mid, encrypt, context, true, 'text', source);
                     // Observer forward: outbound (group) — 原样转发 SDK SendResult（含 envelope + payload）
                     this.forwardOutbound(result);
@@ -2069,11 +2342,12 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 const result = await this.callAndTrace('message.send', params);
                 if (!result || !result.message_id) {
                     logger.warn(`${this.logPrefix()} message.send returned no message_id: ${JSON.stringify(result)}`);
+                    return false;
                 }
                 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, false, encrypt, context?.metadata?.chatmode);
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, encrypt, context?.metadata?.chatmode, 'send');
                     this.appendOutboundJsonl(targetAid, finalText, result.message_id, encrypt, context, false, 'text', source);
                     // Observer forward: outbound (private) — 原样转发 SDK SendResult（含 envelope + payload）
                     this.forwardOutbound(result);
@@ -2090,19 +2364,29 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     if (isGroup) {
                         this.trace('OUT', 'group.send.fallback', params);
                         const result = await this.client.call('group.send', params);
-                        this.trace('OUT', 'group.send.fallback.ok', { message_id: result?.message?.message_id ?? result?.message_id });
-                        if (!result || !result.message_id) {
+                        const mid = this.messageIdFromSendResult(result);
+                        this.trace('OUT', 'group.send.fallback.ok', { message_id: mid });
+                        if (!mid) {
                             logger.warn(`${this.logPrefix()} group.send fallback returned no message_id: ${JSON.stringify(result)}`);
+                            return false;
                         }
+                        appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: mid, kind: 'text', len: finalText.length, groupId: channelId });
+                        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(finalText, 'utf-8'), finalText, false, false, context?.metadata?.chatmode);
+                        this.appendOutboundJsonl(channelId, finalText, mid, false, context, true, 'text', source);
                         this.forwardOutbound(result);
                     }
                     else {
                         this.trace('OUT', 'message.send.fallback', params);
                         const result = await this.client.call('message.send', params);
-                        this.trace('OUT', 'message.send.fallback.ok', { message_id: result?.message_id });
-                        if (!result || !result.message_id) {
+                        const mid = result?.message_id;
+                        this.trace('OUT', 'message.send.fallback.ok', { message_id: mid });
+                        if (!result || !mid) {
                             logger.warn(`${this.logPrefix()} message.send fallback returned no message_id: ${JSON.stringify(result)}`);
+                            return false;
                         }
+                        appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: targetAid, msgId: mid, kind: 'text', len: finalText.length });
+                        this.aidStatsCollector?.recordOutbound(this.config.aid, targetAid, Buffer.byteLength(finalText, 'utf-8'), finalText, false, false, context?.metadata?.chatmode);
+                        this.appendOutboundJsonl(targetAid, finalText, mid, false, context, false, 'text', source);
                         this.forwardOutbound(result);
                     }
                     return true;
@@ -2120,6 +2404,26 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
         }
     }
+    async deliverPayloadEntry(entry) {
+        const channelId = entry.channelId;
+        const payload = entry.payload;
+        if (!payload) {
+            logger.warn(`${this.logPrefix()} deliverPayloadEntry: missing payload (outbox id=${entry.id})`);
+            return { ok: true };
+        }
+        const contentKind = entry.contentKind;
+        const logText = entry.logText ?? this.payloadLogText(payload, contentKind);
+        const context = entry.context;
+        logger.info(`${this.logPrefix()} deliverPayloadEntry: id=${entry.id} kind=${contentKind ?? payload.type ?? 'payload'} channelId=${channelId} thread_id=${payload.thread_id ?? 'none'} task_id=${payload.task_id ?? 'none'} textLen=${logText.length}`);
+        const sent = await this.sendAunPayload(channelId, payload, context, `${contentKind ?? payload.type ?? 'payload'}`);
+        if (!sent.ok || !sent.messageId)
+            return sent;
+        const isGroup = this.isGroupId(channelId);
+        logger.info(`${this.logPrefix()} durable payload sent: kind=${contentKind ?? payload.type ?? 'payload'} target=${isGroup ? channelId : this.peerLabel(channelId)} mid=${sent.messageId} encrypt=${sent.encrypt} text=${logText.slice(0, 60)}`);
+        this.recordDurableOutbound(channelId, payload, sent.messageId, !!sent.encrypt, context, isGroup, contentKind, logText, sent.result);
+        this.runPostSend(entry, sent.messageId);
+        return sent;
+    }
     /** 出站消息写入 messages.jsonl（message.send/group.send/thought.put 成功后调用） */
     appendOutboundJsonl(channelId, text, msgId, encrypt, context, isGroup, msgType = 'text', source = 'daemon') {
         try {
@@ -2172,10 +2476,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             encrypt,
         };
         try {
-            const itemCount = Array.isArray(payload?.items) ? payload.items.length : 0;
-            const stage = payload?.stage ?? `items=${itemCount}`;
-            // 提取 thought 文本（只对 kind=text 的 item 写 jsonl，过滤 tool_use/tool_result 等结构化项）
             const items = payload?.items;
+            const itemCount = Array.isArray(items) ? items.length : 1;
+            const stage = payload?.stage ?? (payload?.kind ? `kind=${payload.kind}` : `items=${itemCount}`);
+            // 提取 thought 文本：兼容旧 items[] 和新扁平 activity payload。
             let thoughtText;
             if (Array.isArray(items) && items.length > 0) {
                 const lastItem = items[items.length - 1];
@@ -2193,6 +2497,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     thoughtText = lastItem;
                 }
             }
+            else {
+                thoughtText = this.activityLogText(payload);
+            }
             if (this.isGroupId(channelId)) {
                 params.group_id = targetId;
                 const putRes = await this.callAndTrace('group.thought.put', params);
@@ -2201,7 +2508,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
                 this.forwardOutbound(putRes);
                 if (thoughtText) {
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive');
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive', 'thought');
                     this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, true, 'thought', 'daemon');
                 }
             }
@@ -2213,7 +2520,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 this.eventBus?.publish?.({ type: 'message:thought-put', agentName: this.config.aid, channelId, taskId, text: thoughtText });
                 this.forwardOutbound(putRes);
                 if (thoughtText) {
-                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive');
+                    this.aidStatsCollector?.recordOutbound(this.config.aid, targetId, Buffer.byteLength(thoughtText, 'utf-8'), thoughtText, false, encrypt, context?.metadata?.chatmode ?? 'proactive', 'thought');
                     this.appendOutboundJsonl(channelId, thoughtText, tid ?? `thought-${Date.now()}`, encrypt, context, false, 'thought', 'daemon');
                 }
             }
@@ -2295,7 +2602,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             }
             return;
         }
-        const ok = await this.deliverFileEntry(entry);
+        const ok = await this.withOutboxInFlight(entry, () => this.deliverFileEntry(entry), false);
         if (ok) {
             outbox.remove(this.config.aid, entry.id);
         }
@@ -2365,6 +2672,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 filePayload.task_id = context.metadata.taskId;
             if (context?.metadata?.chatmode)
                 filePayload.chatmode = context.metadata.chatmode;
+            // file-link-cache: 回带点击请求的 correlationId，客户端用它把异步到达的文件消息对回这次 fetch 点击
+            if (context?.metadata?.correlationId)
+                filePayload.correlation_id = context.metadata.correlationId;
             const isGroup = this.isGroupId(channelId);
             const fileTargetAid = channelId;
             const encryptTarget = isGroup ? channelId : fileTargetAid;
@@ -2373,6 +2683,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 : this.shouldEncrypt(encryptTarget);
             const params = { payload: filePayload, encrypt };
             let sendResult = null;
+            let sentMid = null;
             try {
                 if (isGroup) {
                     params.group_id = channelId;
@@ -2380,9 +2691,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     const result = await this.client.call('group.send', params);
                     sendResult = result;
                     const fileMid = result?.message?.message_id ?? result?.message_id;
+                    sentMid = fileMid ?? null;
                     this.trace('OUT', 'group.send.file.ok', { message_id: fileMid });
                     if (!fileMid) {
                         logger.warn(`${this.logPrefix()} group.send.file returned no message_id: ${JSON.stringify(result)}`);
+                        return false;
                     }
                 }
                 else {
@@ -2390,9 +2703,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                     this.trace('OUT', 'message.send.file', params);
                     const result = await this.client.call('message.send', params);
                     sendResult = result;
-                    this.trace('OUT', 'message.send.file.ok', { message_id: result?.message_id });
-                    if (!result || !result.message_id) {
+                    sentMid = result?.message_id ?? null;
+                    this.trace('OUT', 'message.send.file.ok', { message_id: sentMid });
+                    if (!result || !sentMid) {
                         logger.warn(`${this.logPrefix()} message.send.file returned no message_id: ${JSON.stringify(result)}`);
+                        return false;
                     }
                 }
             }
@@ -2410,18 +2725,22 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                         const result = await this.client.call('group.send', params);
                         sendResult = result;
                         const fbMid = result?.message?.message_id ?? result?.message_id;
+                        sentMid = fbMid ?? null;
                         this.trace('OUT', 'group.send.file.fallback.ok', { message_id: fbMid });
                         if (!fbMid) {
                             logger.warn(`${this.logPrefix()} group.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
+                            return false;
                         }
                     }
                     else {
                         this.trace('OUT', 'message.send.file.fallback', params);
                         const result = await this.client.call('message.send', params);
                         sendResult = result;
-                        this.trace('OUT', 'message.send.file.fallback.ok', { message_id: result?.message_id });
-                        if (!result || !result.message_id) {
+                        sentMid = result?.message_id ?? null;
+                        this.trace('OUT', 'message.send.file.fallback.ok', { message_id: sentMid });
+                        if (!result || !sentMid) {
                             logger.warn(`${this.logPrefix()} message.send.file fallback returned no message_id: ${JSON.stringify(result)}`);
+                            return false;
                         }
                     }
                 }
@@ -2430,6 +2749,13 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
                 }
             }
             logger.info(`${this.logPrefix()} File sent: ${filename} (${formatSize(stat.size)}) → ${channelId}`);
+            if (sentMid) {
+                const fileText = filePayload.text;
+                appendAidEvent({ ts: Date.now(), iso: new Date().toISOString(), event: 'message_out', aid: this.config.aid, to: channelId, msgId: sentMid, kind: 'file', len: fileText.length, ...(isGroup && { groupId: channelId }) });
+                this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, Buffer.byteLength(fileText, 'utf-8'), fileText, false, !!params.encrypt, context?.metadata?.chatmode);
+                const source = context?.metadata?.source ?? 'daemon';
+                this.appendOutboundJsonl(channelId, fileText, sentMid, !!params.encrypt, context, isGroup, 'text', source);
+            }
             if (sendResult)
                 this.forwardOutbound(sendResult);
             return true;
@@ -2465,10 +2791,14 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         logger.info(`${this.logPrefix()} Draining outbox...`);
         const result = await outbox.drain(this.config.aid, async (entry) => {
             if (entry.type === 'text') {
-                return this.deliverTextEntry(entry);
+                return this.withOutboxInFlight(entry, () => this.deliverTextEntry(entry), false);
             }
             else if (entry.type === 'file') {
-                return this.deliverFileEntry(entry);
+                return this.withOutboxInFlight(entry, () => this.deliverFileEntry(entry), false);
+            }
+            else if (entry.type === 'payload') {
+                const sent = await this.withOutboxInFlight(entry, () => this.deliverPayloadEntry(entry), { ok: false });
+                return sent.ok;
             }
             return true; // unknown type, discard
         });
@@ -2497,62 +2827,44 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             progress: 'progress',
         };
         const statusPayload = {
-            type: 'status',
-            state: stateMap[status] ?? status,
+            type: 'task.status',
+            status: stateMap[status] ?? status,
             task_id: taskId,
             session_id: sessionId,
             severity,
+            terminal: ['done', 'interrupted', 'error', 'timeout'].includes(status),
             ...(extraMeta && Object.keys(extraMeta).length > 0 && { metadata: extraMeta }),
         };
         if (context?.threadId)
             statusPayload.thread_id = context.threadId;
         if (context?.peerId)
             statusPayload.initiator = context.peerId;
+        if (context?.metadata?.chatmode)
+            statusPayload.chatmode = context.metadata.chatmode;
         if (context?.replyToMessageId)
             statusPayload.ref_message_id = context.replyToMessageId;
-        const isGroup = this.isGroupId(channelId);
-        // 私聊 channelId = 对端 AID（不含 device_id）
-        const statusTargetAid = channelId;
-        const encryptTarget = isGroup ? channelId : statusTargetAid;
-        const computeEncrypt = () => context?.metadata?.encrypted != null
-            ? !!(context.metadata.encrypted)
-            : this.shouldEncrypt(encryptTarget);
-        const sendOne = (method, payload, label) => {
-            const c = this.client;
-            if (!c) {
-                logger.debug(`${this.logPrefix()} ${label} skipped: client gone`);
-                return Promise.resolve(null);
-            }
-            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 task_${label} send failed to ${channelId}, retrying plaintext`);
-                    const c2 = this.client;
-                    if (!c2)
-                        return null;
-                    const fallbackParams = { ...params, encrypt: false };
-                    return c2.call(method, fallbackParams).catch((e2) => {
-                        logger.debug(`${this.logPrefix()} task_${label} fallback failed: ${e2}`);
-                        return null;
-                    });
-                }
-                logger.debug(`${this.logPrefix()} task_${label} failed: ${e}`);
-                return null;
-            });
-        };
-        const method = isGroup ? 'group.send' : 'message.send';
-        sendOne(method, statusPayload, 'status').then(result => {
-            if (result)
-                this.forwardOutbound(result);
+        const notifyOptions = { ttlMs: 60_000 };
+        if (this.isGroupId(channelId))
+            notifyOptions.groupId = channelId;
+        else
+            notifyOptions.to = channelId;
+        this.trace('OUT', 'notify.task_status', {
+            method: 'event/app.task.status',
+            params: statusPayload,
+            options: notifyOptions,
+        });
+        const notify = this.client.notify;
+        if (typeof notify !== 'function') {
+            logger.warn(`${this.logPrefix()} task.${status} notify skipped: client.notify unavailable`);
+            return;
+        }
+        Promise.resolve(notify.call(this.client, 'event/app.task.status', statusPayload, notifyOptions)).then(() => {
+            this.trace('OUT', 'notify.task_status.ok', { task_id: taskId, status: statusPayload.status });
+        }).catch((e) => {
+            this.trace('OUT', 'notify.task_status.error', { task_id: taskId, status: statusPayload.status, error: String(e) });
+            logger.debug(`${this.logPrefix()} task_status notify failed: ${e}`);
         }).catch(() => { });
-        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, JSON.stringify(statusPayload).length, undefined, true);
+        this.aidStatsCollector?.recordOutbound(this.config.aid, channelId, JSON.stringify(statusPayload).length, undefined, true, undefined, undefined, 'notify');
         // 群聊显示 group id 简称，P2P 显示 peer label；从 context.metadata 读取 chatmode
         const targetLabel = this.isGroupId(channelId) ? channelId : this.peerLabel(channelId);
         const chatmode = context?.metadata?.chatmode ?? '?';
@@ -2775,6 +3087,31 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             return undefined; // 不写缓存，下次仍可重试
         }
     }
+    /**
+     * 查询某成员在群里的角色（经 group.get_admins）。
+     * 仅用于话题创建权限校验（稀有事件），故不缓存：每次查权威源，结果天然最新。
+     * 命中 admins 列表（owner+admin）返回其 role；不在列表（含普通 member / observer）返回 'none'；
+     * 未连接 / 异常返回 undefined —— 绝不抛出，由调用方按 fail-closed 处理。
+     */
+    async getGroupMemberRole(groupId, aid) {
+        if (!groupId || !aid)
+            return undefined;
+        if (!this.client)
+            return undefined;
+        try {
+            const result = await this.callAndTrace('group.get_admins', { group_id: groupId });
+            const admins = Array.isArray(result?.admins) ? result.admins : [];
+            const hit = admins.find((m) => m?.aid === aid);
+            if (hit) {
+                const role = hit.role;
+                return role === 'owner' || role === 'admin' ? role : 'admin';
+            }
+            return 'none'; // 不在 owner/admin 列表 → 普通 member / observer / 非成员
+        }
+        catch {
+            return undefined; // 查询失败，调用方 fail-closed
+        }
+    }
 }
 // Plugin implementation
 export class AUNChannelPlugin {
@@ -2804,43 +3141,89 @@ export class AUNChannelPlugin {
             send: async (envelope, payload) => {
                 const replyCtx = envelope.replyContext;
                 const channelId = envelope.channelId;
+                const taskBase = () => channel.buildTaskPayloadBase(envelope, replyCtx);
                 switch (payload.kind) {
                     case 'result.text':
                     case 'command.result':
-                    case 'command.error':
-                    case 'system.notice':
-                    case 'system.error':
-                    case 'result.error': {
+                    case 'command.error': {
                         const sendCtx = { ...(replyCtx ?? {}) };
                         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, replyCtx);
+                    case 'system.notice': {
+                        await channel.sendReliableStructured(channelId, {
+                            type: 'notice',
+                            ...taskBase(),
+                            subtype: payload.subtype,
+                            text: payload.text,
+                            severity: 'info',
+                        }, replyCtx, payload.text);
+                        return;
+                    }
+                    case 'system.error': {
+                        await channel.sendReliableStructured(channelId, {
+                            type: 'error',
+                            ...taskBase(),
+                            subtype: payload.subtype,
+                            message: payload.text,
+                            user_message: payload.text,
+                            recoverable: payload.recoverable,
+                            terminal: !payload.recoverable,
+                        }, replyCtx, payload.text);
                         return;
+                    }
+                    case 'result.error': {
+                        await channel.sendReliableStructured(channelId, {
+                            type: 'error',
+                            ...taskBase(),
+                            reason: payload.reason,
+                            message: payload.text,
+                            user_message: payload.text,
+                            terminal: true,
+                        }, replyCtx, payload.text);
+                        return;
+                    }
+                    case 'result.file': {
+                        const fileCtx = payload.correlationId
+                            ? { ...(replyCtx ?? {}), metadata: { ...(replyCtx?.metadata ?? {}), correlationId: payload.correlationId } }
+                            : replyCtx;
+                        await channel.sendFile(channelId, payload.filePath, fileCtx);
+                        return;
+                    }
                     case 'result.image': {
                         const buf = payload.data;
                         const b64 = buf.toString('base64');
-                        await channel.sendStructured(channelId, {
+                        await channel.sendContentPayload(channelId, {
                             type: 'image', alt: payload.alt, data_base64: b64, mime_type: payload.mimeType,
-                        }, replyCtx);
+                        }, {
+                            contentKind: 'image',
+                            context: replyCtx,
+                            logText: payload.alt ? `[image] ${payload.alt}` : '[image]',
+                        });
                         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 (replyCtx?.threadId)
-                            aunPayload.thread_id = replyCtx.threadId;
-                        if (envelope.chatmode === 'proactive') {
-                            await channel.sendThought(channelId, envelope.taskId, aunPayload, replyCtx);
-                        }
-                        else {
-                            await channel.sendStructured(channelId, aunPayload, replyCtx);
+                        const items = Array.isArray(payload.items) ? payload.items : [];
+                        for (const item of items) {
+                            if (item?.kind === 'progress') {
+                                channel.sendProcessingStatus(channelId, 'progress', envelope.sessionId ?? envelope.taskId, envelope.taskId, replyCtx, {
+                                    activityType: 'progress',
+                                    text: item.text,
+                                    state: item.state,
+                                    toolUses: item.tool_uses,
+                                    durationMs: item.duration_ms,
+                                });
+                                continue;
+                            }
+                            const aunPayload = channel.buildActivityPayload(envelope, replyCtx, item);
+                            if (envelope.chatmode === 'proactive') {
+                                await channel.sendThought(channelId, envelope.taskId, aunPayload, replyCtx);
+                            }
+                            else {
+                                await channel.sendReliableStructured(channelId, aunPayload, replyCtx, channel.activityLogText(item));
+                            }
                         }
                         return;
                     }
@@ -2882,11 +3265,18 @@ export class AUNChannelPlugin {
                                 aunCard.initiator = req.initiatorId;
                             if (replyCtx?.threadId)
                                 aunCard.thread_id = replyCtx.threadId;
-                            const msgId = await channel.sendStructured(channelId, aunCard, replyCtx);
-                            if (msgId) {
-                                channel.cardMessageIdMap.set(msgId, { requestId: req.id, isCommandCard: false, initiatorAid: req.initiatorId });
-                                setTimeout(() => channel.cardMessageIdMap.delete(msgId), 20 * 60 * 1000);
-                            }
+                            await channel.sendContentPayload(channelId, aunCard, {
+                                contentKind: 'card',
+                                context: replyCtx,
+                                logText: action.title ? `[card] ${action.title}` : '[card]',
+                                postSend: {
+                                    type: 'register_interaction_card',
+                                    requestId: req.id,
+                                    isCommandCard: false,
+                                    initiatorAid: req.initiatorId,
+                                    expiresAt: Date.now() + 20 * 60 * 1000,
+                                },
+                            });
                         }
                         else if (req.kind.kind === 'command-card') {
                             const card = req.kind;
@@ -2894,18 +3284,25 @@ export class AUNChannelPlugin {
                                 type: 'action_card',
                                 title: card.title,
                                 actions: card.buttons.map(btn => ({
-                                    label: btn.label, value: btn.command, style: btn.style ?? 'default', behavior: 'reply',
+                                    label: btn.label, value: btn.command, style: btn.style ?? 'default', behavior: 'reply', disabled: btn.disabled || undefined,
                                 })),
                             };
                             if (card.body)
                                 aunCard.description = card.body;
                             if (replyCtx?.threadId)
                                 aunCard.thread_id = replyCtx.threadId;
-                            const msgId = await channel.sendStructured(channelId, aunCard, replyCtx);
-                            if (msgId) {
-                                channel.cardMessageIdMap.set(msgId, { requestId: req.id, isCommandCard: true, initiatorAid: req.initiatorId });
-                                setTimeout(() => channel.cardMessageIdMap.delete(msgId), 20 * 60 * 1000);
-                            }
+                            await channel.sendContentPayload(channelId, aunCard, {
+                                contentKind: 'card',
+                                context: replyCtx,
+                                logText: card.title ? `[card] ${card.title}` : '[card]',
+                                postSend: {
+                                    type: 'register_interaction_card',
+                                    requestId: req.id,
+                                    isCommandCard: true,
+                                    initiatorAid: req.initiatorId,
+                                    expiresAt: Date.now() + 20 * 60 * 1000,
+                                },
+                            });
                         }
                         else if (payload.fallbackText) {
                             await channel.sendMessage(channelId, payload.fallbackText, replyCtx);
@@ -2926,6 +3323,7 @@ export class AUNChannelPlugin {
             uploadAgentMd: (content) => channel.uploadAgentMd(content),
             downloadAgentMd: (aid) => channel.downloadAgentMd(aid),
             getGroupName: (groupId) => channel.getGroupName(groupId),
+            getGroupMemberRole: (groupId, aid) => channel.getGroupMemberRole(groupId, aid),
             _selfAid: () => channel.getStatus().aid,
             _selfName: () => channel.getSelfName(),
         };
@@ -2969,7 +3367,7 @@ export class AUNChannelPlugin {
                 if (typeof channel.setDispatchModeResolver === 'function') {
                     channel.setDispatchModeResolver(async (channelId) => {
                         const session = await hookCtx.sessionManager.getActiveSession(adapter.channelName, channelId);
-                        return session?.metadata?.dispatchMode;
+                        return session?.metadata?.dispatchModeOverride;
                     });
                 }
             },