evolclaw 2.2.0 → 2.4.0

package/dist/core/command-handler.js

@@ -1,15 +1,34 @@
 import { hasModelSwitcher, hasPermissionController } from '../agents/claude-runner.js';
 import { saveConfig, resolvePaths, getPackageRoot, getOwner } from '../config.js';
 import { logger } from '../utils/logger.js';
+import crypto from 'crypto';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
-const availableEfforts = ['low', 'medium', 'high', 'max'];
-function effortBar(level) {
-    const levels = {
-        low: '◆◇◇◇', medium: '◆◆◇◇', high: '◆◆◆◇', max: '◆◆◆◆'
-    };
-    return levels[level] || '◆◆◇◇';
+const allEfforts = ['low', 'medium', 'high', 'max'];
+const nonMaxEfforts = allEfforts.filter(e => e !== 'max');
+function getAvailableEfforts(agent, model) {
+    if (agent.name === 'claude') {
+        if (model.includes('opus'))
+            return allEfforts;
+        return nonMaxEfforts;
+    }
+    if (agent.name === 'codex') {
+        return nonMaxEfforts;
+    }
+    return [];
+}
+function formatModelUsage(agent, model) {
+    const efforts = getAvailableEfforts(agent, model);
+    const lines = [
+        '用法:',
+        '  /model <model>           切换模型',
+    ];
+    if (efforts.length > 0) {
+        lines.push('  /model <model> <effort>  切换模型+推理强度');
+        lines.push('  /effort [level]          查看或切换推理强度');
+    }
+    return lines.join('\n');
 }
 /**
  * 写入用户级 ~/.claude/settings.json（与 Claude CLI 行为一致）
@@ -84,7 +103,7 @@ function formatIdleTime(ms) {
     return '刚刚';
 }
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/send', '/check'];
+const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/send', '/check'];
 // 命令别名映射
 const aliases = {
     '/p': '/project',
@@ -92,7 +111,7 @@ const aliases = {
     '/name': '/rename'
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/send', '/check', '/p ', '/s ', '/name '];
+const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/send', '/check', '/p ', '/s ', '/name '];
 export class CommandHandler {
     sessionManager;
     config;
@@ -101,9 +120,11 @@ export class CommandHandler {
     adapters = new Map();
     policies = new Map();
     channelObjects = new Map(); // name → actual channel instance (for /check)
+    channelTypeMap = new Map(); // name → channelType (for grouping)
     processor;
     messageQueue;
     permissionGateway;
+    interactionRouter;
     statsCollector;
     agentMap;
     defaultAgentId;
@@ -145,12 +166,16 @@ export class CommandHandler {
         const d = Math.floor(sec / 86400);
         const h = Math.floor((sec % 86400) / 3600);
         const m = Math.floor((sec % 3600) / 60);
+        const s = sec % 60;
         const parts = [];
         if (d > 0)
             parts.push(`${d}天`);
         if (h > 0)
             parts.push(`${h}时`);
-        parts.push(`${m}分`);
+        if (m > 0)
+            parts.push(`${m}分`);
+        if (parts.length === 0)
+            parts.push(`${s}秒`);
         return parts.join('');
     }
     /** 获取消息队列 key：话题用 session.id，主会话用 channel-channelId */
@@ -162,6 +187,69 @@ export class CommandHandler {
     getReplyContext(session) {
         return session.metadata?.replyContext;
     }
+    /**
+     * 尝试通过渠道适配器发送交互卡片。
+     * 返回 message_id 表示卡片已发送，false 表示降级为文本。
+     */
+    async trySendInteraction(channel, channelId, interaction, replyContext) {
+        const adapter = this.adapters.get(channel);
+        if (!adapter?.sendInteraction)
+            return false;
+        try {
+            return await adapter.sendInteraction(channelId, interaction, replyContext);
+        }
+        catch (e) {
+            logger.warn(`[CommandHandler] sendInteraction failed: ${e}`);
+            return false;
+        }
+    }
+    /** 作废某 session 下所有 pending 交互卡片（PATCH 禁用 + cancel） */
+    async invalidateOldCards(channel, sessionId) {
+        if (!this.interactionRouter)
+            return;
+        const adapter = this.adapters.get(channel);
+        const pending = this.interactionRouter.getPending(sessionId);
+        if (pending.length === 0)
+            return;
+        const disabledCard = {
+            config: { wide_screen_mode: true },
+            header: { template: 'grey', title: { tag: 'plain_text', content: '已过期' } },
+            elements: [{ tag: 'markdown', content: '此卡片已过期，请查看最新卡片。' }],
+        };
+        for (const id of pending) {
+            const msgId = this.interactionRouter.getMessageId(id);
+            if (msgId && adapter?.patchInteractionCard) {
+                adapter.patchInteractionCard(msgId, disabledCard).catch(() => { });
+            }
+            this.interactionRouter.cancel(id);
+        }
+    }
+    /**
+     * 发送交互卡片并注册回调。作废旧卡片 → 发送新卡片 → 注册到 interactionRouter。
+     * 返回 true 表示卡片已发送（调用方应 return null），false 表示降级到文本。
+     */
+    async sendInteractionCard(opts) {
+        if (!this.interactionRouter)
+            return false;
+        await this.invalidateOldCards(opts.channel, opts.sessionId);
+        const messageId = await this.trySendInteraction(opts.channel, opts.channelId, opts.interaction, opts.replyCtx);
+        if (!messageId)
+            return false;
+        const wrappedCallback = async (action, values, operatorId) => {
+            await opts.callback(action, values, operatorId);
+            const adapter = this.adapters.get(opts.channel);
+            if (adapter?.patchInteractionCard) {
+                const disabledCard = {
+                    config: { wide_screen_mode: true },
+                    header: { template: 'grey', title: { tag: 'plain_text', content: '已过期' } },
+                    elements: [{ tag: 'markdown', content: '此卡片已过期，请查看最新卡片。' }],
+                };
+                adapter.patchInteractionCard(messageId, disabledCard).catch(() => { });
+            }
+        };
+        this.interactionRouter.register(opts.requestId, opts.sessionId, wrappedCallback, { timeoutMs: 120_000, messageId });
+        return true;
+    }
     /** 获取活跃会话，无会话时返回统一错误提示 */
     async ensureSession(channel, channelId, threadId) {
         if (threadId) {
@@ -187,20 +275,37 @@ export class CommandHandler {
     setPermissionGateway(gateway) {
         this.permissionGateway = gateway;
     }
+    setInteractionRouter(router) {
+        this.interactionRouter = router;
+    }
     setStatsCollector(collector) {
         this.statsCollector = collector;
     }
     registerAdapter(adapter) {
-        this.adapters.set(adapter.name, adapter);
+        this.adapters.set(adapter.channelName, adapter);
     }
-    registerChannel(name, channel) {
+    registerChannel(name, channel, channelType) {
         this.channelObjects.set(name, channel);
+        if (channelType)
+            this.channelTypeMap.set(name, channelType);
+    }
+    /** 将实例名解析为渠道类型（用于 session 查询） */
+    resolveChannelType(channelName) {
+        return this.channelTypeMap.get(channelName) || channelName;
     }
     registerPolicy(channelName, policy) {
         this.policies.set(channelName, policy);
     }
     getAdapter(channelName) {
-        return this.adapters.get(channelName);
+        // 先按实例名查找，再按 channelType 查找
+        let adapter = this.adapters.get(channelName);
+        if (adapter)
+            return adapter;
+        for (const [name, a] of this.adapters) {
+            if ((this.channelTypeMap.get(name) || name) === channelName)
+                return a;
+        }
+        return undefined;
     }
     getPolicy(channel) {
         return this.policies.get(channel) || {
@@ -219,15 +324,25 @@ export class CommandHandler {
      * 返回结构化命令菜单（供 menu.query 使用）
      * admin 看到全部命令分组，guest 仅看到用户级命令
      */
-    getMenuItems(isAdmin) {
+    getMenuItems(isAdmin, chatType = 'private') {
         const items = [];
+        if (!isAdmin && chatType === 'group') {
+            return [
+                {
+                    group: '其他',
+                    commands: [
+                        { cmd: '/status', label: '显示会话状态' },
+                        { cmd: '/help', label: '显示帮助信息' },
+                    ]
+                }
+            ];
+        }
         if (isAdmin) {
             items.push({
                 group: '项目管理',
                 commands: [
                     { cmd: '/pwd', label: '显示当前项目路径' },
-                    { cmd: '/plist', label: '列出所有配置的项目' },
-                    { cmd: '/p', args: '<name|path>', label: '切换项目' },
+                    { cmd: '/p', args: '[name|path]', label: '列出或切换项目' },
                     { cmd: '/bind', args: '<path>', label: '绑定新项目目录' },
                 ]
             });
@@ -235,14 +350,12 @@ export class CommandHandler {
         items.push({
             group: '会话管理',
             commands: [
-                { cmd: '/new', args: '[name]', label: '创建新会话' },
-                { cmd: '/slist', label: '列出当前项目的所有会话' },
-                { cmd: '/s', args: '<name|index|uuid>', label: '切换到指定会话' },
+                { cmd: '/new', args: '[name]', label: '创建新会话（清空历史请用此命令）' },
+                { cmd: '/s', args: '[cli|name|index|uuid]', label: '列出或切换会话（cli 查看未导入的 CLI 会话）' },
                 { cmd: '/name', args: '<name>', label: '重命名当前会话' },
                 { cmd: '/del', args: '<name>', label: '删除指定会话' },
                 ...(isAdmin ? [
                     { cmd: '/fork', args: '[name]', label: '分支当前会话' },
-                    { cmd: '/clear', label: '清空会话对话历史' },
                     { cmd: '/compact', label: '压缩会话上下文' },
                 ] : []),
             ]
@@ -252,13 +365,14 @@ export class CommandHandler {
                 group: 'Agent 与模型',
                 commands: [
                     { cmd: '/agent', args: '[name]', label: '查看或切换 Agent 后端' },
-                    { cmd: '/model', args: '[model] [effort]', label: '查看或切换模型' },
+                    { cmd: '/model', args: '[model]', label: '查看或切换模型' },
+                    { cmd: '/effort', args: '[level]', label: '查看或切换推理强度' },
                 ]
             });
             items.push({
                 group: '权限管理',
                 commands: [
-                    { cmd: '/perm', args: '[mode|allow|deny]', label: '权限模式管理' },
+                    { cmd: '/perm', args: '[mode|allow|always|deny]', label: '权限模式管理' },
                 ]
             });
             items.push({
@@ -267,9 +381,7 @@ export class CommandHandler {
                     { cmd: '/status', label: '显示会话状态' },
                     { cmd: '/stop', label: '中断当前任务' },
                     { cmd: '/restart', label: '重启服务' },
-                    { cmd: '/repair', label: '检查并修复会话' },
-                    { cmd: '/safe', label: '进入安全模式' },
-                    { cmd: '/send', args: '[渠道] <path>', label: '发送项目内文件' },
+                    { cmd: '/send', args: '[channel] <path>', label: '发送项目内文件' },
                     { cmd: '/check', args: '[rty <channel>]', label: '检查渠道状态或重连指定渠道' },
                 ]
             });
@@ -300,7 +412,7 @@ export class CommandHandler {
      * 主命令处理入口
      */
     async handle(content, channel, channelId, sendMessage, userId, threadId) {
-        // 解析身份
+        // 解析身份（按实例名）
         const identity = this.sessionManager.resolveIdentity(channel, userId);
         const policy = this.getPolicy(channel);
         // 按当前会话选择 agent 后端
@@ -327,15 +439,19 @@ export class CommandHandler {
         }
         // 权限检查：区分用户级命令和管理级命令
         const isAdmin = identity.role === 'owner';
+        const activeChatType = activeSession?.chatType || 'private';
         if (normalizedContent.startsWith('/')) {
-            const userCommands = ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s '];
+            const guestGroupCommands = ['/status', '/help'];
+            const userCommands = activeChatType === 'group' && !isAdmin
+                ? guestGroupCommands
+                : ['/slist', '/new', '/session', '/rename', '/name', '/status', '/help', '/del', '/s '];
             const isUserCommand = userCommands.some(cmd => normalizedContent === cmd.trimEnd() || normalizedContent.startsWith(cmd));
             if (!isUserCommand && !isAdmin) {
-                return '❌ 无权限：此命令仅限管理员使用';
+                return '❌ 无权限：当前群聊仅支持 /status 和 /help';
             }
         }
         // 空闲检查：某些命令需要等待当前会话空闲
-        const requiresIdle = ['/new', '/clear', '/compact', '/safe', '/repair', '/fork', '/bind'];
+        const requiresIdle = ['/new', '/session', '/clear', '/compact', '/safe', '/repair', '/fork', '/bind', '/project', '/agent'];
         if (requiresIdle.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' '))) {
             if (threadId) {
                 // 话题中：检查话题 session 是否在处理（不创建）
@@ -370,18 +486,27 @@ export class CommandHandler {
         }
         const isCmd = commands.some(cmd => normalizedContent.startsWith(cmd));
         if (!isCmd)
-            return null;
+            return undefined;
         // /help 命令不需要会话
         if (normalizedContent === '/help') {
+            if (!isAdmin && activeChatType === 'group') {
+                const lines = [
+                    '可用命令：',
+                    '',
+                    '其他：',
+                    '  /status - 显示会话状态',
+                    '  /help - 显示此帮助信息',
+                ];
+                return lines.join('\n');
+            }
             if (!isAdmin) {
                 const lines = [
                     '可用命令：',
                     '',
                     '🔄 会话管理：',
-                    '  /new [名称] - 创建新会话（可选命名）',
-                    '  /slist - 列出当前项目的所有会话',
-                    '  /s, /session <名称|序号|uuid> - 切换到指定会话',
-                    '  /name, /rename <新名称> - 重命名当前会话',
+                    '  /new [名称] - 创建新会话（清空历史请用此命令，可选命名）',
+                    '  /s [cli|名称|序号|uuid] - 列出或切换会话（cli 查看未导入的 CLI 会话）',
+                    '  /name <新名称> - 重命名当前会话',
                     '  /del <名称> - 删除指定会话（仅解绑，不删除文件）',
                     '  /status - 显示会话状态',
                     '',
@@ -395,36 +520,32 @@ export class CommandHandler {
                 '',
                 '📁 项目管理：',
                 '  /pwd - 显示当前项目路径',
-                '  /plist - 列出所有配置的项目',
-                '  /p, /project <name|path> - 切换项目',
+                '  /p [name|path] - 列出或切换项目',
                 '  /bind <path> - 绑定新项目目录',
                 '',
                 '🔄 会话管理：',
-                '  /new [名称] - 创建新会话（可选命名）',
-                '  /slist - 列出当前项目的所有会话',
-                '  /s, /session <名称> - 切换到指定会话',
-                '  /name, /rename <新名称> - 重命名当前会话',
+                '  /new [名称] - 创建新会话（清空历史请用此命令，可选命名）',
+                '  /s [cli|名称|序号|uuid] - 列出或切换会话（cli 查看未导入的 CLI 会话）',
+                '  /name <新名称> - 重命名当前会话',
                 '  /del <名称> - 删除指定会话（仅解绑，不删除文件）',
                 '  /fork [名称] - 分支当前会话（从当前对话点创建分支）',
-                '  /clear - 清空当前会话的对话历史',
                 '  /compact - 压缩会话上下文（减少 token 用量）',
                 '',
                 '🤖 Agent 与模型：',
                 '  /agent [name] - 查看或切换 Agent 后端',
-                '  /model [model] [effort] - 查看或切换模型/推理强度',
+                '  /model [model] - 查看或切换模型',
+                '  /effort [level] - 查看或切换推理强度',
                 '',
                 '🔐 权限管理：',
                 '  /perm - 查看当前权限模式',
-                '  /perm <default|request|edit|plan|noask> - 切换权限模式',
-                '  /perm allow|deny - 审批权限请求',
+                '  /perm <auto|bypass|request|edit|plan|noask> - 切换权限模式',
+                '  /perm allow|always|deny - 审批权限请求',
                 '',
                 '🛠️ 运维：',
                 '  /status - 显示会话状态',
                 '  /stop - 中断当前任务',
                 '  /restart - 重启服务',
-                '  /repair - 检查并修复会话',
-                '  /safe - 进入安全模式',
-                '  /send [渠道] <路径> - 发送项目内文件',
+                '  /send [channel] <path> - 发送项目内文件',
                 '',
                 '❓ 帮助：',
                 '  /help - 显示此帮助信息',
@@ -445,21 +566,61 @@ export class CommandHandler {
                 if (!hasPermissionController(permAgent)) {
                     return '❌ 权限控制不可用';
                 }
-                const currentMode = permSession.metadata?.permissionMode || 'default';
+                const defaultPermMode = identity.role === 'owner' ? 'bypass' : 'readonly';
+                const currentMode = permSession.metadata?.permissionMode ?? defaultPermMode;
                 const modes = permAgent.listModes();
+                // 尝试发送交互卡片
+                if (this.interactionRouter) {
+                    const requestId = `perm-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+                    const availableModes = modes.filter(m => m.available);
+                    const interaction = {
+                        type: 'interaction',
+                        id: requestId,
+                        channelId,
+                        sessionId: permSession.id,
+                        kind: {
+                            kind: 'action',
+                            title: '🔐 权限模式',
+                            body: availableModes.map(m => `${m.key === currentMode ? '▶' : '•'} **${m.key}** (${m.nameZh}) - ${m.description}`).join('\n'),
+                            buttons: availableModes.map(m => ({
+                                key: m.key,
+                                label: m.key === currentMode ? `✓ ${m.key}` : m.key,
+                                style: m.key === currentMode ? 'primary' : 'default',
+                            })),
+                        },
+                    };
+                    const replyCtx = this.getReplyContext(permSession);
+                    const cardSent = await this.sendInteractionCard({
+                        channel, channelId, sessionId: permSession.id, requestId, interaction, replyCtx,
+                        callback: async (action, _values, operatorId) => {
+                            if (action !== currentMode) {
+                                if (userId && operatorId && operatorId !== userId)
+                                    return;
+                                const result = await this.handle(`/perm ${action}`, channel, channelId, undefined, userId, threadId);
+                                if (result) {
+                                    const adapter = this.adapters.get(channel);
+                                    adapter?.sendText(channelId, result, replyCtx);
+                                }
+                            }
+                        },
+                    });
+                    if (cardSent)
+                        return null;
+                }
+                // 降级：文本
                 const modeList = modes.map(m => {
                     const prefix = m.key === currentMode ? '▶' : ' ';
                     const suffix = m.available ? '' : ' ⚠️ 不可用';
                     return `  ${prefix} ${m.key} (${m.nameZh}) - ${m.description}${suffix}`;
                 }).join('\n');
-                return `🔐 当前权限模式: ${currentMode}\n\n${modeList}\n\n用法:\n  /perm <模式>       切换权限模式\n  /perm allow|deny   审批权限请求`;
+                return `🔐 当前权限模式: ${currentMode}\n\n${modeList}\n\n用法:\n  /perm <模式>              切换权限模式\n  /perm allow|always|deny   审批权限请求`;
             }
             const parts = args.split(/\s+/);
-            // /perm <mode> 或 /perm allow|deny：切换模式 / 快捷审批
+            // /perm <mode> 或 /perm allow|always|deny：切换模式 / 快捷审批
             if (parts.length === 1) {
                 const arg = parts[0];
-                // /perm allow|deny：快捷审批（自动找当前 session 唯一的 pending 请求）
-                if (arg === 'allow' || arg === 'deny') {
+                // /perm allow|always|deny：快捷审批（自动找当前 session 唯一的 pending 请求）
+                if (arg === 'allow' || arg === 'always' || arg === 'deny') {
                     if (!this.permissionGateway) {
                         return '❌ 权限审批未启用';
                     }
@@ -471,8 +632,14 @@ export class CommandHandler {
                         return `❌ 当前有 ${pendingIds.length} 个待审批请求，请指定 requestId：\n${pendingIds.map(id => `  /perm ${id} ${arg}`).join('\n')}`;
                     }
                     const requestId = pendingIds[0];
-                    this.permissionGateway.resolvePermission(permSession.id, requestId, arg === 'allow');
-                    return arg === 'allow' ? `✓ 已授权，继续执行……` : `✓ 已拒绝`;
+                    const decision = arg;
+                    this.permissionGateway.resolvePermission(permSession.id, requestId, decision);
+                    const labels = {
+                        allow: '✓ 已授权（本次），继续执行……',
+                        always: '✓ 已授权（始终允许该工具），继续执行……',
+                        deny: '✓ 已拒绝'
+                    };
+                    return labels[decision];
                 }
                 // /perm <mode>：切换权限模式
                 if (hasPermissionController(permAgent)) {
@@ -482,6 +649,10 @@ export class CommandHandler {
                         if (!matched.available) {
                             return `❌ ${matched.key} 模式当前不可用：${matched.unavailableReason}`;
                         }
+                        // guest 用户只能保持 readonly 模式
+                        if (identity.role !== 'owner' && arg !== 'readonly') {
+                            return '❌ 当前身份无法切换权限模式';
+                        }
                         const metadata = permSession.metadata || {};
                         metadata.permissionMode = arg;
                         await this.sessionManager.updateSession(permSession.id, { metadata });
@@ -489,12 +660,12 @@ export class CommandHandler {
                     }
                 }
                 // 不是已知模式名也不是 allow/deny
-                const modeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : 'default|request|edit|plan|noask';
-                return `❌ 未知参数: ${arg}\n用法: /perm <${modeKeys}> 或 /perm allow|deny`;
+                const modeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : 'auto|bypass|request|edit|plan|noask';
+                return `❌ 未知参数: ${arg}\n用法: /perm <${modeKeys}> 或 /perm allow|always|deny`;
             }
             // 双参数不再支持，提示正确用法
-            const allModeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : 'default|request|edit|plan|noask';
-            return `❌ 未知参数: ${args}\n用法: /perm <${allModeKeys}> 或 /perm allow|deny`;
+            const allModeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : 'auto|bypass|request|edit|plan|noask';
+            return `❌ 未知参数: ${args}\n用法: /perm <${allModeKeys}> 或 /perm allow|always|deny`;
         }
         // /agent 命令：查看或切换 Agent 后端
         if (normalizedContent.startsWith('/agent')) {
@@ -504,7 +675,44 @@ export class CommandHandler {
             const available = [...this.agentMap.keys()];
             if (!args) {
                 const currentAgent = activeSession?.agentId || this.defaultAgentId;
-                const list = available.map(a => `${a === currentAgent ? '✓' : '-'} ${a}`).join('\n');
+                // 尝试发送交互卡片
+                if (this.interactionRouter && available.length > 1) {
+                    const requestId = `agent-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+                    const interaction = {
+                        type: 'interaction',
+                        id: requestId,
+                        channelId,
+                        sessionId: activeSession?.id || requestId,
+                        kind: {
+                            kind: 'action',
+                            title: '🔌 切换 Agent',
+                            buttons: available.map(a => ({
+                                key: a,
+                                label: a === currentAgent ? `✓ ${a}` : a,
+                                style: a === currentAgent ? 'primary' : 'default',
+                            })),
+                        },
+                    };
+                    const replyCtx = activeSession ? this.getReplyContext(activeSession) : undefined;
+                    const cardSent = await this.sendInteractionCard({
+                        channel, channelId, sessionId: activeSession?.id || requestId, requestId, interaction, replyCtx,
+                        callback: async (action, _values, operatorId) => {
+                            if (action !== currentAgent) {
+                                if (userId && operatorId && operatorId !== userId)
+                                    return;
+                                const result = await this.handle(`/agent ${action}`, channel, channelId, undefined, userId, threadId);
+                                if (result) {
+                                    const adapter = this.adapters.get(channel);
+                                    adapter?.sendText(channelId, result, replyCtx);
+                                }
+                            }
+                        },
+                    });
+                    if (cardSent)
+                        return null;
+                }
+                // 降级：文本
+                const list = available.map(a => `${a === currentAgent ? ' ✓' : '  '} ${a}`).join('\n');
                 return `当前 Agent: ${currentAgent}\n\n可用:\n${list}\n\n用法: /agent <name>`;
             }
             if (!this.agentMap.has(args)) {
@@ -514,15 +722,19 @@ export class CommandHandler {
             if ('error' in result)
                 return result.error;
             const { session } = result;
-            // 取消原会话的 pending 权限请求
+            // 取消原会话的 pending 权限请求和交互卡片
             if (this.permissionGateway) {
                 this.permissionGateway.cancelAll(session.id);
             }
+            if (this.interactionRouter) {
+                this.interactionRouter.cancelAll(session.id);
+            }
             // 切换到目标 agent（恢复已有会话或创建新会话）
             const newSession = await this.sessionManager.switchAgent(channel, channelId, session.projectPath, args);
             const hasExistingSession = newSession.agentSessionId ? '（恢复已有会话）' : '（新建会话）';
             const projectName = this.getProjectName(session.projectPath);
-            return `✓ 已切换 Agent: ${args}\n  项目: ${projectName}\n  会话: ${newSession.name || '(未命名)'}\n  ${hasExistingSession}`;
+            let agentSwitchResponse = `✓ 已切换 Agent: ${args}\n  项目: ${projectName}\n  会话: ${newSession.name || '(未命名)'}\n  ${hasExistingSession}`;
+            return agentSwitchResponse;
         }
         // /model 命令：查看或切换模型/推理强度
         if (normalizedContent.startsWith('/model')) {
@@ -536,54 +748,72 @@ export class CommandHandler {
             const models = hasModelSwitcher(modelAgent) ? modelAgent.listModels() : [];
             if (!args) {
                 const currentModel = hasModelSwitcher(modelAgent) ? modelAgent.getModel() : modelAgent.name;
+                const efforts = getAvailableEfforts(modelAgent, currentModel);
                 const currentEffort = modelAgent.getEffort?.() || 'auto';
-                const effortDisplay = currentEffort === 'auto' ? 'auto (SDK默认)' : `${currentEffort} ${effortBar(currentEffort)}`;
+                // 尝试发送交互卡片
+                if (this.interactionRouter && models.length > 0) {
+                    const requestId = `model-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+                    const interaction = {
+                        type: 'interaction',
+                        id: requestId,
+                        channelId,
+                        sessionId: modelSession.id,
+                        kind: {
+                            kind: 'action',
+                            title: '🤖 切换模型',
+                            buttons: models.map((m) => ({
+                                key: m,
+                                label: m === currentModel ? `✓ ${m}` : m,
+                                style: m === currentModel ? 'primary' : 'default',
+                            })),
+                        },
+                    };
+                    const replyCtx = this.getReplyContext(modelSession);
+                    const cardSent = await this.sendInteractionCard({
+                        channel, channelId, sessionId: modelSession.id, requestId, interaction, replyCtx,
+                        callback: async (action, _values, operatorId) => {
+                            if (action !== currentModel) {
+                                if (userId && operatorId && operatorId !== userId)
+                                    return;
+                                const result = await this.handle(`/model ${action}`, channel, channelId, undefined, userId, threadId);
+                                if (result) {
+                                    const adapter = this.adapters.get(channel);
+                                    adapter?.sendText(channelId, result, replyCtx);
+                                }
+                            }
+                        },
+                    });
+                    if (cardSent)
+                        return null;
+                }
+                // 降级：文本
                 const modelList = models.map((m) => `- ${m}`).join('\n');
-                return `当前模型: ${currentModel}\n推理强度: ${effortDisplay}\n\n可用模型：\n${modelList}\n\n推理强度: ${availableEfforts.join(' / ')} / auto\n\n用法:\n  /model <model>           切换模型\n  /model <model> <effort>  切换模型+推理强度\n  /model <effort>          仅切换推理强度\n  /model auto              恢复SDK默认`;
+                const effortHint = efforts.length > 0
+                    ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}  (使用 /effort 调整)`
+                    : '';
+                return `当前模型: ${currentModel}${effortHint}\n\n可用模型：\n${modelList}\n\n${formatModelUsage(modelAgent, currentModel)}`;
             }
             const parts = args.split(/\s+/);
             let newModel;
             let newEffort;
             if (parts.length === 1) {
                 const arg = parts[0];
-                if (arg === 'auto') {
-                    modelAgent.setEffort?.(undefined);
-                    // 写回来源
-                    const isCodex = modelAgent.name === 'codex';
-                    if (isCodex) {
-                        if (this.config.agents?.openai?.reasoning) {
-                            delete this.config.agents.openai.reasoning;
-                            try {
-                                saveConfig(this.config);
-                            }
-                            catch { }
-                        }
-                    }
-                    else {
-                        const configuredInEvolclaw = !!this.config.agents?.anthropic?.effort;
-                        if (configuredInEvolclaw) {
-                            delete this.config.agents.anthropic.effort;
-                            try {
-                                saveConfig(this.config);
-                            }
-                            catch { }
-                        }
-                        else {
-                            writeUserSettings({ effortLevel: null });
-                        }
-                    }
-                    return '✓ 推理强度已恢复为 auto (SDK默认)';
+                const currentModel = hasModelSwitcher(modelAgent) ? modelAgent.getModel() : modelAgent.name;
+                const efforts = getAvailableEfforts(modelAgent, currentModel);
+                // effort 相关参数统一转发到 /effort
+                if (efforts.includes(arg) || arg === 'auto') {
+                    return this.handle(`/effort ${arg}`, channel, channelId, undefined, userId, threadId);
                 }
-                // 单参数：模型 或 effort
-                if (availableEfforts.includes(arg)) {
-                    newEffort = arg;
+                else if (allEfforts.includes(arg)) {
+                    return `⚠️ 请使用 /effort ${arg} 调整推理强度`;
                 }
                 else if (models.includes(arg)) {
                     newModel = arg;
                 }
                 else {
                     const modelList = models.map((m) => `- ${m}`).join('\n');
-                    return `❌ 无效参数: ${arg}\n\n可用模型：\n${modelList}\n\n推理强度: ${availableEfforts.join(' / ')}`;
+                    const effortHint = efforts.length > 0 ? `\n\n推理强度请使用 /effort 命令` : '';
+                    return `❌ 无效参数: ${arg}\n\n可用模型：\n${modelList}${effortHint}`;
                 }
             }
             else {
@@ -592,8 +822,13 @@ export class CommandHandler {
                 if (!models.includes(modelArg)) {
                     return `❌ 无效的模型ID: ${modelArg}`;
                 }
-                if (!availableEfforts.includes(effortArg)) {
-                    return `❌ 无效的推理强度: ${effortArg}\n可选: ${availableEfforts.join(' / ')}`;
+                const targetEfforts = getAvailableEfforts(modelAgent, modelArg);
+                if (targetEfforts.length === 0) {
+                    return `⚠️ ${modelArg} 不支持推理强度设置`;
+                }
+                if (!targetEfforts.includes(effortArg)) {
+                    const errorLabel = allEfforts.includes(effortArg) ? '⚠️' : '❌';
+                    return `${errorLabel} ${modelArg} 不支持 ${effortArg} 推理强度\n可选: ${targetEfforts.join(' / ')}`;
                 }
                 newModel = modelArg;
                 newEffort = effortArg;
@@ -613,12 +848,8 @@ export class CommandHandler {
                 changes.push(`模型: ${newModel}`);
             }
             if (newEffort) {
-                const modelAfterSwitch = newModel ?? (hasModelSwitcher(modelAgent) ? modelAgent.getModel() : modelAgent.name);
-                if (newEffort === 'max' && !modelAfterSwitch.includes('opus')) {
-                    return '⚠️ max 推理强度仅 Opus 模型支持（opus / claude-opus-4-6）';
-                }
                 modelAgent.setEffort?.(newEffort);
-                changes.push(`推理强度: ${newEffort} ${effortBar(newEffort)}`);
+                changes.push(`推理强度: ${newEffort}`);
             }
             // 持久化：写回来源（就近原则）
             // evolclaw.json 配了 → 写 evolclaw.json
@@ -685,6 +916,137 @@ export class CommandHandler {
             }
             return `✓ 已切换\n  ${changes.join('\n  ')}`;
         }
+        // /effort 命令：查看或切换推理强度
+        if (normalizedContent.startsWith('/effort')) {
+            const args = normalizedContent.slice(7).trim();
+            const effortResult = await this.ensureSession(channel, channelId, threadId);
+            if ('error' in effortResult)
+                return effortResult.error;
+            const { session: effortSession } = effortResult;
+            const effortAgent = this.getAgent(effortSession.agentId);
+            const currentModel = hasModelSwitcher(effortAgent) ? effortAgent.getModel() : effortAgent.name;
+            const efforts = getAvailableEfforts(effortAgent, currentModel);
+            const currentEffort = effortAgent.getEffort?.() || 'auto';
+            if (efforts.length === 0) {
+                return '⚠️ 当前模型不支持推理强度设置';
+            }
+            if (!args) {
+                // /effort（无参数）：显示当前推理强度 + 发送 Action 卡片
+                if (this.interactionRouter) {
+                    const requestId = `effort-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+                    const buttons = [
+                        ...efforts.map(e => ({
+                            key: e,
+                            label: e === currentEffort ? `✓ ${e}` : e,
+                            style: e === currentEffort ? 'primary' : 'default',
+                        })),
+                        {
+                            key: 'auto',
+                            label: currentEffort === 'auto' ? '✓ auto' : 'auto',
+                            style: currentEffort === 'auto' ? 'primary' : 'default',
+                        },
+                    ];
+                    const interaction = {
+                        type: 'interaction',
+                        id: requestId,
+                        channelId,
+                        sessionId: effortSession.id,
+                        kind: {
+                            kind: 'action',
+                            title: '⚡ 推理强度',
+                            buttons,
+                        },
+                    };
+                    const replyCtx = this.getReplyContext(effortSession);
+                    const cardSent = await this.sendInteractionCard({
+                        channel, channelId, sessionId: effortSession.id, requestId, interaction, replyCtx,
+                        callback: async (action, _values, operatorId) => {
+                            if (action !== currentEffort) {
+                                if (userId && operatorId && operatorId !== userId)
+                                    return;
+                                const result = await this.handle(`/effort ${action}`, channel, channelId, undefined, userId, threadId);
+                                if (result) {
+                                    const adapter = this.adapters.get(channel);
+                                    adapter?.sendText(channelId, result, replyCtx);
+                                }
+                            }
+                        },
+                    });
+                    if (cardSent)
+                        return null;
+                }
+                // 降级：文本
+                const effortDisplay = currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort;
+                const effortList = efforts.map(e => `${e === currentEffort ? '  ✓' : '   '} ${e}`).join('\n');
+                return `⚡ 推理强度: ${effortDisplay}\n\n可选:\n${effortList}\n   ${currentEffort === 'auto' ? '  ✓' : '   '} auto\n\n用法: /effort <level>`;
+            }
+            // /effort auto：恢复 SDK 默认
+            if (args === 'auto') {
+                effortAgent.setEffort?.(undefined);
+                const isCodex = effortAgent.name === 'codex';
+                if (isCodex) {
+                    if (this.config.agents?.openai?.reasoning) {
+                        delete this.config.agents.openai.reasoning;
+                        try {
+                            saveConfig(this.config);
+                        }
+                        catch { }
+                    }
+                }
+                else {
+                    const configuredInEvolclaw = !!this.config.agents?.anthropic?.effort;
+                    if (configuredInEvolclaw) {
+                        delete this.config.agents.anthropic.effort;
+                        try {
+                            saveConfig(this.config);
+                        }
+                        catch { }
+                    }
+                    else {
+                        writeUserSettings({ effortLevel: null });
+                    }
+                }
+                return '✓ 推理强度已恢复为 auto (SDK默认)';
+            }
+            // /effort <level>：切换推理强度
+            if (!efforts.includes(args)) {
+                if (allEfforts.includes(args)) {
+                    return `⚠️ ${currentModel} 不支持 ${args} 推理强度\n可选: ${efforts.join(' / ')}`;
+                }
+                return `❌ 无效参数: ${args}\n可选: ${efforts.join(' / ')} / auto`;
+            }
+            const newEffort = args;
+            effortAgent.setEffort?.(newEffort);
+            // 持久化
+            if (!this.config.agents)
+                this.config.agents = {};
+            const isCodex = effortAgent.name === 'codex';
+            if (isCodex) {
+                if (!this.config.agents.openai)
+                    this.config.agents.openai = {};
+                this.config.agents.openai.reasoning = newEffort;
+                try {
+                    saveConfig(this.config);
+                }
+                catch { }
+            }
+            else {
+                const configuredInEvolclaw = !!(this.config.agents?.anthropic?.model || this.config.agents?.anthropic?.effort);
+                if (configuredInEvolclaw) {
+                    if (!this.config.agents.anthropic)
+                        this.config.agents.anthropic = {};
+                    this.config.agents.anthropic.effort = newEffort;
+                    try {
+                        saveConfig(this.config);
+                    }
+                    catch { }
+                }
+                else {
+                    writeUserSettings({ effortLevel: newEffort });
+                }
+            }
+            return `✓ 推理强度: ${newEffort}`;
+        }
         // /stop 命令：中断当前任务
         if (normalizedContent === '/stop') {
             const stopResult = await this.ensureSession(channel, channelId, threadId);
@@ -827,7 +1189,7 @@ export class CommandHandler {
             }
             const lines = [];
             if (isAdmin) {
-                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${channel} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, `会话轮数: ${sessionTurns}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, `会话轮数: ${sessionTurns}`);
                 if (health.consecutiveErrors > 0) {
                     lines.push(`异常计数: ${health.consecutiveErrors}`);
                 }
@@ -844,8 +1206,8 @@ export class CommandHandler {
                 lines.push('⚠️ 当前处于安全模式（历史上下文已禁用）');
                 lines.push('');
                 lines.push('退出方式：');
-                lines.push('1. /repair - 检查并修复会话（推荐，保留历史）');
-                lines.push('2. /new [名称] - 创建新会话（清空历史）');
+                lines.push('1. /new [名称] - 创建新会话（清空历史）');
+                lines.push('2. 联系管理员使用 /repair 检查并修复会话');
             }
             if (health.lastError) {
                 lines.push('');
@@ -875,9 +1237,12 @@ export class CommandHandler {
                 timestamp: Date.now()
             });
             if (session) {
+                // Reset agent backend state so the new
+                // session starts with a fresh conversation history
+                await agent.clearSession(session.id, session.agentSessionId || '', session.projectPath);
                 await agent.closeSession(session.id);
             }
-            return `✓ 已创建新会话${sessionName ? `: ${sessionName}` : ''}\n  之前的对话历史已保留，可通过 /slist 查看`;
+            return `✓ 已创建新会话${sessionName ? `: ${sessionName}` : ''}\n  之前的对话历史已保留，可通过 /s 查看`;
         }
         // /check 命令：检查渠道状态 / 手动重连指定渠道
         if (normalizedContent === '/check' || normalizedContent.startsWith('/check ')) {
@@ -903,15 +1268,30 @@ export class CommandHandler {
             }
             // Default: show full system health check
             const lines = ['📡 渠道状态：'];
+            // Group by channelType
+            const groups = new Map();
             for (const [name] of this.adapters) {
+                const type = this.channelTypeMap.get(name) || name;
                 const ch = this.channelObjects.get(name);
+                let status;
                 if (ch?.getStatus) {
                     const s = ch.getStatus();
-                    const status = s.connected ? '✓ 已连接' : s.reconnectAttempt > 0 ? `⏳ 重连中 (${s.reconnectAttempt}/${s.maxAttempts})` : '✗ 断开';
-                    lines.push(`  ${name}: ${status}`);
+                    status = s.connected ? '✓ 已连接' : s.reconnectAttempt > 0 ? `⏳ 重连中 (${s.reconnectAttempt}/${s.maxAttempts})` : '✗ 断开';
+                }
+                else {
+                    status = '✓ 已注册';
+                }
+                if (!groups.has(type))
+                    groups.set(type, []);
+                groups.get(type).push({ name, status });
+            }
+            for (const [type, instances] of groups) {
+                if (instances.length === 1) {
+                    lines.push(`  ${instances[0].name}: ${instances[0].status}`);
                 }
                 else {
-                    lines.push(`  ${name}: ✓ 已注册`);
+                    const parts = instances.map(i => `${i.name} ${i.status}`);
+                    lines.push(`  ${type}: [${parts.join(', ')}]`);
                 }
             }
             // 队列状态
@@ -924,7 +1304,6 @@ export class CommandHandler {
                 ? this.statsCollector.getSnapshot().uptimeMs
                 : process.uptime() * 1000;
             lines.push(`  运行时间: ${this.formatUptime(uptimeMs)}`);
-            lines.push(`  当前安全模式会话: ${this.sessionManager.getSafeModeSessionCount()}`);
             // 近 1 小时统计
             if (this.statsCollector) {
                 const snap = this.statsCollector.getSnapshot();
@@ -939,8 +1318,11 @@ export class CommandHandler {
                 else {
                     lines.push(`  处理出错: 0`);
                 }
+                if (h.toolErrors > 0) {
+                    const toolBreakdown = Object.entries(h.toolErrorsByName).map(([t, c]) => `${t}: ${c}`).join(', ');
+                    lines.push(`  工具失败: ${h.toolErrors} (${toolBreakdown})`);
+                }
                 lines.push(`  被中断: ${h.interrupts}`);
-                lines.push(`  进入安全模式: ${h.safeModeEntries}`);
                 if (h.completed > 0) {
                     lines.push(`  平均响应耗时: ${(h.avgResponseMs / 1000).toFixed(1)}s`);
                 }
@@ -957,6 +1339,33 @@ export class CommandHandler {
                 const count = this.messageCache.getCount(s.id);
                 return `${s.projectPath} 有 ${count} 条新消息`;
             });
+            // 执行重启逻辑（共用于卡片回调和文本确认）
+            const executeRestart = async () => {
+                let replyContext;
+                if (threadId) {
+                    const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
+                    replyContext = this.getReplyContext(threadSession);
+                }
+                const restartInfo = {
+                    channel,
+                    channelId,
+                    timestamp: Date.now(),
+                    ...(replyContext?.replyToMessageId ? { rootId: replyContext.replyToMessageId } : {}),
+                };
+                fs.writeFileSync(path.join(resolvePaths().dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
+                const { spawn } = await import('child_process');
+                spawn('node', [path.join(getPackageRoot(), 'dist', 'cli.js'), 'restart-monitor'], {
+                    detached: true,
+                    stdio: 'ignore',
+                    env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root }
+                }).unref();
+                this.eventBus.publish({ type: 'system:restart', channel, channelId });
+                setTimeout(() => {
+                    logger.info('[System] Restarting by user command...');
+                    process.exit(0);
+                }, 1000);
+            };
+            // 文本确认流程
             if (sessionsWithMessages.length > 0) {
                 const restartKey = `${channel}-${channelId}`;
                 const restartConfirmFile = path.join(resolvePaths().dataDir, `restart-confirm-${restartKey}.json`);
@@ -976,30 +1385,7 @@ export class CommandHandler {
                     return sessionsWithMessages.join('\n') + '\n再次输入 /restart 将强制重启。';
                 }
             }
-            // 话题中 restart 时保存 replyContext 用于重启后回复到话题
-            let replyContext;
-            if (threadId) {
-                const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
-                replyContext = this.getReplyContext(threadSession);
-            }
-            const restartInfo = {
-                channel,
-                channelId,
-                timestamp: Date.now(),
-                ...(replyContext?.replyToMessageId ? { rootId: replyContext.replyToMessageId } : {}),
-            };
-            fs.writeFileSync(path.join(resolvePaths().dataDir, 'restart-pending.json'), JSON.stringify(restartInfo));
-            const { spawn } = await import('child_process');
-            spawn('node', [path.join(getPackageRoot(), 'dist', 'cli.js'), 'restart-monitor'], {
-                detached: true,
-                stdio: 'ignore',
-                env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root }
-            }).unref();
-            this.eventBus.publish({ type: 'system:restart', channel, channelId });
-            setTimeout(() => {
-                logger.info('[System] Restarting by user command...');
-                process.exit(0);
-            }, 1000);
+            await executeRestart();
             return '🔄 服务正在重启，请稍候...（约 5 秒后恢复）';
         }
         // /pwd 命令：显示当前项目路径
@@ -1022,26 +1408,43 @@ export class CommandHandler {
             if (!rawArg) {
                 return '用法: /send <相对路径> 或 /send <渠道> <相对路径>\n示例: /send src/index.ts\n示例: /send feishu report.md';
             }
-            // 解析目标通道：第一个 token 若匹配已注册通道名则为目标通道
+            // 解析目标通道：第一个 token 按实例名匹配，再按 channelType 匹配
             const tokens = rawArg.split(/\s+/);
-            const knownChannels = [...this.adapters.keys()];
             let targetChannel = channel;
+            let targetLabel = channel;
             let filePath = rawArg;
-            if (tokens.length >= 2 && knownChannels.includes(tokens[0])) {
-                targetChannel = tokens[0];
-                filePath = tokens.slice(1).join(' ');
+            if (tokens.length >= 2) {
+                const spec = tokens[0];
+                if (this.adapters.has(spec)) {
+                    // 精确实例名
+                    targetChannel = spec;
+                    targetLabel = spec;
+                    filePath = tokens.slice(1).join(' ');
+                }
+                else {
+                    // 按 channelType 查找第一个匹配的实例
+                    for (const [name] of this.adapters) {
+                        if ((this.channelTypeMap.get(name) || name) === spec) {
+                            targetChannel = name;
+                            targetLabel = spec;
+                            filePath = tokens.slice(1).join(' ');
+                            break;
+                        }
+                    }
+                }
             }
+            const isCrossChannel = targetChannel !== channel;
             // 跨通道仅限 owner
-            if (targetChannel !== channel && identity.role !== 'owner') {
+            if (isCrossChannel && identity.role !== 'owner') {
                 return '❌ 跨通道发送仅限管理员';
             }
             // 找目标 adapter
             const targetAdapter = this.adapters.get(targetChannel);
             if (!targetAdapter) {
-                return `❌ 通道 ${targetChannel} 未启用或不存在`;
+                return `❌ 通道 ${targetLabel} 未启用或不存在`;
             }
             if (!targetAdapter.sendFile) {
-                return `❌ 通道 ${targetChannel} 不支持文件发送`;
+                return `❌ 通道 ${targetLabel} 不支持文件发送`;
             }
             // 获取 session（需要 projectPath）
             const sendResult = await this.ensureSession(channel, channelId, threadId);
@@ -1076,22 +1479,22 @@ export class CommandHandler {
             }
             // 找目标 channelId
             let targetChannelId = channelId;
-            if (targetChannel !== channel) {
+            if (isCrossChannel) {
                 const ownerPeerId = getOwner(this.config, targetChannel);
                 targetChannelId = ownerPeerId ? (this.sessionManager.getOwnerChatId(targetChannel, ownerPeerId) ?? '') : '';
                 if (!targetChannelId) {
-                    return `❌ 未找到 ${targetChannel} 的私聊会话，请先在该通道发送一条消息`;
+                    return `❌ 未找到 ${targetLabel} 的私聊会话，请先在该通道发送一条消息`;
                 }
             }
             // 发送文件
             try {
-                const replyCtx = targetChannel === channel ? this.getReplyContext(sendSession) : undefined;
+                const replyCtx = isCrossChannel ? undefined : this.getReplyContext(sendSession);
                 await targetAdapter.sendFile(targetChannelId, realPath, replyCtx);
                 const sizeStr = stat.size < 1024 ? `${stat.size} B`
                     : stat.size < 1024 * 1024 ? `${(stat.size / 1024).toFixed(1)} KB`
                         : `${(stat.size / 1024 / 1024).toFixed(1)} MB`;
-                return targetChannel !== channel
-                    ? `📎 文件已通过 ${targetChannel} 发送: ${filePath} (${sizeStr})`
+                return isCrossChannel
+                    ? `📎 文件已通过 ${targetLabel} 发送: ${filePath} (${sizeStr})`
                     : `✅ 已发送: ${filePath} (${sizeStr})`;
             }
             catch (error) {
@@ -1115,73 +1518,110 @@ export class CommandHandler {
 
 提示：群聊不支持切换项目`;
             }
-            const lines = ['可用项目:'];
-            // 收集项目信息并按最近活跃排序
+            // 收集项目信息并按最近活跃排序（唯一来源：evolclaw.json projects.list）
             const entries = [];
-            const configuredPaths = new Set();
             for (const [name, projectPath] of Object.entries(this.projects)) {
-                configuredPaths.add(projectPath);
-                const isCurrent = session?.projectPath === projectPath;
+                // 跳过不存在的路径
+                if (!fs.existsSync(projectPath))
+                    continue;
+                const isCurrent = session ? path.resolve(session.projectPath) === path.resolve(projectPath) : false;
                 const projectSession = await this.sessionManager.getSessionByProjectPath(channel, channelId, projectPath);
                 entries.push({
                     name, projectPath, projectSession, isCurrent,
                     updatedAt: projectSession?.updatedAt ?? 0,
                 });
             }
-            // Include bound projects not in config (created via /bind)
-            const allSessions = await this.sessionManager.listSessions(channel, channelId);
-            for (const s of allSessions) {
-                if (!configuredPaths.has(s.projectPath)) {
-                    configuredPaths.add(s.projectPath);
-                    const isCurrent = session?.projectPath === s.projectPath;
-                    entries.push({
-                        name: path.basename(s.projectPath), projectPath: s.projectPath, projectSession: s, isCurrent,
-                        updatedAt: s.updatedAt ?? 0,
-                    });
-                }
-            }
             // 当前活跃项目置顶，其余按 updatedAt 降序
             entries.sort((a, b) => {
                 if (a.isCurrent !== b.isCurrent)
                     return a.isCurrent ? -1 : 1;
                 return b.updatedAt - a.updatedAt;
             });
-            for (const { name, projectPath, projectSession, isCurrent } of entries) {
-                const prefix = isCurrent ? '  ✓' : '   ';
-                if (!projectSession) {
-                    lines.push(`${prefix} ${name} (${projectPath}) - 无会话`);
-                    continue;
-                }
-                const statusParts = [];
+            // 构建项目状态文本的辅助函数
+            const buildStatusText = (entry) => {
+                const { projectSession, isCurrent } = entry;
+                if (!projectSession)
+                    return '无会话';
+                const parts = [];
                 if (isCurrent) {
-                    statusParts.push('活跃');
+                    parts.push('活跃');
                 }
                 else {
-                    const idleMs = Date.now() - projectSession.updatedAt;
-                    statusParts.push(formatIdleTime(idleMs));
+                    parts.push(formatIdleTime(Date.now() - projectSession.updatedAt));
                 }
-                // 用 DB processingState 判断处理状态
                 const isProcessing = !!projectSession.processingState;
                 if (isProcessing) {
-                    const queueLength = this.messageQueue.getQueueLength(projectSession.id);
-                    if (queueLength > 0) {
-                        statusParts.push(`[处理中，队列${queueLength}条]`);
-                    }
-                    else {
-                        statusParts.push('[处理中]');
-                    }
+                    const qLen = this.messageQueue.getQueueLength(projectSession.id);
+                    parts.push(qLen > 0 ? `[处理中，队列${qLen}条]` : '[处理中]');
                 }
-                const unreadCount = this.messageCache.getCount(projectSession.id);
-                if (unreadCount > 0) {
-                    statusParts.push(`[${unreadCount}条新消息]`);
+                const unread = this.messageCache.getCount(projectSession.id);
+                if (unread > 0) {
+                    parts.push(`[${unread}条新消息]`);
                 }
                 else if (!isProcessing && !isCurrent) {
-                    statusParts.push('[空闲]');
+                    parts.push('[空闲]');
                 }
-                lines.push(`${prefix} ${name} (${projectPath}) - ${statusParts.join(' ')}`);
+                return parts.join(' ');
+            };
+            // 尝试发送 ActionInteraction 卡片（每个项目一个按钮，一键切换）
+            if (this.interactionRouter && entries.length > 0) {
+                const requestId = `plist-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+                const buttons = entries.map(e => ({
+                    key: e.name,
+                    label: e.isCurrent ? `✓ ${e.name}` : e.name,
+                    style: e.isCurrent ? 'primary' : 'default',
+                }));
+                const bodyLines = entries.map(e => {
+                    const status = buildStatusText(e);
+                    const prefix = e.isCurrent ? '▶' : '•';
+                    return `${prefix} **${e.name}** (${e.projectPath})  ${status}`;
+                });
+                const interaction = {
+                    type: 'interaction',
+                    id: requestId,
+                    channelId,
+                    sessionId: activeSession?.id || requestId,
+                    kind: {
+                        kind: 'action',
+                        title: '📂 项目列表',
+                        body: bodyLines.join('\n'),
+                        buttons,
+                    },
+                };
+                const replyCtx = activeSession ? this.getReplyContext(activeSession) : undefined;
+                const cardSent = await this.sendInteractionCard({
+                    channel, channelId, sessionId: activeSession?.id || requestId, requestId, interaction, replyCtx,
+                    callback: async (action, _values, operatorId) => {
+                        if (userId && operatorId && operatorId !== userId)
+                            return;
+                        const selectedEntry = entries.find(e => e.name === action);
+                        if (selectedEntry && !selectedEntry.isCurrent) {
+                            const result = await this.handle(`/project ${action}`, channel, channelId, undefined, userId, threadId);
+                            if (result) {
+                                const adapter = this.adapters.get(channel);
+                                adapter?.sendText(channelId, result, replyCtx);
+                            }
+                        }
+                    },
+                });
+                if (cardSent)
+                    return null;
+            }
+            // 降级：文本列表
+            const lines = ['可用项目:'];
+            for (const entry of entries) {
+                const prefix = entry.isCurrent ? '  ✓' : '   ';
+                lines.push(`${prefix} ${entry.name} (${entry.projectPath}) - ${buildStatusText(entry)}`);
             }
             return lines.join('\n');
         }
+        // /project（无参数）：直接复用 /plist 逻辑（含卡片交互）
+        if (normalizedContent === '/project') {
+            if (!policy.canSwitchProject(session?.chatType || 'private', identity.role)) {
+                // 群聊不能切换项目，交由 /plist 逻辑处理
+            }
+            return this.handle('/plist', channel, channelId, undefined, userId, threadId);
+        }
         // /project 命令：切换项目（支持名称或路径）
         if (normalizedContent.startsWith('/project ')) {
             if (!policy.canSwitchProject(session?.chatType || 'private', identity.role)) {
@@ -1212,7 +1652,7 @@ export class CommandHandler {
             else {
                 projectPath = this.projects[arg];
                 if (!projectPath) {
-                    return `❌ 项目 "${arg}" 不存在\n提示: 使用 /plist 查看可用项目`;
+                    return `❌ 项目 "${arg}" 不存在\n提示: 使用 /p 查看可用项目`;
                 }
                 projectName = arg;
             }
@@ -1307,16 +1747,87 @@ export class CommandHandler {
             this.projects[projectName] = projectPath;
             return `✓ 已添加项目: ${projectName}\n  路径: ${projectPath}\n\n使用 /p ${projectName} 切换到该项目`;
         }
-        // /slist 命令：列出当前项目的所有会话
-        if (normalizedContent === '/slist') {
+        // /slist 命令：列出当前项目的会话
+        // /slist      — 仅 EvolClaw 会话
+        // /slist cli  — 仅 CLI 会话（未导入的）
+        if (normalizedContent === '/slist' || normalizedContent === '/slist cli') {
             if (!session) {
                 return `❌ 当前没有活跃会话
 
 请先执行以下操作之一：
 1. 发送任意消息 - 自动创建新会话
 2. /new [名称] - 创建命名会话
-3. /project <项目> - 切换到指定项目`;
+3. /p <项目> - 切换到指定项目`;
+            }
+            const showCliOnly = normalizedContent === '/slist cli';
+            // /slist cli — 仅显示 CLI 会话
+            if (showCliOnly) {
+                const canImportCli = policy.canImportCliSession(session.chatType || 'private', identity.role);
+                if (!canImportCli) {
+                    return '❌ 当前无权查看 CLI 会话';
+                }
+                const cliSessions = await this.sessionManager.scanCliSessions(session.projectPath, session.agentId);
+                const sessions = await this.sessionManager.listSessions(channel, channelId);
+                const currentProjectSessions = sessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId);
+                const dbSessionIds = new Set(currentProjectSessions.map(s => s.agentSessionId).filter(Boolean));
+                const orphanCliSessions = cliSessions.filter(c => !dbSessionIds.has(c.uuid));
+                if (orphanCliSessions.length === 0) {
+                    return `当前项目 ${path.basename(session.projectPath)} 没有未导入的 CLI 会话`;
+                }
+                // 构建显示数据（复用于卡片和文本）
+                const cliDisplayItems = orphanCliSessions.map(c => {
+                    const time = new Date(c.mtime).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' });
+                    const message = this.sessionManager.readSessionFirstMessage(session.projectPath, c.uuid, session.agentId) || '(无消息)';
+                    const uuid = c.uuid.substring(0, 8);
+                    return { uuid, fullUuid: c.uuid, time, message };
+                });
+                // 尝试发送 ActionInteraction 卡片
+                if (this.interactionRouter && cliDisplayItems.length > 0) {
+                    const requestId = `slist-cli-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+                    const buttons = cliDisplayItems.map(item => ({
+                        key: item.uuid,
+                        label: item.uuid,
+                        style: 'default',
+                    }));
+                    const bodyLines = cliDisplayItems.map(item => `• ${item.time}  (${item.uuid})  "${item.message}"`);
+                    const interaction = {
+                        type: 'interaction',
+                        id: requestId,
+                        channelId,
+                        sessionId: session.id,
+                        kind: {
+                            kind: 'action',
+                            title: `📋 ${path.basename(session.projectPath)} CLI 会话 (${cliDisplayItems.length})`,
+                            body: bodyLines.join('\n'),
+                            buttons,
+                        },
+                    };
+                    const replyCtx = this.getReplyContext(session);
+                    const cardSent = await this.sendInteractionCard({
+                        channel, channelId, sessionId: session.id, requestId, interaction, replyCtx,
+                        callback: async (action, _values, operatorId) => {
+                            if (userId && operatorId && operatorId !== userId)
+                                return;
+                            const result = await this.handle(`/session ${action}`, channel, channelId, undefined, userId, threadId);
+                            if (result) {
+                                const adapter = this.adapters.get(channel);
+                                adapter?.sendText(channelId, result, replyCtx);
+                            }
+                        },
+                    });
+                    if (cardSent)
+                        return null;
+                }
+                // 降级：文本列表
+                const lines = [`当前项目 ${path.basename(session.projectPath)} 的 CLI 会话 (共 ${orphanCliSessions.length} 个):`, ''];
+                for (const item of cliDisplayItems) {
+                    lines.push(`  ${item.time}  (${item.uuid})  "${item.message}"`);
+                }
+                lines.push('');
+                lines.push('使用 /s <8位uuid> 导入并切换到 CLI 会话');
+                return lines.join('\n');
             }
+            // /slist — 仅显示 EvolClaw 会话
             const sessions = await this.sessionManager.listSessions(channel, channelId);
             const currentProjectSessions = sessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId);
             // 从 SDK 同步会话名称（发现 CLI 改名）
@@ -1335,46 +1846,97 @@ export class CommandHandler {
             catch (error) {
                 logger.debug('[CommandHandler] SDK listSessions sync failed (non-critical):', error);
             }
-            const canImportCli = policy.canImportCliSession(session.chatType || 'private', identity.role);
-            const cliSessions = canImportCli
-                ? await this.sessionManager.scanCliSessions(session.projectPath, session.agentId)
-                : [];
-            const dbSessionIds = new Set(currentProjectSessions.map(s => s.agentSessionId).filter(Boolean));
+            // 构建可显示会话列表（复用于卡片和文本）
+            const hideTopics = currentProjectSessions.length > 10;
+            const topicCount = hideTopics ? currentProjectSessions.filter(s => s.threadId).length : 0;
+            const maxDisplay = 10;
+            const displaySessions = [];
+            let displayIndex = 0;
+            for (let i = 0; i < currentProjectSessions.length; i++) {
+                const s = currentProjectSessions[i];
+                if (hideTopics && s.threadId)
+                    continue;
+                if (displayIndex >= maxDisplay)
+                    break;
+                const isActive = s.metadata?.isActive === true;
+                displayIndex++;
+                const name = s.name || '(未命名)';
+                const idleTime = formatIdleTime(Date.now() - s.updatedAt);
+                const fileMissing = !!(s.agentSessionId && !this.sessionManager.checkSessionFileExists(s.projectPath, s.agentSessionId, s.agentId));
+                let status = '[空闲]';
+                if (fileMissing) {
+                    status = '[会话文件缺失]';
+                }
+                else if (!!s.processingState) {
+                    status = '[处理中]';
+                }
+                else if (isActive) {
+                    status = '[活跃]';
+                }
+                displaySessions.push({ session: s, index: displayIndex, isActive, name, status, idleTime, fileMissing });
+            }
+            // 尝试发送 ActionInteraction 卡片（每个会话一个按钮，一键切换）
+            if (this.interactionRouter && displaySessions.length >= 1) {
+                const requestId = `slist-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
+                const buttons = displaySessions.map(ds => {
+                    const shortId = ds.session.agentSessionId ? ds.session.agentSessionId.substring(0, 8) : ds.name;
+                    return {
+                        key: String(ds.index),
+                        label: ds.isActive ? `✓ ${ds.index}. ${shortId}` : `${ds.index}. ${shortId}`,
+                        style: ds.isActive ? 'primary' : 'default',
+                    };
+                });
+                const bodyLines = displaySessions.map(ds => {
+                    const prefix = ds.isActive ? '▶' : '•';
+                    const threadTag = ds.session.threadId ? '[话题] ' : '';
+                    const uuid = ds.session.agentSessionId ? `(${ds.session.agentSessionId.substring(0, 8)})` : '';
+                    const fileMark = ds.fileMissing ? '❌ ' : '';
+                    return `${prefix} ${ds.index}. ${threadTag}${fileMark}**${ds.name}** ${uuid}  ${ds.idleTime} ${ds.status}`;
+                });
+                const interaction = {
+                    type: 'interaction',
+                    id: requestId,
+                    channelId,
+                    sessionId: session.id,
+                    kind: {
+                        kind: 'action',
+                        title: `📋 ${path.basename(session.projectPath)} 会话列表`,
+                        body: bodyLines.join('\n'),
+                        buttons,
+                    },
+                };
+                const replyCtx = this.getReplyContext(session);
+                const cardSent = await this.sendInteractionCard({
+                    channel, channelId, sessionId: session.id, requestId, interaction, replyCtx,
+                    callback: async (action, _values, operatorId) => {
+                        if (userId && operatorId && operatorId !== userId)
+                            return;
+                        const target = displaySessions.find(ds => String(ds.index) === action);
+                        if (target && !target.isActive) {
+                            const result = await this.handle(`/session ${action}`, channel, channelId, undefined, userId, threadId);
+                            if (result) {
+                                const adapter = this.adapters.get(channel);
+                                adapter?.sendText(channelId, result, replyCtx);
+                            }
+                        }
+                    },
+                });
+                if (cardSent)
+                    return null;
+            }
+            // 降级：文本列表
             const lines = [`当前项目 ${path.basename(session.projectPath)} 的 [${session.agentId}] 会话列表:`, ''];
             if (currentProjectSessions.length > 0) {
-                // 超过10个会话时隐藏话题会话（/slist 只能在主会话调用，话题内已禁用）
-                const hideTopics = currentProjectSessions.length > 10;
-                const topicCount = hideTopics ? currentProjectSessions.filter(s => s.threadId).length : 0;
-                const maxDisplay = 10;
-                lines.push('【EvolClaw 会话】');
-                let displayIndex = 0;
-                for (let i = 0; i < currentProjectSessions.length; i++) {
-                    const s = currentProjectSessions[i];
-                    if (hideTopics && s.threadId)
-                        continue;
-                    if (displayIndex >= maxDisplay)
-                        break;
-                    const isActive = s.metadata?.isActive === true;
-                    displayIndex++;
-                    const prefix = isActive ? '  ✓' : '   ';
-                    const num = `${displayIndex}.`;
-                    const threadTag = s.threadId ? '[话题] ' : '';
-                    const name = s.name || '(未命名)';
-                    const uuid = s.agentSessionId ? `(${s.agentSessionId.substring(0, 8)})` : '';
-                    const idleTime = formatIdleTime(Date.now() - s.updatedAt);
-                    if (s.agentSessionId && !this.sessionManager.checkSessionFileExists(s.projectPath, s.agentSessionId, s.agentId)) {
-                        lines.push(`${prefix} ${num} ${threadTag}❌ ${name} ${uuid} - ${idleTime} [会话文件缺失]`);
+                for (const ds of displaySessions) {
+                    const prefix = ds.isActive ? '  ✓' : '   ';
+                    const num = `${ds.index}.`;
+                    const threadTag = ds.session.threadId ? '[话题] ' : '';
+                    const uuid = ds.session.agentSessionId ? `(${ds.session.agentSessionId.substring(0, 8)})` : '';
+                    if (ds.fileMissing) {
+                        lines.push(`${prefix} ${num} ${threadTag}❌ ${ds.name} ${uuid} - ${ds.idleTime} ${ds.status}`);
                     }
                     else {
-                        const sIsProcessing = !!s.processingState;
-                        let status = '[空闲]';
-                        if (sIsProcessing) {
-                            status = '[处理中]';
-                        }
-                        else if (isActive) {
-                            status = '[活跃]';
-                        }
-                        lines.push(`${prefix} ${num} ${threadTag}${name} ${uuid} - ${idleTime} ${status}`);
+                        lines.push(`${prefix} ${num} ${threadTag}${ds.name} ${uuid} - ${ds.idleTime} ${ds.status}`);
                     }
                 }
                 const hiddenCount = currentProjectSessions.length - displayIndex - topicCount;
@@ -1388,29 +1950,23 @@ export class CommandHandler {
                 }
                 lines.push('');
             }
-            const orphanCliSessions = cliSessions.filter(c => !dbSessionIds.has(c.uuid)).slice(0, 5);
-            if (orphanCliSessions.length > 0) {
-                lines.push('【CLI 会话】(最新5个)');
-                for (const c of orphanCliSessions) {
-                    const time = new Date(c.mtime).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' });
-                    const message = this.sessionManager.readSessionFirstMessage(session.projectPath, c.uuid, session.agentId) || '(无消息)';
-                    const uuid = c.uuid.substring(0, 8);
-                    lines.push(`  ${time}  (${uuid})  "${message}"`);
-                }
-                lines.push('');
-            }
             lines.push('使用 /s <序号、name或8位uuid> 切换会话');
+            lines.push('使用 /s cli 查看 CLI 会话');
             return lines.join('\n');
         }
+        // /session（无参数）：直接复用 /slist 逻辑（含卡片交互）
+        if (normalizedContent === '/session') {
+            return this.handle('/slist', channel, channelId, undefined, userId, threadId);
+        }
+        // /session cli（= /s cli）：列出未导入的 CLI 会话
+        if (normalizedContent === '/session cli') {
+            return this.handle('/slist cli', channel, channelId, undefined, userId, threadId);
+        }
         // /session 或 /s 命令：切换会话
         if (normalizedContent.startsWith('/session ')) {
             const sessionName = normalizedContent.slice(9).trim();
             if (!sessionName)
                 return '用法: /s <序号、会话名称或前8位UUID>';
-            const isProcessing = !!session?.processingState;
-            if (isProcessing) {
-                return `⚠️ 当前正在处理消息，无法切换会话\n请等待当前任务完成后再试`;
-            }
             let targetSession = await this.sessionManager.getSessionByName(channel, channelId, sessionName);
             // 序号切换：纯数字时按 /slist 显示的序号匹配（超过10个时隐藏非活跃话题会话）
             if (!targetSession && /^\d+$/.test(sessionName) && session) {
@@ -1426,7 +1982,7 @@ export class CommandHandler {
                     targetSession = visibleSessions[idx - 1];
                 }
                 else {
-                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /slist 查看可用会话`;
+                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /s 查看可用会话`;
                 }
             }
             if (!targetSession && sessionName.length === 8) {
@@ -1451,7 +2007,7 @@ export class CommandHandler {
                 }
             }
             if (!targetSession) {
-                return `❌ 会话不存在: ${sessionName}\n使用 /slist 查看可用会话`;
+                return `❌ 会话不存在: ${sessionName}\n使用 /s 查看可用会话`;
             }
             const lastInput = targetSession.agentSessionId
                 ? this.sessionManager.readSessionLastUserMessage(targetSession.projectPath, targetSession.agentSessionId, targetSession.agentId)
@@ -1530,14 +2086,14 @@ export class CommandHandler {
                     targetSession = visibleSessions[idx - 1];
                 }
                 else {
-                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /slist 查看可用会话`;
+                    return `❌ 序号超出范围 (1-${visibleSessions.length})\n使用 /s 查看可用会话`;
                 }
             }
             if (!targetSession && sessionName.length === 8) {
                 targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
             }
             if (!targetSession) {
-                return `❌ 会话不存在: ${sessionName}\n使用 /slist 查看可用会话`;
+                return `❌ 会话不存在: ${sessionName}\n使用 /s 查看可用会话`;
             }
             if (targetSession.id === session.id) {
                 return `❌ 无法删除当前活跃会话\n请先切换到其他会话`;
@@ -1568,7 +2124,7 @@ export class CommandHandler {
                 const forkedSessionId = await forkAgent.forkSession(session.agentSessionId, session.projectPath, forkName);
                 const newSession = await this.sessionManager.createForkedSession(session, forkedSessionId, forkName);
                 this.eventBus.publish({ type: 'session:forked', sessionId: newSession.id, sourceSessionId: session.id, name: forkName });
-                return `✅ 会话已分支: ${newSession.name}\n新会话已激活，可以继续对话\n\n使用 /slist 查看所有会话，/s <名称> 切换回原会话`;
+                return `✅ 会话已分支: ${newSession.name}\n新会话已激活，可以继续对话\n\n使用 /s 查看所有会话，/s <名称> 切换回原会话`;
             }
             catch (error) {
                 logger.error('[CommandHandler] Fork session failed:', error);
@@ -1586,7 +2142,7 @@ export class CommandHandler {
                 return `当前不在安全模式，无需修复\n\n如需进入安全模式，请使用 /safe`;
             }
             const repairAgent = this.getAgent(repairSession.agentId);
-            const { checkSessionFile, backupSessionFile } = await import('../utils/session-file-health.js');
+            const { checkSessionFile, backupSessionFile } = await import('./session/session-file-health.js');
             try {
                 if (!repairSession.agentSessionId) {
                     await this.sessionManager.resetHealthStatus(repairSession.id);