evolcore 0.0.22 → 0.0.24

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

@@ -1,5 +1,4 @@
 import { hasModelSwitcher, hasPermissionController } from '../../agents/runner-types.js';
-import { getCodexEfforts } from '../../agents/codex-runner.js';
 import { normalizeBaseagent } from '../../agents/baseagent.js';
 import { buildEnvelope, isDeliveryTargetForChannel } from '../message/message-utils.js';
 import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
@@ -10,13 +9,14 @@ import path from 'path';
 import fs from 'fs';
 import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../../utils/npm-ops.js';
 import { loadDaemonConfig } from '../../config-store.js';
+import { remoteAccessService } from '../auth/remote-access-store.js';
 import { read as cfgRead, resolveEffective, routeFieldPath, write as cfgWrite, } from '../../config/config-manager.js';
 import { execAgentAction } from './agent-control.js';
 import { authorizeOperation, buildAuthSubject } from '../auth/auth-gateway.js';
 import { authorizationNextStep, formatAuthorizationDenial } from '../auth/authorization-denial.js';
 import { resolvePermissionMode, writeScope } from '../model/config-scope.js';
 import { formatPeerKey } from '../relation/peer-identity.js';
-import { modelMatches } from '../model/model-catalog.js';
+import { modelMatches, getCatalog, assertCatalogSelectable, resolveCatalogModel } from '../model/model-catalog.js';
 import { formatModelCheck, runModelCheck } from '../model/model-diagnostics.js';
 import { constrainResolvedModelForRole, filterModelsForRole, validateModelSelectionForRole } from '../model/model-permission.js';
 import { resolveRuntimeStringField } from '../role/runtime-policy.js';
@@ -25,10 +25,11 @@ import { chatmodeFieldForPeer, resolveChatModeForField } from '../message/peer-m
 import { normalizePermissionMode as normalizePermissionModeContract, PUBLIC_PERMISSION_MODES } from '../permission/mode.js';
 import { isManagementRole } from '../../config/builtin-roles.js';
 import { isSystemControlChannel } from '../system-channels.js';
-import { spawnDetachedNode } from '../../utils/cross-platform.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';
-const allEfforts = ['low', 'medium', 'high', 'xhigh', 'max'];
+const allEfforts = ['none', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
 const PERMISSION_MODE_KEYS = PUBLIC_PERMISSION_MODES;
 function defaultSlashChatmode(field) {
     return field === 'private' ? 'interactive' : 'proactive';
@@ -127,12 +128,8 @@ function resolveSlashRelationTarget(params) {
         role: params.role,
     };
 }
-function getAvailableEfforts(agent, model) {
-    if (agent.name === 'claude')
-        return allEfforts;
-    if (agent.name === 'codex')
-        return getCodexEfforts(model);
-    return [];
+async function getAvailableEfforts(agent, model) {
+    return (await agent.getAvailableEfforts?.(model) ?? []);
 }
 function modelDisplayLabel(agent, model) {
     const full = agent.resolveModelId?.(model);
@@ -487,7 +484,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     const isProcessLevelSlash = normalizedContent === '/restart'
         || normalizedContent === '/upgrade'
         || normalizedContent === '/reload'
-        || normalizedContent.startsWith('/reload ');
+        || normalizedContent.startsWith('/reload ')
+        || normalizedContent === '/pair';
     const roleGuard = guardRoleCommand(normalizedContent, activeChatType, isAdmin || (isDaemonOwner && isProcessLevelSlash));
     if (roleGuard)
         return roleGuard;
@@ -635,7 +633,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）');
+            lines.push('', '🛠️ 进程级运维：', '  /restart - 重启服务', '  /upgrade - 检查版本更新', '  /reload [aid] - 热重载 Agent 配置', '  /fa <提示词> - 单次使用宿主级 fullaccess 执行（别名: /fullaccess）', '  /pair - 获取远程控制配对码');
         };
         if (!isAdmin && activeChatType === 'group') {
             const lines = [
@@ -775,6 +773,23 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         ];
         return { kind: 'command.result', text: lines.join('\n') };
     }
+    // /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.
+    if (normalizedContent === '/pair') {
+        if (!isDaemonOwner) {
+            return {
+                kind: 'command.error',
+                text: '❌ /pair 仅限 daemon-owner 使用；请向 daemon 控制 AID 发送 /pair。',
+            };
+        }
+        const pair = remoteAccessService.getPairingCode(userId);
+        const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
+        return {
+            kind: 'command.result',
+            text: `远程控制配对码：${pair.code}（约 ${mins} 分钟内有效）\n可用于 ECWeb 登录或远程 Menu 客户端授权`,
+        };
+    }
     // /evolhelp 命令：返回 JSON 格式的命令列表（供程序解析）
     if (normalizedContent === '/evolhelp') {
         const cmds = [];
@@ -835,6 +850,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             cmds.push({ command: '/restart', description: '重启服务', category: '运维', roles: ['daemon-owner'] });
             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'] });
         }
         if (!isDaemonOwner && isAdmin) {
             cmds.push({ command: '/reload', description: '热重载当前 Agent 配置', category: '运维', roles: ['admin', 'owner'] });
@@ -1048,11 +1064,12 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             const activeBaseagent = owningAgent?.baseagent || this.parseDefaultBaseagent();
             // 尝试发送 CommandCard 卡片
             if (this.interactionRouter && available.length > 1) {
+                const baseagentSession = await getExistingSessionForCommand();
                 const interaction = {
                     type: 'interaction',
                     id: `agent-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`,
                     channelId,
-                    sessionId: activeSession?.id || `agent-${Date.now()}`,
+                    sessionId: baseagentSession?.id || `agent-${Date.now()}`,
                     initiatorId: userId,
                     kind: {
                         kind: 'command-card',
@@ -1065,7 +1082,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         })),
                     },
                 };
-                const replyCtx = activeSession ? this.getReplyContext(activeSession) : undefined;
+                const replyCtx = baseagentSession ? this.getReplyContext(baseagentSession) : replyContext;
                 const cardResult = await this.sendCommandCard({ channel, channelId, interaction, replyCtx, canWrite: isOwner });
                 if (cardResult === null)
                     return null;
@@ -1085,29 +1102,79 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!owningAgent) {
             return { kind: 'command.error', text: '❌ 当前 channel 无绑定 agent，无法设置 active_baseagent' };
         }
