evolcore 0.0.2 → 0.0.4

package/dist/cli/init.js

@@ -64,27 +64,36 @@ export function parseOwnerAids(raw, isValid) {
 function installErrorMessage(e) {
     return String(e?.stderr || e?.message || e).trim();
 }
-async function ensureEcwebInstalledForInit() {
-    if (commandExists(WEB_CLI_BIN))
-        return true;
-    console.log(`  📦 EC Web 组件未安装，正在安装 ${WEB_PACKAGE_LATEST}...`);
+export async function ensureEcwebInstalledForInit(options = {}) {
+    const isInstalled = options.isInstalled ?? (() => commandExists(WEB_CLI_BIN));
+    if (isInstalled())
+        return { ok: true, installedNow: false };
+    if (!options.quiet)
+        console.log(`  📦 EC Web 组件未安装，正在安装 ${WEB_PACKAGE_LATEST}...`);
     try {
-        const { npmInstallGlobal } = await import('../utils/npm-ops.js');
-        await npmInstallGlobal(WEB_PACKAGE_LATEST);
-        console.log('  ✓ EC Web 组件安装完成');
-        return true;
+        const install = options.install ?? (async (pkg) => {
+            const { npmInstallGlobal } = await import('../utils/npm-ops.js');
+            await npmInstallGlobal(pkg);
+        });
+        await install(WEB_PACKAGE_LATEST);
+        if (!options.quiet)
+            console.log('  ✓ EC Web 组件安装完成');
+        return { ok: true, installedNow: true };
     }
     catch (e) {
-        console.log(`  ⚠ EC Web 组件安装失败: ${installErrorMessage(e)}`);
-        console.log(`  可稍后运行 ec watch web 自动安装并启动，或手动运行 npm install -g ${WEB_PACKAGE_LATEST}`);
-        return false;
+        const error = installErrorMessage(e);
+        if (!options.quiet) {
+            console.log(`  ⚠ EC Web 组件安装失败: ${error}`);
+            console.log(`  可稍后运行 ec watch web 自动安装并启动，或手动运行 npm install -g ${WEB_PACKAGE_LATEST}`);
+        }
+        return { ok: false, error };
     }
 }
 // ==================== Main ====================
 export async function cmdInit(options) {
     // 云部署非交互式路径：当带 --owner 或 --format json 时走结构化分支，与交互式 tail 完全隔离。
     // 预留方案 B：当 daemon 支持 Control Plane 无 agent 启动时，可在此分支跳过 agent new 预创建。
-    if (options?.nonInteractive && (options.owner || options.format === 'json')) {
+    if (options?.nonInteractive && (options.owner || options.format === 'json' || options.projectpath || options.ecweb)) {
         return cmdInitNonInteractive({
             owner: options.owner,
             baseagent: options.baseagent,
@@ -339,16 +348,22 @@ export async function initTail() {
         if (daemonConfigForEcweb.ecweb?.enabled === undefined) {
             const ans = (await ask(rl, '\n是否在 ec start 时自动启动 ECWeb 控制台？[y/N] ')).trim().toLowerCase();
             if (ans === 'y' || ans === 'yes') {
-                const cfg = loadDaemonConfig();
-                saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: true } });
-                console.log('  ✓ 已启用 ECWeb（ec start 将自动在后台启动）');
-                const installed = await ensureEcwebInstalledForInit();
-                console.log(installed
-                    ? '  提示：首次访问运行 ec watch web 查看配对码和 URL'
-                    : '  提示：安装完成后运行 ec start；如需立即打开控制台，运行 ec watch web');
+                const installResult = await ensureEcwebInstalledForInit();
+                if (installResult.ok) {
+                    const cfg = loadDaemonConfig();
+                    saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: true } });
+                    console.log('  ✓ 已启用 ECWeb（ec start 将自动在后台启动）');
+                    console.log('  提示：首次访问运行 ec watch web 查看配对码和 URL');
+                }
+                else {
+                    const cfg = loadDaemonConfig();
+                    saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: false } });
+                    console.log('  提示：安装完成后运行 ec start；如需立即打开控制台，运行 ec watch web');
+                }
             }
             else {
-                saveDaemonConfig({ ...loadDaemonConfig(), ecweb: { enabled: false } });
+                const cfg = loadDaemonConfig();
+                saveDaemonConfig({ ...cfg, ecweb: { ...(cfg.ecweb ?? {}), enabled: false } });
                 console.log('  已跳过（可日后运行 ec watch web 手动启动，或编辑 daemon.json）');
             }
         }
