evolcore 0.0.27 → 0.0.29-test.0

package/dist/cli/restart-monitor.js

@@ -3,22 +3,72 @@ import path from 'path';
 import { spawn, execFile } from 'child_process';
 import { promisify } from 'util';
 import { resolvePaths, getPackageRoot, daemonControlDir } from '../paths.js';
-import { loadDaemonConfig } from '../config-store.js';
+import { isRestartRecoveryEnabled, loadDaemonConfig } from '../config-store.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 { applyCachedPackageUpgrades, recordPackageUpgrade } from '../utils/package-version-info.js';
 import { isValidAid } from '../aun/aid/index.js';
 import { msgSend } from '../aun/msg/index.js';
 import { scanInstances, cleanupInstances, writeRestartMonitor, removeRestartMonitor, isRestartMonitorWinner, findOrphanProcesses, killOrphans } from '../utils/instance-registry.js';
-import { WEB_PACKAGE_NAME } from '../product.js';
+import { MAIN_PACKAGE_NAME, WEB_PACKAGE_NAME } from '../product.js';
 import { shouldSuppressRealRestart } from '../utils/restart-safety.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
-import { inspectDataMigrationRequirement } from '../core/data-migration.js';
-import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown } from './daemon-commands.js';
+import { applyDataMigration, finalizeDataMigration, planDataMigration, verifyDataMigration, } from '../core/data-migration.js';
+import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-commands.js';
 import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
 const execFileAsync = promisify(execFile);
+/** Read-only check performed before stopping the current daemon. */
+function preflightDataMigration(root, log) {
+    try {
+        const plan = planDataMigration(root);
+        const operations = plan.operations.filter(operation => operation.status !== 'acknowledged').length;
+        log(`Data migration preflight passed (${operations} pending operation(s))`);
+        for (const warning of plan.warnings)
+            log(`Migration preflight warning: ${warning}`);
+        return { ok: true, operations };
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        log(`Data migration preflight failed: ${reason}`);
+        return { ok: false, reason };
+    }
+}
+/** Execute the migration transaction while the daemon is stopped. */
+function applyPendingDataMigration(root, log) {
+    try {
+        const plan = planDataMigration(root);
+        const pending = plan.operations.filter(operation => operation.status !== 'acknowledged');
+        if (pending.length === 0) {
+            log('Data migration not required after upgrade');
+            return { ok: true, operations: 0 };
+        }
+        log(`Applying data migration (${pending.length} operation(s))`);
+        const applied = applyDataMigration(plan);
+        const verified = verifyDataMigration(applied, { strictTargetContent: true });
+        const finalization = finalizeDataMigration(root, verified);
+        if (verified.state !== 'completed') {
+            const failed = verified.operations.filter(operation => operation.status === 'error' || operation.issues?.length);
+            throw new Error(`migration verification failed (${failed.length} operation(s)); completed sources archived: ${finalization.archivePath}`);
+        }
+        log(`Data migration completed and legacy sources archived: ${finalization.archivePath}`);
+        return { ok: true, operations: pending.length };
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        log(`Data migration failed: ${reason}`);
+        return { ok: false, reason };
+    }
+}
 // Bound network notifications so they cannot hold up recovery after shutdown.
 const OWNER_NOTIFICATION_TIMEOUT_MS = 5000;
