evolcore 0.0.11 → 0.0.13

package/dist/core/message/message-bridge.js

@@ -8,7 +8,7 @@ import { formatChannelKey, tryParseChannelKey } from '../channel-loader.js';
 import { agentDir, resolvePaths } from '../../paths.js';
 import { listStaticAgentAdmins, listStaticAgentOwners, resolvePeerRoleDetail, } from '../../config/peer-role-resolver.js';
 import { resolveContactView, resolvePeerDisplayLabel, resolvePrincipal } from '../../config/contact-book.js';
-import { findContactRequestNote, expirePendingContactRequests, reviewContactRequest, submitContactRequest, } from '../../config/contact-request-service.js';
+import { findContactRequestNote, expirePendingContactRequests, reviewContactRequest, submitContactRequest, contactRequestSubmissionProtocolResult, queryOwnContactRequestStatus, } from '../../config/contact-request-service.js';
 import { isValidAid } from '../../aun/aid/validation.js';
 import { PeerIdentityCache } from '../relation/peer-identity.js';
 import { handlePendingDingtalkContactBindMessage, registerPendingDingtalkContactBind } from '../../channels/dingtalk.js';
@@ -17,8 +17,8 @@ import { handlePendingQQBotContactBindMessage, registerPendingQQBotContactBind }
 import { handlePendingWecomContactBindMessage, registerPendingWecomContactBind } from '../../channels/wecom.js';
 import { handlePendingWechatContactBindMessage, registerPendingWechatContactBind } from '../../channels/wechat.js';
 import { authorizeAccess, buildAuthSubject } from '../auth/auth-gateway.js';
-import { MenuDiagnosticLimiter, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, menuSuccess, normalizeMenuError, parseMenuControl, validateMenuRequest, } from '../command/menu-protocol.js';
-import { evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, isAunMenuTokenRequired } from '../command/evol-menu-version-gate.js';
+import { MenuDiagnosticLimiter, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, menuSuccess, normalizeMenuError, parseMenuControl, validateMenuRequest, evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, isAunMenuTokenRequired, menuCommandForName, } from '../command/menu-protocol.js';
+import { resolveExplicitMenuExecutionContext, validateMenuCatalogArgs, validateMenuValueBatchArgs } from '../command/menu-catalog.js';
 import { MenuTokenStore } from '../command/menu-token-store.js';
 import { SessionRenewService } from '../session/session-renew.js';
 import { createRootCausation, deriveCausation, normalizeCausation } from '../causation/context.js';
@@ -306,42 +306,171 @@ export class MessageBridge {
                 return true;
             }
         }
