evolcore 0.0.12 → 0.0.14

package/dist/index.js

@@ -1,7 +1,7 @@
 // 【重要】最先加载环境变量，确保后续模块初始化时可用
 import dotenv from 'dotenv';
 import path from 'path';
-import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath, eckDebugDir, daemonControlDir, daemonQueuePath } from './paths.js';
+import { ensureDataDirs, resolvePaths, getPackageRoot, agentMdPath, eckDebugDir, daemonControlDir, daemonQueuePath, daemonMessageDedupPath } from './paths.js';
 // 立即加载 .env 文件（在其他模块导入之前）
 try {
     dotenv.config({ path: path.join(resolvePaths().root, '.env') });
@@ -14,16 +14,13 @@ import { CodexSessionFileAdapter } from './core/session/adapters/codex-session-f
 import { GeminiSessionFileAdapter } from './core/session/adapters/gemini-session-file-adapter.js';
 import { EcagentSessionFileAdapter } from './core/session/adapters/ecagent-session-file-adapter.js';
 import { loadDefaults, loadAllAgents, migrateIdentitiesIfNeeded, loadDaemonConfig, initializeEckSnapshotsConfig } from './config-store.js';
-import { ConfigTarget, initConfigManager, onConfigWrite, read as readConfig } from './config/config-manager.js';
-import { ensureRoleConfigV4OnStartup } from './config/role-config-v4-startup.js';
-import { ensureRoleConfigV5OnStartup } from './config/role-config-v5-startup.js';
+import { ConfigTarget, initConfigManager, onConfigWrite, read as readConfig, shouldFailFastForMissingOwners } from './config/config-manager.js';
+import { ensureRoleConfigV4OnStartup, ensureRoleConfigV5OnStartup } from './config/role-migration-startup.js';
 import { ensureContactBookV2OnStartup } from './config/contact-book-v2-startup.js';
 import { resolvePeerDisplayLabel } from './config/contact-book.js';
 import { expirePendingContactRequests } from './config/contact-request-service.js';
-import { shouldFailFastForMissingOwners } from './config/owner-policy.js';
 import { isManagementRole } from './config/builtin-roles.js';
 import { checkRoleAccess, getFirstStaticAgentOwner, resolvePeerRoleDetail, roleToSessionIdentity } from './config/peer-role-resolver.js';
-import { isCrossAgentTriggerOperationAllowed, isCrossAgentTriggerReadOperation } from './core/auth/trigger-authorization.js';
 import { ensureStartupConfigSnapshot, isConfigSnapshotsEnabled, retentionCleanup, readCurrent, readWVersion, diffWorkingVsVersion, paramDiff, incrementSuccessCount } from './config/snapshot.js';
 import { appendBootLog, selfDiagnose } from './config/boot-log.js';
 import { CONFIG_SCHEMA_VERSION } from './types.js';
@@ -41,7 +38,7 @@ import { BindService } from './utils/aid-bind.js';
 import { DingtalkChannelPlugin, registerPendingDingtalkContactBind } from './channels/dingtalk.js';
 import { QQBotChannelPlugin, registerPendingQQBotContactBind } from './channels/qqbot.js';
 import { WecomChannelPlugin, registerPendingWecomContactBind } from './channels/wecom.js';
-import { buildEnvelope } from './core/message/message-utils.js';
+import { buildEnvelope, isDeliveryTargetForChannel, replyContextFromSession } from './core/message/message-utils.js';
 import { ResponseEngine } from './core/message/response-engine.js';
 import { MessageQueue } from './core/message/message-queue.js';
 import { MessageBridge } from './core/message/message-bridge.js';
@@ -58,10 +55,9 @@ import { getEventCatalog } from './core/event-catalog.js';
 import { StatsCollector } from './utils/stats.js';
 import { AidStatsCollector } from './utils/stats.js';
 import { PermissionGateway } from './core/permission/approval-gateway.js';
-import { InteractionRouter } from './core/interaction-router.js';
-import { registerAdapterInteractions } from './core/interaction-registration.js';
+import { InteractionRouter, registerAdapterInteractions } from './core/interaction-router.js';
 import { AgentDelegationRegistry, authorizeDelegatedAunMsgSend } from './core/auth/agent-delegation.js';
-import { authorizeOperation, buildAuthSubject } from './core/auth/auth-gateway.js';
+import { authorizeOperation, buildAuthSubject, isCrossAgentTriggerOperationAllowed, isCrossAgentTriggerReadOperation, } from './core/auth/auth-gateway.js';
 import { parsePeerKey } from './core/relation/peer-identity.js';
 import { isHClassPath } from './core/protected-paths.js';
 import { ChannelLoader, tryParseChannelKey } from './core/channel-loader.js';
@@ -72,7 +68,8 @@ import { AgentReloadBusyError, AgentReloadCoordinator } from './core/agent-reloa
 import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
-import { ecwebVersionRequirementError, fetchEcwebPairCode } from './utils/ecweb-utils.js';
+import { fetchEcwebPairCode } from './utils/ecweb-utils.js';
+import { createEcwebSupervisor } from './utils/ecweb-supervisor.js';
 import { writeMain, removeAll, isMainWinner, scanInstances } from './utils/instance-registry.js';
 import { detectDuplicates } from './core/evolagent-registry.js';
 import { loadKitManifest, cleanEckDebug, invalidateKitCache } from './eck/kit-renderer.js';
@@ -90,14 +87,13 @@ import { applyTriggerPatch } from './trigger/patch.js';
 import { validateModelSelectionForRole } from './core/model/model-permission.js';
 import { constrainRuntimePermissionMode, validateRuntimeStringFieldOverride, } from './core/role/runtime-policy.js';
 import { atomicWriteJson } from './core/session/session-fs-store.js';
+import { ensureProcessManagedTempDir } from './cli/task-context.js';
 import { appendMessageLog, buildOutboundEntry, classifyAunPayloadForLog } from './core/message/message-log.js';
 import { normalizeAunMentionEntries } from './aun/msg/mention-schema.js';
 import { MAIN_PACKAGE_NAME } from './product.js';
 import fs from 'fs';
 import crypto from 'crypto';
 import { fileURLToPath } from 'url';
-import { spawn } from 'child_process';
-import * as platform from './utils/cross-platform.js';
 const controlMenuDeduper = new MenuRequestDeduper();
 /** 出站 payload 摘要（用于 channel-out.log） */
 function summarizeOutboundPayload(payload) {
@@ -176,6 +172,61 @@ function normalizeMessageSource(value) {
         ? value
         : 'daemon';
 }
+/**
+ * Preserve the authenticated AUN inbound route for control-plane replies.
+ * Control callbacks must not reconstruct group/private semantics from an AID.
+ */
+function controlReplyContext(opts, metadata) {
+    const supplied = opts.replyContext?.delivery;
+    if (supplied) {
+        const matchesInbound = opts.chatType === 'group'
+            ? supplied.chatType === 'group' && supplied.groupId === opts.groupId
+            : supplied.chatType === 'private';
+        if (!matchesInbound) {
+            throw Object.assign(new Error('AUN control reply route does not match its authenticated inbound context'), {
+                code: 'AUN_OUTBOUND_ROUTE_MISMATCH',
+            });
+        }
+    }
+    const delivery = supplied
+        ?? (opts.chatType === 'group'
+            ? (opts.groupId ? { chatType: 'group', groupId: opts.groupId } : undefined)
+            : { chatType: 'private' });
+    if (!delivery)
+        throw Object.assign(new Error('AUN control reply is missing a trusted groupId'), { code: 'AUN_OUTBOUND_ROUTE_REQUIRED' });
+    return {
+        ...(opts.replyContext ?? {}),
+        delivery,
+        metadata: {
+            ...(opts.replyContext?.metadata ?? {}),
+            ...(opts.encrypted === undefined ? {} : { encrypted: opts.encrypted }),
+            ...(opts.protectedHeaders ? { protectedHeaders: opts.protectedHeaders } : {}),
+            ...(metadata ?? {}),
+        },
+    };
+}
+function isValidAunDeliveryForChannel(delivery, channelId) {
+    return isDeliveryTargetForChannel(delivery, channelId);
+}
+function restartChannelType(channel) {
+    return channel?.split('#', 1)[0].toLowerCase();
+}
+/**
+ * Restore a persisted restart route without inferring AUN group semantics from
+ * an address. Legacy non-AUN entries may remain route-less; AUN entries do not.
+ */
+export function resolvePersistedRestartDelivery(opts) {
+    const requiresAunRoute = restartChannelType(opts.channel) === 'aun'
+        || restartChannelType(opts.adapterChannel) === 'aun';
+    if (!requiresAunRoute) {
+        return isDeliveryTargetForChannel(opts.delivery, opts.channelId)
+            ? { valid: true, delivery: opts.delivery }
+            : { valid: true };
+    }
+    return isDeliveryTargetForChannel(opts.delivery, opts.channelId)
+        ? { valid: true, delivery: opts.delivery }
+        : { valid: false };
+}
 function daemonConversationWatchdogMs(settings) {
     const idleTimeoutSec = settings.idleMonitor?.timeout;
     const idleMs = typeof idleTimeoutSec === 'number' && Number.isFinite(idleTimeoutSec) && idleTimeoutSec > 0
@@ -205,6 +256,10 @@ function originFromActorSession(session, authenticatedPeerId, authenticatedChann
         threadId: sameConversation && !isGroup ? (session.threadId || undefined) : undefined,
         peerId,
         sessionKey: sameConversation && !isGroup ? session.sessionKey : undefined,
+        // A group-created trigger intentionally feeds back to the authenticated
+        // actor's private conversation (the origin channelId is peerId), so the
+        // route remains explicit even though the source session was a group.
+        delivery: { chatType: 'private' },
     };
 }
 function seedUpgradeCheckTrigger(manager, owner) {
@@ -402,6 +457,20 @@ export async function sendSystemPayload(adapter, envelope, payload) {
 }
 async function runBindBootstrapDaemon(daemonCfg) {
     logger.warn('[bind-bootstrap] starting control AID + IPC only');
+    // Bootstrap exits before the normal trigger scheduler is constructed. Keep
+    // the daemon-owned upgrade check present during a fresh installation too;
+    // the regular startup path will reseed this definition idempotently.
+    const bootstrapControlAid = daemonCfg.aid || '__daemon__';
+    try {
+        seedUpgradeCheckTrigger(new TriggerDefinitionManager(bootstrapControlAid), {
+            aid: bootstrapControlAid,
+            originPeerId: bootstrapControlAid,
+            baseagent: 'codex',
+        });
+    }
+    catch (error) {
+        logger.warn(`[bind-bootstrap] failed to seed daemon upgrade trigger: ${error instanceof Error ? error.message : String(error)}`);
+    }
     const bindService = new BindService({
         receiverAid: daemonCfg.aid,
         getAvailableBaseagents: detectAvailableBaseagentsForBind,
@@ -437,7 +506,7 @@ async function runBindBootstrapDaemon(daemonCfg) {
         }
         const response = parsed ? await bindService.handleRequest(parsed, opts.peerId) : null;
         if (response) {
-            await controlChannel.sendMessage(opts.channelId, JSON.stringify(response));
+            await controlChannel.sendMessage(opts.channelId, JSON.stringify(response), controlReplyContext(opts));
         }
     });
     const controlToken = crypto.randomBytes(32).toString('base64url');
@@ -595,6 +664,9 @@ function readFastaunVersion() {
     }
 }
 async function main() {
+    // Service managers do not necessarily export TMPDIR. Establish the private
+    // managed root before any runner or task runtime is initialized.
+    ensureProcessManagedTempDir();
     // 启动信息：目录类型 + 版本号 + 代码最新时间戳
     {
         const pkgRoot = getPackageRoot();
@@ -789,6 +861,23 @@ async function main() {
             '如需远程管理，请在 daemon.json 配置 owners: [<你的 AID>]');
     }
     const paths = resolvePaths();
+    // ECWeb has one lifecycle owner: the daemon.  The CLI may have started an
+    // instance just before spawning us; the supervisor adopts it when healthy,
+    // otherwise starts one and keeps it alive for the daemon's lifetime.
+    let ecwebSupervisor = null;
+    if (daemonCfg.ecweb?.enabled) {
+        ecwebSupervisor = createEcwebSupervisor({
+            port: daemonCfg.ecweb.port ?? 42705,
+            logger,
+        });
+        try {
+            await ecwebSupervisor.start();
+            onShutdown(() => ecwebSupervisor?.stop());
+        }
+        catch (error) {
+            logger.warn(`ECWeb supervisor 启动失败（不影响 daemon 主流程）: ${error?.message || error}`);
+        }
+    }
     if (bindBootstrapMode && daemonCfg.aid && loadAllAgents().agents.length === 0) {
         await runBindBootstrapDaemon(daemonCfg);
         return;
@@ -1091,7 +1180,7 @@ async function main() {
             if (!adapter)
                 return;
             if (text) {
-                await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: id, replyContext: opts }), { kind: 'system.notice', text, subtype: 'health' });
+                await adapter.send(buildEnvelope({ channel: adapter.channelName, channelId: id, delivery: opts?.delivery, replyContext: opts }), { kind: 'system.notice', text, subtype: 'health' });
             }
         };
         return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);
@@ -1120,6 +1209,7 @@ async function main() {
         await processor.processMessage(message);
     }, {
         persistencePath: daemonQueuePath(),
+        dedupPath: daemonMessageDedupPath(),
     });
     // 设置中断回调（精确中断正在处理的 agent）
     messageQueue.setInterruptCallback(async (sessionKey, baseagent, evolagentName, reason = 'new_message') => {
@@ -1160,12 +1250,20 @@ async function main() {
             source: 'msg',
             handoffTrace: { version: 2, handoff_id: handoff.handoff_id },
         };
-        const result = targetSession.chatType === 'group'
+        const delivery = handoff.request.delivery;
+        if (!isValidAunDeliveryForChannel(delivery, targetSession.channelId)) {
+            return {
+                ok: false,
+                error: 'handoff is missing a valid immutable AUN delivery route',
+            };
+        }
+        const result = delivery.chatType === 'group'
             ? typeof channel.sendDaemonGroupMsg === 'function'
                 ? await channel.sendDaemonGroupMsg({
-                    groupId: targetSession.channelId,
+                    groupId: delivery.groupId,
                     payload: { ...handoff.request.payload, [AUN_HANDOFF_MARKER_FIELD]: handoff.handoff_id },
                     encrypt: handoff.request.encrypt,
+                    causation: handoff.causation,
                     log,
                 })
                 : { ok: false, error: 'AUN channel does not support daemon group sends' }
@@ -1279,6 +1377,14 @@ async function main() {
         if (target && !getTriggerChannel(definition.agentAid, target.channelKey)) {
             throw new Error(`agent ${definition.agentAid} has no configured channel ${target.channelKey}`);
         }
+        const channelType = tryParseChannelKey(target?.channelKey ?? '')?.type
+            ?? (target?.channelKey?.split('#', 1)[0] || undefined);
+        const validAunRoute = definition.feedback.strategy === 'target'
+            ? definition.feedback.target?.chatType === 'private' || definition.feedback.target?.chatType === 'group'
+            : !!definition.origin && isValidAunDeliveryForChannel(definition.origin.delivery, definition.origin.channelId);
+        if (target && channelType === 'aun' && !validAunRoute) {
+            throw Object.assign(new Error('AUN trigger feedback target requires a valid explicit delivery route'), { code: 'AUN_OUTBOUND_ROUTE_REQUIRED' });
+        }
     };
     const validateTriggerDefinitionForActor = (definition, actor) => {
         if (definition.execution.type === 'script' && !actor.management) {
@@ -1520,9 +1626,13 @@ async function main() {
                     && (candidate.adapter.channelKey === target.channelKey || candidate.adapter.channelName === target.channelKey)
                     && tryParseChannelKey(candidate.adapter.channelKey)?.selfAID === input.trigger.agentAid));
                 const channel = inst?.channel;
-                if (!channel || typeof channel.isGroupId !== 'function')
+                if (!channel)
+                    return null;
+                // Trigger targets carry their transport classification explicitly. A
+                // channelId is only an address and is never parsed to choose the RPC.
+                const targetChatType = target.chatType;
+                if (!targetChatType)
                     return null;
-                const targetChatType = channel.isGroupId(target.channelId) ? 'group' : 'private';
                 if (targetChatType === 'group' && typeof channel.sendDaemonGroupMsg !== 'function')
                     return null;
                 if (targetChatType === 'private' && typeof channel.sendDaemonMsg !== 'function')
@@ -1634,11 +1744,20 @@ async function main() {
         // 0. 包装 adapter.send，记录所有出站到 channel-out.log
         const originalSend = inst.adapter.send.bind(inst.adapter);
         inst.adapter.send = async (envelope, payload) => {
-            logger.channelOut({ channel: inst.adapter.channelName, channelId: envelope.channelId, taskId: envelope.taskId, payload: summarizeOutboundPayload(payload) });
+            const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelKey)
+                ?? agentRegistry.resolveByChannel(inst.adapter.channelName);
+            logger.channelOut({
+                channel: inst.adapter.channelName,
+                channelId: envelope.channelId,
+                taskId: envelope.taskId,
+                correlationId: envelope.operationId ?? envelope.taskId,
+                sessionId: envelope.sessionId,
+                agentAid: owningAgent?.aid,
+                agentName: envelope.agentName,
+                payload: summarizeOutboundPayload(payload),
+            });
             const result = await originalSend(envelope, payload);
             if (shouldCountSentPayload(payload)) {
-                const owningAgent = agentRegistry.resolveByChannel(inst.adapter.channelKey)
-                    ?? agentRegistry.resolveByChannel(inst.adapter.channelName);
                 if ((inst.channelType || inst.adapter.channelName) !== 'aun') {
                     try {
                         const logPayload = outboundPayloadToLogText(payload);
@@ -1748,8 +1867,8 @@ async function main() {
             });
         }
         // 5. 撤回消息 → 中断执行中任务
-        inst.channel.onRecall?.((messageId) => {
-            msgBridge.cancel(messageId);
+        inst.channel.onRecall?.((messageId, selfAID) => {
+            msgBridge.cancel(messageId, selfAID);
         });
     }
     // ── 注册所有渠道实例 ──
@@ -1858,6 +1977,7 @@ async function main() {
                 channel: adapter.channelName,
                 channelId: ownerAid,
                 agentName,
+                delivery: { chatType: 'private' },
             });
             sendSystemPayload(adapter, envelope, {
                 kind: 'system.notice',
@@ -1896,16 +2016,31 @@ async function main() {
                 logger.info(`[Restart] Pending notification waits for channel connection: ${pending.channel}`);
                 return;
             }
-            const replyContext = pending.rootId
-                ? { replyToMessageId: pending.rootId, replyInThread: !!pending.threadId }
-                : undefined;
+            const pendingDelivery = pending.delivery;
+            const restartDelivery = resolvePersistedRestartDelivery({
+                channel: pending.channel,
+                adapterChannel: adapter.channelName,
+                channelId: pending.channelId,
+                delivery: pendingDelivery,
+            });
+            if (!restartDelivery.valid) {
+                logger.warn(`[Restart] Discarding pending notification without a valid persisted delivery route: channel=${pending.channel} channelId=${pending.channelId}`);
+                fs.rmSync(pendingFile, { force: true });
+                return;
+            }
+            const pendingRouteContext = restartDelivery.delivery ? { delivery: restartDelivery.delivery } : {};
+            const replyContext = {
+                ...(pendingRouteContext ?? {}),
+                ...(pending.rootId ? { replyToMessageId: pending.rootId, replyInThread: !!pending.threadId } : {}),
+            };
             const owningAgent = agentRegistry.resolveByChannel(adapter.channelKey);
             const envelope = buildEnvelope({
                 taskId: `system-restart-${process.pid}`,
                 channel: adapter.channelKey,
                 channelId: pending.channelId,
                 agentName: owningAgent?.aid || 'evolcore',
-                replyContext,
+                ...(restartDelivery.delivery ? { delivery: restartDelivery.delivery } : {}),
+                replyContext: Object.keys(replyContext).length > 0 ? replyContext : undefined,
             });
             await sendSystemPayload(adapter, envelope, {
                 kind: 'system.notice',
@@ -2115,53 +2250,6 @@ async function main() {
         catch (e) {
             logger.warn(`控制 AID 首连失败（后台自动重连，不影响 daemon 主流程）: ${e?.message || e}`);
         }
-        // ── ECWeb 自动启动 ──
-        // 如果 config.ecweb.enabled，自动拉起 ecweb 服务
-        if (daemonCfg.ecweb?.enabled) {
-            const ecwebPath = path.join(resolvePaths().root, 'ecweb');
-            const ecwebEntry = path.join(ecwebPath, 'dist', 'index.js');
-            if (fs.existsSync(ecwebEntry)) {
-                let ecwebVersion;
-                try {
-                    const pkg = JSON.parse(fs.readFileSync(path.join(ecwebPath, 'package.json'), 'utf-8'));
-                    ecwebVersion = pkg.version;
-                }
-                catch { }
-                const versionError = ecwebVersionRequirementError(ecwebVersion);
-                if (versionError) {
-                    logger.error(`ECWeb 未启动: ${versionError}`);
-                }
-                else {
-                    try {
-                        const ecwebProc = spawn(process.execPath, [ecwebEntry], {
-                            cwd: ecwebPath,
-                            detached: true,
-                            stdio: 'ignore',
-                            windowsHide: platform.isWindows,
-                            env: { ...process.env, EVOLCORE_HOME: resolvePaths().root }
-                        });
-                        ecwebProc.unref();
-                        logger.info(`✓ ECWeb 已启动 (PID: ${ecwebProc.pid})`);
-                        onShutdown(() => {
-                            try {
-                                if (ecwebProc.pid)
-                                    platform.killProcess(ecwebProc.pid, true);
-                                logger.info(`✓ ECWeb 已停止`);
-                            }
-                            catch { }
-                        });
-                    }
-                    catch (e) {
-                        logger.warn(`ECWeb 启动失败: ${e?.message || e}`);
-                    }
-                }
-            }
-            else {
-                // 正式安装时 ECWeb 是独立的全局 ec-web 包，由 ec start/restart 的
-                // 启动链路管理；runtime 目录没有内嵌构建产物是正常状态。
-                logger.debug(`ECWeb runtime entry absent (managed externally): ${ecwebEntry}`);
-            }
-        }
         // 控制 AID 接收 owner 指令：
         // 1. /pair — ECWeb 配对码（文本快路径）
         // 2. menu.* JSON — 路由到 cmdHandler.execMenuForControl（进程级 + 全量权限）
@@ -2176,22 +2264,20 @@ async function main() {
                 catch {
                     parsed = null;
                 }
+                const menuResponseContext = () => controlReplyContext(opts, evolMenuResponseTransportMetadata());
                 if (bindService && parsed?.type === 'bind.request') {
                     const response = await bindService.handleRequest(parsed, opts.peerId);
                     if (response) {
                         // 用 sendStructured 直发 typed payload（payload.type='bind.response'），
                         // 不能用 sendMessage——它会把内容包成 {type:'text', text:...}，App 无法识别。
                         // encrypted 跟随入站请求：bind.response 与 bind.request 的加密/明文对称。
-                        await controlChannel.sendStructured(opts.channelId, response, { metadata: { encrypted: opts.encrypted } });
+                        await controlChannel.sendStructured(opts.channelId, response, controlReplyContext(opts));
                     }
                     return;
                 }
                 const menuControl = parseMenuControl(text);
                 const isRoleMenu = menuControl.isMenu
                     && (menuControl.name === 'role' || menuControl.request.cmd === '/role');
-                const menuResponseContext = () => ({
-                    metadata: evolMenuResponseTransportMetadata(),
-                });
                 if (menuControl.isMenu && !hasValidMenuId(menuControl)) {
                     logger.warn(`[ControlMenu] dropped malformed request without id type=${menuControl.type}`);
                     return;
@@ -2216,7 +2302,7 @@ async function main() {
                     else {
                         reply = 'ECWeb 未运行或暂不可达。请在主机运行 ec watch web 启动后重试。';
                     }
-                    await controlChannel.sendMessage(opts.channelId, reply);
+                    await controlChannel.sendMessage(opts.channelId, reply, controlReplyContext(opts));
                     return;
                 }
                 // menu.* JSON 路由：owner 已在上方校验，转交 execMenuForControl（fromControlChannel=true）
@@ -2235,6 +2321,16 @@ async function main() {
                         return;
                     }
                     const deduped = await controlMenuDeduper.execute([opts.channelId, opts.peerId, menuControl.id].join('\u001f'), menuPayloadFingerprint(menuControl.raw), () => cmdHandler.execMenuForControl(parsed, opts.peerId));
+                    if ('retry' in deduped) {
+                        if (deduped.replayed) {
+                            logger.warn(`[MenuControl] category=request-replay request=${menuControl.id}`
+                                + ` sender=${opts.peerId} replay=true`);
+                        }
+                        if (deduped.retry) {
+                            logger.warn(`[MenuControl] category=request-retry request=${menuControl.id}`
+                                + ` sender=${opts.peerId} retry=true`);
+                        }
+                    }
                     const response = 'conflict' in deduped
                         ? menuFailure({ id: menuControl.id, ...(menuControl.name?.trim() ? { name: menuControl.name } : {}) }, { code: 'CONFLICT', message: 'Request ID was already used with a different payload' })
                         : deduped.value;
@@ -2244,7 +2340,7 @@ async function main() {
                     return;
                 }
                 // owner 发的其他内容：提示可用指令
-                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取 ECWeb 登录配对码）');
+                await controlChannel.sendMessage(opts.channelId, '可用指令：/pair（获取 ECWeb 登录配对码）', controlReplyContext(opts));
             }
             catch (e) {
                 logger.warn(`控制 AID 消息处理失败: ${e?.message || e}`);
@@ -2296,6 +2392,7 @@ async function main() {
                 channel: other.adapter.channelKey,
                 channelId: ownerId,
                 agentName: owningAgent?.aid || 'evolcore',
+                delivery: { chatType: 'private' },
             });
             sendSystemPayload(other.adapter, envelope, {
                 kind: 'system.error',
@@ -2385,11 +2482,13 @@ async function main() {
                 channelType: session.channelType || parsedResumeKey?.type,
                 selfAID: resumeSelfAID,
                 channelId: session.channelId,
+                groupId: session.chatType === 'group' ? (session.metadata?.groupId || session.channelId) : undefined,
+                chatType: session.chatType === 'group' ? 'group' : 'private',
                 content: '服务已重启，请继续之前未完成的任务。',
                 timestamp: Date.now(),
                 peerId: '',
                 threadId: session.threadId || undefined,
-                replyContext: session.metadata?.replyContext,
+                replyContext: replyContextFromSession(session),
             };
             // 清除状态后入队（processMessage 会重新标记）
             sessionManager.clearProcessing(session.id);
@@ -2721,10 +2820,9 @@ async function main() {
             if (!ch) {
                 return { ok: false, error: `AUN channel not found for ${params.aid}`, code: 'AUN_CHANNEL_NOT_FOUND' };
             }
-            const targetIsGroup = typeof ch.isGroupId === 'function' && ch.isGroupId(params.to);
-            if ((params.scope === 'group') !== targetIsGroup) {
-                return { ok: false, error: 'AUN target does not match the delegated send scope', code: 'UNSUPPORTED_TARGET' };
-            }
+            // The IPC command already carries the caller-selected transport scope.
+            // Never reclassify the target by parsing its AID string: a private AID may
+            // look group-like and a group identifier may use a future format.
             const encrypt = typeof params.encrypt === 'boolean'
                 ? params.encrypt
                 : (typeof ch.getDefaultEncrypt === 'function' ? ch.getDefaultEncrypt() : true);
@@ -3180,7 +3278,7 @@ async function main() {
             const agentName = handle?.name;
             if (!agentName)
                 return [];
-            return messageQueue.getQueueItemsByAgent(agentName);
+            return messageQueue.getQueueItemsByAgent(agentName, { after: params.after, before: params.before });
         });
         ipcServer.setQueueActionExecutor(async (params) => {
             const handle = agentRegistry.get(params.agent);
@@ -3261,8 +3359,12 @@ async function main() {
             const handle = agentRegistry.get(authorization.aid);
             if (!handle?.name)
                 return { ok: false, code: 'AGENT_NOT_FOUND', error: 'current Agent not found' };
-            if (!params.action)
-                return { ok: true, items: messageQueue.getQueueItemsByAgent(handle.name) };
+            if (!params.action) {
+                return { ok: true, items: messageQueue.getQueueItemsByAgent(handle.name, {
+                        after: params.after,
+                        before: params.before,
+                    }) };
+            }
             if (params.action === 'clear')
                 return { ok: true, cleared: messageQueue.clearByAgent(handle.name) };
             if (params.action === 'cancel') {

package/dist/ipc.js

@@ -15,6 +15,7 @@ import { hashCurrentDelegatedCommand } from './core/auth/agent-delegation.js';
 import { normalizeAunMentionEntries } from './aun/msg/mention-schema.js';
 const isWindows = process.platform === 'win32';
 const isNamedPipe = (p) => isWindows && p.startsWith('\\\\.\\pipe\\');
+const finiteTimestamp = (value) => (typeof value === 'number' && Number.isFinite(value) ? value : undefined);
 const LOCAL_CONTROL_COMMANDS = new Set([
     'bind.begin',
     'bind.status',
@@ -32,6 +33,12 @@ const LOCAL_CONTROL_COMMANDS = new Set([
     'menu.exec',
     'monitor-snapshot',
 ]);
+function requiresLocalControlToken(cmd) {
+    // Managed bootstrap completion is authenticated by the session delegation
+    // ticket. A standalone CLI invocation still needs the daemon control token.
+    return LOCAL_CONTROL_COMMANDS.has(String(cmd.type ?? ''))
+        || (cmd.type === 'evolagent.bootstrapComplete' && typeof cmd.sessionId !== 'string');
+}
 export function summarizeMonitorAgents(agents, aids) {
     const connectedAgents = new Set(aids.filter(aid => aid.status === 'connected').map(aid => aid.agentName || aid.aid));
     const enabledAgents = agents.filter(agent => agent.status !== 'disabled');
@@ -379,7 +386,7 @@ export class IpcServer {
         }
     }
     async handleCommand(cmd) {
-        if (LOCAL_CONTROL_COMMANDS.has(cmd.type) && !this.hasValidControlToken(cmd.controlToken)) {
+        if (requiresLocalControlToken(cmd) && !this.hasValidControlToken(cmd.controlToken)) {
             return { ok: false, code: 'INVALID_CONTROL_TOKEN', error: 'valid local control token is required' };
         }
         switch (cmd.type) {
@@ -520,7 +527,11 @@ export class IpcServer {
                     // 纯查询
                     if (!this.queueSnapshotProvider)
                         return { ok: false, error: 'queue-snapshot not configured' };
-                    return { ok: true, items: this.queueSnapshotProvider({ agent: cmd.agent }) };
+                    return { ok: true, items: this.queueSnapshotProvider({
+                            agent: cmd.agent,
+                            after: finiteTimestamp(cmd.after),
+                            before: finiteTimestamp(cmd.before),
+                        }) };
                 }
                 // 操作：clear / cancel / interrupt
                 if (!this.queueActionExecutor)
@@ -546,6 +557,8 @@ export class IpcServer {
                     action: cmd.action,
                     messageId: typeof cmd.messageId === 'string' ? cmd.messageId : undefined,
                     sessionKey: typeof cmd.sessionKey === 'string' ? cmd.sessionKey : undefined,
+                    after: finiteTimestamp(cmd.after),
+                    before: finiteTimestamp(cmd.before),
                     sessionId: cmd.sessionId,
                     delegationToken: typeof cmd.delegationToken === 'string' ? cmd.delegationToken : undefined,
                     delegationCommandHash: typeof cmd.delegationCommandHash === 'string' ? cmd.delegationCommandHash : undefined,
@@ -1037,7 +1050,7 @@ export class IpcServer {
 export function ipcQuery(socketPath, cmd, timeoutMs = 3000) {
     let authenticatedCmd = cmd;
     if (!process.env.EVOLCORE_SESSION_ID
-        && LOCAL_CONTROL_COMMANDS.has(cmd.type)
+        && requiresLocalControlToken(cmd)
         && typeof cmd.controlToken !== 'string') {
         try {
             const controlToken = fs.readFileSync(resolvePaths().controlToken, 'utf8').trim();

package/dist/paths.js

@@ -149,6 +149,9 @@ export function daemonControlDir() {
 export function daemonQueuePath() {
     return path.join(daemonDataDir(), 'message-queue.json');
 }
+export function daemonMessageDedupPath() {
+    return path.join(daemonDataDir(), 'message-dedup.json');
+}
 export function channelStateDir(channelKey) {
     if (!channelKey || channelKey === '.' || channelKey === '..') {
         throw new Error('channelKey is required');