evolcore 0.0.12 → 0.0.14

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

@@ -600,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)
@@ -615,14 +615,14 @@ 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, requestId, expiresAt, agentName) {
         await adapter.send(buildEnvelope({
             channel: adapter.channelName,
             channelId: applicantAid,
             agentName: agentName ?? '<unknown>',
-            replyContext: { metadata: evolMenuResponseTransportMetadata() },
+            replyContext: { delivery: { chatType: 'private' }, metadata: evolMenuResponseTransportMetadata() },
         }), {
             kind: 'custom',
             channelType: 'aun',
@@ -687,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;
@@ -860,7 +872,7 @@ export class MessageBridge {
                     return;
                 }
                 // 普通消息保留原始日志；控制 payload 使用脱敏元数据日志。
-                logger.channelIn({ channel: channelName, channelId: msg.channelId, peerId: msg.peerId, peerName: msg.peerName, chatType: msg.chatType, msgId: msg.messageId, threadId: msg.threadId, content, images: msg.images?.length ?? 0, mentions: msg.mentions, replyContext: msg.replyContext });
+                logger.channelIn({ channel: channelName, channelId: msg.channelId, selfAid: msg.selfAID, peerId: msg.peerId, peerName: msg.peerName, chatType: msg.chatType, msgId: msg.messageId, correlationId: msg.messageId, threadId: msg.threadId, content, images: msg.images?.length ?? 0, mentions: msg.mentions, replyContext: msg.replyContext });
                 const accessDecision = authorizeAccess(authSubject);
                 if (!accessDecision.allow) {
                     logger.warn(`[MessageBridge] Access denied before command routing: channel=${channelName} channelId=${msg.channelId} actor=${actorId ?? '<none>'} role=${identity.role} reason=${accessDecision.reason}`);
@@ -925,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,
@@ -940,7 +954,8 @@ export class MessageBridge {
                     }
                 }
                 if (msg.source !== 'handoff' && await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => {
-                    logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId: `cmd-${msg.messageId || Date.now()}`, payload: { kind: 'command.result', text } });
+                    const taskId = `cmd-${msg.messageId || Date.now()}`;
+                    logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId, correlationId: taskId, sessionId: msg.replyContext?.sessionId, agentAid: msg.selfAID, payload: { kind: 'command.result', text } });
                     return sendReply(msg.channelId, text, msg.replyContext);
                 }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext, msg.messageId, msg.selfAID, authSubject))
                     return;
@@ -1017,9 +1032,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,
@@ -1062,6 +1080,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,
@@ -1200,6 +1220,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') {
@@ -1218,7 +1263,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, {
@@ -1233,7 +1278,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, {
@@ -1244,6 +1289,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;
@@ -1380,6 +1427,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,
@@ -1418,9 +1469,11 @@ export class MessageBridge {
         logger.channelIn({
             channel,
             channelId: this.shortHash(msg.channelId),
+            selfAid: msg.selfAID,
             peerId: this.shortHash(msg.peerId),
             chatType: msg.chatType,
             msgId: msg.messageId,
+            correlationId: msg.messageId,
             control: {
                 id: parsed.id,
                 type: parsed.type,
@@ -1438,6 +1491,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) {
@@ -1556,17 +1611,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

@@ -289,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,