+        return false;
+    }
+    async handleContactRequestProtocol(input) {
+        const { context, msg, content, owningAgent, adapter, sendReply } = input;
         const requestMatch = /^\s*\/request(?:\s+([\s\S]*?))?\s*$/i.exec(content);
-        if (!requestMatch)
+        let protocolType;
+        let protocolPayload;
+        try {
+            const parsed = JSON.parse(content);
+            protocolPayload = parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+                ? parsed
+                : undefined;
+            protocolType = protocolPayload?.type === 'contact.request.query'
+                ? 'query'
+                : protocolPayload?.type === 'contact.request.submit' ? 'submit' : undefined;
+        }
+        catch { /* slash command */ }
+        if (!requestMatch && !protocolType)
             return false;
-        if (context.channelType !== 'aun') {
-            await this.sendAdmissionControlReply(context, msg, sendReply, '联系人申请仅支持 AUN 私聊。');
+        // Slash commands keep their human-facing response semantics. Structured
+        // App requests use contact.request.response and never fall through to the
+        // normal command/session pipeline.
+        if (requestMatch) {
+            // Blacklist remains the first gate even though slash controls are
+            // recognized before ordinary admission. Let the normal blocked path
+            // decide whether an agent/bot/service gets a limited rejection.
+            if (context.contactStatus === 'blocked')
+                return false;
+            if (context.channelType !== 'aun') {
+                await this.sendAdmissionControlReply(context, msg, sendReply, '联系人申请仅支持 AUN 私聊。');
+                return true;
+            }
+            if (context.chatType !== 'private') {
+                await this.sendAdmissionControlReply(context, msg, sendReply, '联系人申请仅支持 AUN 私聊。');
+                return true;
+            }
+            if (!context.primaryId || context.principal?.principalStatus !== 'native_aid') {
+                await this.sendAdmissionControlReply(context, msg, sendReply, '无法验证当前 AUN 身份，未提交联系人申请。');
+                return true;
+            }
+            try {
+                const submission = await submitContactRequest({
+                    selfAid: context.selfAid,
+                    applicantAid: context.primaryId,
+                    note: requestMatch[1],
+                    sourceChannelKey: context.channelKey,
+                });
+                if ((submission.code === 'submitted' || submission.code === 'resubmitted') && submission.requestId) {
+                    void this.deliverContactReviewCard(context.selfAid, context.primaryId, submission, owningAgent)
+                        .catch(error => logger.warn(`[MessageBridge] Contact review delivery failed: ${error instanceof Error ? error.message : String(error)}`));
+                }
+                await this.sendAdmissionControlReply(context, msg, sendReply, this.contactRequestReply(submission));
+            }
+            catch (error) {
+                logger.warn(`[MessageBridge] Contact request submission failed: ${error instanceof Error ? error.message : String(error)}`);
+                await this.sendAdmissionControlReply(context, msg, sendReply, '当前无法受理联系人申请，请稍后再试。');
+            }
             return true;
         }
-        if (context.chatType !== 'private') {
-            await this.sendAdmissionControlReply(context, msg, sendReply, '联系人申请仅支持 AUN 私聊。');
+        // The structured protocol is AUN-only. For a blocked external alias,
+        // return false so the existing blacklist response/silence policy applies;
+        // never emit a custom payload through a non-AUN adapter.
+        if (context.contactStatus === 'blocked' && context.channelType !== 'aun')
+            return false;
+        if (context.channelType !== 'aun')
+            return true;
+        if (context.chatType !== 'private')
+            return true;
+        if (context.principal?.principalStatus !== 'native_aid' || !context.primaryId) {
+            await this.sendContactRequestProtocolResponse(adapter, msg, {
+                status: 'NOT_ALLOWED', requestId: null, expiresAt: null,
+            }, owningAgent?.name);
             return true;
         }
-        if (!context.primaryId) {
-            await this.sendAdmissionControlReply(context, msg, sendReply, '无法验证当前 AUN 身份，未提交联系人申请。');
+        if (context.contactStatus === 'blocked') {
+            await this.sendContactRequestProtocolResponse(adapter, msg, {
+                status: 'NOT_ALLOWED', requestId: null, expiresAt: null,
+            }, owningAgent?.name);
             return true;
         }
         let result;
-        try {
-            result = await submitContactRequest({
-                selfAid: context.selfAid,
-                applicantAid: context.primaryId,
-                note: requestMatch[1],
-                sourceChannelKey: context.channelKey,
-            });
-        }
-        catch (error) {
-            logger.warn(`[MessageBridge] Contact request submission failed: self=${context.selfAid} applicant=${context.primaryId} error=${error instanceof Error ? error.message : String(error)}`);
-            await this.sendAdmissionControlReply(context, msg, sendReply, '当前无法受理联系人申请，请稍后再试。');
-            return true;
+        if (protocolType === 'query') {
+            try {
+                result = await queryOwnContactRequestStatus({
+                    selfAid: context.selfAid,
+                    applicantAid: context.primaryId,
+                    requestId: protocolPayload && Object.prototype.hasOwnProperty.call(protocolPayload, 'request_id')
+                        ? protocolPayload.request_id
+                        : undefined,
+                });
+            }
+            catch (error) {
+                logger.warn(`[MessageBridge] Contact request query failed: ${error instanceof Error ? error.message : String(error)}`);
+                result = { status: 'NOT_ALLOWED', requestId: null, expiresAt: null };
+            }
         }
-        if ((result.code === 'submitted' || result.code === 'resubmitted') && result.requestId) {
-            void this.deliverContactReviewCard(context.selfAid, context.primaryId, result, owningAgent)
-                .catch(error => logger.warn(`[MessageBridge] Contact review delivery failed: self=${context.selfAid} applicant=${context.primaryId} error=${error instanceof Error ? error.message : String(error)}`));
+        else {
+            try {
+                if (protocolPayload && Object.prototype.hasOwnProperty.call(protocolPayload, 'note')
+                    && typeof protocolPayload?.note !== 'string') {
+                    await this.sendContactRequestProtocolResponse(adapter, msg, {
+                        status: 'NOT_ALLOWED', requestId: null, expiresAt: null,
+                    }, owningAgent?.name);
+                    return true;
+                }
+                const submission = await submitContactRequest({
+                    selfAid: context.selfAid,
+                    applicantAid: context.primaryId,
+                    note: typeof protocolPayload?.note === 'string' ? protocolPayload.note : undefined,
+                    sourceChannelKey: context.channelKey,
+                });
+                result = contactRequestSubmissionProtocolResult(submission);
+                if ((submission.code === 'submitted' || submission.code === 'resubmitted') && submission.requestId) {
+                    void this.deliverContactReviewCard(context.selfAid, context.primaryId, submission, owningAgent)
+                        .catch(error => logger.warn(`[MessageBridge] Contact review delivery failed: ${error instanceof Error ? error.message : String(error)}`));
+                }
+            }
+            catch (error) {
+                logger.warn(`[MessageBridge] Contact request submission failed: ${error instanceof Error ? error.message : String(error)}`);
+                result = { status: 'NOT_ALLOWED', requestId: null, expiresAt: null };
+            }
         }
-        await this.sendAdmissionControlReply(context, msg, sendReply, this.contactRequestReply(result));
+        await this.sendContactRequestProtocolResponse(adapter, msg, result, owningAgent?.name);
         return true;
     }
+    contactRequestReply(result) {
+        switch (result.code) {
+            case 'submitted': return '联系人申请已提交，等待管理员审核。';
+            case 'resubmitted': return '联系人申请已更新，等待管理员审核。';
+            case 'already-contact': return '你已经是联系人。';
+            case 'owner': return '你已经是 Owner。';
+            case 'blocked': return CONTACT_REJECTION_NOTICE;
+            case 'rate-limited': return '联系人申请过于频繁，请稍后再试。';
+            case 'capacity': return '当前申请较多，请稍后再试。';
+            case 'no-owner': return '当前无法受理联系人申请。';
+            case 'invalid-applicant': return '无法验证当前 AUN 身份，未提交联系人申请。';
+            case 'invalid-note': return '申请说明不能超过 500 个字符。';
+        }
+    }
+    async sendContactRequestProtocolResponse(adapter, msg, result, agentName) {
+        if (!adapter?.send)
+            return;
+        await adapter.send(buildEnvelope({
+            taskId: `contact-request-${randomBytes(4).toString('hex')}`,
+            channel: adapter.channelName,
+            channelId: msg.channelId,
+            agentName: agentName ?? '<unknown>',
+            replyContext: {
+                ...(msg.replyContext ?? {}),
+                metadata: {
+                    ...(msg.replyContext?.metadata ?? {}),
+                    ...evolMenuResponseTransportMetadata(),
+                },
+            },
+        }), {
+            kind: 'custom',
+            channelType: 'aun',
+            payload: {
+                type: 'contact.request.response',
+                status: result.status,
+                request_id: result.requestId,
+                expires_at: result.expiresAt,
+            },
+        });
+    }
     async sendAdmissionControlReply(context, msg, sendReply, text) {
         if (!text || !consumeAdmissionReplyBudget(context))
             return false;
@@ -360,20 +489,6 @@ export class MessageBridge {
         }
         return '当前不接受陌生人消息。联系人申请仅支持 AUN 私聊。';
     }
-    contactRequestReply(result) {
-        switch (result.code) {
-            case 'submitted': return '联系人申请已提交，等待管理员审核。';
-            case 'resubmitted': return '联系人申请已更新，等待管理员审核。';
-            case 'already-contact': return '你已经是联系人。';
-            case 'owner': return '你已经是 Owner。';
-            case 'blocked': return CONTACT_REJECTION_NOTICE;
-            case 'rate-limited': return '联系人申请过于频繁，请稍后再试。';
-            case 'capacity': return '当前申请较多，请稍后再试。';
-            case 'no-owner': return '当前无法受理联系人申请。';
-            case 'invalid-applicant': return '无法验证当前 AUN 身份，未提交联系人申请。';
-            case 'invalid-note': return '申请说明不能超过 500 个字符。';
-        }
-    }
     async deliverContactReviewCard(selfAid, applicantAid, submission, owningAgent) {
         if (!this.interactionRouter || !submission.requestId || !submission.expiresAt || !submission.submittedAt) {
             return false;
@@ -463,7 +578,7 @@ export class MessageBridge {
             }
             if (reviewed.code === 'approved' || reviewed.code === 'rejected' || reviewed.code === 'blocked') {
                 try {
-                    await this.notifyContactApplicant(route.adapter, applicantAid, reviewed.code, owningAgent?.name);
+                    await this.notifyContactApplicant(route.adapter, applicantAid, reviewed.code, submission.requestId, submission.expiresAt, owningAgent?.name);
                 }
                 catch (error) {
                     logger.warn(`[MessageBridge] Contact applicant notification failed: request=${submission.requestId} error=${error instanceof Error ? error.message : String(error)}`);
@@ -485,7 +600,7 @@ export class MessageBridge {
             channelId: route.approverOperatorId,
             agentName: owningAgent?.name ?? selfAid,
             chatmode: 'interactive',
-            replyContext: { metadata: { source: 'handoff', chatmode: 'interactive' } },
+            replyContext: { delivery: { chatType: 'private' }, metadata: { source: 'handoff', chatmode: 'interactive' } },
         });
         const sent = await sendInteractionPayload(route.adapter, envelope, interaction, renderActionAsText(interaction), envelope.replyContext);
         if (!sent)
@@ -500,13 +615,24 @@ export class MessageBridge {
                         : code === 'request-stale' ? '申请已更新或已被处理。'
                             : code === 'revision-conflict' ? '联系人列表已变化，请从联系人列表重新审核。'
                                 : '当前无审核权限。';
-        await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: ownerAid, agentName: agentName ?? '<unknown>' }), { kind: 'system.notice', text, subtype: 'contact-review' });
+        await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: ownerAid, agentName: agentName ?? '<unknown>', delivery: { chatType: 'private' } }), { kind: 'system.notice', text, subtype: 'contact-review' });
     }
-    async notifyContactApplicant(adapter, applicantAid, code, agentName) {
-        const text = code === 'approved' ? '你的联系人申请已通过。'
-            : code === 'rejected' ? '你的联系人申请未通过。'
-                : '你的联系人申请未通过。';
-        await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: applicantAid, agentName: agentName ?? '<unknown>' }), { kind: 'system.notice', text, subtype: 'contact-request-result' });
+    async notifyContactApplicant(adapter, applicantAid, code, requestId, expiresAt, agentName) {
+        await adapter.send(buildEnvelope({
+            channel: adapter.channelName,
+            channelId: applicantAid,
+            agentName: agentName ?? '<unknown>',
+            replyContext: { delivery: { chatType: 'private' }, metadata: evolMenuResponseTransportMetadata() },
+        }), {
+            kind: 'custom',
+            channelType: 'aun',
+            payload: {
+                type: 'contact.request.response',
+                status: code === 'approved' ? 'APPROVED' : code === 'rejected' ? 'REJECTED' : 'NOT_ALLOWED',
+                request_id: requestId,
+                expires_at: expiresAt,
+            },
+        });
     }
     getDebouncer(channelName, channelType) {
         let d = this.debouncers.get(channelName);
@@ -561,11 +687,23 @@ export class MessageBridge {
         onMessage(async (msg) => {
             try {
                 let content = msg.content.trim();
+                // Channels that expose adapter receive time (notably AUN) must keep
+                // that timestamp through session resolution and queue processing.
+                // The fallback is only for legacy adapters that do not provide it.
+                const receivedAt = msg.receivedAt ?? Date.now();
                 const channelKey = adapter?.channelKey || channelName;
                 const owningAgent = this.agentRegistry?.resolveByChannel(channelKey)
                     ?? this.agentRegistry?.resolveByChannel(channelName);
                 const parsedChannelKey = tryParseChannelKey(channelKey);
                 const chatType = msg.chatType || 'private';
+                const delivery = chatType === 'group'
+                    ? { chatType: 'group', groupId: msg.groupId || msg.channelId }
+                    : { chatType: 'private' };
+                msg.groupId = delivery.chatType === 'group' ? delivery.groupId : undefined;
+                msg.replyContext = {
+                    ...(msg.replyContext ?? {}),
+                    delivery,
+                };
                 const actorId = msg.peerId;
                 const conversationId = chatType === 'group' ? (msg.groupId || msg.channelId) : msg.peerId;
                 const selfAid = msg.selfAID || owningAgent?.aid || parsedChannelKey?.selfAID;
@@ -582,6 +720,16 @@ export class MessageBridge {
                     actorId,
                     trustedHandoffEcho,
                 });
+                if (!trustedHandoffEcho && await this.handleContactRequestProtocol({
+                    context: admissionPreflight.context,
+                    msg,
+                    content,
+                    owningAgent,
+                    adapter,
+                    sendReply,
+                })) {
+                    return;
+                }
                 if (!admissionPreflight.allow) {
                     const requestCommand = /^\s*\/request(?:\s|$)/i.test(content);
                     if (admissionPreflight.reason === 'blocked' && admissionPreflight.context.primaryId) {
@@ -789,7 +937,9 @@ export class MessageBridge {
                             content: msg.messageLogContent ?? content,
                             replyTo: inboundReplyTo,
                             permMode: null,
-                            timestamp: Date.now(),
+                            timestamp: receivedAt,
+                            receivedAt,
+                            gatewaySeq: msg.gatewaySeq,
                             encrypt: inboundEncrypt,
                             chatmode: inboundChatmode,
                             peerName: msg.peerName,
@@ -881,9 +1031,12 @@ export class MessageBridge {
                     channelType: msg.channelType || effectiveChannelType,
                     channelId: msg.channelId, content,
                     selfAID: msg.selfAID,
+                    groupId: msg.groupId,
                     baseagent: session.baseagent,
                     chatType,
-                    images: msg.images, timestamp: Date.now(),
+                    images: msg.images, timestamp: receivedAt,
+                    receivedAt,
+                    gatewaySeq: msg.gatewaySeq,
                     peerId: msg.peerId, peerName: msg.peerName,
                     peerType: msg.peerType,
                     sameDevice: msg.sameDevice,
@@ -900,7 +1053,7 @@ export class MessageBridge {
                     source: msg.source,
                     boundSessionId: session.id,
                     resolvedIdentity: identity,
-                    dispatchMode: msg.dispatchMode,
+                    mentionMode: msg.mentionMode,
                     causation: inboundCausation,
                 };
                 recordCausationSpan(inboundCausation, 'message.inbound', {
@@ -926,6 +1079,8 @@ export class MessageBridge {
                             replyTo: inboundReplyTo,
                             permMode: session.identity?.role ?? null,
                             timestamp: fullMessage.timestamp,
+                            receivedAt: msg.receivedAt,
+                            gatewaySeq: msg.gatewaySeq,
                             encrypt: inboundEncrypt,
                             chatmode: inboundChatmode,
                             peerName: msg.peerName,
@@ -1027,28 +1182,6 @@ export class MessageBridge {
         });
     }
     // ── Menu Protocol ──
-    static MENU_NAME_MAP = {
-        pwd: '/pwd',
-        session: '/session',
-        topic: '/topic',
-        baseagent: '/baseagent',
-        model: '/model',
-        effort: '/effort',
-        chatmode: '/chatmode',
-        mentionmode: '/mentionmode',
-        group: '/group',
-        permission: '/perm',
-        activity: '/activity',
-        observable: '/observable',
-        system: '/system',
-        cli: '/cli',
-        agent: '/agent',
-        trigger: '/trigger',
-        file: '/file',
-        capability: '/capability',
-        role: '/role',
-        connect: '/connect',
-    };
     extractTopicName(msg) {
         const raw = msg.topicName
             ?? msg.replyContext?.title
@@ -1077,7 +1210,7 @@ export class MessageBridge {
     resolveCmd(name, cmd) {
         if (cmd)
             return cmd;
-        const mapped = MessageBridge.MENU_NAME_MAP[name];
+        const mapped = menuCommandForName(name);
         if (!mapped)
             throw { code: 'NOT_SUPPORTED', message: `Unsupported menu name: ${name}` };
         return mapped;
@@ -1086,6 +1219,31 @@ export class MessageBridge {
         if (!hasValidMenuId(parsed))
             return;
         const header = { id: parsed.id, ...(parsed.name?.trim() ? { name: parsed.name } : {}) };
+        // Menu IDs are the protocol's stable correlation key. Bind it, together
+        // with the active EvolCore session, before authorization so every
+        // CommandAudit record and denial can be joined to the same request.
+        let activeSession;
+        if (msg.threadId && typeof this.sessionManager.getThreadSession === 'function') {
+            try {
+                activeSession = await this.sessionManager.getThreadSession(channel, msg.channelId, msg.threadId);
+            }
+            catch {
+                activeSession = undefined;
+            }
+        }
+        if (!activeSession && typeof this.sessionManager.getActiveSession === 'function') {
+            try {
+                activeSession = await this.sessionManager.getActiveSession(channel, msg.channelId);
+            }
+            catch {
+                activeSession = undefined;
+            }
+        }
+        const menuAuthSubject = {
+            ...authSubject,
+            requestId: parsed.id,
+            ...(activeSession?.id ? { sessionId: activeSession.id } : {}),
+        };
         const isTokenRequest = parsed.type === 'menu.token.request';
         if (isTokenRequest) {
             if (msg.chatType !== 'private') {
@@ -1104,7 +1262,7 @@ export class MessageBridge {
             }
         }
         if (!isTokenRequest) {
-            const access = authorizeAccess(authSubject);
+            const access = authorizeAccess(menuAuthSubject);
             if (!access.allow) {
                 this.logMenuDiagnostic('access-denied', channel, msg, parsed, access.code);
                 await this.sendMenuResponse(adapter, channel, msg, menuFailure(header, {
@@ -1119,7 +1277,7 @@ export class MessageBridge {
         let afterResponse;
         const deduped = await this.menuDeduper.execute(dedupKey, menuPayloadFingerprint(parsed.raw), () => isTokenRequest
             ? this.issueMenuTokenResponse(header, channel, msg)
-            : this.dispatchMenuRequest(parsed.request, header, channel, msg, authSubject, effect => { afterResponse = effect; }));
+            : this.dispatchMenuRequest(parsed.request, header, channel, msg, menuAuthSubject, effect => { afterResponse = effect; }));
         if ('conflict' in deduped) {
             this.logMenuDiagnostic('request-conflict', channel, msg, parsed, 'CONFLICT');
             await this.sendMenuResponse(adapter, channel, msg, menuFailure(header, {
@@ -1130,6 +1288,8 @@ export class MessageBridge {
         }
         if (deduped.replayed)
             this.logMenuDiagnostic('request-replay', channel, msg, parsed);
+        if (deduped.retry)
+            this.logMenuDiagnostic('request-retry', channel, msg, parsed);
         const response = responseWarning && 'data' in deduped.value
             ? { ...deduped.value, warning: responseWarning }
             : deduped.value;
@@ -1152,29 +1312,73 @@ export class MessageBridge {
             const args = request.args;
             switch (request.type) {
                 case 'menu.list':
+                    if (args?.view === 'catalog') {
+                        validateMenuCatalogArgs(args);
+                        const data = await this.cmdHandler.getMenuCatalog(channel, msg.channelId, authSubject, args.context, msg.isControlChannel ? 'control' : 'agent');
+                        return menuSuccess(header, data);
+                    }
+                    if (args?.view !== undefined) {
+                        return menuFailure(header, { code: 'NOT_SUPPORTED', message: `Unsupported menu.list view: ${String(args.view)}` });
+                    }
                     return menuSuccess(header, this.cmdHandler.getMenuItems(identity.role, msg.chatType || 'private', msg.isControlChannel ? 'control' : 'agent', authSubject));
                 case 'menu.query': {
-                    const result = await this.cmdHandler.execMenuQuery(this.resolveCmd(name, cmd), channel, msg.channelId, msg.peerId, args, msg.chatType, msg.isControlChannel ?? false, identity, authSubject);
+                    if (name === 'menu' && args?.view === 'values') {
+                        validateMenuValueBatchArgs(args);
+                        const data = await this.cmdHandler.execMenuValueBatch(channel, msg.channelId, authSubject, args, args.context, msg.isControlChannel ? 'control' : 'agent');
+                        return menuSuccess(header, data);
+                    }
+                    if (name === 'menu') {
+                        return menuFailure(header, { code: 'NOT_SUPPORTED', message: `Unsupported menu.query view: ${String(args?.view)}` });
+                    }
+                    const execution = await resolveExplicitMenuExecutionContext({
+                        subject: authSubject,
+                        channelType: authSubject.channelType,
+                        channelScope: msg.isControlChannel ? 'control' : 'agent',
+                        channelId: msg.channelId,
+                        args,
+                    });
+                    const result = await this.cmdHandler.execMenuQuery(this.resolveCmd(name, cmd), channel, execution.channelId, execution.subject.actorId, execution.args, execution.subject.chatType, execution.subject.fromControlChannel, execution.subject.identity, execution.subject);
                     if ('error' in result)
                         throw result;
                     return menuSuccess(header, result.data);
                 }
                 case 'menu.options': {
-                    let optionArgs = args;
+                    const execution = await resolveExplicitMenuExecutionContext({
+                        subject: authSubject,
+                        channelType: authSubject.channelType,
+                        channelScope: msg.isControlChannel ? 'control' : 'agent',
+                        channelId: msg.channelId,
+                        args,
+                    });
+                    let optionArgs = execution.args;
                     if ((name === 'topic' || cmd === '/topic') && args?.mode === 'fork-turns' && msg.threadId && !args?.sourceThreadId) {
-                        optionArgs = { ...(args ?? {}), sourceThreadId: msg.threadId };
+                        optionArgs = { ...(execution.args ?? {}), sourceThreadId: msg.threadId };
                     }
-                    const data = await this.cmdHandler.getSubMenuItems(this.resolveCmd(name, cmd), channel, msg.channelId, msg.peerId, optionArgs, identity, msg.chatType, msg.isControlChannel ?? false, authSubject) ?? [];
+                    const data = await this.cmdHandler.getSubMenuItems(this.resolveCmd(name, cmd), channel, execution.channelId, execution.subject.actorId, optionArgs, execution.subject.identity, execution.subject.chatType, execution.subject.fromControlChannel, execution.subject) ?? [];
                     return menuSuccess(header, data);
                 }
                 case 'menu.update': {
-                    const result = await this.cmdHandler.execMenuUpdate(this.resolveCmd(name, cmd), request.value, channel, msg.channelId, msg.peerId, identity, msg.isControlChannel ?? false, args, authSubject);
+                    const execution = await resolveExplicitMenuExecutionContext({
+                        subject: authSubject,
+                        channelType: authSubject.channelType,
+                        channelScope: msg.isControlChannel ? 'control' : 'agent',
+                        channelId: msg.channelId,
+                        args,
+                    });
+                    const result = await this.cmdHandler.execMenuUpdate(this.resolveCmd(name, cmd), request.value, channel, execution.channelId, execution.subject.actorId, execution.subject.identity, execution.subject.fromControlChannel, execution.args, execution.subject);
                     if ('error' in result)
                         throw result;
                     return menuSuccess(header, result.data);
                 }
                 case 'menu.action': {
-                    let actionArgs = args;
+                    const execution = await resolveExplicitMenuExecutionContext({
+                        subject: authSubject,
+                        channelType: authSubject.channelType,
+                        channelScope: msg.isControlChannel ? 'control' : 'agent',
+                        channelId: msg.channelId,
+                        args,
+                    });
+                    let actionArgs = execution.args;
                     if ((name === 'topic' || cmd === '/topic') && request.action === 'fork' && msg.threadId) {
                         if (typeof args?.targetThreadId === 'string' && args.targetThreadId !== msg.threadId) {
                             return menuFailure(header, {
@@ -1182,11 +1386,11 @@ export class MessageBridge {
                                 message: 'args.targetThreadId 必须与消息 thread_id 一致',
                             });
                         }
-                        actionArgs = { ...(args ?? {}), targetThreadId: msg.threadId };
+                        actionArgs = { ...(execution.args ?? {}), targetThreadId: msg.threadId };
                     }
                     const resolvedCmd = this.resolveCmd(name, cmd);
                     const isFileFetch = resolvedCmd.trim().split(' ')[0] === '/file' && request.action === 'fetch';
-                    const result = await this.cmdHandler.execMenuAction(resolvedCmd, request.action, actionArgs, channel, msg.channelId, msg.peerId, identity, msg.chatType, header.id, msg.isControlChannel ?? false, authSubject, 'menu', msg.replyContext, isFileFetch ? registerAfterResponse : undefined);
+                    const result = await this.cmdHandler.execMenuAction(resolvedCmd, request.action, actionArgs, channel, execution.channelId, execution.subject.actorId, execution.subject.identity, execution.subject.chatType, header.id, execution.subject.fromControlChannel, execution.subject, 'menu', msg.replyContext, isFileFetch ? registerAfterResponse : undefined);
                     if ('error' in result)
                         throw result;
                     return menuSuccess(header, result.data);
@@ -1222,6 +1426,10 @@ export class MessageBridge {
                 ...evolMenuResponseTransportMetadata(),
             },
         };
+        if (msg.channelType === 'aun' && !replyContext.delivery) {
+            logger.warn(`[MessageBridge] dropping AUN menu response without trusted delivery route: channel=${channel} channelId=${msg.channelId}`);
+            return;
+        }
         const envelope = buildEnvelope({
             taskId: `menu-${randomBytes(4).toString('hex')}`,
             channel,
@@ -1280,6 +1488,8 @@ export class MessageBridge {
         logger.warn(`[MenuControl] category=${category} request=${parsed.id || '<missing>'}`
             + ` type=${parsed.type} name=${parsed.name || '<none>'} action=${parsed.action || '<none>'}`
             + ` transport=${channel} scope=${this.shortHash(scope)} sender=${this.shortHash(msg.peerId)}`
+            + (category === 'request-replay' ? ' replay=true' : '')
+            + (category === 'request-retry' ? ' retry=true' : '')
             + `${code ? ` code=${code}` : ''}${decision.suppressed ? ` suppressed=${decision.suppressed}` : ''}`);
     }
     shortHash(value) {
@@ -1398,17 +1608,17 @@ export class MessageBridge {
      * 撤回消息：先查 debounce 窗口，再查 message queue，最后查正在执行的任务。
      * @returns true 如果找到并取消/中断
      */
-    cancel(messageId) {
+    cancel(messageId, selfAID) {
         // 阶段 1: debounce 窗口（尚未入队）
         for (const d of this.debouncers.values()) {
-            if (d.cancel(messageId))
+            if (d.cancel(messageId, selfAID))
                 return true;
         }
         // 阶段 2: 已入队但未处理（合并后 messageId 可能是逗号分隔的多个 id）
-        if (this.messageQueue.cancel(messageId))
+        if (this.messageQueue.cancel(messageId, selfAID))
             return true;
         // 阶段 3: 正在执行的任务 → 触发 interrupt
-        return this.messageQueue.cancelActive(messageId);
+        return this.messageQueue.cancelActive(messageId, selfAID);
     }
     /** 清理资源 */
     dispose() {

package/dist/core/message/message-log.js

@@ -3,6 +3,7 @@ import path from 'path';
 import { appendJsonl, chatDirPath } from '../session/session-fs-store.js';
 import { logger } from '../../utils/logger.js';
 const TRANSIENT_PROTOCOL_TYPE_PREFIXES = [
+    'contact.request.',
     'menu.',
     'status.',
     'event.',
@@ -288,6 +289,8 @@ export function buildInboundEntry(opts) {
     const isCommand = isCommandCapable && opts.content.startsWith('/');
     return {
         ts,
+        ...(opts.receivedAt !== undefined ? { receivedAt: opts.receivedAt } : {}),
+        ...(opts.gatewaySeq !== undefined ? { gatewaySeq: opts.gatewaySeq } : {}),
         time: formatTimestampMs(ts),
         sessionId: opts.sessionId,
         threadId: opts.threadId ?? null,