evolcore 0.0.19 → 0.0.21

package/dist/core/channel-loader.js

@@ -65,7 +65,6 @@ export class ChannelLoader {
             owner: agent.getOwner(aunEffName),
             enabled: true,
             keystorePath: agent.config.aun?.keystorePath,
-            gatewayUrl: agent.config.aun?.gatewayUrl,
         };
         const configInsts = [aunInst];
         for (const inst of agent.config.channels) {
@@ -255,7 +254,6 @@ export function buildReloadHooks(deps) {
                     aid,
                     enabled: true,
                     keystorePath: agent.config?.aun?.keystorePath,
-                    gatewayUrl: agent.config?.aun?.gatewayUrl,
                 }
                 : (() => {
                     const agentChannels = agent.config?.channels ?? [];

package/dist/core/command/agent-control.js

@@ -8,6 +8,7 @@ import { agentProjectRootFromDefaults, deriveAgentProjectPath } from '../../util
 import { uploadAvatar } from '../../utils/avatar-upload.js';
 import { agentmdGet, agentmdPut, updateAgentMdFrontmatterName } from '../../aun/aid/agentmd.js';
 import { isValidAid } from '../../aun/aid/validation.js';
+import { isSupportedBaseagent } from '../../agents/baseagent.js';
 const SUPPORTED_AGENT_PATCH_FIELDS = new Set(['aid', 'name', 'avatar', 'active_baseagent', 'baseagents', 'projects', 'owners', 'chatmode', 'channels', 'channelOwners']);
 const HIDDEN_VALUE = '[hidden]';
 const SENSITIVE_CONFIG_KEYS = new Set([
@@ -95,6 +96,9 @@ function normalizeBaseagentsPatch(value) {
     }
     const out = {};
     for (const [name, raw] of Object.entries(value)) {
+        if (!isSupportedBaseagent(name)) {
+            return { ok: false, error: `不支持的 baseagent: ${name}（可选: claude/codex/gemini/ecagent）` };
+        }
         if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
             return { ok: false, error: `baseagents.${name} 必须是对象` };
         }
@@ -286,11 +290,11 @@ function buildCreateProgressOnlyAgent(aid, progress) {
  *  失败仅写日志 + create-status，不回传（受理即返回）。
  *  agentSet key 对照 cli/agent.ts 的 setNestedValue：
  *  model/effort → 'baseagents.<baseagent>.*'；chatmode → 'chatmode'（ChatmodeBlock 对象）。 */
-async function runCreateInBackground(opts, w) {
+async function runCreateInBackground(opts, w, service) {
     let curPhase = 'validating'; // 跟踪当前环节，供 catch 兜底时标注正确 phase
     try {
         // onPhase 把 agentCreateNonInteractive 内部环节（0-3、5）映射到进度文件
-        const res = await agentCreateNonInteractive({
+        const createOptions = {
             aid: opts.aid, name: opts.name, baseagent: opts.baseagent,
             project: opts.project, owner: opts.owner,
             onPhase: (phase, state, detail) => {
@@ -305,7 +309,10 @@ async function runCreateInBackground(opts, w) {
                 else if (state === 'failed')
                     w.finishFailed(phase, detail ?? 'failed');
             },
-        });
+        };
+        const res = service
+            ? await service.create(createOptions)
+            : await agentCreateNonInteractive(createOptions);
         if (!('ok' in res) || res.ok !== true) {
             // 硬失败：onPhase('failed') 已写终态；这里仅兜底日志（防回调未覆盖的 return 路径）
             const err = res.error;
@@ -318,17 +325,23 @@ async function runCreateInBackground(opts, w) {
             w.begin('applying_config');
             let warned;
             if (opts.model) {
-                const r = await agentSet(opts.aid, `baseagents.${opts.baseagent}.model`, opts.model);
+                const r = service
+                    ? await service.setConfig(opts.aid, `baseagents.${opts.baseagent}.model`, opts.model)
+                    : await agentSet(opts.aid, `baseagents.${opts.baseagent}.model`, opts.model);
                 if (!('ok' in r) || !r.ok)
                     warned = `model: ${r.error}`;
             }
             if (opts.effort) {
-                const r = await agentSet(opts.aid, `baseagents.${opts.baseagent}.effort`, opts.effort);
+                const r = service
+                    ? await service.setConfig(opts.aid, `baseagents.${opts.baseagent}.effort`, opts.effort)
+                    : await agentSet(opts.aid, `baseagents.${opts.baseagent}.effort`, opts.effort);
                 if (!('ok' in r) || !r.ok)
                     warned = `${warned ? warned + '; ' : ''}effort: ${r.error}`;
             }
             if (opts.chatmode) {
-                const r = await agentSet(opts.aid, 'chatmode', JSON.stringify(opts.chatmode));
+                const r = service
+                    ? await service.setConfig(opts.aid, 'chatmode', JSON.stringify(opts.chatmode))
+                    : await agentSet(opts.aid, 'chatmode', JSON.stringify(opts.chatmode));
                 if (!('ok' in r) || !r.ok)
                     warned = `${warned ? warned + '; ' : ''}chatmode: ${r.error}`;
             }
@@ -361,7 +374,7 @@ async function runCreateInBackground(opts, w) {
 /** name=agent 的 menu.action 执行。create 使用显式 owner AID；peerId 仅作为控制面鉴权主体。
  *  create 受理即返回（D3）；delete/enable/disable 同步等结果。
  *  调用方负责传入已兜底的 args.project（见 command-handler 装配）。 */
-export async function execAgentAction(action, args, peerId, eventBus) {
+export async function execAgentAction(action, args, peerId, eventBus, service) {
     const a = args ?? {};
     if (action === 'create') {
         if (!peerId)
@@ -394,13 +407,15 @@ export async function execAgentAction(action, args, peerId, eventBus) {
             project: a.project, owner,
             model, effort, chatmode: a.chatmode,
             eventBus,
-        }, progressWriter).catch(e => logger.error(`[agent-control] runCreateInBackground unhandled ${a.aid}: ${e?.message || e}`));
+        }, progressWriter, service).catch(e => logger.error(`[agent-control] runCreateInBackground unhandled ${a.aid}: ${e?.message || e}`));
         return { data: { accepted: true, aid: a.aid } };
     }
     if (action === 'delete') {
         if (!a.aid)
             return { error: '缺少 aid', code: 'INVALID_ARGS' };
-        const res = await agentDelete(a.aid, false);
+        const res = service
+            ? await service.delete(a.aid, false)
+            : await agentDelete(a.aid, false);
         if (!('ok' in res) || res.ok !== true)
             return { error: res.error, code: classifyError(res.error) };
         eventBus?.publish({ type: 'agent:deleted', aid: res.aid, purged: res.purged, timestamp: Date.now() });
@@ -410,7 +425,13 @@ export async function execAgentAction(action, args, peerId, eventBus) {
         if (!a.aid)
             return { error: '缺少 aid', code: 'INVALID_ARGS' };
         const options = { force: a.force === true };
-        const res = action === 'enable' ? await agentEnable(a.aid, options) : await agentDisable(a.aid, options);
+        const res = service
+            ? action === 'enable'
+                ? await service.enable(a.aid, options.force === true)
+                : await service.disable(a.aid, options.force === true)
+            : action === 'enable'
+                ? await agentEnable(a.aid, options)
+                : await agentDisable(a.aid, options);
         if (!('ok' in res) || res.ok !== true)
             return { error: res.error, code: res.code || classifyError(res.error) };
         eventBus?.publish({
@@ -424,7 +445,9 @@ export async function execAgentAction(action, args, peerId, eventBus) {
     if (action === 'reload') {
         if (!a.aid)
             return { error: '缺少 aid', code: 'INVALID_ARGS' };
-        const res = await agentReload(a.aid, { force: a.force === true });
+        const res = service
+            ? await service.reload(a.aid, { force: a.force === true })
+            : await agentReload(a.aid, { force: a.force === true });
         if (!('ok' in res) || res.ok !== true)
             return { error: res.error, code: res.code || classifyError(res.error) };
         eventBus?.publish({ type: 'agent:reloaded', aid: a.aid, timestamp: Date.now() });
@@ -508,6 +531,9 @@ export async function execAgentUpdate(args) {
         if (typeof p.active_baseagent !== 'string' || !p.active_baseagent.trim()) {
             return { error: `无效 active_baseagent: ${JSON.stringify(p.active_baseagent)}（必须是非空字符串）`, code: 'INVALID_ARGS' };
         }
+        if (!isSupportedBaseagent(p.active_baseagent.trim())) {
+            return { error: `不支持的 active_baseagent: ${p.active_baseagent}（可选: claude/codex/gemini/ecagent）`, code: 'INVALID_ARGS' };
+        }
         config.active_baseagent = p.active_baseagent.trim();
         touched = true;
     }
@@ -576,7 +602,7 @@ export async function execAgentUpdate(args) {
 /**
  * project 解析与 ec agent create 保持一致：
  * 显式值 > 默认项目根目录 + AID 前缀。
- * 默认项目根目录由 defaults.projects.rootPath/defaultPath 或运行时根目录推导。
+ * 默认项目根目录由 defaults.projects.defaultPath 或运行时根目录推导。
  */
 export function resolveProjectPath(explicit, aid, defaults) {
     if (explicit && explicit.trim())
@@ -585,13 +611,15 @@ export function resolveProjectPath(explicit, aid, defaults) {
     return deriveAgentProjectPath(root, aid);
 }
 /** name=agent 的 menu.query：查单个 agent 详情，附构建进度（D3）。 */
-export async function execAgentQuery(args) {
+export async function execAgentQuery(args, service) {
     const aid = args?.aid;
     if (!aid)
         return { error: '缺少 aid', code: 'INVALID_ARGS' };
     const agentDir = path.join(resolvePaths().agentsDir, aid);
     const progress = readCreateStatus(agentDir);
-    const res = await agentShow(aid);
+    const res = service
+        ? await service.show(aid)
+        : await agentShow(aid);
     if (!('ok' in res) || res.ok !== true) {
         const code = classifyError(res.error);
         if (code === 'NOT_FOUND' && progress)
@@ -616,9 +644,21 @@ export async function execAgentQuery(args) {
     return { data: progress ? { ...data, createProgress: progress } : data };
 }
 /** name=agent 的 menu.options：列出 agent（enabled 默认 / all） */
-export async function execAgentOptions(args) {
+export async function execAgentOptions(args, service) {
     const scope = args?.options === 'all' ? 'all' : 'enabled';
-    const res = await agentList();
+    const res = service
+        ? { ok: true, agents: service.list().map(info => ({
+                aid: info.aid || info.name,
+                name: info.name,
+                personalName: info.personalName || null,
+                status: info.status || 'stopped',
+                channels: info.channels || [],
+                projectPath: info.projectPath ? toPosix(info.projectPath) : null,
+                baseagent: info.baseagent || null,
+                model: info.model || null,
+                lastActivity: info.lastActivity || null,
+            })) }
+        : await agentList();
     if (!('ok' in res) || res.ok !== true)
         return { error: res.error, code: classifyError(res.error) };
     const agents = scope === 'all'