evolcore 0.0.19 → 0.0.21

package/dist/cli/daemon-commands.js

@@ -18,7 +18,7 @@ import { tryUpgrade, tryUpgradeGlobalPkg, resolveGlobalPkg } from '../utils/npm-
 import { ecwebVersionRequirementError, fetchEcwebPairCode, resolveEcwebLaunchCommand } from '../utils/ecweb-utils.js';
 import { isHostChinese } from '../utils/locale.js';
 import { scanInstances, cleanupInstances, findOrphanProcesses, killOrphans } from '../utils/instance-registry.js';
-import { filterLogFiles, deriveLogTypes, computePreChecked, validateLogTypes, shortLogName as shortLogNameLocal } from './watch-logs.js';
+import { filterLogFiles, deriveLogTypes, computePreChecked, validateLogTypes, shortLogName as shortLogNameLocal, isWatchLogFile } from './watch-logs.js';
 import { displaySessionTitle } from '../core/session/session-title.js';
 import { isNonAgentSessionChannel } from '../core/system-channels.js';
 import { printCodeStats } from './code-stats.js';
@@ -29,6 +29,7 @@ import { rotateStdoutLog } from '../utils/log-writer.js';
 import { inspectDataMigrationRequirement } from '../core/data-migration.js';
 import { isInitCancelledError, printInitCancelHint } from './init-cancel.js';
 import { listCodexAppServerProcesses, unregisterCodexAppServerProcess } from '../utils/codex-app-server-registry.js';
