evolclaw 3.1.1 → 3.1.3

package/dist/core/command-handler.js

@@ -1,5 +1,7 @@
 import { DEFAULT_PERMISSION_MODE } from '../types.js';
 import { hasModelSwitcher, hasPermissionController } from '../agents/claude-runner.js';
+import { getCodexEfforts } from '../agents/codex-runner.js';
+import { resolveAnthropicConfig, resolveOpenaiConfig } from '../agents/resolve.js';
 import { renderCommandCardAsText } from './interaction-router.js';
 import { buildEnvelope, sendInteractionPayload } from './message/message-processor.js';
 import { resolvePaths, getPackageRoot } from '../paths.js';
@@ -11,22 +13,48 @@ import os from 'os';
 import { parseTriggerSet, parseTriggerUpdate } from './trigger/parser.js';
 import { calcNextFireAt } from './trigger/scheduler.js';
 import { checkLatestVersion, getLocalVersion, isLinkedInstall, compareVersions } from '../utils/npm-ops.js';
-const allEfforts = ['low', 'medium', 'high', 'max'];
-const nonMaxEfforts = allEfforts.filter(e => e !== 'max');
+const allEfforts = ['low', 'medium', 'high', 'xhigh', 'max'];
+const nonMaxEfforts = allEfforts.filter(e => e !== 'max' && e !== 'xhigh');
 function getAvailableEfforts(agent, model) {
     if (agent.name === 'claude') {
-        if (model.includes('opus'))
-            return allEfforts;
-        return nonMaxEfforts;
+        return allEfforts;
     }
     if (agent.name === 'codex') {
-        return nonMaxEfforts;
+        return getCodexEfforts(model);
     }
     return [];
 }
 function formatModelUsage(_agent, _model) {
     return '用法: /model <模型>';
 }
+function getModelListSource(owning, agent) {
+    const codexConfig = owning?.config?.baseagents?.codex;
+    const claudeConfig = owning?.config?.baseagents?.claude;
+    if (agent.name === 'codex') {
+        let resolved = {};
+        try {
+            resolved = resolveOpenaiConfig({ agents: { codex: codexConfig } }, codexConfig);
+        }
+        catch { }
+        return {
+            apiBaseUrl: resolved.baseUrl,
+            apiKey: resolved.apiKey,
+            fallbackModels: agent.listModels?.() || [],
+            owner: 'openai',
+        };
+    }
+    let resolved = {};
+    try {
+        resolved = resolveAnthropicConfig({ agents: { claude: claudeConfig } }, claudeConfig);
+    }
+    catch { }
+    return {
+        apiBaseUrl: resolved.baseUrl,
+        apiKey: resolved.apiKey,
+        fallbackModels: ['claude-opus-4-7', 'claude-opus-4-6', 'claude-sonnet-4-6'],
+        owner: 'anthropic',
+    };
+}
 /**
  * 写入用户级 ~/.claude/settings.json（与 Claude CLI 行为一致）
  */
@@ -100,16 +128,16 @@ function formatIdleTime(ms) {
     return '刚刚';
 }
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger', '/upgrade'];
+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 aliases = {
-    '/p': '/project',
     '/s': '/session',
     '/name': '/rename',
-    '/rw': '/rewind'
+    '/rw': '/rewind',
+    '/base': '/baseagent',
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/aid', '/rpc', '/storage', '/trigger', '/upgrade'];
+const quickCommandPrefixes = ['/new', '/pwd', '/help', '/evolhelp', '/status', '/restart', '/model', '/setmodel', '/effort', '/baseagent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/dispatch', '/ask', '/resume', '/base ', '/aid', '/rpc', '/storage', '/agent', '/trigger', '/upgrade'];
 export class CommandHandler {
     sessionManager;
     messageCache;
@@ -465,16 +493,6 @@ export class CommandHandler {
                 }
             ];
         }
