evolcore 0.0.7 → 0.0.9

package/dist/index.js

@@ -69,7 +69,7 @@ import { EvolAgentRegistry } from './core/evolagent-registry.js';
 import { buildReloadHooks } from './core/channel-loader.js';
 import { IpcServer } from './ipc.js';
 import { logger, setLogLevel } from './utils/logger.js';
-import { fetchEcwebPairCode } from './utils/ecweb-utils.js';
+import { ecwebVersionRequirementError, fetchEcwebPairCode } from './utils/ecweb-utils.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';
@@ -88,6 +88,7 @@ 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 { appendMessageLog, buildOutboundEntry, classifyAunPayloadForLog } from './core/message/message-log.js';
+import { MAIN_PACKAGE_NAME } from './product.js';
 import fs from 'fs';
 import crypto from 'crypto';
 import { fileURLToPath } from 'url';
@@ -277,7 +278,7 @@ function seedUpgradeCheckTrigger(manager, owner) {
         'fi',
         '',
         'local_version="$(node -e \'try { console.log(require(process.argv[1]).version || "") } catch { process.exit(0) }\' "$PACKAGE_JSON")"',
-        'remote_version="$(npm view ec version 2>/dev/null || true)"',
+        `remote_version="$(npm view ${MAIN_PACKAGE_NAME} version 2>/dev/null || true)"`,
         '',
         'if [ -z "$remote_version" ]; then',
         '  json "error" "failed to check evolcore latest version"',
@@ -367,6 +368,8 @@ async function runBindBootstrapDaemon(daemonCfg) {
         agentName: daemonCfg.aid,
         channelName: 'control',
         pureIdentity: true,
+        gatewayUrl: daemonCfg.aun?.gatewayUrl,
+        defaultEncrypt: daemonCfg.aun?.defaultEncrypt,
         aunTrace: daemonCfg.debug?.aunTrace,
         aunSdkLog: daemonCfg.debug?.aunSdkLog,
     });