-        await interruptPausedSessionBeforeReplacement(await getExistingSessionForCommand());
-        const previousDefaultBaseagent = owningAgent.baseagent || this.parseDefaultBaseagent();
+        const currentSession = await getExistingSessionForCommand();
+        const previousBaseagent = owningAgent.baseagent || this.parseDefaultBaseagent();
+        if (currentSession?.threadId) {
+            const rotation = await withIdleTopicBackend(currentSession.id, currentSession.threadId, async (current) => {
+                try {
+                    owningAgent.setActiveBaseagent(args);
+                }
+                catch (error) {
+                    return { ok: false, error: error instanceof Error ? error.message : String(error) };
+                }
+                try {
+                    const result = await this.sessionManager.rotateTopicBackend({
+                        sessionId: current.id,
+                        expectedThreadId: current.threadId,
+                        baseagent: args,
+                    });
+                    return { ok: true, result };
+                }
+                catch (error) {
+                    try {
+                        owningAgent.setActiveBaseagent(previousBaseagent);
+                    }
+                    catch { }
+                    return { ok: false, error: error instanceof Error ? error.message : String(error) };
+                }
+            }, currentSession);
+            if (!rotation.ok) {
+                if (rotation.reason === 'busy')
+                    return { kind: 'command.error', text: '⚠️ 当前话题会话忙碌，无法切换 baseagent，请稍后再试' };
+                if (rotation.reason === 'unknown')
+                    return { kind: 'command.error', text: '⚠️ 当前话题会话状态未知，无法安全切换 baseagent，请稍后再试' };
+                return { kind: 'command.error', text: `❌ baseagent 切换失败：${rotation.reason === 'missing' ? '当前话题会话不存在' : '状态未知'}` };
+            }
+            if (!rotation.value.ok)
+                return { kind: 'command.error', text: `❌ baseagent 切换失败：${rotation.value.error}` };
+            this.eventBus.publish({ type: 'agent:baseagent-changed', aid: owningAgent.aid, baseagent: args, previousBaseagent, scope: 'agent', timestamp: Date.now() });
+            return {
+                kind: 'system.notice',
+                text: `✓ 当前话题已切换 Baseagent: ${previousBaseagent} → ${args}\n  话题会话 ID 保持不变: ${currentSession.id}`,
+                subtype: 'session.created',
+            };
+        }
+        await interruptPausedSessionBeforeReplacement(currentSession);
         try {
             owningAgent.setActiveBaseagent(args);
         }
         catch (error) {
             return { kind: 'command.error', text: `❌ ${error instanceof Error ? error.message : String(error)}` };
         }
