evolcore 0.0.6 → 0.0.8

package/dist/cli/daemon-commands.js

@@ -33,7 +33,7 @@ const execFileAsync = promisify(execFile);
 function printNoSelfAgentHints(options) {
     const { daemonConfig, ecwebStarted, skipped } = options;
     console.log('\nℹ 未配置任何 self-agent，Control Plane 已启动。');
-    console.log('  命令行：ec agent new <aid>.agentid.pub');
+    console.log('  命令行：ec agent new <aid>.example.com');
     if (daemonConfig.aid && (daemonConfig.owners?.length ?? 0) > 0) {
         console.log('  Evol App：可通过进程级菜单创建 agent');
     }
@@ -111,7 +111,7 @@ function buildDaemonEnv(p, opts) {
         ...(opts.bindBootstrap ? { EVOLCORE_BIND_BOOTSTRAP: '1' } : {}),
     };
 }
-function serviceProxyNeedsEcweb(cfg) {
+export function serviceProxyNeedsEcweb(cfg) {
     if (!cfg.serviceProxy?.enabled)
         return false;
     return (cfg.serviceProxy.services ?? []).some(s => s.enabled !== false && s.source === 'ecweb');
@@ -301,9 +301,10 @@ export async function cmdStart(opts = {}) {
             if (ans.trim() === '2') {
                 const { suppressSdkLogs } = await import('../aun/aid/index.js');
                 suppressSdkLogs();
-                const { generateControlAid } = await import('../aun/aid/control-aid.js');
-                const result = await generateControlAid();
-                saveDaemonConfig({ ...loadDaemonConfig(), aid: result.aid });
+                const { generateControlAid, resolveControlAidDomain } = await import('../aun/aid/control-aid.js');
+                const cfg = loadDaemonConfig();
+                const result = await generateControlAid(resolveControlAidDomain(cfg.aun?.defaultAidDomain));
+                saveDaemonConfig({ ...cfg, aid: result.aid });
                 console.log(`✓ 新控制 AID: ${result.aid}`);
             }
         }
@@ -349,8 +350,19 @@ export async function cmdStart(opts = {}) {
             await sleep(2000);
         }
     }
-    // 跨 HOME 孤儿（未登记进程）只警告，不动
-    reportOrphans(findOrphanProcesses());
+    // A missing/stale instance record must not turn into a duplicate daemon.
+    // On Windows/macOS the process environment may be unavailable, so an
+    // unregistered process from this package is conservatively treated as a
+    // blocker when its HOME cannot be identified.
+    const orphans = findOrphanProcesses();
+    const blockingOrphans = orphans.filter(o => isRuntimeOrphan(o));
+    if (blockingOrphans.length > 0) {
+        console.error(`❌ 检测到未登记的 EvolCore 进程（PID: ${blockingOrphans.map(o => o.pid).join(', ')}），已停止启动以避免重复连接 AUN。`);
+        console.error('  请先停止这些进程，再重新执行 ec start。');
+        process.exitCode = 1;
+        return;
+    }
+    reportOrphans(orphans);
     console.log('🚀 Starting EvolCore...');
     const stdoutRotation = rotateStdoutLog(p.logs);
     if (stdoutRotation.rotatedPath) {
@@ -549,36 +561,54 @@ export async function cmdStart(opts = {}) {
 async function stopPid(pid) {
     console.log(`🛑 Stopping EvolCore (PID: ${pid})...`);
     platform.killProcess(pid);
-    await new Promise((resolve) => {
-        let waited = 0;
-        const check = setInterval(() => {
-            waited++;
-            if (!platform.isProcessRunning(pid)) {
-                clearInterval(check);
-                console.log('✓ EvolCore stopped');
-                resolve();
-                return;
-            }
-            if (waited >= 10) {
-                clearInterval(check);
-                platform.killProcess(pid, true);
-                console.log('✓ EvolCore stopped (forced)');
-                resolve();
-            }
-        }, 1000);
-    });
+    if (await platform.waitForProcessExit(pid, 10_000)) {
+        console.log('✓ EvolCore stopped');
+        return true;
+    }
+    console.log(`⚠ EvolCore PID ${pid} did not exit gracefully; forcing termination...`);
+    platform.killProcess(pid, true);
+    if (await platform.waitForProcessExit(pid, 5_000)) {
+        console.log('✓ EvolCore stopped (forced)');
+        return true;
+    }
+    console.error(`❌ EvolCore PID ${pid} is still running; restart aborted`);
+    return false;
+}
+function isRuntimeOrphan(orphan, currentHome = resolveRoot()) {
+    if (orphan.confirmedTestDaemon)
+        return false;
+    const homeMatches = orphan.evolcoreHome
+        && normalizeRuntimePath(orphan.evolcoreHome) === normalizeRuntimePath(currentHome);
+    // Windows/macOS may not expose another process's environment. In that case
+    // the exact installed package path is the conservative ownership proof.
+    const packageMatches = !orphan.evolcoreHome
+        && normalizeRuntimePath(orphan.cmdline).includes(normalizeRuntimePath(getPackageRoot()));
+    return Boolean(homeMatches || packageMatches);
 }
 export async function cmdStop() {
     const status = scanInstances();
-    const ping = await probeDaemon(resolvePaths().socket);
-    if (rejectPidIsolatedLifecycle('stop', status, ping))
-        return;
+    const p = resolvePaths();
+    const initialOrphans = findOrphanProcesses();
+    const runtimeOrphans = initialOrphans.filter(orphan => isRuntimeOrphan(orphan, p.root));
+    const ping = await probeDaemon(p.socket);
+    if (ping && !hasVisibleDaemonPid(status, ping) && runtimeOrphans.length === 0) {
+        if (rejectPidIsolatedLifecycle('stop', status, ping))
+            return;
+    }
     const aliveMains = status.mains.filter(m => m.alive);
-    if (aliveMains.length === 0) {
+    if (aliveMains.length === 0 && runtimeOrphans.length === 0) {
         console.log('⚠ EvolCore is not running');
         return;
     }
-    await Promise.all(aliveMains.map(m => stopPid(m.record.pid)));
+    const pids = new Set([...aliveMains.map(entry => entry.record.pid), ...runtimeOrphans.map(orphan => orphan.pid)]);
+    if (runtimeOrphans.length > 0) {
+        console.log(`⚠ 检测到未登记的 EvolCore 进程，将一并停止: ${runtimeOrphans.map(orphan => orphan.pid).join(', ')}`);
+    }
+    const stopped = await Promise.all([...pids].map(pid => stopPid(pid)));
+    if (stopped.some(result => !result)) {
+        process.exitCode = 1;
+        return;
+    }
     await sleep(500);
     cleanupInstances();
     if (aliveMains.length > 1) {
@@ -589,14 +619,16 @@ export async function cmdRestart(opts = {}) {
     const cmdStartedAt = Date.now();
     console.log('🔄 Restarting EvolCore...');
     const initialStatus = scanInstances();
+    const initialOrphans = findOrphanProcesses();
+    const initialRuntimeOrphans = initialOrphans.filter(orphan => isRuntimeOrphan(orphan));
     const socketPath = resolvePaths().socket;
     const ping = await probeDaemon(socketPath);
     if (ping && !hasVisibleDaemonPid(initialStatus, ping)) {
         if (await tryDelegatedDaemonRestart(socketPath))
             return;
+        if (initialRuntimeOrphans.length === 0 && rejectPidIsolatedLifecycle('restart', initialStatus, ping))
+            return;
     }
-    if (rejectPidIsolatedLifecycle('restart', initialStatus, ping))
-        return;
     if (!requireFreshSourceBuild())
         return;
     // 版本检查与自动升级
@@ -651,29 +683,49 @@ export async function cmdRestart(opts = {}) {
         if (aliveMains.length > 1) {
             console.log(`⚠ 检测到 ${aliveMains.length} 个 main 实例，将一并停止: ${aliveMains.map(m => m.record.pid).join(', ')}`);
         }
-        await Promise.all(aliveMains.map(m => stopPid(m.record.pid)));
+        const stopped = await Promise.all(aliveMains.map(m => stopPid(m.record.pid)));
+        if (stopped.some(result => !result)) {
+            console.error('❌ Restart aborted because an existing EvolCore process could not be stopped');
+            process.exitCode = 1;
+            return;
+        }
         await sleep(500);
     }
     cleanupInstances();
-    // 孤儿处理：同 HOME 的孤儿无条件 kill（restart 必须替换旧实例）；
+    const remainingMainProcesses = scanInstances().mains.filter(entry => entry.alive);
+    if (remainingMainProcesses.length > 0) {
+        console.error(`❌ Restart aborted: EvolCore process still registered and alive (PID: ${remainingMainProcesses.map(entry => entry.record.pid).join(', ')})`);
+        process.exitCode = 1;
+        return;
+    }
+    // 孤儿处理：同 HOME/同安装包的孤儿属于本运行时，先确认退出再替换；
     // 跨 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 = 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(', ')}`);
+        const runtimeOrphans = findOrphanProcesses().filter(o => isRuntimeOrphan(o));
+        if (runtimeOrphans.length > 0) {
+            console.log(`⚠ 检测到未登记的 EvolCore 进程，将一并停止: ${runtimeOrphans.map(o => o.pid).join(', ')}`);
+            const stopped = await Promise.all(runtimeOrphans.map(o => stopPid(o.pid)));
+            if (stopped.some(result => !result)) {
+                console.error('❌ Restart aborted because an unregistered EvolCore process could not be stopped');
+                process.exitCode = 1;
+                return;
+            }
             await sleep(500);
         }
+        const remainingRuntimeOrphans = findOrphanProcesses().filter(o => isRuntimeOrphan(o));
+        if (remainingRuntimeOrphans.length > 0) {
+            console.error(`❌ Restart aborted: EvolCore process still running (PID: ${remainingRuntimeOrphans.map(o => o.pid).join(', ')})`);
+            process.exitCode = 1;
+            return;
+        }
+        const otherHome = findOrphanProcesses().filter(o => !o.confirmedTestDaemon && !isRuntimeOrphan(o));
         if (opts.clear && otherHome.length > 0) {
             const killed = killOrphans(otherHome);
             console.log(`☠ 已 SIGKILL ${killed.length} 个跨 HOME 孤儿进程: ${killed.join(', ')}`);
@@ -707,6 +759,9 @@ export async function cmdRestart(opts = {}) {
         printCodeStats(getPackageRoot(), resolvePaths().logs);
     }
 }
+function normalizeRuntimePath(value) {
+    return value.replace(/[\\/]+/g, '/').toLowerCase();
+}
 function formatTimeAgo(ms) {
     const sec = Math.floor(ms / 1000);
     if (sec < 60)
@@ -2382,8 +2437,22 @@ async function printEcwebStatus(p) {
         // still provide an authoritative runtime status without local config access.
     }
     const entries = readEcwebInstanceEntries(p);
-    let readyEntry;
+    const aliveEntries = [];
     for (const entry of entries) {
+        if (platform.isProcessRunning(entry.record.pid)) {
+            aliveEntries.push(entry);
+        }
+        else {
+            // A stale EC Web record must never be used to report the PID of an
+            // unrelated process that later inherited the port.
+            try {
+                fs.unlinkSync(entry.filePath);
+            }
+            catch { }
+        }
+    }
+    let readyEntry;
+    for (const entry of aliveEntries) {
         if (await probeEcwebReady(entry.record.port)) {
             readyEntry = entry;
             break;
@@ -2394,11 +2463,19 @@ async function printEcwebStatus(p) {
         console.log(`🔭 ECWeb: 运行中 (PID: ${readyEntry.record.pid})  http://localhost:${readyEntry.record.port}`);
         return;
     }
-    const visibleEntry = entries.find(entry => platform.isProcessRunning(entry.record.pid));
+    const occupiedPids = new Set();
+    for (const entry of entries) {
+        for (const pid of platform.findProcessByPort(entry.record.port))
+            occupiedPids.add(pid);
+    }
     console.log('');
-    if (visibleEntry) {
+    if (aliveEntries.length > 0) {
+        const visibleEntry = aliveEntries[0];
         console.log(`🔭 ECWeb: 进程存活 (PID: ${visibleEntry.record.pid}) 但 HTTP 未就绪 (端口 ${visibleEntry.record.port})，查看 logs/watch-web.log`);
     }
+    else if (occupiedPids.size > 0) {
+        console.log(`🔭 ECWeb: 端口仍被未登记进程占用 (PID: ${[...occupiedPids].join(', ')})，请先执行 ec restart`);
+    }
     else if (entries.length > 0) {
         console.log('🔭 ECWeb: instance 记录存在，但宿主 PID 不可见且 HTTP 未就绪');
     }
@@ -2432,31 +2509,34 @@ function stopCodexAppServerOrphans() {
     }
     return killed;
 }
-/** 若 ecweb 在运行则杀掉并清理 pid 文件，返回是否成功 kill。 */
-function stopEcwebIfRunning(p) {
+/** 若 ecweb 在运行则杀掉并确认 pid/端口都已释放。 */
+async function stopEcwebIfRunning(p) {
     const alive = findAliveEcweb(p);
-    let killed = false;
-    if (alive) {
-        try {
-            platform.killProcess(alive.pid, true);
-        }
-        catch { }
-        killed = true;
+    const port = loadDaemonConfig().ecweb?.port ?? 42705;
+    const pids = new Set([
+        ...(alive ? [alive.pid] : []),
+        ...platform.findProcessByPort(port),
+    ]);
+    for (const pid of pids)
+        platform.killProcess(pid, true);
+    const exited = await Promise.all([...pids].map(pid => platform.waitForProcessExit(pid, 5_000)));
+    const portReleased = await waitForPortRelease(port, 5_000);
+    if (exited.some(result => !result) || !portReleased) {
+        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 库导致每次重启都要重新配对）
     removeEcwebInstanceFiles(p);
-    // 端口兜底：杀掉任何仍占用 ecweb 端口的残留进程（含手动启动、未登记 pid 文件的）。
-    // 仅靠 pid 文件无法清理这类进程，会导致下次启动端口被占。
-    const port = loadDaemonConfig().ecweb?.port ?? 42705;
-    for (const pid of platform.findProcessByPort(port)) {
-        try {
-            platform.killProcess(pid, true);
-            killed = true;
-        }
-        catch { }
+    return pids.size > 0;
+}
+async function waitForPortRelease(port, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        if (platform.findProcessByPort(port).length === 0)
+            return true;
+        await sleep(250);
     }
-    return killed;
+    return platform.findProcessByPort(port).length === 0;
 }
 /**
  * 后台 detached 启动 ecweb；若已运行则先停再启（确保加载最新代码）。
@@ -2530,11 +2610,23 @@ function ensureServiceProxyConfig(cfg, port) {
         console.log(`   自动配置 Service Proxy: https://${cfg.aid}/proxy/ecweb/`);
     }
 }
-async function startEcwebIfEnabled(p) {
+/**
+ * Start the separately installed `ec-web` process 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.
+ */
+export async function startEcwebIfEnabled(p) {
     const cfg = loadDaemonConfig();
     if (!cfg.ecweb?.enabled)
         return false;
-    const wasRunning = stopEcwebIfRunning(p); // 先停旧进程（有则停），保证加载最新代码
+    let wasRunning = false;
+    try {
+        wasRunning = await stopEcwebIfRunning(p); // 先停旧进程（有则停），保证加载最新代码
+    }
+    catch (error) {
+        console.log(`❌ EC Web 旧进程未清理干净，取消启动: ${error instanceof Error ? error.message : String(error)}`);
+        return false;
+    }
     const port = cfg.ecweb.port ?? 42705;
     const args = ['--home', p.root, '--port', String(port)];
     const launch = resolveEcwebLaunchCommand(args);
@@ -2548,6 +2640,7 @@ async function startEcwebIfEnabled(p) {
         console.log(`   command: ${launch.command}, args: ${JSON.stringify(launch.args)}`);
         return false;
     }
+    let startedPid;
     try {
         const child = spawn(launch.command, launch.args, {
             detached: true,
@@ -2560,6 +2653,7 @@ async function startEcwebIfEnabled(p) {
         });
         child.unref();
         const pid = child.pid;
+        startedPid = pid;
         if (!pid) {
             console.log('❌ ECWeb 启动失败（进程创建失败）');
             return false;
@@ -2587,9 +2681,17 @@ async function startEcwebIfEnabled(p) {
             return true;
         }
         console.log(`❌ ECWeb 启动失败：端口 ${port} 未就绪（进程 PID ${pid} 可能已退出，查看 logs/watch-web.log）`);
+        platform.killProcess(pid, true);
+        await platform.waitForProcessExit(pid, 5_000);
+        removeEcwebInstanceFiles(p);
         return false;
     }
     catch (err) {
+        if (startedPid) {
+            platform.killProcess(startedPid, true);
+            await platform.waitForProcessExit(startedPid, 5_000);
+        }
+        removeEcwebInstanceFiles(p);
         console.log(`⚠ ECWeb 启动失败: ${err instanceof Error ? err.message : String(err)}`);
         console.log(`   command: ${launch.command}`);
         console.log(`   args: ${JSON.stringify(launch.args)}`);
@@ -2766,8 +2868,15 @@ export async function cmdDiagnose() {
     try {
         const instStatus = scanInstances();
         const aliveMains = instStatus.mains.filter(m => m.alive);
+        const orphanMains = findOrphanProcesses();
         if (aliveMains.length > 0) {
             console.log(`[diagnose] ⚠️ 已有进程运行中: PID ${aliveMains.map(m => m.record.pid).join(', ')}`);
+            hasError = true;
+        }
+        else if (orphanMains.length > 0) {
+            console.error(`[diagnose] ❌ 发现未登记的 EvolCore 进程: PID ${orphanMains.map(o => o.pid).join(', ')}`);
+            console.error('[diagnose]    请先执行 ec stop 或手动结束这些 PID，再运行 ec start。');
+            hasError = true;
         }
         else {
             console.log(`[diagnose] ✓ 无残留进程`);
@@ -2776,7 +2885,28 @@ export async function cmdDiagnose() {
     catch {
         console.log(`[diagnose] ✓ 无 instance 文件`);
     }
-    // 6. 检查关键文件
+    // 6. 检查 EC Web 端口与实例记录是否一致。
+    try {
+        const cfg = loadDaemonConfig();
+        if (cfg.ecweb?.enabled) {
+            const port = cfg.ecweb.port ?? 42705;
+            const portPids = platform.findProcessByPort(port);
+            const recordedPids = new Set(readEcwebInstanceEntries(p).map(entry => entry.record.pid));
+            const unregisteredPids = portPids.filter(pid => !recordedPids.has(pid));
+            if (unregisteredPids.length > 0) {
+                console.error(`[diagnose] ❌ EC Web 端口 ${port} 被未登记进程占用: PID ${unregisteredPids.join(', ')}`);
+                console.error('[diagnose]    请执行 ec restart 清理 EC Web 后再启动。');
+                hasError = true;
+            }
+            else {
+                console.log(`[diagnose] ✓ EC Web 端口 ${port} 未发现未登记占用`);
+            }
+        }
+    }
+    catch (e) {
+        console.error(`[diagnose] ⚠️ EC Web 端口检查失败: ${e instanceof Error ? e.message : String(e)}`);
+    }
+    // 7. 检查关键文件
     const appMain = path.join(getPackageRoot(), 'dist', 'index.js');
     if (!fs.existsSync(appMain)) {
         console.error(`[diagnose] ❌ 编译产物不存在: ${appMain}`);

package/dist/cli/data-command.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { resolvePaths, resolveRoot } from '../paths.js';
-import { applyDataMigration, planDataMigration, readDataMigration, verifyDataMigration } from '../core/data-migration.js';
+import { applyDataMigration, finalizeDataMigration, planDataMigration, readDataMigration, verifyDataMigration } from '../core/data-migration.js';
 import { scanInstances } from '../utils/instance-registry.js';
 import { isProcessRunning, killProcess } from '../utils/cross-platform.js';
 import { ipcQuery } from '../ipc.js';
@@ -11,9 +11,11 @@ function printSummary(manifest) {
         result[operation.status] = (result[operation.status] ?? 0) + 1;
         return result;
     }, {});
+    const pending = manifest.operations.filter(operation => !['committed', 'skipped', 'acknowledged'].includes(operation.status)).length;
     console.log(`migration: ${manifest.id}`);
     console.log(`state: ${manifest.state}`);
     console.log(`operations: ${manifest.operations.length}`);
+    console.log(`pending: ${pending}`);
     console.log(`status: ${Object.entries(counts).map(([key, value]) => `${key}=${value}`).join(', ') || 'none'}`);
     if (manifest.warnings.length) {
         console.log('warnings:');
@@ -77,19 +79,72 @@ async function waitForMaintenanceWindow() {
 }
 export async function cmdData(args) {
     if (args[0] !== 'migrate' || args.includes('--help')) {
-        console.log('用法: ec data migrate --dry-run | --apply | --resume <migration-id> | --verify [migration-id]');
+        console.log('用法: ec data migrate --dry-run | --apply [migration-id] | --verify [migration-id]');
         return;
     }
     const root = resolveRoot();
     if (args.includes('--dry-run')) {
+        if (args.length !== 2)
+            throw new Error('--dry-run cannot be combined with another migration action');
         printSummary(planDataMigration(root));
         return;
     }
-    const resumeIndex = args.indexOf('--resume');
     const verify = args.includes('--verify');
-    const requestedId = resumeIndex >= 0 ? args[resumeIndex + 1] : args.find(value => value.startsWith('data-'));
-    if (resumeIndex >= 0 && !requestedId)
-        throw new Error('--resume requires a migration id');
+    const requestedId = args.find(value => value.startsWith('data-'));
+    if (args.includes('--apply')) {
+        if (verify) {
+            throw new Error('--apply cannot be combined with another migration action');
+        }
+        // Planning is read-only, so avoid an unnecessary service interruption
+        // when there is no legacy source to process.
+        const existing = requestedId ? readDataMigration(root, requestedId) : undefined;
+        let manifest = existing ?? planDataMigration(root);
+        if (manifest.operations.length === 0 && Object.keys(manifest.supersededSourceHashes ?? {}).length === 0) {
+            printSummary(manifest);
+            console.log('No legacy data requires migration.');
+            return;
+        }
+        const initialRuntime = liveRuntime();
+        const wasRunning = initialRuntime.mainCount > 0
+            || initialRuntime.monitorPids.length > 0
+            || await daemonIpcReachable();
+        if (wasRunning) {
+            console.log('Stopping daemon and all Agent runtimes for data migration...');
+            await stopRestartMonitors(initialRuntime.monitorPids);
+            await cmdStop();
+            await waitForMaintenanceWindow();
+        }
+        try {
+            if (existing?.state !== 'completed') {
+                manifest = applyDataMigration(manifest);
+                manifest = verifyDataMigration(manifest, { strictTargetContent: true });
+                printSummary(manifest);
+                if (manifest.state !== 'completed') {
+                    throw new Error(`migration is not fully verified; fix the listed operations and run ec data migrate --apply ${manifest.id}`);
+                }
+            }
+            else {
+                // A completed manifest may come from the previous copy-only workflow,
+                // or from an earlier successful --apply. The finalization routine is
+                // idempotent and verifies the archive receipt before returning it.
+                printSummary(manifest);
+            }
+            const finalization = finalizeDataMigration(root, manifest);
+            console.log(`archive: ${finalization.archivePath}`);
+            console.log(`archive-sha256: ${finalization.archiveSha256}`);
+            console.log(`removed legacy sources: ${finalization.sourcePaths.length}`);
+            if (wasRunning) {
+                console.log('Starting daemon and Agent runtimes after data migration...');
+                await cmdStart();
+            }
+        }
+        catch (error) {
+            if (wasRunning)
+                console.error('Data migration failed; daemon remains stopped.');
+            throw error;
+        }
+        return;
+    }
     if (verify) {
         // A completed migration's destination becomes live runtime data. Operator
         // verification therefore validates source integrity and target structure
@@ -100,33 +155,5 @@ export async function cmdData(args) {
             process.exitCode = 1;
         return;
     }
-    if (!args.includes('--apply') && resumeIndex < 0)
-        throw new Error('select --dry-run, --apply, --resume, or --verify');
-    const initialRuntime = liveRuntime();
-    const wasRunning = initialRuntime.mainCount > 0
-        || initialRuntime.monitorPids.length > 0
-        || await daemonIpcReachable();
-    if (wasRunning) {
-        console.log('Stopping daemon and all Agent runtimes for data migration...');
-        // A restart monitor would otherwise relaunch the daemon in the middle of
-        // a copy transaction, so it must leave the maintenance window first.
-        await stopRestartMonitors(initialRuntime.monitorPids);
-        await cmdStop();
-        await waitForMaintenanceWindow();
-    }
-    let manifest = resumeIndex >= 0
-        ? applyDataMigration(readDataMigration(root, requestedId))
-        : applyDataMigration(planDataMigration(root));
-    manifest = verifyDataMigration(manifest);
-    printSummary(manifest);
-    // A partial migration must be inspected before any runtime can write the new
-    // layout. All independent operations have still been attempted and recorded.
-    if (wasRunning && manifest.state === 'completed') {
-        console.log('Starting daemon and Agent runtimes after verified migration...');
-        await cmdStart();
-    }
-    else if (wasRunning) {
-        console.error('Migration has errors; daemon remains stopped. Fix or resume the listed operations before restarting.');
-        process.exitCode = 1;
-    }
+    throw new Error('select --dry-run, --apply, or --verify');
 }

package/dist/cli/init-channel.js

@@ -1250,7 +1250,7 @@ async function pickAgentForChannel(rl) {
     const { agents } = loadAllAgents();
     if (agents.length === 0) {
         console.log('❌ 暂无 agent，请先创建：');
-        console.log('     ec agent new <aid>.agentid.pub');
+        console.log('     ec agent new <aid>.example.com');
         return null;
     }
     const letters = 'abcdefghijklmnopqrstuvwxyz';

package/dist/cli/init.js

@@ -6,7 +6,7 @@ import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
 import { saveDefaultsSafe, loadAllAgents, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
-import { generateControlAid, resolveControlIssuer } from '../aun/aid/control-aid.js';
+import { generateControlAid, resolveControlAidDomain } from '../aun/aid/control-aid.js';
 import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../agents/codex-runner.js';
 import { resolveEcagentConfig } from '../agents/baseagent.js';
 import { defaultProjectsRoot } from '../utils/project-path.js';
@@ -313,29 +313,24 @@ export async function initTail(options = {}) {
     const { agents } = loadAllAgents();
     if (agents.length === 0 && !options.invokedByStart) {
         console.log('\n提示：尚无 agent，运行以下命令创建：');
-        console.log('  ec agent new <aid>.agentid.pub');
+        console.log('  ec agent new <aid>.example.com');
     }
     // 控制 AID：daemon 进程身份。缺失则生成并写回 daemon.json（幂等：已存在则跳过）。
     const daemonConfig = loadDaemonConfig();
     let controlAidReady = !!daemonConfig.aid;
     if (daemonConfig.aid) {
-        const targetIssuer = resolveControlIssuer();
-        const currentIssuer = daemonConfig.aid.split('.').slice(1).join('.');
-        if (currentIssuer !== targetIssuer) {
-            console.log(`⚠️  控制 AID issuer (${currentIssuer}) 与目标 issuer (${targetIssuer}) 不一致`);
-            console.log(`    如需切换，请删除 daemon.json 中的 aid 字段后重新运行 init`);
-        }
         console.log(`✓ 控制 AID 已存在: ${daemonConfig.aid}`);
     }
     else {
         try {
-            const { aid } = await generateControlAid();
+            const aidDomain = resolveControlAidDomain(daemonConfig.aun?.defaultAidDomain);
+            const { aid } = await generateControlAid(aidDomain);
             saveDaemonConfig({ ...daemonConfig, $schema_version: daemonConfig.$schema_version ?? 1, aid });
             controlAidReady = true;
             console.log(`✓ 已生成控制 AID: ${aid}`);
         }
         catch (e) {
-            console.error(`⚠️ 控制 AID 生成失败（Gateway 不可达？联网后重跑 ec init 补全）: ${e?.message || e}`);
+            console.error(`⚠️ 控制 AID 生成失败（请检查 AID domain 配置或 Gateway 连通性）: ${e?.message || e}`);
             controlAidReady = false;
         }
     }
@@ -446,7 +441,7 @@ export async function initTail(options = {}) {
     const { agents: finalAgents } = loadAllAgents();
     if (finalAgents.length === 0) {
         console.log('\n📌 下一步：创建 agent');
-        console.log('  ec agent new <your-aid>.agentid.pub');
+        console.log('  ec agent new <your-aid>.example.com');
         console.log('  ec init feishu    # 绑定飞书');
         console.log('  ec start          # 启动服务');
     }
@@ -632,11 +627,12 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
     let controlAid = existingCfg.aid;
     if (!controlAid) {
         try {
-            const { aid } = await generateControlAid();
+            const aidDomain = resolveControlAidDomain(existingCfg.aun?.defaultAidDomain);
+            const { aid } = await generateControlAid(aidDomain);
             controlAid = aid;
         }
         catch (e) {
-            fail('CONTROL_AID_CREATE_FAILED', `gateway unreachable: ${e?.message || e}`, EXIT_RUNTIME, format);
+            fail('CONTROL_AID_CREATE_FAILED', `control AID creation failed: ${e?.message || e}`, EXIT_RUNTIME, format);
         }
     }
     // ── 9. 写 daemon.json（aid + owners + ecweb）──