evolclaw 2.8.1 → 2.8.3

package/dist/core/command-handler.js

@@ -104,7 +104,7 @@ function formatIdleTime(ms) {
     return '刚刚';
 }
 // 支持的命令列表
-const commands = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/stop', '/clear', '/compact', '/repair', '/safe', '/fork', '/del', '/perm', '/file', '/check', '/rewind', '/activity', '/aid', '/agentmd', '/chatmode', '/ask'];
+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', '/aid', '/agentmd', '/chatmode', '/ask', '/resume'];
 // 命令别名映射
 const aliases = {
     '/p': '/project',
@@ -113,7 +113,7 @@ const aliases = {
     '/rw': '/rewind'
 };
 // 命令快速路径前缀（所有命令都不进入消息队列）
-const quickCommandPrefixes = ['/new', '/pwd', '/plist', '/project', '/bind', '/help', '/status', '/restart', '/model', '/effort', '/agent', '/slist', '/session', '/rename', '/repair', '/fork', '/stop', '/clear', '/compact', '/safe', '/del', '/perm', '/file', '/check', '/p ', '/s ', '/name', '/rewind', '/rw', '/rw ', '/activity', '/chatmode', '/aid', '/agentmd', '/ask'];
+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', '/aid', '/agentmd', '/ask', '/resume'];
 export class CommandHandler {
     sessionManager;
     config;
@@ -130,11 +130,39 @@ export class CommandHandler {
     statsCollector;
     agentMap;
     defaultAgentId;
-    /** 按 agentId 获取 agent，回退到默认 */
-    getAgent(agentId) {
-        if (agentId && this.agentMap.has(agentId))
-            return this.agentMap.get(agentId);
-        return this.agentMap.get(this.defaultAgentId) || this.agentMap.values().next().value;
+    agentRegistry;
+    /**
+     * Get the runner for a (channel, baseagent) pair.
+     *
+     * Resolves the owning EvolAgent via the registry; falls back to default key.
+     * `baseagent` typically comes from `session.agentId` (e.g. 'claude').
+     */
+    getAgent(channel, baseagent) {
+        if (channel && baseagent) {
+            const evolName = this.agentRegistry?.resolveByChannel(channel)?.name || '[default]';
+            const key = `${evolName}::${baseagent}`;
+            if (this.agentMap.has(key))
+                return this.agentMap.get(key);
+        }
+        if (this.agentMap.has(this.defaultAgentId))
+            return this.agentMap.get(this.defaultAgentId);
+        return this.agentMap.values().next().value;
+    }
+    /** Return the list of baseagents available to a given channel (per-EvolAgent isolation). */
+    getAvailableBaseagents(channel) {
+        const evolName = this.agentRegistry?.resolveByChannel(channel)?.name || '[default]';
+        const prefix = `${evolName}::`;
+        const result = [];
+        for (const key of this.agentMap.keys()) {
+            if (key.startsWith(prefix))
+                result.push(key.slice(prefix.length));
+        }
+        return result;
+    }
+    /** Extract the baseagent component from `defaultAgentId` (e.g. `[default]::claude` → `claude`). */
+    parseDefaultBaseagent() {
+        const idx = this.defaultAgentId.indexOf('::');
+        return idx >= 0 ? this.defaultAgentId.slice(idx + 2) : this.defaultAgentId;
     }
     constructor(sessionManager, agentRunnerOrMap, config, messageCache, eventBus, defaultAgentId) {
         this.sessionManager = sessionManager;
@@ -143,12 +171,200 @@ export class CommandHandler {
         this.eventBus = eventBus;
         if (agentRunnerOrMap instanceof Map) {
             this.agentMap = agentRunnerOrMap;
-            this.defaultAgentId = defaultAgentId || 'claude';
+            this.defaultAgentId = defaultAgentId || '[default]::claude';
         }
         else {
-            this.agentMap = new Map([[agentRunnerOrMap.name, agentRunnerOrMap]]);
-            this.defaultAgentId = agentRunnerOrMap.name;
+            // Backward-compat single-runner path: treat as DefaultAgent's claude.
+            this.agentMap = new Map([[`[default]::${agentRunnerOrMap.name}`, agentRunnerOrMap]]);
+            this.defaultAgentId = `[default]::${agentRunnerOrMap.name}`;
+        }
+    }
+    /** 注入 EvolAgentRegistry，用于判断通道是否被 EvolAgent 管理 */
+    setAgentRegistry(registry) {
+        this.agentRegistry = registry;
+    }
+    /** 返回管理当前通道的 EvolAgent（非 default），无则返回 null */
+    getOwningAgent(channel) {
+        if (!this.agentRegistry)
+            return null;
+        const agent = this.agentRegistry.resolveByChannel(channel);
+        if (!agent || agent.isDefault)
+            return null;
+        return agent;
+    }
+    /** 返回当前通道的有效项目路径：agent-owned 用 agent.projectPath；否则用全局 defaultPath。*/
+    getEffectiveDefaultPath(channel) {
+        const owning = this.getOwningAgent(channel);
+        if (owning)
+            return owning.projectPath;
+        return this.config.projects?.defaultPath || process.cwd();
+    }
+    /**
+     * 返回当前通道有效的 projects.list（agent-owned 用 agent.json 的；否则全局 evolclaw.json 的）。
+     * 都没配 list 时回退到 defaultPath 单项目。
+     */
+    getEffectiveProjects(channel) {
+        const owning = this.getOwningAgent(channel);
+        if (owning) {
+            return owning.getProjects();
+        }
+        return this.projects;
+    }
+    /**
+     * 添加项目到当前通道范围（agent-owned 写 agent.json；default 写 evolclaw.json）。
+     */
+    async addProjectInScope(channel, name, projectPath) {
+        const owning = this.getOwningAgent(channel);
+        if (owning) {
+            try {
+                owning.addProject(name, projectPath);
+            }
+            catch (e) {
+                return `⚠️ 写入 agent.json 失败: ${e?.message || e}`;
+            }
+            return undefined;
+        }
+        if (!this.config.projects) {
+            this.config.projects = { defaultPath: process.cwd(), autoCreate: false, list: {} };
+        }
+        if (!this.config.projects.list) {
+            this.config.projects.list = {};
+        }
+        this.config.projects.list[name] = projectPath;
+        try {
+            const { saveConfig } = await import('../config.js');
+            saveConfig(this.config);
+        }
+        catch (e) {
+            return `⚠️ 写入 evolclaw.json 失败: ${e?.message || e}`;
+        }
+        // Refresh in-memory list cache (this.projects getter reads from this.config)
+        return undefined;
+    }
+    /**
+     * 持久化 baseagent.model：agent-owned 写到 agent.json；否则写 evolclaw.json 或 ~/.claude/settings.json。
+     * 返回错误信息或 undefined。
+     */
+    persistBaseagentModel(channel, baseagentName, newModel) {
+        const owning = this.getOwningAgent(channel);
+        if (owning) {
+            try {
+                owning.setBaseagentModel(newModel);
+            }
+            catch (e) {
+                return `⚠️ 写入 agent.json 失败: ${e?.message || e}`;
+            }
+            return undefined;
+        }
+        // DefaultAgent / 无 owning agent：保留原"就近原则"
+        if (!this.config.agents)
+            this.config.agents = {};
+        const isCodex = baseagentName === 'codex';
+        if (isCodex) {
+            if (!this.config.agents.codex)
+                this.config.agents.codex = {};
+            if (newModel)
+                this.config.agents.codex.model = newModel;
+            try {
+                saveConfig(this.config);
+            }
+            catch (e) {
+                return `⚠️ 写入 evolclaw.json 失败: ${e.message}`;
+            }
+            return undefined;
+        }
+        const configuredInEvolclaw = !!(this.config.agents?.claude?.model || this.config.agents?.claude?.effort);
+        if (configuredInEvolclaw) {
+            if (!this.config.agents.claude)
+                this.config.agents.claude = {};
+            if (newModel)
+                this.config.agents.claude.model = newModel;
+            try {
+                saveConfig(this.config);
+            }
+            catch (e) {
+                return `⚠️ 写入 evolclaw.json 失败: ${e.message}`;
+            }
+            return undefined;
+        }
+        // Fallback: ~/.claude/settings.json
+        const updates = {};
+        if (newModel)
+            updates.model = newModel;
+        const writeResult = writeUserSettings(updates);
+        if (!writeResult.success) {
+            return `⚠️ 写入用户配置失败: ${writeResult.error}`;
+        }
+        return undefined;
+    }
+    /**
+     * 持久化 baseagent.effort：agent-owned 写到 agent.json；否则就近原则。
+     */
+    persistBaseagentEffort(channel, baseagentName, newEffort) {
+        const owning = this.getOwningAgent(channel);
+        if (owning) {
+            try {
+                owning.setBaseagentEffort(newEffort);
+            }
+            catch (e) {
+                return `⚠️ 写入 agent.json 失败: ${e?.message || e}`;
+            }
+            return undefined;
+        }
+        if (!this.config.agents)
+            this.config.agents = {};
+        const isCodex = baseagentName === 'codex';
+        if (isCodex) {
+            if (newEffort === undefined) {
+                if (this.config.agents.codex?.reasoning) {
+                    delete this.config.agents.codex.reasoning;
+                    try {
+                        saveConfig(this.config);
+                    }
+                    catch { }
+                }
+            }
+            else {
+                if (!this.config.agents.codex)
+                    this.config.agents.codex = {};
+                this.config.agents.codex.reasoning = newEffort;
+                try {
+                    saveConfig(this.config);
+                }
+                catch (e) {
+                    return `⚠️ 写入 evolclaw.json 失败: ${e.message}`;
+                }
+            }
+            return undefined;
+        }
+        const configuredInEvolclaw = !!(this.config.agents?.claude?.model || this.config.agents?.claude?.effort);
+        if (configuredInEvolclaw) {
+            if (newEffort === undefined) {
+                delete this.config.agents.claude.effort;
+                try {
+                    saveConfig(this.config);
+                }
+                catch { }
+            }
+            else {
+                if (!this.config.agents.claude)
+                    this.config.agents.claude = {};
+                this.config.agents.claude.effort = newEffort;
+                try {
+                    saveConfig(this.config);
+                }
+                catch (e) {
+                    return `⚠️ 写入 evolclaw.json 失败: ${e.message}`;
+                }
+            }
+            return undefined;
         }
+        const updates = { effortLevel: newEffort ?? null };
+        const writeResult = writeUserSettings(updates);
+        if (!writeResult.success) {
+            return `⚠️ 写入用户配置失败: ${writeResult.error}`;
+        }
+        return undefined;
     }
     /** 项目列表快捷访问（list 缺失时用 defaultPath 作为唯一项目） */
     get projects() {
@@ -491,14 +707,16 @@ export class CommandHandler {
             return items;
         }
         if (cmd === '/p') {
-            const list = this.config.projects?.list || {};
+            // Use agent-scoped project list: agent-owned channels see their agent.json's
+            // projects.list; default channel sees evolclaw.json's projects.list
+            const list = this.getEffectiveProjects(channel);
             return Object.entries(list).map(([name, path]) => ({ value: name, label: name, desc: path }));
         }
         if (cmd === '/agent') {
-            return [...this.agentMap.keys()].map(name => ({ value: name, label: name }));
+            return this.getAvailableBaseagents(channel).map(name => ({ value: name, label: name }));
         }
         if (cmd === '/model') {
-            const agent = this.getAgent(session?.agentId);
+            const agent = this.getAgent(channel, session?.agentId);
             if (hasModelSwitcher(agent) && agent.listModels) {
                 const models = await agent.listModels() ?? [];
                 if (models.length > 0)
@@ -507,8 +725,19 @@ export class CommandHandler {
             return null;
         }
         if (cmd === '/restart') {
+            // /restart 是服务级操作（重连/重启进程），仅限 default 通道。
+            // EvolAgent 通道返回空菜单（用户在 agent-owned 通道上无可选项）
+            if (this.getOwningAgent(channel))
+                return [];
             const isOwner = userId ? this.sessionManager.resolveIdentity(channel, userId).role === 'owner' : false;
-            const channels = [...this.adapters.keys()].map(name => ({ value: name, label: name, desc: '重连此渠道' }));
+            // 列出所有 channel type
+            const visibleTypes = new Set();
+            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;
@@ -536,7 +765,7 @@ export class CommandHandler {
             const identity = this.sessionManager.resolveIdentity(channel, userId);
             if (identity.role !== 'owner')
                 return { error: '无权限' };
-            const permAgent = this.getAgent(session.agentId);
+            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'];
@@ -578,7 +807,7 @@ export class CommandHandler {
         const policy = this.getPolicy(channel);
         // 按当前会话选择 agent 后端
         const activeSession = await this.sessionManager.getActiveSession(channel, channelId);
-        const agent = this.getAgent(activeSession?.agentId);
+        const agent = this.getAgent(channel, activeSession?.agentId);
         // 规范化命令（将别名转换为完整命令）
         let normalizedContent = content;
         for (const [alias, full] of Object.entries(aliases)) {
@@ -599,6 +828,20 @@ export class CommandHandler {
                 return '⚠️ 话题中不支持此命令';
             }
         }
+        // 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 `❌ 当前通道由 agent [${owningAgent.name}] 管理，项目已锁定为 ${owningAgent.projectPath}`;
+            }
+            if (normalizedContent.startsWith('/agent ')) {
+                return `❌ 当前通道由 agent [${owningAgent.name}] 管理，baseagent 已锁定为 ${owningAgent.baseagent}`;
+            }
+        }
         // 权限检查：区分用户级命令和管理级命令
         const isOwner = identity.role === 'owner';
         const isAdmin = identity.role === 'owner' || identity.role === 'admin';
@@ -606,8 +849,9 @@ export class CommandHandler {
         if (normalizedContent.startsWith('/')) {
             // guest 在群聊和私聊中均可访问的只读命令：纯查询形态（带参写操作由各 handler 内部守卫拦截）
             const guestGroupCommands = [
-                '/status', '/help', '/check', '/chatmode',
-                '/model', '/effort', '/agent', '/perm', '/activity', '/safe', '/stop',
+                '/status', '/help', '/evolhelp', '/check', '/chatmode',
+                '/model', '/setmodel', '/effort', '/agent', '/perm', '/activity', '/safe', '/stop',
+                '/resume',
             ];
             const userCommands = activeChatType === 'group' && !isAdmin
                 ? guestGroupCommands
@@ -638,7 +882,7 @@ export class CommandHandler {
                 // 话题中：检查话题 session 是否在处理（不创建）
                 const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
                 if (threadSession) {
-                    const threadAgent = this.getAgent(threadSession.agentId);
+                    const threadAgent = this.getAgent(channel, threadSession.agentId);
                     if (threadAgent.hasActiveStream(threadSession.id)) {
                         return '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试';
                     }
@@ -732,7 +976,7 @@ export class CommandHandler {
                 '  /check - 检查渠道状态',
                 '  /activity [all|dm|owner|none] - 查看/控制中间输出显示模式',
                 ...(isAdmin ? [
-                    '  /restart <channel> - 重连指定渠道',
+                    '  /restart <type> - 重连该类型所有渠道实例（服务级，admin+）',
                 ] : []),
                 ...(isOwner ? [
                     '  /restart - 重启服务',
@@ -746,6 +990,64 @@ export class CommandHandler {
             ];
             return lines.join('\n');
         }
+        // /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: '/new', args: '[名称]', description: '创建新会话（清空历史请用此命令，可选命名）', category: '会话管理', roles: ['guest', 'admin', 'owner'] });
+            cmds.push({ command: '/s', aliases: ['/session', '/slist'], args: '[cli|名称|序号|uuid]', description: '列出或切换会话', category: '会话管理', roles: ['guest', 'admin', 'owner'] });
+            cmds.push({ command: '/name', aliases: ['/rename'], args: '<新名称>', description: '重命名当前会话', category: '会话管理', roles: ['guest', 'admin', 'owner'] });
+            cmds.push({ command: '/del', args: '<名称>', description: '删除指定会话（仅解绑，不删除文件）', category: '会话管理', roles: ['guest', 'admin', 'owner'] });
+            if (isAdmin) {
+                cmds.push({ command: '/fork', args: '[名称]', description: '分支当前会话（从当前对话点创建分支）', category: '会话管理', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/rewind', aliases: ['/rw'], args: '[N] [chat|file|all]', description: '查看历史/撤销指定轮次', category: '会话管理', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/compact', description: '压缩会话上下文（减少 token 用量）', category: '会话管理', roles: ['admin', 'owner'] });
+            }
+            // Agent 与模型
+            if (isAdmin) {
+                cmds.push({ command: '/agent', args: '[name]', description: '查看或切换 Agent 后端', category: 'Agent 与模型', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/model', args: '[model]', description: '查看或切换模型', category: 'Agent 与模型', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/setmodel', description: '返回 JSON 格式的模型列表（供程序解析）', category: 'Agent 与模型', roles: ['admin', 'owner'] });
+                cmds.push({ command: '/effort', args: '[level]', description: '查看或切换推理强度', category: 'Agent 与模型', roles: ['admin', 'owner'] });
+            }
+            // 权限管理
+            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: 'allow|always|deny', description: '审批权限请求', category: '权限管理', roles: ['admin', 'owner'] });
+            }
+            // 运维
+            cmds.push({ command: '/status', description: '显示会话状态', category: '运维', roles: ['guest', 'admin', 'owner'] });
+            cmds.push({ command: '/stop', description: '中断当前任务', category: '运维', roles: ['admin', 'owner'] });
+            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|new <aid>]', description: 'AID 管理', category: '运维', roles: ['owner'] });
+                cmds.push({ command: '/agentmd', args: '[put|set <内容>]', description: '管理 agent.md', category: '运维', roles: ['owner'] });
+            }
+            // 会话模式
+            if (isAdmin) {
+                cmds.push({ command: '/chatmode', args: '[interactive|proactive]', description: '查看/切换会话模式（被动响应或主动推进）', category: '会话管理', roles: ['admin', 'owner'] });
+            }
+            // 交互
+            cmds.push({ command: '/ask', args: '<选项>', description: '回答 Agent 的交互式问题', category: '运维', roles: ['guest', 'admin', 'owner'] });
+            cmds.push({ command: '/resume', description: '查看当前项目的 Claude 会话记录', category: '会话管理', roles: ['guest', 'admin', 'owner'] });
+            // 帮助
+            cmds.push({ command: '/help', description: '显示帮助信息', category: '帮助', roles: ['guest', 'admin', 'owner'] });
+            cmds.push({ command: '/evolhelp', description: '返回 JSON 格式命令列表', category: '帮助', roles: ['guest', 'admin', 'owner'] });
+            const categories = [...new Set(cmds.map(c => c.category))];
+            return JSON.stringify({ commands: cmds, categories });
+        }
         // /perm 命令：权限模式切换 + 权限审批（快速路径，不进入消息队列）
         if (normalizedContent.startsWith('/perm')) {
             const args = normalizedContent.slice(5).trim();
@@ -754,7 +1056,7 @@ export class CommandHandler {
             if ('error' in permResult)
                 return permResult.error;
             const { session: permSession } = permResult;
-            const permAgent = this.getAgent(permSession.agentId);
+            const permAgent = this.getAgent(channel, permSession.agentId);
             // /perm（无参数）：显示当前模式和可选模式
             if (!args) {
                 if (!hasPermissionController(permAgent)) {
@@ -893,6 +1195,89 @@ export class CommandHandler {
             this.interactionRouter.handle({ type: 'interaction.response', id: targetId, action: args, operatorId: userId });
             return `✓ 已回答`;
         }
+        // /resume 命令：返回当前项目的 Claude 会话记录（JSON）
+        if (normalizedContent === '/resume' || normalizedContent.startsWith('/resume ')) {
+            const resumeResult = await this.ensureSession(channel, channelId, threadId);
+            if ('error' in resumeResult)
+                return resumeResult.error;
+            const { session: resumeSession } = resumeResult;
+            try {
+                const { encodePath } = await import('../utils/cross-platform.js');
+                const homeDir = os.homedir();
+                const encodedPath = encodePath(resumeSession.projectPath);
+                const projectDir = path.join(homeDir, '.claude', 'projects', encodedPath);
+                if (!fs.existsSync(projectDir)) {
+                    return '❌ 未找到 Claude 会话记录目录';
+                }
+                const jsonlFiles = fs.readdirSync(projectDir).filter(f => f.endsWith('.jsonl'));
+                if (jsonlFiles.length === 0) {
+                    return '❌ 当前项目没有 Claude 会话记录';
+                }
+                const sessions = [];
+                for (const file of jsonlFiles) {
+                    const filePath = path.join(projectDir, file);
+                    const sessionId = file.replace('.jsonl', '');
+                    let lastTimestamp = '';
+                    let firstUserMessage = '';
+                    let model = '';
+                    let branch = '';
+                    let turns = 0;
+                    try {
+                        const content = fs.readFileSync(filePath, 'utf-8');
+                        const lines = content.split('\n').filter(l => l.trim());
+                        for (const line of lines) {
+                            const event = JSON.parse(line);
+                            if (event.timestamp && event.timestamp > lastTimestamp) {
+                                lastTimestamp = event.timestamp;
+                            }
+                            if (event.gitBranch && !branch) {
+                                branch = event.gitBranch;
+                            }
+                            if (event.type === 'user' && event.message?.role === 'user') {
+                                const msgContent = event.message.content;
+                                const isToolResult = Array.isArray(msgContent) && msgContent.every((c) => c.type === 'tool_result');
+                                if (!isToolResult) {
+                                    turns++;
+                                    if (!firstUserMessage) {
+                                        if (typeof msgContent === 'string') {
+                                            firstUserMessage = msgContent.slice(0, 100);
+                                        }
+                                        else if (Array.isArray(msgContent)) {
+                                            const textBlock = msgContent.find((c) => c.type === 'text');
+                                            if (textBlock?.text) {
+                                                firstUserMessage = textBlock.text.slice(0, 100);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            if (event.type === 'assistant' && event.message?.model && !model) {
+                                model = event.message.model;
+                            }
+                        }
+                    }
+                    catch {
+                        continue;
+                    }
+                    if (!lastTimestamp)
+                        continue;
+                    sessions.push({
+                        sessionId,
+                        lastMessageTime: lastTimestamp,
+                        firstUserMessage: firstUserMessage || '(无消息)',
+                        model: model || 'unknown',
+                        turns,
+                        branch: branch || 'unknown',
+                    });
+                }
+                sessions.sort((a, b) => b.lastMessageTime.localeCompare(a.lastMessageTime));
+                return JSON.stringify(sessions, null, 2);
+            }
+            catch (error) {
+                logger.error('[CommandHandler] /resume failed:', error);
+                return `❌ 读取会话记录失败: ${error instanceof Error ? error.message : '未知错误'}`;
+            }
+        }
         // /agent 命令：查看或切换 Agent 后端
         if (normalizedContent === '/agent' || normalizedContent.startsWith('/agent ')) {
             const args = normalizedContent.slice(6).trim();
@@ -900,9 +1285,12 @@ export class CommandHandler {
             if (args && (activeChatType === 'group' ? !isOwner : !isAdmin)) {
                 return '❌ 无权限：此命令仅限管理员使用';
             }
-            const available = [...this.agentMap.keys()];
+            const available = this.getAvailableBaseagents(channel);
             if (!args) {
-                const currentAgent = activeSession?.agentId || this.defaultAgentId;
+                // currentAgent: 当前 session 的 baseagent，或该 channel 所属 evolagent 的 baseagent
+                const currentAgent = activeSession?.agentId
+                    || this.agentRegistry?.resolveByChannel(channel)?.baseagent
+                    || this.parseDefaultBaseagent();
                 // 尝试发送交互卡片
                 if (this.interactionRouter && available.length > 1) {
                     const requestId = `agent-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`;
@@ -948,7 +1336,7 @@ export class CommandHandler {
                 }
                 return `当前 Agent: ${currentAgent}`;
             }
-            if (!this.agentMap.has(args)) {
+            if (!available.includes(args)) {
                 return `❌ 未知 Agent: ${args}\n可用: ${available.join(', ')}`;
             }
             const result = await this.ensureSession(channel, channelId, threadId);
@@ -969,6 +1357,74 @@ export class CommandHandler {
             let agentSwitchResponse = `✓ 已切换 Agent: ${args}\n  项目: ${projectName}\n  会话: ${newSession.name || '(未命名)'}\n  ${hasExistingSession}`;
             return agentSwitchResponse;
         }
+        // /setmodel 命令：返回 JSON 格式的模型列表（供程序解析）
+        if (normalizedContent === '/setmodel' || normalizedContent.startsWith('/setmodel ')) {
+            const setmodelResult = await this.ensureSession(channel, channelId, threadId);
+            if ('error' in setmodelResult)
+                return setmodelResult.error;
+            const { session: setmodelSession } = setmodelResult;
+            const setmodelAgent = this.getAgent(channel, setmodelSession.agentId);
+            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.config.agents?.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 { }
+            let modelListData = null;
+            if (apiBaseUrl) {
+                try {
+                    const modelsUrl = 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.config.agents?.claude?.apiKey || process.env.ANTHROPIC_AUTH_TOKEN || ''}` },
+                    });
+                    clearTimeout(timeout);
+                    if (resp.ok) {
+                        modelListData = await resp.json();
+                    }
+                }
+                catch { }
+            }
+            // 兜底模型列表
+            if (!modelListData || !modelListData.data || modelListData.data.length === 0) {
+                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' },
+                    ],
+                };
+            }
+            return JSON.stringify({
+                current_model: currentModel,
+                current_effort: currentEffort,
+                available_efforts: efforts,
+                models: modelListData,
+            }, null, 2);
+        }
         // /model 命令：查看或切换模型/推理强度
         if (normalizedContent.startsWith('/model')) {
             const args = normalizedContent.slice(6).trim();
@@ -977,7 +1433,7 @@ export class CommandHandler {
             if ('error' in modelResult)
                 return modelResult.error;
             const { session: modelSession } = modelResult;
-            const modelAgent = this.getAgent(modelSession.agentId);
+            const modelAgent = this.getAgent(channel, modelSession.agentId);
             const models = hasModelSwitcher(modelAgent) ? modelAgent.listModels() : [];
             if (!args) {
                 const currentModel = hasModelSwitcher(modelAgent) ? modelAgent.getModel() : modelAgent.name;
@@ -1091,68 +1547,16 @@ export class CommandHandler {
                 modelAgent.setEffort?.(newEffort);
                 changes.push(`推理强度: ${newEffort}`);
             }
-            // 持久化：写回来源（就近原则）
-            // evolclaw.json 配了 → 写 evolclaw.json
-            // evolclaw.json 没配 → 写 agent 全局配置
-            if (isCodexAgent) {
-                const configuredInEvolclaw = !!(this.config.agents?.codex?.model || this.config.agents?.codex?.reasoning);
-                if (configuredInEvolclaw) {
-                    if (!this.config.agents.codex)
-                        this.config.agents.codex = {};
-                    if (newModel)
-                        this.config.agents.codex.model = newModel;
-                    if (newEffort)
-                        this.config.agents.codex.reasoning = newEffort;
-                    try {
-                        saveConfig(this.config);
-                    }
-                    catch (error) {
-                        return `⚠️ 写入 evolclaw.json 失败: ${error.message}\n已更新运行时配置，但未持久化`;
-                    }
-                }
-                else {
-                    // Codex 全局配置（~/.codex/config.toml）目前不支持写入，回退到 evolclaw.json
-                    if (!this.config.agents.codex)
-                        this.config.agents.codex = {};
-                    if (newModel)
-                        this.config.agents.codex.model = newModel;
-                    if (newEffort)
-                        this.config.agents.codex.reasoning = newEffort;
-                    try {
-                        saveConfig(this.config);
-                    }
-                    catch (error) {
-                        return `⚠️ 写入 evolclaw.json 失败: ${error.message}\n已更新运行时配置，但未持久化`;
-                    }
-                }
+            // 持久化：agent-owned channel 写到 agent.json；default 走原"就近原则"
+            if (newModel) {
+                const err = this.persistBaseagentModel(channel, modelAgent.name, newModel);
+                if (err)
+                    return `${err}\n已更新运行时配置，但未持久化`;
             }
-            else {
-                const configuredInEvolclaw = !!(this.config.agents?.claude?.model || this.config.agents?.claude?.effort);
-                if (configuredInEvolclaw) {
-                    if (!this.config.agents.claude)
-                        this.config.agents.claude = {};
-                    if (newModel)
-                        this.config.agents.claude.model = newModel;
-                    if (newEffort)
-                        this.config.agents.claude.effort = newEffort;
-                    try {
-                        saveConfig(this.config);
-                    }
-                    catch (error) {
-                        return `⚠️ 写入 evolclaw.json 失败: ${error.message}\n已更新运行时配置，但未持久化`;
-                    }
-                }
-                else {
-                    const updates = {};
-                    if (newModel)
-                        updates.model = newModel;
-                    if (newEffort)
-                        updates.effortLevel = newEffort;
-                    const writeResult = writeUserSettings(updates);
-                    if (!writeResult.success) {
-                        return `⚠️ 写入用户配置失败: ${writeResult.error}\n已更新运行时配置，但未持久化到 ~/.claude/settings.json`;
-                    }
-                }
+            if (newEffort) {
+                const err = this.persistBaseagentEffort(channel, modelAgent.name, newEffort);
+                if (err)
+                    return `${err}\n已更新运行时配置，但未持久化`;
             }
             return `✓ 已切换\n  ${changes.join('\n  ')}`;
         }
@@ -1163,7 +1567,7 @@ export class CommandHandler {
             if ('error' in effortResult)
                 return effortResult.error;
             const { session: effortSession } = effortResult;
-            const effortAgent = this.getAgent(effortSession.agentId);
+            const effortAgent = this.getAgent(channel, effortSession.agentId);
             const currentModel = hasModelSwitcher(effortAgent) ? effortAgent.getModel() : effortAgent.name;
             const efforts = getAvailableEfforts(effortAgent, currentModel);
             const currentEffort = effortAgent.getEffort?.() || 'auto';
@@ -1231,29 +1635,9 @@ export class CommandHandler {
             // /effort auto：恢复 SDK 默认
             if (args === 'auto') {
                 effortAgent.setEffort?.(undefined);
-                const isCodex = effortAgent.name === 'codex';
-                if (isCodex) {
-                    if (this.config.agents?.codex?.reasoning) {
-                        delete this.config.agents.codex.reasoning;
-                        try {
-                            saveConfig(this.config);
-                        }
-                        catch { }
-                    }
-                }
-                else {
-                    const configuredInEvolclaw = !!this.config.agents?.claude?.effort;
-                    if (configuredInEvolclaw) {
-                        delete this.config.agents.claude.effort;
-                        try {
-                            saveConfig(this.config);
-                        }
-                        catch { }
-                    }
-                    else {
-                        writeUserSettings({ effortLevel: null });
-                    }
-                }
+                const err = this.persistBaseagentEffort(channel, effortAgent.name, undefined);
+                if (err)
+                    return `${err}\n已更新运行时配置，但未持久化`;
                 return '✓ 推理强度已恢复为 auto (SDK默认)';
             }
             // /effort <level>：切换推理强度
@@ -1265,34 +1649,9 @@ export class CommandHandler {
             }
             const newEffort = args;
             effortAgent.setEffort?.(newEffort);
-            // 持久化
-            if (!this.config.agents)
-                this.config.agents = {};
-            const isCodex = effortAgent.name === 'codex';
-            if (isCodex) {
-                if (!this.config.agents.codex)
-                    this.config.agents.codex = {};
-                this.config.agents.codex.reasoning = newEffort;
-                try {
-                    saveConfig(this.config);
-                }
-                catch { }
-            }
-            else {
-                const configuredInEvolclaw = !!(this.config.agents?.claude?.model || this.config.agents?.claude?.effort);
-                if (configuredInEvolclaw) {
-                    if (!this.config.agents.claude)
-                        this.config.agents.claude = {};
-                    this.config.agents.claude.effort = newEffort;
-                    try {
-                        saveConfig(this.config);
-                    }
-                    catch { }
-                }
-                else {
-                    writeUserSettings({ effortLevel: newEffort });
-                }
-            }
+            const err = this.persistBaseagentEffort(channel, effortAgent.name, newEffort);
+            if (err)
+                return `${err}\n已更新运行时配置，但未持久化`;
             return `✓ 推理强度: ${newEffort}`;
         }
         // /aid 命令：AID 身份管理（list / new）
@@ -1424,7 +1783,7 @@ export class CommandHandler {
                 owner: 'owner-dm-only',
                 none: 'none',
             };
-            const currentMode = getChannelShowActivities(this.config, channel);
+            const currentMode = this.agentRegistry?.getShowActivities?.(channel) ?? getChannelShowActivities(this.config, channel);
             // 模式描述列表（用于 body 和文本降级）
             const modeDescriptions = [
                 { key: 'all', configVal: 'all', label: '全部显示' },
@@ -1495,7 +1854,12 @@ export class CommandHandler {
             // 切换操作仅 owner
             if (!isOwner)
                 return '❌ 中间输出模式切换仅限 owner';
-            setChannelShowActivities(this.config, channel, newMode);
+            if (this.agentRegistry?.setShowActivities) {
+                this.agentRegistry.setShowActivities(channel, newMode);
+            }
+            else {
+                setChannelShowActivities(this.config, channel, newMode);
+            }
             return `✅ 中间输出模式: ${activityArg}（${label}）`;
         }
         // /chatmode 命令：查看/切换 session 会话模式（interactive | proactive）
@@ -1526,7 +1890,7 @@ export class CommandHandler {
             if (threadId) {
                 const threadSession = await this.sessionManager.getThreadSession(channel, channelId, threadId);
                 if (threadSession) {
-                    const threadAgent = this.getAgent(threadSession.agentId);
+                    const threadAgent = this.getAgent(channel, threadSession.agentId);
                     if (threadAgent.hasActiveStream(threadSession.id)) {
                         return '⚠️ 当前正在处理消息，请稍后再试\n使用 /stop 中断当前任务后重试';
                     }
@@ -1544,7 +1908,7 @@ export class CommandHandler {
             if ('error' in stopResult)
                 return '当前没有正在处理的任务';
             const { session: stopSession } = stopResult;
-            const stopAgent = this.getAgent(stopSession.agentId);
+            const stopAgent = this.getAgent(channel, stopSession.agentId);
             const sessionKey = stopSession.id;
             const queueLength = this.messageQueue.getQueueLength(sessionKey);
             const hasActive = stopAgent.hasActiveStream(sessionKey);
@@ -1553,7 +1917,12 @@ export class CommandHandler {
             }
             await stopAgent.interrupt(sessionKey);
             // 发布中断事件，让 MessageProcessor 标记为 interrupted（而非 done）
-            this.eventBus.publish({ type: 'message:interrupted', sessionId: sessionKey, reason: 'stop' });
+            this.eventBus.publish({
+                type: 'message:interrupted',
+                sessionId: sessionKey,
+                reason: 'stop',
+                agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '[default]',
+            });
             // 强制清除 processing_state
             this.sessionManager.clearProcessing(sessionKey);
             return '✓ 已发送中断信号，任务将尽快停止';
@@ -1564,7 +1933,7 @@ export class CommandHandler {
             if ('error' in result)
                 return result.error;
             const { session } = result;
-            const sessionAgent = this.getAgent(session.agentId);
+            const sessionAgent = this.getAgent(channel, session.agentId);
             if (!sessionAgent.capabilities?.clear) {
                 return `❌ 当前 Agent (${sessionAgent.name}) 不支持 /clear\n\n可使用 /new 创建新会话替代`;
             }
@@ -1596,7 +1965,7 @@ export class CommandHandler {
             if ('error' in result)
                 return result.error;
             const { session } = result;
-            const sessionAgent = this.getAgent(session.agentId);
+            const sessionAgent = this.getAgent(channel, session.agentId);
             if (!sessionAgent.capabilities?.compact) {
                 return `❌ 当前 Agent (${sessionAgent.name}) 不支持 /compact`;
             }
@@ -1626,7 +1995,7 @@ export class CommandHandler {
         // 尝试获取活跃会话（话题时直接查找话题 session）
         let session;
         if (threadId) {
-            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
+            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId);
         }
         else {
             session = await this.sessionManager.getActiveSession(channel, channelId);
@@ -1638,7 +2007,7 @@ export class CommandHandler {
             normalizedContent.startsWith('/project') ||
             normalizedContent === '/pwd' ||
             normalizedContent === '/status')) {
-            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd());
+            session = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel));
         }
         // /status 命令：显示会话状态
         if (normalizedContent === '/status') {
@@ -1647,7 +2016,7 @@ export class CommandHandler {
                 return `❌ 无法创建会话，请检查配置`;
             }
             const sessionKey = this.getQueueKey(session, channel, channelId);
-            const sessionAgent = this.getAgent(session.agentId);
+            const sessionAgent = this.getAgent(channel, session.agentId);
             const isCurrentlyProcessing = this.messageQueue.isProcessing(sessionKey) || sessionAgent.hasActiveStream(sessionKey);
             const queueLength = this.messageQueue.getQueueLength(sessionKey);
             const isThread = !!session.threadId;
@@ -1707,7 +2076,7 @@ export class CommandHandler {
                     return `❌ 会话名称 "${sessionName}" 已存在，请使用其他名称`;
                 }
             }
-            const projectPath = session?.projectPath || this.config.projects?.defaultPath || process.cwd();
+            const projectPath = session?.projectPath || this.getEffectiveDefaultPath(channel);
             const newSession = await this.sessionManager.createNewSession(channel, channelId, projectPath, sessionName, session?.agentId || this.defaultAgentId);
             this.eventBus.publish({
                 type: 'session:created',
@@ -1729,11 +2098,30 @@ export class CommandHandler {
         // /check 命令：检查渠道状态（guest 可用，详情仅 admin）/ 重连指定渠道（admin only）
         if (normalizedContent === '/check' || normalizedContent.startsWith('/check ')) {
             const subCmd = normalizedContent.slice('/check'.length).trim();
+            // 限定可见渠道：agent-owned 通道仅显示该 agent 名下的渠道；
+            // default 通道也仅显示 default 的渠道（不再展示 evolagents 的渠道）
+            const checkOwningAgent = this.getOwningAgent(channel);
+            let allowedChannels;
+            if (checkOwningAgent) {
+                allowedChannels = new Set(checkOwningAgent.channelInstanceNames());
+            }
+            else {
+                // default 范围：所有 channel 中，不属于任何 evolagent 的
+                const defaultNames = [];
+                for (const [name] of this.adapters) {
+                    const owner = this.agentRegistry?.resolveByChannel(name);
+                    if (!owner || owner.isDefault)
+                        defaultNames.push(name);
+                }
+                allowedChannels = new Set(defaultNames);
+            }
             // Default: show system health check (non-admin 仅看摘要)
             const lines = ['📡 渠道状态：'];
             // Group by channelType
             const groups = new Map();
             for (const [name] of this.adapters) {
+                if (!allowedChannels.has(name))
+                    continue;
                 const type = this.channelTypeMap.get(name) || name;
                 const ch = this.channelObjects.get(name);
                 let status;
@@ -1764,19 +2152,21 @@ export class CommandHandler {
                     lines.push(`  ${type}: [${parts.join(', ')}]`);
                 }
             }
-            // 队列状态
+            // 当前 agent 名（用于 agent 维度 stats / queue 查询）
+            const currentAgentName = checkOwningAgent?.name ?? '[default]';
+            // 队列状态（按当前 agent 维度）
             lines.push('', '📬 队列状态：');
-            lines.push(`  待处理消息: ${this.messageQueue.getGlobalQueueLength()}`);
-            lines.push(`  处理中队列: ${this.messageQueue.getGlobalProcessingCount()}`);
-            // 运行概况
+            lines.push(`  待处理消息: ${this.messageQueue.getQueueLengthByAgent(currentAgentName)}`);
+            lines.push(`  处理中队列: ${this.messageQueue.getProcessingCountByAgent(currentAgentName)}`);
+            // 运行概况（全局，进程级）
             lines.push('', '🖥️ 运行概况：');
             const uptimeMs = this.statsCollector
                 ? this.statsCollector.getSnapshot().uptimeMs
                 : process.uptime() * 1000;
             lines.push(`  运行时间: ${this.formatUptime(uptimeMs)}`);
-            // 近 1 小时统计
+            // 近 1 小时统计（按当前 agent 维度）
             if (this.statsCollector) {
-                const snap = this.statsCollector.getSnapshot();
+                const snap = this.statsCollector.getSnapshot(currentAgentName);
                 const h = snap.lastHour;
                 lines.push('', '📊 近 1 小时统计：');
                 lines.push(`  收到消息: ${h.received}`);
@@ -1802,23 +2192,50 @@ export class CommandHandler {
         // /restart 命令：重启服务（owner only） / 重连指定渠道（admin+）
         if (normalizedContent === '/restart' || normalizedContent.startsWith('/restart ')) {
             const restartArg = normalizedContent.slice('/restart'.length).trim();
-            // /restart <channel> — 重连指定渠道（admin only）
+            // /restart <type> — 重连指定类型的所有渠道（admin only，evolclaw 服务级操作）
+            // 服务级操作仅可从 default 通道发起，避免 evolagent owner/admin 越权
             if (restartArg) {
+                if (this.getOwningAgent(channel)) {
+                    return '❌ 渠道重连只能从 DefaultAgent 通道发起（服务级操作）';
+                }
                 if (!isAdmin)
                     return '❌ 无权限：渠道重连仅限管理员使用';
-                const target = restartArg;
-                const ch = this.channelObjects.get(target);
-                if (!ch) {
-                    const available = [...this.channelObjects.keys()].join(', ') || '无';
-                    return `❌ 未找到渠道 "${target}"，可用渠道：${available}`;
-                }
-                if (!ch.reconnect) {
-                    return `❌ 渠道 "${target}" 不支持重连`;
+                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 `❌ 没有类型为 "${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}`);
+                    }
                 }
-                const result = await ch.reconnect();
-                return `🔄 ${target} 重连: ${result}`;
+                return `🔄 重连 ${type}:\n  ${results.join('\n  ')}`;
+            }
+            // /restart（无参数）— 重启整个服务（owner only，且仅可从 default 通道触发）
+            // 防止 evolagent 通道的 owner 越权杀整个 evolclaw 进程（影响所有租户）
+            if (this.getOwningAgent(channel)) {
+                return '❌ 服务重启只能从 DefaultAgent 通道发起。EvolAgent 通道仅可执行 /restart <type> 重连特定类型渠道';
             }
-            // /restart（无参数）— 重启整个服务（owner only）
             if (!isOwner)
                 return '❌ 无权限：服务重启仅限 owner 使用';
             const allSessions = await this.sessionManager.listSessions(channel, channelId);
@@ -1832,7 +2249,7 @@ export class CommandHandler {
             const executeRestart = async () => {
                 let replyContext;
                 if (threadId) {
-                    const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.config.projects?.defaultPath || process.cwd(), threadId);
+                    const threadSession = await this.sessionManager.getOrCreateSession(channel, channelId, this.getEffectiveDefaultPath(channel), threadId);
                     replyContext = this.getReplyContext(threadSession);
                 }
                 const restartInfo = {
@@ -1971,7 +2388,7 @@ export class CommandHandler {
             // 找目标 channelId
             let targetChannelId = channelId;
             if (isCrossChannel) {
-                const ownerPeerId = getOwner(this.config, targetChannel);
+                const ownerPeerId = this.agentRegistry?.getOwner?.(targetChannel) ?? getOwner(this.config, targetChannel);
                 targetChannelId = ownerPeerId ? (this.sessionManager.getOwnerChatId(targetChannel, ownerPeerId) ?? '') : '';
                 if (!targetChannelId) {
                     return `❌ 未找到 ${targetLabel} 的私聊会话，请先在该通道发送一条消息`;
@@ -2226,27 +2643,19 @@ export class CommandHandler {
             }
             // 生成项目名称（使用目录名）
             const projectName = path.basename(projectPath);
-            // 检查是否已存在
-            if (this.projects[projectName]) {
-                const existingPath = this.projects[projectName];
-                if (existingPath === projectPath) {
+            // 检查在当前 scope 内是否已存在
+            const scopeProjects = this.getEffectiveProjects(channel);
+            const existing = scopeProjects[projectName];
+            if (existing) {
+                if (existing === projectPath) {
                     return `项目 "${projectName}" 已存在\n  路径: ${projectPath}\n\n使用 /p ${projectName} 切换到该项目`;
                 }
-                return `❌ 项目名称 "${projectName}" 已被占用\n  现有路径: ${existingPath}\n  新路径: ${projectPath}\n\n请重命名目录或手动编辑配置文件`;
-            }
-            // 添加到配置
-            if (!this.config.projects) {
-                this.config.projects = { defaultPath: process.cwd(), autoCreate: false, list: {} };
+                return `❌ 项目名称 "${projectName}" 已被占用\n  现有路径: ${existing}\n  新路径: ${projectPath}\n\n请重命名目录或手动编辑配置文件`;
             }
-            if (!this.config.projects.list) {
-                this.config.projects.list = {};
-            }
-            this.config.projects.list[projectName] = projectPath;
-            // 保存配置
-            const { saveConfig } = await import('../config.js');
-            saveConfig(this.config);
-            // 更新内存中的项目列表
-            this.projects[projectName] = projectPath;
+            // 写入：agent-owned channel → agent.json；default → evolclaw.json
+            const err = await this.addProjectInScope(channel, projectName, projectPath);
+            if (err)
+                return err;
             return `✓ 已添加项目: ${projectName}\n  路径: ${projectPath}\n\n使用 /p ${projectName} 切换到该项目`;
         }
         // /slist 命令：列出当前项目的会话
@@ -2608,7 +3017,7 @@ export class CommandHandler {
                 return `❌ 删除失败`;
             }
             this.eventBus.publish({ type: 'session:deleted', sessionId: targetSession.id });
-            const targetAgent = this.getAgent(targetSession.agentId);
+            const targetAgent = this.getAgent(channel, targetSession.agentId);
             await targetAgent.closeSession(targetSession.id);
             return `✓ 已删除会话: ${targetSession.name || sessionName}\n会话文件已保留，可通过 CLI 访问`;
         }
@@ -2621,7 +3030,7 @@ export class CommandHandler {
             if (!session.agentSessionId) {
                 return `❌ 当前会话尚未初始化对话，无法分支\n\n请先发送一条消息，然后再使用 /fork`;
             }
-            const forkAgent = this.getAgent(session.agentId);
+            const forkAgent = this.getAgent(channel, session.agentId);
             if (!forkAgent.capabilities?.fork) {
                 return `❌ 当前 Agent (${forkAgent.name}) 不支持 /fork\n\n可使用 /new 创建新会话替代`;
             }
@@ -2642,7 +3051,7 @@ export class CommandHandler {
             if ('error' in result)
                 return result.error;
             const { session } = result;
-            const rewindAgent = this.getAgent(session.agentId);
+            const rewindAgent = this.getAgent(channel, session.agentId);
             if (rewindAgent.name !== 'claude') {
                 return '❌ /rewind 仅支持 Claude 后端';
             }
@@ -2679,7 +3088,7 @@ export class CommandHandler {
             if ('error' in repairResult)
                 return repairResult.error;
             const { session: repairSession } = repairResult;
-            const repairAgent = this.getAgent(repairSession.agentId);
+            const repairAgent = this.getAgent(channel, repairSession.agentId);
             const { checkSessionFile, backupSessionFile } = await import('./session/session-file-health.js');
             try {
                 if (!repairSession.agentSessionId) {
@@ -2838,7 +3247,7 @@ export class CommandHandler {
         '/help', '/status', '/check', '/pwd',
         '/model', '/effort', '/perm', '/agent',
         '/compact', '/activity', '/file', '/send', '/chatmode', '/restart', '/agentmd', '/bind', '/aid',
-        '/rename', '/name',
+        '/rename', '/name', '/evolagent',
     ];
     /** ctl 中仅允许查询形态的指令；写形态（带参）一律拒绝 */
     static CTL_READONLY = new Set(['/agent']);
@@ -2892,6 +3301,48 @@ 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();
+            if (!arg) {
+                const owning = this.getOwningAgent(session.channel);
+                if (owning) {
+                    return { ok: true, result: `当前 EvolAgent: ${owning.name} (${owning.baseagent})` };
+                }
+                return { ok: true, result: '当前为 DefaultAgent 模式' };
+            }
+            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}` };
+                }
+            }
+            return { ok: false, error: '用法: evolclaw ctl evolagent [reload <name>]' };
+        }
         // 4. /send 文本消息：直接通过 adapter 主动发送，不走 handle()
         if (cmd.startsWith('/send ') || cmd === '/send') {
             const text = cmd.startsWith('/send ') ? cmd.slice(6).trim() : '';