evolclaw 2.8.3 → 3.1.0

package/README.md

@@ -20,6 +20,9 @@ EvolClaw 是一个轻量级 AI Agent 网关系统。它为 Claude Code / Codex
 - 💾 **会话持久化**：会话数据与 CLI 工具共享，不额外存储，服务重启不丢失
 - ⚡ **执行中插入**：任务执行中可发送新消息，自动中断当前任务并处理新请求
 - 🔕 **消息智能发送**：前台任务动态聚合批量发送，后台任务静默完成后通知
+- 🧩 **EvolAgent 多实例**：一个 JSON 文件定义一个 Agent（channels + baseagent + project），多 Agent 并发运行，Agent 运行时隔离 + 热重载无需重启
+- 🔔 **AI 自主触发器**：Agent 可设置延迟 / 定时 / 周期任务，cron 表达式支持，独立 silent session 执行
+- 🎴 **交互卡片体系**：CommandCard（按钮直接触发 slash 命令）+ ActionInteraction（按钮回写交互），Feishu 与 AUN 统一支持
 - 🤖 **健壮性保障**：任务超时提醒、会话异常安全模式修复、重启失败自动自愈
 
 ## 适合场景
@@ -45,7 +48,7 @@ EvolClaw 是一个轻量级 AI Agent 网关系统。它为 Claude Code / Codex
 4. **消息处理层** (`src/core/message/message-processor.ts`) - 统一事件处理引擎
 5. **会话管理层** (`src/core/session/session-manager.ts`) - 多项目会话管理
 6. **交互路由层** (`src/core/interaction-router.ts`) - 卡片交互回调注册与路由
-7. **会话存储层** - JSONL 文件（CLI 共用）+ SQLite 元数据
+7. **会话存储层** - JSONL 文件（CLI 共用）+ 文件系统（每 chat 一个目录，含 active.json / meta_*.jsonl / messages.jsonl / health.jsonl）
 
 ### 消息流转
 
@@ -77,7 +80,7 @@ MessageProcessor.processMessage()
 ### 环境要求
 
 - **操作系统**：macOS / Linux / Windows
-- **Node.js** >= 22（需要 node:sqlite 内置模块支持）
+- **Node.js** >= 18
 - **Claude Code** >= 2.1.32（`npm install -g @anthropic-ai/claude-code`）
 
 ### 1. 安装
@@ -168,6 +171,7 @@ evolclaw restart    # 重启服务
 evolclaw status     # 查看状态
 evolclaw logs       # 查看日志（tail -f）
 evolclaw tui        # 启动 AUN TUI 终端客户端
+evolclaw agent      # 管理 EvolAgent（list / show / new / reload）
 evolclaw mv <old> <new>  # 项目搬家（保留全部会话）
 evolclaw diagnose   # 诊断启动环境
 
@@ -187,17 +191,23 @@ evolclaw/
 │   │   ├── claude-runner.ts        # Claude Agent SDK 封装
 │   │   ├── codex-runner.ts         # Codex Agent 封装
 │   │   └── gemini-runner.ts        # Gemini CLI 封装
+│   ├── aun/                        # AUN 协议工具
 │   ├── core/
 │   │   ├── message/
 │   │   │   ├── message-bridge.ts   # 渠道 ↔ 核心消息桥
 │   │   │   ├── message-processor.ts # 统一消息处理引擎
 │   │   │   ├── message-queue.ts    # 消息队列（串行+中断）
 │   │   │   ├── message-cache.ts    # 消息缓存
-│   │   │   └── stream-flusher.ts   # 批量发送（3秒窗口）
+│   │   │   ├── message-log.ts      # 每 chat 的 messages.jsonl
+│   │   │   └── im-renderer.ts      # IM 渲染 + 批量发送
 │   │   ├── session/
 │   │   │   ├── adapters/           # 各后端会话文件适配器
+│   │   │   ├── session-fs-store.ts # 文件系统存储原语
 │   │   │   └── session-manager.ts  # 会话管理（多项目支持）
+│   │   ├── trigger/                # 触发器引擎
 │   │   ├── command-handler.ts      # 斜杠命令处理