+import { DEFAULT_ECWEB_PORT, ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
 const execFileAsync = promisify(execFile);
 async function runAutomaticInit(action) {
     try {
@@ -58,15 +59,21 @@ function printNoSelfAgentHints(options) {
             console.log(`  - ${skippedAgent.dirName}: ${skippedAgent.reason}`);
     }
 }
-async function probeDaemon(socketPath, timeoutMs = 1000) {
+// Windows named-pipe connection setup can take a couple of seconds on a busy
+// host (especially on the first request after the daemon starts). A one-second
+// probe causes `ec stop` to skip the IPC shutdown path and fall back to
+// taskkill, even though the daemon is healthy and able to shut down gracefully.
+const DAEMON_PROBE_TIMEOUT_MS = platform.isWindows ? 5_000 : 1_000;
+export const DAEMON_SHUTDOWN_TIMEOUT_MS = platform.isWindows ? 10_000 : 3_000;
+async function probeDaemon(socketPath, timeoutMs = DAEMON_PROBE_TIMEOUT_MS) {
     const response = await ipcQuery(socketPath, { type: 'ping' }, timeoutMs);
     if (response?.pong !== true || !Number.isInteger(response.pid) || response.pid <= 0)
         return null;
     return response;
 }
 /** Ask the daemon to run its own graceful shutdown lifecycle. */
-export async function requestDaemonShutdown(socketPath, timeoutMs = 3_000, reason = 'cli', expectedPids) {
-    const daemon = await probeDaemon(socketPath, Math.min(timeoutMs, 1_000));
+export async function requestDaemonShutdown(socketPath, timeoutMs = DAEMON_SHUTDOWN_TIMEOUT_MS, reason = 'cli', expectedPids) {
+    const daemon = await probeDaemon(socketPath, Math.min(timeoutMs, DAEMON_PROBE_TIMEOUT_MS));
     if (!daemon || (expectedPids && !expectedPids.has(daemon.pid)))
         return null;
     const response = await ipcQuery(socketPath, {
@@ -140,11 +147,6 @@ function buildDaemonEnv(p, opts) {
         ...(opts.bindBootstrap ? { EVOLCORE_BIND_BOOTSTRAP: '1' } : {}),
     };
 }
-export function serviceProxyNeedsEcweb(cfg) {
-    if (!cfg.serviceProxy?.enabled)
-        return false;
-    return (cfg.serviceProxy.services ?? []).some(s => s.enabled !== false && s.source === 'ecweb');
-}
 function latestSourceMtime(dir) {
     let latest = 0;
     try {
@@ -431,8 +433,6 @@ export async function cmdStart(opts = {}) {
         console.log(`  Rotated: stdout.log -> ${path.basename(stdoutRotation.rotatedPath)}`);
     }
     cleanEnv();
-    // 在启动前确保 serviceProxy 配置完整（如果 ecweb 启用但 serviceProxy 未配置）
-    ensureServiceProxyConfigBeforeStart(p);
     // 删除旧的 ready signal
     try {
         fs.unlinkSync(p.readySignal);
@@ -561,7 +561,7 @@ export async function cmdStart(opts = {}) {
             }
             console.log('');
             // 代码统计仅在开发环境显示（EVOLCORE_HOME 指向包目录）
-            if (resolveRoot() === getPackageRoot()) {
+            if (path.normalize(resolveRoot()) === path.normalize(getPackageRoot())) {
                 printCodeStats(getPackageRoot(), p.logs);
             }
             console.log(`⏱ done in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
@@ -654,7 +654,7 @@ export async function cmdStop() {
         console.log(`⚠ 检测到未登记的 EvolCore 进程，将一并停止: ${runtimeOrphans.map(orphan => orphan.pid).join(', ')}`);
     }
     const gracefulPid = ping && pids.has(ping.pid)
-        ? await requestDaemonShutdown(p.socket, 3_000, 'ec stop', pids)
+        ? await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'ec stop', pids)
         : null;
     const stopped = await Promise.all([...pids].map(pid => stopPid(pid, pid === gracefulPid)));
     if (stopped.some(result => !result)) {
@@ -726,7 +726,7 @@ export async function cmdRestart(opts = {}) {
         const mainPids = new Set(aliveMains.map(entry => entry.record.pid));
         const currentPing = await probeDaemon(socketPath);
         const gracefulPid = currentPing && mainPids.has(currentPing.pid)
-            ? await requestDaemonShutdown(socketPath, 3_000, 'ec restart', mainPids)
+            ? await requestDaemonShutdown(socketPath, DAEMON_SHUTDOWN_TIMEOUT_MS, 'ec restart', mainPids)
             : null;
         const stopped = await Promise.all(aliveMains.map(m => stopPid(m.record.pid, m.record.pid === gracefulPid)));
         if (stopped.some(result => !result)) {
@@ -759,7 +759,7 @@ export async function cmdRestart(opts = {}) {
             const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
             const currentPing = await probeDaemon(socketPath);
             const gracefulPid = currentPing && orphanPids.has(currentPing.pid)
-                ? await requestDaemonShutdown(socketPath, 3_000, 'ec restart', orphanPids)
+                ? await requestDaemonShutdown(socketPath, DAEMON_SHUTDOWN_TIMEOUT_MS, 'ec restart', orphanPids)
                 : null;
             const stopped = await Promise.all(runtimeOrphans.map(o => stopPid(o.pid, o.pid === gracefulPid)));
             if (stopped.some(result => !result)) {
@@ -802,7 +802,7 @@ export async function cmdRestart(opts = {}) {
     console.log('🔄 Restart monitor started, waiting for service to come back online...');
     await sleep(2000);
     // 代码统计（开发环境）
-    if (resolveRoot() === getPackageRoot()) {
+    if (path.normalize(resolveRoot()) === path.normalize(getPackageRoot())) {
         console.log('');
         printCodeStats(getPackageRoot(), resolvePaths().logs);
     }
@@ -969,7 +969,17 @@ export async function cmdStatus() {
     const p = resolvePaths();
     const status = scanInstances();
     const aliveMains = status.mains.filter(m => m.alive);
-    const ping = await probeDaemon(p.socket);
+    // Start all read-only daemon queries together. On a busy Windows host each
+    // query can otherwise wait behind the same IPC/event-loop delay and make the
+    // total `ec status` time the sum of several individual timeouts.
+    const pingPromise = probeDaemon(p.socket).catch(() => null);
+    const statusPromise = ipcQuery(p.socket, { type: 'status' }).catch(() => null);
+    const aidsPromise = ipcQuery(p.socket, { type: 'aun-aids' }).catch(() => null);
+    const agentsPromise = ipcQuery(p.socket, { type: 'evolagent.list' }).catch(() => null);
+    // Only the ping is needed to decide whether to show the live-daemon
+    // sections. The remaining responses continue in parallel while local
+    // process/session information is rendered.
+    const ping = await pingPromise;
     const pid = ping?.pid ?? (aliveMains.length > 0 ? aliveMains[0].record.pid : null);
     const processVisible = !!pid && aliveMains.some(entry => entry.record.pid === pid);
     if (aliveMains.length > 1) {
@@ -1125,42 +1135,47 @@ export async function cmdStatus() {
     }
     // Channel status. A running daemon is authoritative and avoids reading
     // protected config files from the CLI's potentially sandboxed process.
+    let agentsResponse = null;
     if (pid) {
         console.log('');
-        const status = await ipcQuery(p.socket, { type: 'status' });
-        if (status) {
+        const [statusResponse, aidsResponse, agentResponse] = await Promise.all([
+            statusPromise,
+            aidsPromise,
+            agentsPromise,
+        ]);
+        agentsResponse = agentResponse;
+        if (statusResponse) {
             // 🔑 AUN AIDs 表格（详细 AUN 实例状态）
             try {
-                const aidsResp = await ipcQuery(p.socket, { type: 'aun-aids' });
-                if (aidsResp?.ok && aidsResp.aids?.length > 0) {
+                if (aidsResponse?.ok && aidsResponse.aids?.length > 0) {
                     console.log('🔑 AUN AIDs:');
-                    renderAunAidsTable(aidsResp.aids);
+                    renderAunAidsTable(aidsResponse.aids);
                 }
             }
             catch { /* ignore */ }
             // 控制 AID（daemon 进程身份）状态
-            if (status.controlAid) {
-                const state = status.controlAid.connected ? 'connected' : 'disconnected';
-                console.log(`control: ${status.controlAid.aid}  [${state}]`);
+            if (statusResponse.controlAid) {
+                const state = statusResponse.controlAid.connected ? 'connected' : 'disconnected';
+                console.log(`control: ${statusResponse.controlAid.aid}  [${state}]`);
             }
             else {
                 console.log('control: not configured');
             }
-            if (status.stats) {
+            if (statusResponse.stats) {
                 console.log('');
                 console.log('📊 Last hour:');
-                console.log(`  Messages: ${status.stats.received} received, ${status.stats.completed} completed`);
-                if (status.stats.errors > 0)
-                    console.log(`  Errors: ${status.stats.errors}`);
-                if (status.stats.completed > 0)
-                    console.log(`  Avg response: ${(status.stats.avgResponseMs / 1000).toFixed(1)}s`);
+                console.log(`  Messages: ${statusResponse.stats.received} received, ${statusResponse.stats.completed} completed`);
+                if (statusResponse.stats.errors > 0)
+                    console.log(`  Errors: ${statusResponse.stats.errors}`);
+                if (statusResponse.stats.completed > 0)
+                    console.log(`  Avg response: ${(statusResponse.stats.avgResponseMs / 1000).toFixed(1)}s`);
             }
         }
         else {
             // IPC unreachable but PID exists — fall back to local config if readable.
             const config = readStatusDefaultsConfig(p.defaultsConfig);
             if (config) {
-                console.log('🔌 Channels (IPC unreachable):');
+                console.log('🔌 Channels (live status unavailable; configuration is stale):');
                 showConfigChannels(config);
             }
         }
@@ -1176,7 +1191,7 @@ export async function cmdStatus() {
     // EvolAgent summary (via IPC, only when running)
     if (pid) {
         try {
-            const agentResult = await ipcQuery(p.socket, { type: 'evolagent.list' });
+            const agentResult = agentsResponse;
             if (agentResult?.ok && agentResult.agents?.length > 0) {
                 const agents = agentResult.agents;
                 if (agents.length > 0) {
@@ -1190,6 +1205,22 @@ export async function cmdStatus() {
                     }
                 }
             }
+            else {
+                const { EvolAgentRegistry } = await import('../core/evolagent-registry.js');
+                const diskRegistry = new EvolAgentRegistry(p.agentsDir);
+                diskRegistry.loadAll();
+                const agents = diskRegistry.list();
+                if (agents.length > 0) {
+                    console.log('');
+                    console.log('🤖 EvolAgents (live status unavailable; stale configuration):');
+                    for (const a of agents) {
+                        const diskStatus = a.status === 'disabled' || a.status === 'error' ? a.status : 'unknown';
+                        const channels = summarizeChannelFingerprints(a.channels || []);
+                        const shortName = a.name.replace(/\.agentid\.pub$/, '');
+                        console.log(`  ? ${shortName.padEnd(20)} ${`${diskStatus} (stale)`.padEnd(18)} ${channels}`);
+                    }
+                }
+            }
         }
         catch {
             // IPC query for agents failed — skip section
@@ -1783,10 +1814,10 @@ async function cmdWatchLogsFlow() {
         console.log(`❌ Log directory not found: ${p.logs}`);
         process.exit(1);
     }
-    const files = fs.readdirSync(p.logs).filter(f => f.endsWith('.log'));
+    const files = fs.readdirSync(p.logs).filter(isWatchLogFile);
     const types = deriveLogTypes(files);
     if (types.length === 0) {
-        console.log(`⚠ ${p.logs} 下暂无 .log 文件`);
+        console.log(`⚠ ${p.logs} 下暂无可监听日志文件`);
         return;
     }
     const fileCount = new Map();
@@ -1857,7 +1888,7 @@ function cmdWatch(filterTypes) {
         return c;
     };
     const listLogs = () => {
-        const all = fs.readdirSync(p.logs).filter(f => f.endsWith('.log')).map(f => path.join(p.logs, f));
+        const all = fs.readdirSync(p.logs).filter(isWatchLogFile).map(f => path.join(p.logs, f));
         return filterLogFiles(all, filterTypes);
     };
     const shortName = shortLogNameLocal;
@@ -1879,7 +1910,7 @@ function cmdWatch(filterTypes) {
         const content = formatWatchContent(line);
         return `${timeStr} ${paddedName} ${content}`;
     };
-    console.log(`🔭 Watching ${p.logs}/*.log (ESC to stop)\n`);
+    console.log(`🔭 Watching ${p.logs}/* log files (ESC to stop)\n`);
     // 显示当前实例信息和 AID 状态
     const instStatus = scanInstances();
     const aliveMainEntries = instStatus.mains.filter(m => m.alive);
@@ -2502,9 +2533,9 @@ async function waitForExistingEcweb(p, timeoutMs = 3_000) {
 async function printEcwebStatus(p) {
     try {
         const cfg = loadDaemonConfig();
-        if (cfg.ecweb?.enabled === false) {
+        if (ecwebService(cfg.services)?.enabled === false) {
             console.log('');
-            console.log('🔭 ECWeb: 已禁用 (daemon.json → ecweb.enabled: false)');
+            console.log('🔭 ECWeb: 已禁用 (daemon.json → services[name=ecweb].enabled: false)');
             return;
         }
     }
@@ -2602,7 +2633,7 @@ export function stopCodexAppServerOrphans() {
 /** 若 ecweb 在运行则杀掉并确认 pid/端口都已释放。 */
 async function stopEcwebIfRunning(p) {
     const alive = findAliveEcweb(p);
-    const port = loadDaemonConfig().ecweb?.port ?? 42705;
+    const port = ecwebService(loadDaemonConfig().services)?.port ?? DEFAULT_ECWEB_PORT;
     const pids = new Set([
         ...(alive ? [alive.pid] : []),
         ...platform.findProcessByPort(port),
@@ -2628,78 +2659,6 @@ async function waitForPortRelease(port, timeoutMs) {
     }
     return platform.findProcessByPort(port).length === 0;
 }
-/**
- * 后台 detached 启动 ecweb；若已运行则先停再启（确保加载最新代码）。
- * 启动后轮询端口确认 HTTP 服务真正就绪，打印明确的成功/失败结论（而非模糊的「已在后台启动」状态描述）。
- * 返回 true=本次确实启动成功，false=未启用/未安装/启动失败。
- */
-/**
- * 启动前检查并补全 serviceProxy 配置（如果 ecweb 启用但 serviceProxy 未配置）
- */
-function ensureServiceProxyConfigBeforeStart(p) {
-    const cfg = loadDaemonConfig();
-    // 仅在 ecweb 启用 + 控制 AID 已配置 + serviceProxy 未配置 ecweb 时自动添加
-    if (!cfg.ecweb?.enabled || !cfg.aid)
-        return;
-    const hasEcwebService = (cfg.serviceProxy?.services ?? []).some(s => s.name === 'ecweb' || s.source === 'ecweb');
-    if (!hasEcwebService) {
-        const updatedCfg = {
-            ...cfg,
-            serviceProxy: {
-                enabled: true,
-                ...(cfg.serviceProxy ?? {}),
-                services: [
-                    ...(cfg.serviceProxy?.services ?? []),
-                    {
-                        name: 'ecweb',
-                        source: 'ecweb',
-                        serviceType: 'http',
-                        visibility: 'public',
-                        enabled: true,
-                        metadata: {
-                            label: 'EvolCore Dashboard',
-                        },
-                    },
-                ],
-            },
-        };
-        saveDaemonConfig(updatedCfg);
-        console.log(`✓ 自动配置 Service Proxy: https://${cfg.aid}/proxy/ecweb/`);
-    }
-}
-/**
- * 确保 serviceProxy 配置包含 ecweb 服务（ECWeb 启动成功后自动配置）
- */
-function ensureServiceProxyConfig(cfg, port) {
-    // 仅在控制 AID 已配置时自动添加 serviceProxy
-    if (!cfg.aid)
-        return;
-    const hasEcwebService = (cfg.serviceProxy?.services ?? []).some(s => s.name === 'ecweb' || s.source === 'ecweb');
-    if (!hasEcwebService) {
-        const updatedCfg = {
-            ...cfg,
-            serviceProxy: {
-                enabled: true,
-                ...(cfg.serviceProxy ?? {}),
-                services: [
-                    ...(cfg.serviceProxy?.services ?? []),
-                    {
-                        name: 'ecweb',
-                        source: 'ecweb',
-                        serviceType: 'http',
-                        visibility: 'public',
-                        enabled: true,
-                        metadata: {
-                            label: 'EvolCore Dashboard',
-                        },
-                    },
-                ],
-            },
-        };
-        saveDaemonConfig(updatedCfg);
-        console.log(`   自动配置 Service Proxy: https://${cfg.aid}/proxy/ecweb/`);
-    }
-}
 /**
  * Start the separately installed `ec-web` process for a configured runtime.
  * Kept public for restart-monitor, which launches the daemon directly and
@@ -2707,7 +2666,8 @@ function ensureServiceProxyConfig(cfg, port) {
  */
 export async function startEcwebIfEnabled(p, options = {}) {
     const cfg = loadDaemonConfig();
-    if (!cfg.ecweb?.enabled)
+    const service = ecwebService(cfg.services);
+    if (!service?.enabled)
         return false;
     // The daemon is the lifecycle owner.  CLI callers normally only need to
     // ensure ECWeb is available, so adopt a healthy process instead of killing
@@ -2744,7 +2704,7 @@ export async function startEcwebIfEnabled(p, options = {}) {
         console.log(`❌ EC Web 旧进程未清理干净，取消启动: ${error instanceof Error ? error.message : String(error)}`);
         return false;
     }
-    const port = cfg.ecweb.port ?? 42705;
+    const port = service.port ?? DEFAULT_ECWEB_PORT;
     const args = ['--home', p.root, '--port', String(port)];
     const launch = resolveEcwebLaunchCommand(args, { installedPkg });
     if (!launch) {
@@ -2874,10 +2834,9 @@ async function cmdWatchWeb() {
     }
     // 2. 启动（后台）并同步配置。默认行为是替换旧实例，确保新配置/新版静态资源生效。
     const cfg = loadDaemonConfig();
-    const port = cfg.ecweb?.port ?? 42705;
-    saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: true, port } });
-    // 自动配置 serviceProxy（如果控制 AID 已配置）
-    ensureServiceProxyConfigBeforeStart(p);
+    const currentService = ecwebService(cfg.services);
+    const port = currentService?.port ?? DEFAULT_ECWEB_PORT;
+    saveDaemonConfig({ ...cfg, services: setEcwebEnabled(cfg.services, true, port) });
     const ok = await startEcwebIfEnabled(p, { forceRestart: true });
     if (!ok)
         process.exit(1); // 失败原因已由 startEcwebIfEnabled 打印
@@ -3005,8 +2964,9 @@ export async function cmdDiagnose() {
     // 6. 检查 EC Web 端口与实例记录是否一致。
     try {
         const cfg = loadDaemonConfig();
-        if (cfg.ecweb?.enabled) {
-            const port = cfg.ecweb.port ?? 42705;
+        const service = ecwebService(cfg.services);
+        if (service?.enabled) {
+            const port = service.port ?? DEFAULT_ECWEB_PORT;
             const portPids = platform.findProcessByPort(port);
             const recordedPids = new Set(readEcwebInstanceEntries(p).map(entry => entry.record.pid));
             const unregisteredPids = portPids.filter(pid => !recordedPids.has(pid));
@@ -3077,7 +3037,7 @@ export async function cmdWatchCommand(args) {
         if (requested.length > 0) {
             const p2 = resolvePaths();
             const avail = fs.existsSync(p2.logs)
-                ? deriveLogTypes(fs.readdirSync(p2.logs).filter(f => f.endsWith('.log')))
+                ? deriveLogTypes(fs.readdirSync(p2.logs).filter(isWatchLogFile))
                 : [];
             const invalid = validateLogTypes(requested, avail);
             if (invalid.length > 0) {

package/dist/cli/index.js

@@ -118,6 +118,7 @@ export async function main(args) {
 
 仅初始化 defaults.json:
   ec init                          交互式（写完 defaults.json 后嵌套 agent new）
+                                  选择 ecagent 时会继续询问 API Key 和 Base URL
   ec init --non-interactive [选项]
     --baseagent <claude|codex|gemini|ecagent>    默认: PATH 中第一个可用项；ecagent 需显式选择
     --force                              已存在 defaults.json 时覆盖

package/dist/cli/init.js

@@ -6,9 +6,10 @@ import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
 import { saveDefaultsSafe, loadAllAgents, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
+import { ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
 import { generateControlAid, resolveControlAidDomain } from '../aun/aid/control-aid.js';
 import { getCodexAppServerAvailability } from '../agents/codex-runner.js';
-import { resolveEcagentConfig } from '../agents/baseagent.js';
+import { DEFAULT_ECAGENT_BASE_URL, resolveEcagentConfig } from '../agents/baseagent.js';
 import { defaultProjectsRoot } from '../utils/project-path.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST } from '../product.js';
 import { autostartInstalled, autostartPlatformLabel, configureAutostart } from '../utils/autostart.js';
@@ -79,14 +80,14 @@ function ecagentUnavailableReason() {
         return error instanceof Error ? error.message : String(error);
     }
 }
-function buildDefaults(chosen, available, projectsDefaultPath) {
+function buildDefaults(chosen, available, projectsDefaultPath, ecagentConfig) {
     const baseagents = {};
     for (const b of available) {
         baseagents[b] = {};
     }
     // ecagent is bundled with EvolCore, so declare it even when the caller
     // supplies a reduced availability list (for example, a test probe).
-    baseagents.ecagent ??= {};
+    baseagents.ecagent = ecagentConfig ?? baseagents.ecagent ?? {};
     return {
         $schema_version: 1,
         active_baseagent: chosen,
@@ -94,8 +95,8 @@ function buildDefaults(chosen, available, projectsDefaultPath) {
         ...(projectsDefaultPath ? { projects: { defaultPath: projectsDefaultPath } } : {}),
     };
 }
-function writeDefaults(chosen, available, projectsDefaultPath) {
-    saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath));
+function writeDefaults(chosen, available, projectsDefaultPath, ecagentConfig) {
+    saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath, ecagentConfig));
 }
 function hasCompletedInitConfig() {
     const p = resolvePaths();
@@ -263,7 +264,7 @@ export async function cmdInit(options) {
         }
     }
     const available = detectAvailable(codexAvailability);
-    if (available.length === 0 || (available.length === 1 && available[0] === 'ecagent' && ecagentUnavailableReason())) {
+    if (available.length === 0) {
         console.log('❌ 未检测到可用 baseagent。请安装至少一款：');
         console.log('  - claude CLI');
         console.log('  - gemini CLI');
@@ -361,13 +362,6 @@ export async function cmdInit(options) {
                     console.log(`  ${input} 当前环境不可用（可用: ${available.join('/')}）`);
                     continue;
                 }
-                if (input === 'ecagent') {
-                    const reason = ecagentUnavailableReason();
-                    if (reason) {
-                        console.log(`  ecagent 当前环境不可用：${reason}`);
-                        continue;
-                    }
-                }
                 chosen = input;
             }
             return chosen;
@@ -405,13 +399,59 @@ export async function cmdInit(options) {
                 return resolved;
             }
         }
+        async function askEcagentConfig() {
+            let configured;
+            try {
+                const raw = JSON.parse(fs.readFileSync(defaultsPath, 'utf8'));
+                const candidate = raw?.baseagents?.ecagent;
+                if (candidate && typeof candidate === 'object' && !Array.isArray(candidate)) {
+                    configured = candidate;
+                }
+            }
+            catch {
+                // A malformed or missing defaults file should not prevent the user
+                // from supplying a fresh ecagent configuration during init.
+                configured = undefined;
+            }
+            const usable = (value) => {
+                if (typeof value !== 'string')
+                    return false;
+                const normalized = value.trim();
+                if (!normalized)
+                    return false;
+                const lower = normalized.toLowerCase();
+                return !lower.includes('your-') && !lower.includes('placeholder');
+            };
+            const configuredBaseUrl = [
+                configured?.baseUrl,
+                process.env.ECAGENT_BASE_URL,
+                DEFAULT_ECAGENT_BASE_URL,
+            ].find(usable) || DEFAULT_ECAGENT_BASE_URL;
+            const baseUrl = (await ask(rl, `ecagent Base URL [${configuredBaseUrl}]: `)).trim() || configuredBaseUrl;
+            const configuredApiKey = usable(configured?.apiKey) ? configured.apiKey.trim() : undefined;
+            const environmentApiKeyName = !configuredApiKey
+                ? (usable(process.env.ECAGENT_API_KEY)
+                    ? 'ECAGENT_API_KEY'
+                    : usable(process.env.OPENAI_API_KEY) ? 'OPENAI_API_KEY' : undefined)
+                : undefined;
+            let apiKey = '';
+            while (!apiKey) {
+                const suffix = configuredApiKey || environmentApiKeyName ? '（回车保留当前配置）' : '（必填）';
+                const input = (await ask(rl, `ecagent API Key ${suffix}: `)).trim();
+                apiKey = input || configuredApiKey || (environmentApiKeyName ? '${' + environmentApiKeyName + '}' : '');
+                if (!apiKey)
+                    console.log('  API Key 不能为空，请重新输入');
+            }
+            return { apiKey, baseUrl };
+        }
         try {
             if (defaultsExisted) {
                 const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
                 if (ans === 'y' || ans === 'yes') {
                     const chosen = await askBaseagent();
+                    const ecagentConfig = chosen === 'ecagent' ? await askEcagentConfig() : undefined;
                     const projectsDefaultPath = await askProjectsDefaultPath();
-                    writeDefaults(chosen, available, projectsDefaultPath);
+                    writeDefaults(chosen, available, projectsDefaultPath, ecagentConfig);
                     console.log(`\n✓ 已覆盖: ${defaultsPath}`);
                     console.log(`  active_baseagent: ${chosen}\n`);
                 }
@@ -421,8 +461,9 @@ export async function cmdInit(options) {
             }
             else {
                 const chosen = await askBaseagent();
+                const ecagentConfig = chosen === 'ecagent' ? await askEcagentConfig() : undefined;
                 const projectsDefaultPath = await askProjectsDefaultPath();
-                writeDefaults(chosen, available, projectsDefaultPath);
+                writeDefaults(chosen, available, projectsDefaultPath, ecagentConfig);
                 console.log(`\n✓ 已创建: ${defaultsPath}`);
                 console.log(`  active_baseagent: ${chosen}\n`);
             }
@@ -578,25 +619,34 @@ export async function initTail(options = {}) {
     }
     async function handleEcwebPrompt(rl) {
         const daemonConfigForEcweb = loadDaemonConfig();
-        if (daemonConfigForEcweb.ecweb?.enabled === undefined) {
+        if (ecwebService(daemonConfigForEcweb.services)?.enabled === undefined) {
             const ans = (await ask(rl, '\n是否在 ec start 时自动启动 ECWeb 控制台？[y/N] ')).trim().toLowerCase();
             if (ans === 'y' || ans === 'yes') {
                 const installResult = await ensureEcwebInstalledForInit();
                 if (installResult.ok) {
                     const cfg = loadDaemonConfig();
-                    saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: true } });
+                    saveDaemonConfig({
+                        ...cfg,
+                        services: setEcwebEnabled(cfg.services, true),
+                    });
                     console.log('  ✓ 已启用 ECWeb（ec start 将自动在后台启动）');
                     console.log('  提示：首次访问运行 ec watch web 查看配对码和 URL');
                 }
                 else {
                     const cfg = loadDaemonConfig();
-                    saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: false } });
+                    saveDaemonConfig({
+                        ...cfg,
+                        services: setEcwebEnabled(cfg.services, false),
+                    });
                     console.log('  提示：安装完成后运行 ec start；如需立即打开控制台，运行 ec watch web');
                 }
             }
             else {
                 const cfg = loadDaemonConfig();
-                saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: false } });
+                saveDaemonConfig({
+                    ...cfg,
+                    services: setEcwebEnabled(cfg.services, false),
+                });
                 console.log('  已跳过（可日后运行 ec watch web 手动启动，或编辑 daemon.json）');
             }
         }
@@ -618,7 +668,7 @@ export async function initTail(options = {}) {
     const finalCfg = loadDaemonConfig();
     console.log(`  控制 AID: ${finalCfg.aid || '(未配置)'}`);
     console.log(`  管理者: ${finalCfg.owners?.join(', ') || '(未配置)'}`);
-    console.log(`  ECWeb 自启动: ${finalCfg.ecweb?.enabled ? '已启用' : '已禁用'}`);
+    console.log(`  ECWeb 自启动: ${ecwebService(finalCfg.services)?.enabled ? '已启用' : '已禁用'}`);
     const { agents: finalAgents } = loadAllAgents();
     if (finalAgents.length === 0) {
         console.log('\n📌 下一步：创建 agent');
@@ -786,11 +836,11 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
         const ensureEcweb = dependencies.ensureEcweb ?? (() => ensureEcwebInstalledForInit({ quiet: true }));
         const installResult = await ensureEcweb();
         if (!installResult.ok) {
-            if (existingCfg.ecweb?.enabled === true) {
+            if (ecwebService(existingCfg.services)?.enabled === true) {
                 try {
                     saveDaemonConfig({
                         ...existingCfg,
-                        ecweb: { ...(existingCfg.ecweb ?? {}), enabled: false },
+                        services: setEcwebEnabled(existingCfg.services, false),
                     });
                 }
                 catch (e) {
@@ -826,7 +876,9 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
             $schema_version: existingCfg.$schema_version ?? 1,
             aid: controlAid,
             owners: [ownerAid],
-            ...(opts.ecweb === true ? { ecweb: { ...(existingCfg.ecweb ?? {}), enabled: true } } : {}),
+            ...(opts.ecweb === true
+                ? { services: setEcwebEnabled(existingCfg.services, true) }
+                : {}),
         };
         saveDaemonConfig(next);
     }
@@ -854,7 +906,7 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
         controlAid: controlAid,
         ownerAid,
         owners: [ownerAid],
-        ecwebEnabled: opts.ecweb === true || existingCfg.ecweb?.enabled === true,
+        ecwebEnabled: opts.ecweb === true || ecwebService(existingCfg.services)?.enabled === true,
         baseagent: chosenBaseagent,
         projectsDefaultPath: projectsDefaultPath ?? null,
         defaultsPath: p.defaultsConfig,

package/dist/cli/restart-monitor.js

@@ -14,7 +14,7 @@ import { WEB_PACKAGE_NAME } from '../product.js';
 import { shouldSuppressRealRestart } from '../utils/restart-safety.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
 import { inspectDataMigrationRequirement } from '../core/data-migration.js';
-import { requestDaemonShutdown } from './daemon-commands.js';
+import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown } from './daemon-commands.js';
 const execFileAsync = promisify(execFile);
 // 清理 Claude Code 环境变量，防止 SDK 认为是嵌套会话
 function cleanEnv() {
@@ -107,7 +107,7 @@ export async function cmdRestartMonitor() {
         const pids = runtimeOrphans.map(o => o.pid).join(', ');
         log(`Stopping unregistered EvolCore process(es): ${pids}`);
         const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
-        const ping = await requestDaemonShutdown(p.socket, 3_000, 'restart-monitor orphan cleanup', orphanPids);
+        const ping = await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor orphan cleanup', orphanPids);
         for (const orphan of runtimeOrphans) {
             if (orphan.pid !== ping)
                 platform.killProcess(orphan.pid, false);
@@ -134,7 +134,7 @@ export async function cmdRestartMonitor() {
     if (aliveMains.length > 0) {
         const oldPids = aliveMains.map(m => m.record.pid);
         log(`Monitoring ${oldPids.length} main process(es): ${oldPids.join(', ')}`);
-        const gracefulPid = await requestDaemonShutdown(p.socket, 3_000, 'restart-monitor', new Set(oldPids));
+        const gracefulPid = await requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor', new Set(oldPids));
         // 没有收到 IPC shutdown 确认的进程才走信号兜底
         for (const pid of oldPids) {
             if (pid !== gracefulPid) {