evolcore 0.0.12 → 0.0.13

package/dist/core/command/menu-protocol.js

@@ -269,6 +269,9 @@ export class MenuRequestDeduper {
     ttlMs;
     maxEntries;
     entries = new Map();
+    /** Retain failed request identities briefly so a subsequent identical
+     * request is observable as a retry instead of an unrelated first attempt. */
+    failures = new Map();
     constructor(ttlMs = 30_000, maxEntries = 2_048) {
         this.ttlMs = ttlMs;
         this.maxEntries = maxEntries;
@@ -279,7 +282,13 @@ export class MenuRequestDeduper {
         if (existing) {
             if (existing.fingerprint !== fingerprint)
                 return { conflict: true };
-            return { value: await existing.promise, replayed: true };
+            return { value: await existing.promise, replayed: true, retry: false };
+        }
+        const previousFailure = this.failures.get(key);
+        if (previousFailure) {
+            if (previousFailure.fingerprint !== fingerprint)
+                return { conflict: true };
+            this.failures.delete(key);
         }
         const promise = operation();
         const entry = { fingerprint, promise, expiresAt: Date.now() + this.ttlMs };
@@ -288,10 +297,12 @@ export class MenuRequestDeduper {
         try {
             const value = await promise;
             entry.expiresAt = Date.now() + this.ttlMs;
-            return { value, replayed: false };
+            return { value, replayed: false, retry: !!previousFailure };
         }
         catch (error) {
             this.entries.delete(key);
+            this.failures.set(key, { fingerprint, expiresAt: Date.now() + this.ttlMs });
+            this.enforceLimit();
             throw error;
         }
     }
@@ -301,6 +312,10 @@ export class MenuRequestDeduper {
             if (entry.expiresAt <= now)
                 this.entries.delete(key);
         }
+        for (const [key, entry] of this.failures) {
+            if (entry.expiresAt <= now)
+                this.failures.delete(key);
+        }
     }
     enforceLimit() {
         while (this.entries.size > this.maxEntries) {
@@ -309,6 +324,12 @@ export class MenuRequestDeduper {
                 break;
             this.entries.delete(oldest);
         }
+        while (this.failures.size > this.maxEntries) {
+            const oldest = this.failures.keys().next().value;
+            if (!oldest)
+                break;
+            this.failures.delete(oldest);
+        }
     }
 }
 export class MenuDiagnosticLimiter {

package/dist/core/command/slash-handler.js

@@ -1,6 +1,6 @@
 import { hasModelSwitcher, hasPermissionController } from '../../agents/runner-types.js';
 import { getCodexEfforts } from '../../agents/codex-runner.js';
-import { buildEnvelope } from '../message/message-utils.js';
+import { buildEnvelope, isDeliveryTargetForChannel } from '../message/message-utils.js';
 import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
 import { logger } from '../../utils/logger.js';
 import { shouldSuppressRealRestart } from '../../utils/restart-safety.js';
@@ -2492,17 +2492,50 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         // 执行重启逻辑（共用于卡片回调和文本确认）
         const executeRestart = async () => {
             const suppressRealRestart = shouldSuppressRealRestart();
-            let replyContext;
-            if (threadId) {
-                const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
-                if (threadSession)
-                    replyContext = this.getReplyContext(threadSession);
+            let restartReplyContext = replyContext;
+            try {
+                if (!restartReplyContext?.delivery && threadId) {
+                    const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
+                    if (threadSession)
+                        restartReplyContext = this.getReplyContext(threadSession);
+                }
+                else if (!restartReplyContext?.delivery && activeSession) {
+                    restartReplyContext = this.getReplyContext(activeSession);
+                }
+            }
+            catch (error) {
+                const code = error?.code;
+                if (channel.split('#', 1)[0].toLowerCase() !== 'aun'
+                    || (code !== 'AUN_OUTBOUND_ROUTE_REQUIRED' && code !== 'AUN_OUTBOUND_ROUTE_MISMATCH')) {
+                    throw error;
+                }
+                logger.warn(`[System] Refusing restart from invalid persisted AUN session route: channel=${channel} channelId=${channelId} code=${code}`);
+                return false;
+            }
+            // The authenticated inbound transport context takes precedence over a
+            // potentially stale session snapshot. When no session exists, the
+            // explicit command chat type is the only acceptable local fallback.
+            if (restartReplyContext?.delivery === undefined) {
+                restartReplyContext = {
+                    ...(restartReplyContext ?? {}),
+                    ...(chatType === 'group'
+                        ? { delivery: { chatType: 'group', groupId: channelId } }
+                        : chatType === 'private'
+                            ? { delivery: { chatType: 'private' } }
+                            : {}),
+                };
+            }
+            if (channel.split('#', 1)[0].toLowerCase() === 'aun'
+                && !isDeliveryTargetForChannel(restartReplyContext?.delivery, channelId)) {
+                logger.warn(`[System] Refusing restart without a valid explicit delivery route: channel=${channel} channelId=${channelId}`);
+                return false;
             }
             const restartInfo = {
                 channel,
                 channelId,
                 timestamp: Date.now(),
-                ...(replyContext?.replyToMessageId ? { rootId: replyContext.replyToMessageId } : {}),
+                ...(restartReplyContext?.delivery ? { delivery: restartReplyContext.delivery } : {}),
+                ...(restartReplyContext?.replyToMessageId ? { rootId: restartReplyContext.replyToMessageId } : {}),
             };
             if (!suppressRealRestart) {
                 const controlDir = daemonControlDir();
@@ -2527,7 +2560,11 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         channelId,
                         agentName: 'system',
                         chatmode: 'interactive',
-                        replyContext,
+                        replyContext: restartReplyContext ?? (chatType === 'group'
+                            ? { delivery: { chatType: 'group', groupId: channelId } }
+                            : chatType === 'private'
+                                ? { delivery: { chatType: 'private' } }
+                                : undefined),
                     });
                     await adapter.send(envelope, { kind: 'command.result', text: '🔄 服务正在重启，请稍候...（约 5 秒后恢复）' });
                     // 等待消息发送完成后再延迟 kill
@@ -2570,7 +2607,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 return { kind: 'command.result', text: sessionsWithMessages.join('\n') + '\n再次输入 /restart 将强制重启。' };
             }
         }
-        await executeRestart();
+        const restarted = await executeRestart();
+        if (!restarted) {
+            return { kind: 'command.error', text: '❌ 无法确定重启通知的出站路由，请从可信会话上下文重试' };
+        }
         // executeRestart 内部已经发送了反馈消息，这里返回 null 避免重复发送
         return null;
     }
@@ -2728,7 +2768,15 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         // 发送文件
         try {
-            const replyCtx = !isCrossChannel && sendSession ? this.getReplyContext(sendSession) : undefined;
+            const replyCtx = isCrossChannel
+                ? { delivery: { chatType: 'private' } }
+                : sendSession
+                    ? this.getReplyContext(sendSession)
+                    : chatType === 'group'
+                        ? { delivery: { chatType: 'group', groupId: channelId } }
+                        : chatType === 'private'
+                            ? { delivery: { chatType: 'private' } }
+                            : undefined;
             await targetAdapter.send(buildEnvelope({ channel: targetAdapter.channelName, channelId: targetChannelId, replyContext: replyCtx }), { kind: 'result.file', filePath: realPath });
             const sizeStr = stat.size < 1024 ? `${stat.size} B`
                 : stat.size < 1024 * 1024 ? `${(stat.size / 1024).toFixed(1)} KB`

package/dist/core/event-catalog.js

@@ -313,6 +313,9 @@ const CATALOG = [
             { path: 'sessionId', type: 'string' },
             { path: 'toolName', type: 'string' },
             { path: 'input', type: 'object' },
+            { path: 'callId', type: 'string', optional: true },
+            { path: 'agentAid', type: 'string', optional: true },
+            { path: 'permissionMode', type: 'string', optional: true },
             { path: 'timestamp', type: 'number', optional: true },
         ],
     },
@@ -326,6 +329,9 @@ const CATALOG = [
             { path: 'toolName', type: 'string' },
             { path: 'isError', type: 'boolean', optional: true },
             { path: 'agentName', type: 'string', optional: true },
+            { path: 'callId', type: 'string', optional: true },
+            { path: 'agentAid', type: 'string', optional: true },
+            { path: 'permissionMode', type: 'string', optional: true },
             { path: 'timestamp', type: 'number', optional: true },
         ],
     },

