evolcore 0.0.35-test.0 → 0.0.36

package/dist/cli/bench.js

@@ -491,7 +491,7 @@ Options:
             const hex = crypto.randomBytes(4).toString('hex');
             const newAid = `bench-${hex}.${aidDomain}`;
             try {
-                await aidCreate(newAid, { aunPath });
+                await aidCreate(newAid, { aunPath, type: 'service' });
                 aids.push(newAid);
                 if (!formatJson)
                     console.log(ok(`创建 ${newAid}`));

package/dist/cli/cli-argv.js

@@ -1,4 +1,78 @@
 import { decodeEvolcoreInlineText } from '../core/permission/ec-command-parser.js';
+export const TIME_ARG_FORMATS = 'epoch 毫秒/秒、ISO 8601、YYYY-MM-DD HH:mm:ss [+08:00]、YYYY/MM/DD HH:mm:ss、相对时间 30s/5m/2h/1d、now';
+const RELATIVE_TIME_RE = /^(\d+)\s*(s|sec|secs|m|min|mins|h|hr|hrs|d|day|days)$/i;
+const DATE_TIME_RE = /^(\d{4})[-/](\d{1,2})[-/](\d{1,2})(?:(?:T|\s+)(\d{1,2}):(\d{2})(?::(\d{2})(?:[.,](\d{1,9}))?)?)?\s*(Z|UTC|GMT|[+-]\d{2}(?::?\d{2})?)?$/i;
+const MONTH_NAME_RE = /\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)[a-z]*\b/i;
+const TIME_UNIT_MS = { s: 1_000, m: 60_000, h: 3_600_000, d: 86_400_000 };
+export function parseTimeArg(value, now = Date.now()) {
+    if (typeof value !== 'string')
+        return undefined;
+    const raw = value.trim();
+    if (!raw)
+        return undefined;
+    if (/^\d+$/.test(raw)) {
+        const parsed = Number(raw);
+        if (!Number.isSafeInteger(parsed))
+            return undefined;
+        return raw.length === 10 ? parsed * 1000 : parsed;
+    }
+    if (raw.toLowerCase() === 'now')
+        return now;
+    const relative = RELATIVE_TIME_RE.exec(raw);
+    if (relative) {
+        const result = now - Number(relative[1]) * TIME_UNIT_MS[relative[2][0].toLowerCase()];
+        return Number.isSafeInteger(result) && result >= 0 ? result : undefined;
+    }
+    const match = DATE_TIME_RE.exec(raw);
+    if (match)
+        return parseTimeDate(match);
+    if (MONTH_NAME_RE.test(raw)) {
+        const parsed = Date.parse(raw);
+        return Number.isFinite(parsed) && parsed >= 0 ? parsed : undefined;
+    }
+    return undefined;
+}
+function parseTimeDate(match) {
+    const [, y, mo, d, h, mi, s, frac, zone] = match;
+    const year = Number(y), month = Number(mo), day = Number(d);
+    const hour = h === undefined ? 0 : Number(h);
+    const minute = mi === undefined ? 0 : Number(mi);
+    const second = s === undefined ? 0 : Number(s);
+    const ms = frac === undefined ? 0 : Number(frac.slice(0, 3).padEnd(3, '0'));
+    if (month < 1 || month > 12 || day < 1 || day > 31 || hour > 23 || minute > 59 || second > 59)
+        return undefined;
+    let result;
+    if (zone === undefined) {
+        const local = new Date(year, month - 1, day, hour, minute, second, ms);
+        if (local.getFullYear() !== year || local.getMonth() !== month - 1 || local.getDate() !== day)
+            return undefined;
+        result = local.getTime();
+    }
+    else {
+        const utc = Date.UTC(year, month - 1, day, hour, minute, second, ms);
+        const check = new Date(utc);
+        if (check.getUTCFullYear() !== year || check.getUTCMonth() !== month - 1 || check.getUTCDate() !== day)
+            return undefined;
+        const offset = parseTimeZoneOffset(zone);
+        if (offset === undefined)
+            return undefined;
+        result = utc - offset * 60_000;
+    }
+    return Number.isFinite(result) && result >= 0 ? result : undefined;
+}
+function parseTimeZoneOffset(zone) {
+    if (/^(z|utc|gmt)$/i.test(zone))
+        return 0;
+    const match = /^([+-])(\d{2}):?(\d{2})?$/.exec(zone);
+    if (!match)
+        return undefined;
+    const hours = Number(match[2]);
+    const minutes = match[3] === undefined ? 0 : Number(match[3]);
+    if (hours > 14 || minutes > 59)
+        return undefined;
+    const total = hours * 60 + minutes;
+    return match[1] === '-' ? -total : total;
+}
 export function normalizeCliArgv(argv) {
     if (argv[0] === 'ec' && argv[1])
         return argv.slice(1);

package/dist/cli/daemon-commands.js

@@ -4,7 +4,7 @@ import os from 'os';
 import { spawn, execFile } from 'child_process';
 import { promisify } from 'util';
 import readline from 'readline';
-import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot, agentMdPath, asModeOverridePath } from '../paths.js';
+import { resolveRoot, resolvePaths, ensureDataDirs, getPackageRoot, agentMdPath, asModeOverridePath, daemonControlDir } from '../paths.js';
 import { loadDefaults, loadAllAgents, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
 import { resolveEffective } from '../config/config-manager.js';
 import { resolveAnthropicConfig } from '../agents/baseagent.js';
@@ -14,9 +14,9 @@ import { isHelpFlag } from './help.js';
 import { cmdInit, needsControlAidInit, initTail } from './init.js';
 import * as platform from '../utils/cross-platform.js';
 import { EventBus } from '../core/event-bus.js';
-import { tryUpgradeGlobalPkg, resolveGlobalPkg } from '../utils/npm-ops.js';
+import { resolveGlobalPkg } from '../utils/npm-ops.js';
 import { ensureFreshPackageVersionInfo } from '../utils/package-version-info.js';
-import { ecwebVersionRequirementError, resolveEcwebLaunchCommand, fetchRemotePairingCode } from '../utils/ecweb-utils.js';
+import { ecwebVersionRequirementError, resolveEcwebLaunchCommand, resolveEcwebExternalUrl, fetchRemotePairingCode, } from '../utils/ecweb-utils.js';
 import { isHostChinese } from '../utils/locale.js';
 import { scanInstances, cleanupInstances, findOrphanProcesses } from '../utils/instance-registry.js';
 import { filterLogFiles, deriveLogTypes, computePreChecked, validateLogTypes, shortLogName as shortLogNameLocal, isWatchLogFile } from './watch-logs.js';
@@ -25,7 +25,8 @@ import { isNonAgentSessionChannel } from '../core/system-channels.js';
 import { printCodeStats } from './code-stats.js';
 import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
 import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
-import { MAIN_CLI_BIN, RUNTIME_HOME_ENV, TARGET_PACKAGE_ROOT_ENV, WEB_CLI_BIN, WEB_PACKAGE_LATEST, WEB_PACKAGE_NAME, } from '../product.js';
+import { MAIN_CLI_BIN, RESTART_REQUEST_ID_ENV, RUNTIME_HOME_ENV, TARGET_PACKAGE_ROOT_ENV, WEB_CLI_BIN, WEB_PACKAGE_NAME, } from '../product.js';
+import { readRestartRequest, updateRestartRequest } from '../utils/restart-safety.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
 import { inspectDataMigrationRequirement } from '../core/data-migration.js';
 import { isInitCancelledError, printInitCancelHint } from './init-cancel.js';
@@ -33,6 +34,8 @@ import { computeBuildId } from '../utils/evolcore-version.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';
+import { isTopicThreadId } from '../core/thread/topic-id.js';
+import { formatClaudeSandboxDependencies, formatCodexSandboxAvailability, inspectClaudeSandboxDependencies, inspectCodexSandboxAvailability, probeClaudeSandboxDependencies, probeCodexSandboxAvailability, } from '../core/permission/sandbox-runtime.js';
 const execFileAsync = promisify(execFile);
 export async function confirmCodexHookRebind(state, packageRoot) {
     console.log('⚠️ Codex 受管 Hook 绑定的另一套 EvolCore/Node 路径仍存在，需确认是否切换：');
@@ -132,8 +135,8 @@ function printNoSelfAgentHints(options) {
     const { daemonConfig, ecwebStarted, skipped } = options;
     console.log('\nℹ 未配置任何 self-agent，Control Plane 已启动。');
     console.log('  命令行：ec agent new <aid>.example.com');
-    if (daemonConfig.aid && (daemonConfig.owners?.length ?? 0) > 0) {
-        console.log('  Evol App：可通过进程级菜单创建 agent');
+    if (daemonConfig.aid) {
+        console.log('  使用 ec aid bind <ownerAid> 绑定协议 Owner 后，可通过进程级菜单创建 agent');
     }
     if (ecwebStarted) {
         console.log('  ECWeb：可通过控制台创建 agent');
@@ -296,7 +299,9 @@ async function requireFreshSourceBuild() {
     return await runSourceBuild();
 }
 async function launchPackageLifecycle(source, log, options = {}) {
-    if (!options.prepared)
+    const correlated = options.requestId ?? process.env[RESTART_REQUEST_ID_ENV];
+    const upgradeJobId = correlated ? readRestartRequest(path.join(daemonControlDir(), 'restart-pending.json'), correlated)?.upgradeJobId : undefined;
+    if (!options.prepared && !upgradeJobId)
         await ensureFreshPackageVersionInfo(undefined, { source, log });
     const root = resolvePaths().root;
     const launch = platform.resolveMonitorLaunch(getPackageRoot(), path.join(root, 'data', 'monitor-stage'));
@@ -307,8 +312,15 @@ async function launchPackageLifecycle(source, log, options = {}) {
             platform.cleanupMonitorStage(launch.stageDir);
         return { ok: false, reason: 'RESTART_ENTRY_MISSING' };
     }
+    const requestId = options.requestId ?? process.env[RESTART_REQUEST_ID_ENV];
     const args = [...launch.args, 'restart-monitor', ...(options.clear ? ['--clear'] : [])];
-    const env = { ...options.env, [RUNTIME_HOME_ENV]: root, ...launch.env, [AGENT_DELEGATION_TOKEN_ENV]: '' };
+    const env = {
+        ...options.env,
+        [RUNTIME_HOME_ENV]: root,
+        ...launch.env,
+        [AGENT_DELEGATION_TOKEN_ENV]: '',
+        ...(requestId ? { [RESTART_REQUEST_ID_ENV]: requestId } : {}),
+    };
     if (options.foreground) {
         return new Promise(resolve => {
             const child = spawn(process.execPath, [...args, '--foreground'], {
@@ -325,9 +337,23 @@ async function launchPackageLifecycle(source, log, options = {}) {
             });
         });
     }
-    const result = await platform.launchMonitorAndConfirm(args, env, pid => scanInstances().restartMonitors.some(item => item.alive && item.record.pid === pid), pid => scanInstances().restartMonitors.some(item => item.alive && item.record.pid !== pid));
-    if (!result.ok && launch.stageDir)
+    const result = await platform.launchMonitorAndConfirm(args, env, pid => requestId
+        ? readRestartRequest(path.join(root, 'data', 'daemon', 'control', 'restart-pending.json'), requestId)?.status === 'accepted'
+            || readRestartRequest(path.join(root, 'data', 'daemon', 'control', 'restart-pending.json'), requestId)?.status === 'ready'
+        : scanInstances().restartMonitors.some(item => item.alive && item.record.pid === pid), pid => scanInstances().restartMonitors.some(item => item.alive
+        && item.record.pid !== pid
+        && (!requestId || (item.record.requestId === requestId && item.record.phase === 'accepted'))), {
+        requestId,
+        logFilePath: requestId ? path.join(root, 'logs', `restart-launch-${requestId}.log`) : undefined,
+        onSpawn: pid => { if (requestId)
+            updateRestartRequest(path.join(root, 'data', 'daemon', 'control', 'restart-pending.json'), requestId, { launcherPid: pid }); },
+        isPendingInRegistry: () => !!requestId && scanInstances().restartMonitors.some(item => item.alive && item.record.requestId === requestId),
+    });
+    if (!result.ok && !result.pending && launch.stageDir)
         platform.cleanupMonitorStage(launch.stageDir);
+    if (result.pending) {
+        return { ok: false, reason: result.reason, pending: true, pid: result.pid };
+    }
     if (!result.ok) {
         for (const line of (result.stderrTail ?? '').split(/\r?\n/).filter(Boolean).slice(-8)) {
             console.error(`  | ${line}`);
@@ -351,8 +377,8 @@ function requireCompletedDataMigration(root) {
  * 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, ecwebUpgradeFn, timeoutMs = 60_000) {
-    if (!upgradeFn || !ecwebUpgradeFn) {
+export async function runUpgradeChecks(upgradeFn, timeoutMs = 60_000) {
+    if (!upgradeFn) {
         await ensureFreshPackageVersionInfo(undefined, { source: 'start', log: console.log });
         return;
     }
@@ -379,10 +405,7 @@ export async function runUpgradeChecks(upgradeFn, ecwebUpgradeFn, timeoutMs = 60
                 clearTimeout(timer);
         }
     };
-    const [upgrade, ecwebUpgrade] = await Promise.all([
-        runWithTimeout('EvolCore', upgradeFn),
-        runWithTimeout(WEB_PACKAGE_NAME, ecwebUpgradeFn),
-    ]);
+    const upgrade = await runWithTimeout('EvolCore', upgradeFn);
     switch (upgrade.status) {
         case 'upgraded':
             console.log(`✅ Upgraded: ${upgrade.from} → ${upgrade.to}`);
@@ -399,16 +422,6 @@ export async function runUpgradeChecks(upgradeFn, ecwebUpgradeFn, timeoutMs = 60
             console.log(`⚠ Upgrade failed${upgrade.from && upgrade.to ? ` (${upgrade.from} → ${upgrade.to})` : ''}, continuing with current version${upgrade.error ? `: ${upgrade.error}` : ''}`);
             break;
     }
-    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 ====================
 /**
@@ -608,8 +621,9 @@ export async function cmdStart(opts = {}) {
         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.
-    const versionInfo = await ensureFreshPackageVersionInfo(undefined, { source: 'start', log: console.log });
-    if (opts.upgradeChecks)
+    const autoUpgrade = loadDaemonConfig().upgrade?.autoOnStart !== false;
+    const versionInfo = autoUpgrade ? await ensureFreshPackageVersionInfo(undefined, { source: 'start', log: console.log }) : [];
+    if (autoUpgrade && opts.upgradeChecks)
         await opts.upgradeChecks();
     // 旧配置自动迁移（daemon.json → 新结构）
     const { autoMigrateIfNeeded } = await import('../config-store.js');
@@ -644,7 +658,7 @@ export async function cmdStart(opts = {}) {
     // process is launched.
     if (!await ensureCodexHookBeforeLifecycle())
         return;
-    // 控制 AID 门禁：缺 aid 且交互式 → 只补全控制 AID + owners（不重走 baseagent 向导）。
+    // 控制 AID 门禁：缺 aid 且交互式 → 只补全控制 AID + owner（不重走 baseagent 向导）。
     // 非 TTY（restart-monitor/systemd/管道）不补全（无法交互），只提示后继续启动，daemon 侧 warn 兜底。
     const daemonCfgStart = loadDaemonConfig();
     if (needsControlAidInit(daemonCfgStart.aid, !!process.stdin.isTTY)) {
@@ -747,8 +761,11 @@ export async function cmdStart(opts = {}) {
             prepared: true, foreground: opts.foreground, env: buildDaemonEnv(p, opts),
         });
         if (!launched.ok) {
-            clearAsModeOverride(overrideFile);
-            console.error(`❌ 启动事务未能建立：${launched.reason}`);
+            if (!launched.pending)
+                clearAsModeOverride(overrideFile);
+            console.error(launched.pending
+                ? `⚠ 启动状态暂不可确认（PID ${launched.pid ?? 'unknown'}）：restart-monitor 仍在运行，可能继续执行。`
+                : `❌ 启动事务未能建立：${launched.reason}`);
             process.exitCode = 1;
         }
         else if (!opts.foreground) {
@@ -1097,9 +1114,20 @@ export async function cmdRestart(opts = {}) {
     // the monitor retains shutdown, orphan checks, build and rollback ownership.
     // restart-monitor performs the read-only preflight before stopping the
     // current daemon, then applies the migration during the stopped window.
-    const launched = await launchPackageLifecycle('restart', console.log, { clear: opts.clear });
+    const requestId = process.env[RESTART_REQUEST_ID_ENV];
+    if (requestId) {
+        const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
+        if (!readRestartRequest(pendingFile, requestId)) {
+            console.error('❌ 重启请求已被替换或过期，服务未停止；请重新发起重启。');
+            process.exitCode = 1;
+            return;
+        }
+    }
+    const launched = await launchPackageLifecycle('restart', console.log, { clear: opts.clear, requestId });
     if (!launched.ok) {
-        console.error(`❌ 重启中止：restart-monitor 未能启动（${launched.reason}）；当前服务未主动停止`);
+        console.error(launched.pending
+            ? `⚠ 重启状态暂不可确认（PID ${launched.pid ?? 'unknown'}）：restart-monitor 仍在运行，可能继续执行；请勿立即重复发起。`
+            : `❌ 重启中止：restart-monitor 未能启动（${launched.reason}）；当前服务未主动停止`);
         process.exitCode = 1;
         return;
     }
@@ -1385,7 +1413,7 @@ export async function cmdStatus() {
                     console.log('📋 Recent Active Sessions:');
                     for (const s of recentSessions) {
                         const projectName = path.basename(s.projectPath);
-                        const sessionType = s.threadId ? '话题会话' : '主会话';
+                        const sessionType = isTopicThreadId(s.threadId) ? '话题会话' : '主会话';
                         const chatType = s.chatType === 'group' ? '群聊' : '单聊';
                         const sessionName = displaySessionTitle(s.name);
                         const timeAgo = formatTimeAgo(Date.now() - s.updatedAt);
@@ -2876,6 +2904,7 @@ async function waitForExistingEcweb(p, timeoutMs = 3_000) {
  *      某些 CLI 运行在隔离 PID namespace 中，看不到宿主 ECWeb PID 是正常情况。
  */
 async function printEcwebStatus(p) {
+    let externalUrl = null;
     try {
         const cfg = loadDaemonConfig();
         if (ecwebService(cfg.services)?.enabled === false) {
@@ -2883,6 +2912,7 @@ async function printEcwebStatus(p) {
             console.log('🔭 ECWeb: 已禁用 (daemon.json → services[name=ecweb].enabled: false)');
             return;
         }
+        externalUrl = resolveEcwebExternalUrl(cfg);
     }
     catch {
         // Agent tool sandboxes may mask daemon.json. Instance and HTTP probes below
@@ -2921,6 +2951,10 @@ async function printEcwebStatus(p) {
         const pidVisible = aliveEntries.some(entry => entry.filePath === readyEntry.filePath);
         const pidText = pidVisible ? `PID: ${readyEntry.record.pid}` : `PID: ${readyEntry.record.pid}（当前 namespace 不可见）`;
         console.log(`🔭 ECWeb: 运行中 (${pidText})  http://localhost:${readyEntry.record.port}`);
+        if (externalUrl) {
+            console.log(`   外网访问: ${externalUrl}`);
+            console.log(`   命令行输入 ${MAIN_CLI_BIN} watch web/${WEB_CLI_BIN} 获取配对码`);
+        }
         return;
     }
     const occupiedPids = new Set();
@@ -3016,7 +3050,7 @@ async function waitForPortRelease(port, timeoutMs) {
     return platform.findProcessByPort(port).length === 0;
 }
 /**
- * Start the separately installed `ec-web` process for a configured runtime.
+ * Start the `ec-web` dependency bundled with EvolCore for a configured runtime.
  * Kept public for restart-monitor, which launches the daemon directly and
  * therefore cannot rely on cmdStart's post-ready ECWeb startup path.
  */
@@ -3025,6 +3059,7 @@ export async function startEcwebIfEnabled(p, options = {}) {
     const service = ecwebService(cfg.services);
     if (!service?.enabled)
         return false;
+    const externalUrl = resolveEcwebExternalUrl(cfg);
     // The daemon is the lifecycle owner.  CLI callers normally only need to
     // ensure ECWeb is available, so adopt a healthy process instead of killing
     // it.  `ec watch web` passes forceRestart explicitly for an intentional
@@ -3033,12 +3068,14 @@ export async function startEcwebIfEnabled(p, options = {}) {
         const existing = await waitForExistingEcweb(p);
         if (existing) {
             console.log(`✓ ECWeb 已在运行 (PID: ${existing.pid})  http://localhost:${existing.port}`);
+            if (externalUrl)
+                console.log(`   外网访问: ${externalUrl}`);
             return true;
         }
     }
     const installedPkg = resolveGlobalPkg(WEB_PACKAGE_NAME);
     if (!installedPkg) {
-        console.log(`⚠ EC Web 未安装，跳过启动（运行 npm i -g ${WEB_PACKAGE_NAME}@latest 后可用）`);
+        console.log('⚠ 当前 EvolCore 安装未包含 EC Web，跳过启动；请升级 EvolCore 后重试。');
         return false;
     }
     const versionError = ecwebVersionRequirementError(installedPkg.version);
@@ -3064,7 +3101,7 @@ export async function startEcwebIfEnabled(p, options = {}) {
     const args = ['--home', p.root, '--port', String(port)];
     const launch = resolveEcwebLaunchCommand(args, { installedPkg });
     if (!launch) {
-        console.log(`⚠ EC Web 启动入口不存在，请重新安装: npm i -g ${WEB_PACKAGE_NAME}@latest`);
+        console.log('⚠ 当前 EvolCore 安装中的 EC Web 启动入口不存在，请重新安装 EvolCore。');
         return false;
     }
     // 防御性检查：确保 command 和 args 有效
@@ -3113,6 +3150,8 @@ export async function startEcwebIfEnabled(p, options = {}) {
             }
             const actionLabel = wasRunning ? '已重启' : '启动成功';
             console.log(`✓ ECWeb ${actionLabel} (PID: ${pid})  http://localhost:${port}`);
+            if (externalUrl)
+                console.log(`   外网访问: ${externalUrl}`);
             if (pair) {
                 const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
                 console.log(`   配对码: ${pair.code}  (约 ${mins} 分钟内有效，仅可配对一次，已配对过的浏览器无需重新配对)`);
@@ -3159,43 +3198,10 @@ async function printEcwebAccess(port) {
 }
 async function cmdWatchWeb() {
     const p = resolvePaths();
-    // 1. 检查安装
-    if (!platform.commandExists(WEB_CLI_BIN)) {
-        process.stdout.write(`📦 ${WEB_PACKAGE_NAME} 未安装。`);
-        if (process.stdin.isTTY) {
-            const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-            const ans = await new Promise(res => rl.question(' 立即安装？[Y/n] ', res));
-            rl.close();
-            if (ans.trim().toLowerCase() === 'n') {
-                process.exit(0);
-            }
-        }
-        else {
-            process.stdout.write(' 当前命令会自动安装。\n');
-        }
-        process.stdout.write('\n');
-        const { npmInstallGlobal } = await import('../utils/npm-ops.js');
-        try {
-            await npmInstallGlobal(WEB_PACKAGE_LATEST);
-            process.stdout.write(`✅ ${WEB_PACKAGE_NAME} 安装完成\n`);
-        }
-        catch (e) {
-            process.stderr.write(`❌ 安装失败: ${e?.stderr || e?.message || e}\n`);
-            process.exit(1);
-        }
-    }
-    else {
-        // 已安装：检查并自动升级独立的 EC Web 全局包。
-        const upgrade = await tryUpgradeGlobalPkg(() => resolveGlobalPkg(WEB_PACKAGE_NAME), WEB_PACKAGE_NAME);
-        switch (upgrade.status) {
-            case 'upgraded':
-                process.stdout.write(`✅ ${WEB_PACKAGE_NAME} 已升级: ${upgrade.from} → ${upgrade.to}\n`);
-                break;
-            case 'failed':
-                process.stdout.write(`⚠ ${WEB_PACKAGE_NAME} 升级失败 (${upgrade.from} → ${upgrade.to})，继续使用当前版本\n`);
-                break;
-            // no-update / skipped: 静默
-        }
+    if (!resolveGlobalPkg(WEB_PACKAGE_NAME)) {
+        process.stderr.write(`⚠ ${WEB_PACKAGE_NAME} 未随当前 EvolCore 包安装；请升级 EvolCore 后重试。\n`);
+        process.exitCode = 1;
+        return;
     }
     // 2. 启动（后台）并同步配置。默认行为是替换旧实例，确保新配置/新版静态资源生效。
     const cfg = loadDaemonConfig();
@@ -3262,6 +3268,19 @@ export async function cmdDiagnose(args = []) {
     try {
         // 2. 加载 self-agents
         const { agents, skipped } = loadAllAgents();
+        const checkClaudeSandbox = args.includes('--claude-sandbox')
+            || agents.some(agent => resolveEffective({ self: agent.aid }).active_baseagent === 'claude');
+        if (checkClaudeSandbox) {
+            const dependencies = inspectClaudeSandboxDependencies();
+            const missing = dependencies.status === 'missing';
+            (missing ? console.error : console.log)(`[diagnose] ${missing ? '❌' : '✓'} ${formatClaudeSandboxDependencies(dependencies)}`);
+            hasError ||= missing;
+            if (dependencies.status === 'ready') {
+                const probe = probeClaudeSandboxDependencies(dependencies);
+                (probe.ok ? console.log : console.error)(`[diagnose] ${probe.ok ? '✓' : '❌'} ${probe.detail}`);
+                hasError ||= !probe.ok;
+            }
+        }
         if (agents.length === 0) {
             console.error(`[diagnose] ❌ 未配置 self-agent。请运行 \`ec aid new <name>\``);
             hasError = true;
@@ -3286,6 +3305,18 @@ export async function cmdDiagnose(args = []) {
                 return false;
             }
         });
+        const checkCodexSandbox = args.includes('--codex-sandbox') || codexAgents.length > 0;
+        if (checkCodexSandbox) {
+            const availability = inspectCodexSandboxAvailability();
+            const missing = availability.status === 'missing';
+            (missing ? console.error : console.log)(`[diagnose] ${missing ? '❌' : '✓'} ${formatCodexSandboxAvailability(availability)}`);
+            hasError ||= missing;
+            if (availability.status === 'ready') {
+                const probe = probeCodexSandboxAvailability(availability);
+                (probe.ok ? console.log : console.error)(`[diagnose] ${probe.ok ? '✓' : '❌'} ${probe.detail}`);
+                hasError ||= !probe.ok;
+            }
+        }
         for (const agent of codexAgents) {
             try {
                 const effective = resolveEffective({ self: agent.aid });

package/dist/cli/diag.js

@@ -5,7 +5,7 @@ import { parseDiagArgs } from '../core/command/diag-service.js';
 import { wantsHelp } from './help.js';
 export async function cmdDiag(args) {
     if (wantsHelp(args)) {
-        console.log('用法：ec diag <问题描述> [--owner <daemonOwner-aid>] [--format json]\n      ec diag stop [--format json]\n未指定 --owner 时联系本机 daemon.json.owners[0]；有效诊断期间再次执行会追加到原 case。');
+        console.log('用法：ec diag <问题描述> [--owner <daemonOwner-aid>] [--format json]\n      ec diag stop [--format json]\n未指定 --owner 时联系本机 Control AID 的协议 Owner；有效诊断期间再次执行会追加到原 case。');
         return;
     }
     const argv = ['diag', ...args];

package/dist/cli/fs-command.js

@@ -6,7 +6,7 @@ import { agentmdGet, getAidStore, isValidAid, loadClient, SLOT } from '../aun/ai
 import { ipcQuery } from '../ipc.js';
 import { resolvePaths } from '../paths.js';
 import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
-import { downloadGroupFsBytes } from '../aun/group/index.js';
+import { DEFAULT_FS_CAT_BYTES, MAX_FS_CAT_BYTES, FsReadBudgetError, downloadGroupFsBytes, readPersonalFsBytesWithinBudget, } from '../aun/group/fs-download.js';
 class FsCliError extends Error {
     code;
     suggestion;
@@ -25,7 +25,7 @@ Commands:
   ls <AID>:<path>                 列目录
   stat [-L] <AID>:<path>          查看节点元数据（默认不跟随软链；-L 跟随）
   lstat <AID>:<path>              查看节点本身（不跟随末级软链）
-  cat <AID>:<path>                输出文本文件内容；二进制/大文件返回头部摘要
+  cat <AID>:<path>                预算内输出文本或二进制头部摘要；超出预算报错
   cp <local> <AID>:<path>         上传本地文件
   cp <AID>:<path> <local>         下载远程文件
   cp <AID>:<path> <AID>:<path>    远程复制（同后端）
@@ -72,7 +72,7 @@ Options:
   --size <expr>                   find 大小过滤，如 +1M
   --mtime <expr>                  find 修改时间过滤
   --head-bytes <n>                cat 二进制头部字节数，默认 256
-  --max-bytes <n>                 cat 最大直接输出字节数，默认 1048576
+  --max-bytes <n>                 cat 读取预算，默认及最高 131072；超限终止读取
   --aun-path <path>               指定 AUN keystore 根
   --app <name>                    指定 AUN app slot
 
@@ -284,9 +284,9 @@ async function runManagedFs(args, formatJson) {
 }
 function parseCommonOptions(args) {
     const maxCatBytesRaw = getArgValue(args, '--max-bytes');
-    const maxCatBytes = maxCatBytesRaw === undefined ? 1024 * 1024 : Number(maxCatBytesRaw);
-    if (!Number.isFinite(maxCatBytes) || maxCatBytes <= 0) {
-        throw new FsCliError('INVALID_ARGUMENT', `--max-bytes 必须是正数: ${maxCatBytesRaw}`);
+    const maxCatBytes = maxCatBytesRaw === undefined ? DEFAULT_FS_CAT_BYTES : Number(maxCatBytesRaw);
+    if (!Number.isSafeInteger(maxCatBytes) || maxCatBytes <= 0 || maxCatBytes > MAX_FS_CAT_BYTES) {
+        throw new FsCliError('INVALID_ARGUMENT', `--max-bytes 必须是 1 到 ${MAX_FS_CAT_BYTES} 的整数`);
     }
     const headBytesRaw = getArgValue(args, '--head-bytes');
     const headBytes = headBytesRaw === undefined ? 256 : Number(headBytesRaw);
@@ -404,31 +404,27 @@ async function fsCat(args, opts) {
         const route = await resolveRoute(target.aid, store);
         let statInfo;
         let bytes;
-        let binaryHeadOnly = false;
         if (route.backend === 'group') {
             statInfo = await client.group.fs.stat(remoteRef(target));
             const size = numberFrom(statInfo, ['size', 'size_bytes', 'bytes']);
-            const downloaded = await downloadGroupFsBytes(client, remoteRef(target));
+            if (size !== undefined && size > opts.maxCatBytes)
+                throw new FsReadBudgetError(opts.maxCatBytes);
+            const downloaded = await downloadGroupFsBytes(client, remoteRef(target), { maxBytes: opts.maxCatBytes });
             bytes = downloaded.bytes;
             statInfo = { ...statInfo, ...downloaded.ticket };
             statInfo = { ...statInfo, size: bytes.byteLength };
-            if (size !== undefined && size > opts.maxCatBytes) {
-                binaryHeadOnly = true;
-            }
         }
         else {
             statInfo = await client.storage.stat(target.path, { owner: target.aid, token: opts.token });
             const size = numberFrom(statInfo, ['size', 'sizeBytes', 'size_bytes']);
-            if (size !== undefined && size > opts.maxCatBytes) {
-                bytes = await client.storage.readBytes(target.path, { owner: target.aid, token: opts.token, offset: 0, limit: opts.headBytes });
-                binaryHeadOnly = true;
-            }
-            else {
-                bytes = await client.storage.readBytes(target.path, { owner: target.aid, token: opts.token });
-            }
+            if (size !== undefined && size > opts.maxCatBytes)
+                throw new FsReadBudgetError(opts.maxCatBytes);
+            bytes = await readPersonalFsBytesWithinBudget(client, target.path, opts.maxCatBytes, {
+                owner: target.aid, token: opts.token,
+            });
         }
         const binary = looksBinary(bytes, contentTypeFrom(statInfo));
-        if (binary || binaryHeadOnly) {
+        if (binary) {
             const size = numberFrom(statInfo, ['size', 'sizeBytes', 'size_bytes']) ?? bytes.byteLength;
             const payload = {
                 command: 'cat',
@@ -1532,6 +1528,9 @@ function outputError(error, formatJson) {
 function mapBackendError(error) {
     if (error instanceof FsCliError)
         return error;
+    if (error instanceof FsReadBudgetError) {
+        return new FsCliError(error.code, error.message, '请使用 ec fs cp 下载大文件。');
+    }
     const code = String(error?.code ?? error?.name ?? 'BACKEND_ERROR');
     const message = String(error?.message || error);
     const upper = code.toUpperCase();