-        this.eventBus.publish({
-            type: 'agent:baseagent-changed',
-            aid: owningAgent.aid,
-            baseagent: args,
-            previousBaseagent: previousDefaultBaseagent,
-            scope: 'agent',
-            timestamp: Date.now(),
-        });
-        const projectName = this.getProjectName(owningAgent.projectPath);
-        const agentSwitchResponse = [
-            `✓ 已设置 Baseagent: ${args}`,
-            `  Agent: ${owningAgent.name}`,
-            `  项目: ${projectName}`,
-        ].join('\n');
-        return { kind: 'command.result', text: agentSwitchResponse };
+        let newSession;
+        try {
+            newSession = await this.sessionManager.createNewSession(channel, channelId, owningAgent.projectPath, undefined, args, currentSession?.metadata, { previousBaseagent, baseagentChanged: previousBaseagent !== args });
+        }
+        catch (error) {
+            try {
+                owningAgent.setActiveBaseagent(previousBaseagent);
+            }
+            catch { }
+            return { kind: 'command.error', text: `❌ 创建新会话失败：${error instanceof Error ? error.message : String(error)}` };
+        }
+        if (currentSession) {
+            const previousAgent = getActiveAgentIfAvailable();
+            if (previousAgent) {
+                await previousAgent.clearSession(currentSession.id, currentSession.agentSessionId || '', currentSession.projectPath);
+                await previousAgent.closeSession(currentSession.id);
+            }
+        }
+        this.eventBus.publish({ type: 'agent:baseagent-changed', aid: owningAgent.aid, baseagent: args, previousBaseagent, scope: 'agent', timestamp: Date.now() });
+        return {
+            kind: 'system.notice',
+            text: `✓ 已切换 Baseagent: ${previousBaseagent} → ${args}\n  已创建新的主会话: ${newSession.id}\n  之前的对话历史已保留，可通过 /s 查看`,
+            subtype: 'session.created',
+        };
     }
     // /model 命令：查看或切换模型/推理强度
     if (normalizedContent.startsWith('/model')) {
@@ -1260,12 +1327,14 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             catch { }
             const configuredModel = modelConfig.model;
             const configuredEffort = modelConfig.effort;
-            const rawModels = hasModelSwitcher(modelAgent) ? await modelAgent.listModels() : [];
+            const catalog = await getCatalog(modelSelector.self, fallbackBaseagent);
+            assertCatalogSelectable(catalog);
+            const rawModels = catalog.models.map(m => m.id);
             const models = hasModelSwitcher(modelAgent)
-                ? filterModelsForRole(identity.role, fallbackBaseagent, rawModels, modelAgent.resolveModelId?.bind(modelAgent))
+                ? filterModelsForRole(identity.role, fallbackBaseagent, rawModels, model => resolveCatalogModel(catalog, model), modelSelector.self)
                 : rawModels;
             const currentModel = hasModelSwitcher(modelAgent) ? (configuredModel || modelAgent.getModel()) : modelAgent.name;
-            const efforts = getAvailableEfforts(modelAgent, currentModel);
+            const efforts = await getAvailableEfforts(modelAgent, currentModel);
             const currentEffort = configuredEffort ?? modelAgent.getEffort?.() ?? 'auto';
             const canReadModelList = await canReadSlashModelList({
                 subject: authSubject,
@@ -1290,7 +1359,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         kind: 'command-card',
                         title: '🤖 切换模型',
                         buttons: models.map((m) => {
-                            const display = modelDisplayLabel(modelAgent, m);
+                            const display = modelDisplayLabel(modelAgent, m) + (catalog.models.find(e => e.id === m)?.verification === 'unverified' ? ' [unverified]' : '');
                             return {
                                 label: modelMatches(modelAgent, m, currentModel) ? `✓ ${display}` : display,
                                 command: `/model ${m}`,
@@ -1300,13 +1369,14 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         }),
                     },
                 };
-                const replyCtx = modelSession ? this.getReplyContext(modelSession) : undefined;
+                const replyCtx = modelSession ? this.getReplyContext(modelSession) : replyContext;
                 const cardResult = await this.sendCommandCard({ channel, channelId, interaction, replyCtx, canWrite: isAdmin });
                 if (cardResult === null)
                     return null;
                 return { kind: 'command.result', text: cardResult };
             }
             // 降级：文本
+            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 调整)`
@@ -1322,8 +1392,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 const usage = !args && isAdmin ? '\n\n用法: /model <模型>' : '';
                 return {
                     kind: 'command.result',
-                    text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}\n\n可用模型：\n${modelList}${usage}`,
-                    ...(args === 'list' ? { structured: { ok: true, model: currentModel, effort: currentEffort, baseagent: fallbackBaseagent, models } } : {}),
+                    text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}${rawModels.includes(currentModel) ? '' : ' [当前配置，未列入目录]'}\n${catalogHint}\n\n可用模型：\n${modelList}${usage}`,
+                    ...(args === 'list' ? { structured: { ok: true, model: currentModel, effort: currentEffort, baseagent: fallbackBaseagent, models, revision: catalog.revision, source: catalog.source, freshness: catalog.freshness, diagnostics: catalog.diagnostics } } : {}),
                 };
             }
             return { kind: 'command.result', text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}` };