@@ -375,7 +390,7 @@ export async function initTail() {
  * Present instance selection menu when existing instances are found.
  * Returns the user's choice, or null if cancelled.
  */
-export async function selectInstance(rl, channelType, instances) {
+export async function selectInstance(rl, channelType, instances, options = {}) {
     const typeLabel = channelType === 'feishu' ? '飞书' : channelType === 'wechat' ? '微信' : channelType === 'dingtalk' ? '钉钉' : channelType === 'qqbot' ? 'QQ机器人' : channelType === 'wecom' ? '企业微信' : channelType.toUpperCase();
     console.log(`\n发现已有 ${typeLabel} 配置：`);
     const letters = 'abcdefghijklmnopqrstuvwxyz';
@@ -412,10 +427,12 @@ export async function selectInstance(rl, channelType, instances) {
     }
     const target = instances[choiceIndex];
     console.log(`\n已选择：${target.name}`);
-    const confirm = (await new Promise(r => rl.question(`⚠️ 即将覆盖该配置，确认？(y/N) `, r))).trim().toLowerCase();
-    if (confirm !== 'y' && confirm !== 'yes') {
-        console.log('已取消');
-        return null;
+    if (options.confirmOverwrite !== false) {
+        const confirm = (await new Promise(r => rl.question(`⚠️ 即将覆盖该配置，确认？(y/N) `, r))).trim().toLowerCase();
+        if (confirm !== 'y' && confirm !== 'yes') {
+            console.log('已取消');
+            return null;
+        }
     }
     return { action: 'overwrite', index: choiceIndex, name: target.name };
 }
@@ -436,10 +453,13 @@ function fail(code, message, exitCode, format) {
     emitResult({ type: 'init.result', success: false, error: { code, message } }, format);
     process.exit(exitCode);
 }
-export async function cmdInitNonInteractive(opts) {
+export async function cmdInitNonInteractive(opts, dependencies = {}) {
     const format = opts.format;
     const p = resolvePaths();
     ensureDataDirs();
+    if (format !== undefined && format !== 'json') {
+        fail('INVALID_FORMAT', `--format only supports json: ${format}`, EXIT_USAGE, format);
+    }
     // ── 1. owner 校验 ──
     if (!opts.owner) {
         fail('MISSING_OWNER', '--owner is required in non-interactive mode', EXIT_USAGE, format);
@@ -459,7 +479,7 @@ export async function cmdInitNonInteractive(opts) {
         fail('DAEMON_RUNNING', `EvolCore daemon is running (PID: ${pids}); run 'ec stop' first`, EXIT_USAGE, format);
     }
     // ── 3. baseagent 探测 + 校验 ──
-    const available = detectAvailable();
+    const available = dependencies.availableBaseagents ?? detectAvailable();
     if (available.length === 0) {
         fail('BASEAGENT_UNAVAILABLE', 'no baseagent CLI detected (install claude/codex/gemini)', EXIT_USAGE, format);
     }
@@ -503,14 +523,33 @@ export async function cmdInitNonInteractive(opts) {
     }
     const forced = differentOwner && !!opts.force;
     const previousOwners = forced ? [...existingOwners] : undefined;
-    // ── 6. 写 defaults.json ──
+    // ── 6. EC Web 安装（先安装成功，再写 enabled 配置）──
+    if (opts.ecweb === true) {
+        const ensureEcweb = dependencies.ensureEcweb ?? (() => ensureEcwebInstalledForInit({ quiet: true }));
+        const installResult = await ensureEcweb();
+        if (!installResult.ok) {
+            if (existingCfg.ecweb?.enabled === true) {
+                try {
+                    saveDaemonConfig({
+                        ...existingCfg,
+                        ecweb: { ...(existingCfg.ecweb ?? {}), enabled: false },
+                    });
+                }
+                catch (e) {
+                    fail('ECWEB_INSTALL_FAILED', `failed to install ${WEB_PACKAGE_LATEST}: ${installResult.error}; failed to disable ecweb: ${e?.message || e}`, EXIT_RUNTIME, format);
+                }
+            }
+            fail('ECWEB_INSTALL_FAILED', `failed to install ${WEB_PACKAGE_LATEST}: ${installResult.error}`, EXIT_RUNTIME, format);
+        }
+    }
+    // ── 7. 写 defaults.json ──
     try {
         saveDefaultsSafe(buildDefaults(chosenBaseagent, available, projectsDefaultPath));
     }
     catch (e) {
         fail('IO_ERROR', `failed to write defaults.json: ${e?.message || e}`, EXIT_RUNTIME, format);
     }
-    // ── 7. 控制 AID：缺失则生成 ──
+    // ── 8. 控制 AID：缺失则生成 ──
     let controlAid = existingCfg.aid;
     if (!controlAid) {
         try {
@@ -521,7 +560,7 @@ export async function cmdInitNonInteractive(opts) {
             fail('CONTROL_AID_CREATE_FAILED', `gateway unreachable: ${e?.message || e}`, EXIT_RUNTIME, format);
         }
     }
-    // ── 8. 写 daemon.json（aid + owners + ecweb）──
+    // ── 9. 写 daemon.json（aid + owners + ecweb）──
     try {
         const next = {
             ...existingCfg,
@@ -535,7 +574,7 @@ export async function cmdInitNonInteractive(opts) {
     catch (e) {
         fail('IO_ERROR', `failed to write daemon.json: ${e?.message || e}`, EXIT_RUNTIME, format);
     }
-    // ── 9. 输出 init.result ──
+    // ── 10. 输出 init.result ──
     const result = {
         type: 'init.result',
         success: true,

package/dist/cli/model.js

@@ -243,13 +243,14 @@ Commands:
   check               诊断网关连通性与模型可用性（分阶段输出进度）
 
 作用域（越具体越优先：关系 > 角色 > agent > defaults）:
-  (无参数)                       只读 catalog/defaults，不允许写入
+  (无参数)                       本机 CLI 只读 catalog/defaults，不允许写入
   --self <aid>                   agent级   → config.json
   --self <aid> --role <role>     角色策略预览（只读）
   --self <aid> --peer <X>        关系级    → relations/<peerKey>/config.json
 
 修改 agent/关系作用域后，对应范围所有会话的下一条消息即时生效。
 角色策略请通过角色策略编辑器修改。
+托管会话内省略 --self/--peer/--role 时，命令作用于当前会话。
 
 Options:
   --self <aid>        本端 AID

package/dist/cli/net-check.js

@@ -10,7 +10,7 @@ import { WebSocket } from 'ws';
 import { aunPath as defaultAunPath } from '../paths.js';
 import { isHostChinese } from '../utils/locale.js';
 import { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
-import { isHelpFlag } from './help.js';
+import { isHelpFlag, wantsHelp } from './help.js';
 const GREEN = '\x1b[32m';
 const RED = '\x1b[31m';
 const YELLOW = '\x1b[33m';
@@ -645,7 +645,7 @@ export async function cmdNet(args) {
     const sub = args[0];
     const formatJson = args.includes('--format') && args.includes('json');
     const kickTest = args.includes('--kick-test');
-    if (isHelpFlag(sub)) {
+    if (isHelpFlag(sub) || wantsHelp(args)) {
         console.log(`用法: ec net check [<aid>] [--format json] [--kick-test]
 
 检查 AUN 网络链路连通性（11 步逐层诊断）。

package/dist/cli/queue-command.js

@@ -1,8 +1,8 @@
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
-import { isHelpFlag } from './help.js';
+import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 export async function cmdQueue(args) {
-    if (args.length === 0 || isHelpFlag(args[0])) {
+    if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
         console.log(`用法: ec queue --agent <aid> [选项]
 
 查询与操作 EvolAgent 的消息队列。
@@ -24,7 +24,7 @@ export async function cmdQueue(args) {
   ec queue --agent mybot.agentid.pub --clear
   ec queue --agent mybot.agentid.pub --cancel msg_d4e5f6
   ec queue --agent mybot.agentid.pub --interrupt --sessionkey feishu#oc_abc123#main`);
-        process.exit(0);
+        return;
     }
     // 解析参数
     const agentIdx = args.indexOf('--agent');
@@ -33,15 +33,39 @@ export async function cmdQueue(args) {
         process.exit(1);
     }
     const agent = args[agentIdx + 1];
+    if (agent.startsWith('--')) {
+        console.error('❌ --agent 缺少 <aid> 参数');
+        process.exit(1);
+    }
     const showId = args.includes('--showid');
     const full = args.includes('--full');
-    const formatJson = args.includes('--format json');
+    const formatValue = getArgValue(args, '--format');
+    if (formatValue !== undefined && formatValue !== 'json') {
+        console.error(`❌ --format 仅支持 json: ${formatValue}`);
+        process.exit(1);
+    }
+    const formatJson = formatValue === 'json';
     const clear = args.includes('--clear');
     const cancelIdx = args.indexOf('--cancel');
-    const cancelMsgId = cancelIdx >= 0 && cancelIdx + 1 < args.length ? args[cancelIdx + 1] : undefined;
+    const cancelCandidate = cancelIdx >= 0 && cancelIdx + 1 < args.length ? args[cancelIdx + 1] : undefined;
+    const cancelMsgId = cancelCandidate && !cancelCandidate.startsWith('--') ? cancelCandidate : undefined;
     const interrupt = args.includes('--interrupt');
     const sessionKeyIdx = args.indexOf('--sessionkey');
-    const sessionKey = sessionKeyIdx >= 0 && sessionKeyIdx + 1 < args.length ? args[sessionKeyIdx + 1] : undefined;
+    const sessionCandidate = sessionKeyIdx >= 0 && sessionKeyIdx + 1 < args.length ? args[sessionKeyIdx + 1] : undefined;
+    const sessionKey = sessionCandidate && !sessionCandidate.startsWith('--') ? sessionCandidate : undefined;
+    const actionCount = [clear, cancelIdx >= 0, interrupt].filter(Boolean).length;
+    if (actionCount > 1) {
+        console.error('❌ --clear、--cancel、--interrupt 互斥，只能指定一个');
+        process.exit(1);
+    }
+    if (cancelIdx >= 0 && !cancelMsgId) {
+        console.error('❌ --cancel 缺少 <messageId>');
+        process.exit(1);
+    }
+    if (interrupt && !sessionKey) {
+        console.error('❌ --interrupt 必须配合 --sessionkey <key>');
+        process.exit(1);
+    }
     // 构建 IPC 请求
     const action = clear ? 'clear'
         : cancelMsgId ? 'cancel'

package/dist/cli/raw-key-input.js

@@ -0,0 +1,25 @@
+/**
+ * Temporarily listen for single-key input and restore stdin's previous state.
+ *
+ * Standalone init commands enter this flow after closing readline, so stdin is
+ * paused and must be paused again during cleanup or Node will stay alive. Some
+ * parent wizards keep readline active, so an already-flowing stdin must remain
+ * flowing for their next prompt.
+ */
+export function setupRawKeyListener(onKey, input = process.stdin) {
+    if (!input.isTTY)
+        return () => { };
+    const wasPaused = input.isPaused();
+    const wasRaw = Boolean(input.isRaw);
+    input.setRawMode(true);
+    input.resume();
+    input.setEncoding('utf8');
+    const handler = (chunk) => onKey(String(chunk));
+    input.on('data', handler);
+    return () => {
+        input.removeListener('data', handler);
+        input.setRawMode(wasRaw);
+        if (wasPaused)
+            input.pause();
+    };
+}

package/dist/cli/response.js

@@ -3,8 +3,7 @@
  *
  * 查看/切换/配置会话的响应模式。作用域由 --self/--peer 决定。
  *
- * 三级作用域（越具体越优先：关系 > agent > 全局）：
- *   (无)             → 全局   defaults.json
+ * 读取解析链（越具体越优先：关系 > agent > defaults）：
  *   --self           → agent  config.json
  *   --self --peer    → 关系   relations/<peerKey>/config.json
  *
@@ -149,11 +148,11 @@ Options:
 示例:
   ec response list
   ec response current --self bot.agentid.pub
-  ec response info dual-session
+  ec response info single-session
   ec response set single-session --self bot.agentid.pub
-  ec response set workflow --self bot.agentid.pub --peer aun#team.group.com
-  ec response config dual-session --self bot.agentid.pub
-  ec response config set debounceMs 5000 --mode dual-session --self bot.agentid.pub
+  ec response set single-session --self bot.agentid.pub --peer aun#team.group.com
+  ec response config single-session --self bot.agentid.pub
+  ec response config set tool_use_reminder false --mode single-session --self bot.agentid.pub
   ec response reset --self bot.agentid.pub --peer alice.agentid.pub`;
 // ── list ────────────────────────────────────────────────────────────────
 function cmdList(args, formatJson) {

package/dist/cli/restart-monitor.js

@@ -10,8 +10,10 @@ import { tryUpgrade, tryUpgradeAunSdk, tryUpgradeGlobalPkg, resolveGlobalPkg } f
 import { resolveAunCoreSdkPkg, AUN_CORE_SDK_PKG } from '../aun/aid/client.js';
 import { isValidAid } from '../aun/aid/index.js';
 import { msgSend } from '../aun/msg/index.js';
-import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMonitor, isRestartMonitorWinner } from '../utils/instance-registry.js';
+import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMonitor, isRestartMonitorWinner, findOrphanProcesses, killOrphans } from '../utils/instance-registry.js';
 import { WEB_PACKAGE_NAME } from '../product.js';
+import { shouldSuppressRealRestart } from '../utils/restart-safety.js';
+import { rotateStdoutLog } from '../utils/log-writer.js';
 const execFileAsync = promisify(execFile);
 // 清理 Claude Code 环境变量，防止 SDK 认为是嵌套会话
 function cleanEnv() {
@@ -24,6 +26,10 @@ function cleanEnv() {
     }
 }
 export async function cmdRestartMonitor() {
+    // Defense in depth: a unit test that accidentally executes the real restart
+    // path must not detach a persistent daemon from the test worker.
+    if (shouldSuppressRealRestart())
+        return;
     const p = resolvePaths();
     const restartLog = path.join(p.logs, 'restart.log');
     const MAX_HEAL_ATTEMPTS = 3;
@@ -66,6 +72,17 @@ export async function cmdRestartMonitor() {
         return s.mains.some(m => m.alive);
     };
     log('Restart monitor started');
+    // Test daemons live in one temporary HOME per test, so the current HOME's
+    // instance registry cannot see them. Their strict environment markers make
+    // them safe to reap globally on every real restart.
+    {
+        const leakedTestDaemons = findOrphanProcesses().filter(o => o.confirmedTestDaemon);
+        if (leakedTestDaemons.length > 0) {
+            const killed = killOrphans(leakedTestDaemons);
+            log(`Cleaned ${killed.length} leaked test daemon(s): ${killed.join(', ')}`);
+            await sleep(500);
+        }
+    }
     // restart-pending.json 只留给新主进程发送发起会话内的“重启成功”回执。
     const pendingFile = path.join(p.dataDir, 'restart-pending.json');
     // 等待所有活 main 进程退出（可能不止一个）
@@ -271,6 +288,13 @@ async function spawnAndWaitReady(p, log, timeout) {
     // 清理残留 instance 文件和进程
     cleanupInstances();
     cleanEnv();
+    const stdoutRotation = rotateStdoutLog(p.logs);
+    if (stdoutRotation.rotatedPath) {
+        log(`Rotated stdout.log -> ${path.basename(stdoutRotation.rotatedPath)}`);
+    }
+    if (stdoutRotation.removedArchives.length > 0) {
+        log(`Removed ${stdoutRotation.removedArchives.length} expired stdout archive(s)`);
+    }
     const stdoutLog = path.join(p.logs, 'stdout.log');
     const out = fs.openSync(stdoutLog, 'a');
     const err = fs.openSync(stdoutLog, 'a');

package/dist/cli/stats.js

@@ -32,12 +32,14 @@ Usage: ec stats [options]
   --context <id>          会话 context breakdown 细目
   --budget                预算状态
   --top-peers [--limit N] 对端排行
+  --top-models [--limit N] 模型排行
+  --traffic               消息收发条数与字节数
   --sql "<query>"         直接执行只读 SQL
   --rebuild               全量重建日聚合表 usage_daily（运维兜底/排查）
-  --peers [--limit N]    私聊对端列表（带累计 token/calls/活跃日）
-  --groups [--limit N]   群聊列表（同上）
-  --summary              指定时间范围总消耗汇总（token/USD/CNY）
-  --peer-detail <id>     指定对端 AID 或 peer_key，按天返回消耗明细
+  --peers [--limit N]     私聊对端列表（带累计 token/calls/活跃日）
+  --groups [--limit N]    群聊列表（同上）
+  --summary               指定时间范围总消耗汇总（token/USD/CNY）
+  --peer-detail <id>      指定对端 AID 或 peer_key，按天返回消耗明细
   --task-calls <taskId>   一个 task 的逐次大模型调用明细
   --session-calls <id>    一个会话的逐次大模型调用明细