+let foregroundDaemonExit;
+async function finishSuccessfulRestart() {
+    if (foregroundDaemonExit) {
+        removeRestartMonitor();
+        process.exit(await foregroundDaemonExit);
+    }
+    process.exit(0);
+}
 /**
  * The package this monitor operates on, which is not always the one it runs
  * from.
@@ -118,9 +168,9 @@ export async function cmdRestartMonitor() {
     const pendingFile = path.join(daemonControlDir(), 'restart-pending.json');
     // 升级成功时记下版本变化，回执里要告诉 agent 实际跑的是哪个版本。
     let upgradeVersions;
-    const migrationRequirement = inspectDataMigrationRequirement(p.root);
-    if (migrationRequirement.required) {
-        const message = `Pending user-data migration (${migrationRequirement.operationCount} operations); leaving the current service running. Run ec data migrate --dry-run, then ec data migrate --apply.`;
+    const migrationPreflight = preflightDataMigration(p.root, log);
+    if (!migrationPreflight.ok) {
+        const message = `重启前用户数据迁移预检失败：${migrationPreflight.reason ?? 'unknown error'}`;
         log(message);
         console.error(`❌ ${message}`);
         cleanupPendingFile(pendingFile, log);
@@ -144,13 +194,14 @@ export async function cmdRestartMonitor() {
     // still alive. Refuse to create a second daemon when an unregistered process
     // from this package is found; a duplicate would connect AUN and kick the
     // existing session before failing on IPC/port ownership.
-    const runtimeOrphans = orphanSnapshot.filter(o => {
+    const belongsToRuntime = (o) => {
         if (o.confirmedTestDaemon)
             return false;
         const homeMatches = o.evolcoreHome && normalizePath(o.evolcoreHome) === normalizePath(p.root);
         const packageMatches = !o.evolcoreHome && normalizePath(o.cmdline).includes(normalizePath(targetPackageRoot()));
         return Boolean(homeMatches || packageMatches);
-    });
+    };
+    const runtimeOrphans = orphanSnapshot.filter(belongsToRuntime);
     if (runtimeOrphans.length > 0) {
         const pids = runtimeOrphans.map(o => o.pid).join(', ');
         log(`Stopping unregistered EvolCore process(es): ${pids}`);
@@ -238,15 +289,32 @@ export async function cmdRestartMonitor() {
         // for instance-file cleanup.
         cleanupInstances();
     }
-    // 版本检查与自动升级
-    log('Checking for updates...');
+    // Preserve CLI restart's final ownership guards and optional orphan cleanup
+    // here, after election/shutdown, so no launcher stops a daemon before a
+    // watchdog has successfully loaded.
+    const remaining = findOrphanProcesses();
+    if (scanInstances().mains.some(item => item.alive) || remaining.some(belongsToRuntime)) {
+        log('Restart aborted: a runtime process appeared or survived shutdown');
+        cleanupPendingFile(pendingFile, log);
+        process.exit(1);
+    }
+    const otherHome = remaining.filter(o => !o.confirmedTestDaemon && !belongsToRuntime(o));
+    if (process.argv.includes('--clear') && otherHome.length) {
+        log(`Cleaned cross-HOME orphans: ${killOrphans(otherHome).join(', ')}`);
+    }
+    else if (otherHome.length) {
+        log(`Other HOME orphan processes left running: ${otherHome.map(o => o.pid).join(', ')}`);
+    }
+    const stoppedCodex = stopCodexAppServerOrphans();
+    if (stoppedCodex)
+        log(`Cleaned ${stoppedCodex} EvolCore codex app-server orphan(s)`);
+    // Apply only the preflight cache. There is no registry VERSION query after
+    // shutdown (npm still downloads the exact cached package when needed).
+    log('Applying cached version information...');
     // 升级会原地替换整包，先留一个可回退的产物副本。备份放 EVOLCORE_HOME 而非包目录：
     // Linux/macOS 的全局目录常常不可写，而 HOME 一定可写。
     const upgradeBackup = await backupDistForUpgrade(p, log);
-    const [upgrade, ecwebUpgrade] = await Promise.all([
-        tryUpgrade(),
-        tryUpgradeGlobalPkg(() => resolveGlobalPkg(WEB_PACKAGE_NAME), WEB_PACKAGE_NAME),
-    ]);
+    const [upgrade, ecwebUpgrade] = await applyCachedPackageUpgrades(undefined, { log });
     let upgradeRolledBack;
     switch (upgrade.status) {
         case 'upgraded':
@@ -287,8 +355,7 @@ export async function cmdRestartMonitor() {
             await notifyDaemonOwners(p, `⚠️ evolcore 升级失败，使用当前版本继续\n${upgrade.error ?? ''}`.trim(), log);
             break;
     }
-    // EC Web 是独立全局包，已安装时单独检查升级；与 EvolCore registry
-    // 查询并行执行，npm 安装阶段由 npm-ops 的全局锁串行化。
+    // EC Web independently applies a valid cached result under the install lock.
     switch (ecwebUpgrade.status) {
         case 'upgraded':
             log(`✅ ${WEB_PACKAGE_NAME} upgraded: ${ecwebUpgrade.from} → ${ecwebUpgrade.to}`);
@@ -316,12 +383,26 @@ export async function cmdRestartMonitor() {
         log(`↩ ${buildOutcome.reason ?? '已回滚'}；继续以上一版本启动`);
         await notifyDaemonOwners(p, `⚠️ ${buildOutcome.reason ?? '已回滚'}，正在以上一版本启动服务`, log);
     }
+    const migration = applyPendingDataMigration(p.root, log);
+    if (!migration.ok) {
+        const message = `服务未重启：用户数据迁移失败（${migration.reason ?? 'unknown error'}）`;
+        markRestartOutcome(pendingFile, 'migration-failed', migration.reason, log);
+        cleanupPendingFile(pendingFile, log);
+        process.exit(1);
+    }
     // ECWeb is owned by the daemon. Starting it here used to race with the
     // daemon's own launcher and ECWeb's stale-instance cleanup, which could
     // leave ServiceProxy pointed at a dead PID.
     // 启动并检测 ready signal
     let started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
     if (started) {
+        if (upgrade.status === 'upgraded' || upgrade.status === 'failed') {
+            await recordPackageUpgrade(MAIN_PACKAGE_NAME, {
+                from: upgrade.from, to: upgrade.to, at: new Date().toISOString(),
+                status: upgradeRolledBack ? 'rolled-back' : upgrade.status === 'upgraded' ? 'succeeded' : 'failed',
+                error: upgradeRolledBack ?? upgrade.error,
+            }, log);
+        }
         if (upgradeRolledBack) {
             markRestartOutcome(pendingFile, 'rolled-back', upgradeRolledBack, log);
             log(`✓ Service restarted after upgrade rollback`);
@@ -341,15 +422,21 @@ export async function cmdRestartMonitor() {
         }
         archiveSelfHealLog(p, log);
         // 发起会话内的“重启成功”通知由新进程自行发送，此处只负责失败/自愈告警。
-        process.exit(0);
+        await finishSuccessfulRestart();
     }
     // 升级后的新版本起不来：回退到升级前的产物再试一次。
     if (upgradeVersions?.to && !upgradeRolledBack) {
+        await recordPackageUpgrade(MAIN_PACKAGE_NAME, {
+            ...upgradeVersions, at: new Date().toISOString(), status: 'failed', error: 'Upgraded daemon failed its ready check',
+        }, log);
         if (await restoreDistBackup(upgradeBackup, log)) {
             await notifyDaemonOwners(p, `⚠️ 升级到 ${upgradeVersions.to} 后启动失败，正在回滚到 ${upgradeVersions.from} 重试...`, log);
             started = await spawnAndWaitReady(p, log, READY_TIMEOUT);
             if (started) {
                 const reason = `升级到 ${upgradeVersions.to} 后启动失败，已回滚到 ${upgradeVersions.from}`;
+                await recordPackageUpgrade(MAIN_PACKAGE_NAME, {
+                    ...upgradeVersions, at: new Date().toISOString(), status: 'rolled-back', error: reason,
+                }, log);
                 log(`✓ ${reason}`);
                 markRestartOutcome(pendingFile, 'rolled-back', reason, log);
                 await notifyDaemonOwners(p, `⚠️ ${reason}。当前运行旧版本，请检查后重试。`, log);
@@ -390,6 +477,13 @@ export async function cmdRestartMonitor() {
         cleanupPendingFile(pendingFile, log);
         process.exit(1);
     }
+    if (!isRestartRecoveryEnabled()) {
+        const message = '服务启动失败，restartRecovery.enabled 已关闭，已跳过 Claude 自动修复。';
+        log(`⚠️ ${message}`);
+        await notifyDaemonOwners(p, `⚠️ ${message}`, log);
+        cleanupPendingFile(pendingFile, log);
+        process.exit(1);
+    }
     // 启动失败，进入 self-heal 循环
     log('❌ Service failed to start, entering self-heal loop');
     eventBus.publish({ type: 'self-heal:started', reason: 'Service failed to start after restart' });
@@ -858,9 +952,10 @@ async function spawnAndWaitReady(p, log, timeout) {
     const out = fs.openSync(stdoutLog, 'a');
     const err = fs.openSync(stdoutLog, 'a');
     const appMain = path.join(targetPackageRoot(), 'dist', 'index.js');
+    const foreground = process.argv.includes('--foreground');
     const child = spawn(process.execPath, ['--no-warnings=ExperimentalWarning', appMain], {
-        detached: true,
-        stdio: ['ignore', out, err],
+        detached: !foreground,
+        stdio: foreground ? 'inherit' : ['ignore', out, err],
         windowsHide: true,
         env: {
             ...process.env,
@@ -872,7 +967,16 @@ async function spawnAndWaitReady(p, log, timeout) {
         }
     });
     const childPid = child.pid;
-    child.unref();
+    if (foreground) {
+        foregroundDaemonExit = new Promise(resolve => {
+            child.once('error', () => resolve(1));
+            child.once('exit', code => resolve(code ?? 1));
+        });
+    }
+    else
+        child.unref();
+    fs.closeSync(out);
+    fs.closeSync(err);
     log(`Spawned new process PID: ${childPid}, waiting for ready signal...`);
     // 轮询等待 ready.signal 出现
     const start = Date.now();
@@ -927,7 +1031,7 @@ async function invokeClaude(claudePath, p, attempt, maxAttempts, timeout, log) {
 - 检查是否有旧进程仍在运行：\`ps aux | grep 'node.*dist/index.js' | grep -v grep\`，旧进程可能占用端口或锁文件
 - 可以运行 \`EVOLCORE_HOME=${p.root} node dist/cli/index.js diagnose\` 快速检查配置和数据库
 - 如果进程无任何输出就 exit(1)，说明是 process.exit(1) 被显式调用，搜索源码中所有 process.exit(1) 位置
-- 配置文件使用双 rename 原子写（foo.json → foo.json_ → foo.json__），崩溃时可从 foo.json_ 恢复
+ - 配置文件先写入 foo.json__，再保留旧版本到 foo.json_，最后原子切换为 foo.json；崩溃后会丢弃未完成的 foo.json__，仅在 foo.json 缺失时从 foo.json_ 恢复
 
 请执行以下步骤：
 1. 读取 ${stdoutLog} 和 ${p.logs}/daemon-*.log（最新文件）的最后 50 行

package/dist/cli/skill-command.js

@@ -0,0 +1,41 @@
+/**
+ * `ec skill` 命令。
+ *
+ * 这是一层薄转发：真正的实现是内置技能 ec-skill 自己的脚本
+ * （`kits/skills/ec-skill/scripts/cli.mjs`）。CLI 不复制逻辑，
+ * 模型侧直接跑同一份脚本，两边行为天然一致。
+ *
+ * 用子进程而非 import，理由：脚本是 ESM、位于包的 kits/ 下，
+ * 而 kits/ 随包发布但不参与 tsc 编译；用 spawn 最直接，
+ * 也保留了脚本「自定位、不依赖 cwd」的约束。
+ *
+ * 权限门禁同样在脚本层的 skill.mjs `assertPermission()`，本文件不复制一份。
+ * 两个入口（这里的 spawn 与模型侧直接 node脚本）环境变量一致，
+ * 脚本自己读 EVOLCORE_TASK_RUNTIME_CONTEXT 即可得到相同判据；
+ * 若在 CLI 层再判一遍，只是多一处会与脚本漂移的实现。
+ */
+import path from 'path';
+import { spawn } from 'child_process';
+import { getPackageRoot, agentDir } from '../paths.js';
+import { readTaskRuntimeContextFromEnv } from './task-context.js';
+export async function cmdSkill(args) {
+    const script = path.join(getPackageRoot(), 'kits', 'skills', 'ec-skill', 'scripts', 'cli.mjs');
+    // 脚本在包外运行，拿不到主程序的路径工具，这里把 Agent 目录显式传进去，
+    // 让它能定位 Agent 级 skills/ 与 .switches.json。
+    // selfAid 优先取任务运行时上下文（托管会话的权威来源），其次环境变量。
+    const env = { ...process.env };
+    const selfAid = readTaskRuntimeContextFromEnv()?.selfAid || process.env.EVOLCORE_SELF_AID;
+    if (selfAid && !env.EVOLCORE_AGENT_DIR) {
+        env.EVOLCORE_AGENT_DIR = agentDir(selfAid);
+    }
+    const code = await new Promise((resolve, reject) => {
+        const child = spawn(process.execPath, [script, ...args], {
+            stdio: 'inherit',
+            env,
+        });
+        child.on('error', reject);
+        child.on('exit', (c) => resolve(c ?? 0));
+    });
+    if (code !== 0)
+        process.exitCode = code;
+}

