evolcore 0.0.11 → 0.0.12

package/dist/channels/aun.js

@@ -21,7 +21,7 @@ import { loadAgent } from '../config-store.js';
 import { normalizeAgentLifecycle } from '../config/lifecycle.js';
 import { resolveEffective } from '../config/config-manager.js';
 import { isManagementRole } from '../config/builtin-roles.js';
-import { mentionModeToDispatch } from '../config/mention-mode.js';
+import { normalizeMentionMode } from '../config/mention-mode.js';
 import { getProcessStartTime } from '../utils/process-introspect.js';
 import * as outbox from '../aun/outbox.js';
 import { guessMime, formatSize } from '../utils/media-cache.js';
@@ -34,7 +34,9 @@ import { recordCausationSpan } from '../core/causation/audit.js';
 import { isExplicitGroupId } from '../aun/group-identity.js';
 import { refreshAgentDisplayName, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
 import { readInstalledEvolcoreVersion } from '../utils/evolcore-version.js';
-import { postBootstrapWelcomeOperationId, preparePostBootstrapWelcomeOutbox } from '../core/bootstrap-messages.js';
+import { bindPostBootstrapWelcomeOutboxSession, hasPendingPostBootstrapWelcomeOutbox, postBootstrapWelcomeOperationId, preparePostBootstrapWelcomeOutbox, } from '../core/bootstrap-messages.js';
+import { hasMentionAll, mentionEntryAids, mentionEntryTargets, } from '../core/message/mention-schema.js';
+import { normalizeAunMentionEntries, } from '../aun/msg/mention-schema.js';
 export const AUN_HANDOFF_MARKER_FIELD = '_evolcore_handoff_id';
 const AUN_INTERACTION_CARD_TTL_MS = 24 * 60 * 60 * 1000;
 const IMAGE_MIME_TYPE = /^image\/[!#$%&'*+.^_`|~0-9A-Za-z-]+$/i;
@@ -139,7 +141,7 @@ export function aunOptsToInbound(opts, channel, channelType) {
         replyContext: opts.replyContext,
         source: opts.source,
         images: opts.images,
-        dispatchMode: opts.dispatchMode,
+        mentionMode: opts.mentionMode,
     };
 }
 function verifiedProtectedHeaders(msg, env) {
@@ -698,24 +700,20 @@ export class AUNChannel {
             .replace(/[ \t]+/g, ' ')
             .trim();
     }
-    extractMentionAids(mentions) {
-        const aids = [];
-        for (const m of mentions) {
-            if (typeof m === 'string')
-                aids.push(m);
-            else if (m && typeof m === 'object' && typeof m.aid === 'string')
-                aids.push(m.aid);
+    parsePayloadMentionsOrReject(payload, context, messageId, seq) {
+        const raw = payload && typeof payload === 'object' && !Array.isArray(payload)
+            ? payload.mentions
+            : undefined;
+        try {
+            return normalizeAunMentionEntries(raw);
         }
-        return aids;
-    }
-    hasMentionAll(mentions) {
-        for (const m of mentions) {
-            if (m === 'all')
-                return true;
-            if (m && typeof m === 'object' && m.scope === 'all')
-                return true;
+        catch (error) {
+            this.acknowledgeImmediately(messageId, seq);
+            const detail = error instanceof Error ? error.message : String(error);
+            const code = error?.code ?? 'INVALID_MENTION_SCHEMA';
+            logger.error(`${this.logPrefix()} Dropped ${context}: invalid payload.mentions (${detail}) code=${code} mid=${messageId}`);
+            return undefined;
         }
-        return false;
     }
     /** 从正文提取 @aid（AID 格式：至少三段域名），用于出站填充 payload.mentions */
     static MENTION_AID_RE = /@([a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?){2,})/g;
@@ -731,6 +729,19 @@ export class AUNChannel {
         }
         return out;
     }
+    /**
+     * Convert the AUN text mention notation into the canonical wire entries.
+     * `@all` is intentionally represented by its scope discriminator instead
+     * of being treated as an AID.
+     */
+    extractMentionEntriesFromText(text) {
+        const entries = [];
+        if (this.hasExplicitMention(text, 'all'))
+            entries.push({ scope: 'all' });
+        for (const aid of this.extractMentionAidsFromText(text))
+            entries.push({ aid });
+        return entries;
+    }
     /** Sanitize a raw topicName from untrusted payload: trim, strip control chars, enforce length. */
     sanitizeTopicName(raw) {
         if (typeof raw !== 'string')
@@ -755,6 +766,31 @@ export class AUNChannel {
         }
         return replyContext;
     }
+    claimInboundMessage(kind, messageId, seq) {
+        if (!messageId)
+            return true;
+        // Channel instance names are commonly reused across agents (the default
+        // is simply `aun`). Include the receiving AID so a server-scoped
+        // message_id cannot suppress an unrelated delivery in another channel.
+        const namespace = `${this.config.aid}:${this.config.channelName ?? 'aun'}:aun:${kind}`;
+        const dedupeKey = JSON.stringify([namespace, messageId]);
+        const existing = this.inboundSeenMessages.get(dedupeKey);
+        if (existing) {
+            if (seq !== undefined && existing.seq !== undefined && seq !== existing.seq) {
+                logger.warn(`${this.logPrefix()} Duplicate message_id with conflicting seq: namespace=${namespace} mid=${messageId} firstSeq=${existing.seq} duplicateSeq=${seq}`);
+            }
+            else {
+                logger.debug(`${this.logPrefix()} Duplicate inbound message dropped: namespace=${namespace} mid=${messageId} seq=${seq ?? 'unknown'}`);
+            }
+            this.acknowledgeImmediately(messageId, seq);
+            return false;
+        }
+        this.inboundSeenMessages.set(dedupeKey, { seenAt: Date.now(), seq });
+        if (seq !== undefined)
+            this.messageSeqMap.set(messageId, seq);
+        setTimeout(() => this.inboundSeenMessages.delete(dedupeKey), 5 * 60 * 1000);
+        return true;
+    }
     acknowledgeImmediately(messageId, _seq) {
         // SDK internally manages seq tracking and ack — do not call message.ack RPC directly,
         // as it corrupts the SDK's seqTracker state and breaks V2 e2ee message pull.
@@ -771,10 +807,16 @@ export class AUNChannel {
     _aid;
     _selfName; // 本地 agent.md 中的 name，首次 connect 时读取
     _chatId = ''; // aid:device_id:slot_id — 多实例回声过滤
-    seenMessages = new Map();
+    /**
+     * Inbound application dedupe. The AUN SDK may redeliver the same message
+     * with a different transport sequence, so message_id is the identity and
+     * seq is only retained for ACK/conflict diagnostics. Claiming happens at
+     * the event handler boundary, before payload/slash/mention parsing.
+     */
+    inboundSeenMessages = new Map();
     groupNameCache = new Map(); // groupId → 群显示名（进程内缓存，群名极少变）
     peerInfoCache = new Map();
-    messageSeqMap = new Map(); // messageId → seq (for ack)
+    messageSeqMap = new Map(); // messageId → seq (for ack/diagnostics)
     sentCount = new Map(); // channelId → 已发消息计数（用于判断最终回复）
     peerE2ee = new Map();
     static E2EE_PROBE_TTL = 10 * 60 * 1000; // 10min
@@ -789,7 +831,7 @@ export class AUNChannel {
     interactionCardMessageIds = new Map();
     /** 撤权可能先于 outbox 卡片投递完成；迟到卡片注册后立即撤回。 */
     invalidatedInteractions = new Map();
-    dispatchModeResolver;
+    mentionModeResolver;
     static PROACTIVE_ALLOW_TYPES = new Set([
         'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
         'merge', 'link', 'location', 'personal_card',
@@ -798,6 +840,10 @@ export class AUNChannel {
     static INJECT_REQUEST_TYPE = 'observer.inject';
     /** 绑定请求类型（Evol App → 控制 AID）：快速路径，绕过白名单透传原始 payload JSON 给 bridge。 */
     static BIND_REQUEST_TYPE = 'bind.request';
+    /** 联系人申请本人状态查询：在普通消息准入前交给 bridge，身份只取认证信封。 */
+    static CONTACT_REQUEST_QUERY_TYPE = 'contact.request.query';
+    /** App 联系人申请提交：结构化控制请求，不是 slash command。 */
+    static CONTACT_REQUEST_SUBMIT_TYPE = 'contact.request.submit';
     // Reconnect state
     // SDK 自己跑无限指数退避（1s → 5min）；TS 层只在 SDK 够不到的两类场景下接管：
     //  1. flap：短命 connected 反复出现（SDK 不记忆跨轮 base delay，会从 1s 重新开始）
@@ -1138,6 +1184,14 @@ export class AUNChannel {
             return false;
         return this.reconcilePostBootstrapWelcome();
     }
+    async hasPendingPostBootstrapWelcome() {
+        const aid = this.config.aid.replace(/^@/, '');
+        return hasPendingPostBootstrapWelcomeOutbox(aid);
+    }
+    async bindPostBootstrapWelcomeToSession(sessionId) {
+        const aid = this.config.aid.replace(/^@/, '');
+        return bindPostBootstrapWelcomeOutboxSession(aid, sessionId);
+    }
     /**
      * Resume delivery of an already prepared completion welcome.
      *
@@ -1394,12 +1448,21 @@ export class AUNChannel {
         if (!data || typeof data !== 'object')
             return;
         const msg = data;
+        // Claim before any payload extraction or command parsing. Retransmits may
+        // carry a new seq, but the application identity remains message_id.
+        const messageId = typeof msg.message_id === 'string' ? msg.message_id : '';
+        const seq = typeof msg.seq === 'number' ? msg.seq : undefined;
+        if (!this.claimInboundMessage('private', messageId, seq))
+            return;
         // SDK 0.5.* 移除了顶层 from/to/group_id/encrypted 等别名，统一从 msg.envelope.* 读取。
         // message_id / seq / payload / same_* 等仍是顶层独立字段，不在 envelope 内。
         const env = (msg.envelope && typeof msg.envelope === 'object') ? msg.envelope : {};
         const protectedHeaders = verifiedProtectedHeaders(msg, env);
         const fromAid = env.from ?? '';
         const payload = msg.payload ?? '';
+        const mentions = this.parsePayloadMentionsOrReject(payload, 'p2p.inbound', messageId, seq);
+        if (!mentions)
+            return;
         const causationRef = payload && typeof payload === 'object' && typeof payload._evolcore_causation_ref === 'string'
             ? payload._evolcore_causation_ref
             : undefined;
@@ -1413,15 +1476,19 @@ export class AUNChannel {
         const topicName = (typeof payload === 'object' && payload !== null)
             ? this.sanitizeTopicName(payload.topicName)
             : undefined;
-        const messageId = msg.message_id ?? '';
         const causation = consumeAunCausation(causationRef || messageId, fromAid, this._aid || this.config.aid)
             ?? (causationRef ? consumeAunCausation(messageId, fromAid, this._aid || this.config.aid) : undefined);
-        const seq = msg.seq;
+        const inboundType = (payload && typeof payload === 'object') ? payload.type : undefined;
+        // 终态错误只作为展示信号，不能进入 Agent，也不能被 observer 再次传播。
+        if (inboundType === 'error') {
+            this.acknowledgeImmediately(messageId, seq);
+            logger.info(`${this.logPrefix()} P2P dropped terminal error: from=${fromAid || 'unknown'} mid=${messageId}`);
+            return;
+        }
         // Observer forward (inbound)：在所有过滤之前转发原始明文 payload。
         // forwardInbound 内部排除 self-echo 与 from-owner。
         // 显式排除 observer.inject：它是 owner 对本 agent 的控制消息，不应镜像给观察者
         // （即便日后 from-owner 排除规则调整，也不会泄漏）。
-        const inboundType = (payload && typeof payload === 'object') ? payload.type : undefined;
         if (inboundType !== AUNChannel.INJECT_REQUEST_TYPE) {
             this.forwardInbound(msg);
         }
@@ -1437,10 +1504,13 @@ export class AUNChannel {
         const msgEncrypted = !!env.encrypted;
         if (!msgEncrypted)
             this.plaintextRecv++;
-        // Detect @mentions
-        const mentions = [];
-        if (this._aid && text.includes(`@${this._aid}`)) {
-            mentions.push(this._aid);
+        // Preserve structured mentions for the shared inbound message model.
+        // Text scanning remains only a rendering fallback and is not promoted to
+        // a structured @all decision.
+        if (mentions.length === 0 && this._aid && text.includes(`@${this._aid}`)) {
+            // Private channels historically exposed a self mention even when the
+            // sender omitted payload.mentions; keep that compatibility signal.
+            mentions.push({ aid: this._aid });
         }
         // Process attachments (顶层 + 嵌套在 merge.items / quote.quote 中的)
         const { finalText, images: inboundImages } = await this.processAttachments(payload, text, fromAid);
@@ -1462,8 +1532,10 @@ export class AUNChannel {
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId);
             return;
         }
-        // menu.* 协议：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
-        if (p2pPayloadType.startsWith('menu.')) {
+        // menu.* 与联系人本人状态查询：需要原始 payload JSON 传递给 bridge。
+        if (p2pPayloadType.startsWith('menu.')
+            || p2pPayloadType === AUNChannel.CONTACT_REQUEST_QUERY_TYPE
+            || p2pPayloadType === AUNChannel.CONTACT_REQUEST_SUBMIT_TYPE) {
             this.acknowledgeImmediately(messageId, seq);
             this.appendInboundPayloadJsonl(chatId, fromAid, messageId, msgEncrypted, false, logDescriptor, threadId);
             this.dispatchMessage({
@@ -1474,6 +1546,8 @@ export class AUNChannel {
                 peerType: peerIdentity.type,
                 encrypted: msgEncrypted,
                 protectedHeaders,
+                mentions,
+                mentionAids: mentionEntryAids(mentions),
                 replyContext: this.buildGroupReplyContext(threadId, fromAid, msgEncrypted, messageId),
                 msgType: logDescriptor.msgType,
                 payloadType: logDescriptor.payloadType,
@@ -1502,6 +1576,8 @@ export class AUNChannel {
                 peerName: displayName || undefined,
                 peerType: peerIdentity.type,
                 encrypted: msgEncrypted,
+                mentions,
+                mentionAids: mentionEntryAids(mentions),
                 msgType: logDescriptor.msgType,
                 payloadType: logDescriptor.payloadType,
                 payloadSummary: logDescriptor.payloadSummary,
@@ -1561,28 +1637,38 @@ export class AUNChannel {
         if (!data || typeof data !== 'object')
             return;
         const msg = data;
+        // Deduplicate at the adapter boundary, before mention/slash routing.
+        const messageId = typeof msg.message_id === 'string' ? msg.message_id : '';
+        const seq = typeof msg.seq === 'number' ? msg.seq : undefined;
+        if (!this.claimInboundMessage('group', messageId, seq))
+            return;
         // SDK 0.5.* 移除了顶层 from/sender_aid/group_id/encrypted 等别名，统一从 msg.envelope.* 读取。
-        // message_id / seq / payload / same_* / dispatch_mode 等仍是顶层独立字段，不在 envelope 内。
+        // message_id / seq / payload / same_* / mention_mode 等仍是顶层独立字段，不在 envelope 内。
         const env = (msg.envelope && typeof msg.envelope === 'object') ? msg.envelope : {};
         const protectedHeaders = verifiedProtectedHeaders(msg, env);
         const groupId = env.group_id ?? '';
         const senderAid = env.from ?? '';
         const payload = msg.payload ?? '';
+        const payloadMentionEntries = this.parsePayloadMentionsOrReject(payload, 'group.inbound', messageId, seq);
+        if (!payloadMentionEntries)
+            return;
+        const payloadMentionAids = mentionEntryAids(payloadMentionEntries);
         const logDescriptor = classifyAunPayloadForLog(payload);
         const text = this.extractTextPayload(payload, groupId, senderAid);
         const threadId = typeof payload === 'object' && payload !== null ? payload.thread_id : undefined;
         const topicName = (typeof payload === 'object' && payload !== null)
             ? this.sanitizeTopicName(payload.topicName)
             : undefined;
-        const messageId = msg.message_id ?? '';
-        const seq = msg.seq;
+        const inboundType = (payload && typeof payload === 'object') ? payload.type : undefined;
+        // 终态错误只作为展示信号，不能进入 Agent，也不能被 observer 再次传播。
+        if (inboundType === 'error') {
+            this.acknowledgeImmediately(messageId, seq);
+            logger.info(`${this.logPrefix()} Group dropped terminal error: group=${groupId || 'unknown'} sender=${senderAid || 'unknown'} mid=${messageId}`);
+            return;
+        }
         // Observer forward (inbound)：群聊消息在所有过滤之前转发原始明文 payload。
         // forwardInbound 内部排除 self-echo 与 from-owner。
         this.forwardInbound(msg);
-        // Extract structured mentions from payload (e.g. payload.mentions: ["evolai.agentid.pub"])
-        const payloadMentions = Array.isArray(payload?.mentions)
-            ? payload.mentions.filter((m) => typeof m === 'string')
-            : [];
         logger.debug(`${this.logPrefix()}[DIAG-GRP] full_msg=${JSON.stringify(msg).substring(0, 500)}`);
         if (!groupId || !senderAid) {
             this.acknowledgeImmediately(messageId, seq);
@@ -1654,6 +1740,10 @@ export class AUNChannel {
                     chatType: 'group', messageId, seq, groupId,
                     encrypted: menuEncrypted,
                     protectedHeaders,
+                    mentions: payloadMentionEntries,
+                    mentionAids: payloadMentionAids,
+                    isMentioned: hasMentionAll(payloadMentionEntries)
+                        || (!!this._aid && mentionEntryTargets(payloadMentionEntries).includes(this._aid)),
                     replyContext: this.buildGroupReplyContext(threadId, senderAid, menuEncrypted, messageId, payloadObj?.chatmode, topicName),
                     msgType: logDescriptor.msgType,
                     payloadType: logDescriptor.payloadType,
@@ -1673,17 +1763,17 @@ export class AUNChannel {
         const msgEncrypted = !!env.encrypted;
         if (!msgEncrypted)
             this.plaintextRecv++;
-        // 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');
+        // mention_mode 是唯一的服务端群 @ 策略字段；缺失/非法时使用协议内置默认 disabled。
+        const serverMentionMode = normalizeMentionMode(msg.mention_mode)
+            ?? normalizeMentionMode(payload?.mention_mode)
+            ?? 'disabled';
+        const localMentionMode = normalizeMentionMode(this.mentionModeResolver
+            ? await this.mentionModeResolver(groupId).catch(() => undefined)
+            : undefined);
+        const mentionMode = localMentionMode ?? serverMentionMode;
+        const mentionedSelf = !!this._aid && mentionEntryTargets(payloadMentionEntries).includes(this._aid);
+        // @all 仅认结构化 mentions（payload.mentions），不扫描正文，避免引述性 "@all" 误判。
+        const mentionedAll = hasMentionAll(payloadMentionEntries);
         // Echo 机制优先于 mention 过滤：消息第一行包含 echo 时触发
         // 包含 [EvolCore.xxx] trace 说明已被本系统处理过，是回声的回声，丢弃防止链式爆炸
         const firstLineGroup = text.split('\n')[0] || '';
@@ -1718,16 +1808,17 @@ export class AUNChannel {
         }
         else {
             // 非 echo 消息：mention 标记（不再过滤，交给响应模式决定）
-            // 命令豁免 broadcast：slash 命令在任何 dispatchMode 下都强制走 mention 语义，
+            // slash 命令在任何 mentionMode 下都强制走 mention-only 语义
             // 即必须 @ 本 agent（或 @all）才处理，避免广播群里一条命令被全部 agent 各自执行。
-            const enforceMention = dispatchMode === 'mention' || isCommandMsg;
+            const enforceMention = mentionMode === 'mention-only' || isCommandMsg;
             const isMentioned = mentionedSelf || mentionedAll;
             // 过滤逻辑下移到响应层：这里只标记，不过滤
             // 但为了保持现有行为兼容（避免大量未 @ 消息涌入），暂时保留过滤
             // TODO: Phase 6 实施 selective-response 模式后，移除此过滤，只保留 isMentioned 标记
             if (enforceMention && !isMentioned && !isOwnHandoff) {
                 this.acknowledgeImmediately(messageId, seq);
-                logger.info(`${this.logPrefix()} Group dropped: unmentioned (group=${groupId} sender=${senderAid} mid=${messageId} mode=${dispatchMode} isCommand=${isCommandMsg} textPreview=${JSON.stringify(text.slice(0, 80))})`);
+                this.appendInboundPayloadJsonl(groupId, senderAid, messageId, msgEncrypted, true, logDescriptor, threadId);
+                logger.info(`${this.logPrefix()} Group dropped: unmentioned (group=${groupId} sender=${senderAid} mid=${messageId} mentionMode=${mentionMode} isCommand=${isCommandMsg} textPreview=${JSON.stringify(text.slice(0, 80))})`);
                 return;
             }
         }
@@ -1745,9 +1836,7 @@ export class AUNChannel {
             logger.debug(`${this.logPrefix()} Group dropped: empty text and no attachments (group=${groupId} sender=${senderAid} mid=${messageId})`);
             return;
         }
-        const mentions = mentionedAll
-            ? ['all']
-            : mentionedSelf && this._aid ? [this._aid] : [];
+        const mentions = payloadMentionEntries;
         // Process attachments
         const { finalText, images: inboundImages } = await this.processAttachments(payload, strippedText, groupId, rawAttachments);
         const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
@@ -1758,27 +1847,27 @@ export class AUNChannel {
         const payloadType = (payload && typeof payload === 'object') ? payload.type ?? '' : '';
         const textMentionSelf = this._aid ? this.hasExplicitMention(text, this._aid) : false;
         const textMentionAll = this.hasExplicitMention(text, 'all');
-        const structMentionSelf = this._aid ? payloadMentions.includes(this._aid) : false;
-        const structMentionAll = payloadMentions.includes('all');
+        const structMentionSelf = this._aid ? payloadMentionAids.includes(this._aid) : false;
+        const structMentionAll = mentionedAll;
         const reason = isOwnHandoff
             ? 'handoff.self'
             : mentionedAll
                 ? 'mention.all(struct)'
                 : mentionedSelf
                     ? (structMentionSelf ? 'mention.self(struct)' : 'mention.self(text)')
-                    : `${dispatchMode}.no-mention`;
-        logger.info(`${this.logPrefix()} Group dispatch decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${payloadType} dispatchMode=${dispatchMode} reason=${reason} structMentions=${JSON.stringify(payloadMentions)} textMentionSelf=${textMentionSelf} textMentionAll=${textMentionAll} structMentionSelf=${structMentionSelf} structMentionAll=${structMentionAll} encrypt=${msgEncrypted} textPreview=${JSON.stringify(text.slice(0, 80))}`);
+                    : `${mentionMode}.no-mention`;
+        logger.info(`${this.logPrefix()} Group mention decision: mid=${messageId} group=${groupId} sender=${shortAid}(${displayName}) peerType=${peerIdentity.type} payloadType=${payloadType} mentionMode=${mentionMode} reason=${reason} structMentions=${JSON.stringify(payloadMentionEntries)} 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;
         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)}`);
+        logger.info(`${this.logPrefix()} Group dispatched: group=${groupId} sender=${shortAid}(${displayName}) mentionMode=${mentionMode} 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, payloadType === 'event' ? 'notify' : 'send');
         // 渲染用完整 @ 列表：结构化 payload.mentions + 正文 @aid 兜底，去重（含 self / "all"）。
         // 与上面用于过滤/回复的精简 mentions 独立——这份不丢任何被 @ 的 AID。
         const renderMentionAids = Array.from(new Set([
-            ...payloadMentions,
+            ...payloadMentionAids,
             ...this.extractMentionAidsFromText(text),
         ]));
         this.dispatchMessage({
@@ -1801,7 +1890,7 @@ export class AUNChannel {
             source: isOwnHandoff ? 'handoff' : undefined,
             encrypted: msgEncrypted,
             replyContext: this.buildGroupReplyContext(threadId, senderAid, msgEncrypted, messageId, msgChatmode, topicName),
-            dispatchMode: serverDispatchMode,
+            mentionMode: serverMentionMode,
             images: inboundImages.length > 0 ? inboundImages : undefined,
             msgType: logDescriptor.msgType,
             payloadType: logDescriptor.payloadType,
@@ -1810,17 +1899,9 @@ export class AUNChannel {
         });
     }
     dispatchMessage(event) {
-        // Dedup
-        if (event.messageId) {
-            if (this.seenMessages.has(event.messageId))
-                return;
-            this.seenMessages.set(event.messageId, Date.now());
-            setTimeout(() => this.seenMessages.delete(event.messageId), 5 * 60 * 1000);
-            // Track seq for acknowledge
-            if (event.seq != null) {
-                this.messageSeqMap.set(event.messageId, event.seq);
-            }
-        }
+        // Inbound events are claimed in handleIncomingPrivateMessage / GroupMessage
+        // before parsing. Keeping dedupe there prevents duplicate slash commands
+        // from reaching routing and mention policy code.
         // Echo 机制：消息第一行包含 "echo"（不区分大小写）且原始内容 ≤10 字符时，直接回声
         // 包含 [EvolCore.xxx] trace 说明已被本系统处理过，是回声的回声，丢弃防止链式爆炸
         const firstLine = event.text.split('\n')[0] || '';
@@ -1852,7 +1933,6 @@ export class AUNChannel {
         }
         if (!this.messageHandler)
             return;
-        const mentionObjects = event.mentions?.map(aid => ({ userId: aid }));
         // Use caller-supplied replyContext (group path builds mentionUserIds);
         // fall back to simple threadId-only context for private messages
         let replyContext = event.replyContext;
@@ -1877,12 +1957,12 @@ export class AUNChannel {
             messageId: event.messageId,
             causation: event.causation,
             threadId: event.threadId,
-            mentions: mentionObjects,
+            mentions: event.mentions,
             mentionAids: event.mentionAids,
             isMentioned: event.isMentioned, // ← 新增：传递 isMentioned 标记
             replyContext,
             source: event.source,
-            dispatchMode: event.dispatchMode,
+            mentionMode: event.mentionMode,
             images: event.images,
             msgType: event.msgType,
             payloadType: event.payloadType,
@@ -2421,8 +2501,8 @@ export class AUNChannel {
     onMessage(handler) {
         this.messageHandler = handler;
     }
-    setDispatchModeResolver(resolver) {
-        this.dispatchModeResolver = resolver;
+    setMentionModeResolver(resolver) {
+        this.mentionModeResolver = resolver;
     }
     onRecall(handler) {
         this.recallHandler = handler;
@@ -2511,6 +2591,21 @@ export class AUNChannel {
             finalPayload.chatmode = context.metadata.chatmode;
         return finalPayload;
     }
+    /**
+     * Validate the AUN-specific structured field before it crosses the durable
+     * send boundary. Return a copy when mentions are present so callers do not
+     * retain an unvalidated array reference.
+     */
+    normalizeAunPayloadMentions(payload) {
+        if (!payload || typeof payload !== 'object' || Array.isArray(payload))
+            return payload;
+        if (!Object.prototype.hasOwnProperty.call(payload, 'mentions'))
+            return payload;
+        return {
+            ...payload,
+            mentions: normalizeAunMentionEntries(payload.mentions),
+        };
+    }
     rememberInvalidatedInteraction(interactionId, reason) {
         this.invalidatedInteractions.set(interactionId, reason);
         const timer = setTimeout(() => this.invalidatedInteractions.delete(interactionId), 24 * 60 * 60 * 1000);
@@ -2602,6 +2697,16 @@ export class AUNChannel {
         }
     }
     async sendAunPayload(channelId, payload, context, label) {
+        let normalizedPayload;
+        try {
+            normalizedPayload = this.normalizeAunPayloadMentions(payload);
+        }
+        catch (error) {
+            const detail = error instanceof Error ? error.message : String(error);
+            const code = error?.code ?? 'INVALID_MENTION_SCHEMA';
+            logger.error(`${this.logPrefix()} Dropped durable AUN payload: invalid payload.mentions (${detail}) code=${code} channel=${channelId}`);
+            return { ok: false, discarded: true };
+        }
         if (!this.client || !this.connected)
             return { ok: false };
         const isGroup = this.isGroupId(channelId);
@@ -2616,8 +2721,8 @@ export class AUNChannel {
         if (causationRef && causation)
             registerAunCausation(causationRef, this.config.aid, targetAid, causation);
         const payloadWithCausationRef = causationRef
-            ? { ...payload, _evolcore_causation_ref: causationRef }
-            : payload;
+            ? { ...normalizedPayload, _evolcore_causation_ref: causationRef }
+            : normalizedPayload;
         // Truncate payload if too large (AUN SDK limit: 1MB)
         const truncatedPayload = this.truncatePayloadIfNeeded(payloadWithCausationRef, label);
         const params = { payload: truncatedPayload, encrypt };
@@ -2692,6 +2797,9 @@ export class AUNChannel {
         this.forwardOutbound(result);
     }
     async sendContentPayload(channelId, payload, opts) {
+        // Validate the caller's raw mentions before any early-return policy (such
+        // as a cancelled interaction) can hide a malformed wire payload.
+        const validatedPayload = this.normalizeAunPayloadMentions(payload);
         const interactionId = opts.postSend?.type === 'register_interaction_card'
             ? opts.postSend.requestId
             : undefined;
@@ -2699,7 +2807,12 @@ export class AUNChannel {
             logger.info(`${this.logPrefix()} Dropped invalidated interaction before durable enqueue: request=${interactionId}`);
             return {};
         }
-        const finalPayload = this.applyReplyContextToPayload(payload, opts.context);
+        // Validate before write-ahead enqueue. Invalid AUN payloads must not be
+        // hidden in the outbox and emitted later after a reconnect.
+        // Validate the caller's raw mentions before deep-cleaning: that helper
+        // intentionally removes undefined array elements, which would otherwise
+        // turn malformed `mentions: [undefined]` into an apparently valid `[]`.
+        const finalPayload = this.normalizeAunPayloadMentions(this.applyReplyContextToPayload(validatedPayload, opts.context));
         const logText = opts.logText ?? this.payloadLogText(finalPayload, opts.contentKind);
         const entry = outbox.enqueue(this.config.aid, {
             channelId,
@@ -2859,9 +2972,27 @@ export class AUNChannel {
         }
         let finalText = text;
         this.sentCount.set(channelId, (this.sentCount.get(channelId) || 0) + 1);
-        if (this.isGroupId(channelId) && context?.peerId) {
-            if (!finalText.includes(`@${context.peerId}`)) {
-                finalText = `@${context.peerId} ` + finalText;
+        if (this.isGroupId(channelId)) {
+            const requestedMentions = Array.from(new Set((context?.mentionUserIds ?? [])
+                .filter((id) => typeof id === 'string' && id.trim().length > 0)
+                .map(id => id.trim())));
+            // AUN's textual representation gives @all precedence over individual
+            // targets, matching the cross-channel mention contract.
+            const textMentionsAll = this.hasExplicitMention(finalText, 'all');
+            const mentionTargets = requestedMentions.includes('all') || textMentionsAll
+                ? ['all']
+                : requestedMentions;
+            if (mentionTargets.length > 0) {
+                for (const target of mentionTargets.reverse()) {
+                    if (!this.hasExplicitMention(finalText, target)) {
+                        finalText = `@${target} ` + finalText;
+                    }
+                }
+            }
+            else if (context?.peerId && !context.suppressPeerMention && !textMentionsAll) {
+                if (!this.hasExplicitMention(finalText, context.peerId)) {
+                    finalText = `@${context.peerId} ` + finalText;
+                }
             }
         }
         const operationId = typeof context?.metadata?.operationId === 'string'
@@ -2905,16 +3036,27 @@ export class AUNChannel {
     }
     /** Daemon-side transport for `ec msg send` running inside an agent task. */
     async sendDaemonMsg(args) {
-        if (!this.connected || !this.client) {
-            return { ok: false, error: 'AUN channel is not connected', code: 'AUN_NOT_CONNECTED' };
-        }
         if (!args.to || this.isGroupId(args.to)) {
             return { ok: false, error: 'aun-msg-send only supports private AID targets', code: 'UNSUPPORTED_TARGET' };
         }
         if (!args.payload || typeof args.payload !== 'object' || Array.isArray(args.payload)) {
             return { ok: false, error: 'payload must be an object', code: 'INVALID_PAYLOAD' };
         }
-        const finalPayload = this.stripUndefinedDeep({ ...args.payload });
+        let finalPayload;
+        try {
+            const validatedPayload = this.normalizeAunPayloadMentions(args.payload);
+            finalPayload = this.stripUndefinedDeep(validatedPayload);
+        }
+        catch (e) {
+            return {
+                ok: false,
+                error: e?.message || String(e),
+                code: e?.code,
+            };
+        }
+        if (!this.connected || !this.client) {
+            return { ok: false, error: 'AUN channel is not connected', code: 'AUN_NOT_CONNECTED' };
+        }
         const info = await this.fetchPeerInfo(args.to);
         const chatmode = info.type === 'human' ? 'interactive' : 'proactive';
         if (!finalPayload.chatmode)
@@ -3019,20 +3161,34 @@ export class AUNChannel {
     }
     /** Daemon-side transport for `ec group send` running inside an agent task. */
     async sendDaemonGroupMsg(args) {
-        if (!this.connected || !this.client) {
-            return { ok: false, error: 'AUN channel is not connected', code: 'AUN_NOT_CONNECTED' };
-        }
         if (!args.groupId || !this.isGroupId(args.groupId)) {
             return { ok: false, error: 'aun-msg-send requires a valid group target', code: 'UNSUPPORTED_TARGET' };
         }
         if (!args.payload || typeof args.payload !== 'object' || Array.isArray(args.payload)) {
             return { ok: false, error: 'payload must be an object', code: 'INVALID_PAYLOAD' };
         }
-        const finalPayload = this.stripUndefinedDeep({ ...args.payload });
-        if (args.mentions?.length)
-            finalPayload.mentions = args.mentions;
-        const encrypt = args.encrypt ?? this.shouldEncrypt(args.groupId);
         try {
+            // Validate before deep-cleaning so undefined entries cannot be silently
+            // removed from a malformed mentions array.
+            const validatedPayload = this.normalizeAunPayloadMentions(args.payload);
+            const finalPayload = this.stripUndefinedDeep(validatedPayload);
+            const payloadMentions = Object.prototype.hasOwnProperty.call(finalPayload, 'mentions')
+                ? normalizeAunMentionEntries(finalPayload.mentions)
+                : undefined;
+            if (args.mentions !== undefined) {
+                const normalizedMentions = normalizeAunMentionEntries(args.mentions);
+                if (normalizedMentions.length > 0)
+                    finalPayload.mentions = normalizedMentions;
+                else if (payloadMentions !== undefined)
+                    finalPayload.mentions = payloadMentions;
+            }
+            else if (payloadMentions !== undefined) {
+                finalPayload.mentions = payloadMentions;
+            }
+            if (!this.connected || !this.client) {
+                return { ok: false, error: 'AUN channel is not connected', code: 'AUN_NOT_CONNECTED' };
+            }
+            const encrypt = args.encrypt ?? this.shouldEncrypt(args.groupId);
             const result = await this.callAndTrace('group.send', {
                 group_id: args.groupId,
                 payload: this.truncatePayloadIfNeeded(finalPayload, 'group-send-ipc'),
@@ -3154,7 +3310,7 @@ export class AUNChannel {
         const source = context?.metadata?.source ?? 'daemon';
         const payload = { type: 'text', text: finalText };
         if (this.isGroupId(channelId)) {
-            const extracted = this.extractMentionAidsFromText(finalText);
+            const extracted = this.extractMentionEntriesFromText(finalText);
             if (extracted.length > 0)
                 payload.mentions = extracted;
         }
@@ -3353,6 +3509,10 @@ export class AUNChannel {
         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.discarded) {
+            logger.warn(`${this.logPrefix()} Removed malformed durable payload from outbox: id=${entry.id} channel=${channelId}`);
+            return { ok: true, discarded: true };
+        }
         if (!sent.ok || !sent.messageId)
             return sent;
         const isGroup = this.isGroupId(channelId);
@@ -3415,13 +3575,14 @@ export class AUNChannel {
      * 存储键：group_id/peer_aid + sender_aid + context.type + context.id
      */
     async sendThought(channelId, taskId, payload, context) {
-        if (!this.connected || !this.client)
-            return;
         if (!taskId)
             return;
+        const validatedPayload = this.normalizeAunPayloadMentions(payload);
+        const finalPayload = this.normalizeAunPayloadMentions(this.stripUndefinedDeep(validatedPayload));
+        if (!this.connected || !this.client)
+            return;
         // 私聊 channelId = 对端 AID（不含 device_id）
         const targetId = channelId;
-        const finalPayload = this.stripUndefinedDeep(payload);
         const encrypt = context?.metadata?.encrypted != null
             ? !!(context.metadata.encrypted)
             : this.shouldEncrypt(targetId);
@@ -3491,6 +3652,10 @@ export class AUNChannel {
     }
     /** 发送结构化 AUN payload；transient 协议载荷不写本地 messages.jsonl。 */
     async sendStructured(channelId, payload, context) {
+        // Validate before checking connection state so malformed producer payloads
+        // are reported deterministically instead of being hidden by a disconnect.
+        const validatedPayload = this.normalizeAunPayloadMentions(payload);
+        const finalPayload = this.stripUndefinedDeep(validatedPayload);
         if (!this.connected || !this.client)
             return null;
         const isGroup = this.isGroupId(channelId);
@@ -3499,7 +3664,6 @@ export class AUNChannel {
         const encrypt = context?.metadata?.encrypted != null
             ? !!(context.metadata.encrypted)
             : this.shouldEncrypt(encryptTarget);
-        const finalPayload = this.stripUndefinedDeep({ ...payload });
         if (context?.threadId && !finalPayload.thread_id)
             finalPayload.thread_id = context.threadId;
         if (context?.replyToMessageId && !finalPayload.ref_message_id)
@@ -4236,11 +4400,30 @@ export class AUNChannelPlugin {
                         return;
                     }
                     case 'system.error': {
-                        await channel.sendMessage(channelId, payload.text, replyCtx);
+                        const errorPayload = {
+                            type: 'error',
+                            ...taskBase(),
+                            subtype: payload.subtype,
+                            text: payload.text,
+                            message: payload.text,
+                            user_message: payload.text,
+                            recoverable: payload.recoverable === true,
+                            terminal: payload.recoverable !== true,
+                        };
+                        await channel.sendReliableStructured(channelId, errorPayload, { ...(replyCtx ?? {}), suppressPeerMention: true }, payload.text);
                         return;
                     }
                     case 'result.error': {
-                        await channel.sendMessage(channelId, payload.text, replyCtx);
+                        const errorPayload = {
+                            type: 'error',
+                            ...taskBase(),
+                            reason: payload.reason,
+                            text: payload.text,
+                            message: payload.text,
+                            user_message: payload.text,
+                            terminal: true,
+                        };
+                        await channel.sendReliableStructured(channelId, errorPayload, { ...(replyCtx ?? {}), suppressPeerMention: true }, payload.text);
                         return;
                     }
                     case 'result.file': {
@@ -4438,15 +4621,12 @@ export class AUNChannelPlugin {
                         });
                     });
                 }
-                if (typeof channel.setDispatchModeResolver === 'function') {
-                    channel.setDispatchModeResolver(async (channelId) => {
-                        // 配置层用 mentionMode（mention-only/disabled），翻译成 AUN 协议
-                        // dispatch_mode（mention/broadcast）；未设值返回 undefined，回退服务端下发值。
-                        const mentionMode = resolveEffective({
+                if (typeof channel.setMentionModeResolver === 'function') {
+                    channel.setMentionModeResolver(async (channelId) => {
+                        return resolveEffective({
                             self: aid,
                             peerKey: formatPeerKey('aun', channelId),
                         }, { cache: true }).mentionMode;
-                        return mentionModeToDispatch(mentionMode);
                     });
                 }
             },