evolcore 0.0.2 → 0.0.3

package/dist/cli/daemon-commands.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { spawn, execFileSync, execFile } from 'child_process';
+import { spawn, execFile } from 'child_process';
 import { promisify } from 'util';
 import readline from 'readline';
 import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot, agentMdPath } from '../paths.js';
@@ -27,6 +27,7 @@ import { printCodeStats } from './code-stats.js';
 import { getProcessStartTime } from '../utils/process-introspect.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST, WEB_PACKAGE_NAME } from '../product.js';
+import { rotateStdoutLog } from '../utils/log-writer.js';
 const execFileAsync = promisify(execFile);
 async function probeDaemon(socketPath, timeoutMs = 1000) {
     const response = await ipcQuery(socketPath, { type: 'ping' }, timeoutMs);
@@ -81,42 +82,6 @@ export function cleanEnv() {
         delete process.env[key];
     }
 }
-/**
- * 启动时归档过大的 stdout.log。其它 .log 文件由各自的 LogWriter 管理切片/清理，
- * 不再扫描整个目录——LogWriter 模式下重复的 size 检查会和 hourly rotation 冲突。
- */
-function rotateStdoutIfNeeded(logDir) {
-    if (!fs.existsSync(logDir))
-        return;
-    const MAX_SIZE = 10 * 1024 * 1024; // 10MB
-    const cutoff = Date.now() - 7 * 24 * 60 * 60 * 1000;
-    const stdoutLog = path.join(logDir, 'stdout.log');
-    // 归档当前 stdout.log（若超过 10MB）
-    try {
-        const stat = fs.statSync(stdoutLog);
-        if (stat.size > MAX_SIZE) {
-            const timestamp = new Date().toISOString().replace(/[:.]/g, '').slice(0, 15);
-            const newPath = `${stdoutLog}.${timestamp}`;
-            fs.renameSync(stdoutLog, newPath);
-            console.log(`  Rotated: stdout.log -> ${path.basename(newPath)}`);
-        }
-    }
-    catch { /* file not exist */ }
-    // 清理 7 天前的 stdout.log.* 归档
-    try {
-        for (const file of fs.readdirSync(logDir)) {
-            if (!file.startsWith('stdout.log.'))
-                continue;
-            const full = path.join(logDir, file);
-            try {
-                if (fs.statSync(full).mtimeMs < cutoff)
-                    fs.unlinkSync(full);
-            }
-            catch { }
-        }
-    }
-    catch { }
-}
 function buildDaemonEnv(p, opts) {
     return {
         ...process.env,
@@ -318,7 +283,10 @@ export async function cmdStart(opts = {}) {
     // 跨 HOME 孤儿（未登记进程）只警告，不动
     reportOrphans(findOrphanProcesses());
     console.log('🚀 Starting EvolCore...');
-    rotateStdoutIfNeeded(p.logs);
+    const stdoutRotation = rotateStdoutLog(p.logs);
+    if (stdoutRotation.rotatedPath) {
+        console.log(`  Rotated: stdout.log -> ${path.basename(stdoutRotation.rotatedPath)}`);
+    }
     cleanEnv();
     // 在启动前确保 serviceProxy 配置完整（如果 ecweb 启用但 serviceProxy 未配置）
     ensureServiceProxyConfigBeforeStart(p);
@@ -604,9 +572,16 @@ export async function cmdRestart(opts = {}) {
     // 跨 HOME 的孤儿只在 --clear 时 kill，否则仅警告。
     {
         const orphans = findOrphanProcesses();
+        const confirmedTestDaemons = orphans.filter(o => o.confirmedTestDaemon);
+        const nonTestOrphans = orphans.filter(o => !o.confirmedTestDaemon);
+        if (confirmedTestDaemons.length > 0) {
+            const killed = killOrphans(confirmedTestDaemons);
+            console.log(`☠ 已清理 ${killed.length} 个泄漏的测试 daemon: ${killed.join(', ')}`);
+            await sleep(500);
+        }
         const currentHome = resolveRoot();
-        const sameHome = orphans.filter(o => o.evolcoreHome === currentHome);
-        const otherHome = orphans.filter(o => o.evolcoreHome !== currentHome);
+        const sameHome = nonTestOrphans.filter(o => o.evolcoreHome === currentHome);
+        const otherHome = nonTestOrphans.filter(o => o.evolcoreHome !== currentHome);
         if (sameHome.length > 0) {
             const killed = killOrphans(sameHome);
             console.log(`☠ 已 SIGKILL ${killed.length} 个同 HOME 孤儿进程: ${killed.join(', ')}`);
@@ -617,6 +592,9 @@ export async function cmdRestart(opts = {}) {
             console.log(`☠ 已 SIGKILL ${killed.length} 个跨 HOME 孤儿进程: ${killed.join(', ')}`);
             await sleep(500);
         }
+        else if (otherHome.length > 0) {
+            reportOrphans(otherHome);
+        }
     }
     // 清理 codex app-server 孤儿进程（无 HOME 区分，全局清理）
     {
@@ -642,141 +620,6 @@ export async function cmdRestart(opts = {}) {
         printCodeStats(getPackageRoot(), resolvePaths().logs);
     }
 }
-export async function cmdDev(args) {
-    const pkgRoot = getPackageRoot();
-    const isNpmInstall = pkgRoot.includes('node_modules');
-    const p = resolvePaths();
-    const devMarker = path.join(p.dataDir, 'dev-repo.path');
-    const sub = args[0];
-    if (!sub) {
-        if (!isNpmInstall) {
-            console.log(`当前: [dev] ${pkgRoot}`);
-            console.log('');
-            console.log('断开开发仓链接:');
-            console.log('  ec dev off');
-        }
-        else {
-            console.log(`当前: [pkg] ${pkgRoot}`);
-            console.log('');
-            let devPath = null;
-            try {
-                devPath = fs.readFileSync(devMarker, 'utf-8').trim();
-            }
-            catch { }
-            if (devPath && fs.existsSync(devPath)) {
-                console.log('链接到开发仓:');
-                console.log(`  ec dev on`);
-                console.log(`  (已记录路径: ${devPath})`);
-            }
-            else {
-                console.log('链接到开发仓:');
-                console.log('  ec dev <开发仓路径>');
-            }
-        }
-        return;
-    }
-    if (sub === 'off') {
-        if (isNpmInstall) {
-            console.log('当前已是 [pkg] 模式，无需断开');
-            return;
-        }
-        console.log('🔗 断开开发仓链接...');
-        let npmPrefix;
-        if (process.platform === 'win32' && process.env.APPDATA) {
-            npmPrefix = path.join(process.env.APPDATA, 'npm');
-        }
-        else {
-            npmPrefix = execFileSync('npm', ['prefix', '-g'], { encoding: 'utf-8', shell: true }).trim();
-        }
-        const linkPath = path.join(npmPrefix, 'node_modules', 'evolcore');
-        const binPath = path.join(npmPrefix, 'evolcore');
-        try {
-            fs.rmSync(linkPath, { recursive: true });
-        }
-        catch { }
-        try {
-            fs.unlinkSync(binPath);
-        }
-        catch { }
-        try {
-            fs.unlinkSync(binPath + '.cmd');
-        }
-        catch { }
-        try {
-            fs.unlinkSync(binPath + '.ps1');
-        }
-        catch { }
-        console.log('✓ 已断开');
-        console.log(`  已删除: ${linkPath}`);
-        console.log(`  如需恢复: ec dev on（需从已安装的 evolcore 执行）`);
-        return;
-    }
-    if (sub === 'on') {
-        if (!isNpmInstall) {
-            console.log(`当前已是 [dev] 模式: ${pkgRoot}`);
-            return;
-        }
-        let devPath = null;
-        try {
-            devPath = fs.readFileSync(devMarker, 'utf-8').trim();
-        }
-        catch { }
-        if (!devPath || !fs.existsSync(devPath)) {
-            console.log('未记录开发仓路径');
-            console.log('');
-            console.log('用法: ec dev <开发仓路径>');
-            process.exit(1);
-        }
-        console.log(`🔗 链接开发仓: ${devPath}`);
-        try {
-            execFileSync('npm', ['link'], { stdio: 'inherit', cwd: devPath, shell: true });
-            console.log(`✓ 已链接 [dev] ${devPath}`);
-        }
-        catch (e) {
-            console.error('❌ npm link 失败:', e.message);
-            process.exit(1);
-        }
-        return;
-    }
-    // ec dev <path> — 记录路径 + 建立链接
-    const devPath = path.resolve(sub);
-    const pkgJson = path.join(devPath, 'package.json');
-    if (!fs.existsSync(pkgJson)) {
-        console.error(`❌ 路径不存在或无 package.json: ${devPath}`);
-        process.exit(1);
-    }
-    let pkg;
-    try {
-        pkg = JSON.parse(fs.readFileSync(pkgJson, 'utf-8'));
-    }
-    catch {
-        console.error(`❌ 无法解析 package.json: ${pkgJson}`);
-        process.exit(1);
-    }
-    if (pkg.name !== 'evolcore') {
-        console.error(`❌ package.json name 不是 evolcore（是 "${pkg.name}"）`);
-        process.exit(1);
-    }
-    // 已经链接到同一路径，只记录不重复 link
-    if (!isNpmInstall && path.resolve(pkgRoot) === devPath) {
-        fs.mkdirSync(p.dataDir, { recursive: true });
-        fs.writeFileSync(devMarker, devPath, 'utf-8');
-        console.log(`✓ 当前已链接到该路径，路径已记录`);
-        return;
-    }
-    console.log(`🔗 链接开发仓: ${devPath}`);
-    try {
-        execFileSync('npm', ['link'], { stdio: 'inherit', cwd: devPath, shell: true });
-    }
-    catch (e) {
-        console.error('❌ npm link 失败:', e.message);
-        process.exit(1);
-    }
-    fs.mkdirSync(p.dataDir, { recursive: true });
-    fs.writeFileSync(devMarker, devPath, 'utf-8');
-    console.log(`✓ 已链接 [dev] ${devPath}`);
-    console.log(`  路径已记录，下次可用 ec dev on 快速切换`);
-}
 function formatTimeAgo(ms) {
     const sec = Math.floor(ms / 1000);
     if (sec < 60)
@@ -885,6 +728,16 @@ function renderAunAidsTable(aids) {
             note);
     }
 }
+function readStatusDefaultsConfig(file) {
+    try {
+        return JSON.parse(fs.readFileSync(file, 'utf-8'));
+    }
+    catch (error) {
+        const detail = error?.code ? String(error.code) : error instanceof Error ? error.message : String(error);
+        console.log(`⚠ Channel configuration unavailable (${detail})`);
+        return null;
+    }
+}
 function showConfigChannels(config) {
     const groups = [];
     const channelChecks = [
@@ -1061,48 +914,52 @@ export async function cmdStatus() {
         }
         catch { }
     }
-    // Channel status
-    if (fs.existsSync(p.defaultsConfig)) {
+    // Channel status. A running daemon is authoritative and avoids reading
+    // protected config files from the CLI's potentially sandboxed process.
+    if (pid) {
         console.log('');
-        const config = JSON.parse(fs.readFileSync(p.defaultsConfig, 'utf-8'));
-        if (pid) {
-            // Running: query IPC for real-time status
-            const status = await ipcQuery(p.socket, { type: 'status' });
-            if (status) {
-                // 🔑 AUN AIDs 表格（详细 AUN 实例状态）
-                try {
-                    const aidsResp = await ipcQuery(p.socket, { type: 'aun-aids' });
-                    if (aidsResp?.ok && aidsResp.aids?.length > 0) {
-                        console.log('🔑 AUN AIDs:');
-                        renderAunAidsTable(aidsResp.aids);
-                    }
-                }
-                catch { /* ignore */ }
-                // 控制 AID（daemon 进程身份）状态
-                if (status.controlAid) {
-                    const state = status.controlAid.connected ? 'connected' : 'disconnected';
-                    console.log(`control: ${status.controlAid.aid}  [${state}]`);
-                }
-                else {
-                    console.log('control: not configured');
-                }
-                if (status.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`);
+        const status = await ipcQuery(p.socket, { type: 'status' });
+        if (status) {
+            // 🔑 AUN AIDs 表格（详细 AUN 实例状态）
+            try {
+                const aidsResp = await ipcQuery(p.socket, { type: 'aun-aids' });
+                if (aidsResp?.ok && aidsResp.aids?.length > 0) {
+                    console.log('🔑 AUN AIDs:');
+                    renderAunAidsTable(aidsResp.aids);
                 }
             }
+            catch { /* ignore */ }
+            // 控制 AID（daemon 进程身份）状态
+            if (status.controlAid) {
+                const state = status.controlAid.connected ? 'connected' : 'disconnected';
+                console.log(`control: ${status.controlAid.aid}  [${state}]`);
+            }
             else {
-                // IPC unreachable but PID exists — show config only
+                console.log('control: not configured');
+            }
+            if (status.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`);
+            }
+        }
+        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):');
                 showConfigChannels(config);
             }
         }
-        else {
+    }
+    else if (fs.existsSync(p.defaultsConfig)) {
+        console.log('');
+        const config = readStatusDefaultsConfig(p.defaultsConfig);
+        if (config) {
             console.log('🔌 Channel Configuration:');
             showConfigChannels(config);
         }
@@ -2406,11 +2263,17 @@ async function probeEcwebReady(port) {
  *   2. HTTP 是否就绪——探测根路径 /（serveStatic → index.html, 无副作用）。
  */
 async function printEcwebStatus(p) {
-    const cfg = loadDaemonConfig();
-    if (cfg.ecweb?.enabled === false) {
-        console.log('');
-        console.log('🔭 ECWeb: 已禁用 (daemon.json → ecweb.enabled: false)');
-        return;
+    try {
+        const cfg = loadDaemonConfig();
+        if (cfg.ecweb?.enabled === false) {
+            console.log('');
+            console.log('🔭 ECWeb: 已禁用 (daemon.json → ecweb.enabled: false)');
+            return;
+        }
+    }
+    catch {
+        // Agent tool sandboxes may mask daemon.json. Instance and HTTP probes below
+        // still provide an authoritative runtime status without local config access.
     }
     const entries = readEcwebInstanceEntries(p);
     let readyEntry;

package/dist/cli/handoff-command.js

@@ -3,7 +3,7 @@ import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
 import { HANDOFF_QUERY_DEFAULT_LIMIT, HANDOFF_QUERY_MAX_LIMIT, HANDOFF_STATES } from '../core/handoff/types.js';
 import { HANDOFF_ID_RE } from '../core/handoff/store.js';
-import { isHelpFlag } from './help.js';
+import { isHelpFlag, wantsHelp } from './help.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 function parseLimit(value) {
     const limit = Number(value);
@@ -152,7 +152,7 @@ function formatTimestamp(value) {
 }
 export async function cmdHandoff(args) {
     const sub = args[0];
-    if (!sub || isHelpFlag(sub)) {
+    if (!sub || isHelpFlag(sub) || wantsHelp(args)) {
         console.log(`用法: ec handoff <command> [args]
 
 Commands:

package/dist/cli/help.js

@@ -3,22 +3,26 @@
  *
  * 把 7 种历史写法统一为两个语义清晰的函数：
  *   - isHelpFlag(token)：单 token 是否是 help 标记（'help' / '--help' / '-h'）
- *   - wantsHelp(args)：args 任意位置出现 help 标记
+ *   - wantsHelp(args)：首 token 为 help，或 `--` 分隔符前出现 --help/-h
  *
  * 两套 API 服务于不同语义：
  *   - 顶层路由（如 cmdAid 看到第一个 token 是子命令名时）必须用 isHelpFlag(sub)，
  *     否则 `ec aid delete --help` 会被顶层吞掉，永远到不了 delete 自己的 help。
- *   - 单层命令（如 cmdLinkRules、cmdAid 的具体 sub 处理块内）用 wantsHelp(args)
- *     更宽松，任意位置都识别。
+ *   - 单层命令（如 cmdLinkRules、cmdAid 的具体 sub 处理块内）用 wantsHelp(args)，
+ *     支持 option 风格帮助，同时不把 `--` 后的正文误判为帮助。
  */
 const HELP_TOKENS = new Set(['help', '--help', '-h']);
 export function isHelpFlag(token) {
     return token !== undefined && HELP_TOKENS.has(token);
 }
 export function wantsHelp(args) {
-    for (const a of args)
-        if (HELP_TOKENS.has(a))
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg === '--')
+            break;
+        if (arg === '--help' || arg === '-h' || (i === 0 && arg === 'help'))
             return true;
+    }
     return false;
 }
 /**