evolclaw 3.2.0 → 3.3.0

package/dist/core/command-handler.js

@@ -1,5 +1,5 @@
 import { DEFAULT_PERMISSION_MODE } from '../types.js';
-import { hasModelSwitcher, hasPermissionController } from '../agents/claude-runner.js';
+import { hasModelSwitcher, hasPermissionController } from '../agents/runner-types.js';
 import { getCodexEfforts } from '../agents/codex-runner.js';
 import { renderCommandCardAsText } from './interaction-router.js';
 import { buildEnvelope, sendInteractionPayload } from './message/message-processor.js';
@@ -13,11 +13,13 @@ import { parseTriggerSet, parseTriggerUpdate } from './trigger/parser.js';
 import { calcNextFireAt } from './trigger/scheduler.js';
 import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../utils/npm-ops.js';
 import { tryParseChannelKey } from './channel-loader.js';
-import { loadDefaults } from '../config-store.js';
-import { loadEvolclawConfig } from '../evolclaw-config.js';
+import { loadDefaults, loadEvolclawConfig } from '../config-store.js';
 import { execAgentAction, execAgentQuery, execAgentOptions, resolveProjectPath } from './message/command-handler-agent-control.js';
+import { displaySessionTitle } from './session/session-title.js';
 const allEfforts = ['low', 'medium', 'high', 'xhigh', 'max'];
 const nonMaxEfforts = allEfforts.filter(e => e !== 'max' && e !== 'xhigh');
+const PERMISSION_MODE_KEYS = ['auto', 'bypass', 'readonly', 'plan', 'edit', 'request', 'noask'];
+const PERMISSION_MODE_USAGE = PERMISSION_MODE_KEYS.join('|');
 // ── CLI 透传（menu.action name=cli action=exec）─────────────────────────
 // 经消息通道的远程命令执行（RCE）：仅 owner、白名单内只读+配置命令、无 shell、超时+截断。
 // command → '*'(全部子命令放行) | Set(允许的子命令)。
@@ -26,6 +28,7 @@ const nonMaxEfforts = allEfforts.filter(e => e !== 'max' && e !== 'xhigh');
 const CLI_EXEC_WHITELIST = {
     status: '*',
     model: '*',
+    stats: '*',
     agent: new Set(['list', 'show', 'get']),
     aid: new Set(['list', 'show', 'lookup']),
     storage: new Set(['ls', 'quota']),
@@ -134,8 +137,12 @@ function formatIdleTime(ms) {
         return `${minutes}分钟前`;
     return '刚刚';
 }
+function isAdminRole(role) {
+    return role === 'owner' || role === 'admin';
+}
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/baseagent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade'];
+const commands = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/baseagent', '/slist', '/session', '/rename', '/stop', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade'];
+const deprecatedCommands = ['/clear'];
 // 命令别名映射
 const aliases = {
     '/s': '/session',
@@ -463,6 +470,43 @@ export class CommandHandler {
             accumulateErrors: () => true,
         };
     }
+    resolveMenuChatType(channel, channelId, explicit) {
+        if (explicit)
+            return explicit;
+        const active = this.sessionManager.getActiveSessionSync(channel, channelId);
+        return active?.chatType === 'group' ? 'group' : 'private';
+    }
+    canReadTopics(role) {
+        return role !== 'anonymous';
+    }
+    canDeleteTopic(role, chatType, topic, userId) {
+        if (role === 'anonymous')
+            return false;
+        if (isAdminRole(role))
+            return true;
+        if (chatType === 'group')
+            return false;
+        return !!userId && topic.metadata?.peerId === userId;
+    }
+    buildTopicMenuItem(s) {
+        const displayName = displaySessionTitle(s.name, s.threadId || s.id.slice(0, 8));
+        const item = {
+            value: s.threadId,
+            label: displayName,
+        };
+        if (s.agentSessionId) {
+            item.agentSessionId = s.agentSessionId;
+            const fileInfo = this.sessionManager.getSessionFileInfo(s.projectPath, s.agentSessionId, s.agentId);
+            if (fileInfo.turns)
+                item.turns = fileInfo.turns;
+            const firstMsg = this.sessionManager.readSessionFirstMessage(s.projectPath, s.agentSessionId, s.agentId);
+            if (firstMsg)
+                item.preview = firstMsg.length > 80 ? firstMsg.slice(0, 80) + '...' : firstMsg;
+        }
+        if (s.updatedAt)
+            item.lastActive = s.updatedAt;
+        return item;
+    }
     /**
      * 返回结构化命令菜单（供 menu.query 使用）
      * owner 看到全部命令，admin 看到管理级命令（不含 owner-only），guest 仅看到用户级命令
@@ -470,9 +514,16 @@ export class CommandHandler {
     getMenuItems(role, chatType = 'private') {
         const isOwner = role === 'owner';
         const isAdmin = role === 'owner' || role === 'admin';
+        const canReadTopic = role !== 'anonymous';
         const items = [];
         if (!isAdmin && chatType === 'group') {
             return [
+                ...(canReadTopic ? [{
+                        group: '话题管理',
+                        commands: [
+                            { cmd: '/topic', label: '话题管理', desc: '查看当前聊天的话题会话', next: { type: 'select', dynamic: true } },
+                        ]
+                    }] : []),
                 {
                     group: '其他',
                     commands: [
@@ -488,6 +539,7 @@ export class CommandHandler {
             commands: [
                 { cmd: '/new', label: '创建新会话', desc: '清空历史，开始全新对话', next: { type: 'text' } },
                 { cmd: '/s', label: '切换会话', desc: '切换到同项目下的其他会话', next: { type: 'select', dynamic: true } },
+                ...(canReadTopic ? [{ cmd: '/topic', label: '话题管理', desc: '查看与管理当前聊天的话题会话', next: { type: 'select', dynamic: true } }] : []),
                 { cmd: '/name', label: '重命名当前会话', desc: '为当前会话设置一个易识别的名称', next: { type: 'text' } },
                 { cmd: '/del', label: '删除指定会话', desc: '永久删除一个非活跃会话', next: { type: 'select', dynamic: true } },
                 ...(isAdmin ? [
@@ -526,6 +578,7 @@ export class CommandHandler {
                                 ...(isOwner ? [
                                     { value: 'auto', label: '自动模式', desc: '根据风险等级自动决定是否审批' },
                                     { value: 'bypass', label: '免审批模式', desc: '跳过所有工具审批确认' },
+                                    { value: 'readonly', label: '只读模式', desc: '允许读取和临时目录写入，拒绝项目文件修改' },
                                     { value: 'plan', label: '计划模式', desc: '仅允许只读操作，写操作需审批' },
                                     { value: 'edit', label: '编辑模式', desc: '允许文件编辑，其他操作需审批' },
                                     { value: 'request', label: '请求模式', desc: '所有操作均需审批' },
@@ -576,7 +629,7 @@ export class CommandHandler {
         return items;
     }
     /** 动态子菜单：根据 cmd 路径返回选项列表（供 menu.query + cmd 使用） */
