evolcore 0.0.25 → 0.0.27

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

@@ -28,7 +28,7 @@ import { isSystemControlChannel } from '../system-channels.js';
 import { launchMonitorAndConfirm, resolveMonitorLaunch, cleanupMonitorStage } from '../../utils/cross-platform.js';
 import { scanInstances } from '../../utils/instance-registry.js';
 import { inspectDataMigrationRequirement } from '../data-migration.js';
-import { guardIdleCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, probeSessionActivity, } from './slash-gate.js';
+import { guardIdleCommand, guardGroupSlashCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, probeSessionActivity, } from './slash-gate.js';
 const allEfforts = ['none', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
 const PERMISSION_MODE_KEYS = PUBLIC_PERMISSION_MODES;
 function defaultSlashChatmode(field) {
@@ -368,7 +368,7 @@ async function getGitWorkingDirInfo(projectPath) {
         return null; // git 命令失败时静默返回 null
     }
 }
-export async function handleSlashCommand(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, overrideSubject, replyContext) {
+export async function handleSlashCommand(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, overrideSubject, replyContext, applyGroupSlashPolicy = false) {
     // 卡片回调的 chatType 不可靠（飞书 bot 单聊 chatId 也是 oc_ 前缀），
     // 不应覆盖 session 中已有的正确值
     if (source === 'card-trigger')
@@ -434,9 +434,18 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             logger.warn(`[CommandHandler] topic session lookup failed: thread=${threadId}: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    const activeChatType = topicAuthSession?.chatType
+    const activeChatType = (applyGroupSlashPolicy
+        ? replyContext?.delivery?.chatType || overrideSubject?.chatType || chatType
+        : undefined)
+        || topicAuthSession?.chatType
         || activeSession?.chatType
         || (chatType === 'group' ? 'group' : 'private');
+    const groupSlash = applyGroupSlashPolicy && activeChatType === 'group';
+    if (applyGroupSlashPolicy) {
+        const groupGuard = guardGroupSlashCommand(normalizedContent, activeChatType);
+        if (groupGuard)
+            return groupGuard;
+    }
     const getExistingSessionForCommand = async () => {
         if (threadId) {
             if (topicAuthSessionLookupFailed)
@@ -485,7 +494,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         || normalizedContent === '/upgrade'
         || normalizedContent === '/reload'
         || normalizedContent.startsWith('/reload ')
-        || normalizedContent === '/pair';
+        || normalizedContent === '/pair'
+        || /^\/diag(?:\s|$)/.test(normalizedContent);
     const roleGuard = guardRoleCommand(normalizedContent, activeChatType, isAdmin || (isDaemonOwner && isProcessLevelSlash));
     if (roleGuard)
         return roleGuard;
@@ -617,6 +627,30 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     };
     // /help 命令不需要会话
     if (normalizedContent === '/help') {
+        if (groupSlash) {
+            const lines = [
+                '群聊可用命令：',
+                '  /help - 显示帮助',
+                '  /status - 显示会话状态',
+                '  /check - 检查 Agent 健康',
+                '  /model [current|list|check] - 查询模型或检查网关',
+                '  /effort - 查看推理强度',
+                '  /baseagent - 查看 Agent 后端',
+                '  /perm - 查看权限模式',
+                '  /mentionmode - 查看群聊 @ 处理模式',
+                '  /ask <选项> - 回答待处理问题',
+                '  /pause - 在下一次工具调用前暂停任务',
+                '  /resume - 继续已暂停的任务',
+                '  /stop - 中断当前任务',
+                ...(isAdmin ? [
+                    '  /compact - 压缩会话上下文',
+                    ...(threadId ? ['  /renew - 轮换当前话题的后端会话'] : []),
+                ] : []),
+                '',
+                '模型、推理强度、后端、权限与 @ 模式在群聊中仅支持查询。',
+            ];
+            return { kind: 'command.result', text: lines.join('\n') };
+        }
         const canReadModel = canAccessSlashOperation('model.current', 'relation')
             || canAccessSlashOperation('model.list', 'relation');
         const canUseModel = canAccessSlashOperation('model.use', 'relation');
@@ -633,7 +667,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const appendProcessCommands = (lines) => {
             if (!isDaemonOwner)
                 return;
-            lines.push('', '🛠️ 进程级运维：', '  /restart - 重启服务', '  /upgrade - 检查版本更新', '  /reload [aid] - 热重载 Agent 配置', '  /fa <提示词> - 单次使用宿主级 fullaccess 执行（别名: /fullaccess）', '  /pair - 获取远程控制配对码');
+            lines.push('', '🛠️ 进程级运维：', '  /restart - 重启服务', '  /upgrade - 检查版本更新', '  /reload [aid] - 热重载 Agent 配置', '  /fa <提示词> - 单次使用宿主级 fullaccess 执行（别名: /fullaccess）', '  /pair - 获取远程控制配对码', '  /diag <问题描述> - 邀请远程诊断；/diag stop 撤销授权');
         };
         if (!isAdmin && activeChatType === 'group') {
             const lines = [
@@ -677,7 +711,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 '  /del <名称> - 删除指定会话（仅解绑，不删除文件）',
                 ...(threadId ? ['  /renew - 在当前话题中轮换 backend'] : []),
                 '  /pause - 在下一次工具调用前暂停当前任务',
-                '  /resume - 继续已暂停的当前任务',
+                '  /resume - 继续暂停或异常中断的当前任务',
                 '  /stop - 中断当前任务',
                 '  /status - 显示会话状态',
                 '  /check - 检查 EvolAgent 实例健康',
@@ -727,7 +761,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             '  /compact - 压缩会话上下文（减少 token 用量）',
             '  /renew - 在话题中轮换 backend（下一条消息懒初始化）',
             '  /pause - 在下一次工具调用前暂停当前任务',
-            '  /resume - 继续已暂停的当前任务',
+            '  /resume - 继续暂停或异常中断的当前任务',
             '  /stop - 中断当前任务',
             '',
             '🤖 Agent 与模型：',
@@ -748,7 +782,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             '🛠️ 运维：',
             '  /status - 显示会话状态',
             '  /pause - 在下一次工具调用前暂停当前任务',
-            '  /resume - 继续已暂停的当前任务',
+            '  /resume - 继续暂停或异常中断的当前任务',
             '  /stop - 中断当前任务',
             '  /check - 检查 EvolAgent 实例健康',
             ...(isOwner ? [
@@ -773,6 +807,14 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         ];
         return { kind: 'command.result', text: lines.join('\n') };
     }
+    if (/^\/diag(?:\s|$)/.test(normalizedContent)) {
+        if (!isDaemonOwner || !userId || !this.diagService)
+            return { kind: 'command.error', text: '❌ /diag 需要本机 DaemonOwner 和可用的诊断入口' };
+        const problem = content.trim().slice(5).trim();
+        const result = await this.diagService.execute(problem.toLowerCase() === 'stop'
+            ? { action: 'stop' } : { action: 'start', problem }, userId);
+        return { kind: result.ok ? 'command.result' : 'command.error', text: result.message };
+    }
     // /pair is also recognized on an Agent channel so it cannot fall through
     // into model input. The daemon control channel has its own fast path; this
     // branch preserves the same daemon-owner boundary for ordinary AUN chats.
@@ -783,15 +825,35 @@ 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 格式的命令列表（供程序解析）
     if (normalizedContent === '/evolhelp') {
+        if (groupSlash) {
+            const commands = [
+                { command: '/help', description: '显示帮助信息', category: '帮助', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/status', description: '显示会话状态', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/check', description: '检查 EvolAgent 实例健康', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/model', args: '[current|list|check]', description: '查询模型或检查模型网关', category: 'Agent 与模型', roles: [identity.role] },
+                { command: '/effort', description: '查看推理强度', category: 'Agent 与模型', roles: [identity.role] },
+                { command: '/baseagent', description: '查看 Agent 后端', category: 'Agent 与模型', roles: [identity.role] },
+                { command: '/perm', description: '查看当前权限模式', category: '权限管理', roles: [identity.role] },
+                { command: '/mentionmode', description: '查看群聊 @ 处理模式', category: '聊天设置', roles: [identity.role] },
+                { command: '/ask', args: '<选项>', description: '回答 Agent 的交互式问题', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/pause', description: '在下一次工具调用前暂停当前任务', category: '运维', roles: ['admin', 'owner'] },
+                { command: '/resume', description: '继续已暂停的当前任务', category: '运维', roles: ['admin', 'owner'] },
+                { command: '/stop', description: '中断当前任务', category: '运维', roles: ['admin', 'owner'] },
+            ];
+            if (isAdmin) {
+                commands.push({ command: '/compact', description: '压缩会话上下文', category: '会话管理', roles: ['admin', 'owner'] }, ...(threadId ? [{ command: '/renew', description: '轮换当前话题 backend', category: '会话管理', roles: ['admin', 'owner'] }] : []));
+            }
+            return { kind: 'command.result', text: JSON.stringify({ commands, categories: [...new Set(commands.map(c => c.category))] }) };
+        }
         const cmds = [];
         const canReadModel = canAccessSlashOperation('model.current', 'relation')
             || canAccessSlashOperation('model.list', 'relation');
@@ -836,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) {
@@ -851,6 +913,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             cmds.push({ command: '/upgrade', description: '检查版本更新', category: '运维', roles: ['daemon-owner'] });
             cmds.push({ command: '/reload', args: '[aid]', description: '热重载 Agent 配置', category: '运维', roles: ['daemon-owner'] });
             cmds.push({ command: '/pair', description: '获取远程控制配对码', category: '运维', roles: ['daemon-owner'] });
+            cmds.push({ command: '/diag', args: '<问题描述>|stop', description: '邀请远程诊断或撤销授权', category: '运维', roles: ['daemon-owner'] });
         }
         if (!isDaemonOwner && isAdmin) {
             cmds.push({ command: '/reload', description: '热重载当前 Agent 配置', category: '运维', roles: ['admin', 'owner'] });
@@ -1008,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' };
     }
@@ -1048,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 ')) {
@@ -1063,7 +1135,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!args) {
             const activeBaseagent = owningAgent?.baseagent || this.parseDefaultBaseagent();
             // 尝试发送 CommandCard 卡片
-            if (this.interactionRouter && available.length > 1) {
+            if (!groupSlash && this.interactionRouter && available.length > 1) {
                 const baseagentSession = await getExistingSessionForCommand();
                 const interaction = {
                     type: 'interaction',
@@ -1090,7 +1162,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             }
             // 降级：文本
             const list = available.map((a) => `${a === activeBaseagent ? ' ✓' : '  '} ${a}`).join('\n');
-            const canSwitchAgent = isOwner;
+            const canSwitchAgent = isOwner && !groupSlash;
             if (canSwitchAgent) {
                 return { kind: 'command.result', text: `当前 Baseagent: ${activeBaseagent}\n\n可用:\n${list}\n用法: /baseagent <name>` };
             }
@@ -1348,7 +1420,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 isDaemonOwner,
             });
             // 尝试发送 CommandCard 卡片
-            if (!args && canReadModelList && this.interactionRouter && models.length > 0) {
+            if (!groupSlash && !args && canReadModelList && this.interactionRouter && models.length > 0) {
                 const interaction = {
                     type: 'interaction',
                     id: `model-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`,
@@ -1379,7 +1451,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             const catalogHint = `[${catalog.source}/${catalog.freshness}] ${catalog.diagnostics.map(d => d.message).join('; ')}`;
             const modelList = models.map((m) => `  ${modelMatches(modelAgent, m, currentModel) ? '✓' : ' '} ${modelDisplayLabel(modelAgent, m)}`).join('\n');
             const effortHint = efforts.length > 0
-                ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}  (使用 /effort 调整)`
+                ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}${groupSlash ? '' : '  (使用 /effort 调整)'}`
                 : '';
             if (args === 'current') {
                 return {
@@ -1389,7 +1461,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 };
             }
             if (canReadModelList) {
-                const usage = !args && isAdmin ? '\n\n用法: /model <模型>' : '';
+                const usage = !groupSlash && !args && isAdmin ? '\n\n用法: /model <模型>' : '';
                 return {
                     kind: 'command.result',
                     text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}${rawModels.includes(currentModel) ? '' : ' [当前配置，未列入目录]'}\n${catalogHint}\n\n可用模型：\n${modelList}${usage}`,
@@ -1473,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 {
@@ -1503,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 级。
@@ -1543,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)) {
@@ -1659,7 +1730,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 return { kind: 'command.error', text: '⚠️ 当前模型不支持推理强度设置' };
             }
             // /effort（无参数）：显示当前推理强度 + 发送 CommandCard 卡片
-            if (this.interactionRouter) {
+            if (!groupSlash && this.interactionRouter) {
                 const allItems = [...efforts, 'auto'];
                 const interaction = {
                     type: 'interaction',
@@ -1687,7 +1758,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             // 降级：文本
             const effortDisplay = currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort;
             const effortOptions = [...efforts, 'auto'].join(' / ');
-            if (isAdmin) {
+            if (isAdmin && !groupSlash) {
                 return { kind: 'command.result', text: `推理强度: ${effortDisplay}  可选: ${effortOptions}  用法: /effort <level>` };
             }
             return { kind: 'command.result', text: `推理强度: ${effortDisplay}` };
@@ -2109,6 +2180,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const currentMode = readSlashMentionMode(mentionTarget, mentionFallback);
         if (!arg) {
             const displayMode = currentMode ?? '未设置（跟随群设置）';
+            if (groupSlash)
+                return { kind: 'command.result', text: `@ 处理模式: ${displayMode}` };
             // 尝试发送 CommandCard 卡片
             if (isAdmin) {
                 const modes = [
@@ -2195,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）
@@ -2486,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';
@@ -2508,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}`);
             }
@@ -2516,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('');
@@ -2863,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) => {
@@ -3223,10 +3301,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     // /slist cli  — 仅 CLI 会话（未导入的）
     if (normalizedContent === '/slist' || normalizedContent === '/slist cli') {
         if (!session) {
-            return { kind: 'command.error', text: `❌ 当前没有活跃会话
-
-请先执行以下操作之一：
-1. 发送任意消息 - 自动创建新会话
+            return { kind: 'command.error', text: `❌ 当前没有活跃会话
+
+请先执行以下操作之一：
+1. 发送任意消息 - 自动创建新会话
 2. /new [名称] - 创建命名会话` };
         }
         const showCliOnly = normalizedContent === '/slist cli';
@@ -3497,11 +3575,11 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!newName)
             return { kind: 'command.result', text: '用法: /name <新名称> 或 /rename <新名称>' };
         if (!session) {
-            return { kind: 'command.error', text: `❌ 当前没有活跃会话
-
-请先执行以下操作之一：
-1. 发送任意消息 - 自动创建新会话
-2. /new [名称] - 创建命名会话
+            return { kind: 'command.error', text: `❌ 当前没有活跃会话
+
+请先执行以下操作之一：
+1. 发送任意消息 - 自动创建新会话
+2. /new [名称] - 创建命名会话
 3. /session <名称> - 切换到已有会话` };
         }
         const existing = await this.sessionManager.getSessionByName(channel, channelId, newName);
@@ -3584,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,