@@ -1384,7 +1454,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         catch { }
         const models = hasModelSwitcher(modelAgent) ? await modelAgent.listModels() : [];
         const allowedModels = hasModelSwitcher(modelAgent)
-            ? filterModelsForRole(identity.role, fallbackBaseagent, models, modelAgent.resolveModelId?.bind(modelAgent))
+            ? filterModelsForRole(identity.role, fallbackBaseagent, models, modelAgent.resolveModelId?.bind(modelAgent), selfAID ?? this.resolveSelfAID(channel))
             : models;
         const parts = args.split(/\s+/);
         let newModel;
@@ -1392,7 +1462,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (parts.length === 1) {
             const arg = parts[0];
             const currentModel = hasModelSwitcher(modelAgent) ? (configuredModel || modelAgent.getModel()) : modelAgent.name;
-            const efforts = getAvailableEfforts(modelAgent, currentModel);
+            const efforts = await getAvailableEfforts(modelAgent, currentModel);
             // effort 相关参数统一转发到 /effort
             if (efforts.includes(arg) || arg === 'auto') {
                 const delegated = await this.handle(`/effort ${arg}`, channel, channelId, undefined, userId, threadId);
@@ -1425,7 +1495,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             if (!models.includes(modelArg)) {
                 return { kind: 'command.error', text: `❌ 无效的模型ID: ${modelArgRaw}` };
             }
-            const targetEfforts = getAvailableEfforts(modelAgent, modelArg);
+            const targetEfforts = await getAvailableEfforts(modelAgent, modelArg);
             if (targetEfforts.length === 0) {
                 return { kind: 'command.error', text: `⚠️ ${modelArg} 不支持推理强度设置` };
             }
@@ -1583,7 +1653,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             const configuredModel = modelConfig.model;
             const configuredEffort = modelConfig.effort;
             const currentModel = hasModelSwitcher(effortAgent) ? (configuredModel || effortAgent.getModel()) : effortAgent.name;
-            const efforts = getAvailableEfforts(effortAgent, currentModel);
+            const efforts = await getAvailableEfforts(effortAgent, currentModel);
             const currentEffort = configuredEffort ?? effortAgent.getEffort?.() ?? 'auto';
             if (efforts.length === 0) {
                 return { kind: 'command.error', text: '⚠️ 当前模型不支持推理强度设置' };
@@ -1608,7 +1678,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         })),
                     },
                 };
-                const replyCtx = effortSession ? this.getReplyContext(effortSession) : undefined;
+                const replyCtx = effortSession ? this.getReplyContext(effortSession) : replyContext;
                 const cardResult = await this.sendCommandCard({ channel, channelId, interaction, replyCtx, canWrite: isAdmin });
                 if (cardResult === null)
                     return null;
