evolcore 0.0.16 → 0.0.18

package/dist/core/event-catalog.js

@@ -313,10 +313,16 @@ const CATALOG = [
             { path: 'sessionId', type: 'string' },
             { path: 'toolName', type: 'string' },
             { path: 'input', type: 'object' },
+            { path: 'eventKey', type: 'string' },
+            { path: 'eventPhase', type: 'string' },
             { path: 'callId', type: 'string', optional: true },
             { path: 'correlationId', type: 'string', optional: true },
             { path: 'agentAid', type: 'string', optional: true },
             { path: 'permissionMode', type: 'string', optional: true },
+            { path: 'decision', type: 'string' },
+            { path: 'decisionSource', type: 'string' },
+            { path: 'executed', type: 'boolean' },
+            { path: 'executionState', type: 'string' },
             { path: 'timestamp', type: 'number', optional: true },
         ],
     },
@@ -328,6 +334,8 @@ const CATALOG = [
         fields: [
             { path: 'sessionId', type: 'string' },
             { path: 'toolName', type: 'string' },
+            { path: 'eventKey', type: 'string' },
+            { path: 'eventPhase', type: 'string' },
             { path: 'isError', type: 'boolean', optional: true },
             { path: 'errorCode', type: 'string', optional: true },
             { path: 'agentName', type: 'string', optional: true },
@@ -335,6 +343,10 @@ const CATALOG = [
             { path: 'correlationId', type: 'string', optional: true },
             { path: 'agentAid', type: 'string', optional: true },
             { path: 'permissionMode', type: 'string', optional: true },
+            { path: 'decision', type: 'string' },
+            { path: 'decisionSource', type: 'string' },
+            { path: 'executed', type: 'boolean' },
+            { path: 'executionState', type: 'string' },
             { path: 'timestamp', type: 'number', optional: true },
         ],
     },
@@ -846,3 +858,9 @@ export function getEventCatalog(opts = {}) {
     const namespaces = [...new Set(events.map(entry => entry.namespace))].sort();
     return { namespaces, events };
 }
+/** Whether an event Trigger pattern can subscribe to daemon-internal events. */
+export function eventPatternIncludesInternal(pattern) {
+    return CATALOG.some(entry => entry.internal === true && (pattern === '*'
+        || pattern === entry.type
+        || (pattern.endsWith(':*') && entry.namespace === pattern.slice(0, -2))));
+}

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

@@ -17,7 +17,7 @@ import { handlePendingQQBotContactBindMessage, registerPendingQQBotContactBind }
 import { handlePendingWecomContactBindMessage, registerPendingWecomContactBind } from '../../channels/wecom.js';
 import { handlePendingWechatContactBindMessage, registerPendingWechatContactBind } from '../../channels/wechat.js';
 import { authorizeAccess, buildAuthSubject } from '../auth/auth-gateway.js';
-import { MenuDiagnosticLimiter, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, menuSuccess, normalizeMenuError, parseMenuControl, validateMenuRequest, evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, isAunMenuTokenRequired, menuCommandForName, } from '../command/menu-protocol.js';
+import { MenuDiagnosticLimiter, MenuRequestDeduper, hasValidMenuId, menuFailure, menuPayloadFingerprint, menuSuccess, normalizeMenuError, parseMenuControl, validateMenuRequest, evaluateEvolMenuVersionGate, evolMenuResponseTransportMetadata, isAunMenuTokenRequired, menuCommandForName, normalizeMenuResponseTiming, withMenuProcessingTime, logMenuRequestCompleted, logMenuRequestReceived, } from '../command/menu-protocol.js';
 import { resolveExplicitMenuExecutionContext, validateMenuCatalogArgs, validateMenuValueBatchArgs } from '../command/menu-catalog.js';
 import { MenuTokenStore } from '../command/menu-token-store.js';
 import { SessionRenewService } from '../session/session-renew.js';
@@ -691,9 +691,16 @@ export class MessageBridge {
                 // that timestamp through session resolution and queue processing.
                 // The fallback is only for legacy adapters that do not provide it.
                 const receivedAt = msg.receivedAt ?? Date.now();
+                const menuTiming = normalizeMenuResponseTiming(msg);
                 const channelKey = adapter?.channelKey || channelName;
                 const owningAgent = this.agentRegistry?.resolveByChannel(channelKey)
                     ?? this.agentRegistry?.resolveByChannel(channelName);
+                // Agent-owned business controls bypass ResponseEngine entirely, so
+                // expose them only after bootstrap has explicitly reached active.
+                // Missing lifecycle fails closed; control channels without an owning
+                // EvolAgent keep their existing command behavior.
+                const allowsNormalCommandRouting = !owningAgent
+                    || owningAgent.config?.lifecycle === 'active';
                 const parsedChannelKey = tryParseChannelKey(channelKey);
                 const chatType = msg.chatType || 'private';
                 const delivery = chatType === 'group'
@@ -772,14 +779,21 @@ export class MessageBridge {
                     logger.info(`[MessageBridge] Inbound admission denied before business routing: self=${selfAid} actor=${actorId ?? '<none>'} channel=${channelKey} reason=${admissionDecision.reason}`);
                     return;
                 }
-                const menuControl = resolvedChannelType === 'aun'
+                const menuControl = allowsNormalCommandRouting && resolvedChannelType === 'aun'
                     ? parseMenuControl(content)
                     : { isMenu: false };
                 let menuResponseWarning;
                 if (menuControl.isMenu) {
+                    // AUN captures this mark at its adapter boundary. Legacy/test
+                    // adapters fall back to the bridge entry mark captured above.
+                    Object.assign(msg, menuTiming);
                     this.logMenuInbound(channelName, msg, menuControl);
                     if (!hasValidMenuId(menuControl)) {
                         this.logMenuDiagnostic('missing-id', channelName, msg, menuControl);
+                        logMenuRequestCompleted(menuControl.request, undefined, this.menuFlowContext(channelName, msg), {
+                            delivery: 'dropped',
+                            reason: 'missing-id',
+                        });
                         return;
                     }
                     const versionError = evaluateEvolMenuVersionGate({
@@ -916,7 +930,9 @@ export class MessageBridge {
                 // 2. 命令快速路径（去除引用前缀后检查，兼容话题中引用上文的情况）
                 const contentForCmd = content.replace(/^(>[^\n]*\n)+\n?/, '').trim();
                 const cmdContent = contentForCmd || content;
-                const isCmd = msg.source !== 'handoff' && this.cmdHandler.isCommand(cmdContent);
+                const isCmd = allowsNormalCommandRouting
+                    && msg.source !== 'handoff'
+                    && this.cmdHandler.isCommand(cmdContent);
                 if (isCmd) {
                     logger.debug(`[MessageBridge] Command detected: "${cmdContent}", routing to handler`);
                     // 命令也要记录入方向 jsonl（不创建 session，直接用 chatDirPath 计算路径）
@@ -953,11 +969,13 @@ export class MessageBridge {
                         logger.debug(`[MessageBridge] Failed to log inbound command: ${e}`);
                     }
                 }
-                if (msg.source !== 'handoff' && await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => {
-                    const taskId = `cmd-${msg.messageId || Date.now()}`;
-                    logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId, correlationId: taskId, sessionId: msg.replyContext?.sessionId, agentAid: msg.selfAID, payload: { kind: 'command.result', text } });
-                    return sendReply(msg.channelId, text, msg.replyContext);
-                }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext, msg.messageId, msg.selfAID, authSubject))
+                if (allowsNormalCommandRouting
+                    && msg.source !== 'handoff'
+                    && await this.handleCommand(cmdContent, channelName, msg.channelId, (text) => {
+                        const taskId = `cmd-${msg.messageId || Date.now()}`;
+                        logger.channelOut({ channel: channelName, channelId: msg.channelId, taskId, correlationId: taskId, sessionId: msg.replyContext?.sessionId, agentAid: msg.selfAID, payload: { kind: 'command.result', text } });
+                        return sendReply(msg.channelId, text, msg.replyContext);
+                    }, msg.peerId, msg.threadId, msg.chatType, msg.source, msg.replyContext, msg.messageId, msg.selfAID, authSubject))
                     return;
                 // 3. session 解析（使用 Channel 层填充的 chatType）
                 if (!(await this.canCreateThreadSession(channelName, msg, chatType))) {
@@ -1408,6 +1426,9 @@ export class MessageBridge {
         }
     }
     async sendMenuResponse(adapter, channel, msg, response) {
+        const request = this.menuRequestForLog(msg, response);
+        const flowContext = this.menuFlowContext(channel, msg);
+        const timedResponse = withMenuProcessingTime(response, msg);
         if (!adapter?.send) {
             this.logMenuDiagnostic('transport-unavailable', channel, msg, {
                 isMenu: true,
@@ -1417,6 +1438,10 @@ export class MessageBridge {
                 id: response.id,
                 name: response.name,
             }, 'TEMPORARILY_UNAVAILABLE');
+            logMenuRequestCompleted(request, timedResponse, flowContext, {
+                delivery: 'dropped',
+                reason: 'transport-unavailable',
+            });
             return;
         }
         const agentName = this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>';
@@ -1429,6 +1454,10 @@ export class MessageBridge {
         };
         if (msg.channelType === 'aun' && !replyContext.delivery) {
             logger.warn(`[MessageBridge] dropping AUN menu response without trusted delivery route: channel=${channel} channelId=${msg.channelId}`);
+            logMenuRequestCompleted(request, timedResponse, flowContext, {
+                delivery: 'dropped',
+                reason: 'missing-delivery-route',
+            });
             return;
         }
         const envelope = buildEnvelope({
@@ -1438,7 +1467,18 @@ export class MessageBridge {
             agentName,
             replyContext,
         });
-        await adapter.send(envelope, { kind: 'custom', channelType: channel, payload: response });
+        try {
+            await adapter.send(envelope, { kind: 'custom', channelType: channel, payload: timedResponse });
+            logMenuRequestCompleted(request, timedResponse, flowContext, { delivery: 'sent' });
+        }
+        catch (error) {
+            logMenuRequestCompleted(request, timedResponse, flowContext, {
+                delivery: 'failed',
+                reason: 'transport-error',
+                transportError: error,
+            });
+            throw error;
+        }
     }
     menuTokenOwnerAid(channel, msg) {
         return msg.selfAID || this.agentRegistry?.resolveByChannel(channel)?.aid;
@@ -1466,6 +1506,7 @@ export class MessageBridge {
         return normalized.length > 0 && normalized.length <= 256 ? normalized : undefined;
     }
     logMenuInbound(channel, msg, parsed) {
+        logMenuRequestReceived(parsed.request, this.menuFlowContext(channel, msg));
         logger.channelIn({
             channel,
             channelId: this.shortHash(msg.channelId),
@@ -1482,6 +1523,21 @@ export class MessageBridge {
             },
         });
     }
+    menuRequestForLog(msg, response) {
+        try {
+            const parsed = JSON.parse(msg.content);
+            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
+                return parsed;
+        }
+        catch {
+            // Fall through to a minimal correlation record.
+        }
+        return {
+            type: 'menu.unknown',
+            id: response.id,
+            ...(response.name ? { name: response.name } : {}),
+        };
+    }
     logMenuDiagnostic(category, channel, msg, parsed, code) {
         const scope = msg.chatType === 'group' ? (msg.groupId || msg.channelId) : msg.peerId;
         const key = `${category}:${channel}:${this.shortHash(scope)}`;
@@ -1611,6 +1667,13 @@ export class MessageBridge {
      * 撤回消息：先查 debounce 窗口，再查 message queue，最后查正在执行的任务。
      * @returns true 如果找到并取消/中断
      */
+    menuFlowContext(channel, msg) {
+        return {
+            source: 'agent-aun',
+            selfAid: msg.selfAID ?? this.agentRegistry?.resolveByChannel(channel)?.aid,
+            messageId: msg.messageId,
+        };
+    }
     cancel(messageId, selfAID) {
         // 阶段 1: debounce 窗口（尚未入队）
         for (const d of this.debouncers.values()) {

package/dist/core/message/pause-controller.js

@@ -0,0 +1,53 @@
+/** Per-session gate used only at the next tool boundary. */
+export class PauseController {
+    state = 'running';
+    waiters = new Set();
+    requestPause() {
+        if (this.state !== 'running')
+            return false;
+        this.state = 'pause_requested';
+        return true;
+    }
+    isPauseRequested() { return this.state === 'pause_requested'; }
+    isPaused() { return this.state === 'paused'; }
+    waitAtToolBoundary(signal) {
+        if (signal?.aborted)
+            return Promise.resolve('cancelled');
+        if (this.state === 'running')
+            return Promise.resolve('none');
+        this.state = 'paused';
+        return new Promise(resolve => {
+            const waiter = { resolve: () => { }, abort: undefined };
+            const finish = (result) => {
+                this.waiters.delete(waiter);
+                if (waiter.abort)
+                    signal?.removeEventListener('abort', waiter.abort);
+                resolve(result);
+            };
+            waiter.resolve = finish;
+            if (signal) {
+                waiter.abort = () => finish('cancelled');
+                signal.addEventListener('abort', waiter.abort, { once: true });
+            }
+            this.waiters.add(waiter);
+            if (this.state === 'running')
+                finish('released');
+            else if (signal?.aborted)
+                finish('cancelled');
+        });
+    }
+    resume() {
+        if (this.state === 'running')
+            return false;
+        this.state = 'running';
+        for (const waiter of [...this.waiters])
+            waiter.resolve('released');
+        return true;
+    }
+    cancel() {
+        this.state = 'running';
+        for (const waiter of [...this.waiters])
+            waiter.resolve('cancelled');
+    }
+    clear() { this.cancel(); }
+}

package/dist/core/message/response-engine.js

@@ -13,7 +13,7 @@ import { isHostChinese } from '../../utils/locale.js';
 import { getErrorMessage, classifyError, ErrorType, ERROR_PREFIX, isInfraError, isAbortTerminalReason, prefixErrorType, isRetryableError, isContextTooLongText } from '../../utils/error-utils.js';
 import { isExactEvolcoreSendCommandForSession } from '../permission/ec-command-parser.js';
 import { summarizeToolInput } from '../../utils/tool-summary.js';
-import { getPackageRoot, resolveRoot, resolvePaths } from '../../paths.js';
+import { agentDir as resolveAgentDir, agentMdPath, getPackageRoot, resolveRoot, resolvePaths } from '../../paths.js';
 import { renderKitSections } from '../../eck/kit-renderer.js';
 import { renderMessageBody } from '../../eck/message-renderer.js';
 import { syncGroupRulesContext } from '../../eck/group-rules-sync.js';
@@ -47,6 +47,8 @@ import { deriveSessionTitle, shouldAutoFillSessionTitle } from '../session/sessi
 import { SessionTurnCoordinator } from '../session/session-turn-coordinator.js';
 import { recordTriggerExecutionAnomaly } from '../../trigger/anomaly-store.js';
 import { classifyToolErrorCode } from '../permission/tool-error-code.js';
+import { buildToolLifecycleEventKey } from '../audit/event-key.js';
+import { PauseController } from './pause-controller.js';
 function isShowActivitiesMode(value) {
     return value === 'all' || value === 'text' || value === 'none';
 }
@@ -592,6 +594,28 @@ export class ResponseEngine {
         registerBuiltinModes(registry);
         this.responseCoordinator = new ResponseModeCoordinator(registry);
     }
+    pauseControllers = new Map();
+    getPauseController(sessionId) {
+        let controller = this.pauseControllers.get(sessionId);
+        if (!controller) {
+            controller = new PauseController();
+            this.pauseControllers.set(sessionId, controller);
+        }
+        return controller;
+    }
+    pauseSession(sessionId) { return this.getPauseController(sessionId).requestPause(); }
+    resumeSession(sessionId) { return this.pauseControllers.get(sessionId)?.resume() ?? false; }
+    isPauseRequested(sessionId) {
+        const controller = this.pauseControllers.get(sessionId);
+        return !!controller && (controller.isPauseRequested() || controller.isPaused());
+    }
+    clearPauseSession(sessionId, expected) {
+        const controller = this.pauseControllers.get(sessionId);
+        if (expected && controller !== expected)
+            return;
+        controller?.clear();
+        this.pauseControllers.delete(sessionId);
+    }
     setInteractionRouter(router) {
         this.interactionRouter = router;
         // 等待用户交互期间暂停 idle 监控，应答/取消/超时后恢复——
@@ -609,6 +633,7 @@ export class ResponseEngine {
         this.messageQueue = queue;
     }
     async interruptSession(sessionId, reason) {
+        this.clearPauseSession(sessionId);
         // A retry delay has no active runner stream to abort. Wake it before any
         // session-store I/O so /stop and a newer message take effect immediately.
         this.cancelRetryDelays(sessionId);
@@ -1165,7 +1190,7 @@ export class ResponseEngine {
     static COMMAND_PREFIXES = [
         '/new', '/pwd', '/help', '/status', '/restart',
         '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork',
-        '/stop', '/clear', '/compact', '/del', '/perm', '/file', '/check',
+        '/stop', '/pause', '/resume', '/clear', '/compact', '/del', '/perm', '/file', '/check',
         '/s ', '/name ', '/rewind', '/rw', '/rw ', '/activity', '/observable', '/chatmode',
         '/aid', '/upgrade', '/evolagent',
     ];
@@ -1293,7 +1318,10 @@ export class ResponseEngine {
         // 按 session.baseagent 选择 agent 后端（idle-kill 路径需要 interrupt）
         let agent;
         try {
-            agent = this.getAgent(channelKey, session.baseagent, session.selfAID || message.selfAID);
+            const runnerSelfAid = this.agentRegistry?.resolveByChannel(channelKey)?.aid
+                || session.selfAID
+                || message.selfAID;
+            agent = this.getAgent(channelKey, session.baseagent, runnerSelfAid);
         }
         catch (error) {
             if (error instanceof BaseagentRunnerUnavailableError) {
@@ -1526,6 +1554,10 @@ export class ResponseEngine {
         const taskAgentAid = message.selfAID || session.selfAID;
         const owningAgentForTask = this.agentRegistry?.resolveByChannel(channelKey)
             ?? (taskAgentAid ? this.agentRegistry?.get(taskAgentAid) : null);
+        const runnerSelfAid = owningAgentForTask?.aid || session.selfAID || message.selfAID;
+        const lifecycle = owningAgentForTask?.config?.lifecycle;
+        const isActive = lifecycle === 'active';
+        const isBootstrapping = lifecycle === 'bootstrapping';
         // Per-method agent name for stats bucketing (agent.name or '<unknown>')
         const agentNameForStats = owningAgentForTask?.name ?? taskAgentAid ?? '<unknown>';
         if (!channelInfo) {
@@ -1533,10 +1565,19 @@ export class ResponseEngine {
             this.publishTriggerExecutionFailure(message, `unknown_channel:${channelKey}`);
             return;
         }
+        // Agent-owned turns are runnable only in the two explicit execution
+        // states. An untransitioned `created` agent or a malformed/missing
+        // lifecycle must not fall through to a base runner's default prompt.
+        if (owningAgentForTask && !isActive && !isBootstrapping) {
+            const blockedLifecycle = lifecycle ?? 'missing';
+            logger.error(`[ResponseEngine] Agent lifecycle is not runnable: agent=${owningAgentForTask.aid} lifecycle=${blockedLifecycle}`);
+            this.publishTriggerExecutionFailure(message, `agent_lifecycle_not_runnable:${blockedLifecycle}`);
+            return;
+        }
         // 二次拦截：如果命令消息绕过 MessageBridge 的 handleCommand 泄漏到这里，
         // 静默丢弃而不是发送给 Agent（命令已在 MessageBridge 层处理过）
         const rawContent = message.content.replace(/^(>[^\n]*\n)+\n?/, '').trim();
-        if (rawContent.startsWith('/') && this.isKnownCommand(rawContent)) {
+        if (!isBootstrapping && rawContent.startsWith('/') && this.isKnownCommand(rawContent)) {
             logger.warn(`[ResponseEngine] Command leaked past MessageBridge, dropped: "${rawContent.substring(0, 40)}"`);
             this.publishTriggerExecutionFailure(message, 'trigger_command_not_supported');
             return;
@@ -1546,7 +1587,7 @@ export class ResponseEngine {
         const identityRole = session.identity?.role || 'none';
         let agent;
         try {
-            agent = this.getAgent(channelKey, session.baseagent, session.selfAID || message.selfAID);
+            agent = this.getAgent(channelKey, session.baseagent, runnerSelfAid);
         }
         catch (error) {
             if (error instanceof BaseagentRunnerUnavailableError) {
@@ -1569,6 +1610,7 @@ export class ResponseEngine {
         }
         // 为本次任务处理生成唯一 task_id（客户端生成，格式 task-{10hex}）
         const taskId = `task-${crypto.randomUUID().replace(/-/g, '').slice(0, 10)}`;
+        const taskPauseController = this.getPauseController(session.id);
         let turnLease;
         const inputCausation = normalizeCausation(message.causation) ?? createRootCausation();
         const taskCausation = deriveCausation(inputCausation);
@@ -1604,7 +1646,12 @@ export class ResponseEngine {
         const currentChannelType = options?.channelType || message.channel;
         const adapterAny = channelInfo.adapter;
         const adapterSelfAid = typeof adapterAny._selfAid === 'function' ? adapterAny._selfAid() : undefined;
-        const selfAid = adapterSelfAid || message.selfAID || session.selfAID || undefined;
+        // During bootstrap the lifecycle owner is the authoritative identity. Do
+        // not let a stale/crafted message or session selfAID redirect agent.md
+        // access or the two lifecycle commands to another local AID.
+        const selfAid = isBootstrapping
+            ? owningAgentForTask?.aid
+            : adapterSelfAid || message.selfAID || session.selfAID || undefined;
         const registrySelfName = selfAid ? this.agentRegistry?.resolveDisplayName?.(selfAid) : undefined;
         const adapterSelfName = typeof adapterAny._selfName === 'function' ? adapterAny._selfName() : undefined;
         const selfName = registrySelfName ?? adapterSelfName;
@@ -1684,9 +1731,10 @@ export class ResponseEngine {
             chatType,
             peerType,
         });
+        const responseModeAgentDir = selfAid ? resolveAgentDir(selfAid) : undefined;
         // mentionMode：顶层通用参数（先读出备用，投递/入队策略后续接入）
         const mentionMode = effectiveAgentConfig?.mentionMode ?? 'disabled';
-        const resolvedMode = triggerChatModeOverride || systemOrServicePeer
+        const resolvedMode = triggerChatModeOverride || systemOrServicePeer || !responseModeAgentDir
             ? null // trigger 强制覆盖或 system/service 强制 interactive 时，不走插件解析
             : this.responseCoordinator.resolveMode(effectiveAgentConfig?.responseMode, // 标量：关系级>agent级>注册表首选
             chatModeFallback, effectiveAgentConfig?.responseModeParams, // 按模式分桶的参数字典
@@ -1706,7 +1754,7 @@ export class ResponseEngine {
                     send: async () => { }, // 引擎自行发送，插件 handleOutbound 只做决策
                 },
                 logger,
-                agentDir: resolvePaths().agentsDir,
+                agentDir: responseModeAgentDir,
             });
         if (resolvedMode) {
             logger.info('[ResponseSystem] selected mode=' + resolvedMode.mode.id + ' source=' + resolvedMode.source + ' chatType=' + chatType + ' peerKey=' + (peerKey ?? 'none') + ' chatMode=' + chatModeFallback);
@@ -2208,6 +2256,7 @@ export class ResponseEngine {
                 approvalRouting,
                 approvalInteractionPolicy: authorizationIdentity ? 'deny' : 'interactive',
                 recordExecutionAnomaly,
+                pauseController: taskPauseController,
                 preToolUsePolicyHook: pureSessionPolicyHook,
                 armApprovedDelegationCommand: this.agentDelegationRegistry
                     ? (carrierToken, commandHash) => this.agentDelegationRegistry.armApprovedCommand({
@@ -2363,8 +2412,8 @@ export class ResponseEngine {
                 // Personal state is exposed to the manifest as vars. The manifest owns
                 // loading persona.md and working.md into the system prompt.
                 const owningAgent = owningAgentForTask;
-                const persona = owningAgent?.getPersona?.() || undefined;
-                const working = owningAgent?.getWorkingMemory?.() || undefined;
+                const persona = isActive ? (owningAgent?.getPersona?.() || undefined) : undefined;
+                const working = isActive ? (owningAgent?.getWorkingMemory?.() || undefined) : undefined;
                 // 计算 peerKey：群聊固定按 groupId/channelId，私聊按发送者 peerId。
                 // 这样单条和积压合并批次不会因队列状态不同而切换关系级配置。
                 const normalizedBaseagent = normalizeBaseagent(agent.name);
@@ -2521,6 +2570,12 @@ export class ResponseEngine {
                 if (shouldPassPermissionMode) {
                     modelOverride = { ...(modelOverride || {}), permissionMode: effectivePermissionMode };
                 }
+                if (isBootstrapping && selfAid) {
+                    modelOverride = {
+                        ...(modelOverride || {}),
+                        bootstrapAgentMdPath: agentMdPath(selfAid),
+                    };
+                }
                 if (normalizedBaseagent.canonical === 'claude') {
                     modelOverride = {
                         ...(modelOverride || {}),
@@ -2567,6 +2622,9 @@ export class ResponseEngine {
                         VENUES_DIR: selfAid ? path.join(resolveRoot(), 'agents', selfAid, 'venues') : undefined,
                         selfAid: selfAid || undefined,
                         selfName: selfName || undefined,
+                        agentMdPath: selfAid ? agentMdPath(selfAid) : undefined,
+                        lifecycle,
+                        isBootstrapping,
                         hasPersona: !!persona,
                         hasWorkingMemory: !!working,
                         peerId: peerIdRaw || undefined,
@@ -2637,7 +2695,12 @@ export class ResponseEngine {
                 // 按会话原型（sessionType）选 manifest 文件：config.sessionManifests 映射，缺省回退主 manifest。
                 const sessionType = session.sessionType ?? 'main';
                 const sessionManifests = this.agentRegistry?.resolveByChannel(channelKey)?.config?.sessionManifests;
-                const manifestFile = sessionManifests?.[sessionType] ?? 'eck_manifest.json';
+                // Bootstrap always uses the lifecycle-gated main manifest. A custom
+                // session manifest (for example the auxiliary manifest with `always`
+                // sections) must not reintroduce normal rules or command context.
+                const manifestFile = isBootstrapping
+                    ? 'eck_manifest.json'
+                    : sessionManifests?.[sessionType] ?? 'eck_manifest.json';
                 const kitContext = renderKitSections(kitCtx, manifestFile);
                 effectiveSystemPrompt = [options?.systemPromptAppend, kitContext].filter(Boolean).join('\n') || undefined;
                 // ── Stats: context_breakdown 旁路采集（各段估算 token 数，字符数/4 近似） ──
@@ -2775,6 +2838,7 @@ export class ResponseEngine {
                     taskId,
                     sessionId: session.id,
                     messageId: message.messageId,
+                    baseagent: normalizedBaseagent.canonical,
                     channel: configChannelType,
                     channelId: message.channelId,
                     chatType: configChatType,
@@ -3833,6 +3897,7 @@ export class ResponseEngine {
             if (this.activeRenderers.get(session.id)?.taskId === taskId) {
                 this.activeRenderers.delete(session.id);
             }
+            this.clearPauseSession(session.id, taskPauseController);
         }
         // [迁移探针] 任务收尾：记录工具提醒最终状态并落盘（防线 1）
         if (snapshot.isEnabled()) {
@@ -4419,8 +4484,15 @@ export class ResponseEngine {
                         // 重置最后回复追踪
                         lastReplyText = '';
                         hasProjectedCurrentReplyText = false;
+                        const lifecycleEventKey = buildToolLifecycleEventKey({
+                            sessionId: session.id,
+                            callId: event.callId,
+                            correlationId: event.correlationId,
+                        });
                         this.eventBus.publish({
                             type: 'tool:use',
+                            eventKey: lifecycleEventKey,
+                            eventPhase: 'use',
                             sessionId: session.id,
                             toolName: event.name,
                             input: event.input,
@@ -4428,6 +4500,10 @@ export class ResponseEngine {
                             ...(event.correlationId || event.callId ? { correlationId: event.correlationId ?? event.callId } : {}),
                             agentAid: session.selfAID ?? 'unknown',
                             permissionMode: permissionMode ?? 'unknown',
+                            decision: 'pending',
+                            decisionSource: 'runner',
+                            executed: false,
+                            executionState: 'requested',
                             timestamp: Date.now(),
                             causation,
                         });
@@ -4486,8 +4562,15 @@ export class ResponseEngine {
                                 logger.warn('[ResponseEngine] auto clear queue after ec ctl queue failed:', error);
                             }
                         }
+                        const lifecycleEventKey = buildToolLifecycleEventKey({
+                            sessionId: session.id,
+                            callId: event.callId,
+                            correlationId: event.correlationId,
+                        });
                         this.eventBus.publish({
                             type: 'tool:result',
+                            eventKey: lifecycleEventKey,
+                            eventPhase: 'result',
                             sessionId: session.id,
                             toolName: event.name,
                             isError: event.isError,
@@ -4497,6 +4580,10 @@ export class ResponseEngine {
                             ...(event.correlationId || event.callId ? { correlationId: event.correlationId ?? event.callId } : {}),
                             agentAid: session.selfAID ?? 'unknown',
                             permissionMode: permissionMode ?? 'unknown',
+                            decision: event.isError ? 'error' : 'allow',
+                            decisionSource: 'runner',
+                            executed: true,
+                            executionState: event.isError ? 'failed' : 'completed',
                             timestamp: Date.now(),
                             causation,
                         });