evolcore 0.0.26 → 0.0.27

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

@@ -51,6 +51,8 @@ export function parseMenuClientProtectedHeaders(value) {
         result.client_version = normalized.client_version;
     if (normalized.evol_version !== undefined)
         result.evol_version = normalized.evol_version;
+    if (normalized.sdk_version !== undefined)
+        result.sdk_version = normalized.sdk_version;
     if (normalized.auth_method === 'daemon-owner' || normalized.auth_method === 'remote-access-token' || normalized.auth_method === 'ecweb-token')
         result.auth_method = normalized.auth_method;
     else if (normalized.auth_method !== undefined)
@@ -118,11 +120,16 @@ export const MENU_NAME_COMMANDS = Object.freeze({
     dispatch: '/dispatch',
     observable: '/observable',
     system: '/system',
+    baseagents: '/baseagents',
     cli: '/cli',
     agent: '/agent',
     aid: '/aid',
     trigger: '/trigger',
     file: '/file',
+    'agent-data-root': '/agent-data-root',
+    'relation-data-root': '/relation-data-root',
+    'agent-storage-root': '/agent-storage-root',
+    storage: '/storage',
     gateway: '/gateway',
     config: '/config',
     capability: '/capability',
@@ -208,11 +215,17 @@ export function isEvolMenuVersionGateEnabled() {
 export function isAunMenuTokenRequired() {
     return loadDaemonConfig().aun?.menuTokenRequired === true;
 }
-export function evolMenuResponseTransportMetadata() {
+export function evolMenuResponseTransportMetadata(sdkVersion) {
     return {
         // Clear inherited request state so AUNChannel applies daemon aun.defaultEncrypt.
         encrypted: undefined,
-        protectedHeaders: { ec_version: readInstalledEvolcoreVersion() },
+        protectedHeaders: {
+            ec_version: readInstalledEvolcoreVersion(),
+            ...(typeof sdkVersion === 'string' && sdkVersion.trim() ? { sdk_version: sdkVersion.trim() } : {}),
+        },
+        ...(typeof sdkVersion === 'string' && sdkVersion.trim()
+            ? { menuClientSdkVersion: sdkVersion.trim() }
+            : {}),
     };
 }
 const EXPLICIT_SCOPE_UPDATE_NAMES = new Set([
@@ -329,6 +342,12 @@ export function validateMenuRequest(request) {
             return { code: 'INVALID_ARGUMENT', message: 'File fetch requires args.path' };
         }
     }
+    if ((request.name === 'file' || request.cmd === '/file') && request.args !== undefined) {
+        const args = request.args;
+        if (args.rootId !== undefined && (typeof args.rootId !== 'string' || args.rootId.trim().length === 0)) {
+            return { code: 'INVALID_ARGUMENT', message: 'File rootId must be a non-empty string' };
+        }
+    }
     return null;
 }
 export function menuSuccess(header, data) {
@@ -371,10 +390,10 @@ export function enforceMenuResponseSize(response, maxBytes = 128 * 1024) {
     });
 }
 const INVALID_ARGUMENT_CODES = new Set([
-    'ARGUMENT_MISMATCH', 'FILE_TOO_LARGE', 'INVALID_ARGS', 'INVALID_DELEGATION',
+    'ARGUMENT_MISMATCH', 'INVALID_ARGS', 'INVALID_DELEGATION',
     'INVALID_FIELD', 'INVALID_REVISION', 'INVALID_SCOPE', 'INVALID_TYPE', 'INVALID_VALUE', 'MISSING_AID',
     'MISSING_ARGV', 'MISSING_BASEAGENT', 'MISSING_CMD', 'MISSING_PEER', 'MISSING_VALUE',
-    'NOT_A_DIRECTORY', 'REVISION_REQUIRED', 'ROLE_VIOLATION',
+    'REVISION_REQUIRED', 'ROLE_VIOLATION',
 ]);
 const STABLE_CODES = new Set([
     'ROLE_ACCESS_DENIED', 'PERMISSION_DENIED', 'UNAUTHORIZED', 'FORBIDDEN',
@@ -386,6 +405,9 @@ const STABLE_CODES = new Set([
     'RATE_LIMITED', 'CATALOG_STALE', 'DATA_MIGRATION_REQUIRED',
     'INVALID_CLIENT', 'REMOTE_ACCESS_TOKEN_INVALID', 'ECWEB_TOKEN_INVALID', 'CLIENT_BUSY', 'INVALID_RESPONSE', 'TIMEOUT',
     'RESPONSE_TOO_LARGE',
+    'TOPIC_SESSION_NOT_FOUND', 'TOPIC_SESSION_LOOKUP_FAILED',
+    'ROOT_NOT_FOUND', 'ROOT_FORBIDDEN', 'ROOT_EXPIRED', 'ROOT_SCOPE_MISMATCH', 'ROOT_PEER_MISMATCH',
+    'INVALID_ROOT_ID', 'MISSING_ROOT_ID', 'INVALID_ROOT_PATH', 'NOT_A_DIRECTORY', 'FILE_TOO_LARGE',
 ]);
 export function normalizeMenuError(error) {
     const source = error && typeof error === 'object' ? error : {};
@@ -436,6 +458,16 @@ export class MenuRequestDeduper {
         this.ttlMs = ttlMs;
         this.maxEntries = maxEntries;
     }
+    /** Replace an acknowledged deferred operation's result after it fails. */
+    async replaceResult(key, fingerprint, previous, value) {
+        const entry = this.entries.get(key);
+        if (!entry || entry.fingerprint !== fingerprint || await entry.promise !== previous)
+            return;
+        if (this.entries.get(key) !== entry)
+            return;
+        entry.promise = Promise.resolve(value);
+        entry.expiresAt = Date.now() + this.ttlMs;
+    }
     async execute(key, fingerprint, operation) {
         this.prune();
         const existing = this.entries.get(key);
@@ -510,14 +542,16 @@ const MAX_LOG_DEPTH = 8;
 const MAX_LOG_KEYS = 100;
 const MAX_LOG_ARRAY_ITEMS = 100;
 const MAX_LOG_STRING_LENGTH = 4096;
-const SENSITIVE_LOG_KEY = /(?:^|[_-])(?:api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|token|secret(?:[_-]?key)?|password|passwd|credentials?|authorization|cookie|private[_-]?key|seed)(?:$|[_-])/i;
+const SENSITIVE_LOG_KEY = /(?:^|[_-])(?:api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|root[_-]?id|token|secret(?:[_-]?key)?|password|passwd|credentials?|authorization|cookie|private[_-]?key|seed)(?:$|[_-])/i;
 const SENSITIVE_LOG_ARG = /(?:api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|token|secret|password|passwd|credential|authorization|cookie|private[_-]?key|seed)/i;
 function isSensitiveLogKey(key) {
     const normalized = key.replace(/([a-z0-9])([A-Z])/g, '$1_$2');
-    return SENSITIVE_LOG_KEY.test(normalized);
+    return SENSITIVE_LOG_KEY.test(normalized) || /^(?:next[_-]?)?cursor$|^(?:download[_-]?)?url$|^ticket$/i.test(normalized);
 }
 function sanitizeInlineLogSecrets(value) {
     return value
+        .replace(/\b(?:sr1|sc1|dr1)\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g, '[REDACTED]')
+        .replace(/https?:\/\/[^\s"'<>]*[?&](?:t|token|signature|x-amz-signature)=[^\s"'<>]*/gi, '[REDACTED_URL]')
         .replace(/\b(authorization\s*:\s*Bearer\s+)[^\s"',;]+/gi, '$1[REDACTED]')
         .replace(/\bBearer\s+[^\s,;]+/gi, 'Bearer [REDACTED]')
         .replace(/\b(api[_-]?key|access[_-]?token|refresh[_-]?token|menu[_-]?token|token|password|passwd|secret|credential|authorization|cookie)\s*([=:])\s*(?:"[^"]*"|'[^']*'|\S+)/gi, '$1$2[REDACTED]')

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

@@ -16,9 +16,9 @@ import { fileCache } from '../daemon-file-cache.js';
 import { currentVersion } from '../../config/schema-registry.js';
 import { loadSchema } from '../../config/schema-registry.js';
 import { rolePermissionFields, rolePermissionFieldOptions, rolePermissionFieldPatterns, validateRoleConfig, } from '../../config/role-schema.js';
-import { groupInfo, groupList, groupDirectoryErrorCode } from '../../aun/msg/group.js';
+import { groupInfo, groupList, groupDirectoryErrorCode } from '../../aun/group/index.js';
 import { aidLookup, isValidAid } from '../../aun/aid/identity.js';
-import { isExplicitGroupId } from '../../aun/group-identity.js';
+import { isExplicitGroupId } from '../../aun/group/index.js';
 import { readJsonFile, readLastJsonlLine, scanChatDirs, scanMetaFiles } from '../session/session-fs-store.js';
 import { constrainResolvedModelForRole } from '../model/model-permission.js';
 import { resolveRuntimePermissionMode, resolveRuntimeStringField } from '../role/runtime-policy.js';

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

@@ -711,7 +711,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 '  /del <名称> - 删除指定会话（仅解绑，不删除文件）',
                 ...(threadId ? ['  /renew - 在当前话题中轮换 backend'] : []),
                 '  /pause - 在下一次工具调用前暂停当前任务',
-                '  /resume - 继续已暂停的当前任务',
+                '  /resume - 继续暂停或异常中断的当前任务',
                 '  /stop - 中断当前任务',
                 '  /status - 显示会话状态',
                 '  /check - 检查 EvolAgent 实例健康',
@@ -761,7 +761,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             '  /compact - 压缩会话上下文（减少 token 用量）',
             '  /renew - 在话题中轮换 backend（下一条消息懒初始化）',
             '  /pause - 在下一次工具调用前暂停当前任务',
-            '  /resume - 继续已暂停的当前任务',
+            '  /resume - 继续暂停或异常中断的当前任务',
             '  /stop - 中断当前任务',
             '',
             '🤖 Agent 与模型：',
@@ -782,7 +782,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             '🛠️ 运维：',
             '  /status - 显示会话状态',
             '  /pause - 在下一次工具调用前暂停当前任务',
-            '  /resume - 继续已暂停的当前任务',
+            '  /resume - 继续暂停或异常中断的当前任务',
             '  /stop - 中断当前任务',
             '  /check - 检查 EvolAgent 实例健康',
             ...(isOwner ? [
@@ -825,11 +825,11 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 text: '❌ /pair 仅限 daemon-owner 使用；请向 daemon 控制 AID 发送 /pair。',
             };
         }
-        const pair = remoteAccessService.getPairingCode(userId);
+        const pair = remoteAccessService.getPairingCode(userId, Date.now(), 'pair');
         const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
         return {
             kind: 'command.result',
-            text: `远程控制配对码：${pair.code}（约 ${mins} 分钟内有效）\n可用于 ECWeb 登录或远程 Menu 客户端授权`,
+            text: `远程控制配对码：${pair.code}（约 ${mins} 分钟内有效，仅可配对一次）\n可用于 ECWeb 登录或远程 Menu 客户端授权`,
         };
     }
     // /evolhelp 命令：返回 JSON 格式的命令列表（供程序解析）
@@ -898,7 +898,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         // 运维
         cmds.push({ command: '/status', description: '显示会话状态', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] });
         cmds.push({ command: '/pause', description: '在下一次工具调用前暂停当前任务', category: '运维', roles: ['admin', 'owner'] });
-        cmds.push({ command: '/resume', description: '继续已暂停的当前任务', category: '运维', roles: ['admin', 'owner'] });
+        cmds.push({ command: '/resume', description: '继续暂停或异常中断的当前任务', category: '运维', roles: ['admin', 'owner'] });
         cmds.push({ command: '/stop', description: '中断当前任务', category: '运维', roles: ['admin', 'owner'] });
         cmds.push({ command: '/check', description: '检查 EvolAgent 实例健康', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] });
         if (isAdmin) {
@@ -1071,19 +1071,20 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!args) {
             if (!askSession)
                 return { kind: 'command.result', text: '当前没有待回答的问题' };
-            const pendingIds = this.interactionRouter?.getPending(askSession.id) || [];
+            const pendingIds = this.interactionRouter?.getPending(askSession.id, 'ask') || [];
             if (pendingIds.length === 0)
                 return { kind: 'command.result', text: '当前没有待回答的问题' };
-            return { kind: 'command.result', text: `当前有 ${pendingIds.length} 个待回答问题，请回复 /ask <选项>` };
+            return { kind: 'command.result',
+                text: `当前有 ${pendingIds.length} 个待回答问题，请回复 /ask <问题ID> <回答>：\n${pendingIds.join('\n')}` };
         }
         if (!askSession)
             return { kind: 'command.error', text: '❌ 当前没有待回答的问题' };
-        const fb = await this.handleInteractionFallback('ask', args, askSession.id, userId);
+        const fb = await this.handleInteractionFallback('ask', args, askSession.id, userId, this.getAdapter(channel)?.channelKey);
         if (fb.matched)
             return { kind: 'command.result', text: fb.result ?? '✓ 已回答' };
         return { kind: 'command.error', text: '❌ 当前没有待回答的问题' };
     }
-    // /pause and /resume control the current session's next-tool gate.
+    // /pause gates the next tool; /resume also recovers a failed backend turn.
     if (normalizedContent.startsWith('/pause ')) {
         return { kind: 'command.error', text: '用法: /pause' };
     }
@@ -1111,8 +1112,16 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const resumeSession = await getExistingSessionForCommand();
         if (!resumeSession)
             return { kind: 'command.result', text: '当前没有活跃会话' };
-        const resumed = this.processor.resumeSession(resumeSession.id);
-        return { kind: 'command.result', text: resumed ? '✓ 已继续当前任务' : '当前任务未处于暂停状态' };
+        const resumed = await this.processor.recoverTask({
+            sessionId: resumeSession.id,
+            agentAid: resumeSession.selfAID,
+            peerId: userId,
+            encrypted: replyContext?.metadata?.encrypted,
+        });
+        return {
+            kind: resumed.ok ? 'command.result' : 'command.error',
+            text: resumed.message ?? (resumed.ok ? '已继续当前任务' : '任务恢复失败'),
+        };
     }
     // /baseagent 命令：查看或切换 Agent 后端
     if (normalizedContent === '/baseagent' || normalizedContent.startsWith('/baseagent ')) {
@@ -1536,10 +1545,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             }
             else {
                 const resolvedArg = hasModelSwitcher(modelAgent) ? (modelAgent.resolveModelId?.(arg) ?? arg) : arg;
-                if (models.includes(resolvedArg)) {
-                    newModel = resolvedArg;
-                }
-                else if (models.includes(arg)) {
+                if (models.includes(resolvedArg) || models.includes(arg)) {
                     newModel = arg;
                 }
                 else {
@@ -1566,7 +1572,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 const errorLabel = allEfforts.includes(effortArg) ? '⚠️' : '❌';
                 return { kind: 'command.result', text: `${errorLabel} ${modelArg} 不支持 ${effortArg} 推理强度\n可选: ${targetEfforts.join(' / ')}` };
             }
-            newModel = modelArg;
+            newModel = modelArgRaw;
             newEffort = effortArg;
         }
         // 优先写关系级覆盖；只有无法定位关系且具备管理权限时才回退到 runner/agent 级。
@@ -1606,11 +1612,13 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 requestedModel: newModel,
                 models,
                 resolveModelId: modelAgent.resolveModelId?.bind(modelAgent),
+                selfAid: modelSelector.self,
             });
             if (!decision.ok) {
                 return { kind: 'command.error', text: decision.message || `invalid model: ${newModel}` };
             }
-            newModel = decision.model || newModel;
+            // The decision validates the resolved model; retain the user's selection
+            // for configuration and replies, just like menu.update and local model use.
         }
         const changes = [];
         if (!('error' in relationTarget)) {
@@ -2260,6 +2268,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const hasActive = stopAgent.hasActiveStream(sessionKey);
         const isProcessing = this.messageQueue.isProcessing(sessionKey);
         if (queueLength === 0 && !hasActive && !isProcessing) {
+            // Even an idle session can have an undelivered task:error recovery.
+            // Persist the stop fence before acknowledging that nothing is running.
+            await this.processor.interruptSession(sessionKey, 'stop');
             return { kind: 'command.result', text: '当前没有正在处理的任务' };
         }
         // 发布中断事件，让 MessageProcessor 标记为 interrupted（而非 done）
@@ -2551,6 +2562,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 session.name = fileInfo.title;
             }
         }
+        const sessionSubtasks = this.sessionManager.getRunnerTaskHistory(session.id).length;
         const lines = [];
         const chatMode = getEffectiveChatmode(session);
         const sessionRole = session.identity?.role || identity.role || 'none';
@@ -2573,7 +2585,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             if (gitInfo) {
                 lines.push(`Git: ${gitInfo}`);
             }
-            lines.push(`会话状态: ${sessionStatus} / 轮数: ${sessionTurns}`, sessionRoleLine, chatModeLine, ...(mentionModeLine ? [mentionModeLine] : []));
+            lines.push(`会话状态: ${sessionStatus} / 轮数: ${sessionTurns} / 已记录子任务数: ${sessionSubtasks}`, sessionRoleLine, chatModeLine, ...(mentionModeLine ? [mentionModeLine] : []));
             if (health.consecutiveErrors > 0) {
                 lines.push(`异常计数: ${health.consecutiveErrors}`);
             }
@@ -2581,7 +2593,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, ...(mentionModeLine ? [mentionModeLine] : []), `最后活跃: ${timeStr}`);
+            lines.push(`状态: ${sessionStatus} / 轮数: ${sessionTurns} / 已记录子任务数: ${sessionSubtasks}`, sessionRoleLine, chatModeLine, ...(mentionModeLine ? [mentionModeLine] : []), `最后活跃: ${timeStr}`);
         }
         if (health.lastError) {
             lines.push('');
@@ -2928,7 +2940,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 text: `❌ ${excludeKey ? '其他会话' : '该 Agent'} 有 ${busyInfo.count} 个任务执行中，无法重启。\n\n处理中的会话：\n${processingLines}\n\n建议：等待这些任务完成后重试。可通过 ec ctl status 查看队列状态；典型等待时间 30-60 秒，群聊大型任务可能更长。`,
             };
         }
-        const allSessions = await this.sessionManager.listSessions(channel, channelId);
+        // Archiving only changes list visibility; pending work must still be checked.
+        const allSessions = await this.sessionManager.listSessions(channel, channelId, { archiveFilter: 'all' });
         const sessionsWithMessages = allSessions
             .filter((s) => this.messageCache.hasMessages(s.id))
             .map((s) => {
@@ -3649,7 +3662,9 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         }
         await interruptPausedSessionBeforeReplacement(session);
         try {
-            const forkedSessionId = await forkAgent.forkSession(session.agentSessionId, session.projectPath, forkName);
+            const forkedSessionId = await forkAgent.forkSession(session.agentSessionId, session.projectPath, forkName, {
+                sessionId: session.id, permissionMode: authSubject.permissionMode, role: authSubject.role,
+            });
             const newSession = await this.sessionManager.createForkedSession(session, forkedSessionId, forkName);
             await forkAgent.updateSessionMetadata?.(forkedSessionId, {
                 gitInfo: {

package/dist/core/event-catalog.js

@@ -294,6 +294,10 @@ const CATALOG = [
         description: 'agent 任务失败',
         fields: [
             { path: 'sessionId', type: 'string' },
+            { path: 'agentAid', type: 'string', optional: true },
+            { path: 'peerId', type: 'string', optional: true },
+            { path: 'encrypted', type: 'boolean', optional: true },
+            { path: 'originTriggerId', type: 'string', optional: true },
             { path: 'taskId', type: 'string', optional: true },
             { path: 'generation', type: 'number', optional: true },
             { path: 'error', type: 'string' },

package/dist/core/evolagent-registry.js

@@ -6,6 +6,7 @@ import { agentPersonalDir } from '../paths.js';
 import { invalidateAgentDisplayName, resolveAgentDisplayName } from '../aun/aid/agentmd.js';
 import { loadAllAgents, ensureAgentDirSkeleton, loadAgent, validateAgentConfig, } from '../config-store.js';
 import { ConfigTarget, read as readConfig, resolveEffective } from '../config/config-manager.js';
+import { resolveAgentLifecycle } from '../config/lifecycle.js';
 // ── Channel Fingerprint ───────────────────────────────────────────────────
 // 用于检测多 agent 之间复用同一外部凭证的冲突（appId、aid、token 等）。
 // 格式：{type}:{primaryKey}
@@ -58,6 +59,8 @@ export class EvolAgentRegistry {
     agents = new Map();
     /** channel key (`<type>#<selfAID>#<name>`) → agent aid */
     channelIndex = new Map();
+    /** Agents stopped through stopAgent; distinct from the initial load state. */
+    manuallyStopped = new Set();
     /** 启动期被 ConfigStore 跳过的目录（命名非法 / 缺 config.json / 校验失败等） */
     skipped = [];
     /**
@@ -81,6 +84,7 @@ export class EvolAgentRegistry {
         void _globalConfig;
         this.agents.clear();
         this.channelIndex.clear();
+        this.manuallyStopped.clear();
         this.skipped = [];
         const { agents: rawAgents, skipped, invalidAgents = [] } = loadAllAgents({ includeInvalid: true });
         this.skipped = skipped;
@@ -285,6 +289,7 @@ export class EvolAgentRegistry {
             if (!hotLoad)
                 throw new Error(`Cannot enable agent "${aidOrName}": hot-load handler not initialized`);
             this.agents.delete(oldAgent.aid);
+            this.manuallyStopped.delete(oldAgent.aid);
             this.channelIndex.clear();
             this.buildChannelIndex();
             await hotLoad(oldAgent.aid);
@@ -298,6 +303,7 @@ export class EvolAgentRegistry {
             const previousConfig = oldAgent.captureConfigSnapshot();
             const previousStatus = oldAgent.status;
             const previousError = oldAgent.error;
+            const previousManuallyStopped = this.manuallyStopped.has(oldAgent.aid);
             try {
                 await hooks.prepareHandoffReload?.(oldAgent.aid);
                 prepared = true;
@@ -312,6 +318,7 @@ export class EvolAgentRegistry {
                 }
                 oldAgent.swapConfig(raw, merged);
                 oldAgent.status = 'disabled';
+                this.manuallyStopped.delete(oldAgent.aid);
                 this.channelIndex.clear();
                 this.buildChannelIndex();
                 runnerTransaction?.commit();
@@ -331,6 +338,10 @@ export class EvolAgentRegistry {
                 oldAgent.invalidatePersonaCache();
                 oldAgent.status = previousStatus;
                 oldAgent.error = previousError;
+                if (previousManuallyStopped)
+                    this.manuallyStopped.add(oldAgent.aid);
+                else
+                    this.manuallyStopped.delete(oldAgent.aid);
                 await runnerTransaction?.rollback().catch(rollbackError => {
                     rollbackErrors.push(`runners: ${rollbackError instanceof Error ? rollbackError.message : String(rollbackError)}`);
                 });
@@ -370,11 +381,16 @@ export class EvolAgentRegistry {
         const previousConfig = oldAgent.captureConfigSnapshot();
         const previousStatus = oldAgent.status;
         const previousError = oldAgent.error;
+        const previousManuallyStopped = this.manuallyStopped.has(oldAgent.aid);
         try {
             await hooks.prepareHandoffReload?.(oldAgent.aid);
             prepared = true;
             runnerTransaction = await hooks.stageAgentRunners?.(new EvolAgent(raw, merged));
-            const oldChannels = new Set(oldAgent.channelInstanceNames());
+            // stopAgent removes runtime transports but preserves configuration.
+            // Reload transitions a manually stopped Agent back to running.
+            const oldChannels = this.manuallyStopped.has(oldAgent.aid)
+                ? new Set()
+                : new Set(oldAgent.channelInstanceNames());
             const aunKey = oldAgent.effectiveChannelName('aun', 'main');
             const otherKeys = merged.channels.filter(c => c.type !== 'aun').map(c => oldAgent.effectiveChannelName(c.type, c.name));
             const newChannels = new Set([aunKey, ...otherKeys]);
@@ -404,6 +420,7 @@ export class EvolAgentRegistry {
                 addedSuccessfully.push(ch);
             }
             oldAgent.status = 'running';
+            this.manuallyStopped.delete(oldAgent.aid);
             this.channelIndex.clear();
             this.buildChannelIndex();
             runnerTransaction?.commit();
@@ -466,6 +483,10 @@ export class EvolAgentRegistry {
             if (rollbackErrors.length === 0) {
                 oldAgent.status = previousStatus;
                 oldAgent.error = previousError;
+                if (previousManuallyStopped)
+                    this.manuallyStopped.add(oldAgent.aid);
+                else
+                    this.manuallyStopped.delete(oldAgent.aid);
             }
             else {
                 oldAgent.status = 'error';
@@ -481,8 +502,10 @@ export class EvolAgentRegistry {
             throw new Error(`Agent "${aidOrName}" not found`);
         if (agent.status === 'disabled')
             throw new Error('Agent is disabled; use enable/disable instead');
-        if (agent.status === 'stopped')
+        if (agent.status === 'stopped') {
+            this.manuallyStopped.add(agent.aid);
             return;
+        }
         for (const ch of agent.channelInstanceNames()) {
             try {
                 await hooks.disconnectChannel(ch);
@@ -490,6 +513,7 @@ export class EvolAgentRegistry {
             catch { }
         }
         agent.status = 'stopped';
+        this.manuallyStopped.add(agent.aid);
         this.channelIndex.clear();
         this.buildChannelIndex();
         logger.info(`[Registry] Stopped agent ${aidOrName}`);
@@ -508,6 +532,7 @@ export class EvolAgentRegistry {
             await hooks.startChannel(agent, ch);
         }
         agent.status = 'running';
+        this.manuallyStopped.delete(agent.aid);
         this.channelIndex.clear();
         this.buildChannelIndex();
         logger.info(`[Registry] Started agent ${aidOrName}`);
@@ -575,6 +600,7 @@ export class EvolAgentRegistry {
             personalName,
             aid: agent.aid,
             status: agent.status,
+            lifecycle: resolveAgentLifecycle(agent.config),
             channels,
             projectPath,
             baseagent,