@@ -1645,7 +1715,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const configuredModel = modelConfig.model;
         const configuredEffort = modelConfig.effort;
         const currentModel = hasModelSwitcher(effortAgent) ? (configuredModel || effortAgent.getModel()) : effortAgent.name;
-        const efforts = getAvailableEfforts(effortAgent, currentModel);
+        const efforts = await getAvailableEfforts(effortAgent, currentModel);
         const currentEffort = configuredEffort ?? effortAgent.getEffort?.() ?? 'auto';
         if (efforts.length === 0) {
             return { kind: 'command.error', text: '⚠️ 当前模型不支持推理强度设置' };
@@ -1861,7 +1931,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                         })),
                     },
                 };
-                const replyCtx = replyContext ?? (activitySession ? this.getReplyContext(activitySession) : undefined);
+                // A topic session's persisted route is authoritative; an inbound
+                // replyContext may be a stale/main-session snapshot (notably for card
+                // callbacks), so prefer the resolved session context whenever present.
+                const replyCtx = activitySession ? this.getReplyContext(activitySession) : replyContext;
                 const cardResult = await this.sendCommandCard({ channel, channelId, interaction, replyCtx, canWrite: isOwner });
                 if (cardResult === null)
                     return null;
@@ -1929,7 +2002,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     })),
                 },
             };
-            const replyCtx = existingChatmodeSession ? this.getReplyContext(existingChatmodeSession) : undefined;
+            const replyCtx = existingChatmodeSession ? this.getReplyContext(existingChatmodeSession) : replyContext;
             const cardResult = await this.sendCommandCard({
                 channel,
                 channelId,
@@ -2235,7 +2308,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             }
             return {
                 kind: 'system.notice',
-                text: `✅ backend 已切换${outcome.wasBound ? '' : '（当前未绑定 backend）'}；下一条消息将初始化新 backend（阶段一不携带历史摘要）`,
+                text: '已切换到新会话。下一条消息将在新会话中处理。',
                 subtype: 'session.renewed',
             };
         }
@@ -2272,7 +2345,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             // The runner instance's model is only the final fallback; without this
             // override Claude's /compact command could resume with a stale agent
             // default (for example glm-5.3) while the turn itself used gpt-5.6-sol.
-            const compactBaseagentRaw = session.baseagent || currentSessionAgent.name;
+            const compactBaseagentRaw = session.baseagent;
+            if (!compactBaseagentRaw) {
+                return { kind: 'command.error', text: '❌ 当前会话缺少 baseagent 绑定，拒绝隐式切换' };
+            }
             const compactBaseagentNormalized = normalizeBaseagent(compactBaseagentRaw);
             const compactBaseagent = compactBaseagentNormalized.canonical === 'unknown'
                 ? compactBaseagentRaw
@@ -2502,6 +2578,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (session && previousAgent) {
             // Reset agent backend state so the new
             // session starts with a fresh conversation history
+            // Clearing is a pure backend lifecycle operation; model selection is
+            // resolved only when the new session performs its next turn.
             await previousAgent.clearSession(session.id, session.agentSessionId || '', session.projectPath);
             await previousAgent.closeSession(session.id);
         }
@@ -2590,7 +2668,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 groups.set(type, []);
             groups.get(type).push({ name, status });
         }
