evolcore 0.0.26 → 0.0.27

package/dist/core/interaction-router.js

@@ -46,6 +46,8 @@ export class InteractionRouter {
             clearTimeout(existing.timer);
         const isReplacement = !!existing;
         const pending = {
+            blocking: opts?.blocking !== false,
+            retainOnRejected: opts?.retainOnRejected === true,
             callback,
             sessionId,
             initiatorId: opts?.initiatorId,
@@ -61,7 +63,8 @@ export class InteractionRouter {
                 if (this.handlers.get(id) !== pending)
                     return;
                 this.handlers.delete(id);
-                this.decPending(pending.sessionId);
+                if (pending.blocking)
+                    this.decPending(pending.sessionId);
                 const cancelReason = opts.timeoutCancelReason ?? 'timeout';
                 logger.debug(`[InteractionRouter] Timeout for interaction: ${id}`);
                 opts.onTimeout?.();
@@ -73,7 +76,9 @@ export class InteractionRouter {
             }, opts.timeoutMs);
         }
         this.handlers.set(id, pending);
-        if (!isReplacement)
+        if (existing?.blocking && (!pending.blocking || existing.sessionId !== sessionId))
+            this.decPending(existing.sessionId);
+        if (pending.blocking && (!isReplacement || !existing?.blocking || existing.sessionId !== sessionId))
             this.incPending(sessionId);
     }
     dispatch(response) {
@@ -104,10 +109,15 @@ export class InteractionRouter {
             // The callback may already have resolved/cancelled this exact handler.
             if (this.handlers.get(response.id) !== handler)
                 return accepted;
+            if (!accepted && handler.retainOnRejected && rejectionReason === 'backend_rejected') {
+                handler.inFlight = false;
+                return false;
+            }
             if (handler.timer)
                 clearTimeout(handler.timer);
             this.handlers.delete(response.id);
-            this.decPending(handler.sessionId);
+            if (handler.blocking)
+                this.decPending(handler.sessionId);
             if (!accepted && handler.onCancel) {
                 Promise.resolve(handler.onCancel(rejectionReason)).catch(err => {
                     logger.error(`[InteractionRouter] Rejection cancellation error for ${response.id}:`, err);
@@ -153,10 +163,13 @@ export class InteractionRouter {
         const pending = [];
         for (const [id, handler] of this.handlers.entries()) {
             if (handler.sessionId === sessionId) {
+                if (!handler.blocking && reason === 'new_message')
+                    continue;
                 if (handler.timer)
                     clearTimeout(handler.timer);
                 this.handlers.delete(id);
-                this.decPending(handler.sessionId);
+                if (handler.blocking)
+                    this.decPending(handler.sessionId);
                 if (reason && handler.onCancel) {
                     pending.push(Promise.resolve(handler.onCancel(reason)).then(() => undefined));
                 }
@@ -170,7 +183,8 @@ export class InteractionRouter {
             if (handler.timer)
                 clearTimeout(handler.timer);
             this.handlers.delete(id);
-            this.decPending(handler.sessionId);
+            if (handler.blocking)
+                this.decPending(handler.sessionId);
             if (reason && handler.onCancel)
                 await handler.onCancel(reason);
             return true;
@@ -208,10 +222,10 @@ export class InteractionRouter {
             return false;
         }
     }
-    getPending(sessionId) {
+    getPending(sessionId, command) {
         const ids = [];
         for (const [id, handler] of this.handlers.entries()) {
-            if (handler.sessionId === sessionId)
+            if (handler.sessionId === sessionId && (!command || handler.fallbackCommand === command))
                 ids.push(id);
         }
         return ids;
@@ -281,7 +295,7 @@ export function renderActionAsText(req) {
     if (fb.acceptFreeText && fb.freeTextHint) {
         lines.push(`  ${fb.freeTextHint}`);
     }
-    if (action.allowCustomInput) {
+    if (action.allowCustomInput && req.blocking !== false) {
         lines.push(`  或直接输入自定义内容`);
     }
     return lines.join('\n');

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

@@ -1,8 +1,9 @@
 import { logger } from '../../utils/logger.js';
-import { summarizeToolInput, toolInputForDisplay } from '../../utils/tool-summary.js';
+import { summarizeToolInput, summarizeToolInputForDisplay, toolInputForDisplay } from '../../utils/tool-summary.js';
 import { getErrorMessage, isContextTooLongText } from '../../utils/error-utils.js';
 import { tagErrorTextWithEvolcoreVersion } from '../../utils/evolcore-version.js';
 import { DEFAULT_FLUSH_DELAY_MS } from '../../types.js';
+import { classifyAunToolErrorCode } from '../permission/tool-error-code.js';
 export class IMRenderer {
     opts;
     itemsQueue = [];
@@ -19,6 +20,7 @@ export class IMRenderer {
     hasEmittedText = false;
     /** 自增 callId 兜底（runner 没提供时用） */
     syntheticCallSeq = 0;
+    currentAssistantUuid;
     constructor(opts) {
         this.opts = opts;
     }
@@ -61,12 +63,12 @@ export class IMRenderer {
         // interactive 模式由 MessageProcessor 显式调 addText/addToolCall/... 推入 items
     }
     /** 强制刷新所有 pending 事件 */
-    async flush(isFinal) {
+    async flush(isFinal, attention) {
         if (this.opts.envelope.chatmode === 'proactive') {
             // proactive 是 fire-and-forget，无 pending buffer
             return;
         }
-        return this.flushInternal(isFinal);
+        return this.flushInternal(isFinal, attention);
     }
     /** 仅 flush activities，保留 textBuffer（用于中间 complete 事件） */
     async flushActivitiesOnly() {
@@ -122,7 +124,12 @@ export class IMRenderer {
         this.textBuffer = '';
         // 清掉已消费的 text items，包括被拦截的纯空白正文。
         this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
-        const payload = { kind: 'result.text', text: rawText, isFinal: false };
+        const payload = {
+            kind: 'result.text',
+            text: rawText,
+            isFinal: false,
+            ...this.forkAnchorMetadata(),
+        };
         this.sentContent = true;
         try {
             await this.sendPayload(payload);
@@ -168,9 +175,14 @@ export class IMRenderer {
     }
     // ── 文本/活动注入（替代 StreamFlusher.addText/addActivity）──
     /** 添加文本片段（流式 text） */
-    addText(text, outputTokens, turn) {
+    async addText(text, outputTokens, turn, assistantUuid) {
         if (this.opts.envelope.chatmode === 'proactive')
             return;
+        if (this.textBuffer && this.currentAssistantUuid !== assistantUuid && !this.suppressIntermediateText()) {
+            await this.flushText();
+        }
+        // Do not carry the previous item's anchor onto unanchored output.
+        this.currentAssistantUuid = assistantUuid;
         this.emitProgress('text', outputTokens, turn);
         if (!text)
             return;
@@ -195,18 +207,19 @@ export class IMRenderer {
         this.emitProgress('tool_call', outputTokens, turn, { toolName: name, callId });
         if (this.suppressActivityItems())
             return;
+        const displayInput = toolInputForDisplay(name, input);
         this.itemsQueue.push({
             kind: 'tool_call',
             call_id: callId || this.synthCallId(),
             name,
-            arguments: toolInputForDisplay(name, input),
-            text: descText,
+            arguments: displayInput,
+            text: displayInput !== input ? summarizeToolInput(name, displayInput || {}) : descText,
         });
         this.messageTimestamps.push(Date.now());
         this.scheduleFlush();
     }
     /** 添加工具结果 */
-    addToolResult(name, ok, result, error, callId, durationMs, descText) {
+    addToolResult(name, ok, result, error, callId, durationMs, descText, classification) {
         if (this.opts.envelope.chatmode === 'proactive')
             return;
         this.emitProgress('tool_result', undefined, undefined, { toolName: name, callId, ok, durationMs });
@@ -219,6 +232,7 @@ export class IMRenderer {
             ok,
             ...(result !== undefined && { result }),
             ...(error !== undefined && { error }),
+            ...(!ok && { error_code: classifyAunToolErrorCode(classification ?? {}) }),
             ...(durationMs !== undefined && { duration_ms: durationMs }),
             ...(descText !== undefined && { text: descText }),
         });
@@ -260,6 +274,19 @@ export class IMRenderer {
             logger.warn(`[IMRenderer] status notice send failed: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
+    /** Notify the client that a new model text block has started. */
+    async sendTextStart(contentIndex, turn) {
+        const payload = {
+            kind: 'status.progress',
+            metadata: { activityType: 'text', kind: 'text_start', contentIndex, turn },
+        };
+        try {
+            await this.opts.send(payload);
+        }
+        catch (error) {
+            logger.debug(`[IMRenderer] text_start status send failed: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     /** 兼容旧调用方：发送 warning 级别的任务 notice。 */
     async sendWarningStatus(message, subtype, details) {
         return this.sendStatusNotice(message, 'warn', subtype, details);
@@ -317,7 +344,11 @@ export class IMRenderer {
             return false;
         // 保持与流式正文的到达顺序：先发出已缓冲的正文，再投影运行状态。
         await this.flushText();
-        const payload = { kind: 'result.text', text, isFinal: false };
+        const payload = {
+            kind: 'result.text',
+            text,
+            isFinal: false,
+        };
         this.sentContent = true;
         await this.sendPayload(payload);
         this.lastFlush = Date.now();
@@ -470,7 +501,7 @@ export class IMRenderer {
      * 完整 flush：把 itemsQueue 里所有 items 打包成 activity.batch 发送。
      * 如果 isFinal=true，还会在 batch 之后单独发一条 result.text 作为最终回复。
      */
-    async flushInternal(isFinal) {
+    async flushInternal(isFinal, attention) {
         if (this.timer) {
             clearTimeout(this.timer);
             this.timer = undefined;
@@ -501,6 +532,7 @@ export class IMRenderer {
         });
         this.itemsQueue = [];
         const finalText = isFinal ? this.textBuffer : '';
+        const finalAnchor = this.forkAnchorMetadata();
         if (isFinal)
             this.textBuffer = '';
         // 1. interactive 模式下：不发 text items（由 result.text 统一发送最终文本）
@@ -532,7 +564,12 @@ export class IMRenderer {
                 return;
             const text = this.textBuffer;
             this.textBuffer = '';
-            const payload = { kind: 'result.text', text, isFinal: false };
+            const payload = {
+                kind: 'result.text',
+                text,
+                isFinal: false,
+                ...this.forkAnchorMetadata(),
+            };
             this.sentContent = true;
             try {
                 await this.sendPayload(payload);
@@ -546,7 +583,14 @@ export class IMRenderer {
         }
         // 2. isFinal=true 时单独发最终回复文本
         if (isFinal && finalText.length > 0) {
-            const payload = { kind: 'result.text', text: finalText, isFinal: true };
+            const payload = {
+                kind: 'result.text',
+                text: finalText,
+                isFinal: true,
+                ...finalAnchor,
+            };
+            if (attention !== undefined)
+                payload.attention = attention;
             this.sentContent = true;
             try {
                 await this.sendPayload(payload);
@@ -559,6 +603,15 @@ export class IMRenderer {
             this.flushCount++;
         }
     }
+    forkAnchorMetadata() {
+        const assistantMessageId = this.currentAssistantUuid?.trim();
+        if (!assistantMessageId)
+            return {};
+        const anchor = {
+            assistantMessageId,
+        };
+        return { metadata: { forkAnchor: anchor } };
+    }
     // ── 内部：status.progress 发送 ──
     emitProgress(activityType, outputTokens, turn, extra) {
         if (this.suppressActivityItems())
@@ -592,9 +645,16 @@ export class IMRenderer {
         const item = this.mapEventToItem(event);
         if (!item)
             return;
+        // Proactive output is optional thought content. Blank runner blocks are
+        // normal; keep diagnostics without reporting a failed message send.
+        if ((item.kind === 'text' || (item.kind === 'summary' && !item.is_error)) && !item.text.trim()) {
+            const { envelope, agentAid } = this.opts;
+            logger.debug(`[IMRenderer] Skipping blank proactive thought: kind=${item.kind}`
+                + ` task=${envelope.taskId} session=${envelope.sessionId ?? '<none>'}`
+                + ` agent=${agentAid ?? envelope.agentName} textLength=${item.text.length}`);
+            return;
+        }
         if (item.kind === 'text') {
-            if (!this.hasSendableText(item.text, 'proactive'))
-                return;
             this.hasEmittedText = true;
             this.allText += item.text;
         }
@@ -622,7 +682,7 @@ export class IMRenderer {
                     return null;
                 return { kind: 'text', text: event.text };
             case 'tool_use': {
-                const desc = summarizeToolInput(event.name, event.input || {});
+                const desc = summarizeToolInputForDisplay(event.name, event.input || {});
                 const item = {
                     kind: 'tool_call',
                     call_id: event.callId || this.synthCallId(),
@@ -640,6 +700,7 @@ export class IMRenderer {
                         call_id: event.callId || this.synthCallId(),
                         name: event.name,
                         ok: false,
+                        error_code: classifyAunToolErrorCode(event),
                         error: event.error || (typeof event.result === 'string' ? event.result : '执行失败'),
                         ...(event.durationMs !== undefined && { duration_ms: event.durationMs }),
                     };

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

@@ -1,9 +1,13 @@
+import { loadAgent } from '../../config-store.js';
+import { initializationBlocksTasks } from '../../cli/agent-create.js';
 import { createHash, randomBytes } from 'crypto';
+import { agentStorageMenuService, isAgentStorageMenuRequest } from '../command/agent-storage-menu.js';
 import { logger } from '../../utils/logger.js';
 import { StreamDebouncer } from './stream-debouncer.js';
 import { appendMessageLog, appendMessageLogStrict, buildInboundEntry, isTransientProtocolMessage } from './message-log.js';
 import { buildEnvelope, isInteractionSendAccepted, sendInteractionPayload } from './message-utils.js';
 import { chatDirPath } from '../session/session-fs-store.js';
+import { readTopicLable } from '../session/session-mapper.js';
 import { formatChannelKey, tryParseChannelKey } from '../channel-loader.js';
 import { agentDir, resolvePaths } from '../../paths.js';
 import { listStaticAgentAdmins, listStaticAgentOwners, resolvePeerRoleDetail, } from '../../config/peer-role-resolver.js';
@@ -27,6 +31,7 @@ import { renderActionAsText } from '../interaction-router.js';
 import { planApprovalRoute } from '../permission/approval-gateway.js';
 import { guardGroupSlashCommand, parseFullAccessCommand } from '../command/slash-gate.js';
 import { isFullAccessEnabled } from '../../config-store.js';
+import { createAgentPolicyAuthorization } from '../role/runtime-policy.js';
 import { auditFullAccessEvent } from '../auth/authorization-audit.js';
 import { consumeAdmissionReplyBudget, clearAdmissionReplyBudgets, evaluateInboundAdmissionPreflight, evaluateOrdinaryInboundAdmission, } from './message-admission.js';
 const CONTACT_REJECTION_NOTICE = '[rejection] Not accepting messages from you.';
@@ -113,6 +118,7 @@ export class MessageBridge {
     aidStatsCollector;
     contactBindRuntimeChecker;
     interactionRouter;
+    groupInviteReviewService;
     constructor(defaultProjectPath, sessionManager, processor, messageQueue, cmdHandler, eventBus, defaultDebounce, processOwnersProvider) {
         this.defaultProjectPath = defaultProjectPath;
         this.sessionManager = sessionManager;
@@ -144,6 +150,12 @@ export class MessageBridge {
     setInteractionRouter(router) {
         this.interactionRouter = router;
     }
+    setGroupInviteReviewService(service) {
+        this.groupInviteReviewService = service;
+    }
+    registerGroupInviteReviewChannel(binding) {
+        this.groupInviteReviewService?.attach(binding);
+    }
     /**
      * AUN supplies an authenticated sender AID, while the IM-side code proves
      * possession of the external account. This command only creates that
@@ -483,7 +495,7 @@ export class MessageBridge {
                 ...(msg.replyContext ?? {}),
                 metadata: {
                     ...(msg.replyContext?.metadata ?? {}),
-                    ...evolMenuResponseTransportMetadata(),
+                    ...evolMenuResponseTransportMetadata(msg.protectedHeaders?.sdk_version),
                 },
             },
         }), {
@@ -795,6 +807,20 @@ export class MessageBridge {
                     }
                     return;
                 }
+                if (!trustedHandoffEcho && selfAid && actorId && this.groupInviteReviewService) {
+                    const inviteCommand = await this.groupInviteReviewService.handleCommand({
+                        selfAid,
+                        ownerAid: actorId,
+                        channelKey,
+                        channelType: resolvedChannelType,
+                        chatType,
+                        content,
+                    });
+                    if (inviteCommand.handled) {
+                        await this.sendAdmissionControlReply(admissionPreflight.context, msg, sendReply, inviteCommand.text ?? '群邀请命令已处理。');
+                        return;
+                    }
+                }
                 if (!trustedHandoffEcho && await this.handleReservedContactControl({
                     context: admissionPreflight.context,
                     msg,
@@ -1027,6 +1053,11 @@ export class MessageBridge {
                         ...(chatType === 'private' ? { routeId: msg.channelId } : {}),
                     });
                 }
+                const initializationConfig = selfAid ? loadAgent(selfAid) : null;
+                if (initializationConfig && initializationBlocksTasks(initializationConfig)) {
+                    await sendReply(msg.channelId, 'Agent 初始化尚未完成，请由创建者查询 ec agent show 或恢复初始化。');
+                    return;
+                }
                 // 1. owner 绑定（按实例名绑定）
                 if (adapter && actorId && roleDetail.effectiveRole === 'owner') {
                     await this.bootstrapService?.tryStartBootstrap({
@@ -1106,6 +1137,14 @@ export class MessageBridge {
                         return sendReply(msg.channelId, text, msg.replyContext);
                     }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext, msg.messageId, msg.selfAID, authSubject))
                     return;
+                // Commands retain their normal route. Only authenticated direct model
+                // input can obtain the Agent policy's per-call authorization.
+                if (!executionPermissionOverride && selfAid && owningAgent?.aid === selfAid) {
+                    executionPermissionOverride = createAgentPolicyAuthorization({
+                        agentAid: selfAid, actor: roleDetail.actor, chatType,
+                        source: msg.source, peerType: msg.peerType,
+                    });
+                }
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 if (!(await this.canCreateThreadSession(channelName, msg, chatType))) {
                     // 静默丢弃：绝不向群里注入回复。
@@ -1149,7 +1188,7 @@ export class MessageBridge {
                 // has been appended and create another renewed session.
                 releaseAdmission = await this.acquireAdmission(admissionRoute);
                 const hadMainSession = msg.threadId ? true : this.sessionManager.hasMainSession(channelName, msg.channelId, msg.channelType || effectiveChannelType, msg.selfAID || selfAid);
-                let session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, this.extractTopicName(msg), msg.peerId, chatType, owningAgent?.baseagent, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType, identity);
+                let session = await this.sessionManager.getOrCreateSession(channelName, msg.channelId, effectiveProjectPath, msg.threadId, Object.keys(metadata).length ? metadata : undefined, this.extractTopicName(msg), msg.peerId, chatType, owningAgent?.baseagent, msg.selfAID, msg.channelType || effectiveChannelType, msg.peerType, identity, readTopicLable(msg) ?? readTopicLable(msg.replyContext?.metadata));
                 if (session.threadId && typeof this.messageQueue.reserveSessionIngress === 'function') {
                     releaseSessionIngress = this.messageQueue.reserveSessionIngress(session.id);
                 }
@@ -1205,6 +1244,7 @@ export class MessageBridge {
                     mentions: msg.mentions, mentionAids: msg.mentionAids, threadId: msg.threadId,
                     isMentioned: msg.isMentioned,
                     topicName: this.extractTopicName(msg),
+                    lable: session.lable,
                     replyContext: msg.replyContext,
                     source: msg.source,
                     ...(executionPermissionOverride ? { executionPermissionOverride } : {}),
@@ -1427,6 +1467,8 @@ export class MessageBridge {
         const menuAuthSubject = {
             ...authSubject,
             requestId: parsed.id,
+            menuEncrypted: msg.encrypted === true,
+            fromControlChannel: authSubject.fromControlChannel || msg.isControlChannel === true,
             ...(activeSession?.id ? { sessionId: activeSession.id } : {}),
         };
         const isTokenRequest = parsed.type === 'menu.token.request';
@@ -1457,6 +1499,17 @@ export class MessageBridge {
                 return;
             }
         }
+        // Reauthorize even cached responses: roots expire and static owners can be revoked.
+        const isStorageRequest = isAgentStorageMenuRequest(parsed.request);
+        if (isStorageRequest) {
+            try {
+                agentStorageMenuService.preflight(parsed.request, menuAuthSubject);
+            }
+            catch (error) {
+                await this.sendMenuResponse(adapter, channel, msg, menuFailure(header, normalizeMenuError(error)));
+                return;
+            }
+        }
         const scope = msg.chatType === 'group' ? (msg.groupId || msg.channelId) : msg.peerId;
         // Separate installations can generate identical request IDs. Token
         // issuance and replay must remain scoped to the authenticated requester.
@@ -1474,6 +1527,16 @@ export class MessageBridge {
             }));
             return;
         }
+        // A replay may have awaited an in-flight request; check again before release.
+        if (isStorageRequest) {
+            try {
+                agentStorageMenuService.preflight(parsed.request, menuAuthSubject, false);
+            }
+            catch (error) {
+                await this.sendMenuResponse(adapter, channel, msg, menuFailure(header, normalizeMenuError(error)));
+                return;
+            }
+        }
         if (deduped.replayed)
             this.logMenuDiagnostic('request-replay', channel, msg, parsed);
         if (deduped.retry)
@@ -1488,7 +1551,20 @@ export class MessageBridge {
                 await deferredEffect();
             }
             catch (error) {
-                logger.warn(`[MenuControl] deferred effect failed: request=${parsed.id} error=${error instanceof Error ? error.message : String(error)}`);
+                const detail = error instanceof Error ? error.message : String(error);
+                const code = error && typeof error === 'object' && 'code' in error
+                    ? String(error.code ?? 'EXEC_FAILED')
+                    : 'EXEC_FAILED';
+                logger.warn(`[MenuControl] deferred effect failed: request=${parsed.id} error=${detail}`);
+                // File fetch is acknowledged before the upload completes. Send a
+                // second response with the same request id so the client can finish
+                // the pending fetch with an actionable error instead of timing out.
+                const failedResponse = menuFailure(header, {
+                    code,
+                    message: detail.startsWith('文件发送失败') ? detail : `文件发送失败: ${detail}`,
+                });
+                await this.menuDeduper.replaceResult(dedupKey, menuPayloadFingerprint(parsed.raw), deduped.value, failedResponse);
+                await this.sendMenuResponse(adapter, channel, msg, failedResponse);
             }
         }
     }
@@ -1498,6 +1574,13 @@ export class MessageBridge {
             const name = header.name ?? '';
             const cmd = typeof request.cmd === 'string' ? request.cmd : undefined;
             const args = request.args;
+            const transportReplyContext = {
+                ...(msg.replyContext ?? {}),
+                ...(msg.threadId ? { threadId: msg.threadId } : {}),
+            };
+            // Explicit group context can target a different conversation. Its
+            // sessions must not inherit the thread of the source conversation.
+            const replyContextFor = (channelId) => channelId === msg.channelId ? transportReplyContext : undefined;
             switch (request.type) {
                 case 'menu.list':
                     if (args?.view === 'catalog') {
@@ -1514,7 +1597,7 @@ export class MessageBridge {
                 case 'menu.query': {
                     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');
+                        const data = await this.cmdHandler.execMenuValueBatch(channel, msg.channelId, authSubject, args, args.context, msg.isControlChannel ? 'control' : 'agent', transportReplyContext);
                         return menuSuccess(header, data);
                     }
                     if (name === 'menu') {
@@ -1527,7 +1610,7 @@ export class MessageBridge {
                         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);
+                    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, 'menu', replyContextFor(execution.channelId));
                     if ('error' in result)
                         throw result;
                     return menuSuccess(header, result.data);
@@ -1544,7 +1627,7 @@ export class MessageBridge {
                     if ((name === 'topic' || cmd === '/topic') && args?.mode === 'fork-turns' && msg.threadId && !args?.sourceThreadId) {
                         optionArgs = { ...(execution.args ?? {}), sourceThreadId: msg.threadId };
                     }
-                    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) ?? [];
+                    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, 'menu', replyContextFor(execution.channelId)) ?? [];
                     return menuSuccess(header, data);
                 }
                 case 'menu.update': {
@@ -1555,10 +1638,7 @@ export class MessageBridge {
                         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, 'menu', {
-                        ...(msg.replyContext ?? {}),
-                        ...(msg.threadId ? { threadId: msg.threadId } : {}),
-                    });
+                    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, 'menu', replyContextFor(execution.channelId));
                     if ('error' in result)
                         throw result;
                     return menuSuccess(header, result.data);
@@ -1621,9 +1701,11 @@ export class MessageBridge {
         const agentName = this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>';
         const replyContext = {
             ...(msg.replyContext ?? {}),
+            ...(msg.peerDeviceId ? { toDeviceId: msg.peerDeviceId } : {}),
             metadata: {
                 ...(msg.replyContext?.metadata ?? {}),
-                ...evolMenuResponseTransportMetadata(),
+                ...evolMenuResponseTransportMetadata(msg.protectedHeaders?.sdk_version),
+                ...(isAgentStorageMenuRequest(request) ? { encrypted: true } : {}),
             },
         };
         if (msg.channelType === 'aun' && !replyContext.delivery) {
@@ -1890,6 +1972,7 @@ export class MessageBridge {
     }
     /** 注销单个渠道的 debouncer（热重载断开渠道时调用） */
     removeChannel(channelName) {
+        this.groupInviteReviewService?.detach(channelName);
         const d = this.debouncers.get(channelName);
         if (d) {
             d.dispose();

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

@@ -1,6 +1,6 @@
 import fs from 'fs';
 import path from 'path';
-import { appendJsonl, chatDirPath } from '../session/session-fs-store.js';
+import { appendJsonl, appendJsonlDurable, chatDirPath } from '../session/session-fs-store.js';
 import { logger } from '../../utils/logger.js';
 const TRANSIENT_PROTOCOL_TYPE_PREFIXES = [
     'contact.request.',
@@ -313,13 +313,13 @@ export function appendMessageLog(chatDir, entry) {
     }
 }
 /** Strict conversation-history append used by handoff reply binding. */
-export function appendMessageLogStrict(chatDir, entry) {
+export function appendMessageLogStrict(chatDir, entry, durable = false) {
     if (isTransientProtocolMessage(entry))
         return;
     if (entry.dir === 'in' && hasDuplicate(chatDir, entry.msgId))
         return;
     fs.mkdirSync(chatDir, { recursive: true });
-    appendJsonl(messageLogPath(chatDir), entry);
+    (durable ? appendJsonlDurable : appendJsonl)(messageLogPath(chatDir), entry);
     if (entry.dir === 'in')
         rememberMessageId(chatDir, entry.msgId);
 }
@@ -343,6 +343,8 @@ export function buildInboundEntry(opts) {
         msgType: isCommand ? 'command' : (opts.msgType ?? 'text'),
         payloadType: opts.payloadType,
         payloadSummary: opts.payloadSummary,
+        groupAttention: opts.groupAttention,
+        groupDelivery: opts.groupDelivery,
         content: opts.content,
         replyTo: opts.replyTo ?? null,
         agent: null,