+│   │   ├── evolagent.ts            # EvolAgent 实体
+│   │   ├── evolagent-registry.ts   # Agent 注册表（扫描/路由/热重载）
 │   │   ├── interaction-router.ts   # 卡片交互回调路由
 │   │   └── permission.ts           # 权限网关
 │   ├── channels/
@@ -207,17 +217,13 @@ evolclaw/
 │   │   ├── qqbot.ts                # QQ 频道渠道
 │   │   ├── wecom.ts                # 企业微信 AI Bot 渠道
 │   │   └── aun.ts                  # AUN Mesh 网络渠道
+│   ├── cli/                        # CLI 命令
 │   ├── utils/                      # 工具函数
 │   ├── types.ts                    # 类型定义
-│   ├── config.ts                   # 配置加载
+│   ├── config-store.ts             # 配置加载
 │   ├── paths.ts                    # 路径解析
-│   ├── cli.ts                      # CLI 命令（init/start/stop/tui/mv/...）
 │   └── index.ts                    # 主入口
-├── aun/
-│   ├── aun_cli.py                  # AUN TUI 客户端（Python）
-│   └── pyproject.toml              # AUN CLI 依赖声明
-└── data/
-    └── evolclaw.sample.json        # 配置模板
+└── kits/                           # 共享上下文模板
 ```
 
 ## 斜杠命令
@@ -256,6 +262,9 @@ evolclaw/
 - `/stop` - 中断当前任务
 - `/check` - 系统健康检查（详情）
 - `/activity [all|dm|owner|none]` - 查看/控制中间输出显示模式
+- `/chatmode [interactive|proactive]` - 查看/切换会话模式
+- `/dispatch [mention|broadcast]` - 群聊分发模式（仅 @ 响应或广播）
+- `/trigger <动作> ...` - 设置/查看 AI 自主触发器（延迟/定时/周期）
 - `/restart <channel>` - 重连指定渠道
 
 ### Owner 专属命令
@@ -270,7 +279,7 @@ evolclaw/
 - **运行时**：Node.js >= 22 + TypeScript（ES modules）
 - **AI SDK**：@anthropic-ai/claude-agent-sdk >= 0.2.75、@openai/codex-sdk、Gemini CLI
 - **消息渠道**：飞书（@larksuiteoapi/node-sdk）、微信（ClawBot ilink API）、钉钉（dingtalk-stream）、QQ频道（pure-qqbot）、企业微信（AI Bot API）、AUN 网络
-- **数据存储**：node:sqlite（内置模块）+ JSONL（CLI 共用）
+- **数据存储**：文件系统（per-chat 目录） + JSONL（CLI 共用）
 - **测试框架**：Vitest
 
 ## TODO
@@ -280,8 +289,8 @@ evolclaw/
 - [x] 项目搬家工具（`evolclaw mv`）
 - [x] 手动授权支持（文本回复 + 飞书卡片）
 - [x] 自动授权可配置（自动放行/自动拒绝）
+- [x] 触发器支持
 - [ ] AUN 群组扩展功能支持
-- [ ] 触发器支持
 - [ ] 统计/状态监控 WebHook
 
 

package/bin/ec.js

@@ -0,0 +1,29 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import { spawnSync } from 'child_process';
+import { fileURLToPath, pathToFileURL } from 'url';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const here = path.dirname(fileURLToPath(import.meta.url));
+const repoRoot = path.resolve(here, '..');
+const srcEntry = path.join(repoRoot, 'src', 'cli', 'index.ts');
+const distEntry = path.join(repoRoot, 'dist', 'cli', 'index.js');
+const args = process.argv.slice(2);
+
+if (fs.existsSync(srcEntry)) {
+  try {
+    const tsxImport = pathToFileURL(require.resolve('tsx')).href;
+    const result = spawnSync(process.execPath, ['--import', tsxImport, srcEntry, ...args], { stdio: 'inherit' });
+    process.exit(result.status ?? (result.error ? 1 : 0));
+  } catch {}
+}
+
+if (fs.existsSync(distEntry)) {
+  const result = spawnSync(process.execPath, [distEntry, ...args], { stdio: 'inherit' });
+  process.exit(result.status ?? (result.error ? 1 : 0));
+}
+
+console.error('ec: missing CLI entrypoint');
+process.exit(1);

package/dist/agents/baseagent-normalize.js

@@ -0,0 +1,19 @@
+const BASEAGENT_ALIASES = {
+    claude: { canonical: 'claude', displayName: 'Claude Code' },
+    cc: { canonical: 'claude', displayName: 'Claude Code' },
+    'claude-code': { canonical: 'claude', displayName: 'Claude Code' },
+    'claude code': { canonical: 'claude', displayName: 'Claude Code' },
+    claudecode: { canonical: 'claude', displayName: 'Claude Code' },
+    codex: { canonical: 'codex', displayName: 'Codex' },
+    'codex-cli': { canonical: 'codex', displayName: 'Codex' },
+    'codex cli': { canonical: 'codex', displayName: 'Codex' },
+    gemini: { canonical: 'gemini', displayName: 'Gemini CLI' },
+    'gemini-cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
+    'gemini cli': { canonical: 'gemini', displayName: 'Gemini CLI' },
+    geminicli: { canonical: 'gemini', displayName: 'Gemini CLI' },
+    hermes: { canonical: 'hermes', displayName: 'Hermes' },
+};
+export function normalizeBaseagent(input) {
+    const key = String(input || '').trim().toLowerCase().replace(/_/g, '-');
+    return BASEAGENT_ALIASES[key] || { canonical: 'unknown', displayName: input ? String(input) : 'Unknown' };
+}

package/dist/agents/claude-runner.js

@@ -1,6 +1,9 @@
 import { query, forkSession as sdkForkSession, getSessionMessages as sdkGetSessionMessages } from '@anthropic-ai/claude-agent-sdk';
-import { ensureDir, resolveAnthropicConfig } from '../config.js';
+import { ensureDir } from '../utils/atomic-write.js';
+import { resolveAnthropicConfig } from './resolve.js';
 import { DEFAULT_PERMISSION_MODE } from '../types.js';
+import { renderActionAsText } from '../core/interaction-router.js';
+import { buildEnvelope, sendInteractionPayload } from '../core/message/message-processor.js';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
@@ -173,7 +176,7 @@ export class AgentRunner {
             if (!fs.existsSync(settingsPath))
                 return;
             const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
-            // evolclaw.json 显式配置优先，不被 settings.json 覆盖
+            // agent config 显式配置优先，不被 settings.json 覆盖
             const configModel = this.config?.agents?.claude?.model;
             if (!configModel && settings.model && settings.model !== this.model) {
                 logger.info(`[AgentRunner] Synced model from ~/.claude/settings.json: ${settings.model}`);
@@ -203,14 +206,18 @@ export class AgentRunner {
         const questions = input.questions;
         // 没有交互上下文（无渠道适配器），回退到纯文本
         const permCtx = this.permissionContexts.get(sessionId);
-        if (!permCtx?.adapter?.sendInteraction || !permCtx?.channelId) {
+        if (!permCtx?.adapter || !permCtx?.channelId) {
+            return this.handleAskUserQuestionFallback(sessionId, input, questions);
+        }
+        const adapterHasInteractionPath = !!permCtx.adapter.send;
+        if (!adapterHasInteractionPath) {
             return this.handleAskUserQuestionFallback(sessionId, input, questions);
         }
         const answers = {};
         // 从 permCtx 构造 per-session 的发送函数，避免全局 sendPromptFn 被其他 channel 实例覆盖
         // 注意：sendPromptFn 是全局单例，多 channel 并发时会被覆盖，导致提示发到错误 channel
         const sendPrompt = permCtx.adapter && permCtx.channelId
-            ? async (text) => permCtx.adapter.sendText(permCtx.channelId, text, permCtx.replyContext)
+            ? async (text) => permCtx.adapter.send(buildEnvelope({ channel: permCtx.adapter.channelName, channelId: permCtx.channelId, replyContext: permCtx.replyContext }), { kind: 'result.text', text, isFinal: true })
             : this.sendPromptFn;
         // 逐个 question 发送卡片并等待用户选择
         for (let i = 0; i < questions.length; i++) {
@@ -251,7 +258,17 @@ export class AgentRunner {
             };
             let cardSent = false;
             try {
-                const result = await permCtx.adapter.sendInteraction(permCtx.channelId, interaction, permCtx.replyContext);
+                const envelope = buildEnvelope({
+                    taskId: permCtx.taskId,
+                    channel: permCtx.channel ?? permCtx.adapter.channelName,
+                    channelId: permCtx.channelId,
+                    agentName: permCtx.agentName,
+                    chatmode: permCtx.chatmode,
+                    replyContext: permCtx.replyContext,
+                });
+                const optionLines = q.options.map((o, idx) => `  ${idx + 1}. ${o.label}${o.description ? ` — ${o.description}` : ''}`).join('\n');
+                const fallbackText = `💬 ${q.header || q.question}\n${q.header ? q.question + '\n' : ''}${optionLines}`;
+                const result = await sendInteractionPayload(permCtx.adapter, envelope, interaction, fallbackText, permCtx.replyContext);
                 cardSent = !!result;
             }
             catch (err) {
@@ -313,16 +330,33 @@ export class AgentRunner {
     async handleAskUserQuestionFallback(sessionId, input, questions) {
         const permCtx = this.permissionContexts.get(sessionId);
         const sendPrompt = permCtx?.adapter && permCtx?.channelId
-            ? async (text) => permCtx.adapter.sendText(permCtx.channelId, text, permCtx.replyContext)
+            ? async (text) => permCtx.adapter.send(buildEnvelope({ channel: permCtx.adapter.channelName, channelId: permCtx.channelId, replyContext: permCtx.replyContext }), { kind: 'result.text', text, isFinal: true })
             : this.sendPromptFn;
         const answers = {};
         if (questions?.length) {
             for (const q of questions) {
-                const optText = q.options.map((o, i) => `  ${i + 1}. ${o.label}${o.description ? ` — ${o.description}` : ''}`).join('\n');
-                const prompt = `💬 ${q.question}\n${optText}\n\n回复 /ask <数字> 选择，或 /ask <自定义内容>`;
                 if (sendPrompt && permCtx?.interactionRouter) {
-                    await sendPrompt(prompt);
                     const requestId = `ask-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+                    const interaction = {
+                        type: 'interaction',
+                        id: requestId,
+                        channelId: permCtx.channelId || '',
+                        sessionId,
+                        initiatorId: permCtx.userId,
+                        kind: {
+                            kind: 'action',
+                            title: `💬 ${q.question}`,
+                            body: q.options.map((o, i) => `${i + 1}. ${o.label}${o.description ? ` — ${o.description}` : ''}`).join('\n'),
+                            buttons: q.options.map((o, i) => ({ key: `opt-${i}`, label: o.label })),
+                        },
+                        fallback: {
+                            command: 'ask',
+                            buttonArgMap: Object.fromEntries(q.options.map((_, i) => [`opt-${i}`, String(i + 1)])),
+                            acceptFreeText: true,
+                            freeTextHint: '或回复 /ask <自定义内容>',
+                        },
+                    };
+                    await sendPrompt(renderActionAsText(interaction));
                     const answer = await new Promise((resolve) => {
                         permCtx.interactionRouter.register(requestId, sessionId, (action) => {
                             const num = parseInt(action.trim(), 10);
@@ -332,16 +366,16 @@ export class AgentRunner {
                             else {
                                 resolve(action.trim());
                             }
-                        }, { timeoutMs: 120_000, onTimeout: () => resolve(q.options[0]?.label || '') });
+                        }, { timeoutMs: 120_000, onTimeout: () => resolve(q.options[0]?.label || ''), initiatorId: permCtx.userId, fallbackCommand: 'ask' });
                     });
                     answers[q.question] = answer;
                 }
                 else {
-                    // 无交互能力，自动选第一项
                     const firstLabel = q.options[0]?.label || '';
                     answers[q.question] = firstLabel;
                     if (sendPrompt) {
-                        await sendPrompt(`${prompt}\n  → 自动选择：${firstLabel}`);
+                        const optText = q.options.map((o, i) => `  ${i + 1}. ${o.label}${o.description ? ` — ${o.description}` : ''}`).join('\n');
+                        await sendPrompt(`💬 ${q.question}\n${optText}\n\n  → 自动选择：${firstLabel}`);
                     }
                 }
             }