-        if (isAdmin) {
-            items.push({
-                group: '项目管理',
-                commands: [
-                    { cmd: '/pwd', label: '显示当前项目路径', desc: '查看当前会话绑定的项目目录' },
-                    { cmd: '/p', label: '列出或切换项目', desc: '切换到其他已配置的项目', next: { type: 'select', dynamic: true } },
-                    ...(isOwner ? [{ cmd: '/bind', label: '绑定新项目目录', desc: '将当前会话绑定到指定项目路径', next: { type: 'text' } }] : []),
-                ]
-            });
-        }
         items.push({
             group: '会话管理',
             commands: [
@@ -493,7 +511,7 @@ export class CommandHandler {
             items.push({
                 group: 'Agent 与模型',
                 commands: [
-                    { cmd: '/agent', label: '切换 Agent 后端', desc: '切换当前会话使用的 AI 后端', next: { type: 'select', dynamic: true } },
+                    { cmd: '/baseagent', label: '切换 Agent 后端', desc: '切换当前会话使用的 AI 后端', next: { type: 'select', dynamic: true } },
                     { cmd: '/model', label: '切换模型', desc: '切换当前 Agent 使用的模型版本', next: { type: 'select', dynamic: true } },
                     { cmd: '/effort', label: '切换推理强度', desc: '调整模型推理深度，影响响应速度与质量', next: { type: 'select', items: [
                                 { value: 'low', label: 'Low' },
@@ -542,7 +560,7 @@ export class CommandHandler {
                                 { value: 'none', label: '不显示', desc: '关闭所有中间输出' },
                             ] } },
                     ...(isAdmin ? [
-                        { cmd: '/restart', label: '重启/重连', desc: '重启服务或重连指定渠道', next: { type: 'select', dynamic: true } },
+                        { cmd: '/restart', label: '重启服务', desc: '重启整个 EvolClaw 服务进程' },
                     ] : []),
                     ...(isOwner ? [
                         { cmd: '/file', label: '发送项目内文件', desc: '将项目目录内的文件发送给用户' },
@@ -570,22 +588,32 @@ export class CommandHandler {
     /** 动态子菜单：根据 cmd 路径返回选项列表（供 menu.query + cmd 使用） */
     async getSubMenuItems(cmd, channel, channelId, userId) {
         const session = await this.sessionManager.getActiveSession(channel, channelId);
-        if (cmd === '/s' || cmd === '/del') {
+        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 => !active || s.id !== active.id)
                 .map(s => {
-                const shortId = s.agentSessionId ? s.agentSessionId.substring(0, 8) : '';
-                const time = s.updatedAt ? formatIdleTime(Date.now() - s.updatedAt) : '';
-                const parts = [shortId, time].filter(Boolean).join(' · ');
-                return {
+                const item = {
                     value: s.name || s.id.slice(0, 8),
                     label: s.name || s.id.slice(0, 8),
-                    desc: parts || undefined,
+                    selected: currentSession ? s.id === currentSession.id : false,
                 };
+                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;
             });
-            if (cmd === '/s') {
+            if (cmd === '/s' || cmd === '/session') {
                 items.push({ value: 'cli', label: '查看 CLI 会话', desc: '列出未导入的 CLI 本地会话' });
             }
             return items;
@@ -594,107 +622,474 @@ export class CommandHandler {
             // Use agent-scoped project list: agent-owned channels see their agent.json's
             // projects.list; default channel sees agent config's projects.list
             const list = this.getEffectiveProjects(channel);
-            return Object.entries(list).map(([name, path]) => ({ value: name, label: name, desc: path }));
+            const currentPath = session?.projectPath;
+            return Object.entries(list).map(([name, p]) => ({ value: name, label: name, desc: p, selected: currentPath === p }));
         }
-        if (cmd === '/agent') {
-            return this.getAvailableBaseagents(channel).map(name => ({ value: name, label: name }));
+        if (cmd === '/baseagent') {
+            const currentAgent = session?.agentId;
+            return this.getAvailableBaseagents(channel).map(name => ({ value: name, label: name, selected: name === currentAgent }));
         }
         if (cmd === '/model') {
             const agent = this.getAgent(channel, session?.agentId);
             if (hasModelSwitcher(agent) && agent.listModels) {
                 const models = await agent.listModels() ?? [];
+                const currentModel = agent.getModel();
                 if (models.length > 0)
-                    return models.map((m) => ({ value: m, label: m }));
+                    return models.map((m) => ({ value: m, label: m, selected: m === currentModel }));
             }
             return null;
         }
-        if (cmd === '/restart') {
-            const isOwner = userId ? this.sessionManager.resolveIdentity(channel, userId).role === 'owner' : false;
-            // 列出所有 channel type
-            const visibleTypes = new Set();
-            for (const [name] of this.adapters) {
-                const t = this.channelTypeMap.get(name);
-                if (t)
-                    visibleTypes.add(t);
+        // if (cmd === '/restart') {
+        //   const isOwner = userId ? this.sessionManager.resolveIdentity(channel, userId).role === 'owner' : false;
+        //   // 列出所有 channel type
+        //   const visibleTypes = new Set<string>();
+        //   for (const [name] of this.adapters) {
+        //     const t = this.channelTypeMap.get(name);
+        //     if (t) visibleTypes.add(t);
+        //   }
+        //   const channels = [...visibleTypes].map(type => ({ value: type, label: type, desc: '重连此类型所有渠道实例' }));
+        //   if (isOwner) channels.unshift({ value: '', label: '重启服务', desc: '重启整个 EvolClaw 服务进程' });
+        //   return channels;
+        // }
+        if (cmd === '/activity') {
+            const currentMode = this.agentRegistry?.getShowActivities?.(channel) ?? 'all';
+            return [
+                { value: 'all', label: '全部显示', selected: currentMode === 'all' },
+                { value: 'dm', label: '仅私聊显示', selected: currentMode === 'dm-only' },
+                { value: 'owner', label: '仅 owner 私聊显示', selected: currentMode === 'owner-dm-only' },
+                { value: 'none', label: '全部静默', selected: currentMode === 'none' },
+            ];
+        }
+        if (cmd === '/effort') {
+            const agent = this.getAgent(channel, session?.agentId);
+            const currentModel = hasModelSwitcher(agent) ? agent.getModel() : agent.name;
+            const efforts = getAvailableEfforts(agent, currentModel);
+            const currentEffort = agent.getEffort?.() || 'auto';
+            const allItems = [...efforts, 'auto'];
+            return allItems.map(e => ({ value: e, label: e === 'auto' ? 'auto (SDK默认)' : e, selected: e === currentEffort }));
+        }
+        if (cmd === '/chatmode') {
+            // 无活跃会话时，selected 跟随 evolagent.config.chatmode.private 默认值
+            let currentMode;
+            if (session?.sessionMode) {
+                currentMode = session.sessionMode;
             }
-            const channels = [...visibleTypes].map(type => ({ value: type, label: type, desc: '重连此类型所有渠道实例' }));
-            if (isOwner)
-                channels.unshift({ value: '', label: '重启服务', desc: '重启整个 EvolClaw 服务进程' });
-            return channels;
+            else {
+                const evolagent = this.agentRegistry?.resolveByChannel(channel);
+                currentMode = evolagent?.config?.chatmode?.private || 'interactive';
+            }
+            return [
+                { value: 'interactive', label: '交互模式', selected: currentMode === 'interactive' },
+                { value: 'proactive', label: '主动模式', selected: currentMode === 'proactive' },
+            ];
+        }
+        if (cmd === '/dispatch') {
+            const currentMode = session?.metadata?.dispatchMode ?? null;
+            return [
+                { value: 'mention', label: '@提及时响应', selected: currentMode === 'mention' },
+                { value: 'broadcast', label: '所有消息响应', selected: currentMode === 'broadcast' },
+            ];
+        }
+        if (cmd === '/perm') {
+            const currentMode = session?.metadata?.permissionMode ?? DEFAULT_PERMISSION_MODE;
+            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'];
+            return validModes.map(m => ({ value: m, label: m, selected: m === currentMode }));
         }
         return null;
     }
-    /** 菜单 exec 模式：查询状态或执行命令，返回结构化数据 */
-    async execMenu(cmd, mode, channel, channelId, userId) {
+    // ── Menu Protocol exec ────────────────────────────────────────────────
+    //
+    // 三个入口对应 menu.query / menu.update / menu.action：
+    //   execMenuQuery  — 查询某项当前值（无会话时多数 fallback 到 evolagent config）
+    //   execMenuUpdate — 写入新值（持久化到 session 或 evolagent config）
+    //   execMenuAction — 触发动词（stop/restart/new/delete/compact/fork/switch/check/upgrade）
+    //
+    // 所有方法返回 { data } 或 { error, code? }。code 是结构化错误码（NO_ACTIVE_SESSION 等），
+    // 客户端可据此决定降级策略。message-bridge 把 code 透传到 menu.response。
+    async loadMenuContext(channel, channelId) {
         const session = await this.sessionManager.getActiveSession(channel, channelId);
-        if (!session)
-            return { error: '当前无活跃会话' };
-        const trimmed = cmd.trim();
-        const cmdBase = trimmed.split(' ')[0];
+        const evolagent = this.agentRegistry?.resolveByChannel(channel) ?? null;
+        return { session, evolagent };
+    }
+    requireSession(s) {
+        return s ? null : { error: '当前无活跃会话', code: 'NO_ACTIVE_SESSION' };
+    }
+    /** menu.query — 查询当前值。 */
+    async execMenuQuery(cmd, channel, channelId, userId) {
+        void userId;
+        const cmdBase = cmd.trim().split(' ')[0];
         if (!cmdBase)
-            return { error: '缺少命令' };
-        const arg = trimmed.slice(cmdBase.length).trim();
+            return { error: '缺少命令', code: 'MISSING_CMD' };
+        const { session, evolagent } = await this.loadMenuContext(channel, channelId);
+        if (cmdBase === '/pwd') {
+            const sessPath = session?.projectPath;
+            const fallbackPath = evolagent?.config?.projects?.defaultPath;
+            const path = sessPath ?? fallbackPath ?? null;
+            const name = path ? this.getProjectName(path) : null;
+            return { data: { name, path } };
+        }
+        if (cmdBase === '/session' || cmdBase === '/s') {
+            if (!session) {
+                return { data: { status: 'no-session' } };
+            }
+            const sessionKey = this.getQueueKey(session, channel, channelId);
+            const sessionAgent = this.getAgent(channel, session.agentId);
+            const isProcessing = this.messageQueue.isProcessing(sessionKey) || sessionAgent.hasActiveStream(sessionKey);
+            const queueLength = this.messageQueue.getQueueLength(sessionKey);
+            const health = await this.sessionManager.getHealthStatus(session.id);
+            let processingDuration;
+            if (isProcessing && session.processingState) {
+                const elapsed = Date.now() - parseInt(session.processingState, 10);
+                if (!isNaN(elapsed) && elapsed > 0)
+                    processingDuration = Math.floor(elapsed / 1000);
+            }
+            let turns = 0;
+            if (session.agentSessionId) {
+                const fileInfo = this.sessionManager.getSessionFileInfo(session.projectPath, session.agentSessionId, session.agentId);
+                turns = fileInfo.turns;
+            }
+            const data = {
+                name: session.name || null,
+                agentSessionId: session.agentSessionId || null,
+                status: isProcessing ? 'processing' : 'idle',
+                createdAt: session.createdAt,
+                updatedAt: session.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 } };
+        }
+        if (cmdBase === '/model') {
+            if (session) {
+                const agent = this.getAgent(channel, session.agentId);
+                if (hasModelSwitcher(agent))
+                    return { data: { model: agent.getModel() ?? null } };
+            }
+            const ba = evolagent?.config?.active_baseagent;
+            const block = ba && evolagent ? evolagent.config.baseagents?.[ba] : undefined;
+            return { data: { model: block?.model ?? null } };
+        }
+        if (cmdBase === '/effort') {
+            if (session) {
+                const agent = this.getAgent(channel, session.agentId);
+                const e = agent.getEffort?.();
+                if (e !== undefined)
+                    return { data: { effort: e } };
+            }
+            const ba = evolagent?.config?.active_baseagent;
+            const block = ba && evolagent ? evolagent.config.baseagents?.[ba] : undefined;
+            const fallbackField = ba === 'codex' ? (block?.effort ?? block?.reasoning) : block?.effort;
+            return { data: { effort: fallbackField ?? null } };
+        }
+        if (cmdBase === '/chatmode') {
+            const sessionMode = session?.sessionMode;
+            const fallback = evolagent?.config?.chatmode?.private;
+            return { data: { mode: sessionMode || fallback || 'interactive' } };
+        }
+        if (cmdBase === '/dispatch') {
+            const chatType = session?.chatType || 'private';
+            if (chatType !== 'group') {
+                return { error: 'dispatch 仅在群聊会话中有效', code: 'NOT_APPLICABLE' };
+            }
+            const sessionMode = session?.metadata?.dispatchMode;
+            const fallback = evolagent?.config?.dispatch;
+            return { data: { mode: sessionMode ?? fallback ?? null } };
+        }
         if (cmdBase === '/perm') {
+            const need = this.requireSession(session);
+            if (need)
+                return need;
             const currentMode = session.metadata?.permissionMode ?? DEFAULT_PERMISSION_MODE;
-            if (mode === 'query') {
-                return { data: { mode: currentMode } };
+            return { data: { mode: currentMode } };
+        }
+        if (cmdBase === '/activity') {
+            const currentMode = this.agentRegistry?.getShowActivities?.(channel) ?? 'all';
+            return { data: { mode: currentMode } };
+        }
+        if (cmdBase === '/system') {
+            const owningAgent = this.getOwningAgent(channel);
+            const data = {
+                agent: owningAgent?.name ?? 'DefaultAgent',
+                channel: this.resolveChannelType(channel),
+                pid: process.pid,
+                node: process.version,
+                uptime: Math.floor(process.uptime()),
+            };
+            try {
+                const pkgPath = path.join(getPackageRoot(), 'package.json');
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+                if (pkg?.version)
+                    data.version = pkg.version;
+            }
+            catch { }
+            const channels = owningAgent?.channelInstanceNames?.() ?? [];
+            if (channels.length)
+                data.channels = channels;
+            return { data };
+        }
+        return { error: `不支持 query: ${cmdBase}`, code: 'NOT_SUPPORTED' };
+    }
+    /** menu.update — 写入新值。 */
+    async execMenuUpdate(cmd, value, channel, channelId, userId) {
+        const cmdBase = cmd.trim().split(' ')[0];
+        if (!cmdBase)
+            return { error: '缺少命令', code: 'MISSING_CMD' };
+        const arg = value.trim();
+        if (!arg)
+            return { error: '缺少 value 参数', code: 'MISSING_VALUE' };
+        const { session, evolagent } = await this.loadMenuContext(channel, channelId);
+        const identity = this.sessionManager.resolveIdentity(channel, userId);
+        if (cmdBase === '/baseagent') {
+            const valid = this.getAvailableBaseagents(channel);
+            if (valid.length && !valid.includes(arg)) {
+                return { error: `无效 baseagent: ${arg}，可选: ${valid.join(' / ')}`, code: 'INVALID_VALUE' };
+            }
+            // 当前会话切换走 slash 命令的完整逻辑（涉及 runner 状态、session.agentId 重新挂载等）
+            // 仅在 slash 命令成功后才持久化到 evolagent config，避免失败时配置已落盘
+            if (session && session.agentId !== arg) {
+                const result = await this._handleInternal(`/baseagent ${arg}`, channel, channelId, undefined, userId);
+                const payload = result;
+                if (payload?.kind === 'command.error') {
+                    return { error: payload.text || '切换失败', code: 'EXEC_FAILED' };
+                }
+            }
+            // 持久化到 evolagent config（影响后续新会话）
+            if (evolagent)
+                evolagent.setActiveBaseagent(arg);
+            return { data: { baseagent: arg } };
+        }
+        if (cmdBase === '/model') {
+            const agent = this.getAgent(channel, session?.agentId);
+            if (hasModelSwitcher(agent)) {
+                const models = (await agent.listModels?.()) ?? [];
+                if (models.length && !models.includes(arg)) {
+                    return { error: `无效模型: ${arg}`, code: 'INVALID_VALUE' };
+                }
+                agent.setModel(arg);
+            }
+            if (evolagent)
+                evolagent.setBaseagentModel(arg);
+            return { data: { model: arg } };
+        }
+        if (cmdBase === '/effort') {
+            const agent = this.getAgent(channel, session?.agentId);
+            const currentModel = hasModelSwitcher(agent) ? agent.getModel() : agent.name;
+            const validEfforts = getAvailableEfforts(agent, currentModel);
+            const allValid = [...validEfforts, 'auto'];
+            if (!allValid.includes(arg)) {
+                return { error: `无效推理强度: ${arg}，可选: ${allValid.join(' / ')}`, code: 'INVALID_VALUE' };
+            }
+            if (typeof agent.setEffort === 'function') {
+                agent.setEffort(arg === 'auto' ? undefined : arg);
+            }
+            if (evolagent)
+                evolagent.setBaseagentEffort(arg === 'auto' ? undefined : arg);
+            return { data: { effort: arg } };
+        }
+        if (cmdBase === '/chatmode') {
+            if (arg !== 'interactive' && arg !== 'proactive') {
+                return { error: `无效模式: ${arg}`, code: 'INVALID_VALUE' };
+            }
+            if (session) {
+                const chatType = session.chatType || 'private';
+                if (chatType === 'group' && identity.role !== 'owner' && identity.role !== 'admin') {
+                    return { error: '无权限：群聊中仅管理员可切换', code: 'NO_PERMISSION' };
+                }
+                await this.sessionManager.updateSession(session.id, { sessionMode: arg });
+                this.eventBus.publish({ type: 'session:chat-mode-changed', sessionId: session.id, mode: arg, timestamp: Date.now() });
             }
-            // update
-            if (!arg)
-                return { error: '缺少目标模式' };
-            const identity = this.sessionManager.resolveIdentity(channel, userId);
+            else {
+                if (evolagent)
+                    evolagent.setChatmodePrivate(arg);
+            }
+            return { data: { mode: arg } };
+        }
+        if (cmdBase === '/dispatch') {
+            if (arg !== 'mention' && arg !== 'broadcast') {
+                return { error: `无效模式: ${arg}`, code: 'INVALID_VALUE' };
+            }
+            const chatType = session?.chatType;
+            if (!session || chatType !== 'group') {
+                return { error: 'dispatch 仅在群聊会话中有效', code: 'NOT_APPLICABLE' };
+            }
+            if (identity.role !== 'owner' && identity.role !== 'admin') {
+                return { error: '无权限：群聊中仅管理员可切换', code: 'NO_PERMISSION' };
+            }
+            const metadata = { ...(session.metadata || {}), dispatchMode: arg };
+            await this.sessionManager.updateSession(session.id, { metadata });
+            this.eventBus.publish({ type: 'session:dispatch-mode-changed', sessionId: session.id, mode: arg, timestamp: Date.now() });
+            return { data: { mode: arg } };
+        }
+        if (cmdBase === '/perm') {
+            const need = this.requireSession(session);
+            if (need)
+                return need;
             if (identity.role !== 'owner')
-                return { error: '无权限' };
+                return { error: '无权限', code: 'NO_PERMISSION' };
             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'];
             if (!validModes.includes(arg))
-                return { error: `无效模式: ${arg}` };
+                return { error: `无效模式: ${arg}`, code: 'INVALID_VALUE' };
             const metadata = { ...(session.metadata || {}), permissionMode: arg };
             await this.sessionManager.updateSession(session.id, { metadata });
             return { data: { mode: arg } };
         }
-        if (cmdBase === '/chatmode') {
-            const currentMode = session.sessionMode || 'interactive';
-            if (mode === 'query') {
-                return { data: { mode: currentMode } };
-            }
-            // update
-            if (!arg)
-                return { error: '缺少目标模式' };
-            if (arg !== 'interactive' && arg !== 'proactive')
-                return { error: `无效模式: ${arg}` };
-            const identity = this.sessionManager.resolveIdentity(channel, userId);
-            const chatType = session.chatType || 'private';
-            if (chatType === 'group' && identity.role !== 'owner' && identity.role !== 'admin') {
-                return { error: '无权限：群聊中仅管理员可切换' };
-            }
-            await this.sessionManager.updateSession(session.id, { sessionMode: arg });
-            this.eventBus.publish({ type: 'session:chat-mode-changed', sessionId: session.id, mode: arg, timestamp: Date.now() });
-            return { data: { mode: arg } };
+        if (cmdBase === '/activity') {
+            const modeMap = { all: 'all', dm: 'dm-only', owner: 'owner-dm-only', none: 'none' };
+            const newMode = modeMap[arg];
+            if (!newMode)
+                return { error: `无效模式: ${arg}，可选: all / dm / owner / none`, code: 'INVALID_VALUE' };
+            if (identity.role !== 'owner')
+                return { error: '中间输出模式切换仅限 owner', code: 'NO_PERMISSION' };
+            if (!this.agentRegistry?.setShowActivities)
+                return { error: '找不到通道所属 agent，无法持久化', code: 'EXEC_FAILED' };
+            this.agentRegistry.setShowActivities(channel, newMode);
+            return { data: { mode: newMode } };
         }
-        if (cmdBase === '/dispatch') {
-            const currentMode = session.metadata?.dispatchMode;
-            if (mode === 'query') {
-                return { data: { mode: currentMode ?? null } };
-            }
-            // update
-            if (!arg)
-                return { error: '缺少目标模式' };
-            if (arg !== 'mention' && arg !== 'broadcast')
-                return { error: `无效模式: ${arg}` };
-            const identity = this.sessionManager.resolveIdentity(channel, userId);
-            const chatType = session.chatType || 'private';
-            if (chatType === 'group' && identity.role !== 'owner' && identity.role !== 'admin') {
-                return { error: '无权限：群聊中仅管理员可切换' };
+        return { error: `不支持 update: ${cmdBase}`, code: 'NOT_SUPPORTED' };
+    }
+    /** menu.action — 触发动词。 */
+    async execMenuAction(cmd, action, args, channel, channelId, userId) {
+        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);
+        // ── /session 系列 ──
+        if (cmdBase === '/session' || cmdBase === '/s') {
+            if (action === 'stop') {
+                if (!session)
+                    return { error: '当前无活跃会话', code: 'NO_ACTIVE_SESSION' };
+                const sessionKey = this.getQueueKey(session, channel, channelId);
+                const sessionAgent = this.getAgent(channel, session.agentId);
+                const hasActive = sessionAgent.hasActiveStream(sessionKey);
+                const queueLength = this.messageQueue.getQueueLength(sessionKey);
+                if (queueLength === 0 && !hasActive) {
+                    return { error: '当前没有正在处理的任务', code: 'NO_ACTIVE_TASK' };
+                }
+                await sessionAgent.interrupt(sessionKey);
+                this.eventBus.publish({
+                    type: 'task:interrupted',
+                    sessionId: sessionKey,
+                    reason: 'stop',
+                    agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>',
+                });
+                this.sessionManager.clearProcessing(sessionKey);
+                return { data: { action: 'stop', success: true } };
+            }
+            if (action === 'new') {
+                const name = (args?.name ?? '').toString().trim();
+                return await this.delegateAsAction(action, name ? `/new ${name}` : '/new', channel, channelId, userId, { enrichSession: true });
+            }
+            if (action === 'delete') {
+                const target = (args?.target ?? '').toString().trim();
+                if (!target)
+                    return { error: '缺少 args.target', code: 'MISSING_VALUE' };
+                return await this.delegateAsAction(action, `/del ${target}`, channel, channelId, userId);
+            }
+            if (action === 'switch') {
+                const target = (args?.target ?? '').toString().trim();
+                if (!target)
+                    return { error: '缺少 args.target', code: 'MISSING_VALUE' };
+                return await this.delegateAsAction(action, `/s ${target}`, channel, channelId, userId, { enrichSession: true });
+            }
+            if (action === 'compact') {
+                const need = this.requireSession(session);
+                if (need)
+                    return need;
+                return await this.delegateAsAction(action, '/compact', channel, channelId, userId);
+            }
+            if (action === 'fork') {
+                const need = this.requireSession(session);
+                if (need)
+                    return need;
+                const name = (args?.name ?? '').toString().trim();
+                return await this.delegateAsAction(action, name ? `/fork ${name}` : '/fork', channel, channelId, userId, { enrichSession: true });
+            }
+            return { error: `不支持的 session action: ${action}`, code: 'NOT_SUPPORTED' };
+        }
+        // ── /system 系列 ──
+        if (cmdBase === '/system') {
+            if (action === 'restart') {
+                if (identity.role !== 'owner')
+                    return { error: '无权限：服务重启仅限 owner 使用', code: 'NO_PERMISSION' };
+                const restartInfo = { channel, channelId, timestamp: Date.now() };
+                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', 'index.js'), 'restart-monitor'], {
+                    detached: true,
+                    stdio: 'ignore',
+                    env: { ...process.env, EVOLCLAW_HOME: resolvePaths().root }
+                }).unref();
+                this.eventBus.publish({ type: 'system:restart', channel, channelId });
+                setTimeout(() => { process.kill(process.pid, 'SIGTERM'); }, 500);
+                return { data: { action: 'restart', success: true } };
             }
-            const metadata = { ...(session.metadata || {}), dispatchMode: arg };
-            await this.sessionManager.updateSession(session.id, { metadata });
-            this.eventBus.publish({ type: 'session:dispatch-mode-changed', sessionId: session.id, mode: arg, timestamp: Date.now() });
-            return { data: { mode: arg } };
+            if (action === 'check') {
+                return await this.delegateAsAction(action, '/check', channel, channelId, userId);
+            }
+            if (action === 'upgrade') {
+                if (identity.role !== 'owner')
+                    return { error: '无权限：升级仅限 owner 使用', code: 'NO_PERMISSION' };
+                return await this.delegateAsAction(action, '/upgrade', channel, channelId, userId);
+            }
+            return { error: `不支持的 system action: ${action}`, code: 'NOT_SUPPORTED' };
+        }
+        return { error: `不支持 action: ${cmdBase}`, code: 'NOT_SUPPORTED' };
+    }
+    /** 把 menu.action 委派给已有 slash 命令处理逻辑，把 OutboundPayload 包成结构化结果。 */
+    async delegateAsAction(action, slashCmd, channel, channelId, userId, opts = {}) {
+        try {
+            const result = await this._handleInternal(slashCmd, channel, channelId, undefined, userId);
+            if (result == null) {
+                // null / undefined: 命令未识别或前置守卫拦截（如 idle 检查），视为失败
+                return { error: '命令未执行（可能被前置守卫拦截）', code: 'EXEC_FAILED' };
+            }
+            if (typeof result !== 'object' || !('kind' in result)) {
+                return { data: { action, success: true } };
+            }
+            const payload = result;
+            if (payload.kind === 'command.error') {
+                return { error: payload.text || '执行失败', code: 'EXEC_FAILED' };
+            }
+            const data = { action, success: true };
+            if (payload.text)
+                data.message = payload.text;
+            // 对于切换/创建类动作，附加切换后的活跃 session 信息便于客户端继续操作
+            if (opts.enrichSession) {
+                const newSession = await this.sessionManager.getActiveSession(channel, channelId);
+                if (newSession) {
+                    data.session = { id: newSession.id, name: newSession.name || null };
+                    if (newSession.agentSessionId)
+                        data.session.agentSessionId = newSession.agentSessionId;
+                }
+            }
+            return { data };
+        }
+        catch (e) {
+            return { error: e?.message || String(e), code: 'INTERNAL' };
         }
-        return { error: `不支持 exec 模式: ${cmdBase}` };
     }
     isCommand(content) {
         return content === '/p' || content === '/s' || quickCommandPrefixes.some(cmd => content.startsWith(cmd));
@@ -707,6 +1102,10 @@ export class CommandHandler {
         return result;
     }
     async _handleInternal(content, channel, channelId, sendMessage, userId, threadId, chatType, source) {
+        // 卡片回调的 chatType 不可靠（飞书 bot 单聊 chatId 也是 oc_ 前缀），
+        // 不应覆盖 session 中已有的正确值
+        if (source === 'card-trigger')
+            chatType = undefined;
         // 解析身份（按实例名）
         const identity = this.sessionManager.resolveIdentity(channel, userId);
         const policy = this.getPolicy(channel);
@@ -727,26 +1126,13 @@ export class CommandHandler {
         logger.info(`[CommandHandler] handle: channel=${channel} channelId=${channelId} cmd="${normalizedContent.split(' ')[0]}" user=${userId ?? 'n/a'} role=${identity?.role ?? 'n/a'}`);
         // 话题内禁用部分命令
         if (threadId) {
-            const threadBlocked = ['/new', '/slist', '/plist', '/bind', '/s', '/session', '/project', '/p', '/fork', '/del', '/agent'];
+            const threadBlocked = ['/new', '/slist', '/s', '/session', '/fork', '/del', '/baseagent'];
             const isBlocked = threadBlocked.some(c => normalizedContent === c || normalizedContent.startsWith(c + ' '));
             if (isBlocked) {
                 return { kind: 'command.error', text: '⚠️ 话题中不支持此命令' };
             }
         }
         // Agent-owned 通道：禁止项目切换和 agent 切换
-        const owningAgent = this.getOwningAgent(channel);
-        if (owningAgent) {
-            const isProjectCmd = normalizedContent === '/project' || normalizedContent.startsWith('/project ') ||
-                normalizedContent === '/bind' || normalizedContent.startsWith('/bind ') ||
-                normalizedContent === '/plist' ||
-                normalizedContent === '/p' || normalizedContent.startsWith('/p ');
-            if (isProjectCmd) {
-                return { kind: 'command.error', text: `❌ 当前通道由 agent [${owningAgent.name}] 管理，项目已锁定为 ${owningAgent.projectPath}` };
-            }
-            if (normalizedContent.startsWith('/agent ')) {
-                return { kind: 'command.error', text: `❌ 当前通道由 agent [${owningAgent.name}] 管理，baseagent 已锁定为 ${owningAgent.baseagent}` };
-            }
-        }
         // 权限检查：区分用户级命令和管理级命令
         const isOwner = identity.role === 'owner';
         const isAdmin = identity.role === 'owner' || identity.role === 'admin';
@@ -755,7 +1141,7 @@ export class CommandHandler {
             // guest 在群聊和私聊中均可访问的只读命令：纯查询形态（带参写操作由各 handler 内部守卫拦截）
             const guestGroupCommands = [
                 '/status', '/help', '/evolhelp', '/check', '/chatmode', '/dispatch',
-                '/model', '/setmodel', '/effort', '/agent', '/perm', '/activity', '/safe', '/stop',
+                '/model', '/setmodel', '/effort', '/baseagent', '/perm', '/activity', '/safe', '/stop',
                 '/resume', '/trigger',
             ];
             const userCommands = activeChatType === 'group' && !isAdmin
@@ -775,12 +1161,12 @@ export class CommandHandler {
         // 空闲检查：某些命令需要等待当前会话空闲
         // 原则：仅对"写/破坏性"形态拦截，纯读/用法提示的无参形态始终放行
         // - 始终需要 idle（无参即写）：/new /clear /compact /repair /fork
-        // - 仅带参时需要 idle（无参是列表/用法）：/session /bind /project /agent /rewind
+        // - 仅带参时需要 idle（无参是列表/用法）：/session /baseagent /rewind
         // - /chatmode：在 handler 内部自行做写操作的 idle 检查
         // - /dispatch：在 handler 内部自行做写操作的 idle 检查
         // - /safe：已禁用 no-op，不再要求 idle
         const idleAlways = ['/new', '/clear', '/compact', '/repair', '/fork'];
-        const idleWhenArg = ['/session', '/bind', '/project', '/agent', '/rewind'];
+        const idleWhenArg = ['/session', '/baseagent', '/rewind'];
         const needsIdle = idleAlways.some(cmd => normalizedContent === cmd || normalizedContent.startsWith(cmd + ' ')) ||
             idleWhenArg.some(cmd => normalizedContent.startsWith(cmd + ' '));
         if (needsIdle) {
@@ -852,10 +1238,8 @@ export class CommandHandler {
             const lines = [
                 '可用命令：',
                 '',
-                '📁 项目管理：',
+                '📁 项目：',
                 '  /pwd - 显示当前项目路径',
-                '  /p [name|path] - 列出或切换项目',
-                ...(isOwner ? ['  /bind <path> - 绑定新项目目录'] : []),
                 '',
                 '🔄 会话管理：',
                 '  /new [名称] - 创建新会话（清空历史请用此命令，可选命名）',
@@ -867,7 +1251,7 @@ export class CommandHandler {
                 '  /compact - 压缩会话上下文（减少 token 用量）',
                 '',
                 '🤖 Agent 与模型：',
-                '  /agent [name] - 查看或切换 Agent 后端',
+                '  /baseagent [name] - 查看或切换 Agent 后端（别名: /base）',
                 '  /model [model] - 查看或切换模型',
                 '  /effort [level] - 查看或切换推理强度',
                 '',
@@ -886,7 +1270,7 @@ export class CommandHandler {
                 '  /stop - 中断当前任务',
                 '  /check - 检查渠道状态',
                 ...(isAdmin ? [
-                    '  /restart <type> - 重连该类型所有渠道实例（服务级，admin+）',
+                    '  /restart - 重启服务（owner only）',
                 ] : []),
                 ...(isOwner ? [
                     '  /restart - 重启服务',
@@ -895,8 +1279,6 @@ export class CommandHandler {
                     '',
                     '🧰 工具：',
                     '  /file [channel] <path> - 发送项目内文件',
-                    '  /aid [list|show|new|delete|lookup|agentmd] - AID 身份管理',
-                    '  /storage [upload|download|ls|rm|quota] <aid> - 文件存储',
                 ] : []),
                 '',
                 '❓ 帮助：',
@@ -907,12 +1289,8 @@ export class CommandHandler {
         // /evolhelp 命令：返回 JSON 格式的命令列表（供程序解析）
         if (normalizedContent === '/evolhelp') {
             const cmds = [];
-            // 项目管理
-            cmds.push({ command: '/pwd', description: '显示当前项目路径', category: '项目管理', roles: ['admin', 'owner'] });
-            cmds.push({ command: '/p', aliases: ['/project', '/plist'], args: '[name|path]', description: '列出或切换项目', category: '项目管理', roles: ['admin', 'owner'] });
-            if (isOwner) {
-                cmds.push({ command: '/bind', args: '<path>', description: '绑定新项目目录', category: '项目管理', roles: ['owner'] });
-            }
+            // 项目
+            cmds.push({ command: '/pwd', description: '显示当前项目路径', category: '项目', roles: ['admin', 'owner'] });
             // 会话管理
             cmds.push({ command: '/new', args: '[名称]', description: '创建新会话（清空历史请用此命令，可选命名）', category: '会话管理', roles: ['guest', 'admin', 'owner'] });
             cmds.push({ command: '/s', aliases: ['/session', '/slist'], args: '[cli|名称|序号|uuid]', description: '列出或切换会话', category: '会话管理', roles: ['guest', 'admin', 'owner'] });
@@ -925,7 +1303,7 @@ export class CommandHandler {
             }
             // Agent 与模型
             if (isAdmin) {
-                cmds.push({ command: '/agent', args: '[name]', description: '查看或切换 Agent 后端', category: 'Agent 与模型', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/baseagent', aliases: ['/base'], args: '[name]', description: '查看或切换 Agent 后端', category: 'Agent 与模型', roles: ['admin', 'owner'] });
                 cmds.push({ command: '/model', args: '[model]', description: '查看或切换模型', category: 'Agent 与模型', roles: ['admin', 'owner'] });
                 cmds.push({ command: '/effort', args: '[level]', description: '查看或切换推理强度', category: 'Agent 与模型', roles: ['admin', 'owner'] });
             }
@@ -940,13 +1318,10 @@ export class CommandHandler {
             cmds.push({ command: '/check', description: '检查渠道状态', category: '运维', roles: ['guest', 'admin', 'owner'] });
             if (isAdmin) {
                 cmds.push({ command: '/activity', args: '[all|dm|owner|none]', description: '查看/控制中间输出显示模式', category: '聊天设置', roles: ['admin', 'owner'] });
-                cmds.push({ command: '/restart', args: '<channel>', description: '重连指定渠道', category: '运维', roles: ['admin', 'owner'] });
             }
             if (isOwner) {
                 cmds.push({ command: '/restart', description: '重启服务', category: '运维', roles: ['owner'] });
                 cmds.push({ command: '/file', args: '[channel] <path>', description: '发送项目内文件', category: '工具', roles: ['owner'] });
-                cmds.push({ command: '/aid', args: '[list|show|new|delete|lookup|agentmd]', description: 'AID 身份管理', category: '工具', roles: ['owner'] });
-                cmds.push({ command: '/storage', args: '[upload|download|ls|rm|quota] <aid>', description: '文件存储', category: '工具', roles: ['owner'] });
             }
             // 聊天设置
             if (isAdmin) {
@@ -1174,9 +1549,9 @@ export class CommandHandler {
                 return { kind: 'command.error', text: `❌ 读取会话记录失败: ${error instanceof Error ? error.message : '未知错误'}` };
             }
         }
-        // /agent 命令：查看或切换 Agent 后端
-        if (normalizedContent === '/agent' || normalizedContent.startsWith('/agent ')) {
-            const args = normalizedContent.slice(6).trim();
+        // /baseagent 命令：查看或切换 Agent 后端
+        if (normalizedContent === '/baseagent' || normalizedContent.startsWith('/baseagent ')) {
+            const args = normalizedContent.slice(10).trim();
             // 切换（带参）需权限：群聊 owner only，私聊 admin+；无参查询对所有人放开
             if (args && (activeChatType === 'group' ? !isOwner : !isAdmin)) {
                 return { kind: 'command.error', text: '❌ 无权限：此命令仅限管理员使用' };
@@ -1200,7 +1575,7 @@ export class CommandHandler {
                             title: '🔌 切换 Agent',
                             buttons: available.map(a => ({
                                 label: a === currentAgent ? `✓ ${a}` : a,
-                                command: `/agent ${a}`,
+                                command: `/baseagent ${a}`,
                                 style: (a === currentAgent ? 'primary' : 'default'),
                                 disabled: a === currentAgent,
                             })),
@@ -1216,7 +1591,7 @@ export class CommandHandler {
                 const list = available.map(a => `${a === currentAgent ? ' ✓' : '  '} ${a}`).join('\n');
                 const canSwitchAgent = activeChatType === 'group' ? isOwner : isAdmin;
                 if (canSwitchAgent) {
-                    return { kind: 'command.result', text: `当前 Agent: ${currentAgent}\n\n可用:\n${list}\n用法: /agent <name>` };
+                    return { kind: 'command.result', text: `当前 Agent: ${currentAgent}\n\n可用:\n${list}\n用法: /baseagent <name>` };
                 }
                 return { kind: 'command.result', text: `当前 Agent: ${currentAgent}` };
             }
@@ -1251,37 +1626,16 @@ export class CommandHandler {
             const currentModel = hasModelSwitcher(setmodelAgent) ? setmodelAgent.getModel() : setmodelAgent.name;
             const efforts = getAvailableEfforts(setmodelAgent, currentModel);
             const currentEffort = setmodelAgent.getEffort?.() || 'auto';
-            // 获取 API URL 用于请求 /models
-            let apiBaseUrl;
-            try {
-                const configBaseUrl = this.getOwningAgent(channel)?.config?.baseagents?.claude?.baseUrl;
-                const isPlaceholderUrl = configBaseUrl?.includes('api.anthropic.com');
-                if (configBaseUrl && !isPlaceholderUrl) {
-                    apiBaseUrl = configBaseUrl;
-                }
-                else if (process.env.ANTHROPIC_BASE_URL) {
-                    apiBaseUrl = process.env.ANTHROPIC_BASE_URL;
-                }
-                else {
-                    const claudeSettingsPath = path.join(os.homedir(), '.claude', 'settings.json');
-                    if (fs.existsSync(claudeSettingsPath)) {
-                        const claudeSettings = JSON.parse(fs.readFileSync(claudeSettingsPath, 'utf-8'));
-                        if (claudeSettings.env?.ANTHROPIC_BASE_URL) {
-                            apiBaseUrl = claudeSettings.env.ANTHROPIC_BASE_URL;
-                        }
-                    }
-                }
-            }
-            catch { }
+            const modelListSource = getModelListSource(this.getOwningAgent(channel), setmodelAgent);
             let modelListData = null;
-            if (apiBaseUrl) {
+            if (modelListSource.apiBaseUrl) {
                 try {
-                    const modelsUrl = apiBaseUrl.replace(/\/+$/, '') + '/v1/models';
+                    const modelsUrl = modelListSource.apiBaseUrl.replace(/\/+$/, '') + '/v1/models';
                     const controller = new AbortController();
                     const timeout = setTimeout(() => controller.abort(), 5000);
                     const resp = await fetch(modelsUrl, {
                         signal: controller.signal,
-                        headers: { 'Authorization': `Bearer ${this.getOwningAgent(channel)?.config?.baseagents?.claude?.apiKey || process.env.ANTHROPIC_AUTH_TOKEN || ''}` },
+                        headers: { 'Authorization': `Bearer ${modelListSource.apiKey || ''}` },
                     });
                     clearTimeout(timeout);
                     if (resp.ok) {
@@ -1295,11 +1649,12 @@ export class CommandHandler {
                 const now = Math.floor(Date.now() / 1000);
                 modelListData = {
                     object: 'list',
-                    data: [
-                        { id: 'claude-opus-4-7', object: 'model', created: now, owned_by: 'anthropic' },
-                        { id: 'claude-opus-4-6', object: 'model', created: now, owned_by: 'anthropic' },
-                        { id: 'claude-sonnet-4-6', object: 'model', created: now, owned_by: 'anthropic' },
-                    ],
+                    data: modelListSource.fallbackModels.map(id => ({
+                        id,
+                        object: 'model',
+                        created: now,
+                        owned_by: modelListSource.owner,
+                    })),
                 };
             }
             return { kind: 'command.result', text: JSON.stringify({
@@ -1506,54 +1861,12 @@ export class CommandHandler {
                 return { kind: 'command.result', text: `${err}\n已更新运行时配置，但未持久化` };
             return { kind: 'command.result', text: `✓ 推理强度: ${newEffort}` };
         }
-        // /aid, /rpc, /storage — 转发到 CLI 执行
-        if (normalizedContent === '/aid' || normalizedContent.startsWith('/aid ') ||
+        // /agent, /aid, /rpc, /storage — 仅限 ctl 调用，slash 输入拒绝
+        if (normalizedContent === '/agent' || normalizedContent.startsWith('/agent ') ||
+            normalizedContent === '/aid' || normalizedContent.startsWith('/aid ') ||
             normalizedContent === '/rpc' || normalizedContent.startsWith('/rpc ') ||
             normalizedContent === '/storage' || normalizedContent.startsWith('/storage ')) {
-            if (!isOwner)
-                return { kind: 'command.error', text: '❌ 无权限：此命令仅限 owner 使用' };
-            // 无参数时返回用法说明
-            if (normalizedContent === '/aid') {
-                return { kind: 'command.result', text: `用法:
-  /aid list              列出本地所有 AID
-  /aid show <aid>        查看 AID 详情
-  /aid new <aid>         创建新 AID
-  /aid delete <aid>      删除本地 AID
-  /aid lookup <aid>      远程探测 AID
-  /aid agentmd put <aid> 签名并上传 agent.md
-  /aid agentmd get <aid> 下载并验签 agent.md` };
-            }
-            if (normalizedContent === '/rpc') {
-                return { kind: 'command.result', text: `用法: /rpc --as <aid> --params <json>
-示例: /rpc --as myaid.agentid.pub --params {"method":"meta.ping","params":{}}` };
-            }
-            if (normalizedContent === '/storage') {
-                return { kind: 'command.result', text: `用法:
-  /storage upload <aid> <file> <path> [--public]
-  /storage download <aid> <url> [local-path]
-  /storage ls <aid> [prefix]
-  /storage rm <aid> <path>
-  /storage quota <aid>` };
-            }
-            const cliArgs = normalizedContent.slice(1); // strip leading /
-            try {
-                const { execFile } = await import('node:child_process');
-                const { promisify } = await import('node:util');
-                const execFileAsync = promisify(execFile);
-                const { stdout, stderr } = await execFileAsync('evolclaw', cliArgs.split(/\s+/), {
-                    timeout: 30000,
-                    encoding: 'utf-8',
-                    env: { ...process.env, AUN_LOG_INI_DISABLE: '1' },
-                });
-                const output = (stdout || '').trim();
-                if (!output && stderr)
-                    return { kind: 'command.result', text: `⚠ ${stderr.trim().slice(0, 500)}` };
-                return { kind: 'command.result', text: output || '(无输出)' };
-            }
-            catch (e) {
-                const msg = e.stderr?.trim() || e.stdout?.trim() || String(e.message || e);
-                return { kind: 'command.error', text: `❌ ${msg.slice(0, 500)}` };
-            }
+            return { kind: 'command.error', text: '❌ 此命令仅限 ctl 调用，不支持 slash 输入' };
         }
         if (normalizedContent === '/activity' || normalizedContent.startsWith('/activity ')) {
             const activityArg = normalizedContent.slice(9).trim();
@@ -1878,10 +2191,7 @@ export class CommandHandler {
             session = await this.sessionManager.getActiveSession(channel, channelId);
         }
         // 对于需要会话的命令，如果没有会话则使用默认项目创建临时会话
-        // 这样 /pwd、/status 等命令可以在没有活跃会话时返回默认项目信息
         if (!session && (normalizedContent.startsWith('/new') ||
-            normalizedContent.startsWith('/bind') ||
-            normalizedContent.startsWith('/project') ||
             normalizedContent === '/pwd' ||
             normalizedContent === '/status')) {
             session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel));
@@ -2075,44 +2385,8 @@ export class CommandHandler {
             }
             return { kind: 'command.result', text: lines.join('\n') };
         }
-        // /restart 命令：重启服务（owner only） / 重连指定渠道（admin+）
-        if (normalizedContent === '/restart' || normalizedContent.startsWith('/restart ')) {
-            const restartArg = normalizedContent.slice('/restart'.length).trim();
-            // /restart <type> — 重连指定类型的所有渠道（admin only）
-            if (restartArg) {
-                if (!isAdmin)
-                    return { kind: 'command.error', text: '❌ 无权限：渠道重连仅限管理员使用' };
-                const type = restartArg;
-                // /restart 是服务级操作：重连该 type 下的所有实例（不分 agent）
-                const scopedNames = [];
-                for (const [name] of this.adapters) {
-                    if (this.channelTypeMap.get(name) === type)
-                        scopedNames.push(name);
-                }
-                if (scopedNames.length === 0) {
-                    return { kind: 'command.error', text: `❌ 没有类型为 "${type}" 的渠道` };
-                }
-                const results = [];
-                for (const name of scopedNames) {
-                    const ch = this.channelObjects.get(name);
-                    if (!ch) {
-                        results.push(`${name}: 未找到渠道对象`);
-                        continue;
-                    }
-                    if (!ch.reconnect) {
-                        results.push(`${name}: 不支持重连`);
-                        continue;
-                    }
-                    try {
-                        const result = await ch.reconnect();
-                        results.push(`${name}: ${result}`);
-                    }
-                    catch (e) {
-                        results.push(`${name}: 重连失败 - ${e?.message || e}`);
-                    }
-                }
-                return { kind: 'command.result', text: `🔄 重连 ${type}:\n  ${results.join('\n  ')}` };
-            }
+        // /restart 命令：重启服务（owner only）
+        if (normalizedContent === '/restart') {
             // /restart（无参数）— 重启整个服务（owner only）
             if (!isOwner)
                 return { kind: 'command.error', text: '❌ 无权限：服务重启仅限 owner 使用' };
@@ -2195,7 +2469,6 @@ export class CommandHandler {
         }
         // /pwd 命令：显示当前项目路径
         if (normalizedContent === '/pwd') {
-            // session 现在总是存在（上面已自动创建）
             if (!session) {
                 return { kind: 'command.error', text: `❌ 无法创建会话，请检查配置` };
             }
@@ -2309,241 +2582,6 @@ export class CommandHandler {
                 return { kind: 'command.error', text: `❌ 文件发送失败: ${error.message || error}` };
             }
         }
-        // /plist 命令：列出所有项目
-        if (normalizedContent === '/plist') {
-            if (!policy.canListProjects(session?.chatType || 'private', identity.role)) {
-                if (!session) {
-                    return { kind: 'command.error', text: `❌ 当前群聊未绑定项目
-
-请使用 /bind <项目路径> 绑定项目` };
-                }
-                const projectName = this.getProjectName(session.projectPath);
-                const isProcessing = !!session.processingState;
-                const status = isProcessing ? '[处理中]' : '[空闲]';
-                return { kind: 'command.result', text: `当前群聊绑定的项目：
-  ${projectName} (${session.projectPath}) - ${status}
-
-提示：群聊不支持切换项目` };
-            }
-            // 收集项目信息并按最近活跃排序（唯一来源：agent config projects.list）
-            const entries = [];
-            for (const [name, projectPath] of Object.entries(this.projects)) {
-                // 跳过不存在的路径
-                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,
-                });
-            }
-            // 当前活跃项目置顶，其余按 updatedAt 降序
-            entries.sort((a, b) => {
-                if (a.isCurrent !== b.isCurrent)
-                    return a.isCurrent ? -1 : 1;
-                return b.updatedAt - a.updatedAt;
-            });
-            // 构建项目状态文本的辅助函数
-            const buildStatusText = (entry) => {
-                const { projectSession, isCurrent } = entry;
-                if (!projectSession)
-                    return '无会话';
-                const parts = [];
-                if (isCurrent) {
-                    parts.push('活跃');
-                }
-                else {
-                    parts.push(formatIdleTime(Date.now() - projectSession.updatedAt));
-                }
-                const isProcessing = !!projectSession.processingState;
-                if (isProcessing) {
-                    const qLen = this.messageQueue.getQueueLength(projectSession.id);
-                    parts.push(qLen > 0 ? `[处理中，队列${qLen}条]` : '[处理中]');
-                }
-                const unread = this.messageCache.getCount(projectSession.id);
-                if (unread > 0) {
-                    parts.push(`[${unread}条新消息]`);
-                }
-                else if (!isProcessing && !isCurrent) {
-                    parts.push('[空闲]');
-                }
-                return parts.join(' ');
-            };
-            // 尝试发送 CommandCard 卡片（每个项目一个按钮，一键切换）
-            if (entries.length > 0) {
-                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: `plist-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`,
-                    channelId,
-                    sessionId: activeSession?.id || '',
-                    initiatorId: userId,
-                    kind: {
-                        kind: 'command-card',
-                        title: '📂 项目列表',
-                        body: bodyLines.join('\n'),
-                        buttons: entries.map(e => ({
-                            label: e.isCurrent ? `✓ ${e.name}` : e.name,
-                            command: `/project ${e.name}`,
-                            style: (e.isCurrent ? 'primary' : 'default'),
-                            disabled: e.isCurrent,
-                        })),
-                    },
-                };
-                const replyCtx = activeSession ? this.getReplyContext(activeSession) : undefined;
-                const cardResult = await this.sendCommandCard({ channel, channelId, interaction, replyCtx, canWrite: isAdmin });
-                if (cardResult === null)
-                    return null;
-                return { kind: 'command.result', text: cardResult };
-            }
-            // 降级：文本列表
-            const lines = ['可用项目:'];
-            for (const entry of entries) {
-                const prefix = entry.isCurrent ? '  ✓' : '   ';
-                lines.push(`${prefix} ${entry.name} (${entry.projectPath}) - ${buildStatusText(entry)}`);
-            }
-            lines.push('', '提示: 使用 /p <名称> 切换项目');
-            return { kind: 'command.result', text: lines.join('\n') };
-        }
-        // /project（无参数）：直接复用 /plist 逻辑（含卡片交互）
-        if (normalizedContent === '/project') {
-            if (!policy.canSwitchProject(session?.chatType || 'private', identity.role)) {
-                // 群聊不能切换项目，交由 /plist 逻辑处理
-            }
-            const delegated = await this.handle('/plist', channel, channelId, undefined, userId, threadId);
-            return typeof delegated === 'string' ? { kind: 'command.result', text: delegated } : delegated;
-        }
-        // /project 命令：切换项目（支持名称或路径）
-        if (normalizedContent.startsWith('/project ')) {
-            if (!policy.canSwitchProject(session?.chatType || 'private', identity.role)) {
-                return { kind: 'command.error', text: `❌ 群聊不支持切换项目
-
-群聊只能绑定一个项目。如需更换项目，请联系管理员重新配置。` };
-            }
-            let arg = normalizedContent.slice(9).trim();
-            if (!arg)
-                return { kind: 'command.result', text: '用法: /p <name|path> 或 /project <name|path>' };
-            // 检查确认标志
-            const hasConfirm = arg.endsWith(' --confirm');
-            if (hasConfirm) {
-                arg = arg.slice(0, -10).trim();
-            }
-            let projectPath;
-            let projectName;
-            if (arg.includes('/')) {
-                if (!path.isAbsolute(arg)) {
-                    return { kind: 'command.error', text: '❌ 项目路径必须是绝对路径' };
-                }
-                if (!fs.existsSync(arg)) {
-                    return { kind: 'command.error', text: `❌ 路径不存在: ${arg}` };
-                }
-                projectPath = arg;
-                projectName = path.basename(arg);
-            }
-            else {
-                projectPath = this.projects[arg];
-                if (!projectPath) {
-                    return { kind: 'command.error', text: `❌ 项目 "${arg}" 不存在\n提示: 使用 /p 查看可用项目` };
-                }
-                projectName = arg;
-            }
-            if (session) {
-                const normalizedSessionPath = path.resolve(session.projectPath);
-                const normalizedProjectPath = path.resolve(projectPath);
-                if (normalizedSessionPath === normalizedProjectPath) {
-                    return { kind: 'command.result', text: `当前已在项目: ${projectName}\n  路径: ${projectPath}` };
-                }
-            }
-            // 群聊切换项目需要确认
-            const isGroupChat = session?.chatType === 'group';
-            if (isGroupChat && !hasConfirm) {
-                return { kind: 'command.error', text: `⚠️ 群聊切换项目风险提示：
-
-切换项目将影响所有群成员的对话上下文，可能导致：
-  • 当前项目的会话历史被切换
-  • 正在处理的任务被中断
-  • 其他成员的工作受到影响
-
-确认切换请执行：
-  /p ${projectName} --confirm` };
-            }
-            const currentAgentId = activeSession?.agentId || this.primaryRunnerKey;
-            const newSession = await this.sessionManager.switchProject(channel, channelId, projectPath, currentAgentId);
-            this.eventBus.publish({
-                type: 'project:switched',
-                sessionId: newSession.id,
-                channel,
-                channelId,
-                projectPath,
-                timestamp: Date.now()
-            });
-            const cachedEvents = this.messageCache.getEvents(newSession.id);
-            const hasExistingSession = newSession.agentSessionId ? '（恢复已有会话）' : '（新建会话）';
-            const currentAgent = newSession.agentId || this.primaryRunnerKey;
-            let response = `✓ 已切换到项目: ${projectName}\n  路径: ${projectPath}\n  Agent: ${currentAgent}\n  ${hasExistingSession}`;
-            if (cachedEvents.length > 0 && sendMessage) {
-                for (const event of cachedEvents) {
-                    if (event.type === 'completed') {
-                        response += `\n\n后台任务完成`;
-                        if (event.metadata?.duration) {
-                            response += ` (耗时: ${Math.round(event.metadata.duration / 1000)}s)`;
-                        }
-                    }
-                    else if (event.type === 'error') {
-                        response += `\n\n后台任务失败: ${event.metadata?.errorType || '未知错误'}`;
-                    }
-                }
-                await sendMessage(channelId, response);
-                for (const event of cachedEvents) {
-                    await sendMessage(channelId, event.message);
-                }
-                this.messageCache.clearEvents(newSession.id);
-                return { kind: 'command.result', text: '' };
-            }
-            return { kind: 'command.result', text: response };
-        }
-        // /bind 命令：持久化项目到配置（不切换）（owner only）
-        if (normalizedContent === '/bind')
-            return { kind: 'command.result', text: '用法: /bind <路径>' };
-        if (normalizedContent.startsWith('/bind ')) {
-            if (!isOwner)
-                return { kind: 'command.error', text: '❌ 无权限：此命令仅限 owner 使用' };
-            const projectPath = normalizedContent.slice(6).trim();
-            if (!projectPath)
-                return { kind: 'command.result', text: '用法: /bind <路径>' };
-            if (!path.isAbsolute(projectPath)) {
-                return { kind: 'command.error', text: '❌ 项目路径必须是绝对路径' };
-            }
-            if (!fs.existsSync(projectPath)) {
-                if (this.getOwningAgent(channel)?.config?.projects?.autoCreate) {
-                    fs.mkdirSync(projectPath, { recursive: true });
-                }
-                else {
-                    return { kind: 'command.error', text: `❌ 路径不存在: ${projectPath}` };
-                }
-            }
-            // 生成项目名称（使用目录名）
-            const projectName = path.basename(projectPath);
-            // 检查在当前 scope 内是否已存在
-            const scopeProjects = this.getEffectiveProjects(channel);
-            const existing = scopeProjects[projectName];
-            if (existing) {
-                if (existing === projectPath) {
-                    return { kind: 'command.result', text: `项目 "${projectName}" 已存在\n  路径: ${projectPath}\n\n使用 /p ${projectName} 切换到该项目` };
-                }
-                return { kind: 'command.error', text: `❌ 项目名称 "${projectName}" 已被占用\n  现有路径: ${existing}\n  新路径: ${projectPath}\n\n请重命名目录或手动编辑配置文件` };
-            }
-            // 写入：agent-owned channel → agent.json；default → agent config
-            const err = await this.addProjectInScope(channel, projectName, projectPath);
-            if (err)
-                return { kind: 'command.result', text: err };
-            return { kind: 'command.result', text: `✓ 已添加项目: ${projectName}\n  路径: ${projectPath}\n\n使用 /p ${projectName} 切换到该项目` };
-        }
         // /slist 命令：列出当前项目的会话
         // /slist      — 仅 EvolClaw 会话
         // /slist cli  — 仅 CLI 会话（未导入的）
@@ -2553,8 +2591,7 @@ export class CommandHandler {
 
 请先执行以下操作之一：
 1. 发送任意消息 - 自动创建新会话
-2. /new [名称] - 创建命名会话
-3. /p <项目> - 切换到指定项目` };
+2. /new [名称] - 创建命名会话` };
             }
             const showCliOnly = normalizedContent === '/slist cli';
             // /slist cli — 仅显示 CLI 会话
@@ -3000,8 +3037,10 @@ export class CommandHandler {
         return null;
     }
     handleTrigger(content, channel, channelId, peerId, isAdmin) {
-        const scheduler = this.triggerScheduler;
-        const manager = this.triggerManager;
+        // Resolve trigger manager/scheduler from the owning agent of this channel
+        const owningAgent = this.getOwningAgent(channel);
+        const scheduler = (owningAgent?.triggerScheduler ?? this.triggerScheduler);
+        const manager = (owningAgent?.triggerManager ?? this.triggerManager);
         // Bare /trigger → list active
         if (content === '/trigger') {
             if (!manager)
@@ -3268,13 +3307,13 @@ export class CommandHandler {
     // ── Agent Ctl ──
     static CTL_COMMANDS = [
         '/help', '/status', '/check', '/pwd',
-        '/model', '/effort', '/perm', '/agent',
-        '/compact', '/file', '/send', '/restart', '/bind', '/aid', '/rpc', '/storage',
-        '/rename', '/name', '/evolagent', '/trigger',
+        '/model', '/effort', '/perm', '/agent', '/baseagent',
+        '/compact', '/file', '/send', '/restart', '/aid', '/rpc', '/storage',
+        '/rename', '/name', '/trigger',
         '/chatmode', '/dispatch', '/activity',
     ];
     /** ctl 中仅允许查询形态的指令；写形态（带参）一律拒绝 */
-    static CTL_READONLY = new Set(['/agent']);
+    static CTL_READONLY = new Set(['/baseagent']);
     /**
      * 从 session 恢复 ReplyContext，用于 ctl send 主动发送文本时的路由
      * - 群聊话题：metadata.replyContext.{threadId,peerId}
@@ -3328,47 +3367,45 @@ export class CommandHandler {
         }
         // 3. 从 session.metadata.peerId 获取 userId（用于权限判断）
         const userId = session.metadata?.peerId;
-        // 3.1 /evolagent: EvolAgent 管理（show identity / reload）
-        if (cmd === '/evolagent' || cmd.startsWith('/evolagent ')) {
-            const arg = cmd.slice('/evolagent'.length).trim();
+        // 3.1 /agent: EvolAgent 管理（转发到 CLI）
+        if (cmd === '/agent' || cmd.startsWith('/agent ')) {
+            const arg = cmd.slice('/agent'.length).trim();
+            // 无参数时返回用法
             if (!arg) {
-                const owning = this.getOwningAgent(session.channel);
-                if (owning) {
-                    return { ok: true, result: `当前 EvolAgent: ${owning.name} (${owning.baseagent})` };
-                }
-                return { ok: true, result: '当前为 DefaultAgent 模式' };
+                return { ok: true, result: `用法:\n  /agent list              列出所有 agent\n  /agent show [name]       查看 agent 详情\n  /agent enable <name>     启用 agent\n  /agent disable <name>    停用 agent\n  /agent get <name> <key>  读取配置字段\n  /agent set <name> <key> <val>  修改配置字段\n  /agent rename <name> <newname> 修改名称\n  /agent reload [name]     热重载配置` };
+            }
+            const parts = arg.split(/\s+/);
+            const subCmd = parts[0];
+            // ctl 禁止 new/delete（仅限 CLI 操作）
+            if (subCmd === 'new' || subCmd === 'delete') {
+                return { ok: false, error: `❌ /agent ${subCmd} 仅限 CLI 操作，请使用: evolclaw agent ${subCmd} ...` };
+            }
+            // 自我保护：不能 disable 自己所在的 agent
+            const selfAgent = this.getOwningAgent(session.channel);
+            const selfName = selfAgent?.name;
+            if (selfName && subCmd === 'disable' && parts[1] === selfName) {
+                return { ok: false, error: `❌ 不能 disable 自己所在的 agent: ${selfName}` };
+            }
+            // 转发到 CLI
+            const cliArgs = ['agent', ...parts];
+            try {
+                const { execFile } = await import('node:child_process');
+                const { promisify } = await import('node:util');
+                const execFileAsync = promisify(execFile);
+                const { stdout, stderr } = await execFileAsync('evolclaw', cliArgs, {
+                    timeout: 30000,
+                    encoding: 'utf-8',
+                    env: { ...process.env, AUN_LOG_INI_DISABLE: '1' },
+                });
+                const output = (stdout || '').trim();
+                if (!output && stderr)
+                    return { ok: true, result: `⚠ ${stderr.trim().slice(0, 500)}` };
+                return { ok: true, result: output || '(无输出)' };
             }
-            if (arg.startsWith('reload ') || arg === 'reload') {
-                const name = arg === 'reload' ? '' : arg.slice('reload '.length).trim();
-                if (!name)
-                    return { ok: false, error: '用法: evolclaw ctl evolagent reload <name>' };
-                // I8: reload is a structural op, require admin or owner
-                if (!userId) {
-                    return { ok: false, error: '权限不足：evolagent reload 仅 owner/admin 可用' };
-                }
-                const identity = this.sessionManager.resolveIdentity(session.channel, userId);
-                if (identity.role !== 'owner' && identity.role !== 'admin') {
-                    return { ok: false, error: '权限不足：evolagent reload 仅 owner/admin 可用' };
-                }
-                if (!this.agentRegistry)
-                    return { ok: false, error: 'EvolAgentRegistry not available' };
-                const a = this.agentRegistry.get(name);
-                if (!a)
-                    return { ok: false, error: `Agent "${name}" not found` };
-                const hooks = globalThis.__evolclaw_reloadHooks;
-                if (!hooks)
-                    return { ok: false, error: 'Reload hooks not initialized' };
-                if (!this.agentRegistry.reload)
-                    return { ok: false, error: 'EvolAgentRegistry.reload not available' };
-                try {
-                    await this.agentRegistry.reload(name, hooks);
-                    return { ok: true, result: `Agent "${name}" reloaded` };
-                }
-                catch (e) {
-                    return { ok: false, error: `Reload failed: ${e?.message || e}` };
-                }
+            catch (e) {
+                const msg = e.stderr?.trim() || e.stdout?.trim() || String(e.message || e);
+                return { ok: false, error: msg.slice(0, 500) };
             }
-            return { ok: false, error: '用法: evolclaw ctl evolagent [reload <name>]' };
         }
         // 4. /send 文本消息：直接通过 adapter 主动发送，不走 handle()
         if (cmd.startsWith('/send ') || cmd === '/send') {
@@ -3386,9 +3423,10 @@ export class CommandHandler {
                 const taskId = replyContext?.metadata?.taskId;
                 const chatmode = replyContext?.metadata?.chatmode ?? 'interactive';
                 // --encrypt 覆盖 session 加密状态
+                // 添加 source: 'ctl' 标记（用于区分 ec ctl send）
                 const enrichedReplyContext = forceEncrypt
-                    ? { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), encrypted: true } }
-                    : replyContext;
+                    ? { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), encrypted: true, source: 'ctl' } }
+                    : { ...(replyContext ?? {}), metadata: { ...(replyContext?.metadata ?? {}), source: 'ctl' } };
                 await adapter.send(buildEnvelope({ taskId, channel: adapter.channelName, channelId: session.channelId, chatmode, replyContext: enrichedReplyContext }), { kind: 'result.text', text, isFinal: true });
                 // 出方向 jsonl 写入已下沉到 aun.ts:deliverTextEntry，message.send 成功后统一写入。
                 return { ok: true, result: 'ok' };
@@ -3410,6 +3448,56 @@ export class CommandHandler {
                 }
             }
         }
+        // 5.1 /aid, /rpc, /storage — ctl 专属，转发到 CLI 执行
+        if (cmd === '/aid' || cmd.startsWith('/aid ') ||
+            cmd === '/rpc' || cmd.startsWith('/rpc ') ||
+            cmd === '/storage' || cmd.startsWith('/storage ')) {
+            // 权限检查：仅 owner
+            if (userId) {
+                const identity = this.sessionManager.resolveIdentity(session.channel, userId);
+                if (identity.role !== 'owner') {
+                    return { ok: false, error: '无权限：此命令仅限 owner 使用' };
+                }
+            }
+            // 无参数时返回用法说明
+            if (cmd === '/aid') {
+                return { ok: true, result: `用法:\n  /aid list              列出本地所有 AID\n  /aid show <aid>        查看 AID 详情\n  /aid new <aid>         创建新 AID\n  /aid delete <aid>      删除本地 AID\n  /aid lookup <aid>      远程探测 AID\n  /aid agentmd put <aid> 签名并上传 agent.md\n  /aid agentmd get <aid> 下载并验签 agent.md` };
+            }
+            if (cmd === '/rpc') {
+                return { ok: true, result: `用法: /rpc --as <aid> --params <json>\n示例: /rpc --as myaid.agentid.pub --params {"method":"meta.ping","params":{}}` };
+            }
+            if (cmd === '/storage') {
+                return { ok: true, result: `用法:\n  /storage upload <aid> <file> <path> [--public]\n  /storage download <aid> <url> [local-path]\n  /storage ls <aid> [prefix]\n  /storage rm <aid> <path>\n  /storage quota <aid>` };
+            }
+            // /aid 自我保护：不能删除当前 agent 所用的 AID
+            if (cmd.startsWith('/aid delete ')) {
+                const targetAid = cmd.slice('/aid delete '.length).trim();
+                const selfAgent = this.getOwningAgent(session.channel);
+                const selfAid = selfAgent?.config?.aid;
+                if (selfAid && targetAid === selfAid) {
+                    return { ok: false, error: `❌ 不能删除当前 agent 所用的 AID: ${selfAid}` };
+                }
+            }
+            const cliArgs = cmd.slice(1); // strip leading /
+            try {
+                const { execFile } = await import('node:child_process');
+                const { promisify } = await import('node:util');
+                const execFileAsync = promisify(execFile);
+                const { stdout, stderr } = await execFileAsync('evolclaw', cliArgs.split(/\s+/), {
+                    timeout: 30000,
+                    encoding: 'utf-8',
+                    env: { ...process.env, AUN_LOG_INI_DISABLE: '1' },
+                });
+                const output = (stdout || '').trim();
+                if (!output && stderr)
+                    return { ok: true, result: `⚠ ${stderr.trim().slice(0, 500)}` };
+                return { ok: true, result: output || '(无输出)' };
+            }
+            catch (e) {
+                const msg = e.stderr?.trim() || e.stdout?.trim() || String(e.message || e);
+                return { ok: false, error: msg.slice(0, 500) };
+            }
+        }
         // 6. 调用现有 handle()，不传 sendMessage 回调（结果直接返回）
         try {
             const result = await this.handle(cmd, session.channel, session.channelId, undefined, // 不发送消息