-        if (!isAdmin && !isDaemonOwner) {
+        // ECWeb 的系统控制面需要结构化健康数据（尤其是 daemon.aun.connected）。
+        // 这里不能把全局 system 通道降级成仅文本摘要，否则前端会因缺少
+        // daemonStatusProvider 返回值而把已连接的控制 AID 显示为 disconnect。
+        if (!isAdmin && !isDaemonOwner && !isGlobalCheckChannel) {
             // visitor/member: 仅显示实例通道摘要
             const total = [...groups.values()].flat().length;
             const healthy = [...groups.values()].flat().filter(i => i.status.includes('✓')).length;
@@ -2743,6 +2824,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         // 进程级操作：必须是 daemon owner（daemon.json.owners），与 menu 协议 /system restart 一致。
         // agent-channel 的 owner/admin 角色不足以重启整个 daemon。
         const restartSelfAid = this.agentRegistry?.resolveByChannel(channel)?.aid;
+        const commandSession = await getExistingSessionForCommand();
         const authDenied = await authorizeIntent({
             intent: {
                 operation: 'system.restart',
@@ -2752,7 +2834,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 dangerous: true,
             },
             identity,
-            session: activeSession,
+            session: commandSession ?? activeSession,
             channel,
             channelId,
             userId,
@@ -2764,7 +2846,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const selfAid = this.agentRegistry?.resolveByChannel(channel)?.aid;
         // 排除当前会话（如果存在）。如果 activeSession 不存在，说明还没建立会话，
         // 此时检查所有任务；如果有其他会话在处理，仍然阻塞重启。
-        const excludeKey = activeSession?.id;
+        // A topic command owns its topic session even when the channel's active
+        // session remains the main conversation.  Exclude that exact queue key
+        // from the busy check so the current topic cannot block its own restart.
+        const excludeKey = commandSession?.id ?? activeSession?.id;
         const busyInfo = getAgentBusyInfo(this, selfAid, excludeKey);
         if (busyInfo && busyInfo.count > 0) {
             // busyInfo.count > 0 说明【除当前会话外】还有其他会话的任务在执行
@@ -2789,10 +2874,14 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             const suppressRealRestart = shouldSuppressRealRestart();
             let restartReplyContext = replyContext;
             try {
-                if (!restartReplyContext?.delivery && threadId) {
+                // A topic's persisted session context is authoritative for card
+                // callbacks and for inbound messages that only carry a partial route.
+                // Do not let a stale/main-session replyContext win merely because it
+                // happens to contain a delivery target.
+                if (threadId) {
                     const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
                     if (threadSession)
-                        restartReplyContext = this.getReplyContext(threadSession);
+                        restartReplyContext = { ...(replyContext ?? {}), ...(this.getReplyContext(threadSession) ?? {}), threadId };
                 }
                 else if (!restartReplyContext?.delivery && activeSession) {
                     restartReplyContext = this.getReplyContext(activeSession);
@@ -2834,16 +2923,39 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 channel,
                 channelId,
                 timestamp: Date.now(),
+                ...(restartReplyContext?.threadId ? { threadId: restartReplyContext.threadId } : {}),
                 ...(restartReplyContext?.delivery ? { delivery: restartReplyContext.delivery } : {}),
                 ...(restartReplyContext?.replyToMessageId ? { rootId: restartReplyContext.replyToMessageId } : {}),
             };
             if (!suppressRealRestart) {
+                // 这条路径上 daemon 会在下面 kill 掉自己，所以必须先确认 monitor 真的活起来：
+                // 只查文件存在不够 —— 开发仓下 monitor 走 tsx，源码语法错误会让它加载即退出；
+                // 安装包下 monitor 先复制到 stage 再启动，避免升级替换掉自己脚下的文件。
+                const monitorEntry = resolveMonitorLaunch(getPackageRoot(), path.join(resolvePaths().root, 'data', 'monitor-stage'));
+                if (monitorEntry.note)
+                    logger.info(`[System] ${monitorEntry.note}`);
+                if (!fs.existsSync(monitorEntry.entry)) {
+                    logger.error(`[System] Refusing restart: restart-monitor entry not found: ${monitorEntry.entry}`);
+                    return { code: 'RESTART_ENTRY_MISSING', entry: monitorEntry.entry };
+                }
                 const controlDir = daemonControlDir();
                 fs.mkdirSync(controlDir, { recursive: true });
                 fs.writeFileSync(path.join(controlDir, 'restart-pending.json'), JSON.stringify(restartInfo));
-                spawnDetachedNode([path.join(getPackageRoot(), 'dist', 'cli', 'index.js'), 'restart-monitor'], {
-                    EVOLCORE_HOME: resolvePaths().root,
-                });
+                const confirmation = await launchMonitorAndConfirm([...monitorEntry.args, 'restart-monitor'], { EVOLCORE_HOME: resolvePaths().root, ...monitorEntry.env }, pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid === pid), pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid !== pid));
+                if (!confirmation.ok) {
+                    // 没有看门狗就不要停服务：撤掉回执文件，让本进程继续跑。
+                    if (monitorEntry.stageDir)
+                        cleanupMonitorStage(monitorEntry.stageDir);
+                    try {
+                        fs.rmSync(path.join(controlDir, 'restart-pending.json'), { force: true });
+                    }
+                    catch { }
+                    logger.error(`[System] Refusing restart: restart-monitor did not come up (${confirmation.reason})`);
+                    for (const line of (confirmation.stderrTail ?? '').split(/\r?\n/).filter(Boolean).slice(-8)) {
+                        logger.error(`[System]   | ${line}`);
+                    }
+                    return { code: 'RESTART_MONITOR_DEAD', reason: confirmation.reason ?? 'unknown' };
+                }
             }
             else {
                 logger.info('[System] Suppressed real restart in test runtime');
@@ -2874,15 +2986,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                     logger.error('[System] Failed to send restart notification:', err);
                 }
             }
-            // 发 SIGTERM 而非直接 process.exit(0)，让 index.ts 的 shutdown() 先
-            // 正常关闭所有 channel（包括 Feishu WebSocket close frame），
-            // 避免 Feishu 服务端因连接异常断开而重推未 ack 的消息给新进程。
-            if (!suppressRealRestart) {
-                setTimeout(() => {
-                    logger.info('[System] Restarting by user command...');
-                    process.kill(process.pid, 'SIGTERM');
-                }, 1000);
-            }
+            // restart-monitor owns the old daemon shutdown and the replacement
+            // startup. Do not kill this process here: the monitor may have exited
+            // after a read-only migration check, in which case the current service
+            // must remain available.
             return true;
         };
         // 文本确认流程
@@ -2911,7 +3018,21 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (typeof restarted === 'object' && restarted.code === 'DATA_MIGRATION_REQUIRED') {
             return {
                 kind: 'command.error',
-                text: `❌ 待处理的用户数据迁移（${restarted.operationCount} 项）阻止重启。请先运行 ec data migrate --dry-run，然后运行 ec data migrate --apply。`,
+                text: `❌ 待处理的用户数据迁移（${restarted.operationCount} 项）阻止重启；本次仅检查，未停止当前服务。请先运行 ec data migrate --dry-run，然后运行 ec data migrate --apply。`,
+                reason: restarted.code,
+            };
+        }
+        if (typeof restarted === 'object' && restarted.code === 'RESTART_ENTRY_MISSING') {
+            return {
+                kind: 'command.error',
+                text: `❌ 重启已中止：找不到 restart-monitor 入口 ${restarted.entry}。服务未重启，当前进程继续运行。请先执行 npm run build 重建产物。`,
+                reason: restarted.code,
+            };
+        }
+        if (typeof restarted === 'object' && restarted.code === 'RESTART_MONITOR_DEAD') {
+            return {
+                kind: 'command.error',
+                text: `❌ 重启已中止：看门狗进程未能启动（${restarted.reason}）。服务未停止，仍在运行当前版本。开发仓下这通常是源码语法错误导致 tsx 无法加载，请执行 npx tsc --noEmit 检查。`,
                 reason: restarted.code,
             };
         }
@@ -3079,11 +3200,11 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 ? { delivery: { chatType: 'private' } }
                 : sendSession
                     ? this.getReplyContext(sendSession)
-                    : chatType === 'group'
+                    : replyContext ?? (chatType === 'group'
                         ? { delivery: { chatType: 'group', groupId: channelId } }
                         : chatType === 'private'
                             ? { delivery: { chatType: 'private' } }
-                            : undefined;
+                            : undefined);
             await targetAdapter.send(buildEnvelope({ channel: targetAdapter.channelName, channelId: targetChannelId, replyContext: replyCtx }), { kind: 'result.file', filePath: realPath });
             const sizeStr = stat.size < 1024 ? `${stat.size} B`
                 : stat.size < 1024 * 1024 ? `${(stat.size / 1024).toFixed(1)} KB`
@@ -3309,7 +3430,12 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 projectPaths.unshift(session.projectPath);
             }
             for (const projectPath of projectPaths) {
-                const currentBaseagent = session?.baseagent || this.primaryRunnerKey;
+                const currentBaseagent = session?.baseagent
+                    ?? this.agentRegistry?.resolveByChannel(channel)?.baseagent
+                    ?? (this.agentMap?.size === 1 ? this.parseDefaultBaseagent() : undefined);
+                if (!currentBaseagent) {
+                    return { kind: 'command.error', text: '❌ 无法确定当前会话的 baseagent，拒绝导入 CLI 会话' };
+                }
                 const cliSessions = currentBaseagent === 'ecagent'
                     ? await this.sessionManager.listImportableCliSessions(projectPath, currentBaseagent, selfAID ?? session?.selfAID)
                     : await this.sessionManager.listImportableCliSessions(projectPath, currentBaseagent);
@@ -3484,7 +3610,10 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const session = await getExistingSessionForCommand();
         if (!session)
             return { kind: 'command.error', text: '❌ 当前没有活跃会话' };
-        const rewindBaseagent = session.baseagent ?? session.agentId;
+        const rewindBaseagent = session.baseagent;
+        if (!rewindBaseagent) {
+            return { kind: 'command.error', text: '❌ 当前会话缺少 baseagent 绑定，拒绝隐式切换' };
+        }
         const rewindAgent = this.getAgent(channel, rewindBaseagent);
         if (!session.agentSessionId) {
             return { kind: 'command.error', text: '❌ 当前会话无历史记录\n\n请先发送一条消息，然后再使用 /rewind' };

package/dist/core/data-migration.js

@@ -752,21 +752,11 @@ export function planDataMigration(root) {
         }
     }
     catch { }
-    const legacyOutbox = path.join(root, 'data', 'outbox');
-    try {
-        for (const entry of fs.readdirSync(legacyOutbox, { withFileTypes: true })) {
-            if (!entry.isFile() || !entry.name.endsWith('.jsonl'))
-                continue;
-            const aid = entry.name.slice(0, -'.jsonl'.length);
-            if (!aids.has(aid)) {
-                warnings.push(`Unresolved outbox owner retained: ${entry.name}`);
-                continue;
-            }
-            const operationId = nextId('outbox');
-            addCopy(operations, operationId, path.join(legacyOutbox, entry.name), path.join(root, 'agents', aid, 'data', 'outbox.jsonl'), stageFor(operationId));
-        }
-    }
-    catch { }
+    // Outbox layouts are imported lazily by src/aun/outbox.ts when a queue is
+    // first read or written. They are append-only delivery state, so including
+    // them in the maintenance migration would unnecessarily block startup and
+    // could race a live connector. Keep the explicit migration reserved for
+    // data that needs operator review or an exclusive maintenance window.
     const contactAudit = path.join(root, 'data', 'contact-book-audit.jsonl');
     // The legacy audit file may be provisioned as an empty placeholder (for
     // example by a protected-path sandbox). An empty source has nothing to

package/dist/core/event-catalog.js

@@ -89,6 +89,9 @@ const CATALOG = [
             { path: 'name', type: 'string', optional: true },
             { path: 'chatType', type: 'string', optional: true },
             { path: 'threadId', type: 'string', optional: true },
+            { path: 'baseagent', type: 'string', optional: true },
+            { path: 'previousBaseagent', type: 'string', optional: true },
+            { path: 'baseagentChanged', type: 'boolean', optional: true },
             { path: 'cause', type: 'string', optional: true },
             { path: 'sourceSessionId', type: 'string', optional: true },
             { path: 'renewSource', type: 'string', optional: true },

package/dist/core/handoff/runtime.js

@@ -118,6 +118,7 @@ export class HandoffRuntime {
                 targetSessionId: target.id,
                 payload: input.payload,
                 encrypt: input.encrypt,
+                contextOnly: input.contextOnly,
                 delivery: targetChatType === 'group'
                     ? { chatType: 'group', groupId: input.to }
                     : { chatType: 'private' },
@@ -131,7 +132,8 @@ export class HandoffRuntime {
             status: 'started',
             refs: { handoffId: handoff.handoff_id, sessionId: origin.id, messageId: input.originMessageId },
         });
-        await this.dispatcher.drain(input.selfAid, target.id);
+        if (!input.contextOnly)
+            await this.dispatcher.drain(input.selfAid, target.id);
         const dispatched = this.store.get(input.selfAid, handoff.handoff_id) ?? handoff;
         const replacedSessionId = [origin.id, target.id].find(sessionId => ((this.sessionDiscardSequence.get(this.sessionKey(input.selfAid, sessionId)) ?? 0) > operationSequence));
         if (dispatched.state === 'discarded' || replacedSessionId) {