evolcore 0.0.22 → 0.0.24

package/dist/cli/daemon-commands.js

@@ -15,7 +15,7 @@ import { cmdInit, needsControlAidInit, initTail } from './init.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
 import { tryUpgrade, tryUpgradeGlobalPkg, resolveGlobalPkg } from '../utils/npm-ops.js';
-import { ecwebVersionRequirementError, fetchEcwebPairCode, resolveEcwebLaunchCommand } from '../utils/ecweb-utils.js';
+import { ecwebVersionRequirementError, resolveEcwebLaunchCommand, fetchRemotePairingCode } 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, isWatchLogFile } from './watch-logs.js';
@@ -28,9 +28,52 @@ import { WEB_CLI_BIN, WEB_PACKAGE_LATEST, WEB_PACKAGE_NAME } from '../product.js
 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 { listCodexAppServerProcesses, unregisterCodexAppServerProcess } from '../agents/codex/app-server-registry.js';
 import { DEFAULT_ECWEB_PORT, ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
+import { checkCodexProjectPath, inspectCodexManagedHook, ensureCodexManagedHook, runCodexHookLaunchDiagnostic, } from '../agents/codex/diagnostics.js';
 const execFileAsync = promisify(execFile);
+/** Run before launch, and before restart stops any existing daemon. */
+export function ensureCodexHookBeforeLifecycle(onRepaired) {
+    if (!platform.isWindows)
+        return true;
+    try {
+        const usesCodex = loadDefaults()?.active_baseagent === 'codex'
+            || loadAllAgents().agents.some(agent => {
+                try {
+                    return resolveEffective({ self: agent.aid }).active_baseagent === 'codex';
+                }
+                catch (error) {
+                    console.warn(`⚠ Agent ${agent.aid} 配置解析失败：${error instanceof Error ? error.message : String(error)}`);
+                    return false;
+                }
+            });
+        if (!usesCodex)
+            return true;
+        const result = ensureCodexManagedHook({
+            packageRoot: getPackageRoot(),
+            onInstallRequired: () => console.log('🔧 Codex 运行组件缺失，正在自动安装；Windows 提示管理员授权时请选择“是”。'),
+        });
+        if (result.status === 'installed') {
+            if (result.repaired) {
+                console.log('✅ Codex Windows managed hook 已自动安装并验证');
+                onRepaired?.();
+            }
+            return true;
+        }
+        console.error(`❌ Codex Windows managed hook 未就绪：${result.error || result.reason || result.status}`);
+        if (result.status === 'missing') {
+            console.error('  本次操作已停止。下次启动或重启会再次自动尝试安装，需要允许 Windows 管理员授权。');
+        }
+        else {
+            console.error('  本次操作已停止。现有 Codex 策略或文件访问异常，需要管理员核对；自动安装不会覆盖异常策略。');
+        }
+    }
+    catch (error) {
+        console.error(`❌ Codex 启动检查失败：${error instanceof Error ? error.message : String(error)}`);
+    }
+    process.exitCode = 1;
+    return false;
+}
 async function runAutomaticInit(action) {
     try {
         return await action();
@@ -65,8 +108,8 @@ function printNoSelfAgentHints(options) {
 // 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);
+async function probeDaemon(socketPath, timeoutMs = DAEMON_PROBE_TIMEOUT_MS, throwOnError = false) {
+    const response = await ipcQuery(socketPath, { type: 'ping' }, timeoutMs, { throwOnError });
     if (response?.pong !== true || !Number.isInteger(response.pid) || response.pid <= 0)
         return null;
     return response;
@@ -177,10 +220,15 @@ function sourceBuildNeedsRefresh() {
 function runSourceBuild() {
     return new Promise(resolve => {
         console.log('🔧 源码比 daemon 编译产物更新，自动重新构建...');
-        const child = spawn(platform.isWindows ? 'npm.cmd' : 'npm', ['run', 'build'], {
+        // Windows cannot spawn a .cmd shim directly with shell:false on recent
+        // Node versions. Invoke cmd.exe explicitly instead of using spawn's
+        // shell:true mode, which also avoids the DEP0190 warning.
+        const command = platform.isWindows ? (process.env.ComSpec ?? process.env.COMSPEC ?? 'cmd.exe') : 'npm';
+        const args = platform.isWindows ? ['/d', '/c', 'npm.cmd', 'run', 'build'] : ['run', 'build'];
+        const child = spawn(command, args, {
             cwd: getPackageRoot(),
             stdio: 'inherit',
-            shell: platform.isWindows,
+            windowsHide: platform.isWindows,
         });
         child.on('error', err => {
             console.error(`❌ 无法启动构建进程: ${err.message}`);
@@ -199,22 +247,100 @@ function runSourceBuild() {
         });
     });
 }
+/**
+ * Spawn the restart monitor and confirm it actually reached its own code.
+ *
+ * The daemon is already stopped at this point, so a monitor that dies on
+ * startup leaves nothing running and nobody watching — the exact silent
+ * failure this mechanism exists to prevent.
+ */
+async function spawnRestartMonitorAndConfirm(monitorEntry, reportLine) {
+    const result = await platform.launchMonitorAndConfirm([...monitorEntry.args, 'restart-monitor'], { EVOLCORE_HOME: resolvePaths().root, ...(monitorEntry.env ?? {}) }, pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid === pid), pid => scanInstances().restartMonitors.some(m => m.alive && m.record.pid !== pid));
+    if (result.ok)
+        return { ok: true };
+    for (const line of (result.stderrTail ?? '').split(/\r?\n/).filter(Boolean).slice(-8)) {
+        reportLine(`  | ${line}`);
+    }
+    return { ok: false, reason: result.reason ?? 'unknown' };
+}
 async function requireFreshSourceBuild() {
     if (!sourceBuildNeedsRefresh())
         return true;
     return await runSourceBuild();
 }
-function requireCompletedDataMigration(root) {
+function requireCompletedDataMigration(root, action = 'start') {
     const requirement = inspectDataMigrationRequirement(root);
     if (!requirement.required)
         return true;
-    console.error(`❌ 检测到 ${requirement.operationCount} 项待确认的用户数据迁移，服务未启动。`);
+    console.error(action === 'restart'
+        ? `❌ 检测到 ${requirement.operationCount} 项待确认的用户数据迁移，本次不停止当前服务。`
+        : `❌ 检测到 ${requirement.operationCount} 项待确认的用户数据迁移，服务未启动。`);
     console.error('  先执行: ec data migrate --dry-run');
     console.error('  确认后: ec data migrate --apply');
     console.error('  迁移成功并校验后，再执行 ec start 或 ec restart。');
+    if (action === 'restart')
+        console.error('  本次 ec restart 仅完成只读检查，未停止当前服务。');
     process.exitCode = 2;
     return false;
 }
+/**
+ * Check package updates before starting or restarting the daemon.
+ * A failed upgrade is reported, but the currently installed version remains
+ * usable and the caller continues with its normal lifecycle.
+ */
+export async function runUpgradeChecks(upgradeFn = signal => tryUpgrade({ signal }), ecwebUpgradeFn = signal => tryUpgradeGlobalPkg(() => resolveGlobalPkg(WEB_PACKAGE_NAME), WEB_PACKAGE_NAME, { signal }), timeoutMs = 60_000) {
+    console.log('📦 Checking for updates...');
+    const runWithTimeout = async (label, fn) => {
+        const controller = new AbortController();
+        let timer;
+        try {
+            return await Promise.race([
+                fn(controller.signal),
+                new Promise(resolve => {
+                    timer = setTimeout(() => {
+                        resolve({ status: 'failed', error: `${label} upgrade timed out` });
+                        controller.abort();
+                    }, timeoutMs);
+                }),
+            ]);
+        }
+        catch (error) {
+            return { status: 'failed', error: error instanceof Error ? error.message : String(error) };
+        }
+        finally {
+            if (timer)
+                clearTimeout(timer);
+        }
+    };
+    const upgrade = await runWithTimeout('EvolCore', upgradeFn);
+    switch (upgrade.status) {
+        case 'upgraded':
+            console.log(`✅ Upgraded: ${upgrade.from} → ${upgrade.to}`);
+            break;
+        case 'no-update':
+            console.log(`✓ Already up to date (${upgrade.from})`);
+            break;
+        case 'skipped':
+            console.log(upgrade.error
+                ? '⏭ Skipped upgrade (network unavailable)'
+                : '⏭ Skipped upgrade check (dev mode)');
+            break;
+        case 'failed':
+            console.log(`⚠ Upgrade failed${upgrade.from && upgrade.to ? ` (${upgrade.from} → ${upgrade.to})` : ''}, continuing with current version${upgrade.error ? `: ${upgrade.error}` : ''}`);
+            break;
+    }
+    const ecwebUpgrade = await runWithTimeout(WEB_PACKAGE_NAME, ecwebUpgradeFn);
+    switch (ecwebUpgrade.status) {
+        case 'upgraded':
+            console.log(`✅ ${WEB_PACKAGE_NAME} upgraded: ${ecwebUpgrade.from} → ${ecwebUpgrade.to}`);
+            break;
+        case 'no-update':
+            break;
+        case 'failed':
+            console.log(`⚠ ${WEB_PACKAGE_NAME} upgrade failed${ecwebUpgrade.from && ecwebUpgrade.to ? ` (${ecwebUpgrade.from} → ${ecwebUpgrade.to})` : ''}${ecwebUpgrade.error ? `: ${ecwebUpgrade.error}` : ''}`);
+            break;
+    }
+}
 // ==================== Commands ====================
 /**
  * 检测并展示跨 HOME 残留的 evolcore 主进程。
@@ -322,6 +448,14 @@ export async function cmdStart(opts = {}) {
     const p = resolvePaths();
     const existingDaemon = await probeDaemon(p.socket);
     if (existingDaemon) {
+        let hookRepaired = false;
+        if (!ensureCodexHookBeforeLifecycle(() => { hookRepaired = true; }))
+            return;
+        if (hookRepaired) {
+            console.log('🔄 Codex 运行组件已补齐，正在自动重启服务以加载策略...');
+            await cmdRestart({ diagnose: opts.diagnose });
+            return;
+        }
         console.log(`  EvolCore is already running (PID: ${existingDaemon.pid}, IPC reachable)`);
         console.log(`  已在运行；已运行时长: ${resolveRunningDuration(existingDaemon.pid, existingDaemon.uptime)}；部署/脚本可直接复用当前实例`);
         return;
@@ -329,6 +463,9 @@ export async function cmdStart(opts = {}) {
     ensureDataDirs();
     if (!await requireFreshSourceBuild())
         return;
+    // A stopped container may miss the daily upgrade trigger. Check once on
+    // every real start so the service does not stay on an old installation.
+    await (opts.upgradeChecks ?? runUpgradeChecks)();
     // 旧配置自动迁移（daemon.json → 新结构）
     const { autoMigrateIfNeeded } = await import('../config-store.js');
     autoMigrateIfNeeded();
@@ -357,6 +494,11 @@ export async function cmdStart(opts = {}) {
             console.log('\n初始化完成，开始启动 EvolCore ....');
         }
     }
+    // The initialization path can create the first Codex agent, so perform the
+    // machine-hook check after config migration/auto-init and before any daemon
+    // process is launched.
+    if (!ensureCodexHookBeforeLifecycle())
+        return;
     // 控制 AID 门禁：缺 aid 且交互式 → 只补全控制 AID + owners（不重走 baseagent 向导）。
     // 非 TTY（restart-monitor/systemd/管道）不补全（无法交互），只提示后继续启动，daemon 侧 warn 兜底。
     const daemonCfgStart = loadDaemonConfig();
@@ -691,6 +833,8 @@ export async function cmdStop() {
 export async function cmdRestart(opts = {}) {
     const cmdStartedAt = Date.now();
     console.log('🔄 Restarting EvolCore...');
+    if (!ensureCodexHookBeforeLifecycle())
+        return;
     const initialStatus = scanInstances();
     const initialOrphans = findOrphanProcesses();
     const initialRuntimeOrphans = initialOrphans.filter(orphan => isRuntimeOrphan(orphan));
@@ -702,40 +846,12 @@ export async function cmdRestart(opts = {}) {
         if (initialRuntimeOrphans.length === 0 && rejectPidIsolatedLifecycle('restart', initialStatus, ping))
             return;
     }
-    if (!await requireFreshSourceBuild())
-        return;
-    // 版本检查与自动升级
-    console.log('📦 Checking for updates...');
-    const upgrade = await tryUpgrade();
-    switch (upgrade.status) {
-        case 'upgraded':
-            console.log(`✅ Upgraded: ${upgrade.from} → ${upgrade.to}`);
-            break;
-        case 'no-update':
-            console.log(`✓ Already up to date (${upgrade.from})`);
-            break;
-        case 'skipped':
-            console.log(upgrade.error
-                ? '⏭ Skipped upgrade (network unavailable)'
-                : '⏭ Skipped upgrade check (dev mode)');
-            break;
-        case 'failed':
-            console.log(`⚠ Upgrade failed (${upgrade.from} → ${upgrade.to}), continuing with current version`);
-            break;
-    }
-    // EC Web 是独立全局包，已安装时单独检查升级。
-    const ecwebUpgrade = await tryUpgradeGlobalPkg(() => resolveGlobalPkg(WEB_PACKAGE_NAME), WEB_PACKAGE_NAME);
-    switch (ecwebUpgrade.status) {
-        case 'upgraded':
-            console.log(`✅ ${WEB_PACKAGE_NAME} upgraded: ${ecwebUpgrade.from} → ${ecwebUpgrade.to}`);
-            break;
-        case 'no-update':
-            break; // silent
-        case 'failed':
-            console.log(`⚠ ${WEB_PACKAGE_NAME} upgrade failed (${ecwebUpgrade.from} → ${ecwebUpgrade.to})`);
-            break;
-    }
-    if (!requireCompletedDataMigration(resolveRoot()))
+    // 构建交给 restart-monitor：它在 daemon 停止之后才编译，dist/ 不会被活进程
+    // 占用，失败还能回滚到上一份产物。这里再编译一次会落在事务保护之外。
+    // Keep restart behavior identical to startup: both paths use one upgrade
+    // check implementation and continue when an upgrade is unavailable.
+    await runUpgradeChecks();
+    if (!requireCompletedDataMigration(resolveRoot(), 'restart'))
         return;
     // 停止所有活 main 进程（可能不止一个）
     const status = scanInstances();
@@ -815,11 +931,30 @@ export async function cmdRestart(opts = {}) {
         }
     }
     console.log(`⏱ restart prep done in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s, starting...`);
-    // 通过 restart-monitor 启动，避免在 agent 内调用时自杀
-    const appCli = path.join(getPackageRoot(), 'dist', 'cli', 'index.js');
-    platform.spawnDetachedNode([appCli, 'restart-monitor'], {
-        EVOLCORE_HOME: resolvePaths().root,
-    });
+    // 通过 restart-monitor 启动，避免在 agent 内调用时自杀。
+    // 开发仓下 monitor 从源码跑；安装包下先复制到 stage 目录，两种情况都让看门狗
+    // 不住在会被替换的产物里。
+    const monitorEntry = platform.resolveMonitorLaunch(getPackageRoot(), path.join(resolvePaths().root, 'data', 'monitor-stage'));
+    if (monitorEntry.note)
+        console.log(`ℹ ${monitorEntry.note}`);
+    if (!fs.existsSync(monitorEntry.entry)) {
+        console.error(`❌ 重启中止：找不到 restart-monitor 入口 ${monitorEntry.entry}`);
+        console.error('  请先执行 npm run build 重建产物');
+        process.exitCode = 1;
+        return;
+    }
+    const monitorStarted = await spawnRestartMonitorAndConfirm(monitorEntry, log => console.error(log));
+    if (!monitorStarted.ok) {
+        if (monitorEntry.stageDir)
+            platform.cleanupMonitorStage(monitorEntry.stageDir);
+        console.error(`❌ 重启中止：restart-monitor 未能启动（${monitorStarted.reason}）`);
+        if (fs.existsSync(path.join(getPackageRoot(), 'src', 'cli', 'index.ts'))) {
+            console.error('  源码可能存在语法错误导致 tsx 无法加载。请执行 npx tsc --noEmit 检查。');
+        }
+        console.error('  服务已停止，请修复后执行 ec start。');
+        process.exitCode = 1;
+        return;
+    }
     console.log('🔄 Restart monitor started, waiting for service to come back online...');
     await sleep(2000);
     // 代码统计（开发环境）
@@ -993,7 +1128,11 @@ export async function cmdStatus() {
     // 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);
+    let ipcFailure;
+    const pingPromise = probeDaemon(p.socket, DAEMON_PROBE_TIMEOUT_MS, true).catch(error => {
+        ipcFailure = error;
+        return 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);
@@ -1010,6 +1149,11 @@ export async function cmdStatus() {
     }
     if (pid) {
         printStartupInfo({ pid, running: true });
+        if (!ping) {
+            console.log('⚠ 仅确认 daemon PID 存活，IPC 不可用，不能据此判断服务健康。');
+            if (ipcFailure)
+                console.log(`  ${ipcFailure instanceof Error ? ipcFailure.message : String(ipcFailure)}`);
+        }
         console.log('');
         console.log('📊 Process Info:');
         if (processVisible) {
@@ -1120,7 +1264,9 @@ export async function cmdStatus() {
         }
     }
     else {
-        console.log('⚠ EvolCore is not running');
+        console.log(ipcFailure ? '⚠ 无法确认 EvolCore 运行状态：IPC 不可用，且没有可见的存活 PID。' : '⚠ EvolCore is not running');
+        if (ipcFailure)
+            console.log(`  ${ipcFailure instanceof Error ? ipcFailure.message : String(ipcFailure)}`);
     }
     // Session & Project statistics (从文件系统读)
     if (fs.existsSync(p.sessionsDir)) {
@@ -2667,7 +2813,7 @@ async function stopEcwebIfRunning(p) {
         throw new Error(`EC Web old process or port ${port} could not be released`);
     }
     // 清理 pid 文件（仅 ecweb-<pid>.json / watch-web-<pid>.json，
-    // 不碰 ecweb-tokens.json 等非 pid 文件，否则会清空配对 token 库导致每次重启都要重新配对）
+    // 不碰 daemon-owned control-access-tokens.json 等非 pid 文件，否则会清空凭据库导致每次重启都要重新配对）
     removeEcwebInstanceFiles(p);
     return pids.size > 0;
 }
@@ -2759,23 +2905,32 @@ export async function startEcwebIfEnabled(p, options = {}) {
         fs.mkdirSync(p.instanceDir, { recursive: true });
         const startedAt = getProcessStartTime(pid) ?? Date.now();
         fs.writeFileSync(path.join(p.instanceDir, `ecweb-${pid}.json`), JSON.stringify({ pid, port, startedAt, startedAtIso: new Date(startedAt).toISOString() }, null, 2));
-        // 轮询端口确认 HTTP 服务真正就绪（spawn 成功 ≠ 端口绑定成功），顺便拿配对码
+        // 轮询端口确认 HTTP 服务真正就绪（spawn 成功 ≠ 端口绑定成功）。
+        // 配对码由 daemon 提供，daemon 尚未启动时不应把已经就绪的 ECWeb 杀掉。
+        let ready = false;
         let pair = null;
         for (let i = 0; i < 20; i++) {
-            pair = await fetchEcwebPairCode(port);
-            if (pair)
+            ready = await probeEcwebReady(port);
+            if (ready) {
+                pair = await fetchRemotePairingCode();
                 break;
+            }
             await sleep(250);
         }
-        if (pair) {
+        if (ready) {
             const actualStartedAt = getProcessStartTime(pid);
             if (actualStartedAt !== null) {
                 fs.writeFileSync(path.join(p.instanceDir, `ecweb-${pid}.json`), JSON.stringify({ pid, port, startedAt: actualStartedAt, startedAtIso: new Date(actualStartedAt).toISOString() }, null, 2));
             }
-            const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
             const actionLabel = wasRunning ? '已重启' : '启动成功';
             console.log(`✓ ECWeb ${actionLabel} (PID: ${pid})  http://localhost:${port}`);
-            console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，已配对过的浏览器无需重新配对)`);
+            if (pair) {
+                const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
+                console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，已配对过的浏览器无需重新配对)`);
+            }
+            else {
+                console.log('   daemon 尚未提供配对码；EvolCore 启动后可通过 /pair 或 ECWeb 页面获取');
+            }
             return true;
         }
         console.log(`❌ ECWeb 启动失败：端口 ${port} 未就绪（进程 PID ${pid} 可能已退出，查看 logs/watch-web.log）`);
@@ -2801,13 +2956,13 @@ async function printEcwebAccess(port) {
     console.log(`🔭 ECWeb  http://localhost:${port}`);
     let pair = null;
     for (let i = 0; i < 10 && !pair; i++) {
-        pair = await fetchEcwebPairCode(port);
+        pair = await fetchRemotePairingCode();
         if (!pair)
             await sleep(300);
     }
     if (pair) {
         const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
-        console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，配对后 token 缓存 24h)`);
+        console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，配对后远程访问 token 缓存 30 天)`);
     }
     else {
         console.log('   配对码: 暂不可用（稍后重试 ec watch web，或查看 logs/watch-web.log）');
@@ -2857,7 +3012,12 @@ async function cmdWatchWeb() {
     const cfg = loadDaemonConfig();
     const currentService = ecwebService(cfg.services);
     const port = currentService?.port ?? DEFAULT_ECWEB_PORT;
-    saveDaemonConfig({ ...cfg, services: setEcwebEnabled(cfg.services, true, port) });
+    // Avoid rewriting daemon.json on every invocation once ECWeb is already
+    // enabled on the requested port. The persisted config is the daemon's
+    // lifecycle source of truth, but an unchanged desired state needs no write.
+    if (currentService?.enabled !== true || currentService.port !== port) {
+        saveDaemonConfig({ ...cfg, services: setEcwebEnabled(cfg.services, true, port) });
+    }
     const ok = await startEcwebIfEnabled(p, { forceRestart: true });
     if (!ok)
         process.exit(1); // 失败原因已由 startEcwebIfEnabled 打印
@@ -2896,9 +3056,10 @@ export async function cmdMv(oldDir, newDir) {
     }
 }
 // ==================== Diagnose ====================
-export async function cmdDiagnose() {
+export async function cmdDiagnose(args = []) {
     const p = resolvePaths();
     let hasError = false;
+    const runHookLaunchProbe = args.includes('--codex-hook');
     // 1. 检查数据目录
     console.log(`[diagnose] EVOLCORE_HOME = ${p.root}`);
     if (!fs.existsSync(p.root)) {
@@ -2924,7 +3085,74 @@ export async function cmdDiagnose() {
         else {
             console.log(`[diagnose] ✓ 已加载 ${agents.length} 个 self-agent`);
         }
-        // 3. 检查 Anthropic 配置（用首个 self-agent 的 effective config）
+        // 3. 检查实际使用 Codex 的 Agent 项目目录。项目路径属于 Agent 的
+        // effective config，逐个输出 AID，避免只检查第一个 agent 掩盖坏配置。
+        const codexAgents = agents.filter(agent => {
+            try {
+                return resolveEffective({ self: agent.aid }).active_baseagent === 'codex';
+            }
+            catch (error) {
+                console.error(`[diagnose] ❌ Agent ${agent.aid} effective config 解析失败: ${error instanceof Error ? error.message : String(error)}`);
+                hasError = true;
+                return false;
+            }
+        });
+        for (const agent of codexAgents) {
+            try {
+                const effective = resolveEffective({ self: agent.aid });
+                const check = checkCodexProjectPath(effective.projects?.defaultPath);
+                if (check.status === 'ok') {
+                    console.log(`[diagnose] ✓ Codex 项目路径 ${agent.aid}: ${check.path}`);
+                }
+                else {
+                    console.error(`[diagnose] ❌ Codex 项目路径 ${agent.aid}: ${check.path || '(未配置)'} (${check.reason || check.status})`);
+                    hasError = true;
+                }
+                for (const warning of check.warnings)
+                    console.warn(`[diagnose] ⚠️ Codex 项目路径 ${agent.aid}: ${warning}`);
+            }
+            catch (error) {
+                console.error(`[diagnose] ❌ Codex 项目路径检查失败 ${agent.aid}: ${error instanceof Error ? error.message : String(error)}`);
+                hasError = true;
+            }
+        }
+        if (codexAgents.length === 0) {
+            console.log('[diagnose] - Codex managed hook: 跳过（没有 Agent 使用 Codex）');
+        }
+        else {
+            const hook = inspectCodexManagedHook({ packageRoot: getPackageRoot() });
+            if (hook.status === 'installed') {
+                console.log(`[diagnose] ✓ Codex managed hook 已安装: ${hook.hookPath}`);
+                if (runHookLaunchProbe) {
+                    try {
+                        const launch = runCodexHookLaunchDiagnostic({ packageRoot: getPackageRoot() });
+                        if (launch.status === 'ok') {
+                            console.log('[diagnose] ✓ Codex managed hook 启动探针报告: ' + launch.output);
+                            for (const result of launch.results) {
+                                console.log('[diagnose]   ' + result.label + ': exit=' + result.exitCode + ' pid=' + (result.pid ?? 'unknown'));
+                            }
+                        }
+                        else {
+                            console.log('[diagnose] - Codex managed hook 启动探针: 跳过（' + (launch.reason || 'not applicable') + '）');
+                        }
+                    }
+                    catch (error) {
+                        console.error('[diagnose] ❌ Codex managed hook 启动探针失败: ' + (error instanceof Error ? error.message : String(error)));
+                        hasError = true;
+                    }
+                }
+            }
+            else if (hook.status === 'skipped') {
+                console.log(`[diagnose] - Codex managed hook: 跳过（${hook.reason}）`);
+            }
+            else {
+                const prefix = hook.status === 'missing' ? '⚠️' : '❌';
+                const writer = hook.status === 'missing' ? console.warn : console.error;
+                writer(`[diagnose] ${prefix} Codex managed hook ${hook.status}: ${hook.reason || 'unknown error'}${hook.requirements ? ` (${hook.requirements})` : ''}`);
+                hasError = true;
+            }
+        }
+        // 4. 检查 Anthropic 配置（用首个 self-agent 的 effective config）
         if (agents.length > 0) {
             try {
                 const merged = resolveEffective({ self: agents[0].aid });

package/dist/cli/index.js

@@ -46,6 +46,7 @@ AUN:
   fs                AUN 文件系统
   storage           底层对象存储命令
   rpc               调用底层 AUN RPC
+  menu-client       向远程 daemon 发送标准 Menu 请求
   contact           联系人黑名单管理
   net               AUN 网络链路诊断
 
@@ -79,7 +80,7 @@ function printLifecycleHelp(command) {
         logs: `用法: ec logs [选项]\n\n  --level <error|warn|info|debug>  最低日志级别\n  --module <name>                  只显示指定模块\n  --raw                            原始输出\n  --no-color                       禁用颜色`,
         watch: `用法: ec watch [logs|log|aid|msg|web|session]\n\n  ec watch                 打开监控选择菜单\n  ec watch logs            选择日志类型后监控\n  ec watch log <类型...>   直接监控指定日志类型\n  ec watch aid             监控 AID 连接\n  ec watch msg             打开消息 TUI\n  ec watch web             安装/升级并启动 EC Web\n  ec watch session         ec watch web 的兼容别名`,
         'restart-monitor': '用法: ec restart-monitor\n\n运行内 daemon 重启与升级监控器。',
-        diagnose: '用法: ec diagnose\n\n检查配置、数据库、进程和编译产物。',
+        diagnose: '用法: ec diagnose [--codex-hook]\n\n检查配置、数据库、进程和编译产物。\n\n  --codex-hook 运行 Windows Codex managed hook 启动探针。',
         mv: '用法: ec mv <old-directory> <new-directory>\n\n迁移项目目录以及 Claude、Codex 和 EvolCore 会话路径。',
     };
     console.log(help[command]);
@@ -308,7 +309,7 @@ export async function main(args) {
                 printLifecycleHelp('diagnose');
                 break;
             }
-            await cmdDiagnose();
+            await cmdDiagnose(args.slice(1));
             break;
         case 'data': {
             const { cmdData } = await import('./data-command.js');
@@ -350,6 +351,25 @@ export async function main(args) {
             await cmdRpc(args.slice(1));
             break;
         }
+        case 'menu-client': {
+            const { suppressSdkLogs } = await import('../aun/aid/index.js');
+            suppressSdkLogs();
+            const { cmdMenuClient } = await import('./menu-client.js');
+            try {
+                await cmdMenuClient(args.slice(1));
+            }
+            catch (error) {
+                const payload = {
+                    ok: false,
+                    code: typeof error?.code === 'string' ? error.code : 'MENU_CLIENT_FAILED',
+                    error: error?.message ?? String(error),
+                    ...(error?.data === undefined ? {} : { data: error.data }),
+                };
+                console.error(JSON.stringify(payload));
+                process.exitCode = 1;
+            }
+            break;
+        }
         case 'storage': {
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();

package/dist/cli/init.js

@@ -14,6 +14,7 @@ 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';
 import { askInit, isInitCancelledError, printInitCancelHint } from './init-cancel.js';
+import { AUTO_BASEAGENT_CANDIDATES, BASEAGENT_CANDIDATES, detectAvailableBaseagents, } from '../agents/baseagent-availability.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return askInit(rl, question);
@@ -27,17 +28,8 @@ export function expandLeadingTildePath(value, homeDir = os.homedir()) {
     }
     return value;
 }
-const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini', 'ecagent'];
-const AUTO_BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
-function isBaseagentAvailable(baseagent, codexAvailability) {
-    if (baseagent === 'codex')
-        return (codexAvailability ?? getCodexAppServerAvailability()).available;
-    if (baseagent === 'ecagent')
-        return true;
-    return commandExists(baseagent);
-}
 function detectAvailable(codexAvailability = getCodexAppServerAvailability()) {
-    return BASEAGENT_CANDIDATES.filter(baseagent => isBaseagentAvailable(baseagent, codexAvailability));
+    return detectAvailableBaseagents(codexAvailability);
 }
 /** Offer installation only when the probe positively identified an old CLI. */
 export async function maybeUpgradeCodexForInit(availability, dependencies) {

package/dist/cli/managed-command-guard.js

@@ -12,6 +12,9 @@ const MANAGED_TASK_COMMANDS = new Set([
     'msg',
     'queue',
     'response',
+    // `stats` reads the usage database directly. It authorizes each managed call
+    // against the task's relation role in `resolveManagedStatsScope`.
+    'stats',
     'status',
     'storage',
     'trigger',