package/dist/cli/task-context.js

@@ -34,6 +34,7 @@ function normalizeTaskRuntimeContext(value) {
         chatType: optionalString(value.chatType),
         selfAid: optionalString(value.selfAid),
         peerId: optionalString(value.peerId),
+        peerKey: optionalString(value.peerKey),
         peerName: optionalString(value.peerName),
         peerType: optionalString(value.peerType),
         peerRole: optionalString(value.peerRole),
@@ -51,6 +52,7 @@ function normalizeTaskRuntimeContext(value) {
         runtimeLockDir: optionalAbsolutePath(value.runtimeLockDir),
         handoffIds: handoffIds?.length ? handoffIds : undefined,
         causation: normalizeCausation(value.causation),
+        consolidationBatchDir: optionalString(value.consolidationBatchDir ?? value.consolidationLogBase),
     };
 }
 function optionalProcessRole(value) {
@@ -60,29 +62,6 @@ function optionalProcessRole(value) {
 function optionalDataScope(value) {
     return value === 'relation' || value === 'agent' || value === 'daemon' ? value : undefined;
 }
-/**
- * Codex's shell carrier can leave one JSON-style escape layer in a message
- * argument (for example, the two characters `\\` and `n`). Decode only that
- * layer, and only for a task that is explicitly running the Codex backend.
- * Actual line breaks and all non-Codex CLI input remain unchanged.
- */
-export function decodeCodexMessageText(text, runtime) {
-    if (runtime?.baseagent?.trim().toLowerCase() !== 'codex')
-        return text;
-    return text.replace(/\\([nrt])/g, (_match, escape) => {
-        if (escape === 'n')
-            return '\n';
-        if (escape === 'r')
-            return '\r';
-        return '\t';
-    });
-}
-/** Apply the Codex-only normalization to a text message payload. */
-export function normalizeCodexTextPayload(payload, runtime) {
-    if (payload.type !== 'text' || typeof payload.text !== 'string')
-        return;
-    payload.text = decodeCodexMessageText(payload.text, runtime);
-}
 function optionalAbsolutePath(value) {
     if (typeof value !== 'string' || !path.isAbsolute(value))
         return undefined;

package/dist/cli/trigger-command.js

@@ -5,9 +5,17 @@ import { ipcQuery } from '../ipc.js';
 import { isHelpFlag, wantsHelp } from './help.js';
 import { readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
+import { assertEcSingleLine } from './cli-argv.js';
+import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
 import { normalizeTriggerDefinition, resolveScriptPath, } from '../trigger/validation.js';
 export async function cmdTrigger(args) {
+    args = canonicalizeEvolcoreCommandArgv(['ec', 'trigger', ...args]).slice(2);
     const sub = args[0];
+    if (sub === 'create' || sub === 'set' || sub === 'update') {
+        const nameIndex = args.indexOf('--name');
+        if (nameIndex >= 0)
+            assertEcSingleLine(args[nameIndex + 1], '--name');
+    }
     if (!sub || isHelpFlag(sub)) {
         printHelp();
         return;
@@ -112,7 +120,7 @@ Create 参数模式支持:
   --execution-timeout <时长>（模型类 Trigger 单次执行总时限）
   --model <模型>  --effort <low|medium|high|xhigh|max>
   --max-runs <次数>  --max-duration <时长: 30s|15m|2h|1d>
-  --permission <readonly|auto|request|bypass|fullaccess>（省略则继承当前身份配置；fullaccess 仅 daemon-owner 且 feature flag 开启时可用）
+  --permission <readonly|auto|request|bypass|fullaccess>（省略则继承当前身份配置；fullaccess 仅 daemon-owner 可用）
   --tz <时区> (仅 cron)
   --target-channel <channelKey> --target-channel-id <ID>  (AUN 可简写为 aun)
   --target-chat-type <private|group>  (AUN 目标必填；channelId 同时作为群聊 ID)

package/dist/cli/watch-msg-diag.js

@@ -0,0 +1,209 @@
+/**
+ * ec watch diag — 消息生命周期诊断
+ * 固定N行，每行一个环节，原地刷新，显示该环节的计数 + 最后处理的消息。
+ * 数据源：各处理环节直接打点写入的 msg-diag.jsonl，不分析其他日志。
+ */
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { resolvePaths } from '../paths.js';
+// ==================== ANSI ====================
+const isTTY = !!process.stdout.isTTY;
+const RST = isTTY ? '\x1b[0m' : '';
+const DIM = isTTY ? '\x1b[2m' : '';
+const BOLD = isTTY ? '\x1b[1m' : '';
+const CYAN = isTTY ? '\x1b[36m' : '';
+const GREEN = isTTY ? '\x1b[32m' : '';
+const YELLOW = isTTY ? '\x1b[33m' : '';
+const BLUE = isTTY ? '\x1b[34m' : '';
+const GRAY = isTTY ? '\x1b[38;5;244m' : '';
+const UP = (n) => isTTY ? `\x1b[${n}A` : '';
+const CLR = isTTY ? '\x1b[2K\r' : '';
+// ==================== Stage definitions ====================
+const STAGES = [
+    { stage: 'sdk_received', label: '0. SDK收到    ', color: GRAY },
+    { stage: 'aun_in', label: '1. AUN入站    ', color: GREEN },
+    { stage: 'queue_enqueue', label: '2. 队列入队   ', color: CYAN },
+    { stage: 'task_created', label: '3. 任务创建   ', color: YELLOW },
+    { stage: 'task_start', label: '4. 任务开始   ', color: YELLOW },
+    { stage: 'task_done', label: '5. 任务完成   ', color: BLUE },
+    { stage: 'aun_out', label: '6. AUN出站    ', color: GREEN },
+];
+const state = new Map();
+for (const s of STAGES)
+    state.set(s.stage, { count: 0 });
+// ==================== Helpers ====================
+function hhmmssms(iso) {
+    const d = new Date(iso);
+    return (String(d.getHours()).padStart(2, '0') + ':' +
+        String(d.getMinutes()).padStart(2, '0') + ':' +
+        String(d.getSeconds()).padStart(2, '0') + '.' +
+        String(d.getMilliseconds()).padStart(3, '0'));
+}
+function cut(s, n) {
+    if (!s)
+        return '';
+    return s.length <= n ? s : s.slice(0, n - 1) + '…';
+}
+function pad(s, n) {
+    return s.length >= n ? s : s + ' '.repeat(n - s.length);
+}
+// ==================== Render ====================
+let firstRender = true;
+const HEADER_LINES = 3;
+function renderHeader() {
+    const cols = process.stdout.columns ?? 120;
+    let buf = '';
+    buf += `${BOLD}${CYAN}━━━ ec watch diag — 消息生命周期诊断 ━━━${RST}\n`;
+    buf += `${DIM}各环节实时显示处理计数和最后一条消息，Ctrl+C 退出${RST}\n`;
+    buf += `${GRAY}${'─'.repeat(Math.min(cols, 120))}${RST}\n`;
+    return buf;
+}
+function renderRow(stageDef, st) {
+    const countStr = `[${String(st.count).padStart(4)}]`;
+    const label = `${stageDef.color}${stageDef.label}${RST}`;
+    if (!st.last) {
+        return `${CLR}${label} ${DIM}${countStr}${RST}  ${GRAY}(等待中...)${RST}`;
+    }
+    const e = st.last;
+    const time = hhmmssms(e.ts);
+    const from = cut(e.from || e.aid, 20);
+    const to = cut(e.to, 20);
+    const arrow = from && to ? `${from}${GRAY}→${RST}${to}` : (from || to || `${GRAY}---${RST}`);
+    const preview = e.preview ? `${DIM}"${cut(e.preview, 40)}"${RST}` : '';
+    const taskStr = e.taskId ? `${GRAY}[${cut(e.taskId, 22)}]${RST} ` : '';
+    const sessStr = e.sessionId ? `${GRAY}sess=${cut(e.sessionId, 18)}${RST} ` : '';
+    return `${CLR}${label} ${DIM}${countStr}${RST}  ${GRAY}${time}${RST}  ${pad(arrow, 42)}  ${taskStr}${sessStr}${preview}`;
+}
+function render(_redrawAll) {
+    if (!isTTY)
+        return;
+    // 每次都清屏重绘，彻底避免因内容长度不一导致的行偏移问题
+    let buf = '\x1b[2J\x1b[H';
+    buf += `${BOLD}${CYAN}━━━ ec watch diag — 消息生命周期诊断 ━━━${RST}\n`;
+    const cols = process.stdout.columns ?? 120;
+    buf += `${DIM}各环节实时显示处理计数和最后一条消息，Ctrl+C 退出${RST}\n`;
+    buf += `${GRAY}${'─'.repeat(Math.min(cols, 120))}${RST}\n`;
+    for (const s of STAGES) {
+        buf += renderRow(s, state.get(s.stage)) + '\n';
+    }
+    process.stdout.write(buf);
+    firstRender = false;
+}
+// 非 TTY 模式打印新事件
+function printNonTty(entry) {
+    const stageDef = STAGES.find(s => s.stage === entry.stage);
+    if (!stageDef)
+        return;
+    const st = state.get(entry.stage);
+    const time = hhmmssms(entry.ts);
+    const from = cut(entry.from || entry.aid, 14);
+    const to = cut(entry.to, 14);
+    console.log(`${stageDef.label.trim()}  [${st.count}]  ${time}  ${from}→${to}  "${entry.preview}"`);
+}
+// ==================== Log tailing ====================
+function getDiagLogPath() {
+    const p = resolvePaths();
+    // resolvePaths().root 是 ~/.evolcore
+    const home = process.env.EVOLCORE_HOME ?? path.join(os.homedir(), '.evolcore');
+    return path.join(home, 'logs', 'msg-diag.jsonl');
+}
+function processLine(line) {
+    if (!line.trim())
+        return false;
+    try {
+        const entry = JSON.parse(line);
+        if (!entry.stage || !STAGES.find(s => s.stage === entry.stage))
+            return false;
+        const st = state.get(entry.stage);
+        if (!st)
+            return false;
+        st.count++;
+        st.last = entry;
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+// ==================== Main ====================
+export async function cmdWatchMsgDiag(_args) {
+    const logPath = getDiagLogPath();
+    if (!isTTY) {
+        // 非 TTY：只打印新事件
+        console.log('# ec watch diag — 消息生命周期诊断（非 TTY 模式）');
+    }
+    else {
+        process.stdout.write('\x1b[?25l'); // 隐藏光标
+    }
+    // 初始加载：读取已有历史（最后 50KB）
+    let filePos = 0;
+    if (fs.existsSync(logPath)) {
+        const stat = fs.statSync(logPath);
+        filePos = Math.max(0, stat.size - 50000);
+        const fd = fs.openSync(logPath, 'r');
+        const buf = Buffer.alloc(stat.size - filePos);
+        fs.readSync(fd, buf, 0, buf.length, filePos);
+        fs.closeSync(fd);
+        const lines = buf.toString('utf-8').split('\n');
+        for (const line of lines)
+            processLine(line);
+        filePos = stat.size;
+    }
+    // 初始渲染
+    render(true);
+    let curLogPath = logPath;
+    function tick() {
+        // 检查文件是否存在（daemon 重启后才会创建）
+        if (!fs.existsSync(curLogPath)) {
+            if (!firstRender) {
+                // 文件消失了，说明 daemon 重启，重置状态
+                for (const s of STAGES)
+                    state.set(s.stage, { count: 0 });
+                filePos = 0;
+                render(true);
+            }
+            return;
+        }
+        try {
+            const stat = fs.statSync(curLogPath);
+            if (stat.size <= filePos)
+                return; // 无新内容
+            const fd = fs.openSync(curLogPath, 'r');
+            const buf = Buffer.alloc(stat.size - filePos);
+            fs.readSync(fd, buf, 0, buf.length, filePos);
+            fs.closeSync(fd);
+            filePos = stat.size;
+            const lines = buf.toString('utf-8').split('\n');
+            let changed = false;
+            for (const line of lines) {
+                if (processLine(line)) {
+                    changed = true;
+                    if (!isTTY) {
+                        try {
+                            const entry = JSON.parse(line);
+                            printNonTty(entry);
+                        }
+                        catch { }
+                    }
+                }
+            }
+            // 批量处理完所有新行后，只渲染一次
+            if (changed && isTTY)
+                render(false);
+        }
+        catch {
+            // 文件轮转中，忽略
+        }
+    }
+    const interval = setInterval(tick, 300);
+    process.on('SIGINT', () => {
+        clearInterval(interval);
+        if (isTTY) {
+            process.stdout.write('\x1b[?25h\n');
+        }
+        console.log('\n诊断监控已停止');
+        process.exit(0);
+    });
+    await new Promise(() => { });
+}