@@ -397,7 +400,20 @@ async function runBindBootstrapDaemon(daemonCfg) {
         channels: {},
         channelsByType: {},
         queue: { pending: 0, processing: 0 },
-        controlAid: { aid: daemonCfg.aid, connected: controlChannel?.getAidState().status === 'connected' },
+        controlAid: (() => {
+            const aidState = controlChannel?.getAidState();
+            return {
+                aid: daemonCfg.aid,
+                connected: aidState?.status === 'connected',
+                ...(aidState ? {
+                    status: aidState.status,
+                    gatewayUrl: aidState.gatewayUrl,
+                    reconnectCount: aidState.reconnectCount,
+                    lastConnectedAt: aidState.lastConnectedAt,
+                    lastError: aidState.lastError,
+                } : {}),
+            };
+        })(),
     }));
     ipcServer.setBindExecutor({
         begin: (cmd) => bindService.begin(cmd),
@@ -859,11 +875,12 @@ async function main() {
     agentLoader.register(new CodexAgentPlugin());
     agentLoader.register(new GeminiAgentPlugin());
     agentLoader.register(new EcagentAgentPlugin());
+    const creationErrors = [];
     const agentInstances = agentLoader.createAll(agentRegistry, {
         onSessionIdUpdate: async (sessionId, agentSessionId) => {
             await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
         },
-    });
+    }, creationErrors);
     // agentMap 复合键：${aid}::${baseagent}
     const agentMap = new Map();
     for (const inst of agentInstances) {
@@ -871,10 +888,18 @@ async function main() {
     }
     const primaryBaseagent = primaryAgent?.baseagent ?? 'claude';
     let primaryRunnerKey = primaryAgent ? `${primaryAgent.aid}::${primaryBaseagent}` : '<empty>::claude';
-    const agentRunner = agentMap.get(primaryRunnerKey) || agentInstances[0]?.agent;
+    const agentRunner = primaryAgent
+        ? agentMap.get(primaryRunnerKey)
+        : agentInstances[0]?.agent;
     if (primaryAgent && !agentRunner) {
         agentRuntimeState = 'error';
-        agentRuntimeError = 'No agent backend available. Check baseagents config (no runners created).';
+        const primaryCreationErrors = creationErrors.filter(error => error.evolagentName === primaryAgent.name);
+        const creationDetail = primaryCreationErrors.length > 0
+            ? primaryCreationErrors.map(({ baseagent, message }) => `${baseagent}: ${message}`).join('; ')
+            : `active_baseagent=${primaryAgent.config.active_baseagent ?? '(unset)'}, configured=${Object.keys(primaryAgent.config.baseagents ?? {}).join(',') || '(none)'}`;
+        agentRuntimeError = primaryCreationErrors.length > 0
+            ? creationDetail
+            : `No agent runner created for ${primaryAgent.name}: ${creationDetail}`;
         primaryAgent.status = 'error';
         primaryAgent.error = agentRuntimeError;
         logger.error(agentRuntimeError);
@@ -927,7 +952,7 @@ async function main() {
         messageCache.cleanupExpired();
     }, 60 * 60 * 1000);
     // 渠道插件系统
-    const channelLoader = new ChannelLoader(daemonCfg.debug);
+    const channelLoader = new ChannelLoader(daemonCfg.debug, daemonCfg.aun?.defaultEncrypt);
     channelLoader.register(new FeishuChannelPlugin());
     channelLoader.register(new WechatChannelPlugin());
     channelLoader.register(new AUNChannelPlugin());
@@ -1202,7 +1227,7 @@ async function main() {
             const effortDecision = validateRuntimeStringFieldOverride({
                 selfAid: definition.agentAid,
                 role: actor.role,
-                field: `baseagents.${baseagent}.${baseagent === 'codex' ? 'reasoning' : 'effort'}`,
+                field: `baseagents.${baseagent}.effort`,
                 value: definition.execution.effort,
             });
             if (!effortDecision.ok)
@@ -1430,7 +1455,7 @@ async function main() {
                     originSessionId: originSession.id,
                     originMessageId: input.runId,
                     payload,
-                    encrypt: false,
+                    encrypt: typeof channel.getDefaultEncrypt === 'function' ? channel.getDefaultEncrypt() : true,
                     thread: target.session === 'thread' ? target.threadId : undefined,
                     targetChatType,
                     explicitReturnPolicy: 'none',
@@ -1871,6 +1896,78 @@ async function main() {
         if (inst)
             connectedChannels.delete(inst.adapter.channelKey);
     };
+    // Bind the per-HOME IPC endpoint before any AUN connection is attempted.
+    // A failed bind (for example, a stale Windows named pipe) must abort startup
+    // without creating a second AUN session that can kick the old daemon.
+    let controlChannel;
+    const ipcServer = new IpcServer(resolvePaths().socket, () => {
+        const channels = {};
+        const channelsByType = {};
+        for (const inst of channelInstances) {
+            const name = inst.adapter.channelName;
+            const status = inst.channel.getStatus?.() ?? { connected: true };
+            const channelType = inst.channelType || name;
+            channels[name] = { ...status, channelType };
+            if (!channelsByType[channelType])
+                channelsByType[channelType] = [];
+            channelsByType[channelType].push(name);
+        }
+        const snap = statsCollector.getSnapshot();
+        const agentListForStatus = agentRegistry.list();
+        return {
+            pid: process.pid,
+            uptime: snap.uptimeMs,
+            controlPlane: {
+                ready: true,
+                owned: processLevelOwners.length > 0,
+            },
+            agentRuntime: {
+                state: agentRuntimeState,
+                runnableAgents: agentListForStatus.filter((a) => a.status !== 'error' && a.status !== 'disabled').length,
+                runningAgents: agentListForStatus.filter((a) => a.status === 'running').length,
+                ...(agentRuntimeError ? { error: agentRuntimeError } : {}),
+            },
+            channels,
+            channelsByType,
+            queue: {
+                pending: messageQueue.getGlobalQueueLength(),
+                processing: messageQueue.getGlobalProcessingCount(),
+            },
+            stats: {
+                received: snap.lastHour.received,
+                sent: snap.lastHour.sent,
+                completed: snap.lastHour.completed,
+                errors: snap.lastHour.errors,
+                avgResponseMs: snap.lastHour.avgResponseMs,
+            },
+            controlAid: (() => {
+                if (!daemonCfg.aid)
+                    return undefined;
+                const aidState = controlChannel?.getAidState();
+                return {
+                    aid: daemonCfg.aid,
+                    connected: aidState?.status === 'connected',
+                    ...(aidState ? {
+                        status: aidState.status,
+                        gatewayUrl: aidState.gatewayUrl,
+                        reconnectCount: aidState.reconnectCount,
+                        lastConnectedAt: aidState.lastConnectedAt,
+                        lastError: aidState.lastError,
+                    } : {}),
+                };
+            })(),
+        };
+    }, async (cmd, sessionId, delegationToken, delegationCommandHash) => {
+        const delegation = agentDelegationRegistry.validate(delegationToken, sessionId, delegationCommandHash);
+        if (!delegation.ok)
+            return { ok: false, code: delegation.code, error: delegation.reason };
+        return cmdHandler.handleCtl(cmd, sessionId);
+    });
+    // Register every IPC executor/provider before exposing the endpoint. The
+    // function declaration is hoisted, while its invocation remains here so a
+    // failed bind still aborts before any AUN connection is attempted.
+    configureIpc();
+    await ipcServer.start();
     // ── 连接所有渠道（后台首连，AUN/任意渠道故障不阻塞 daemon 主流程）──
     logger.info(`🚀 EvolCore core is ready; connecting ${channelInstances.length} channel(s) in background`);
     const connectAllPromise = channelLoader.connectAll(channelInstances, {
@@ -1913,13 +2010,14 @@ async function main() {
             logger.warn(`控制 AID 证书缺失：${daemonCfg.aid}（AUN 控制通道后台重连；如需重建运行 ec init）`);
         }
     }
-    let controlChannel;
     if (daemonCfg.aid) {
         controlChannel = new AUNChannel({
             aid: daemonCfg.aid,
             agentName: daemonCfg.aid,
             channelName: 'control',
             pureIdentity: true,
+            gatewayUrl: daemonCfg.aun?.gatewayUrl,
+            defaultEncrypt: daemonCfg.aun?.defaultEncrypt,
             aunTrace: daemonCfg.debug?.aunTrace,
             aunSdkLog: daemonCfg.debug?.aunSdkLog,
         });
@@ -1938,26 +2036,38 @@ async function main() {
             const ecwebPath = path.join(resolvePaths().root, 'ecweb');
             const ecwebEntry = path.join(ecwebPath, 'dist', 'index.js');
             if (fs.existsSync(ecwebEntry)) {
+                let ecwebVersion;
                 try {
-                    const ecwebProc = spawn('node', [ecwebEntry], {
-                        cwd: ecwebPath,
-                        detached: true,
-                        stdio: 'ignore',
-                        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 { }
-                    });
+                    const pkg = JSON.parse(fs.readFileSync(path.join(ecwebPath, 'package.json'), 'utf-8'));
+                    ecwebVersion = pkg.version;
                 }
-                catch (e) {
-                    logger.warn(`ECWeb 启动失败: ${e?.message || e}`);
+                catch { }
+                const versionError = ecwebVersionRequirementError(ecwebVersion);
+                if (versionError) {
+                    logger.error(`ECWeb 未启动: ${versionError}`);
+                }
+                else {
+                    try {
+                        const ecwebProc = spawn('node', [ecwebEntry], {
+                            cwd: ecwebPath,
+                            detached: true,
+                            stdio: 'ignore',
+                            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 {
@@ -1994,7 +2104,7 @@ async function main() {
                 const isRoleMenu = menuControl.isMenu
                     && (menuControl.name === 'role' || menuControl.request.cmd === '/role');
                 const menuResponseContext = () => ({
-                    metadata: evolMenuResponseTransportMetadata(opts.encrypted),
+                    metadata: evolMenuResponseTransportMetadata(),
                 });
                 if (menuControl.isMenu && !hasValidMenuId(menuControl)) {
                     logger.warn(`[ControlMenu] dropped malformed request without id type=${menuControl.type}`);
@@ -2199,756 +2309,715 @@ async function main() {
             });
         }
     }
-    // IPC server — 供 CLI 查询实时状态 + Agent ctl 指令执行
-    const ipcServer = new IpcServer(resolvePaths().socket, () => {
-        const channels = {};
-        const channelsByType = {};
-        for (const inst of channelInstances) {
-            const name = inst.adapter.channelName;
-            const status = inst.channel.getStatus?.() ?? { connected: true };
-            const channelType = inst.channelType || name;
-            channels[name] = { ...status, channelType };
-            if (!channelsByType[channelType])
-                channelsByType[channelType] = [];
-            channelsByType[channelType].push(name);
+    function configureIpc() {
+        // M3: direct call (not cast) — wire EvolAgentRegistry into IPC for evolagent.* handlers
+        ipcServer.setAgentRegistry(agentRegistry);
+        ipcServer.setDingtalkContactBindExecutor({
+            register: (cmd) => registerPendingDingtalkContactBind(cmd),
+            isChannelReady: isContactBindChannelReady,
+        });
+        ipcServer.setFeishuContactBindExecutor({
+            register: (cmd) => registerPendingFeishuContactBind(cmd),
+            isChannelReady: isContactBindChannelReady,
+        });
+        ipcServer.setQQBotContactBindExecutor({
+            register: (cmd) => registerPendingQQBotContactBind(cmd),
+            isChannelReady: isContactBindChannelReady,
+        });
+        ipcServer.setWecomContactBindExecutor({
+            register: (cmd) => registerPendingWecomContactBind(cmd),
+            isChannelReady: isContactBindChannelReady,
+        });
+        ipcServer.setWechatContactBindExecutor({
+            register: (cmd) => registerPendingWechatContactBind(cmd),
+            isChannelReady: isContactBindChannelReady,
+        });
+        ipcServer.setMenuExecutor((payload, auth) => cmdHandler.execMenuForEcweb(payload, auth));
+        ipcServer.setConfigOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleConfigOperation(argv, sessionId, delegationToken, delegationCommandHash));
+        ipcServer.setContactOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleContactOperation(argv, sessionId, delegationToken, delegationCommandHash));
+        cmdHandler.setDaemonStatusProvider(() => {
+            const aidState = controlChannel?.getAidState?.();
+            return {
+                aid: daemonCfg.aid ?? null,
+                aun: aidState ? {
+                    connected: aidState.status === 'connected',
+                    status: aidState.status,
+                    reconnectCount: aidState.reconnectCount ?? 0,
+                    flapCount: aidState.flapCount ?? 0,
+                    ...(aidState.lastError ? { lastError: String(aidState.lastError).slice(0, 80) } : {}),
+                    ...(aidState.kickDetail?.reason ? { kickReason: String(aidState.kickDetail.reason).slice(0, 80) } : {}),
+                } : {
+                    connected: false,
+                    status: daemonCfg.aid ? 'disconnected' : 'disabled',
+                },
+            };
+        });
+        if (bindService) {
+            ipcServer.setBindExecutor({
+                begin: (cmd) => bindService.begin(cmd),
+                status: (taskId) => bindService.status(taskId),
+                cancel: (taskId) => bindService.cancel(taskId),
+            });
         }
-        const snap = statsCollector.getSnapshot();
-        const agentListForStatus = agentRegistry.list();
-        return {
-            pid: process.pid,
-            uptime: snap.uptimeMs,
-            controlPlane: {
-                ready: true,
-                owned: processLevelOwners.length > 0,
-            },
-            agentRuntime: {
-                state: agentRuntimeState,
-                runnableAgents: agentListForStatus.filter((a) => a.status !== 'error' && a.status !== 'disabled').length,
-                runningAgents: agentListForStatus.filter((a) => a.status === 'running').length,
-                ...(agentRuntimeError ? { error: agentRuntimeError } : {}),
-            },
-            channels,
-            channelsByType,
-            queue: {
-                pending: messageQueue.getGlobalQueueLength(),
-                processing: messageQueue.getGlobalProcessingCount(),
-            },
-            stats: {
-                received: snap.lastHour.received,
-                sent: snap.lastHour.sent,
-                completed: snap.lastHour.completed,
-                errors: snap.lastHour.errors,
-                avgResponseMs: snap.lastHour.avgResponseMs,
-            },
-            controlAid: daemonCfg.aid
-                ? { aid: daemonCfg.aid, connected: controlChannel?.getAidState().status === 'connected' }
-                : undefined,
-        };
-    }, async (cmd, sessionId, delegationToken, delegationCommandHash) => {
-        const delegation = agentDelegationRegistry.validate(delegationToken, sessionId, delegationCommandHash);
-        if (!delegation.ok)
-            return { ok: false, code: delegation.code, error: delegation.reason };
-        return cmdHandler.handleCtl(cmd, sessionId);
-    });
-    // M3: direct call (not cast) — wire EvolAgentRegistry into IPC for evolagent.* handlers
-    ipcServer.setAgentRegistry(agentRegistry);
-    ipcServer.setDingtalkContactBindExecutor({
-        register: (cmd) => registerPendingDingtalkContactBind(cmd),
-        isChannelReady: isContactBindChannelReady,
-    });
-    ipcServer.setFeishuContactBindExecutor({
-        register: (cmd) => registerPendingFeishuContactBind(cmd),
-        isChannelReady: isContactBindChannelReady,
-    });
-    ipcServer.setQQBotContactBindExecutor({
-        register: (cmd) => registerPendingQQBotContactBind(cmd),
-        isChannelReady: isContactBindChannelReady,
-    });
-    ipcServer.setWecomContactBindExecutor({
-        register: (cmd) => registerPendingWecomContactBind(cmd),
-        isChannelReady: isContactBindChannelReady,
-    });
-    ipcServer.setWechatContactBindExecutor({
-        register: (cmd) => registerPendingWechatContactBind(cmd),
-        isChannelReady: isContactBindChannelReady,
-    });
-    ipcServer.setMenuExecutor((payload, auth) => cmdHandler.execMenuForEcweb(payload, auth));
-    ipcServer.setConfigOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleConfigOperation(argv, sessionId, delegationToken, delegationCommandHash));
-    ipcServer.setContactOperationExecutor((argv, sessionId, delegationToken, delegationCommandHash) => cmdHandler.handleContactOperation(argv, sessionId, delegationToken, delegationCommandHash));
-    cmdHandler.setDaemonStatusProvider(() => {
-        const aidState = controlChannel?.getAidState?.();
-        return {
-            aid: daemonCfg.aid ?? null,
-            aun: aidState ? {
-                connected: aidState.status === 'connected',
-                status: aidState.status,
-                reconnectCount: aidState.reconnectCount ?? 0,
-                flapCount: aidState.flapCount ?? 0,
-                ...(aidState.lastError ? { lastError: String(aidState.lastError).slice(0, 80) } : {}),
-                ...(aidState.kickDetail?.reason ? { kickReason: String(aidState.kickDetail.reason).slice(0, 80) } : {}),
-            } : {
-                connected: false,
-                status: daemonCfg.aid ? 'disconnected' : 'disabled',
-            },
-        };
-    });
-    if (bindService) {
-        ipcServer.setBindExecutor({
-            begin: (cmd) => bindService.begin(cmd),
-            status: (taskId) => bindService.status(taskId),
-            cancel: (taskId) => bindService.cancel(taskId),
+        // 注入 AUN AID 状态聚合器：遍历所有 aun 类型 channel，调 getAidState() 收集
+        ipcServer.setAunAidProvider(() => {
+            const out = [];
+            for (const inst of channelInstances) {
+                if (inst.channelType !== 'aun')
+                    continue;
+                const ch = inst.channel;
+                if (typeof ch?.getAidState === 'function') {
+                    try {
+                        const aidState = ch.getAidState();
+                        // 增强：添加队列状态
+                        const agentName = aidState.agentName || aidState.aid;
+                        const processing = messageQueue.getProcessingCountByAgent(agentName);
+                        const queued = messageQueue.getQueueLengthByAgent(agentName);
+                        out.push({
+                            ...aidState,
+                            queueStatus: { processing, queued }
+                        });
+                    }
+                    catch { /* ignore */ }
+                }
+            }
+            return out;
         });
-    }
-    // 注入 AUN AID 状态聚合器：遍历所有 aun 类型 channel，调 getAidState() 收集
-    ipcServer.setAunAidProvider(() => {
-        const out = [];
+        // 注入 Per-AID 统计收集器到所有 AUN channel 实例
         for (const inst of channelInstances) {
             if (inst.channelType !== 'aun')
                 continue;
             const ch = inst.channel;
-            if (typeof ch?.getAidState === 'function') {
-                try {
-                    const aidState = ch.getAidState();
-                    // 增强：添加队列状态
-                    const agentName = aidState.agentName || aidState.aid;
-                    const processing = messageQueue.getProcessingCountByAgent(agentName);
-                    const queued = messageQueue.getQueueLengthByAgent(agentName);
-                    out.push({
-                        ...aidState,
-                        queueStatus: { processing, queued }
-                    });
-                }
-                catch { /* ignore */ }
-            }
-        }
-        return out;
-    });
-    // 注入 Per-AID 统计收集器到所有 AUN channel 实例
-    for (const inst of channelInstances) {
-        if (inst.channelType !== 'aun')
-            continue;
-        const ch = inst.channel;
-        if (typeof ch?.setAidStatsCollector === 'function') {
-            ch.setAidStatsCollector(aidStatsCollector);
-        }
-    }
-    // 注入 Per-AID 统计 IPC provider
-    aidStatsCollector.setQueueStatsProvider((agentName) => ({
-        processing: messageQueue.getProcessingCountByAgent(agentName),
-        queued: messageQueue.getQueueLengthByAgent(agentName),
-        muted: messageQueue.isAgentMuted(agentName),
-    }));
-    ipcServer.setAunAidStatsProvider(() => aidStatsCollector.getAllSnapshots());
-    ipcServer.setAunAidStatsRecorder((params) => {
-        aidStatsCollector.recordOutbound(params.aid, params.toPeer, Buffer.byteLength(params.text || '', 'utf-8'), params.text, false, params.encrypt, params.chatmode, 'send');
-    });
-    ipcServer.setTaskRuntimeContextProvider(({ sessionId }) => responseEngine.getTaskRuntimeContext(sessionId));
-    ipcServer.setHandoffReturnExecutor((params) => responseEngine.returnHandoffResult(params));
-    ipcServer.setHandoffStatusExecutor(async (params) => {
-        if (!params.sessionId)
-            return { ok: false, code: 'HANDOFF_CALL_SESSION_REQUIRED', error: 'current session is required' };
-        const runtime = responseEngine.getTaskRuntimeContext(params.sessionId);
-        const session = await sessionManager.getSessionById(params.sessionId);
-        const selfAid = runtime?.selfAid || session?.selfAID;
-        if (!selfAid)
-            return { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff not found' };
-        return handoffRuntime.status(selfAid, params.handoffId)
-            ?? { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff not found' };
-    });
-    const resolveHandoffQueryAid = async (params) => {
-        if (params.sessionId) {
+            if (typeof ch?.setAidStatsCollector === 'function') {
+                ch.setAidStatsCollector(aidStatsCollector);
+            }
+        }
+        // 注入 Per-AID 统计 IPC provider
+        aidStatsCollector.setQueueStatsProvider((agentName) => ({
+            processing: messageQueue.getProcessingCountByAgent(agentName),
+            queued: messageQueue.getQueueLengthByAgent(agentName),
+            muted: messageQueue.isAgentMuted(agentName),
+        }));
+        ipcServer.setAunAidStatsProvider(() => aidStatsCollector.getAllSnapshots());
+        ipcServer.setAunAidStatsRecorder((params) => {
+            aidStatsCollector.recordOutbound(params.aid, params.toPeer, Buffer.byteLength(params.text || '', 'utf-8'), params.text, false, params.encrypt, params.chatmode, 'send');
+        });
+        ipcServer.setTaskRuntimeContextProvider(({ sessionId }) => responseEngine.getTaskRuntimeContext(sessionId));
+        ipcServer.setHandoffReturnExecutor((params) => responseEngine.returnHandoffResult(params));
+        ipcServer.setHandoffStatusExecutor(async (params) => {
+            if (!params.sessionId)
+                return { ok: false, code: 'HANDOFF_CALL_SESSION_REQUIRED', error: 'current session is required' };
             const runtime = responseEngine.getTaskRuntimeContext(params.sessionId);
             const session = await sessionManager.getSessionById(params.sessionId);
             const selfAid = runtime?.selfAid || session?.selfAID;
-            if (!selfAid) {
-                return { ok: false, code: 'HANDOFF_CALL_SESSION_INVALID', error: 'current session is invalid' };
+            if (!selfAid)
+                return { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff not found' };
+            return handoffRuntime.status(selfAid, params.handoffId)
+                ?? { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff not found' };
+        });
+        const resolveHandoffQueryAid = async (params) => {
+            if (params.sessionId) {
+                const runtime = responseEngine.getTaskRuntimeContext(params.sessionId);
+                const session = await sessionManager.getSessionById(params.sessionId);
+                const selfAid = runtime?.selfAid || session?.selfAID;
+                if (!selfAid) {
+                    return { ok: false, code: 'HANDOFF_CALL_SESSION_INVALID', error: 'current session is invalid' };
+                }
+                if (params.agent && params.agent !== selfAid) {
+                    return { ok: false, code: 'HANDOFF_AGENT_SCOPE_MISMATCH', error: 'agent does not match the current session' };
+                }
+                return { ok: true, aid: selfAid };
             }
-            if (params.agent && params.agent !== selfAid) {
-                return { ok: false, code: 'HANDOFF_AGENT_SCOPE_MISMATCH', error: 'agent does not match the current session' };
+            if (!params.agent) {
+                return { ok: false, code: 'HANDOFF_AGENT_REQUIRED', error: '--agent is required outside a task context' };
             }
-            return { ok: true, aid: selfAid };
-        }
-        if (!params.agent) {
-            return { ok: false, code: 'HANDOFF_AGENT_REQUIRED', error: '--agent is required outside a task context' };
-        }
-        if (!agentRegistry.get(params.agent)) {
-            return { ok: false, code: 'HANDOFF_AGENT_NOT_FOUND', error: `agent not found: ${params.agent}` };
-        }
-        return { ok: true, aid: params.agent };
-    };
-    ipcServer.setHandoffListExecutor(async (params) => {
-        const scope = await resolveHandoffQueryAid(params);
-        if (!scope.ok)
-            return scope;
-        return handoffRuntime.listHandoffs({
-            selfAid: scope.aid,
-            state: params.state,
-            sessionId: params.filterSessionId,
-            limit: params.limit,
+            if (!agentRegistry.get(params.agent)) {
+                return { ok: false, code: 'HANDOFF_AGENT_NOT_FOUND', error: `agent not found: ${params.agent}` };
+            }
+            return { ok: true, aid: params.agent };
+        };
+        ipcServer.setHandoffListExecutor(async (params) => {
+            const scope = await resolveHandoffQueryAid(params);
+            if (!scope.ok)
+                return scope;
+            return handoffRuntime.listHandoffs({
+                selfAid: scope.aid,
+                state: params.state,
+                sessionId: params.filterSessionId,
+                limit: params.limit,
+            });
         });
-    });
-    ipcServer.setHandoffTraceExecutor(async (params) => {
-        const scope = await resolveHandoffQueryAid(params);
-        if (!scope.ok)
-            return scope;
-        return handoffRuntime.traceHandoff(scope.aid, params.handoffId, params.limit)
-            ?? { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff not found' };
-    });
-    ipcServer.setAunMsgSender(async (params) => {
-        const runtimeCausation = params.originSessionId
-            ? responseEngine.getTaskRuntimeContext(params.originSessionId)?.causation
-            : undefined;
-        const delegation = authorizeDelegatedAunMsgSend(agentDelegationRegistry, {
-            delegationToken: params.delegationToken,
-            delegationCommandHash: params.delegationCommandHash,
-            sessionId: params.originSessionId,
-            messageId: params.originMessageId,
-            aid: params.aid,
-            to: params.to,
-            scope: params.scope,
-            action: params.file ? 'file' : 'send',
+        ipcServer.setHandoffTraceExecutor(async (params) => {
+            const scope = await resolveHandoffQueryAid(params);
+            if (!scope.ok)
+                return scope;
+            return handoffRuntime.traceHandoff(scope.aid, params.handoffId, params.limit)
+                ?? { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff not found' };
         });
-        if (!delegation.ok) {
-            return { ok: false, error: delegation.reason, code: delegation.code };
-        }
-        const inst = channelInstances.find((candidate) => {
-            if (candidate.channelType !== 'aun')
-                return false;
-            const ch = candidate.channel;
-            try {
-                const aidState = typeof ch?.getAidState === 'function' ? ch.getAidState() : null;
-                if (aidState?.aid === params.aid)
-                    return true;
-                if (typeof ch?.getAid === 'function' && ch.getAid() === params.aid)
-                    return true;
+        ipcServer.setAunMsgSender(async (params) => {
+            const runtimeCausation = params.originSessionId
+                ? responseEngine.getTaskRuntimeContext(params.originSessionId)?.causation
+                : undefined;
+            const delegation = authorizeDelegatedAunMsgSend(agentDelegationRegistry, {
+                delegationToken: params.delegationToken,
+                delegationCommandHash: params.delegationCommandHash,
+                sessionId: params.originSessionId,
+                messageId: params.originMessageId,
+                aid: params.aid,
+                to: params.to,
+                scope: params.scope,
+                action: params.file ? 'file' : 'send',
+            });
+            if (!delegation.ok) {
+                return { ok: false, error: delegation.reason, code: delegation.code };
             }
-            catch { /* ignore */ }
-            return false;
-        });
-        const ch = inst?.channel;
-        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' };
-        }
-        let payload = params.payload;
-        if (params.file) {
-            if (isHClassPath(params.file.filePath)) {
-                return {
-                    ok: false,
-                    error: 'H-class protected files cannot be uploaded by an agent task',
-                    code: 'H_CLASS_PROTECTED',
-                };
+            const inst = channelInstances.find((candidate) => {
+                if (candidate.channelType !== 'aun')
+                    return false;
+                const ch = candidate.channel;
+                try {
+                    const aidState = typeof ch?.getAidState === 'function' ? ch.getAidState() : null;
+                    if (aidState?.aid === params.aid)
+                        return true;
+                    if (typeof ch?.getAid === 'function' && ch.getAid() === params.aid)
+                        return true;
+                }
+                catch { /* ignore */ }
+                return false;
+            });
+            const ch = inst?.channel;
+            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' };
+            }
+            const encrypt = typeof params.encrypt === 'boolean'
+                ? params.encrypt
+                : (typeof ch.getDefaultEncrypt === 'function' ? ch.getDefaultEncrypt() : true);
+            let payload = params.payload;
+            if (params.file) {
+                if (isHClassPath(params.file.filePath)) {
+                    return {
+                        ok: false,
+                        error: 'H-class protected files cannot be uploaded by an agent task',
+                        code: 'H_CLASS_PROTECTED',
+                    };
+                }
+                if (typeof ch.buildDaemonFilePayload !== 'function') {
+                    return { ok: false, error: 'AUN channel does not support daemon file uploads', code: 'AUN_FILE_UNSUPPORTED' };
+                }
+                try {
+                    payload = await ch.buildDaemonFilePayload(params.file);
+                }
+                catch (error) {
+                    return {
+                        ok: false,
+                        error: error instanceof Error ? error.message : String(error),
+                        code: error?.code ?? 'AUN_FILE_UPLOAD_FAILED',
+                    };
+                }
             }
-            if (typeof ch.buildDaemonFilePayload !== 'function') {
-                return { ok: false, error: 'AUN channel does not support daemon file uploads', code: 'AUN_FILE_UNSUPPORTED' };
+            if (!payload) {
+                return { ok: false, error: 'message payload is required', code: 'INVALID_PAYLOAD' };
             }
-            try {
-                payload = await ch.buildDaemonFilePayload(params.file);
+            if (params.thread && typeof payload.thread_id !== 'string') {
+                payload = { ...payload, thread_id: params.thread };
             }
-            catch (error) {
-                return {
-                    ok: false,
-                    error: error instanceof Error ? error.message : String(error),
-                    code: error?.code ?? 'AUN_FILE_UPLOAD_FAILED',
-                };
+            if (params.scope === 'group' && params.mentions?.length) {
+                payload = { ...payload, mentions: params.mentions };
             }
-        }
-        if (!payload) {
-            return { ok: false, error: 'message payload is required', code: 'INVALID_PAYLOAD' };
-        }
-        if (params.thread && typeof payload.thread_id !== 'string') {
-            payload = { ...payload, thread_id: params.thread };
-        }
-        if (params.scope === 'group' && params.mentions?.length) {
-            payload = { ...payload, mentions: params.mentions };
-        }
-        let targetSessionId;
-        if (params.originSessionId && params.originMessageId) {
-            try {
-                const created = await handoffRuntime.createOutbound({
-                    selfAid: params.aid,
-                    to: params.to,
-                    originSessionId: params.originSessionId,
-                    originMessageId: params.originMessageId,
-                    payload,
-                    encrypt: params.encrypt === true,
-                    thread: params.thread,
-                    targetChatType: params.scope === 'group' ? 'group' : 'private',
-                    explicitReturnPolicy: params.returnPolicy,
-                    originAuthorization: {
-                        actorId: delegation.grant.actorId,
-                        channelKey: delegation.grant.channel,
-                        channelType: delegation.grant.channelType,
-                        chatType: delegation.grant.chatType,
-                        peerKey: delegation.grant.peerKey,
-                    },
-                    causation: runtimeCausation,
-                });
-                targetSessionId = created.targetSession.id;
-                if (created.crossSession && created.handoff) {
+            let targetSessionId;
+            if (params.originSessionId && params.originMessageId) {
+                try {
+                    const created = await handoffRuntime.createOutbound({
+                        selfAid: params.aid,
+                        to: params.to,
+                        originSessionId: params.originSessionId,
+                        originMessageId: params.originMessageId,
+                        payload,
+                        encrypt,
+                        thread: params.thread,
+                        targetChatType: params.scope === 'group' ? 'group' : 'private',
+                        explicitReturnPolicy: params.returnPolicy,
+                        originAuthorization: {
+                            actorId: delegation.grant.actorId,
+                            channelKey: delegation.grant.channel,
+                            channelType: delegation.grant.channelType,
+                            chatType: delegation.grant.chatType,
+                            peerKey: delegation.grant.peerKey,
+                        },
+                        causation: runtimeCausation,
+                    });
+                    targetSessionId = created.targetSession.id;
+                    if (created.crossSession && created.handoff) {
+                        return {
+                            ok: true,
+                            status: created.handoff.state === 'target_sent' ? 'delivered' : 'queued',
+                            message_id: created.handoff.target_message_id ?? undefined,
+                            handoff_id: created.handoff.handoff_id,
+                            target_session_id: created.targetSession.id,
+                        };
+                    }
+                    if (params.scope === 'msg' && !payload.ref_message_id) {
+                        payload.ref_message_id = params.originMessageId;
+                    }
+                }
+                catch (error) {
+                    const code = error?.code;
+                    const handoffId = error?.handoffId
+                        ?? error?.blockingHandoffId;
                     return {
-                        ok: true,
-                        status: created.handoff.state === 'target_sent' ? 'delivered' : 'queued',
-                        message_id: created.handoff.target_message_id ?? undefined,
-                        handoff_id: created.handoff.handoff_id,
-                        target_session_id: created.targetSession.id,
+                        ok: false,
+                        error: error instanceof Error ? error.message : String(error),
+                        code,
+                        ...(handoffId ? { handoff_id: handoffId } : {}),
                     };
                 }
-                if (params.scope === 'msg' && !payload.ref_message_id) {
-                    payload.ref_message_id = params.originMessageId;
-                }
             }
-            catch (error) {
-                const code = error?.code;
-                const handoffId = error?.handoffId
-                    ?? error?.blockingHandoffId;
-                return {
-                    ok: false,
-                    error: error instanceof Error ? error.message : String(error),
-                    code,
-                    ...(handoffId ? { handoff_id: handoffId } : {}),
-                };
+            if (params.scope === 'group') {
+                if (typeof ch.sendDaemonGroupMsg !== 'function') {
+                    return { ok: false, error: 'AUN channel does not support daemon group sends', code: 'AUN_GROUP_UNSUPPORTED' };
+                }
+                return await ch.sendDaemonGroupMsg({
+                    groupId: params.to,
+                    payload,
+                    mentions: params.mentions,
+                    encrypt,
+                    log: params.log ? { ...params.log, sessionId: targetSessionId ?? params.log.sessionId } : undefined,
+                });
             }
-        }
-        if (params.scope === 'group') {
-            if (typeof ch.sendDaemonGroupMsg !== 'function') {
-                return { ok: false, error: 'AUN channel does not support daemon group sends', code: 'AUN_GROUP_UNSUPPORTED' };
+            if (typeof ch.sendDaemonMsg !== 'function') {
+                return { ok: false, error: 'AUN channel does not support daemon private sends', code: 'AUN_MSG_UNSUPPORTED' };
             }
-            return await ch.sendDaemonGroupMsg({
-                groupId: params.to,
+            return await ch.sendDaemonMsg({
+                to: params.to,
                 payload,
-                mentions: params.mentions,
-                encrypt: params.encrypt,
+                encrypt,
+                causation: runtimeCausation,
                 log: params.log ? { ...params.log, sessionId: targetSessionId ?? params.log.sessionId } : undefined,
             });
-        }
-        if (typeof ch.sendDaemonMsg !== 'function') {
-            return { ok: false, error: 'AUN channel does not support daemon private sends', code: 'AUN_MSG_UNSUPPORTED' };
-        }
-        return await ch.sendDaemonMsg({
-            to: params.to,
-            payload,
-            encrypt: params.encrypt,
-            causation: runtimeCausation,
-            log: params.log ? { ...params.log, sessionId: targetSessionId ?? params.log.sessionId } : undefined,
         });
-    });
-    // ── Reload hooks: enable agentRegistry.reload() to drain/disconnect/restart channels ──
-    const reloadHooks = buildReloadHooks({
-        channelLoader,
-        channelInstances,
-        registerChannelInstance,
-        unregisterChannelInstance: (channelName) => {
-            markChannelDisconnected(channelName);
-            processor.unregisterChannel(channelName);
-            cmdHandler.unregisterChannel(channelName);
-            msgBridge.removeChannel(channelName);
-        },
-        onChannelStarted: (inst) => {
-            // startChannel 重建渠道时重新注入 AidStatsCollector（与 hot-load 路径对齐）
-            if (inst.channelType === 'aun') {
-                const ch = inst.channel;
-                if (typeof ch?.setAidStatsCollector === 'function')
-                    ch.setAidStatsCollector(aidStatsCollector);
-            }
-        },
-        onChannelConnected: markChannelConnected,
-        messageQueue,
-        handoffRuntime,
-    });
-    // Make reload hooks accessible to IPC handler & ctl handler (both run in this process)
-    globalThis.__evolcore_reloadHooks = reloadHooks;
-    // Hot-load handler: dynamically add a new agent at runtime
-    globalThis.__evolcore_hotLoadAgent = async (aid) => {
-        handoffRuntime.pauseAgent(aid);
-        let resumed = false;
-        try {
-            agentRuntimeState = 'starting';
-            agentRuntimeError = undefined;
-            const agent = agentRegistry.loadNewAgent(aid);
-            if (!agent) {
-                agentRuntimeState = agentRegistry.runnableAgents().length > 0 ? 'running' : 'error';
-                agentRuntimeError = `Failed to load agent ${aid}`;
-                throw new Error(agentRuntimeError);
-            }
-            const newAgentInstances = agentLoader.createForAgent(agent, {
-                onSessionIdUpdate: async (sessionId, agentSessionId) => {
-                    await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
-                },
-            });
-            for (const inst of newAgentInstances) {
-                agentMap.set(`${inst.evolagentName}::${inst.baseagent}`, inst.agent);
-                inst.agent.setPermissionGateway?.(permissionGateway);
-                inst.agent.setCompactStartCallback?.((sessionId) => {
-                    processor.handleCompactStart(sessionId);
-                });
-            }
-            if (newAgentInstances.length === 0) {
-                agent.status = 'error';
-                agent.error = 'No baseagent runner created for hot-loaded agent';
-                agentRuntimeState = 'error';
-                agentRuntimeError = agent.error;
-                throw new Error(agent.error);
-            }
-            // 创建 channels
-            const instances = await channelLoader.createForAgent(agent);
-            for (const inst of instances) {
-                registerChannelInstance(inst);
+        // ── Reload hooks: enable agentRegistry.reload() to drain/disconnect/restart channels ──
+        const reloadHooks = buildReloadHooks({
+            channelLoader,
+            channelInstances,
+            registerChannelInstance,
+            unregisterChannelInstance: (channelName) => {
+                markChannelDisconnected(channelName);
+                processor.unregisterChannel(channelName);
+                cmdHandler.unregisterChannel(channelName);
+                msgBridge.removeChannel(channelName);
+            },
+            onChannelStarted: (inst) => {
+                // startChannel 重建渠道时重新注入 AidStatsCollector（与 hot-load 路径对齐）
                 if (inst.channelType === 'aun') {
                     const ch = inst.channel;
                     if (typeof ch?.setAidStatsCollector === 'function')
                         ch.setAidStatsCollector(aidStatsCollector);
                 }
-                agent.channels.set(inst.adapter.channelKey, inst.adapter);
-                channelInstances.push(inst);
-            }
-            agent.status = 'running';
-            // 连接
-            await channelLoader.connectAll(instances, { onConnected: markChannelConnected });
-            await handoffRuntime.recover([aid]);
-            await ensureTriggerSchedulerStarted(agent);
-            handoffRuntime.resumeAgent(aid);
-            resumed = true;
-            agentRuntimeState = 'running';
-            agentRuntimeError = undefined;
-            logger.info(`[HotLoad] ✓ Agent ${aid} online with ${instances.length} channel(s)`);
-        }
-        finally {
-            if (!resumed)
-                handoffRuntime.resumeAgent(aid);
-        }
-    };
-    // Full resync handler: scan disk, load new agents, unload removed/disabled, reload changed
-    globalThis.__evolcore_resyncAgents = async () => {
-        // 先清 kit 缓存：'kits' 组（manifest / fragment / schema / 角色模板）走 on-reload
-        // 策略，平时不查盘。放在扫盘与 reload 之前，本轮上下线的 agent 才能读到磁盘上的
-        // 最新版本——放在末尾的话，这一轮全用旧值，改动要等下一次 resync 才生效。
-        invalidateKitCache();
-        const { loadAllAgents: scanAgents, loadDefaults: readDefaults } = await import('./config-store.js');
-        const { resolveEffective } = await import('./config/config-manager.js');
-        const freshDefaults = readDefaults();
-        const { agents: diskAgents } = scanAgents();
-        const diskAidSet = new Set(diskAgents.map(a => a.aid));
-        const results = [];
-        // 1. 下线：运行时有但磁盘上没有 / disabled 的
-        for (const [aid, agent] of [...agentRegistry.agents.entries()]) {
-            const diskCfg = diskAgents.find(a => a.aid === aid);
-            if (!diskCfg || diskCfg.enabled === false) {
-                handoffRuntime.pauseAgent(aid);
-                try {
-                    await handoffRuntime.drainAgent(aid);
+            },
+            onChannelConnected: markChannelConnected,
+            messageQueue,
+            handoffRuntime,
+        });
+        // Make reload hooks accessible to IPC handler & ctl handler (both run in this process)
+        globalThis.__evolcore_reloadHooks = reloadHooks;
+        // Hot-load handler: dynamically add a new agent at runtime
+        globalThis.__evolcore_hotLoadAgent = async (aid) => {
+            handoffRuntime.pauseAgent(aid);
+            let resumed = false;
+            try {
+                agentRuntimeState = 'starting';
+                agentRuntimeError = undefined;
+                const agent = agentRegistry.loadNewAgent(aid);
+                if (!agent) {
+                    agentRuntimeState = agentRegistry.runnableAgents().length > 0 ? 'running' : 'error';
+                    agentRuntimeError = `Failed to load agent ${aid}`;
+                    throw new Error(agentRuntimeError);
                 }
-                catch (error) {
-                    handoffRuntime.resumeAgent(aid);
-                    results.push(`⚠ ${aid}: ${error instanceof Error ? error.message : String(error)}`);
-                    continue;
+                const creationErrors = [];
+                const newAgentInstances = agentLoader.createForAgent(agent, {
+                    onSessionIdUpdate: async (sessionId, agentSessionId) => {
+                        await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
+                    },
+                }, creationErrors);
+                for (const inst of newAgentInstances) {
+                    agentMap.set(`${inst.evolagentName}::${inst.baseagent}`, inst.agent);
+                    inst.agent.setPermissionGateway?.(permissionGateway);
+                    inst.agent.setCompactStartCallback?.((sessionId) => {
+                        processor.handleCompactStart(sessionId);
+                    });
                 }
-                await triggerSchedulers.get(aid)?.stop();
-                triggerSchedulers.delete(aid);
-                triggerSchedulerStarts.delete(aid);
-                // 断开所有 channels
-                for (const chName of agent.channelInstanceNames()) {
-                    const inst = channelInstances.find(i => i.adapter.channelName === chName);
-                    if (inst) {
-                        try {
-                            await inst.disconnect();
-                        }
-                        catch { }
-                        markChannelDisconnected(inst.adapter.channelName);
-                        const idx = channelInstances.indexOf(inst);
-                        if (idx >= 0)
-                            channelInstances.splice(idx, 1);
+                if (newAgentInstances.length === 0) {
+                    const creationDetail = creationErrors.length > 0
+                        ? creationErrors.map(({ baseagent, message }) => `${baseagent}: ${message}`).join('; ')
+                        : `active_baseagent=${agent.config.active_baseagent ?? '(unset)'}, configured=${Object.keys(agent.config.baseagents ?? {}).join(',') || '(none)'}`;
+                    agent.status = 'error';
+                    agent.error = creationErrors.length > 0
+                        ? creationDetail
+                        : `No baseagent runner created for hot-loaded agent: ${creationDetail}`;
+                    agentRuntimeState = 'error';
+                    agentRuntimeError = agent.error;
+                    throw new Error(agent.error);
+                }
+                // 创建 channels
+                const instances = await channelLoader.createForAgent(agent);
+                for (const inst of instances) {
+                    registerChannelInstance(inst);
+                    if (inst.channelType === 'aun') {
+                        const ch = inst.channel;
+                        if (typeof ch?.setAidStatsCollector === 'function')
+                            ch.setAidStatsCollector(aidStatsCollector);
                     }
+                    agent.channels.set(inst.adapter.channelKey, inst.adapter);
+                    channelInstances.push(inst);
                 }
-                agentRegistry.agents.delete(aid);
-                results.push(`- ${aid} (offline)`);
-                continue;
-            }
-        }
-        // 2. 新增：磁盘上有但运行时没有的
-        for (const cfg of diskAgents) {
-            if (cfg.enabled === false)
-                continue;
-            if (agentRegistry.agents.has(cfg.aid))
-                continue;
-            try {
-                await globalThis.__evolcore_hotLoadAgent(cfg.aid);
-                results.push(`+ ${cfg.aid} (online)`);
-            }
-            catch (e) {
-                results.push(`✗ ${cfg.aid}: ${e?.message || e}`);
-            }
-        }
-        // 3. 已有的：重新 reload（config 可能改了）
-        const hooks = globalThis.__evolcore_reloadHooks;
-        for (const cfg of diskAgents) {
-            if (cfg.enabled === false)
-                continue;
-            if (!agentRegistry.agents.has(cfg.aid))
-                continue;
-            // 只有磁盘上存在且运行时也存在的才 reload
-            try {
-                await agentRegistry.reload(cfg.aid, hooks);
-                const runtimeAgent = agentRegistry.get(cfg.aid);
-                if (runtimeAgent)
-                    await startTriggerScheduler(runtimeAgent);
-                results.push(`↻ ${cfg.aid} (reloaded)`);
+                agent.status = 'running';
+                // 连接
+                await channelLoader.connectAll(instances, { onConnected: markChannelConnected });
+                await handoffRuntime.recover([aid]);
+                await ensureTriggerSchedulerStarted(agent);
+                handoffRuntime.resumeAgent(aid);
+                resumed = true;
+                agentRuntimeState = 'running';
+                agentRuntimeError = undefined;
+                logger.info(`[HotLoad] ✓ Agent ${aid} online with ${instances.length} channel(s)`);
             }
-            catch (e) {
-                results.push(`⚠ ${cfg.aid}: ${e?.message || e}`);
+            finally {
+                if (!resumed)
+                    handoffRuntime.resumeAgent(aid);
             }
-        }
-        // 重建 channel index（kit 缓存已在本轮开头清过）
-        agentRegistry.channelIndex.clear();
-        agentRegistry.buildChannelIndex();
-        logger.info(`[Resync] Done: ${results.length} agent(s) processed`);
-        return results;
-    };
-    ipcServer.setStatsProvider(() => statsCollector.getSnapshot());
-    ipcServer.setAgentStatsProvider(() => agentRegistry.list().map((agent) => {
-        const snap = statsCollector.getSnapshot(agent.aid);
-        return {
-            aid: agent.aid,
-            received: snap.lastHour.received,
-            sent: snap.lastHour.sent,
-            completed: snap.lastHour.completed,
-            errors: snap.lastHour.errors,
-            interrupts: snap.lastHour.interrupts,
-            avgResponseMs: snap.lastHour.avgResponseMs,
-            processing: messageQueue.getProcessingCountByAgent(agent.aid),
-            queued: messageQueue.getQueueLengthByAgent(agent.aid),
-            muted: messageQueue.isAgentMuted(agent.aid),
         };
-    }));
-    // Queue snapshot & action (for ec queue --agent CLI)
-    ipcServer.setQueueSnapshotProvider((params) => {
-        const handle = agentRegistry.get(params.agent);
-        const agentName = handle?.name;
-        if (!agentName)
-            return [];
-        return messageQueue.getQueueItemsByAgent(agentName);
-    });
-    ipcServer.setQueueActionExecutor(async (params) => {
-        const handle = agentRegistry.get(params.agent);
-        const agentName = handle?.name;
-        if (!agentName)
-            return { ok: false, error: `agent not found: ${params.agent}` };
-        switch (params.action) {
-            case 'clear':
-                return { ok: true, cleared: messageQueue.clearByAgent(agentName) };
-            case 'cancel':
-                if (!params.messageId)
-                    return { ok: false, error: 'missing messageId' };
-                return { ok: true, cancelled: messageQueue.cancelMessageById(agentName, params.messageId) };
-            case 'interrupt':
-                if (!params.sessionKey)
-                    return { ok: false, error: 'missing sessionKey' };
-                {
-                    const sessionId = messageQueue.findSessionIdBySessionKey(params.sessionKey);
-                    if (!sessionId)
-                        return { ok: false, error: `session not found: ${params.sessionKey}` };
-                    return { ok: true, interrupted: await messageQueue.interruptBySession(sessionId) };
+        // Full resync handler: scan disk, load new agents, unload removed/disabled, reload changed
+        globalThis.__evolcore_resyncAgents = async () => {
+            // 先清 kit 缓存：'kits' 组（manifest / fragment / schema / 角色模板）走 on-reload
+            // 策略，平时不查盘。放在扫盘与 reload 之前，本轮上下线的 agent 才能读到磁盘上的
+            // 最新版本——放在末尾的话，这一轮全用旧值，改动要等下一次 resync 才生效。
+            invalidateKitCache();
+            const { loadAllAgents: scanAgents, loadDefaults: readDefaults } = await import('./config-store.js');
+            const { resolveEffective } = await import('./config/config-manager.js');
+            const freshDefaults = readDefaults();
+            const { agents: diskAgents } = scanAgents();
+            const diskAidSet = new Set(diskAgents.map(a => a.aid));
+            const results = [];
+            // 1. 下线：运行时有但磁盘上没有 / disabled 的
+            for (const [aid, agent] of [...agentRegistry.agents.entries()]) {
+                const diskCfg = diskAgents.find(a => a.aid === aid);
+                if (!diskCfg || diskCfg.enabled === false) {
+                    handoffRuntime.pauseAgent(aid);
+                    try {
+                        await handoffRuntime.drainAgent(aid);
+                    }
+                    catch (error) {
+                        handoffRuntime.resumeAgent(aid);
+                        results.push(`⚠ ${aid}: ${error instanceof Error ? error.message : String(error)}`);
+                        continue;
+                    }
+                    await triggerSchedulers.get(aid)?.stop();
+                    triggerSchedulers.delete(aid);
+                    triggerSchedulerStarts.delete(aid);
+                    // 断开所有 channels
+                    for (const chName of agent.channelInstanceNames()) {
+                        const inst = channelInstances.find(i => i.adapter.channelName === chName);
+                        if (inst) {
+                            try {
+                                await inst.disconnect();
+                            }
+                            catch { }
+                            markChannelDisconnected(inst.adapter.channelName);
+                            const idx = channelInstances.indexOf(inst);
+                            if (idx >= 0)
+                                channelInstances.splice(idx, 1);
+                        }
+                    }
+                    agentRegistry.agents.delete(aid);
+                    results.push(`- ${aid} (offline)`);
+                    continue;
                 }
-            default:
-                return { ok: false, error: `unknown action: ${params.action}` };
-        }
-    });
-    ipcServer.setTriggerExecutor(async (cmd) => {
-        const schedulerFor = (agentAid) => {
-            const scheduler = triggerSchedulers.get(agentAid);
-            if (!scheduler)
-                throw new Error(`trigger scheduler not found for agent: ${agentAid}`);
-            return scheduler;
-        };
-        const requireAgent = (agentAid) => {
-            if (typeof agentAid !== 'string' || !agentAid)
-                throw new Error('missing agentAid');
-            if (agentAid === daemonTriggerOwner.aid)
-                return agentAid;
-            if (!agentRegistry.get(agentAid))
-                throw new Error(`agent not found: ${agentAid}`);
-            return agentAid;
-        };
-        const authorizeTrigger = async (agentAid, operation, triggerId) => {
-            const actor = await authenticatedTriggerActor(agentAid, cmd.actorSessionId, cmd.delegationToken, cmd.delegationCommandHash, cmd.controlToken);
-            const isCrossAgent = !actor.control && actor.selfAid !== agentAid;
-            if (!isCrossAgentTriggerOperationAllowed({
-                control: actor.control,
-                taskAgentAid: actor.selfAid,
-                targetAgentAid: agentAid,
-                targetManagement: actor.management,
-                operation,
-            })) {
-                if (isCrossAgent && !actor.management) {
-                    throw new Error('cross-agent trigger audit requires owner/admin access on the target agent');
+            }
+            // 2. 新增：磁盘上有但运行时没有的
+            for (const cfg of diskAgents) {
+                if (cfg.enabled === false)
+                    continue;
+                if (agentRegistry.agents.has(cfg.aid))
+                    continue;
+                try {
+                    await globalThis.__evolcore_hotLoadAgent(cfg.aid);
+                    results.push(`+ ${cfg.aid} (online)`);
                 }
-                if (isCrossAgent && !isCrossAgentTriggerReadOperation(operation)) {
-                    throw new Error('cross-agent trigger operations are limited to list, show, and history');
+                catch (e) {
+                    results.push(`✗ ${cfg.aid}: ${e?.message || e}`);
                 }
-                throw new Error('trigger agent does not match authenticated task agent');
             }
-            const operationDecision = authorizeOperation({
-                source: actor.control ? 'control' : 'agent-tool',
-                subject: actor.subject,
-                intent: {
+            // 3. 已有的：重新 reload（config 可能改了）
+            const hooks = globalThis.__evolcore_reloadHooks;
+            for (const cfg of diskAgents) {
+                if (cfg.enabled === false)
+                    continue;
+                if (!agentRegistry.agents.has(cfg.aid))
+                    continue;
+                // 只有磁盘上存在且运行时也存在的才 reload
+                try {
+                    await agentRegistry.reload(cfg.aid, hooks);
+                    const runtimeAgent = agentRegistry.get(cfg.aid);
+                    if (runtimeAgent)
+                        await startTriggerScheduler(runtimeAgent);
+                    results.push(`↻ ${cfg.aid} (reloaded)`);
+                }
+                catch (e) {
+                    results.push(`⚠ ${cfg.aid}: ${e?.message || e}`);
+                }
+            }
+            // 重建 channel index（kit 缓存已在本轮开头清过）
+            agentRegistry.channelIndex.clear();
+            agentRegistry.buildChannelIndex();
+            logger.info(`[Resync] Done: ${results.length} agent(s) processed`);
+            return results;
+        };
+        ipcServer.setStatsProvider(() => statsCollector.getSnapshot());
+        ipcServer.setAgentStatsProvider(() => agentRegistry.list().map((agent) => {
+            const snap = statsCollector.getSnapshot(agent.aid);
+            return {
+                aid: agent.aid,
+                received: snap.lastHour.received,
+                sent: snap.lastHour.sent,
+                completed: snap.lastHour.completed,
+                errors: snap.lastHour.errors,
+                interrupts: snap.lastHour.interrupts,
+                avgResponseMs: snap.lastHour.avgResponseMs,
+                processing: messageQueue.getProcessingCountByAgent(agent.aid),
+                queued: messageQueue.getQueueLengthByAgent(agent.aid),
+                muted: messageQueue.isAgentMuted(agent.aid),
+            };
+        }));
+        // Queue snapshot & action (for ec queue --agent CLI)
+        ipcServer.setQueueSnapshotProvider((params) => {
+            const handle = agentRegistry.get(params.agent);
+            const agentName = handle?.name;
+            if (!agentName)
+                return [];
+            return messageQueue.getQueueItemsByAgent(agentName);
+        });
+        ipcServer.setQueueActionExecutor(async (params) => {
+            const handle = agentRegistry.get(params.agent);
+            const agentName = handle?.name;
+            if (!agentName)
+                return { ok: false, error: `agent not found: ${params.agent}` };
+            switch (params.action) {
+                case 'clear':
+                    return { ok: true, cleared: messageQueue.clearByAgent(agentName) };
+                case 'cancel':
+                    if (!params.messageId)
+                        return { ok: false, error: 'missing messageId' };
+                    return { ok: true, cancelled: messageQueue.cancelMessageById(agentName, params.messageId) };
+                case 'interrupt':
+                    if (!params.sessionKey)
+                        return { ok: false, error: 'missing sessionKey' };
+                    {
+                        const sessionId = messageQueue.findSessionIdBySessionKey(params.sessionKey);
+                        if (!sessionId)
+                            return { ok: false, error: `session not found: ${params.sessionKey}` };
+                        return { ok: true, interrupted: await messageQueue.interruptBySession(sessionId) };
+                    }
+                default:
+                    return { ok: false, error: `unknown action: ${params.action}` };
+            }
+        });
+        ipcServer.setTriggerExecutor(async (cmd) => {
+            const schedulerFor = (agentAid) => {
+                const scheduler = triggerSchedulers.get(agentAid);
+                if (!scheduler)
+                    throw new Error(`trigger scheduler not found for agent: ${agentAid}`);
+                return scheduler;
+            };
+            const requireAgent = (agentAid) => {
+                if (typeof agentAid !== 'string' || !agentAid)
+                    throw new Error('missing agentAid');
+                if (agentAid === daemonTriggerOwner.aid)
+                    return agentAid;
+                if (!agentRegistry.get(agentAid))
+                    throw new Error(`agent not found: ${agentAid}`);
+                return agentAid;
+            };
+            const authorizeTrigger = async (agentAid, operation, triggerId) => {
+                const actor = await authenticatedTriggerActor(agentAid, cmd.actorSessionId, cmd.delegationToken, cmd.delegationCommandHash, cmd.controlToken);
+                const isCrossAgent = !actor.control && actor.selfAid !== agentAid;
+                if (!isCrossAgentTriggerOperationAllowed({
+                    control: actor.control,
+                    taskAgentAid: actor.selfAid,
+                    targetAgentAid: agentAid,
+                    targetManagement: actor.management,
                     operation,
-                    scope: 'relation',
+                })) {
+                    if (isCrossAgent && !actor.management) {
+                        throw new Error('cross-agent trigger audit requires owner/admin access on the target agent');
+                    }
+                    if (isCrossAgent && !isCrossAgentTriggerReadOperation(operation)) {
+                        throw new Error('cross-agent trigger operations are limited to list, show, and history');
+                    }
+                    throw new Error('trigger agent does not match authenticated task agent');
+                }
+                const operationDecision = authorizeOperation({
                     source: actor.control ? 'control' : 'agent-tool',
-                    args: {
-                        self: agentAid,
-                        peer: actor.origin.peerId,
-                        peerKey: actor.subject.peerKey,
-                        ...(triggerId ? { triggerId } : {}),
+                    subject: actor.subject,
+                    intent: {
+                        operation,
+                        scope: 'relation',
+                        source: actor.control ? 'control' : 'agent-tool',
+                        args: {
+                            self: agentAid,
+                            peer: actor.origin.peerId,
+                            peerKey: actor.subject.peerKey,
+                            ...(triggerId ? { triggerId } : {}),
+                        },
                     },
-                },
-            });
-            if (!operationDecision.allow)
-                throw new Error(operationDecision.reason);
-            if (actor.management)
-                return actor;
-            if (!triggerId)
+                });
+                if (!operationDecision.allow)
+                    throw new Error(operationDecision.reason);
+                if (actor.management)
+                    return actor;
+                if (!triggerId)
+                    return actor;
+                const definition = schedulerFor(agentAid).list({ all: true }).find(trigger => trigger.id === triggerId);
+                if (!definition
+                    || definition.origin?.peerId !== actor.origin?.peerId
+                    || definition.origin?.channelKey !== actor.origin?.channelKey) {
+                    throw new Error('trigger not found or access denied');
+                }
                 return actor;
-            const definition = schedulerFor(agentAid).list({ all: true }).find(trigger => trigger.id === triggerId);
-            if (!definition
-                || definition.origin?.peerId !== actor.origin?.peerId
-                || definition.origin?.channelKey !== actor.origin?.channelKey) {
-                throw new Error('trigger not found or access denied');
-            }
-            return actor;
-        };
-        switch (cmd.type) {
-            case 'trigger.list': {
-                const agentAid = requireAgent(cmd.agentAid);
-                const actor = await authorizeTrigger(agentAid, 'trigger.list');
-                const scheduler = schedulerFor(agentAid);
-                const definitions = scheduler.list({ all: cmd.all === true }).filter(trigger => actor.management
-                    || (trigger.origin?.peerId === actor.origin?.peerId && trigger.origin?.channelKey === actor.origin?.channelKey));
-                return { ok: true, triggers: scheduler.listItems(definitions) };
-            }
-            case 'trigger.show': {
-                const agentAid = requireAgent(cmd.agentAid);
-                if (!cmd.triggerId)
-                    throw new Error('missing triggerId');
-                await authorizeTrigger(agentAid, 'trigger.show', cmd.triggerId);
-                return {
-                    ok: true,
-                    ...schedulerFor(agentAid).show(cmd.triggerId, {
-                        includeScriptPreview: cmd.includeScriptPreview !== false,
-                    }),
-                };
-            }
-            case 'trigger.history': {
-                const agentAid = requireAgent(cmd.agentAid);
-                const limit = cmd.limit === undefined ? 100 : Number(cmd.limit);
-                if (!Number.isInteger(limit) || limit <= 0 || limit > 10_000)
-                    throw new Error('invalid history limit');
-                if (cmd.triggerId !== undefined && (typeof cmd.triggerId !== 'string' || !cmd.triggerId)) {
-                    throw new Error('invalid triggerId');
+            };
+            switch (cmd.type) {
+                case 'trigger.list': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    const actor = await authorizeTrigger(agentAid, 'trigger.list');
+                    const scheduler = schedulerFor(agentAid);
+                    const definitions = scheduler.list({ all: cmd.all === true }).filter(trigger => actor.management
+                        || (trigger.origin?.peerId === actor.origin?.peerId && trigger.origin?.channelKey === actor.origin?.channelKey));
+                    return { ok: true, triggers: scheduler.listItems(definitions) };
                 }
-                if (cmd.triggerId)
-                    await authorizeTrigger(agentAid, 'trigger.history', cmd.triggerId);
-                else if (!(await authorizeTrigger(agentAid, 'trigger.history')).management) {
-                    throw new Error('triggerId is required for non-management history access');
+                case 'trigger.show': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    if (!cmd.triggerId)
+                        throw new Error('missing triggerId');
+                    await authorizeTrigger(agentAid, 'trigger.show', cmd.triggerId);
+                    return {
+                        ok: true,
+                        ...schedulerFor(agentAid).show(cmd.triggerId, {
+                            includeScriptPreview: cmd.includeScriptPreview !== false,
+                        }),
+                    };
                 }
-                return { ok: true, events: schedulerFor(agentAid).history(cmd.triggerId, limit) };
-            }
-            case 'trigger.eventCatalog': {
-                const agentAid = requireAgent(cmd.agentAid);
-                await authorizeTrigger(agentAid, 'trigger.eventCatalog');
-                return { ok: true, ...getEventCatalog({ includeInternal: cmd.includeInternal === true }) };
-            }
-            case 'trigger.create': {
-                const rawDefinition = cmd.definition;
-                if (!rawDefinition || typeof rawDefinition !== 'object' || Array.isArray(rawDefinition)) {
-                    throw new Error('trigger definition must be an object');
+                case 'trigger.history': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    const limit = cmd.limit === undefined ? 100 : Number(cmd.limit);
+                    if (!Number.isInteger(limit) || limit <= 0 || limit > 10_000)
+                        throw new Error('invalid history limit');
+                    if (cmd.triggerId !== undefined && (typeof cmd.triggerId !== 'string' || !cmd.triggerId)) {
+                        throw new Error('invalid triggerId');
+                    }
+                    if (cmd.triggerId)
+                        await authorizeTrigger(agentAid, 'trigger.history', cmd.triggerId);
+                    else if (!(await authorizeTrigger(agentAid, 'trigger.history')).management) {
+                        throw new Error('triggerId is required for non-management history access');
+                    }
+                    return { ok: true, events: schedulerFor(agentAid).history(cmd.triggerId, limit) };
                 }
-                const agentAid = requireAgent(rawDefinition.agentAid);
-                const actor = await authorizeTrigger(agentAid, 'trigger.create');
-                const materialized = materializeTriggerCreateBaseagent({ ...rawDefinition, origin: actor.origin }, agentAid);
-                const definition = normalizeTriggerDefinition(materialized);
-                validateTriggerDefinitionForActor(definition, actor);
-                requireAgent(definition.agentAid);
-                validateTriggerFeedbackChannels(definition);
-                const trigger = schedulerFor(definition.agentAid).create(definition, cmd.files ?? [], { enable: cmd.enable });
-                return { ok: true, trigger };
-            }
-            case 'trigger.update': {
-                const agentAid = requireAgent(cmd.agentAid);
-                if (!cmd.triggerId)
-                    throw new Error('missing triggerId');
-                const actor = await authorizeTrigger(agentAid, 'trigger.update', cmd.triggerId);
-                const existing = schedulerFor(agentAid).list({ all: true }).find(trigger => trigger.id === cmd.triggerId);
-                if (!existing)
-                    throw new Error(`trigger not found: ${cmd.triggerId}`);
-                const currentRevision = definitionRevision(existing);
-                if (cmd.expectedRevision !== undefined && cmd.expectedRevision !== currentRevision) {
-                    throw new Error(`trigger revision conflict: expected ${cmd.expectedRevision}, current ${currentRevision}`);
+                case 'trigger.eventCatalog': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    await authorizeTrigger(agentAid, 'trigger.eventCatalog');
+                    return { ok: true, ...getEventCatalog({ includeInternal: cmd.includeInternal === true }) };
                 }
-                const definition = applyTriggerPatch(existing, cmd.patch, { fromPromptFile: cmd.promptFile === true });
-                validateTriggerDefinitionForActor(definition, actor);
-                validateTriggerFeedbackChannels(definition);
-                const scheduler = schedulerFor(agentAid);
-                const trigger = scheduler.update(cmd.triggerId, definition);
-                return { ok: true, trigger: scheduler.listItem(trigger), revision: definitionRevision(trigger) };
-            }
-            case 'trigger.setEnabled': {
-                const agentAid = requireAgent(cmd.agentAid);
-                if (!cmd.triggerId)
-                    throw new Error('missing triggerId');
-                if (typeof cmd.enabled !== 'boolean')
-                    throw new Error('missing enabled');
-                await authorizeTrigger(agentAid, 'trigger.setEnabled', cmd.triggerId);
-                const trigger = schedulerFor(agentAid).setEnabled(cmd.triggerId, cmd.enabled);
-                return { ok: true, trigger };
-            }
-            case 'trigger.cancel': {
-                const agentAid = requireAgent(cmd.agentAid);
-                if (!cmd.triggerId)
-                    throw new Error('missing triggerId');
-                await authorizeTrigger(agentAid, 'trigger.cancel', cmd.triggerId);
-                const trigger = schedulerFor(agentAid).cancel(cmd.triggerId);
-                return { ok: true, trigger };
-            }
-            case 'trigger.delete': {
-                const agentAid = requireAgent(cmd.agentAid);
-                if (!cmd.triggerId)
-                    throw new Error('missing triggerId');
-                await authorizeTrigger(agentAid, 'trigger.delete', cmd.triggerId);
-                const trigger = schedulerFor(agentAid).delete(cmd.triggerId);
-                return { ok: true, trigger };
-            }
-            case 'trigger.run': {
-                const agentAid = requireAgent(cmd.agentAid);
-                if (!cmd.triggerId)
-                    throw new Error('missing triggerId');
-                await authorizeTrigger(agentAid, 'trigger.run', cmd.triggerId);
-                const result = await schedulerFor(agentAid).run(cmd.triggerId, {
-                    dryRun: cmd.dryRun === true,
-                    ...(cmd.eventPayload !== undefined ? { eventPayload: cmd.eventPayload } : {}),
-                });
-                return {
-                    ok: result.ok,
-                    result,
-                    runId: result.runId,
-                    triggerId: result.triggerId,
-                    status: result.status,
-                    reason: result.reason,
-                    conflictRunId: result.conflictRunId,
-                    error: result.error,
-                    audit: result.audit,
-                };
+                case 'trigger.create': {
+                    const rawDefinition = cmd.definition;
+                    if (!rawDefinition || typeof rawDefinition !== 'object' || Array.isArray(rawDefinition)) {
+                        throw new Error('trigger definition must be an object');
+                    }
+                    const agentAid = requireAgent(rawDefinition.agentAid);
+                    const actor = await authorizeTrigger(agentAid, 'trigger.create');
+                    const materialized = materializeTriggerCreateBaseagent({ ...rawDefinition, origin: actor.origin }, agentAid);
+                    const definition = normalizeTriggerDefinition(materialized);
+                    validateTriggerDefinitionForActor(definition, actor);
+                    requireAgent(definition.agentAid);
+                    validateTriggerFeedbackChannels(definition);
+                    const trigger = schedulerFor(definition.agentAid).create(definition, cmd.files ?? [], { enable: cmd.enable });
+                    return { ok: true, trigger };
+                }
+                case 'trigger.update': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    if (!cmd.triggerId)
+                        throw new Error('missing triggerId');
+                    const actor = await authorizeTrigger(agentAid, 'trigger.update', cmd.triggerId);
+                    const existing = schedulerFor(agentAid).list({ all: true }).find(trigger => trigger.id === cmd.triggerId);
+                    if (!existing)
+                        throw new Error(`trigger not found: ${cmd.triggerId}`);
+                    const currentRevision = definitionRevision(existing);
+                    if (cmd.expectedRevision !== undefined && cmd.expectedRevision !== currentRevision) {
+                        throw new Error(`trigger revision conflict: expected ${cmd.expectedRevision}, current ${currentRevision}`);
+                    }
+                    const definition = applyTriggerPatch(existing, cmd.patch, { fromPromptFile: cmd.promptFile === true });
+                    validateTriggerDefinitionForActor(definition, actor);
+                    validateTriggerFeedbackChannels(definition);
+                    const scheduler = schedulerFor(agentAid);
+                    const trigger = scheduler.update(cmd.triggerId, definition);
+                    return { ok: true, trigger: scheduler.listItem(trigger), revision: definitionRevision(trigger) };
+                }
+                case 'trigger.setEnabled': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    if (!cmd.triggerId)
+                        throw new Error('missing triggerId');
+                    if (typeof cmd.enabled !== 'boolean')
+                        throw new Error('missing enabled');
+                    await authorizeTrigger(agentAid, 'trigger.setEnabled', cmd.triggerId);
+                    const trigger = schedulerFor(agentAid).setEnabled(cmd.triggerId, cmd.enabled);
+                    return { ok: true, trigger };
+                }
+                case 'trigger.cancel': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    if (!cmd.triggerId)
+                        throw new Error('missing triggerId');
+                    await authorizeTrigger(agentAid, 'trigger.cancel', cmd.triggerId);
+                    const trigger = schedulerFor(agentAid).cancel(cmd.triggerId);
+                    return { ok: true, trigger };
+                }
+                case 'trigger.delete': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    if (!cmd.triggerId)
+                        throw new Error('missing triggerId');
+                    await authorizeTrigger(agentAid, 'trigger.delete', cmd.triggerId);
+                    const trigger = schedulerFor(agentAid).delete(cmd.triggerId);
+                    return { ok: true, trigger };
+                }
+                case 'trigger.run': {
+                    const agentAid = requireAgent(cmd.agentAid);
+                    if (!cmd.triggerId)
+                        throw new Error('missing triggerId');
+                    await authorizeTrigger(agentAid, 'trigger.run', cmd.triggerId);
+                    const result = await schedulerFor(agentAid).run(cmd.triggerId, {
+                        dryRun: cmd.dryRun === true,
+                        ...(cmd.eventPayload !== undefined ? { eventPayload: cmd.eventPayload } : {}),
+                    });
+                    return {
+                        ok: result.ok,
+                        result,
+                        runId: result.runId,
+                        triggerId: result.triggerId,
+                        status: result.status,
+                        reason: result.reason,
+                        conflictRunId: result.conflictRunId,
+                        error: result.error,
+                        audit: result.audit,
+                    };
+                }
+                default:
+                    return { ok: false, error: `unknown trigger command: ${cmd.type}` };
             }
-            default:
-                return { ok: false, error: `unknown trigger command: ${cmd.type}` };
-        }
-    });
+        });
+    }
     ipcServer.startCpuTracking();
-    // I3: start IPC server after all hooks/executors/providers are registered.
-    await ipcServer.start();
-    // 写入 ready 信号（Control Plane 已可通过 IPC 查询；channel 连接不阻塞启动判定）
+    // IPC was bound before channel connection. At this point all handlers are
+    // registered, so the ready signal can safely expose the control plane.
     const readySignalPath = resolvePaths().readySignal;
     fs.writeFileSync(readySignalPath, String(Date.now()));
     logger.info(`✓ Ready signal written: ${readySignalPath}`);