package/dist/core/handoff/runtime.js

@@ -6,6 +6,7 @@ import { HandoffStore } from './store.js';
 import { createRootCausation, deriveCausation, normalizeCausation } from '../causation/context.js';
 import { recordCausationSpan } from '../causation/audit.js';
 import { logger } from '../../utils/logger.js';
+import { replyContextFromSession } from '../message/message-utils.js';
 const HANDOFF_STALE_WARN_MS = 72 * 60 * 60 * 1000;
 const HANDOFF_RETENTION_MS = 7 * 24 * 60 * 60 * 1000;
 const HANDOFF_LARGE_AGGREGATE_COUNT = 10;
@@ -79,7 +80,12 @@ export class HandoffRuntime {
         if (!origin || origin.selfAID !== input.selfAid)
             throw new Error('origin session not found');
         const targetChannelKey = formatChannelKey({ type: 'aun', selfAID: input.selfAid, name: 'main' });
-        const targetChatType = input.targetChatType ?? 'private';
+        if (!input.targetChatType) {
+            throw Object.assign(new Error('AUN handoff requires an explicit target chat type'), {
+                code: 'AUN_OUTBOUND_ROUTE_REQUIRED',
+            });
+        }
+        const targetChatType = input.targetChatType;
         const target = await this.sessionManager.getOrCreateSession(targetChannelKey, input.to, origin.projectPath, input.thread, {
             channelKey: targetChannelKey,
             peerId: input.to,
@@ -112,6 +118,9 @@ export class HandoffRuntime {
                 targetSessionId: target.id,
                 payload: input.payload,
                 encrypt: input.encrypt,
+                delivery: targetChatType === 'group'
+                    ? { chatType: 'group', groupId: input.to }
+                    : { chatType: 'private' },
                 returnPolicy: input.explicitReturnPolicy ?? 'required',
                 originAuthorization: input.originAuthorization,
                 causation: handoffCausation,
@@ -209,6 +218,8 @@ export class HandoffRuntime {
             messageId,
             timestamp: Date.now(),
             source: 'handoff',
+            groupId: origin.chatType === 'group' ? (origin.metadata?.groupId || origin.channelId) : undefined,
+            replyContext: replyContextFromSession(origin),
             boundSessionId: origin.id,
             causation: instance.return_causation
                 ? deriveCausation(instance.return_causation)

package/dist/core/handoff/store.js

@@ -115,7 +115,11 @@ export class HandoffStore {
             origin_session_id: input.originSessionId,
             origin_message_id: input.originMessageId,
             target_session_id: input.targetSessionId,
-            request: { payload: clonePayload(input.payload), encrypt: input.encrypt },
+            request: {
+                payload: clonePayload(input.payload),
+                encrypt: input.encrypt,
+                ...(input.delivery ? { delivery: input.delivery } : {}),
+            },
             ...(input.originAuthorization
                 ? { origin_authorization: { ...input.originAuthorization } }
                 : {}),

package/dist/core/interaction-router.js

@@ -228,6 +228,16 @@ export class InteractionRouter {
         return undefined;
     }
 }
+/** Bind an adapter response to its runtime-owned channel identity domain. */
+export function registerAdapterInteractions(adapter, router) {
+    const channelKey = adapter.channelKey;
+    adapter.onInteraction?.(async (response) => {
+        return router.handleAsync({ ...response, channelKey });
+    });
+    adapter.onInteractionInvalidated?.((interactionId, reason) => {
+        return router.cancelFromChannel(interactionId, reason);
+    });
+}
 /** 把 CommandCard 渲染为文本提示，channel 不支持卡片时使用 */
 export function renderCommandCardAsText(card) {
     const lines = [card.title];

package/dist/core/message/im-renderer.js

@@ -244,6 +244,25 @@ export class IMRenderer {
             durationMs: opts.durationMs,
         });
     }
+    /** 发送不进入 activity/thought 历史的非终态 warning status。 */
+    async sendWarningStatus(message, subtype, details) {
+        const payload = {
+            kind: 'status.progress',
+            metadata: {
+                activityType: 'progress',
+                message,
+                severity: 'warn',
+                ...(subtype !== undefined && { subtype }),
+                ...(details?.missingItems !== undefined && { missingItems: details.missingItems }),
+            },
+        };
+        try {
+            await this.opts.send(payload);
+        }
+        catch (error) {
+            logger.warn(`[IMRenderer] warning status send failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     /** 添加任务生命周期边界事件，复用 activity.batch 投影路径。 */
     addLifecycle(phase, metadata, text) {
         const item = {

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;
@@ -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,
@@ -1017,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,
@@ -1062,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,
@@ -1200,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') {
@@ -1218,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, {
@@ -1233,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, {
@@ -1244,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;
@@ -1380,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,
@@ -1438,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) {
@@ -1556,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

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