evolclaw 2.8.2 → 2.8.3

package/dist/agents/claude-runner.js

@@ -988,15 +988,26 @@ export class AgentRunner {
 // Plugin implementation
 export class ClaudeAgentPlugin {
     name = 'claude';
-    isEnabled(config) {
-        return true;
-    }
-    createAgent(config, callbacks) {
-        const anthropic = resolveAnthropicConfig(config);
-        const agentRunner = new AgentRunner(anthropic.apiKey, anthropic.model, callbacks.onSessionIdUpdate, anthropic.baseUrl, config);
+    isEnabled(_globalConfig, agent) {
+        // Only instantiate this baseagent for agents that declare it.
+        return !!agent.config.agents?.claude;
+    }
+    createAgent(globalConfig, agent, callbacks) {
+        // Per-agent override: read from agent.json's agents.claude block first.
+        const override = agent.config.agents?.claude;
+        const anthropic = resolveAnthropicConfig(globalConfig, override);
+        // Merge per-agent claude block into config so runner reads useSettingSources etc.
+        const merged = {
+            ...globalConfig,
+            agents: {
+                ...(globalConfig.agents || {}),
+                claude: { ...(globalConfig.agents?.claude || {}), ...(override || {}) },
+            },
+        };
+        const agentRunner = new AgentRunner(anthropic.apiKey, anthropic.model, callbacks.onSessionIdUpdate, anthropic.baseUrl, merged);
         if (anthropic.effort) {
             agentRunner.setEffort(anthropic.effort);
         }
-        return { agent: agentRunner };
+        return { evolagentName: agent.name, baseagent: 'claude', agent: agentRunner };
     }
 }

package/dist/agents/codex-runner.js

@@ -301,17 +301,28 @@ export class CodexRunner {
 // ── Plugin ──
 export class CodexAgentPlugin {
     name = 'codex';
-    isEnabled(config) {
+    isEnabled(globalConfig, agent) {
+        if (!agent.config.agents?.codex)
+            return false;
         try {
-            const resolved = resolveOpenaiConfig(config);
+            const override = agent.config.agents.codex;
+            const resolved = resolveOpenaiConfig(globalConfig, override);
             return !!resolved.apiKey;
         }
         catch {
             return false;
         }
     }
-    createAgent(config, callbacks) {
-        const resolved = resolveOpenaiConfig(config);
-        return { agent: new CodexRunner(config, callbacks) };
+    createAgent(globalConfig, agent, callbacks) {
+        const override = agent.config.agents?.codex;
+        // Synthesize a per-agent config view so CodexRunner sees its own credentials.
+        const merged = {
+            ...globalConfig,
+            agents: {
+                ...(globalConfig.agents || {}),
+                codex: { ...(globalConfig.agents?.codex || {}), ...(override || {}) },
+            },
+        };
+        return { evolagentName: agent.name, baseagent: 'codex', agent: new CodexRunner(merged, callbacks) };
     }
 }

package/dist/agents/gemini-runner.js

@@ -405,16 +405,27 @@ export class GeminiRunner {
 // ── Plugin ──
 export class GeminiAgentPlugin {
     name = 'gemini';
-    isEnabled(config) {
+    isEnabled(globalConfig, agent) {
+        if (!agent.config.agents?.gemini)
+            return false;
         try {
-            const resolved = resolveGoogleConfig(config);
+            const override = agent.config.agents.gemini;
+            const resolved = resolveGoogleConfig(globalConfig, override);
             return !!resolved.cliPath;
         }
         catch {
             return false;
         }
     }
-    createAgent(config, callbacks) {
-        return { agent: new GeminiRunner(config, callbacks) };
+    createAgent(globalConfig, agent, callbacks) {
+        const override = agent.config.agents?.gemini;
+        const merged = {
+            ...globalConfig,
+            agents: {
+                ...(globalConfig.agents || {}),
+                gemini: { ...(globalConfig.agents?.gemini || {}), ...(override || {}) },
+            },
+        };
+        return { evolagentName: agent.name, baseagent: 'gemini', agent: new GeminiRunner(merged, callbacks) };
     }
 }

package/dist/channels/aun.js

@@ -80,6 +80,11 @@ export class AUNChannel {
      */
     async callAndTrace(method, params, opts) {
         this.trace('OUT', method, params);
+        // [DIAG-STALE] 记录调用瞬间 SDK 内部 _state，证明是否在 reconnecting 中误发
+        const sdkStateBefore = this.client?._state ?? 'no-client';
+        if (sdkStateBefore !== 'connected') {
+            logger.warn(`[AUN][DIAG-STALE] callAndTrace ${method} on non-connected SDK: sdk_state=${sdkStateBefore} evolclaw_connected=${this.connected}`);
+        }
         try {
             const result = await this.client.call(method, params);
             if (!opts?.silentOk) {
@@ -97,6 +102,9 @@ export class AUNChannel {
                 code: e?.code,
                 name: e?.name,
             });
+            // [DIAG-STALE] 失败时再记录一次 SDK _state，看错误类型是否为 ConnectionError
+            const sdkStateAfter = this.client?._state ?? 'no-client';
+            logger.warn(`[AUN][DIAG-STALE] callAndTrace ${method} FAILED: err_name=${e?.name ?? '?'} err_code=${e?.code ?? '?'} sdk_state_before=${sdkStateBefore} sdk_state_after=${sdkStateAfter} evolclaw_connected=${this.connected}`);
             logger.warn(`${this.logPrefix()} rpc ${method} failed: ${e?.name ?? ''}(${e?.code ?? ''}) ${e?.message ?? e}`);
             throw e;
         }
@@ -887,6 +895,11 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!data || typeof data !== 'object')
             return;
         const state = data.state ?? '';
+        // [DIAG-STALE] 记录状态切换瞬间 evolclaw 的 connected 标志和 SDK 的内部 _state，
+        // 用于证明"reconnecting 时 connected 保持 true，导致 sendMessage 误放行"的假设
+        const sdkState = this.client?._state ?? 'no-client';
+        const connectedBefore = this.connected;
+        logger.info(`[AUN][DIAG-STALE] connection.state event: state=${state} attempt=${data.attempt ?? '-'} | connected_before=${connectedBefore} sdk_state=${sdkState}`);
         if (state === 'connected') {
             this.connected = true;
             this.reconnectAttempt = 0;
@@ -952,6 +965,15 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         this.recallHandler = handler;
     }
     async sendMessage(channelId, text, context) {
+        // [DIAG-STALE] 进入 sendMessage 时记录 evolclaw connected 标志和 SDK _state，
+        // 用于检测两者是否一致：若 connected=true 但 sdk_state != 'connected'，即为 stale 状态
+        const sdkStateOnEntry = this.client?._state ?? 'no-client';
+        if (this.connected !== (sdkStateOnEntry === 'connected')) {
+            logger.warn(`[AUN][DIAG-STALE] sendMessage entry MISMATCH: connected=${this.connected} sdk_state=${sdkStateOnEntry} channel=${channelId} text=${text.slice(0, 40)}`);
+        }
+        else {
+            logger.debug(`[AUN][DIAG-STALE] sendMessage entry: connected=${this.connected} sdk_state=${sdkStateOnEntry} channel=${channelId}`);
+        }
         if (!this.connected || !this.client) {
             logger.warn(`${this.logPrefix()} Cannot send: not connected`);
             return;

package/dist/config.js

@@ -48,82 +48,97 @@ function loadCodexSettings() {
     catch { }
     return {};
 }
-export function resolveAnthropicConfig(config) {
+/**
+ * Resolve anthropic credentials with optional override (from agent.json).
+ *
+ * Priority: override > globalConfig.agents.claude > env > ~/.claude/settings.json
+ *
+ * Override is matched against the same shape as `config.agents.claude` so
+ * EvolAgent's `agents.claude` block is wired in directly.
+ */
+export function resolveAnthropicConfig(config, override) {
     const settings = loadClaudeSettings();
-    // 过滤占位符，视为未配置
-    const configApiKey = config.agents?.claude?.apiKey;
-    const isPlaceholderKey = !configApiKey ||
-        configApiKey.includes('your-') ||
-        configApiKey.includes('placeholder');
-    const apiKey = (isPlaceholderKey ? null : configApiKey)
+    const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
+    // apiKey: override → global → env → settings.json
+    const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
+    const globalApiKey = isPlaceholder(config.agents?.claude?.apiKey) ? undefined : config.agents?.claude?.apiKey;
+    const apiKey = overrideApiKey
+        || globalApiKey
         || process.env.ANTHROPIC_AUTH_TOKEN
         || settings.env?.ANTHROPIC_AUTH_TOKEN;
     if (!apiKey) {
-        throw new Error('No API key found. Set one of: agents.claude.apiKey, env ANTHROPIC_AUTH_TOKEN, or ~/.claude/settings.json env.ANTHROPIC_AUTH_TOKEN');
+        throw new Error('No API key found. Set one of: agents.claude.apiKey (per-agent or global), env ANTHROPIC_AUTH_TOKEN, or ~/.claude/settings.json env.ANTHROPIC_AUTH_TOKEN');
     }
-    // baseUrl 也过滤占位符
-    const configBaseUrl = config.agents?.claude?.baseUrl;
-    const isPlaceholderUrl = configBaseUrl?.includes('api.anthropic.com');
-    const baseUrl = (isPlaceholderUrl ? null : configBaseUrl)
+    const isPlaceholderUrl = (v) => !v || v.includes('api.anthropic.com');
+    const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
+    const globalBaseUrl = isPlaceholderUrl(config.agents?.claude?.baseUrl) ? undefined : config.agents?.claude?.baseUrl;
+    const baseUrl = overrideBaseUrl
+        || globalBaseUrl
         || process.env.ANTHROPIC_BASE_URL
         || settings.env?.ANTHROPIC_BASE_URL;
-    const model = config.agents?.claude?.model
+    const model = override?.model
+        || config.agents?.claude?.model
         || settings.model
         || 'sonnet';
-    const effort = config.agents?.claude?.effort
+    const effort = override?.effort
+        || config.agents?.claude?.effort
         || settings.effortLevel
         || undefined;
-    const configExecPath = config.agents?.claude?.pathToClaudeCodeExecutable;
-    const isPlaceholderExec = !configExecPath || configExecPath.includes('your-') || configExecPath.includes('placeholder');
-    const pathToClaudeCodeExecutable = isPlaceholderExec ? undefined : configExecPath;
+    const pickExec = (v) => (!v || v.includes('your-') || v.includes('placeholder')) ? undefined : v;
+    const pathToClaudeCodeExecutable = pickExec(override?.pathToClaudeCodeExecutable)
+        || pickExec(config.agents?.claude?.pathToClaudeCodeExecutable);
     return { apiKey, baseUrl, model, effort, pathToClaudeCodeExecutable };
 }
-export function resolveOpenaiConfig(config) {
+export function resolveOpenaiConfig(config, override) {
     const codexSettings = loadCodexSettings();
-    // 过滤占位符，视为未配置
-    const configApiKey = config.agents?.codex?.apiKey;
-    const isPlaceholderKey = !configApiKey ||
-        configApiKey.includes('your-') ||
-        configApiKey.includes('placeholder');
-    const apiKey = (isPlaceholderKey ? null : configApiKey)
+    const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
+    const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
+    const globalApiKey = isPlaceholder(config.agents?.codex?.apiKey) ? undefined : config.agents?.codex?.apiKey;
+    const apiKey = overrideApiKey
+        || globalApiKey
         || process.env.OPENAI_API_KEY
         || codexSettings.apiKey;
     if (!apiKey) {
-        throw new Error('No OpenAI API key found. Set one of: agents.codex.apiKey, env OPENAI_API_KEY, or ~/.codex/auth.json');
+        throw new Error('No OpenAI API key found. Set one of: agents.codex.apiKey (per-agent or global), env OPENAI_API_KEY, or ~/.codex/auth.json');
     }
-    // baseUrl 也过滤占位符（与 anthropic 保持一致：只检查默认域名）
-    const configBaseUrl = config.agents?.codex?.baseUrl;
-    const isPlaceholderUrl = configBaseUrl?.includes('api.openai.com');
-    const baseUrl = (isPlaceholderUrl ? null : configBaseUrl)
+    const isPlaceholderUrl = (v) => !v || v.includes('api.openai.com');
+    const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
+    const globalBaseUrl = isPlaceholderUrl(config.agents?.codex?.baseUrl) ? undefined : config.agents?.codex?.baseUrl;
+    const baseUrl = overrideBaseUrl
+        || globalBaseUrl
         || process.env.OPENAI_BASE_URL
         || codexSettings.baseUrl
         || undefined;
-    const model = config.agents?.codex?.model
+    const model = override?.model
+        || config.agents?.codex?.model
         || codexSettings.model
         || 'gpt-5.2-codex';
-    const effort = config.agents?.codex?.effort || config.agents?.codex?.reasoning || undefined;
+    const effort = override?.effort
+        || override?.reasoning
+        || config.agents?.codex?.effort
+        || config.agents?.codex?.reasoning
+        || undefined;
     return { apiKey, baseUrl, model, effort };
 }
-export function resolveGoogleConfig(config) {
+export function resolveGoogleConfig(config, override) {
     const googleCfg = config.agents?.gemini;
-    // CLI path: config → which gemini
-    let cliPath = googleCfg?.cliPath || '';
+    const isPlaceholder = (v) => !v || v.includes('your-') || v.includes('placeholder');
+    let cliPath = override?.cliPath || googleCfg?.cliPath || '';
     if (!cliPath) {
         cliPath = commandExists('gemini') ? 'gemini' : '';
     }
-    // Model: config → default
-    const model = googleCfg?.model || 'gemini-2.5-flash';
-    // API key: config → env (optional, CLI has OAuth)
-    const configApiKey = googleCfg?.apiKey;
-    const isPlaceholder = !configApiKey || configApiKey.includes('your-') || configApiKey.includes('placeholder');
-    const apiKey = (isPlaceholder ? undefined : configApiKey)
+    const model = override?.model || googleCfg?.model || 'gemini-2.5-flash';
+    const overrideApiKey = isPlaceholder(override?.apiKey) ? undefined : override?.apiKey;
+    const globalApiKey = isPlaceholder(googleCfg?.apiKey) ? undefined : googleCfg?.apiKey;
+    const apiKey = overrideApiKey
+        || globalApiKey
         || process.env.GEMINI_API_KEY
         || process.env.GOOGLE_API_KEY
         || undefined;
-    const mode = googleCfg?.mode || 'cli';
-    const useVertex = googleCfg?.useVertex || false;
-    const project = googleCfg?.project || process.env.GOOGLE_CLOUD_PROJECT || undefined;
-    const location = googleCfg?.location || process.env.GOOGLE_CLOUD_LOCATION || 'us-central1';
+    const mode = override?.mode || googleCfg?.mode || 'cli';
+    const useVertex = override?.useVertex ?? googleCfg?.useVertex ?? false;
+    const project = override?.project || googleCfg?.project || process.env.GOOGLE_CLOUD_PROJECT || undefined;
+    const location = override?.location || googleCfg?.location || process.env.GOOGLE_CLOUD_LOCATION || 'us-central1';
     return { cliPath, model, apiKey, mode, useVertex, project, location };
 }
 export function loadConfig(configPath = resolvePaths().config) {

package/dist/core/agent-loader.js

@@ -1,14 +1,12 @@
 /**
  * Agent Plugin System
  *
- * Provides a lightweight plugin interface for agent integration.
+ * Per-EvolAgent runner instantiation: each (EvolAgent × baseagent) gets its
+ * own runner so that runtime state (model/effort/permissionMode/credentials)
+ * is fully isolated.
  */
 import { logger } from '../utils/logger.js';
-/**
- * Agent Loader
- *
- * Manages agent plugin registration and creation.
- */
+/** Agent Loader — produces one runner per (EvolAgent × baseagent). */
 export class AgentLoader {
     plugins = new Map();
     register(plugin) {
@@ -18,20 +16,37 @@ export class AgentLoader {
         this.plugins.set(plugin.name, plugin);
         logger.debug(`Registered agent plugin: ${plugin.name}`);
     }
-    createAll(config, callbacks) {
+    /**
+     * Iterate over all EvolAgents (DefaultAgent + each named agent in registry)
+     * × all registered plugins. Each successful (agent, plugin) pair yields one
+     * runner instance.
+     */
+    createAll(globalConfig, registry, callbacks) {
         const instances = [];
-        for (const [name, plugin] of this.plugins) {
-            if (!plugin.isEnabled(config)) {
-                logger.info(`Agent '${name}' is disabled, skipping`);
-                continue;
-            }
-            try {
-                const instance = plugin.createAgent(config, callbacks);
-                instances.push(instance);
-                logger.info(`✓ Agent '${name}' instance created`);
-            }
-            catch (error) {
-                logger.error(`✗ Failed to create agent '${name}':`, error);
+        const allAgents = [];
+        const def = registry.get('[default]');
+        if (def)
+            allAgents.push(def);
+        for (const a of registry.runnableAgents())
+            allAgents.push(a);
+        for (const agent of allAgents) {
+            for (const [pluginName, plugin] of this.plugins) {
+                if (!plugin.isEnabled(globalConfig, agent)) {
+                    logger.debug(`Plugin '${pluginName}' disabled for agent '${agent.name}', skipping`);
+                    continue;
+                }
+                try {
+                    const instance = plugin.createAgent(globalConfig, agent, callbacks);
+                    if (!instance) {
+                        logger.debug(`Plugin '${pluginName}' returned null for agent '${agent.name}', skipping`);
+                        continue;
+                    }
+                    instances.push(instance);
+                    logger.info(`✓ Runner created: agent=${instance.evolagentName} baseagent=${instance.baseagent}`);
+                }
+                catch (error) {
+                    logger.error(`✗ Failed to create runner for agent='${agent.name}' baseagent='${pluginName}':`, error);
+                }
             }
         }
         return instances;

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;
@@ -131,11 +131,38 @@ export class CommandHandler {
     agentMap;
     defaultAgentId;
     agentRegistry;
-    /** 按 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;
+    /**
+     * 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;
@@ -144,11 +171,12 @@ 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 管理 */
@@ -685,10 +713,10 @@ export class CommandHandler {
             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)
@@ -737,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'];
@@ -779,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)) {
@@ -821,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
@@ -853,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 中断当前任务后重试';
                     }
@@ -961,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();
@@ -969,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)) {
@@ -1108,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();
@@ -1115,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')}`;
@@ -1163,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);
@@ -1184,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();
@@ -1192,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;
@@ -1326,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';
@@ -1649,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 中断当前任务后重试';
                     }
@@ -1667,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);
@@ -1692,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 创建新会话替代`;
             }
@@ -1724,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`;
             }
@@ -1775,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;
@@ -2776,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 访问`;
         }
@@ -2789,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 创建新会话替代`;
             }
@@ -2810,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 后端';
             }
@@ -2847,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) {

package/dist/core/evolagent-registry.js

@@ -105,10 +105,21 @@ export class EvolAgentRegistry {
     buildDefaultAgent(globalConfig) {
         const agents = globalConfig.agents || {};
         const defaultName = agents.defaultAgent || 'claude';
+        // Include ALL declared baseagents (not just defaultName) so that
+        // AgentLoader creates runners for each, enabling /agent switching.
+        const baseagentBlock = {};
+        const KNOWN_BASEAGENTS = ['claude', 'codex', 'gemini', 'hermes'];
+        for (const ba of KNOWN_BASEAGENTS) {
+            if (agents[ba] !== undefined)
+                baseagentBlock[ba] = agents[ba];
+        }
+        if (Object.keys(baseagentBlock).length === 0) {
+            baseagentBlock[defaultName] = agents[defaultName] || {};
+        }
         const cfg = {
             name: '[default]',
             enabled: true,
-            agents: { [defaultName]: agents[defaultName] || {} },
+            agents: baseagentBlock,
             channels: globalConfig.channels || {},
             projects: { defaultPath: globalConfig.projects?.defaultPath || process.cwd() },
             chatmode: globalConfig.chatmode,

package/dist/core/message/message-processor.js

@@ -32,11 +32,25 @@ export class MessageProcessor {
     interactionRouter;
     messageQueue;
     skillsEnsured = false; // 全局 SKILLS.md 是否已确保
-    /** 按 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;
+    /**
+     * Get the runner for a given (channel, baseagent) pair.
+     *
+     * - `channel` is used to look up the owning EvolAgent (via registry).
+     * - `baseagent` (e.g. 'claude') comes from `session.agentId`.
+     *
+     * Falls back to `defaultAgentId` (a composite key, e.g. `[default]::claude`)
+     * when no match is found.
+     */
+    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;
     }
     /** 获取可用 agent 列表 */
     getAvailableAgents() {
@@ -57,12 +71,12 @@ export class MessageProcessor {
         this.commandHandler = commandHandler;
         if (agentRunnerOrMap instanceof Map) {
             this.agentMap = agentRunnerOrMap;
-            this.defaultAgentId = defaultAgentId || 'claude';
+            this.defaultAgentId = defaultAgentId || '[default]::claude';
         }
         else {
-            // 向后兼容：单个 agentRunner
-            this.agentMap = new Map([[agentRunnerOrMap.name, agentRunnerOrMap]]);
-            this.defaultAgentId = agentRunnerOrMap.name;
+            // Backward-compat single-runner path.
+            this.agentMap = new Map([[`[default]::${agentRunnerOrMap.name}`, agentRunnerOrMap]]);
+            this.defaultAgentId = `[default]::${agentRunnerOrMap.name}`;
         }
         // 监听中断事件，标记被中断的 session
         this.eventBus.subscribe('message:interrupted', (event) => {
@@ -176,7 +190,7 @@ export class MessageProcessor {
             logger.debug(`[MessageProcessor] Agent context resolved: ${agentContext.name} (${agentContext.baseagent})`);
         }
         // 按 session.agentId 选择 agent 后端
-        const agent = this.getAgent(session.agentId);
+        const agent = this.getAgent(channelKey, session.agentId);
         const monitorEnabled = this.config.idleMonitor?.enabled !== false;
         const showIdleMonitor = policy.showIdleMonitor(chatType, identityRole);
         // 计算是否抑制中间输出（工具活动 + 流式文本）
@@ -302,7 +316,7 @@ export class MessageProcessor {
             return;
         }
         const { adapter, options } = channelInfo;
-        const agent = this.getAgent(session.agentId);
+        const agent = this.getAgent(channelKey, session.agentId);
         const streamKey = session.id;
         // 为本次任务处理生成唯一 task_id（客户端生成，格式 task-{10hex}）
         const taskId = `task-${crypto.randomUUID().replace(/-/g, '').slice(0, 10)}`;

package/dist/core/message/message-queue.js

@@ -98,7 +98,7 @@ export class MessageQueue {
                         agentName: this.processingAgent.get(queueKey),
                     });
                     if (this.interruptCallback) {
-                        this.interruptCallback(sessionKey, this.currentAgentId).catch(() => { });
+                        this.interruptCallback(sessionKey, this.currentAgentId, this.processingAgent.get(queueKey)).catch(() => { });
                     }
                 }
                 else {
@@ -282,7 +282,7 @@ export class MessageQueue {
             agentName: this.processingAgent.get(this.currentSessionKey),
         });
         if (this.interruptCallback) {
-            this.interruptCallback(sessionKey, this.currentAgentId).catch(() => { });
+            this.interruptCallback(sessionKey, this.currentAgentId, this.processingAgent.get(this.currentSessionKey)).catch(() => { });
         }
         return true;
     }

package/dist/index.js

@@ -132,27 +132,28 @@ async function main() {
     sessionManager.registerFileAdapter(new ClaudeSessionFileAdapter());
     sessionManager.registerFileAdapter(new CodexSessionFileAdapter());
     sessionManager.registerFileAdapter(new GeminiSessionFileAdapter());
-    // Agent 插件系统
+    // Agent 插件系统：每个 EvolAgent × 每个 baseagent 一个独立 runner（H1/H2 修复）
     const agentLoader = new AgentLoader();
     agentLoader.register(new ClaudeAgentPlugin());
     agentLoader.register(new CodexAgentPlugin());
     agentLoader.register(new GeminiAgentPlugin());
-    const agentInstances = agentLoader.createAll(config, {
+    const agentInstances = agentLoader.createAll(config, agentRegistry, {
         onSessionIdUpdate: async (sessionId, agentSessionId) => {
             await sessionManager.updateAgentSessionIdBySessionId(sessionId, agentSessionId);
         },
     });
-    // 构建 agent map，支持按 agentId 路由（当前默认使用第一个 agent）
+    // agentMap 复合键：${evolagentName}::${baseagent}
     const agentMap = new Map();
     for (const inst of agentInstances) {
-        agentMap.set(inst.agent.name, inst.agent);
+        agentMap.set(`${inst.evolagentName}::${inst.baseagent}`, inst.agent);
     }
     const defaultAgent = config.agents?.defaultAgent || 'claude';
-    const agentRunner = agentMap.get(defaultAgent) || agentInstances[0]?.agent;
+    const defaultAgentKey = `[default]::${defaultAgent}`;
+    const agentRunner = agentMap.get(defaultAgentKey) || agentInstances[0]?.agent;
     if (!agentRunner) {
-        throw new Error('No agent backend available. Check agents config.');
+        throw new Error('No agent backend available. Check agents config (no runners created).');
     }
-    logger.info(`✓ Agent runner ready (default: ${agentRunner.name}, available: ${[...agentMap.keys()].join(', ')})`);
+    logger.info(`✓ Runners ready (default key: ${defaultAgentKey}, total: ${agentMap.size}, keys: ${[...agentMap.keys()].join(', ')})`);
     // 权限审批网关
     const permissionGateway = new PermissionGateway();
     permissionGateway.setEventBus(eventBus);
@@ -222,7 +223,7 @@ async function main() {
     // 启动迁移：将 sessions.channel 从 channelType 回填为实例名
     sessionManager.migrateChannelToInstanceName();
     // 创建命令处理器
-    const cmdHandler = new CommandHandler(sessionManager, agentMap, config, messageCache, eventBus, defaultAgent);
+    const cmdHandler = new CommandHandler(sessionManager, agentMap, config, messageCache, eventBus, defaultAgentKey);
     cmdHandler.setPermissionGateway(permissionGateway);
     cmdHandler.setInteractionRouter(interactionRouter);
     cmdHandler.setStatsCollector(statsCollector);
@@ -237,7 +238,7 @@ async function main() {
             }
         };
         return cmdHandler.handle(content, channel, channelId, sendFn, userId, threadId);
-    }, defaultAgent);
+    }, defaultAgentKey);
     // 回填 processor 和 messageQueue 的引用
     cmdHandler.setProcessor(processor);
     // Inject EvolAgentRegistry (methods added by T6/T7)
@@ -260,8 +261,11 @@ async function main() {
         await processor.processMessage(message);
     });
     // 设置中断回调（精确中断正在处理的 agent）
-    messageQueue.setInterruptCallback(async (sessionKey, agentId) => {
-        const agent = agentMap.get(agentId || defaultAgent);
+    messageQueue.setInterruptCallback(async (sessionKey, agentId, evolagentName) => {
+        const baseagent = agentId || defaultAgent;
+        const evol = evolagentName || '[default]';
+        const agent = agentMap.get(`${evol}::${baseagent}`)
+            || agentMap.get(defaultAgentKey);
         if (agent?.hasActiveStream(sessionKey)) {
             await agent.interrupt(sessionKey);
         }
@@ -522,12 +526,16 @@ async function main() {
                 sessionManager.clearProcessing(session.id);
                 continue;
             }
-            const agent = agentMap.get(session.agentId) || agentMap.get(defaultAgent);
+            // 复合键：${evolagentName}::${baseagent}，从 channel 反查 evolagent
+            const owningAgent = agentRegistry.resolveByChannel(session.channel);
+            const evolName = owningAgent?.name || '[default]';
+            const baseagentName = session.agentId || defaultAgent;
+            const agent = agentMap.get(`${evolName}::${baseagentName}`) || agentMap.get(defaultAgentKey);
             if (!agent) {
                 sessionManager.clearProcessing(session.id);
                 continue;
             }
-            logger.info(`[Resume] Resuming session: ${session.id} (agent: ${session.agentId})`);
+            logger.info(`[Resume] Resuming session: ${session.id} (agent: ${evolName}::${baseagentName})`);
             const resumeMessage = {
                 channel: session.channel,
                 channelId: session.channelId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",