-    async getSubMenuItems(cmd, channel, channelId, userId, args) {
+    async getSubMenuItems(cmd, channel, channelId, userId, args, overrideIdentity, _explicitChatType) {
         const session = await this.sessionManager.getActiveSession(channel, channelId);
         // ── 进程级 /agent list（owners 鉴权） ──
         if (cmd === '/agent') {
@@ -595,28 +648,44 @@ export class CommandHandler {
             if (!manager)
                 return [];
             const scope = args?.options === 'all' ? 'all' : 'enabled';
-            const role = this.sessionManager.resolveIdentity(channel, userId).role;
+            const role = (overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId)).role;
             const isAdmin = role === 'owner' || role === 'admin';
             const all = manager.listAll();
             const list = scope === 'all' ? all.active.concat(all.history) : manager.listActive();
             const visible = isAdmin ? list
                 : list.filter((t) => t.createdByPeerId === (userId ?? '') && t.createdByChannel === channel);
             return visible.map((t) => ({
+                // 透传完整 trigger 字段（ECWeb Triggers 表逐列渲染需要）
+                ...t,
                 value: t.id,
                 label: t.name,
                 desc: `${t.scheduleType}${t.nextFireAt ? ` | 下次 ${new Date(t.nextFireAt).toLocaleString()}` : ''}`,
+                // 状态标识：history 条目带 doneReason（fired/cancelled/expired），active 条目恒为 'active'
+                status: t.doneReason ?? 'active',
             }));
         }
+        if (cmd === '/topic') {
+            const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId);
+            if (!this.canReadTopics(identity.role)) {
+                throw { code: 'FORBIDDEN', message: '无权限查看话题' };
+            }
+            const sessions = await this.sessionManager.listSessions(channel, channelId);
+            return sessions
+                .filter(s => !!s.threadId)
+                .map(s => this.buildTopicMenuItem(s));
+        }
         if (cmd === '/s' || cmd === '/session' || cmd === '/del') {
             const sessions = await this.sessionManager.listSessions(channel, channelId);
             const active = cmd === '/del' ? await this.sessionManager.getActiveSession(channel, channelId) : null;
             const currentSession = session;
             const items = sessions
+                .filter(s => !s.threadId)
                 .filter(s => !active || s.id !== active.id)
                 .map(s => {
+                const displayName = displaySessionTitle(s.name, s.id.slice(0, 8));
                 const item = {
                     value: s.name || s.id.slice(0, 8),
-                    label: s.name || s.id.slice(0, 8),
+                    label: displayName,
                     selected: currentSession ? s.id === currentSession.id : false,
                 };
                 if (s.agentSessionId) {
@@ -707,7 +776,7 @@ export class CommandHandler {
             const permAgent = this.getAgent(channel, session?.agentId);
             const validModes = hasPermissionController(permAgent)
                 ? permAgent.listModes().filter(m => m.available).map(m => m.key)
-                : ['auto', 'bypass', 'plan', 'edit', 'request', 'noask'];
+                : [...PERMISSION_MODE_KEYS];
             return validModes.map(m => ({ value: m, label: m, selected: m === currentMode }));
         }
         return null;
@@ -730,7 +799,7 @@ export class CommandHandler {
         return s ? null : { error: '当前无活跃会话', code: 'NO_ACTIVE_SESSION' };
     }
     /** menu.query — 查询当前值。 */
-    async execMenuQuery(cmd, channel, channelId, userId, args) {
+    async execMenuQuery(cmd, channel, channelId, userId, args, _explicitChatType) {
         const cmdBase = cmd.trim().split(' ')[0];
         if (!cmdBase)
             return { error: '缺少命令', code: 'MISSING_CMD' };
@@ -790,6 +859,54 @@ export class CommandHandler {
                 data.lastError = { type: health.lastErrorType || 'unknown', message: health.lastError.substring(0, 100) };
             return { data };
         }
+        if (cmdBase === '/topic') {
+            const identity = this.sessionManager.resolveIdentity(channel, userId);
+            if (!this.canReadTopics(identity.role)) {
+                return { error: '无权限查看话题', code: 'FORBIDDEN' };
+            }
+            const target = (args?.target ?? '').toString().trim();
+            if (!target)
+                return { error: '缺少 args.target', code: 'MISSING_VALUE' };
+            const topic = await this.sessionManager.getThreadSession(channel, channelId, target);
+            if (!topic)
+                return { error: '话题不存在', code: 'NOT_FOUND' };
+            const sessionKey = this.getQueueKey(topic, channel, channelId);
+            const sessionAgent = this.getAgent(channel, topic.agentId);
+            const isProcessing = this.messageQueue.isProcessing(sessionKey) || sessionAgent.hasActiveStream(sessionKey);
+            const queueLength = this.messageQueue.getQueueLength(sessionKey);
+            const health = await this.sessionManager.getHealthStatus(topic.id);
+            let processingDuration;
+            if (isProcessing && topic.processingState) {
+                const elapsed = Date.now() - parseInt(topic.processingState, 10);
+                if (!isNaN(elapsed) && elapsed > 0)
+                    processingDuration = Math.floor(elapsed / 1000);
+            }
+            let turns = 0;
+            if (topic.agentSessionId) {
+                turns = this.sessionManager.getSessionFileInfo(topic.projectPath, topic.agentSessionId, topic.agentId).turns;
+            }
+            const data = {
+                threadId: topic.threadId,
+                name: topic.name || null,
+                agentSessionId: topic.agentSessionId || null,
+                status: isProcessing ? 'processing' : 'idle',
+                createdAt: topic.createdAt,
+                updatedAt: topic.updatedAt,
+            };
+            if (processingDuration !== undefined)
+                data.processingDuration = processingDuration;
+            if (queueLength > 0)
+                data.queueLength = queueLength;
+            if (turns > 0)
+                data.turns = turns;
+            if (health.lastSuccessTime)
+                data.lastSuccess = health.lastSuccessTime;
+            if (health.consecutiveErrors)
+                data.consecutiveErrors = health.consecutiveErrors;
+            if (health.lastError)
+                data.lastError = { type: health.lastErrorType || 'unknown', message: health.lastError.substring(0, 100) };
+            return { data };
+        }
         if (cmdBase === '/baseagent') {
             const value = session?.agentId ?? evolagent?.config?.active_baseagent ?? null;
             return { data: { baseagent: value } };
@@ -863,6 +980,13 @@ export class CommandHandler {
                     data.version = pkg.version;
             }
             catch { }
+            try {
+                const fp = path.join(getPackageRoot(), 'node_modules', '@agentunion', 'fastaun', 'package.json');
+                const fp2 = JSON.parse(fs.readFileSync(fp, 'utf-8'));
+                if (fp2?.version)
+                    data.fastaunVersion = fp2.version;
+            }
+            catch { }
             const channels = owningAgent?.channelInstanceNames?.() ?? [];
             if (channels.length)
                 data.channels = channels;
@@ -871,7 +995,7 @@ export class CommandHandler {
         return { error: `不支持 query: ${cmdBase}`, code: 'NOT_SUPPORTED' };
     }
     /** menu.update — 写入新值。 */
-    async execMenuUpdate(cmd, value, channel, channelId, userId) {
+    async execMenuUpdate(cmd, value, channel, channelId, userId, overrideIdentity) {
         const cmdBase = cmd.trim().split(' ')[0];
         if (!cmdBase)
             return { error: '缺少命令', code: 'MISSING_CMD' };
@@ -879,7 +1003,7 @@ export class CommandHandler {
         if (!arg)
             return { error: '缺少 value 参数', code: 'MISSING_VALUE' };
         const { session, evolagent } = await this.loadMenuContext(channel, channelId);
-        const identity = this.sessionManager.resolveIdentity(channel, userId);
+        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId);
         // ── 关系级 /trigger update（调度参数，value 为 JSON 字符串） ──
         if (cmdBase === '/trigger') {
             const owningAgent = this.getOwningAgent(channel);
@@ -1020,7 +1144,7 @@ export class CommandHandler {
             const permAgent = this.getAgent(channel, session.agentId);
             const validModes = hasPermissionController(permAgent)
                 ? permAgent.listModes().filter(m => m.available).map(m => m.key)
-                : ['auto', 'bypass', 'plan', 'edit', 'request', 'noask'];
+                : [...PERMISSION_MODE_KEYS];
             if (!validModes.includes(arg))
                 return { error: `无效模式: ${arg}`, code: 'INVALID_VALUE' };
             const metadata = { ...(session.metadata || {}), permissionMode: arg };
@@ -1052,14 +1176,14 @@ export class CommandHandler {
         return { error: `不支持 update: ${cmdBase}`, code: 'NOT_SUPPORTED' };
     }
     /** menu.action — 触发动词。 */
-    async execMenuAction(cmd, action, args, channel, channelId, userId) {
+    async execMenuAction(cmd, action, args, channel, channelId, userId, overrideIdentity, explicitChatType) {
         const cmdBase = cmd.trim().split(' ')[0];
         if (!cmdBase)
             return { error: '缺少命令', code: 'MISSING_CMD' };
         if (!action)
             return { error: '缺少 action', code: 'MISSING_VALUE' };
         const { session } = await this.loadMenuContext(channel, channelId);
-        const identity = this.sessionManager.resolveIdentity(channel, userId);
+        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId);
         // ── 进程级 /agent（owners 鉴权，不依赖 session/channel） ──
         // NOTE(D5): 本次进程级 /agent 仅按 evolclaw.json owners 鉴权，任意 evolagent 的 AUN
         // channel 均可作为入口。part1（daemon 控制 AID）落地后，应叠加 isControlChannel(channelId)
@@ -1072,6 +1196,19 @@ export class CommandHandler {
             if (action === 'create') {
                 a.project = resolveProjectPath(a.project, a.aid ?? '', loadDefaults());
             }
+            // reload / disable / delete 会中断 agent 正在处理的任务，执行前检查是否繁忙。
+            // 队列按 agent 名计数，故先用 registry 把 aid 解析成 name；force 跳过。
+            if ((action === 'reload' || action === 'disable' || action === 'delete') && a.aid && !a.force) {
+                const handle = this.agentRegistry?.get(a.aid) ?? null;
+                const agentName = handle?.name;
+                if (agentName) {
+                    const busy = this.messageQueue.getProcessingCountByAgent(agentName)
+                        + this.messageQueue.getQueueLengthByAgent(agentName);
+                    if (busy > 0) {
+                        return { error: `该 Agent 有 ${busy} 个任务执行中`, code: 'BUSY' };
+                    }
+                }
+            }
             return await execAgentAction(action, a, userId ?? '');
         }
         // ── 关系级 /trigger（不走 owners；复用 isAdmin + scoped 逻辑，D4 直调底层） ──
@@ -1126,11 +1263,33 @@ export class CommandHandler {
                     return { error: '触发器不存在或无权限', code: 'NOT_FOUND' };
                 manager.moveToDone(trigger.id, 'cancelled');
                 scheduler.cancel(trigger.id);
-                this.eventBus.publish({ type: 'trigger:cancelled', triggerId: trigger.id, by: userId ?? '' });
+                this.eventBus.publish({ type: 'trigger:cancelled', triggerId: trigger.id, name: trigger.name, by: userId ?? '' });
                 return { data: { id: trigger.id, cancelled: true } };
             }
             return { error: `不支持的 trigger action: ${action}`, code: 'INVALID_ARGS' };
         }
+        if (cmdBase === '/topic') {
+            if (action !== 'delete') {
+                return { error: `不支持的 topic action: ${action}`, code: 'NOT_SUPPORTED' };
+            }
+            const target = (args?.target ?? '').toString().trim();
+            if (!target)
+                return { error: '缺少 args.target', code: 'MISSING_VALUE' };
+            const topic = await this.sessionManager.getThreadSession(channel, channelId, target);
+            if (!topic)
+                return { error: '话题不存在', code: 'NOT_FOUND' };
+            const chatType = this.resolveMenuChatType(channel, channelId, explicitChatType);
+            if (!this.canDeleteTopic(identity.role, chatType, topic, userId)) {
+                return { error: '无权限删除话题', code: 'FORBIDDEN' };
+            }
+            const success = await this.sessionManager.unbindSession(topic.id);
+            if (!success)
+                return { error: '删除失败', code: 'DELETE_FAILED' };
+            this.eventBus.publish({ type: 'session:deleted', sessionId: topic.id });
+            const targetAgent = this.getAgent(channel, topic.agentId);
+            await targetAgent.closeSession?.(topic.id);
+            return { data: { deleted: true } };
+        }
         // ── /session 系列 ──
         if (cmdBase === '/session' || cmdBase === '/s') {
             if (action === 'stop') {
@@ -1204,10 +1363,37 @@ export class CommandHandler {
                 return { data: { action: 'restart', success: true } };
             }
             if (action === 'check') {
-                return await this.delegateAsAction(action, '/check', channel, channelId, userId);
+                const r = await this.delegateAsAction(action, '/check', channel, channelId, userId, { overrideIdentity });
+                const structured = r.data?.structured ?? null;
+                if (structured)
+                    return { data: { ...r.data, ...structured } };
+                return r;
             }
             if (action === 'upgrade') {
-                return await this.delegateAsAction(action, '/upgrade', channel, channelId, userId);
+                const devMode = isLinkedInstall();
+                const localEvolclaw = getLocalVersion();
+                // fastaun 本地版本：从 node_modules 读取（与 menu.query name=system 一致）
+                let localFastaun = null;
+                try {
+                    const fp = path.join(getPackageRoot(), 'node_modules', '@agentunion', 'fastaun', 'package.json');
+                    localFastaun = JSON.parse(fs.readFileSync(fp, 'utf-8'))?.version ?? null;
+                }
+                catch { }
+                const [evolclawRemote, fastaunRemote, ecwebRemote] = await Promise.all([
+                    checkLatestVersion('evolclaw'),
+                    checkLatestVersion('@agentunion/fastaun'),
+                    checkLatestVersion('evolclaw-web'),
+                ]);
+                const cmp = (local, remote) => !!(local && remote && compareVersions(local, remote) < 0);
+                return {
+                    data: {
+                        devMode,
+                        evolclaw: { local: localEvolclaw, remote: evolclawRemote, hasUpdate: cmp(localEvolclaw, evolclawRemote) },
+                        fastaun: { local: localFastaun, remote: fastaunRemote, hasUpdate: cmp(localFastaun, fastaunRemote) },
+                        // ecweb 本地版本由 ECWeb 进程自身注入（data.ecwebVersion），此处仅给 remote
+                        ecweb: { remote: ecwebRemote },
+                    },
+                };
             }
             return { error: `不支持的 system action: ${action}`, code: 'NOT_SUPPORTED' };
         }
@@ -1232,6 +1418,79 @@ export class CommandHandler {
         }
         return { error: `不支持 action: ${cmdBase}`, code: 'NOT_SUPPORTED' };
     }
+    /** ECWeb 专用入口：注入 owner identity，进程级操作检查 owners 非空。不暴露 cli。 */
+    async execMenuForEcweb(payload) {
+        const id = payload?.id ?? '';
+        const name = payload?.name;
+        if (name === 'cli' || payload?.cmd === '/cli') {
+            return { type: 'menu.response', id, name, error: { code: 'NOT_SUPPORTED', message: 'cli 不在 ECWeb 控制范围' } };
+        }
+        const isProcessLevel = name === 'system' || name === 'agent';
+        const owners = loadEvolclawConfig().owners ?? [];
+        if (isProcessLevel && owners.length === 0) {
+            return { type: 'menu.response', id, name, error: { code: 'FORBIDDEN', message: '请在 evolclaw.json 配置 owners 后使用进程级操作' } };
+        }
+        const ECWEB_CHANNEL = '__ecweb__';
+        // payload.agent（aid 或 name）时，用该 agent 的首个 channel 实例作为 channel 参数，
+        // 让 execMenuQuery / execMenuUpdate 能按真实 agent 解析 model/effort/perm 等会话级配置。
+        // system / agent 两个进程级 name 不走此路径，仍用 ECWEB_CHANNEL。
+        const agentChannelKey = (() => {
+            if (!payload?.agent || isProcessLevel)
+                return ECWEB_CHANNEL;
+            const handle = this.agentRegistry?.get(payload.agent) ?? null;
+            return handle?.channelInstanceNames()?.[0] ?? ECWEB_CHANNEL;
+        })();
+        const ownerIdentity = { role: 'owner', mode: 'interactive' };
+        // 进程级操作用 owners[0] 让 isProcessLevelOwner() 通过；其余传 undefined
+        const userId = isProcessLevel ? (owners[0] ?? '') : undefined;
+        const nameMap = {
+            pwd: '/pwd', session: '/session', baseagent: '/baseagent', model: '/model',
+            topic: '/topic',
+            effort: '/effort', chatmode: '/chatmode', dispatch: '/dispatch',
+            permission: '/perm', activity: '/activity', system: '/system',
+            agent: '/agent', trigger: '/trigger',
+        };
+        const cmd = name ? (nameMap[name] ?? payload.cmd) : payload.cmd;
+        try {
+            switch (payload?.type) {
+                case 'menu.list':
+                    return { type: 'menu.response', id, data: this.getMenuItems('owner', 'private') };
+                case 'menu.query': {
+                    if (!cmd)
+                        return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
+                    const r = await this.execMenuQuery(cmd, agentChannelKey, agentChannelKey, userId, payload.args);
+                    return ecwebResp(id, name, r);
+                }
+                case 'menu.options': {
+                    if (!cmd)
+                        return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
+                    const data = await this.getSubMenuItems(cmd, agentChannelKey, agentChannelKey, userId, payload.args, ownerIdentity) ?? [];
+                    return { type: 'menu.response', id, name, data };
+                }
+                case 'menu.update': {
+                    if (!cmd)
+                        return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
+                    if (!payload.value)
+                        return ecwebErr(id, name, 'MISSING_VALUE', '缺少 value');
+                    const r = await this.execMenuUpdate(cmd, payload.value, agentChannelKey, agentChannelKey, userId, ownerIdentity);
+                    return ecwebResp(id, name, r);
+                }
+                case 'menu.action': {
+                    if (!cmd)
+                        return ecwebErr(id, name, 'MISSING_CMD', '缺少 name/cmd');
+                    if (!payload.action)
+                        return ecwebErr(id, name, 'MISSING_VALUE', '缺少 action');
+                    const r = await this.execMenuAction(cmd, payload.action, payload.args, agentChannelKey, agentChannelKey, userId, ownerIdentity);
+                    return ecwebResp(id, name, r);
+                }
+                default:
+                    return ecwebErr(id, name, 'NOT_SUPPORTED', `未知类型: ${payload?.type}`);
+            }
+        }
+        catch (e) {
+            return ecwebErr(id, name, 'INTERNAL', e?.message ?? String(e));
+        }
+    }
     /**
      * CLI 透传执行：spawn `node dist/cli/index.js <argv>` 子进程，捕获输出回传。
      * 不 in-process 调用（CLI handler 用 console.log + process.exit，spawn 行为与终端一致且隔离）。
@@ -1304,7 +1563,7 @@ export class CommandHandler {
     /** 把 menu.action 委派给已有 slash 命令处理逻辑，把 OutboundPayload 包成结构化结果。 */
     async delegateAsAction(action, slashCmd, channel, channelId, userId, opts = {}) {
         try {
-            const result = await this._handleInternal(slashCmd, channel, channelId, undefined, userId);
+            const result = await this._handleInternal(slashCmd, channel, channelId, undefined, userId, undefined, undefined, undefined, undefined, undefined, opts.overrideIdentity);
             if (result == null) {
                 // null / undefined: 命令未识别或前置守卫拦截（如 idle 检查），视为失败
                 return { error: '命令未执行（可能被前置守卫拦截）', code: 'EXEC_FAILED' };
@@ -1319,6 +1578,8 @@ export class CommandHandler {
             const data = { action, success: true };
             if (payload.text)
                 data.message = payload.text;
+            if (payload.structured)
+                data.structured = payload.structured;
             // 对于切换/创建类动作，附加切换后的活跃 session 信息便于客户端继续操作
             if (opts.enrichSession) {
                 const newSession = await this.sessionManager.getActiveSession(channel, channelId);
@@ -1344,13 +1605,13 @@ export class CommandHandler {
         const result = await this._handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID);
         return result;
     }
-    async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID) {
+    async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity) {
         // 卡片回调的 chatType 不可靠（飞书 bot 单聊 chatId 也是 oc_ 前缀），
         // 不应覆盖 session 中已有的正确值
         if (source === 'card-trigger')
             chatType = undefined;
         // 解析身份（按实例名）
-        const identity = this.sessionManager.resolveIdentity(channel, userId);
+        const identity = overrideIdentity ?? this.sessionManager.resolveIdentity(channel, userId);
         const policy = this.getPolicy(channel);
         // 按当前会话选择 agent 后端
         const activeSession = await this.sessionManager.getActiveSession(channel, channelId);
@@ -1403,12 +1664,12 @@ export class CommandHandler {
         }
         // 空闲检查：某些命令需要等待当前会话空闲
         // 原则：仅对"写/破坏性"形态拦截，纯读/用法提示的无参形态始终放行
-        // - 始终需要 idle（无参即写）：/clear /compact /repair /fork /new
+        // - 始终需要 idle（无参即写）：/compact /repair /fork /new
         // - 仅带参时需要 idle（无参是列表/用法）：/session /baseagent /rewind
         // - /chatmode：在 handler 内部自行做写操作的 idle 检查
         // - /dispatch：在 handler 内部自行做写操作的 idle 检查
         // - /safe：已禁用 no-op，不再要求 idle
-        const idleAlways = ['/clear', '/compact', '/repair', '/fork', '/new'];
+        const idleAlways = ['/compact', '/repair', '/fork', '/new'];
         const idleWhenArg = ['/session', '/baseagent', '/rewind'];
         const needsIdle = idleAlways.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' ')) ||
             idleWhenArg.some(cmd => normalizedContent.startsWith(cmd + ' '));
@@ -1436,7 +1697,8 @@ export class CommandHandler {
         // 检查是否以 / 开头（可能是命令）
         if (normalizedContent.startsWith('/')) {
             const inputCmd = normalizedContent.split(' ')[0];
-            const isValidCommand = commands.some(cmd => normalizedContent.startsWith(cmd));
+            const isValidCommand = commands.some(cmd => normalizedContent.startsWith(cmd)) ||
+                deprecatedCommands.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' '));
             if (!isValidCommand) {
                 const similar = commands.find(cmd => {
                     const distance = levenshteinDistance(inputCmd, cmd);
@@ -1450,7 +1712,8 @@ export class CommandHandler {
                 }
             }
         }
-        const isCmd = commands.some(cmd => normalizedContent.startsWith(cmd));
+        const isCmd = commands.some(cmd => normalizedContent.startsWith(cmd)) ||
+            deprecatedCommands.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' '));
         if (!isCmd)
             return undefined;
         // /help 命令不需要会话
@@ -1511,7 +1774,7 @@ export class CommandHandler {
                 '',
                 '🔐 权限管理：',
                 '  /perm - 查看当前权限模式',
-                ...(isOwner ? ['  /perm <auto|bypass|request|edit|plan|noask> - 切换权限模式'] : []),
+                ...(isOwner ? [`  /perm <${PERMISSION_MODE_USAGE}> - 切换权限模式`] : []),
                 '  /perm allow|always|deny - 审批权限请求',
                 '',
                 '🛠️ 运维：',
@@ -1558,7 +1821,7 @@ export class CommandHandler {
             }
             // 权限管理
             if (isAdmin) {
-                cmds.push({ command: '/perm', args: isOwner ? '<auto|bypass|request|edit|plan|noask>' : undefined, description: '查看当前权限模式', category: '权限管理', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/perm', args: isOwner ? `<${PERMISSION_MODE_USAGE}>` : undefined, description: '查看当前权限模式', category: '权限管理', roles: ['admin', 'owner'] });
                 cmds.push({ command: '/perm', args: 'allow|always|deny', description: '审批权限请求', category: '权限管理', roles: ['admin', 'owner'] });
             }
             // 运维
@@ -1690,11 +1953,11 @@ export class CommandHandler {
                     }
                 }
                 // 不是已知模式名也不是 allow/deny
-                const modeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : 'auto|bypass|request|edit|plan|noask';
+                const modeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : PERMISSION_MODE_USAGE;
                 return { kind: 'command.error', text: `❌ 未知参数: ${arg}\n用法: /perm <${modeKeys}> 或 /perm allow|always|deny` };
             }
             // 双参数不再支持，提示正确用法
-            const allModeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : 'auto|bypass|request|edit|plan|noask';
+            const allModeKeys = hasPermissionController(permAgent) ? permAgent.listModes().map(m => m.key).join('|') : PERMISSION_MODE_USAGE;
             return { kind: 'command.error', text: `❌ 未知参数: ${args}\n用法: /perm <${allModeKeys}> 或 /perm allow|always|deny` };
         }
         // /ask 命令：回答 AskUserQuestion / ExitPlanMode 的交互式问题
@@ -1864,7 +2127,7 @@ export class CommandHandler {
             const newSession = await this.sessionManager.switchAgent(channel, channelId, session.projectPath, args);
             const hasExistingSession = newSession.agentSessionId ? '（恢复已有会话）' : '（新建会话）';
             const projectName = this.getProjectName(session.projectPath);
-            let agentSwitchResponse = `✓ 已切换 Agent: ${args}\n  项目: ${projectName}\n  会话: ${newSession.name || '(未命名)'}\n  ${hasExistingSession}`;
+            let agentSwitchResponse = `✓ 已切换 Agent: ${args}\n  项目: ${projectName}\n  会话: ${displaySessionTitle(newSession.name, '(未命名)')}\n  ${hasExistingSession}`;
             if (source === 'card-trigger')
                 return null;
             return { kind: 'command.result', text: agentSwitchResponse };
@@ -2352,7 +2615,8 @@ export class CommandHandler {
             const sessionKey = stopSession.id;
             const queueLength = this.messageQueue.getQueueLength(sessionKey);
             const hasActive = stopAgent.hasActiveStream(sessionKey);
-            if (queueLength === 0 && !hasActive) {
+            const isProcessing = this.messageQueue.isProcessing(sessionKey);
+            if (queueLength === 0 && !hasActive && !isProcessing) {
                 return { kind: 'command.result', text: '当前没有正在处理的任务' };
             }
             await stopAgent.interrupt(sessionKey);
@@ -2367,37 +2631,10 @@ export class CommandHandler {
             this.sessionManager.clearProcessing(sessionKey);
             return { kind: 'command.result', text: '✓ 已发送中断信号，任务将尽快停止' };
         }
-        // /clear 命令：通过 SDK /clear 清空会话历史
+        // /clear 已移除：Claude/Codex/Gemini 对“清空当前 backend 历史”的语义不一致。
+        // 统一使用 /new 创建新会话来开始全新上下文。
         if (normalizedContent === '/clear') {
-            const result = await this.ensureSession(channel, channelId, threadId, chatType);
-            if ('error' in result)
-                return { kind: 'command.error', text: result.error };
-            const { session } = result;
-            const sessionAgent = this.getAgent(channel, session.agentId);
-            if (!sessionAgent.capabilities?.clear) {
-                return { kind: 'command.error', text: `❌ 当前 Agent (${sessionAgent.name}) 不支持 /clear\n\n可使用 /new 创建新会话替代` };
-            }
-            if (!session.agentSessionId) {
-                return { kind: 'command.error', text: '❌ 当前会话没有历史记录，无需清空' };
-            }
-            const projectPath = path.isAbsolute(session.projectPath)
-                ? session.projectPath
-                : path.resolve(process.cwd(), session.projectPath);
-            const releaseLock = this.messageQueue.acquireLock(session.id);
-            try {
-                const cleared = await sessionAgent.clearSession(session.id, session.agentSessionId, projectPath);
-                if (cleared) {
-                    await this.sessionManager.updateAgentSessionIdBySessionId(session.id, '');
-                    sessionAgent.updateSessionId(session.id, '');
-                    return { kind: 'command.result', text: '✅ 已清空当前会话的对话历史' };
-                }
-                else {
-                    return { kind: 'command.error', text: '❌ 清空会话失败，请稍后重试' };
-                }
-            }
-            finally {
-                releaseLock();
-            }
+            return { kind: 'command.error', text: '⚠️ /clear 已移除\n\n请使用 /new [名称] 创建新会话来开始全新上下文。旧会话会保留，可通过 /s 查看或切换。' };
         }
         // /compact 命令：手动压缩会话上下文
         if (normalizedContent === '/compact') {
@@ -2422,7 +2659,10 @@ export class CommandHandler {
                 }
                 const compacted = await sessionAgent.compactSession(session.id, session.agentSessionId, projectPath);
                 if (compacted) {
-                    return { kind: 'command.result', text: '✅ 会话上下文已压缩' };
+                    return {
+                        kind: 'command.result',
+                        text: '✅ 会话压缩完成',
+                    };
                 }
                 else {
                     return { kind: 'command.error', text: '❌ 会话压缩失败，请稍后重试' };
@@ -2491,7 +2731,7 @@ export class CommandHandler {
             const chatModeLine = `会话模式: ${sessionMode}`;
             const dispatchModeLine = session.chatType === 'group' ? `分发模式: ${dispatchMode}` : null;
             if (isAdmin) {
-                lines.push(`📊 ${isThread ? '话题' : '会话'}状态 (Agent: ${agentName})：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${session.name || '(未命名)'}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, chatModeLine, ...(dispatchModeLine ? [dispatchModeLine] : []), `会话轮数: ${sessionTurns}`);
+                lines.push(`📊 ${isThread ? '话题' : '会话'}状态 (Agent: ${agentName})：`, `渠道: ${this.resolveChannelType(channel)} / 项目: ${projectName} / 会话: ${displaySessionTitle(session.name, '(未命名)')}`, `会话ID: ${session.id}`, `项目路径: ${session.projectPath}`, `会话状态: ${sessionStatus}`, chatModeLine, ...(dispatchModeLine ? [dispatchModeLine] : []), `会话轮数: ${sessionTurns}`);
                 if (health.consecutiveErrors > 0) {
                     lines.push(`异常计数: ${health.consecutiveErrors}`);
                 }
@@ -2517,6 +2757,9 @@ export class CommandHandler {
                 }
             }
             const projectPath = this.getEffectiveDefaultPath(channel);
+            if (sendMessage && session) {
+                await sendMessage(channelId, `⏳ 正在创建新会话${sessionName ? `: ${sessionName}` : ''}...`, this.getReplyContext(session));
+            }
             const newSession = await this.sessionManager.createNewSession(channel, channelId, projectPath, sessionName, session?.agentId || this.primaryRunnerKey);
             this.eventBus.publish({
                 type: 'session:created',
@@ -2539,12 +2782,16 @@ export class CommandHandler {
         if (normalizedContent === '/check' || normalizedContent.startsWith('/check ')) {
             const subCmd = normalizedContent.slice('/check'.length).trim();
             // 限定可见渠道：agent-owned 通道仅显示该 agent 名下的渠道；
-            // default 通道也仅显示 default 的渠道（不再展示 evolagents 的渠道）
+            // __ecweb__ 是 ECWeb 系统级入口，展示全量渠道
             const checkOwningAgent = this.getOwningAgent(channel);
             let allowedChannels;
             if (checkOwningAgent) {
                 allowedChannels = new Set(checkOwningAgent.channelInstanceNames());
             }
+            else if (channel === '__ecweb__') {
+                // ECWeb 全局视图：展示所有渠道
+                allowedChannels = new Set(this.adapters.keys());
+            }
             else {
                 // default 范围：不再有 default channel 概念，等价于"所有 channel"
                 const defaultNames = [];
@@ -2632,7 +2879,29 @@ export class CommandHandler {
                     lines.push(`  平均响应耗时: ${(h.avgResponseMs / 1000).toFixed(1)}s`);
                 }
             }
-            return { kind: 'command.result', text: lines.join('\n') };
+            const checkSnap = this.statsCollector?.getSnapshot(currentAgentName);
+            const structured = {
+                channels: [...groups.entries()].map(([type, instances]) => ({ type, instances })),
+                queue: {
+                    pending: this.messageQueue.getQueueLengthByAgent(currentAgentName),
+                    processing: this.messageQueue.getProcessingCountByAgent(currentAgentName),
+                },
+                uptimeMs,
+                lastHour: checkSnap?.lastHour ?? null,
+                evolagents: this.agentRegistry?.list().map((ag) => ({
+                    name: ag.name, aid: ag.aid ?? '', status: ag.status,
+                    baseagent: ag.baseagent ?? null,
+                    activeTasks: this.messageQueue.getProcessingCountByAgent(ag.name)
+                        + this.messageQueue.getQueueLengthByAgent(ag.name),
+                    error: ag.error,
+                })) ?? [],
+                baseagents: [...this.agentMap.entries()].map(([key, runner]) => ({
+                    name: key.split('::')[1] ?? key,
+                    activeStreams: runner.activeStreamCount?.() ?? 0,
+                    healthy: true,
+                })),
+            };
+            return { kind: 'command.result', text: lines.join('\n'), structured };
         }
         // /restart 命令：重启服务（owner only）
         if (normalizedContent === '/restart') {
@@ -2873,7 +3142,7 @@ export class CommandHandler {
                 }
                 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 currentProjectSessions = sessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId && !s.threadId);
                 const dbSessionIds = new Set(currentProjectSessions.map(s => s.agentSessionId).filter(Boolean));
                 const orphanCliSessions = cliSessions.filter(c => !dbSessionIds.has(c.uuid));
                 if (orphanCliSessions.length === 0) {
@@ -2923,7 +3192,7 @@ export class CommandHandler {
             }
             // /slist — 仅显示 EvolClaw 会话
             const sessions = await this.sessionManager.listSessions(channel, channelId);
-            const currentProjectSessions = sessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId && !s.threadId?.startsWith('trigger-'));
+            const currentProjectSessions = sessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId && !s.threadId);
             // 从 SDK 同步会话名称（发现 CLI 改名）
             try {
                 const sdkSessions = await this.sessionManager.listSdkSessions(session.projectPath, session.agentId);
@@ -2941,20 +3210,16 @@ export class CommandHandler {
                 logger.debug('[CommandHandler] SDK listSessions sync failed (non-critical):', error);
             }
             // 构建可显示会话列表（复用于卡片和文本）
-            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 name = displaySessionTitle(s.name, '(未命名)');
                 const idleTime = formatIdleTime(Date.now() - s.updatedAt);
                 const fileMissing = !!(s.agentSessionId && !this.sessionManager.checkSessionFileExists(s.projectPath, s.agentSessionId, s.agentId));
                 let status = '[空闲]';
@@ -2973,10 +3238,9 @@ export class CommandHandler {
             if (this.interactionRouter && displaySessions.length >= 1) {
                 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}`;
+                    return `${prefix} ${ds.index}. ${fileMark}**${ds.name}** ${uuid}  ${ds.idleTime} ${ds.status}`;
                 });
                 const interaction = {
                     type: 'interaction',
@@ -3011,22 +3275,19 @@ export class CommandHandler {
                 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}`);
+                        lines.push(`${prefix} ${num} ❌ ${ds.name} ${uuid} - ${ds.idleTime} ${ds.status}`);
                     }
                     else {
-                        lines.push(`${prefix} ${num} ${threadTag}${ds.name} ${uuid} - ${ds.idleTime} ${ds.status}`);
+                        lines.push(`${prefix} ${num} ${ds.name} ${uuid} - ${ds.idleTime} ${ds.status}`);
                     }
                 }
-                const hiddenCount = currentProjectSessions.length - displayIndex - topicCount;
-                if (topicCount > 0 || hiddenCount > 0) {
+                const hiddenCount = currentProjectSessions.length - displayIndex;
+                if (hiddenCount > 0) {
                     const parts = [];
                     if (hiddenCount > 0)
                         parts.push(`${hiddenCount} 个更早的会话`);
-                    if (topicCount > 0)
-                        parts.push(`${topicCount} 个话题会话`);
                     lines.push(`\n  (已隐藏 ${parts.join('、')})`);
                 }
                 lines.push('');
@@ -3055,12 +3316,7 @@ export class CommandHandler {
             if (!targetSession && /^\d+$/.test(sessionName) && session) {
                 const idx = parseInt(sessionName, 10);
                 const allSessions = await this.sessionManager.listSessions(channel, channelId);
-                const projectSessions = allSessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId);
-                // 与 /slist 显示逻辑一致：超过10个时隐藏非活跃话题会话
-                const hideTopics = projectSessions.length > 10;
-                const visibleSessions = hideTopics
-                    ? projectSessions.filter(s => !s.threadId)
-                    : projectSessions;
+                const visibleSessions = allSessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId && !s.threadId);
                 if (idx >= 1 && idx <= visibleSessions.length) {
                     targetSession = visibleSessions[idx - 1];
                 }
@@ -3071,6 +3327,9 @@ export class CommandHandler {
             if (!targetSession && sessionName.length >= 8) {
                 targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
             }
+            if (targetSession?.threadId) {
+                return { kind: 'command.error', text: `❌ 话题会话不支持通过 /s 切换\n请在对应话题内继续对话` };
+            }
             const canImport = policy.canImportCliSession(session?.chatType || 'private', identity.role);
             if (!targetSession && sessionName.length >= 8 && canImport) {
                 const projectPaths = Object.values(this.projects);
@@ -3085,7 +3344,7 @@ export class CommandHandler {
                         const imported = await this.sessionManager.importCliSession(channel, channelId, projectPath, cliSession.uuid, currentAgentId);
                         this.eventBus.publish({ type: 'session:imported', sessionId: imported.id, agentSessionId: cliSession.uuid, projectPath });
                         const projectName = this.getProjectName(projectPath);
-                        return { kind: 'command.result', text: `✓ 已导入 CLI 会话: ${imported.name}\n  项目: ${projectName}\n  将继续之前的对话历史` };
+                        return { kind: 'command.result', text: `✓ 已导入 CLI 会话: ${displaySessionTitle(imported.name, '(未命名)')}\n  项目: ${projectName}\n  将继续之前的对话历史` };
                     }
                 }
             }
@@ -3103,10 +3362,10 @@ export class CommandHandler {
                 }
                 if (source === 'card-trigger')
                     return null;
-                return { kind: 'command.result', text: `✓ 已切换到会话: ${targetSession.name || sessionName}\n  项目: ${path.basename(targetSession.projectPath)}${lastInputLine}` };
+                return { kind: 'command.result', text: `✓ 已切换到会话: ${displaySessionTitle(targetSession.name, sessionName)}\n  项目: ${path.basename(targetSession.projectPath)}${lastInputLine}` };
             }
             if (targetSession.id === session.id) {
-                return { kind: 'command.result', text: `当前已在会话: ${targetSession.name || sessionName}` };
+                return { kind: 'command.result', text: `当前已在会话: ${displaySessionTitle(targetSession.name, sessionName)}` };
             }
             // 阻止从主会话切换到话题会话
             if (!session.threadId && targetSession.threadId) {
@@ -3120,7 +3379,7 @@ export class CommandHandler {
             const continueHint = lastInput ? '\n  将继续之前的对话历史' : '\n  当前会话未有发言';
             if (source === 'card-trigger')
                 return null;
-            return { kind: 'command.result', text: `✓ 已切换到会话: ${targetSession.name || sessionName}${continueHint}${lastInputLine}` };
+            return { kind: 'command.result', text: `✓ 已切换到会话: ${displaySessionTitle(targetSession.name, sessionName)}${continueHint}${lastInputLine}` };
         }
         // /rename 或 /name 命令：重命名当前会话
         if (normalizedContent === '/rename' || normalizedContent === '/name') {
@@ -3142,8 +3401,14 @@ export class CommandHandler {
             if (existing && existing.id !== session.id) {
                 return { kind: 'command.error', text: `❌ 会话名称 "${newName}" 已存在，请使用其他名称` };
             }
-            const oldName = session.name || '(未命名)';
+            const oldName = displaySessionTitle(session.name, '(未命名)');
             const success = await this.sessionManager.renameSession(session.id, newName);
+            if (success && session.agentSessionId) {
+                const renameAgent = this.getAgent(channel, session.agentId);
+                await renameAgent.setSessionName?.(session.agentSessionId, newName).catch(error => {
+                    logger.debug('[CommandHandler] Backend session rename sync failed:', error);
+                });
+            }
             if (!success) {
                 return { kind: 'command.error', text: `❌ 重命名失败` };
             }
@@ -3167,11 +3432,7 @@ export class CommandHandler {
             if (!targetSession && /^\d+$/.test(sessionName)) {
                 const idx = parseInt(sessionName, 10);
                 const allSessions = await this.sessionManager.listSessions(channel, channelId);
-                const projectSessions = allSessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId);
-                const hideTopics = projectSessions.length > 10;
-                const visibleSessions = hideTopics
-                    ? projectSessions.filter(s => !s.threadId)
-                    : projectSessions;
+                const visibleSessions = allSessions.filter(s => s.projectPath === session.projectPath && s.agentId === session.agentId && !s.threadId);
                 if (idx >= 1 && idx <= visibleSessions.length) {
                     targetSession = visibleSessions[idx - 1];
                 }
@@ -3182,6 +3443,9 @@ export class CommandHandler {
             if (!targetSession && sessionName.length >= 8) {
                 targetSession = await this.sessionManager.getSessionByUuidPrefix(channel, channelId, sessionName);
             }
+            if (targetSession?.threadId) {
+                return { kind: 'command.error', text: `❌ 请使用话题管理删除话题会话` };
+            }
             if (!targetSession) {
                 return { kind: 'command.error', text: `❌ 会话不存在: ${sessionName}\n使用 /s 查看可用会话` };
             }
@@ -3195,7 +3459,7 @@ export class CommandHandler {
             this.eventBus.publish({ type: 'session:deleted', sessionId: targetSession.id });
             const targetAgent = this.getAgent(channel, targetSession.agentId);
             await targetAgent.closeSession(targetSession.id);
-            return { kind: 'command.result', text: `✓ 已删除会话: ${targetSession.name || sessionName}\n会话文件已保留，可通过 CLI 访问` };
+            return { kind: 'command.result', text: `✓ 已删除会话: ${displaySessionTitle(targetSession.name, sessionName)}\n会话文件已保留，可通过 CLI 访问` };
         }
         // /fork 命令：分支当前会话
         if (normalizedContent === '/fork' || normalizedContent.startsWith('/fork ')) {
@@ -3213,8 +3477,19 @@ export class CommandHandler {
             try {
                 const forkedSessionId = await forkAgent.forkSession(session.agentSessionId, session.projectPath, forkName);
                 const newSession = await this.sessionManager.createForkedSession(session, forkedSessionId, forkName);
+                await forkAgent.updateSessionMetadata?.(forkedSessionId, {
+                    gitInfo: {
+                        branch: null,
+                        commitHash: null,
+                        repositoryUrl: null,
+                    },
+                    evolclawSessionId: newSession.id,
+                    sourceSessionId: session.id,
+                }).catch(error => {
+                    logger.debug('[CommandHandler] Backend fork metadata sync failed:', error);
+                });
                 this.eventBus.publish({ type: 'session:forked', sessionId: newSession.id, sourceSessionId: session.id, name: forkName });
-                return { kind: 'command.result', text: `✅ 会话已分支: ${newSession.name}\n新会话已激活，可以继续对话\n\n使用 /s 查看所有会话，/s <名称> 切换回原会话` };
+                return { kind: 'command.result', text: `✅ 会话已分支: ${displaySessionTitle(newSession.name, '(未命名)')}\n新会话已激活，可以继续对话\n\n使用 /s 查看所有会话，/s <名称> 切换回原会话` };
             }
             catch (error) {
                 logger.error('[CommandHandler] Fork session failed:', error);
@@ -3228,14 +3503,11 @@ export class CommandHandler {
                 return { kind: 'command.error', text: result.error };
             const { session } = result;
             const rewindAgent = this.getAgent(channel, session.agentId);
-            if (rewindAgent.name !== 'claude') {
-                return { kind: 'command.error', text: '❌ /rewind 仅支持 Claude 后端' };
-            }
             if (!session.agentSessionId) {
                 return { kind: 'command.error', text: '❌ 当前会话无历史记录\n\n请先发送一条消息，然后再使用 /rewind' };
             }
             if (!rewindAgent.getSessionMessages) {
-                return { kind: 'command.error', text: '❌ 当前 Agent 不支持 /rewind' };
+                return { kind: 'command.error', text: `❌ 当前 Agent (${rewindAgent.name}) 不支持 /rewind` };
             }
             const args = normalizedContent.slice('/rewind'.length).trim();
             if (!args) {
@@ -3379,7 +3651,7 @@ export class CommandHandler {
             }
             manager.moveToDone(trigger.id, 'cancelled');
             scheduler.cancel(trigger.id);
-            this.eventBus.publish({ type: 'trigger:cancelled', triggerId: trigger.id, by: peerId });
+            this.eventBus.publish({ type: 'trigger:cancelled', triggerId: trigger.id, name: trigger.name, by: peerId });
             return `✅ 触发器已取消：**${trigger.name}**`;
         }
         // /trigger update <name|id> [--参数...]
@@ -3410,6 +3682,38 @@ export class CommandHandler {
                 const now = Date.now();
                 patch.nextFireAt = calcNextFireAt(patch.scheduleType, patch.scheduleValue, now);
             }
+            // 跨渠道迁移：改了 targetChannel 时必须同步重算 targetChannelType，
+            // 并按 session 策略重新绑定执行会话（与 set 路径保持一致，否则 trigger
+            // 仍按旧 channelType 路由 / 仍绑在旧渠道的 boundSessionId 上）。
+            const effectiveChannel = patch.targetChannel ?? trigger.targetChannel;
+            const effectiveChannelId = patch.targetChannelId ?? trigger.targetChannelId;
+            if (patch.targetChannel) {
+                patch.targetChannelType = this.resolveChannelType(patch.targetChannel);
+            }
+            // 解析最终生效的 session 策略（patch 优先，否则沿用原 trigger）
+            const effStrategy = patch.targetSessionStrategy ?? trigger.targetSessionStrategy;
+            // 渠道或策略变化时，按策略重新绑定会话
+            if (patch.targetChannel || patch.targetSessionStrategy) {
+                if (effStrategy === 'current') {
+                    if (patch.targetChannel && patch.targetChannel !== trigger.targetChannel) {
+                        return '❌ 跨渠道不支持 --session current，请改用 latest 或 thread';
+                    }
+                    const active = await this.sessionManager.getActiveSession(effectiveChannel, effectiveChannelId);
+                    if (!active)
+                        return '❌ 目标渠道当前没有活跃会话，改用 --session latest 或先在该渠道发一条消息';
+                    patch.boundSessionId = active.id;
+                }
+                else if (effStrategy === 'thread') {
+                    const adapter = this.adapters.get(effectiveChannel);
+                    if (!adapter?.capabilities.thread)
+                        return '❌ 目标渠道不支持 thread 会话';
+                }
+                else {
+                    // latest 策略：清除旧的 boundSessionId（若有），按渠道动态取最新会话
+                    if (trigger.boundSessionId)
+                        patch.boundSessionId = undefined;
+                }
+            }
             let updated;
             try {
                 updated = manager.update(trigger.id, patch);
@@ -3450,15 +3754,26 @@ export class CommandHandler {
         const nextFireAt = calcNextFireAt(parsed.scheduleType, parsed.scheduleValue, now);
         // Auto-generate name if not provided
         const name = parsed.name ?? `trigger-${Date.now().toString(36)}`;
+        // Validate target channel exists
+        const targetChannelName = parsed.targetChannel ?? channel;
+        if (parsed.targetChannel && !this.adapters.has(parsed.targetChannel)) {
+            return { ok: false, error: `目标渠道不存在或未启用：${parsed.targetChannel}` };
+        }
+        // Validate channelId format for AUN: must look like an AID (contains '.')
+        const targetChannelType = this.resolveChannelType(targetChannelName);
+        const targetChannelId = parsed.targetChannelId ?? channelId;
+        if (targetChannelType === 'aun' && parsed.targetChannelId && !parsed.targetChannelId.includes('.')) {
+            return { ok: false, error: `AUN 渠道的 --channelid 必须是 AID 格式（如 user.agentid.pub），收到："${parsed.targetChannelId}"` };
+        }
         const trigger = {
             id: crypto.randomUUID(),
             name,
             scheduleType: parsed.scheduleType,
             scheduleValue: parsed.scheduleValue,
             nextFireAt,
-            targetChannel: parsed.targetChannel ?? channel,
-            targetChannelId: parsed.targetChannelId ?? channelId,
-            targetChannelType: this.resolveChannelType(parsed.targetChannel ?? channel),
+            targetChannel: targetChannelName,
+            targetChannelId,
+            targetChannelType,
             targetThreadId: parsed.targetThreadId,
             targetSessionStrategy: parsed.targetSessionStrategy,
             agentId: parsed.agentId,
@@ -3466,12 +3781,16 @@ export class CommandHandler {
             createdByPeerId: peerId,
             createdByChannel: channel,
             fireCount: 0,
+            failCount: 0,
             createdAt: now,
             updatedAt: now,
         };
         try {
             // Strategy-based session binding
             if (parsed.targetSessionStrategy === 'current') {
+                if (parsed.targetChannel && parsed.targetChannel !== channel) {
+                    return { ok: false, error: '跨渠道不支持 --session current，请改用 latest 或 thread' };
+                }
                 const active = await this.sessionManager.getActiveSession(channel, channelId);
                 if (!active)
                     return { ok: false, error: '当前没有活跃会话，改用 --session latest 或 thread' };
@@ -3556,12 +3875,26 @@ export class CommandHandler {
                     const detail = fileResult.filesChanged
                         ? `（恢复了 ${fileResult.filesChanged.length} 个文件）`
                         : '';
-                    results.push(`✅ 已恢复文件到第 ${turnNum} 轮之前的状态${detail}`);
+                    if (agent.capabilities?.fileRewind === 'git-head') {
+                        results.push(`✅ 已按 Git HEAD 恢复文件${detail}（Codex 当前不提供逐轮文件快照）`);
+                    }
+                    else {
+                        results.push(`✅ 已恢复文件到第 ${turnNum} 轮之前的状态${detail}`);
+                    }
                 }
             }
-            // 对话回退（延迟执行 — 下次发消息时生效）
+            // 对话回退：Codex app-server 可直接 rollback；Claude 走 resumeAt 延迟到下次消息生效。
             if (mode === 'chat' || mode === 'all') {
-                if (keepTarget) {
+                const discarded = turns.length - turnNum + 1;
+                if (agent.rollbackSessionTurns) {
+                    const ok = await agent.rollbackSessionTurns(session.agentSessionId, session.projectPath, discarded);
+                    if (!ok)
+                        return '❌ 对话回退失败';
+                    const meta = { ...(session.metadata || {}) };
+                    delete meta.resumeAt;
+                    await this.sessionManager.updateSession(session.id, { metadata: meta });
+                }
+                else if (keepTarget) {
                     const meta = { ...(session.metadata || {}), resumeAt: keepTarget.assistantUuid };
                     await this.sessionManager.updateSession(session.id, { metadata: meta });
                 }
@@ -3574,10 +3907,6 @@ export class CommandHandler {
                         agentSessionId: null,
                     });
                 }
-                const discarded = turns.length - turnNum + 1;
-                const keepDesc = keepTarget
-                    ? `回退到第 ${turnNum - 1} 轮："${keepTarget.userContent}"`
-                    : '已清空全部对话历史';
                 results.push(`✅ 已撤销第 ${turnNum} 轮${discarded > 1 ? `及后续共 ${discarded} 轮` : ''}`, keepTarget ? `下次发言将从第 ${turnNum - 1} 轮继续` : '下次发言将开始全新对话');
             }
             this.eventBus.publish({
@@ -3833,7 +4162,27 @@ export class CommandHandler {
         else if (Array.isArray(m?.content)) {
             text = m.content.filter((b) => b.type === 'text').map((b) => b.text).join(' ');
         }
-        text = text.trim().replace(/\s+/g, ' ');
+        text = text.trim();
+        // Strip injection wrappers before previewing (outermost first):
+        // 1. Interrupt wrapper: 【新消息插入】\n...\n【请无视之前中断继续处理】
+        text = text.replace(/^【新消息插入】\s*/, '').replace(/\s*【请无视之前中断继续处理】$/, '').trim();
+        // 2. Current format: ‹metadata›\ncontent  (message-renderer item.md)
+        if (text.startsWith('‹')) {
+            const nl = text.indexOf('\n');
+            if (nl !== -1)
+                text = text.slice(nl + 1).trim();
+        }
+        // 3. Legacy XML format: <messages><message sender="..." time="...">content</message></messages>
+        if (text.startsWith('<messages>')) {
+            const parts = [];
+            const re = /<message(?:\s[^>]*)?>([\s\S]*?)<\/message>/g;
+            let match;
+            while ((match = re.exec(text)) !== null)
+                parts.push(match[1].trim());
+            if (parts.length > 0)
+                text = parts.join(' ');
+        }
+        text = text.replace(/\s+/g, ' ').trim();
         if (!text)
             return '';
         return text.length > 50 ? text.substring(0, 50) + '…' : text;
@@ -3846,6 +4195,16 @@ export function isProcessLevelOwner(peerId, owners) {
         return false;
     return (owners ?? []).includes(peerId);
 }
+/** ECWeb menu.response 错误信封。 */
+function ecwebErr(id, name, code, message) {
+    return { type: 'menu.response', id, ...(name ? { name } : {}), error: { code, message } };
+}
+/** 把 execMenu* 的 {data}|{error} 结果转成 menu.response。 */
+function ecwebResp(id, name, result) {
+    return 'error' in result
+        ? { type: 'menu.response', id, ...(name ? { name } : {}), error: { code: result.code ?? 'EXEC_FAILED', message: result.error } }
+        : { type: 'menu.response', id, ...(name ? { name } : {}), data: result.data };
+}
 /** 校验 menu 路径直传的 trigger 调度参数（绕过 parseTriggerSet 文本解析后必须自校验）。
  *  返回错误字符串表示非法；返回 null 表示通过。
  *  防止非法 scheduleType/scheduleValue 传到 calcNextFireAt 产出 NaN/throw，污染 scheduler heap。 */