@@ -355,7 +389,7 @@ export class AgentRunner {
     async handleExitPlanMode(sessionId, input, options) {
         const permCtx = this.permissionContexts.get(sessionId);
         const sendPrompt = permCtx?.adapter && permCtx?.channelId
-            ? async (text) => permCtx.adapter.sendText(permCtx.channelId, text, permCtx.replyContext)
+            ? async (text) => permCtx.adapter.send(buildEnvelope({ channel: permCtx.adapter.channelName, channelId: permCtx.channelId, replyContext: permCtx.replyContext }), { kind: 'result.text', text, isFinal: true })
             : this.sendPromptFn;
         // 无任何交互能力，直接 allow
         if (!permCtx?.channelId || !sendPrompt) {
@@ -363,7 +397,7 @@ export class AgentRunner {
         }
         // 尝试发送交互卡片
         let cardSent = false;
-        if (permCtx.adapter?.sendInteraction) {
+        if (permCtx.adapter?.send) {
             const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
             const interaction = {
                 type: 'interaction',
@@ -379,9 +413,23 @@ export class AgentRunner {
                 },
                 channelId: permCtx.channelId,
                 sessionId,
+                initiatorId: permCtx.userId,
+                fallback: {
+                    command: 'ask',
+                    buttonArgMap: { approve: '1', reject: '2' },
+                },
             };
             try {
-                const result = await permCtx.adapter.sendInteraction(permCtx.channelId, interaction, permCtx.replyContext);
+                const envelope = buildEnvelope({
+                    taskId: permCtx.taskId,
+                    channel: permCtx.channel ?? permCtx.adapter.channelName,
+                    channelId: permCtx.channelId,
+                    agentName: permCtx.agentName,
+                    chatmode: permCtx.chatmode,
+                    replyContext: permCtx.replyContext,
+                });
+                const fallbackText = '📋 计划审批：AI 已完成规划，等待审批。\n回复 /ask 1 批准 / /ask 2 拒绝';
+                const result = await sendInteractionPayload(permCtx.adapter, envelope, interaction, fallbackText, permCtx.replyContext);
                 cardSent = !!result;
             }
             catch (err) {
@@ -390,22 +438,43 @@ export class AgentRunner {
             if (cardSent) {
                 return new Promise((resolve) => {
                     permCtx.interactionRouter?.register(requestId, sessionId, (action) => {
-                        if (action === 'approve') {
-                            resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
+                        const trimmed = action.trim();
+                        if (trimmed === '2' || trimmed.toLowerCase() === 'reject' || trimmed === '拒绝' || trimmed === 'reject') {
+                            resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
                         }
                         else {
-                            resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
+                            resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
                         }
-                    });
+                    }, { initiatorId: permCtx.userId, fallbackCommand: 'ask' });
                 });
             }
         }
         // 文本 fallback：注册到 interactionRouter，等待用户 /ask 回复
         if (permCtx.interactionRouter) {
-            await sendPrompt('📋 计划审批\nAI 已完成规划，等待审批。\n\n  1. 批准执行\n  2. 拒绝\n\n回复 /ask 1 批准，/ask 2 拒绝：');
-            const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+            const fallbackRequestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+            const fallbackInteraction = {
+                type: 'interaction',
+                id: fallbackRequestId,
+                channelId: permCtx.channelId || '',
+                sessionId,
+                initiatorId: permCtx.userId,
+                kind: {
+                    kind: 'action',
+                    title: '📋 计划审批',
+                    body: 'AI 已完成规划，等待审批。',
+                    buttons: [
+                        { key: 'approve', label: '✅ 批准执行', style: 'primary' },
+                        { key: 'reject', label: '❌ 拒绝', style: 'danger' },
+                    ],
+                },
+                fallback: {
+                    command: 'ask',
+                    buttonArgMap: { approve: '1', reject: '2' },
+                },
+            };
+            await sendPrompt(renderActionAsText(fallbackInteraction));
             return new Promise((resolve) => {
-                permCtx.interactionRouter.register(requestId, sessionId, (action) => {
+                permCtx.interactionRouter.register(fallbackRequestId, sessionId, (action) => {
                     const trimmed = action.trim();
                     if (trimmed === '2' || trimmed.toLowerCase() === 'reject' || trimmed === '拒绝') {
                         resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
@@ -413,7 +482,7 @@ export class AgentRunner {
                     else {
                         resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
                     }
-                }, { timeoutMs: 300_000, onTimeout: () => resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' }) });
+                }, { timeoutMs: 300_000, onTimeout: () => resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' }), initiatorId: permCtx.userId, fallbackCommand: 'ask' });
             });
         }
         // 无交互能力，发提示后直接 allow
@@ -425,7 +494,6 @@ export class AgentRunner {
      * 所有 SDK 特有的事件类型引用封装在此方法内
      */
     async *transformStream(sdkStream, sessionId) {
-        let hasTextDelta = false;
         let lastSessionId;
         // tool_use_id → tool_name 映射，用于从 SDKUserMessage 的 tool_result 块中还原工具名
         const toolUseNames = new Map();
@@ -436,11 +504,6 @@ export class AgentRunner {
                 this.updateSessionId(sessionId, event.session_id);
                 yield { type: 'session_id', sessionId: event.session_id };
             }
-            // text_delta → text
-            if (event.type === 'text_delta' && event.text) {
-                hasTextDelta = true;
-                yield { type: 'text', text: event.text };
-            }
             // system: compact_boundary → compact
             if (event.type === 'system' && event.subtype === 'compact_boundary') {
                 yield { type: 'compact', preTokens: event.compact_metadata?.pre_tokens || 0 };
@@ -465,9 +528,9 @@ export class AgentRunner {
                         // 记录 id → name 映射，供后续 tool_result 使用
                         if (content.id)
                             toolUseNames.set(content.id, content.name);
-                        yield { type: 'tool_use', name: content.name, input: content.input };
+                        yield { type: 'tool_use', name: content.name, input: content.input, callId: content.id };
                     }
-                    else if (content.type === 'text' && content.text && !hasTextDelta) {
+                    else if (content.type === 'text' && content.text) {
                         yield { type: 'text', text: content.text };
                     }
                 }
@@ -487,6 +550,7 @@ export class AgentRunner {
                             result: resultContent,
                             isError: block.is_error === true,
                             error: block.is_error === true ? resultContent : undefined,
+                            callId: block.tool_use_id,
                         };
                     }
                 }
@@ -519,7 +583,11 @@ export class AgentRunner {
                     costUsd: event.total_cost_usd,
                     terminalReason: event.terminal_reason,
                     sessionTitle: event.session_title,
+                    numTurns: event.num_turns,
+                    usage: event.usage,
                 };
+                // result 是 SDK 流的终结事件，不再等待后续（防止 interrupt 后流不关闭导致挂起）
+                return;
             }
         }
     }
@@ -692,7 +760,7 @@ export class AgentRunner {
         const sdkPermissionMode = this.toSdkPermissionMode();
         logger.info(`[AgentRunner] runQuery model=${this.model} effort=${this.effort ?? 'auto'} permMode=${this.permissionMode} sdkMode=${sdkPermissionMode}`);
         if (systemPromptAppend) {
-            logger.info(`[AgentRunner] systemPromptAppend (full):\n${systemPromptAppend}`);
+            logger.info(`[AgentRunner] systemPromptAppend: ${systemPromptAppend.length} chars`);
         }
         else {
             logger.info(`[AgentRunner] systemPromptAppend: none`);
@@ -988,21 +1056,15 @@ export class AgentRunner {
 // Plugin implementation
 export class ClaudeAgentPlugin {
     name = 'claude';
-    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.
+    isEnabled(agent) {
+        return agent.baseagent === 'claude';
+    }
+    createAgent(agent, callbacks) {
+        const override = agent.config.baseagents?.claude;
+        const syntheticConfig = { agents: { claude: override } };
+        const anthropic = resolveAnthropicConfig(syntheticConfig, override);
         const merged = {
-            ...globalConfig,
-            agents: {
-                ...(globalConfig.agents || {}),
-                claude: { ...(globalConfig.agents?.claude || {}), ...(override || {}) },
-            },
+            agents: { claude: { ...(override || {}) } },
         };
         const agentRunner = new AgentRunner(anthropic.apiKey, anthropic.model, callbacks.onSessionIdUpdate, anthropic.baseUrl, merged);
         if (anthropic.effort) {

package/dist/agents/codex-runner.js

@@ -5,7 +5,7 @@
  * Implements the same interface surface as AgentRunner (claude-runner.ts)
  * so MessageProcessor and CommandHandler can work with it transparently.
  */
-import { resolveOpenaiConfig } from '../config.js';
+import { resolveOpenaiConfig } from './resolve.js';
 import { logger } from '../utils/logger.js';
 import fs from 'fs';
 import path from 'path';
@@ -41,7 +41,7 @@ export class CodexRunner {
     }
     async ensureCodex() {
         if (!this.codex || !this.codexModule) {
-            const { requireOptional } = await import('../utils/init-channel.js');
+            const { requireOptional } = await import('../utils/npm-ops.js');
             this.codexModule = await requireOptional('@openai/codex-sdk');
             this.codex = new this.codexModule.Codex({
                 apiKey: this.resolvedConfig.apiKey,
@@ -301,27 +301,26 @@ export class CodexRunner {
 // ── Plugin ──
 export class CodexAgentPlugin {
     name = 'codex';
-    isEnabled(globalConfig, agent) {
-        if (!agent.config.agents?.codex)
+    isEnabled(agent) {
+        if (agent.baseagent !== 'codex')
+            return false;
+        if (!agent.config.baseagents?.codex)
             return false;
         try {
-            const override = agent.config.agents.codex;
-            const resolved = resolveOpenaiConfig(globalConfig, override);
+            const override = agent.config.baseagents.codex;
+            const syntheticConfig = { agents: { codex: override } };
+            const resolved = resolveOpenaiConfig(syntheticConfig, override);
             return !!resolved.apiKey;
         }
         catch {
             return false;
         }
     }
-    createAgent(globalConfig, agent, callbacks) {
-        const override = agent.config.agents?.codex;
-        // Synthesize a per-agent config view so CodexRunner sees its own credentials.
+    createAgent(agent, callbacks) {
+        const override = agent.config.baseagents?.codex;
+        const syntheticConfig = { agents: { codex: override } };
         const merged = {
-            ...globalConfig,
-            agents: {
-                ...(globalConfig.agents || {}),
-                codex: { ...(globalConfig.agents?.codex || {}), ...(override || {}) },
-            },
+            agents: { codex: { ...(override || {}) } },
         };
         return { evolagentName: agent.name, baseagent: 'codex', agent: new CodexRunner(merged, callbacks) };
     }

package/dist/agents/gemini-runner.js

@@ -13,7 +13,8 @@ import { createInterface } from 'readline';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { resolveGoogleConfig } from '../config.js';
+import { resolveGoogleConfig } from './resolve.js';
+import { commandExists } from '../utils/cross-platform.js';
 import { GeminiSessionFileAdapter } from '../core/session/adapters/gemini-session-file-adapter.js';
 import { logger } from '../utils/logger.js';
 // Strip ANSI escape codes from Gemini CLI text output.
@@ -405,26 +406,23 @@ export class GeminiRunner {
 // ── Plugin ──
 export class GeminiAgentPlugin {
     name = 'gemini';
-    isEnabled(globalConfig, agent) {
-        if (!agent.config.agents?.gemini)
+    isEnabled(agent) {
+        if (agent.baseagent !== 'gemini')
             return false;
-        try {
-            const override = agent.config.agents.gemini;
-            const resolved = resolveGoogleConfig(globalConfig, override);
-            return !!resolved.cliPath;
-        }
-        catch {
+        const geminiCfg = agent.config.baseagents?.gemini;
+        if (!geminiCfg)
             return false;
-        }
+        if (geminiCfg.cliPath)
+            return true;
+        if (geminiCfg.apiKey && !geminiCfg.apiKey.includes('your-') && !geminiCfg.apiKey.includes('placeholder'))
+            return true;
+        return commandExists('gemini');
     }
-    createAgent(globalConfig, agent, callbacks) {
-        const override = agent.config.agents?.gemini;
+    createAgent(agent, callbacks) {
+        const override = agent.config.baseagents?.gemini;
+        const syntheticConfig = { agents: { gemini: override } };
         const merged = {
-            ...globalConfig,
-            agents: {
-                ...(globalConfig.agents || {}),
-                gemini: { ...(globalConfig.agents?.gemini || {}), ...(override || {}) },
-            },
+            agents: { gemini: { ...(override || {}) } },
         };
         return { evolagentName: agent.name, baseagent: 'gemini', agent: new GeminiRunner(merged, callbacks) };
     }