evolcore 0.0.10 → 0.0.12

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

@@ -1,4 +1,7 @@
 import { createHash } from 'crypto';
+import { loadDaemonConfig } from '../../config-store.js';
+import { readInstalledEvolcoreVersion } from '../../utils/evolcore-version.js';
+import { compareStableSemver, parseStableSemver } from '../../utils/stable-semver.js';
 export const MENU_REQUEST_TYPES = new Set([
     'menu.token.request',
     'menu.list',
@@ -7,6 +10,72 @@ export const MENU_REQUEST_TYPES = new Set([
     'menu.update',
     'menu.action',
 ]);
+export const MENU_NAME_COMMANDS = Object.freeze({
+    pwd: '/pwd',
+    session: '/session',
+    topic: '/topic',
+    baseagent: '/baseagent',
+    model: '/model',
+    effort: '/effort',
+    chatmode: '/chatmode',
+    mentionmode: '/mentionmode',
+    group: '/group',
+    permission: '/perm',
+    activity: '/activity',
+    dispatch: '/dispatch',
+    observable: '/observable',
+    system: '/system',
+    cli: '/cli',
+    agent: '/agent',
+    trigger: '/trigger',
+    file: '/file',
+    gateway: '/gateway',
+    config: '/config',
+    capability: '/capability',
+    role: '/role',
+    connect: '/connect',
+});
+export function menuCommandForName(name) {
+    if (typeof name !== 'string')
+        return undefined;
+    return MENU_NAME_COMMANDS[name];
+}
+export function evaluateEvolMenuVersionGate(input) {
+    const minimum = loadDaemonConfig().aun?.minEvolVersion;
+    if (!minimum)
+        return null;
+    const minimumVersion = parseStableSemver(minimum);
+    if (!minimumVersion) {
+        throw new Error('daemon.json.aun.minEvolVersion must use stable X.Y.Z format');
+    }
+    const received = input.protectedHeaders?.evol_version;
+    const receivedVersion = input.encrypted ? parseStableSemver(received) : null;
+    if (!receivedVersion || compareStableSemver(receivedVersion, minimumVersion) < 0) {
+        return {
+            code: 'UPGRADE_REQUIRED',
+            message: `Evol ${minimum} or later is required`,
+            data: {
+                minimum,
+                received: receivedVersion ? received : null,
+            },
+        };
+    }
+    return null;
+}
+export function isEvolMenuVersionGateEnabled() {
+    return loadDaemonConfig().aun?.minEvolVersion !== undefined;
+}
+/** Token may be issued while disabled, but only this flag makes it an access requirement. */
+export function isAunMenuTokenRequired() {
+    return loadDaemonConfig().aun?.menuTokenRequired === true;
+}
+export function evolMenuResponseTransportMetadata() {
+    return {
+        // Clear inherited request state so AUNChannel applies daemon aun.defaultEncrypt.
+        encrypted: undefined,
+        protectedHeaders: { ec_version: readInstalledEvolcoreVersion() },
+    };
+}
 const EXPLICIT_SCOPE_UPDATE_NAMES = new Set([
     'model',
     'effort',
@@ -155,6 +224,8 @@ const STABLE_CODES = new Set([
     'METHOD_NOT_FOUND', 'NOT_FOUND', 'CONFLICT', 'EXPIRED', 'EXECUTION_TIMEOUT',
     'TEMPORARILY_UNAVAILABLE', 'INTERNAL_ERROR', 'MISSING_SCOPE', 'UPGRADE_REQUIRED',
     'MENU_TOKEN_REQUIRED', 'MENU_TOKEN_REJECTED', 'MENU_TOKEN_ENCRYPTION_REQUIRED',
+    'INVALID_CONTEXT', 'SCHEMA_VERSION_UNSUPPORTED', 'DEPENDENCY_UNAVAILABLE',
+    'RATE_LIMITED', 'CATALOG_STALE',
 ]);
 export function normalizeMenuError(error) {
     const source = error && typeof error === 'object' ? error : {};

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

@@ -114,7 +114,9 @@ export async function guardIdleCommand(opts) {
             catch {
                 // Runner mismatch should not block recovery commands such as /baseagent.
             }
-            const isBusy = hasActiveStream || opts.messageQueue?.isProcessing(threadSession.id);
+            const isBusy = hasActiveStream
+                || opts.messageQueue?.isProcessing(threadSession.id)
+                || (opts.messageQueue?.getQueueLength(threadSession.id) ?? 0) > 0;
             if (isBusy) {
                 return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
             }
@@ -122,7 +124,8 @@ export async function guardIdleCommand(opts) {
     }
     else if (opts.activeSession) {
         const isBusy = (opts.activeAgent?.hasActiveStream(opts.activeSession.id) ?? false) ||
-            opts.messageQueue?.isProcessing(opts.activeSession.id);
+            opts.messageQueue?.isProcessing(opts.activeSession.id) ||
+            (opts.messageQueue?.getQueueLength(opts.activeSession.id) ?? 0) > 0;
         if (isBusy) {
             return { kind: 'command.error', text: '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试' };
         }

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

@@ -21,9 +21,9 @@ import { filterModelsForRole, validateModelSelectionForRole } from '../model/mod
 import { displaySessionTitle, isSyntheticCliPrompt } from '../session/session-title.js';
 import { chatmodeFieldForPeer, resolveChatModeForField } from '../message/peer-mode.js';
 import { normalizePermissionMode as normalizePermissionModeContract, PUBLIC_PERMISSION_MODES } from '../permission/mode.js';
-import { dispatchToMentionMode } from '../../config/mention-mode.js';
 import { isManagementRole } from '../../config/builtin-roles.js';
 import { isSystemControlChannel } from '../system-channels.js';
+import { spawnDetachedNode } from '../../utils/cross-platform.js';
 import { guardIdleCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, } from './slash-gate.js';
 const allEfforts = ['low', 'medium', 'high', 'xhigh', 'max'];
 const PERMISSION_MODE_KEYS = PUBLIC_PERMISSION_MODES;
@@ -259,7 +259,8 @@ async function getGitWorkingDirInfo(projectPath) {
             cwd: projectPath,
             encoding: 'utf8',
             timeout: 1000,
-            stdio: ['ignore', 'pipe', 'ignore']
+            stdio: ['ignore', 'pipe', 'ignore'],
+            windowsHide: process.platform === 'win32',
         }).trim();
         if (isInsideWorkTree !== 'true')
             return null;
@@ -268,14 +269,16 @@ async function getGitWorkingDirInfo(projectPath) {
             cwd: projectPath,
             encoding: 'utf8',
             timeout: 1000,
-            stdio: ['ignore', 'pipe', 'ignore']
+            stdio: ['ignore', 'pipe', 'ignore'],
+            windowsHide: process.platform === 'win32',
         }).trim();
         if (!branch) {
             branch = execFileSync('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {
                 cwd: projectPath,
                 encoding: 'utf8',
                 timeout: 1000,
-                stdio: ['ignore', 'pipe', 'ignore']
+                stdio: ['ignore', 'pipe', 'ignore'],
+                windowsHide: process.platform === 'win32',
             }).trim();
         }
         if (!branch)
@@ -285,7 +288,8 @@ async function getGitWorkingDirInfo(projectPath) {
             cwd: projectPath,
             encoding: 'utf8',
             timeout: 1000,
-            stdio: ['ignore', 'pipe', 'ignore']
+            stdio: ['ignore', 'pipe', 'ignore'],
+            windowsHide: process.platform === 'win32',
         });
         // 解析文件状态统计
         const stats = { modified: 0, added: 0, deleted: 0, untracked: 0 };
@@ -328,7 +332,13 @@ async function getGitWorkingDirInfo(projectPath) {
         }
         // 获取 ahead/behind 信息
         try {
-            const revOutput = execFileSync('git', ['rev-list', '--left-right', '--count', '@{upstream}...HEAD'], { cwd: projectPath, timeout: 1000, encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
+            const revOutput = execFileSync('git', ['rev-list', '--left-right', '--count', '@{upstream}...HEAD'], {
+                cwd: projectPath,
+                timeout: 1000,
+                encoding: 'utf8',
+                stdio: ['ignore', 'pipe', 'ignore'],
+                windowsHide: process.platform === 'win32',
+            });
             const revParts = revOutput.trim().split(/\s+/);
             if (revParts.length === 2) {
                 const behind = parseInt(revParts[0], 10) || 0;
@@ -1641,6 +1651,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!isDaemonOwner && aidArg && aidArg !== selfAid) {
             return { kind: 'command.error', text: '❌ 无权限：跨 agent reload 仅限 daemon owner 使用' };
         }
+        const targetAid = aidArg ?? selfAid;
+        if (!targetAid) {
+            return { kind: 'command.error', text: '❌ 无法确定目标 agent，请指定 aid：/reload <aid>' };
+        }
         const reloadScope = 'agent';
         const authDenied = await authorizeIntent({
             intent: {
@@ -1664,10 +1678,6 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!isDaemonOwner && !isAdmin) {
             return { kind: 'command.error', text: '❌ 无权限：/reload 仅限 daemon owner 或 agent owner/admin 使用' };
         }
-        const targetAid = aidArg ?? selfAid;
-        if (!targetAid) {
-            return { kind: 'command.error', text: '❌ 无法确定目标 agent，请指定 aid：/reload <aid>' };
-        }
         // 繁忙检查（同 menu /agent reload）
         const busyInfo = getAgentBusyInfo(this, targetAid);
         if (busyInfo && busyInfo.count > 0) {
@@ -1924,8 +1934,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if ('error' in mentionTarget) {
             return { kind: 'command.error', text: `❌ ${mentionTarget.error}` };
         }
-        // session.metadata.dispatchMode 是 AUN 协议词汇（mention/broadcast），翻译成 mentionMode 词汇兜底
-        const mentionFallback = dispatchToMentionMode(mentionSession.metadata?.dispatchMode) ?? null;
+        const mentionFallback = mentionSession.metadata?.mentionMode ?? null;
         const currentMode = readSlashMentionMode(mentionTarget, mentionFallback);
         if (!arg) {
             const displayMode = currentMode ?? '未设置（跟随群设置）';
@@ -2121,20 +2130,19 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             selfAID,
             role: sessionRole,
         });
-        // session.metadata.dispatchMode 是 AUN 协议词汇，翻译成 mentionMode 词汇兜底
-        const mentionModeFallback = dispatchToMentionMode(session.metadata?.dispatchMode) ?? null;
+        const mentionModeFallback = session.metadata?.mentionMode ?? null;
         const mentionMode = 'error' in mentionModeTarget
             ? (mentionModeFallback ?? '未设置（跟随群设置）')
             : (readSlashMentionMode(mentionModeTarget, mentionModeFallback) ?? '未设置（跟随群设置）');
         const chatModeLine = `会话模式: ${chatMode}`;
-        const dispatchModeLine = session.chatType === 'group' ? `@ 处理模式: ${mentionMode}` : null;
+        const mentionModeLine = session.chatType === 'group' ? `@ 处理模式: ${mentionMode}` : null;
         if (isAdmin) {
             const gitInfo = await getGitWorkingDirInfo(session.projectPath);
             lines.push(`📊 ${isThread ? '话题' : '会话'}状态 (Agent: ${agentName})：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${displaySessionTitle(session.name, '(未命名)')}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`);
             if (gitInfo) {
                 lines.push(`Git: ${gitInfo}`);
             }
-            lines.push(`会话状态: ${sessionStatus} / 轮数: ${sessionTurns}`, sessionRoleLine, chatModeLine, ...(dispatchModeLine ? [dispatchModeLine] : []));
+            lines.push(`会话状态: ${sessionStatus} / 轮数: ${sessionTurns}`, sessionRoleLine, chatModeLine, ...(mentionModeLine ? [mentionModeLine] : []));
             if (health.consecutiveErrors > 0) {
                 lines.push(`异常计数: ${health.consecutiveErrors}`);
             }
@@ -2142,7 +2150,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         else {
             lines.push(`📊 ${isThread ? '话题' : '会话'}状态 (Agent: ${agentName})：`, `渠道: ${channel} / 项目: ${projectName} / ${session.baseagent}会话`);
-            lines.push(`状态: ${sessionStatus} / 轮数: ${sessionTurns}`, sessionRoleLine, chatModeLine, ...(dispatchModeLine ? [dispatchModeLine] : []), `最后活跃: ${timeStr}`);
+            lines.push(`状态: ${sessionStatus} / 轮数: ${sessionTurns}`, sessionRoleLine, chatModeLine, ...(mentionModeLine ? [mentionModeLine] : []), `最后活跃: ${timeStr}`);
         }
         if (health.lastError) {
             lines.push('');
@@ -2171,7 +2179,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 ...(previousMetadata.channelKey ? { channelKey: previousMetadata.channelKey } : {}),
                 groupId: previousMetadata.groupId || channelId,
                 ...(previousMetadata.groupName ? { groupName: previousMetadata.groupName } : {}),
-                ...(previousMetadata.dispatchMode ? { dispatchMode: previousMetadata.dispatchMode } : {}),
+                ...(previousMetadata.mentionMode ? { mentionMode: previousMetadata.mentionMode } : {}),
             }
             : {
                 ...(previousMetadata.channelKey ? { channelKey: previousMetadata.channelKey } : {}),
@@ -2180,6 +2188,21 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 ...(previousMetadata.peerType ? { peerType: previousMetadata.peerType } : {}),
             };
         const newSession = await this.sessionManager.createNewSession(channel, channelId, projectPath, sessionName, newSessionBaseagent, newSessionIdentityMetadata);
+        const previousSession = session || activeSession;
+        const handoffSelfAid = previousSession?.selfAID
+            || selfAID
+            || this.getOwningAgent(channel)?.aid
+            || this.resolveSelfAID(channel);
+        let handoffDiscardWarning;
+        if (previousSession?.id && handoffSelfAid && this.handoffRuntime) {
+            try {
+                await this.handoffRuntime.discardSession(handoffSelfAid, previousSession.id);
+            }
+            catch (error) {
+                handoffDiscardWarning = '⚠️ 原会话 Handoff 清理失败，请检查 daemon 日志';
+                logger.error(`[Handoff] failed to discard handoffs after /new: session=${previousSession.id}`, error);
+            }
+        }
         const previousAgent = getActiveAgentIfAvailable();
         if (session && previousAgent) {
             // Reset agent backend state so the new
@@ -2214,7 +2237,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             ?? newRunner.getEffort?.()
             ?? newAgent?.effort;
         const backendBits = [newBaseagent, backendModel, backendEffort].filter(Boolean).join(' · ');
-        return { kind: 'command.result', text: `✓ 已创建新会话${sessionName ? `: ${sessionName}` : ''}\n  项目: ${this.getProjectName(projectPath)}\n  后端: ${backendBits}\n  之前的对话历史已保留，可通过 /s 查看` };
+        return { kind: 'command.result', text: `✓ 已创建新会话${sessionName ? `: ${sessionName}` : ''}\n  项目: ${this.getProjectName(projectPath)}\n  后端: ${backendBits}\n  之前的对话历史已保留，可通过 /s 查看${handoffDiscardWarning ? `\n${handoffDiscardWarning}` : ''}` };
     }
     // /check 命令：检查 EvolAgent 实例健康（visitor/member 可用，详情仅 admin）
     if (normalizedContent === '/check' || normalizedContent.startsWith('/check ')) {
@@ -2485,12 +2508,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 const controlDir = daemonControlDir();
                 fs.mkdirSync(controlDir, { recursive: true });
                 fs.writeFileSync(path.join(controlDir, 'restart-pending.json'), JSON.stringify(restartInfo));
-                const { spawn } = await import('child_process');
-                spawn('node', [path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
-                    detached: true,
-                    stdio: 'ignore',
-                    env: { ...process.env, EVOLCORE_HOME: resolvePaths().root }
-                }).unref();
+                spawnDetachedNode([path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
+                    EVOLCORE_HOME: resolvePaths().root,
+                });
             }
             else {
                 logger.info('[System] Suppressed real restart in test runtime');

package/dist/core/daemon-file-cache.js

@@ -10,7 +10,7 @@
  *  - 只缓存"文件 → 解析后内容"，不缓存按 vars 渲染后的结果。
  *
  * 策略（reload/重启永远全量失效，无视策略；策略只决定"平时每次读怎么检查"）：
- *  - on-reload：平时不检查，直接用缓存（kits 文件、persona）。靠 reload/重启刷新。
+ *  - on-reload：平时不检查，直接用缓存（kits 文件）。靠 reload/重启刷新。
  *  - manual：同 on-reload，额外支持显式 invalidate(file) 单刷。
  *  - mtime：每次读 statSync 门控 size + mtime，变了自动重读（working.md、config.json）。
  *
@@ -35,6 +35,7 @@ function newCounters() {
  */
 const GROUP_CAPS = {
     'relation-prefs': 512,
+    'eck-runtime': 512,
 };
 export class FileCache {
     cache = new Map();

package/dist/core/data-migration.js

@@ -1303,7 +1303,10 @@ function verifyArchiveContains(archivePath, sourcePaths) {
         .replace(/\/+$/, '');
     let entries;
     try {
-        entries = new Set(execFileSync(tar, ['-tzf', archivePath], { encoding: 'utf8' })
+        entries = new Set(execFileSync(tar, ['-tzf', archivePath], {
+            encoding: 'utf8',
+            windowsHide: process.platform === 'win32',
+        })
             .split('\n')
             .map(normalizeArchivePath)
             .filter(Boolean));
@@ -1401,7 +1404,11 @@ export function finalizeDataMigration(root, manifest) {
     const temporary = `${archivePath}.${process.pid}.${crypto.randomBytes(6).toString('hex')}.tmp`;
     const tar = process.platform === 'win32' ? 'tar.exe' : 'tar';
     try {
-        execFileSync(tar, ['-czf', temporary, ...sourcePaths], { cwd: root, stdio: 'pipe' });
+        execFileSync(tar, ['-czf', temporary, ...sourcePaths], {
+            cwd: root,
+            stdio: 'pipe',
+            windowsHide: process.platform === 'win32',
+        });
         verifyArchiveContains(temporary, sourcePaths);
         fs.renameSync(temporary, archivePath);
     }

package/dist/core/evolagent-registry.js

@@ -5,7 +5,7 @@ import { logger } from '../utils/logger.js';
 import { agentPersonalDir } from '../paths.js';
 import { invalidateAgentDisplayName, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
 import { loadAllAgents, ensureAgentDirSkeleton, loadAgent, validateAgentConfig, } from '../config-store.js';
-import { resolveEffective } from '../config/config-manager.js';
+import { ConfigTarget, read as readConfig, resolveEffective } from '../config/config-manager.js';
 // ── Channel Fingerprint ───────────────────────────────────────────────────
 // 用于检测多 agent 之间复用同一外部凭证的冲突（appId、aid、token 等）。
 // 格式：{type}:{primaryKey}
@@ -84,18 +84,20 @@ export class EvolAgentRegistry {
         this.skipped = [];
         const { agents: rawAgents, skipped, invalidAgents = [] } = loadAllAgents({ includeInvalid: true });
         this.skipped = skipped;
-        for (const raw of rawAgents) {
+        for (const expandedRaw of rawAgents) {
             try {
-                const merged = resolveEffective({ self: raw.aid });
+                const raw = readConfig(ConfigTarget.Agent, { self: expandedRaw.aid }, { cache: true }) ?? expandedRaw;
+                const merged = resolveEffective({ self: expandedRaw.aid }, { expand: true });
                 const agent = new EvolAgent(raw, merged);
-                ensureAgentDirSkeleton(raw.aid);
+                ensureAgentDirSkeleton(expandedRaw.aid);
                 this.agents.set(agent.aid, agent);
             }
             catch (e) {
-                logger.warn(`[EvolAgentRegistry] failed to construct agent ${raw.aid}: ${e}`);
+                logger.warn(`[EvolAgentRegistry] failed to construct agent ${expandedRaw.aid}: ${e}`);
             }
         }
-        for (const { agent: raw, reason } of invalidAgents) {
+        for (const { agent: expandedRaw, reason } of invalidAgents) {
+            const raw = readConfig(ConfigTarget.Agent, { self: expandedRaw.aid }, { cache: true }) ?? expandedRaw;
             this.registerErrorAgent(raw, reason);
         }
         this.detectAndFlagConflicts();
@@ -119,7 +121,7 @@ export class EvolAgentRegistry {
     }
     resolveMergedForErrorAgent(raw, reason) {
         try {
-            return resolveEffective({ self: raw.aid });
+            return resolveEffective({ self: raw.aid }, { expand: true });
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);
@@ -225,9 +227,9 @@ export class EvolAgentRegistry {
             logger.info(`[EvolAgentRegistry] agent ${aid} already loaded, skipping`);
             return this.agents.get(aid);
         }
-        let raw = null;
+        let expandedRaw = null;
         try {
-            raw = loadAgent(aid);
+            expandedRaw = loadAgent(aid);
         }
         catch (e) {
             const reason = e instanceof Error ? e.message : String(e);
@@ -239,22 +241,23 @@ export class EvolAgentRegistry {
                 channels: [],
             }, reason);
         }
-        if (!raw) {
+        if (!expandedRaw) {
             logger.warn(`[EvolAgentRegistry] loadNewAgent: ${aid}/config.json not found`);
             return null;
         }
-        const errs = validateAgentConfig(raw);
+        const errs = validateAgentConfig(expandedRaw);
         if (errs.length > 0) {
             const reason = errs.join('; ');
             logger.warn(`[EvolAgentRegistry] loadNewAgent ${aid}: ${reason}`);
-            return this.registerErrorAgent(raw, reason);
+            return this.registerErrorAgent(expandedRaw, reason);
         }
-        const conflict = this.checkConflictForReload(raw, aid);
+        const conflict = this.checkConflictForReload(expandedRaw, aid);
         if (conflict) {
             logger.warn(`[EvolAgentRegistry] loadNewAgent ${aid}: ${conflict}`);
-            return this.registerErrorAgent(raw, `Channel conflict: ${conflict}`);
+            return this.registerErrorAgent(expandedRaw, `Channel conflict: ${conflict}`);
         }
-        const merged = resolveEffective({ self: aid });
+        const raw = readConfig(ConfigTarget.Agent, { self: aid }, { cache: true }) ?? expandedRaw;
+        const merged = resolveEffective({ self: aid }, { expand: true });
         const agent = new EvolAgent(raw, merged);
         ensureAgentDirSkeleton(aid);
         this.agents.set(aid, agent);
@@ -268,13 +271,14 @@ export class EvolAgentRegistry {
         const oldAgent = this.agents.get(aidOrName);
         if (!oldAgent)
             throw new Error(`Agent "${aidOrName}" not found`);
-        const raw = loadAgent(oldAgent.aid);
-        if (!raw)
+        const expandedRaw = loadAgent(oldAgent.aid);
+        if (!expandedRaw)
             throw new Error(`Agent ${oldAgent.aid}/config.json missing on reload`);
-        const errs = validateAgentConfig(raw);
+        const errs = validateAgentConfig(expandedRaw);
         if (errs.length > 0)
             throw new Error(`Invalid config after edit: ${errs.join('; ')}`);
-        const merged = resolveEffective({ self: raw.aid });
+        const raw = readConfig(ConfigTarget.Agent, { self: oldAgent.aid }, { cache: true }) ?? expandedRaw;
+        const merged = resolveEffective({ self: raw.aid }, { expand: true });
         if (oldAgent.status === 'disabled' && raw.enabled !== false) {
             oldAgent.swapConfig(raw, merged);
             const hotLoad = globalThis.__evolcore_hotLoadAgent;
@@ -289,32 +293,69 @@ export class EvolAgentRegistry {
         }
         if (oldAgent.status !== 'disabled' && raw.enabled === false) {
             let prepared = false;
+            let runnerTransaction;
+            const disconnectedChannels = [];
+            const previousConfig = oldAgent.captureConfigSnapshot();
+            const previousStatus = oldAgent.status;
+            const previousError = oldAgent.error;
             try {
                 await hooks.prepareHandoffReload?.(oldAgent.aid);
                 prepared = true;
+                runnerTransaction = await hooks.stageAgentRunners?.(new EvolAgent(raw, merged));
                 for (const ch of oldAgent.channelInstanceNames()) {
                     try {
                         await hooks.drainChannel(ch);
                     }
                     catch { }
-                    try {
-                        await hooks.disconnectChannel(ch);
-                    }
-                    catch { }
+                    await hooks.disconnectChannel(ch);
+                    disconnectedChannels.push(ch);
                 }
                 oldAgent.swapConfig(raw, merged);
                 oldAgent.status = 'disabled';
                 this.channelIndex.clear();
                 this.buildChannelIndex();
+                runnerTransaction?.commit();
+                try {
+                    await runnerTransaction?.finalize();
+                }
+                catch (error) {
+                    logger.warn(`[Reload] Failed to dispose previous runners after disabling "${aidOrName}": ${error instanceof Error ? error.message : String(error)}`);
+                }
+                prepared = false;
                 logger.info(`[Reload] Agent "${aidOrName}" disabled`);
                 return;
             }
             catch (error) {
+                const rollbackErrors = [];
+                oldAgent.swapConfig(previousConfig.rawAgent, previousConfig.merged);
+                oldAgent.invalidatePersonaCache();
+                oldAgent.status = previousStatus;
+                oldAgent.error = previousError;
+                await runnerTransaction?.rollback().catch(rollbackError => {
+                    rollbackErrors.push(`runners: ${rollbackError instanceof Error ? rollbackError.message : String(rollbackError)}`);
+                });
+                for (const ch of disconnectedChannels) {
+                    try {
+                        await hooks.startChannel(oldAgent, ch);
+                    }
+                    catch (restartError) {
+                        rollbackErrors.push(`restart ${ch}: ${restartError instanceof Error ? restartError.message : String(restartError)}`);
+                    }
+                }
+                this.channelIndex.clear();
+                this.buildChannelIndex();
                 if (prepared) {
                     try {
                         await hooks.completeHandoffReload?.(oldAgent.aid);
                     }
-                    catch { }
+                    catch (resumeError) {
+                        rollbackErrors.push(`handoff: ${resumeError instanceof Error ? resumeError.message : String(resumeError)}`);
+                    }
+                }
+                if (rollbackErrors.length > 0) {
+                    oldAgent.status = 'error';
+                    oldAgent.error = `Disable failed; rollback incomplete: ${rollbackErrors.join('; ')}`;
+                    logger.error(`[Reload] Disable rollback incomplete for "${aidOrName}": ${rollbackErrors.join('; ')}`);
                 }
                 throw error;
             }
@@ -324,13 +365,18 @@ export class EvolAgentRegistry {
             throw new Error(`Channel conflict: ${conflict}`);
         const removedSuccessfully = [];
         const addedSuccessfully = [];
+        let runnerTransaction;
         let prepared = false;
+        const previousConfig = oldAgent.captureConfigSnapshot();
+        const previousStatus = oldAgent.status;
+        const previousError = oldAgent.error;
         try {
             await hooks.prepareHandoffReload?.(oldAgent.aid);
             prepared = true;
+            runnerTransaction = await hooks.stageAgentRunners?.(new EvolAgent(raw, merged));
             const oldChannels = new Set(oldAgent.channelInstanceNames());
             const aunKey = oldAgent.effectiveChannelName('aun', 'main');
-            const otherKeys = raw.channels.filter(c => c.type !== 'aun').map(c => oldAgent.effectiveChannelName(c.type, c.name));
+            const otherKeys = merged.channels.filter(c => c.type !== 'aun').map(c => oldAgent.effectiveChannelName(c.type, c.name));
             const newChannels = new Set([aunKey, ...otherKeys]);
             const toRemove = [...oldChannels].filter(c => !newChannels.has(c));
             const toAdd = [...newChannels].filter(c => !oldChannels.has(c));
@@ -338,7 +384,7 @@ export class EvolAgentRegistry {
             const credentialsChanged = [];
             for (const ch of kept) {
                 const oldInst = oldAgent.findChannelInstance(ch);
-                const newInst = findInstanceByKey(raw, oldAgent, ch);
+                const newInst = findInstanceByKey(merged, oldAgent, ch);
                 if (oldInst && newInst && JSON.stringify(oldInst) !== JSON.stringify(newInst)) {
                     credentialsChanged.push(ch);
                 }
@@ -360,28 +406,72 @@ export class EvolAgentRegistry {
             oldAgent.status = 'running';
             this.channelIndex.clear();
             this.buildChannelIndex();
-            await hooks.completeHandoffReload?.(oldAgent.aid);
-            prepared = false;
+            runnerTransaction?.commit();
+            try {
+                await hooks.completeHandoffReload?.(oldAgent.aid);
+            }
+            catch (error) {
+                logger.warn(`[Reload] Handoff recovery failed after commit for "${aidOrName}": ${error instanceof Error ? error.message : String(error)}`);
+            }
+            finally {
+                prepared = false;
+            }
+            try {
+                await hooks.afterReload?.(oldAgent);
+            }
+            catch (error) {
+                logger.warn(`[Reload] Post-reload hook failed after commit for "${aidOrName}": ${error instanceof Error ? error.message : String(error)}`);
+            }
+            try {
+                await runnerTransaction?.finalize();
+            }
+            catch (error) {
+                logger.warn(`[Reload] Failed to dispose previous runners for "${aidOrName}": ${error instanceof Error ? error.message : String(error)}`);
+            }
         }
         catch (err) {
-            logger.error(`[Reload] Failed: ${err}. Attempting rollback for "${aidOrName}".`);
-            for (const ch of addedSuccessfully) {
+            logger.error(`[Reload] Failed before commit: ${err}. Attempting rollback for "${aidOrName}".`);
+            const rollbackErrors = [];
+            for (const ch of [...addedSuccessfully].reverse()) {
                 try {
                     await hooks.disconnectChannel(ch);
                 }
-                catch { }
+                catch (error) {
+                    rollbackErrors.push(`disconnect ${ch}: ${error instanceof Error ? error.message : String(error)}`);
+                }
             }
+            oldAgent.swapConfig(previousConfig.rawAgent, previousConfig.merged);
+            oldAgent.invalidatePersonaCache();
+            await runnerTransaction?.rollback().catch(error => {
+                rollbackErrors.push(`runners: ${error instanceof Error ? error.message : String(error)}`);
+            });
+            for (const ch of [...new Set(removedSuccessfully)]) {
+                try {
+                    await hooks.startChannel(oldAgent, ch);
+                }
+                catch (error) {
+                    rollbackErrors.push(`restart ${ch}: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
+            this.channelIndex.clear();
+            this.buildChannelIndex();
             if (prepared) {
                 try {
                     await hooks.completeHandoffReload?.(oldAgent.aid);
                 }
                 catch (resumeError) {
-                    logger.error(`[Reload] Failed to resume Handoff dispatcher for "${aidOrName}":`, resumeError);
+                    rollbackErrors.push(`handoff: ${resumeError instanceof Error ? resumeError.message : String(resumeError)}`);
                 }
             }
-            void removedSuccessfully;
-            oldAgent.status = 'error';
-            oldAgent.error = `Reload failed (rollback partial): ${err instanceof Error ? err.message : String(err)}`;
+            if (rollbackErrors.length === 0) {
+                oldAgent.status = previousStatus;
+                oldAgent.error = previousError;
+            }
+            else {
+                oldAgent.status = 'error';
+                oldAgent.error = `Reload failed; rollback incomplete: ${rollbackErrors.join('; ')}`;
+                logger.error(`[Reload] Rollback incomplete for "${aidOrName}": ${rollbackErrors.join('; ')}`);
+            }
             throw err;
         }
     }