evolcore 0.0.4 → 0.0.6

package/dist/cli/agent.js

@@ -13,6 +13,7 @@ import { ensureInitialRoleRegistry } from '../config/role-service.js';
 import { isValidChannelName } from '../core/channel-loader.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../agents/codex-runner.js';
+import { resolveEcagentConfig } from '../agents/baseagent.js';
 import { agentProjectRootFromDefaults, deriveAgentProjectPath } from '../utils/project-path.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 function withStaticOwner(config, owner) {
@@ -25,19 +26,29 @@ function withStaticOwner(config, owner) {
     return { ...config, owners: [...owners, value] };
 }
 // ==================== Helpers ====================
-const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
+const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini', 'ecagent'];
+const AUTO_BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
 function isBaseagentAvailable(baseagent) {
     if (baseagent === 'codex')
         return isCodexAppServerAvailable();
+    if (baseagent === 'ecagent')
+        return true;
     return commandExists(baseagent);
 }
 function detectAvailableBaseagents() {
     return BASEAGENT_CANDIDATES.filter(isBaseagentAvailable);
 }
 function pickDefaultBaseagent(available) {
-    if (available.length === 0)
-        return null;
-    return available.includes('claude') ? 'claude' : available[0];
+    return AUTO_BASEAGENT_CANDIDATES.find(candidate => available.includes(candidate)) ?? null;
+}
+function ecagentUnavailableReason() {
+    try {
+        resolveEcagentConfig({ agents: { ecagent: {} } });
+        return undefined;
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
 }
 function buildBaseagentsBlock(chosen) {
     return { [chosen]: {} };
@@ -301,19 +312,24 @@ export async function agentCreateInteractive(opts = {}) {
         }
         // Baseagent
         const available = detectAvailableBaseagents();
-        if (available.length === 0) {
-            return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server.` };
+        if (available.length === 0 || (available.length === 1 && available[0] === 'ecagent' && ecagentUnavailableReason())) {
+            return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server, or configure bundled ecagent.` };
         }
         const defaultBa = pickDefaultBaseagent(available);
         let baseagent;
-        if (available.length === 1) {
+        if (available.length === 1 && defaultBa) {
             console.log(`  Baseagent: ${defaultBa}`);
             baseagent = defaultBa;
         }
         else {
             let chosen = null;
             while (chosen === null) {
-                const input = (await ask(`Baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
+                const defaultHint = defaultBa ? ` [${defaultBa}]` : '';
+                const input = (await ask(`Baseagent (${available.join('/')})${defaultHint}: `)).trim() || defaultBa;
+                if (!input) {
+                    console.log('  ecagent is optional; enter ecagent to select it explicitly.');
+                    continue;
+                }
                 if (!BASEAGENT_CANDIDATES.includes(input)) {
                     console.log(`  Invalid choice. Options: ${BASEAGENT_CANDIDATES.join('/')}`);
                     continue;
@@ -322,6 +338,13 @@ export async function agentCreateInteractive(opts = {}) {
                     console.log(`  ${input} is not available in the current environment. Available: ${available.join('/')}`);
                     continue;
                 }
+                if (input === 'ecagent') {
+                    const reason = ecagentUnavailableReason();
+                    if (reason) {
+                        console.log(`  ecagent is unavailable: ${reason}`);
+                        continue;
+                    }
+                }
                 chosen = input;
             }
             baseagent = chosen;
@@ -535,8 +558,8 @@ export async function agentCreateNonInteractive(opts) {
     }
     // Baseagent
     const available = detectAvailableBaseagents();
-    if (available.length === 0) {
-        return failValidating(`No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server.`);
+    if (available.length === 0 || (available.length === 1 && available[0] === 'ecagent' && ecagentUnavailableReason())) {
+        return failValidating(`No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server, or configure bundled ecagent.`);
     }
     let baseagent;
     if (opts.baseagent) {
@@ -549,10 +572,18 @@ export async function agentCreateNonInteractive(opts) {
                 : undefined;
             return failValidating(reason || `${opts.baseagent} is not available in the current environment (available: ${available.join('/')})`);
         }
+        if (opts.baseagent === 'ecagent') {
+            const reason = ecagentUnavailableReason();
+            if (reason)
+                return failValidating(reason);
+        }
         baseagent = opts.baseagent;
     }
     else {
-        baseagent = pickDefaultBaseagent(available);
+        const defaultBaseagent = pickDefaultBaseagent(available);
+        if (!defaultBaseagent)
+            return failValidating('ecagent is optional; pass --baseagent ecagent after configuring its API key');
+        baseagent = defaultBaseagent;
     }
     if (!path.isAbsolute(opts.project)) {
         return failValidating(`--project must be absolute: ${opts.project}`);

package/dist/cli/aun-commands.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
-import { agentMdPath, resolveRoot } from '../paths.js';
+import path from 'path';
+import { agentMdPath, resolvePaths, resolveRoot } from '../paths.js';
 import { isExplicitGroupId } from '../aun/group-identity.js';
 import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 // ==================== AID ====================
@@ -814,6 +815,8 @@ Options:
   --before <time>       只返回该时间之前的历史
   --after <time>        只返回该时间之后的历史
   --direction <value>   历史方向：in|out|all
+  --channel <type>      历史渠道：aun|feishu|wechat|dingtalk|qqbot|wecom
+  --channel-name <name> 历史渠道实例名（非 AUN 渠道必须匹配 Agent 配置）
   --return <none|required> 跨会话发送必填：none=仅补充目标上下文，required=回答回流来源
   --content-type <mime> 显式覆盖 MIME（仅 --file 模式）
   --as <type>           附件类型：image|video|voice|file（仅 --file 模式）
@@ -841,7 +844,7 @@ Options:
     if (sub === 'history' && wantsHelp(args)) {
         console.log(`用法: ec msg history <self-aid> <target-aid> [options]
 
-查询指定 AID 对的本地 messages.jsonl，不调用 message.pull，也不影响收件箱游标。
+查询指定会话对的本地历史，不调用 message.pull，也不影响收件箱游标。非 AUN 历史仅通过当前 Agent 已配置的渠道实例读取，不能传入文件路径。
 
 Options:
   --session <latest|all|id> 默认 latest；all 查询全部；也可指定会话 ID
@@ -849,12 +852,15 @@ Options:
   --before <time>         开区间；epoch 毫秒或 ISO 时间
   --after <time>          开区间；epoch 毫秒或 ISO 时间
   --direction <value>     in|out|all（默认 all）
+  --channel <type>        aun|feishu|wechat|dingtalk|qqbot|wecom（默认 aun）
+  --channel-name <name>   渠道实例名；省略时仅允许该类型恰好配置一个实例
   --format <text|json>    输出格式（默认 text）
 
 示例:
   ec msg history alice.agentid.pub bob.agentid.pub
   ec msg history alice.agentid.pub bob.agentid.pub --session latest
   ec msg history alice.agentid.pub bob.agentid.pub --session all
+  ec msg history alice.agentid.pub oc_xxx --channel feishu --channel-name main --session all --format json
   ec msg history alice.agentid.pub bob.agentid.pub --session meta_20260713_1783920000000 --format json`);
         return;
     }
@@ -876,7 +882,7 @@ Options:
             console.error('用法: ec msg history <self-aid> <target-aid> [options]');
             process.exit(1);
         }
-        const historyValueFlags = new Set(['--session', '--limit', '--before', '--after', '--direction', '--format']);
+        const historyValueFlags = new Set(['--session', '--limit', '--before', '--after', '--direction', '--channel', '--channel-name', '--format']);
         const seenHistoryFlags = new Set();
         for (let index = 3; index < args.length; index++) {
             const flag = args[index];
@@ -915,9 +921,25 @@ Options:
             console.error(`❌ --after 必须是 epoch 毫秒或有效时间: ${afterRaw}`);
             process.exit(1);
         }
+        const channel = getArgValue(args, '--channel') ?? 'aun';
+        const channelTypes = new Set(['aun', 'feishu', 'wechat', 'dingtalk', 'qqbot', 'wecom']);
+        if (!channelTypes.has(channel)) {
+            console.error(`❌ 不支持的 channel: ${channel}`);
+            process.exit(1);
+        }
+        let channelName;
+        try {
+            channelName = resolveHistoryChannelName(from, channel, getArgValue(args, '--channel-name'));
+        }
+        catch (error) {
+            console.error(`❌ ${error instanceof Error ? error.message : String(error)}`);
+            process.exit(1);
+        }
         const result = msgHistory({
             from,
             target,
+            channel: channel,
+            channelName,
             session: getArgValue(args, '--session'),
             limit,
             before,
@@ -2001,3 +2023,28 @@ function parseMsgHistoryTime(value) {
     const timestamp = Date.parse(trimmed);
     return Number.isFinite(timestamp) ? timestamp : undefined;
 }
+/** Resolve a configured channel instance without exposing Agent session paths. */
+function resolveHistoryChannelName(agentAid, channel, requested) {
+    if (channel === 'aun' && requested === undefined)
+        return undefined;
+    const configPath = path.join(resolvePaths().root, 'agents', agentAid, 'config.json');
+    let config;
+    try {
+        config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+    }
+    catch {
+        throw new Error(`无法读取 Agent 渠道配置: ${agentAid}`);
+    }
+    const instances = (Array.isArray(config?.channels) ? config.channels : [])
+        .filter((item) => item && item.type === channel && item.enabled !== false && typeof item.name === 'string');
+    if (requested !== undefined) {
+        if (!instances.some((item) => item.name === requested)) {
+            throw new Error(`Agent 未配置 ${channel} 渠道实例: ${requested}`);
+        }
+        return requested;
+    }
+    if (instances.length !== 1) {
+        throw new Error(`${channel} 渠道实例不唯一，请指定 --channel-name`);
+    }
+    return instances[0].name;
+}

package/dist/cli/daemon-commands.js

@@ -28,7 +28,24 @@ import { getProcessStartTime } from '../utils/process-introspect.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST, WEB_PACKAGE_NAME } from '../product.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
+import { inspectDataMigrationRequirement } from '../core/data-migration.js';
 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');
+    if (daemonConfig.aid && (daemonConfig.owners?.length ?? 0) > 0) {
+        console.log('  Evol App：可通过进程级菜单创建 agent');
+    }
+    if (ecwebStarted) {
+        console.log('  ECWeb：可通过控制台创建 agent');
+    }
+    if (skipped.length > 0) {
+        console.log('跳过的目录:');
+        for (const skippedAgent of skipped)
+            console.log(`  - ${skippedAgent.dirName}: ${skippedAgent.reason}`);
+    }
+}
 async function probeDaemon(socketPath, timeoutMs = 1000) {
     const response = await ipcQuery(socketPath, { type: 'ping' }, timeoutMs);
     if (response?.pong !== true || !Number.isInteger(response.pid) || response.pid <= 0)
@@ -99,6 +116,53 @@ function serviceProxyNeedsEcweb(cfg) {
         return false;
     return (cfg.serviceProxy.services ?? []).some(s => s.enabled !== false && s.source === 'ecweb');
 }
+function latestSourceMtime(dir) {
+    let latest = 0;
+    try {
+        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+            const filePath = path.join(dir, entry.name);
+            if (entry.isDirectory()) {
+                latest = Math.max(latest, latestSourceMtime(filePath));
+            }
+            else if (entry.isFile()) {
+                latest = Math.max(latest, fs.statSync(filePath).mtimeMs);
+            }
+        }
+    }
+    catch { }
+    return latest;
+}
+function sourceBuildNeedsRefresh() {
+    const packageRoot = getPackageRoot();
+    const sourceCli = path.join(packageRoot, 'src', 'cli', 'index.ts');
+    if (!fs.existsSync(sourceCli))
+        return false;
+    const daemonEntry = path.join(packageRoot, 'dist', 'index.js');
+    if (!fs.existsSync(daemonEntry))
+        return true;
+    const sourceMtime = Math.max(latestSourceMtime(path.join(packageRoot, 'src')), latestSourceMtime(path.join(packageRoot, 'ecagent', 'src')));
+    return sourceMtime > fs.statSync(daemonEntry).mtimeMs;
+}
+function requireFreshSourceBuild() {
+    if (!sourceBuildNeedsRefresh())
+        return true;
+    console.error('❌ 源码比 daemon 编译产物更新，服务未启动。');
+    console.error('  请先执行: ec stop && npm run build');
+    console.error('  然后执行: ec start');
+    process.exitCode = 2;
+    return false;
+}
+function requireCompletedDataMigration(root) {
+    const requirement = inspectDataMigrationRequirement(root);
+    if (!requirement.required)
+        return true;
+    console.error(`❌ 检测到 ${requirement.operationCount} 项待确认的用户数据迁移，服务未启动。`);
+    console.error('  先执行: ec data migrate --dry-run');
+    console.error('  确认后: ec data migrate --apply');
+    console.error('  迁移成功并校验后，再执行 ec start 或 ec restart。');
+    process.exitCode = 2;
+    return false;
+}
 // ==================== Commands ====================
 /**
  * 检测并展示跨 HOME 残留的 evolcore 主进程。
@@ -184,6 +248,8 @@ export async function cmdStart(opts = {}) {
         return;
     }
     ensureDataDirs();
+    if (!requireFreshSourceBuild())
+        return;
     // 旧配置自动迁移（daemon.json → 新结构）
     const { autoMigrateIfNeeded } = await import('../config-store.js');
     autoMigrateIfNeeded();
@@ -196,8 +262,16 @@ export async function cmdStart(opts = {}) {
         }
         else {
             console.log('⚡ 未检测到初始化配置，自动启动初始化向导...\n');
-            await cmdInit();
-            return;
+            // cmdStart 直接调用 cmdInit，不会经过 CLI 的 `init` 分发分支；
+            // 这里需显式抑制 AUN SDK 的常规 keystore 日志。
+            const { suppressSdkLogs } = await import('../aun/aid/index.js');
+            suppressSdkLogs();
+            await cmdInit({ invokedByStart: true });
+            if (!loadDefaults()) {
+                console.log('⚠ 初始化未完成，未启动 EvolCore。');
+                return;
+            }
+            console.log('\n初始化完成，开始启动 EvolCore ....');
         }
     }
     // 控制 AID 门禁：缺 aid 且交互式 → 只补全控制 AID + owners（不重走 baseagent 向导）。
@@ -236,20 +310,15 @@ export async function cmdStart(opts = {}) {
     }
     // 检查至少有一个 self-agent
     const { agents, skipped } = loadAllAgents();
+    const isControlAidBootstrap = opts.bindBootstrap && !!daemonCfgStart.aid;
+    const shouldPrintNoSelfAgentHints = agents.length === 0 && !isControlAidBootstrap;
     if (agents.length === 0) {
-        if (opts.bindBootstrap && daemonCfgStart.aid) {
+        if (isControlAidBootstrap) {
             console.log('ℹ 未配置任何 self-agent，绑定 bootstrap 将仅启动控制 AID');
         }
-        else {
-            console.log('ℹ 未配置任何 self-agent，将仅启动 Control Plane。');
-            console.log('  可通过控制 AID 远程创建 agent，或稍后运行 ec agent new <aid>.agentid.pub');
-            if (skipped.length > 0) {
-                console.log(`跳过的目录:`);
-                for (const s of skipped)
-                    console.log(`  - ${s.dirName}: ${s.reason}`);
-            }
-        }
     }
+    if (!requireCompletedDataMigration(p.root))
+        return;
     // 检查 instance 目录中的进程状态
     const status = scanInstances();
     const aliveMains = status.mains.filter(m => m.alive);
@@ -323,10 +392,22 @@ export async function cmdStart(opts = {}) {
             console.log(`  Logs: ${p.logs}/`);
             console.log(`⏱ ready in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
             if (!ecwebStartedBeforeDaemon) {
-                startEcwebIfEnabled(p).catch((err) => {
+                startEcwebIfEnabled(p)
+                    .then((ecwebStarted) => {
+                    if (shouldPrintNoSelfAgentHints) {
+                        printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted, skipped });
+                    }
+                })
+                    .catch((err) => {
                     console.error(`⚠ ECWeb 启动检查失败: ${err instanceof Error ? err.message : String(err)}`);
+                    if (shouldPrintNoSelfAgentHints) {
+                        printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted: false, skipped });
+                    }
                 });
             }
+            else if (shouldPrintNoSelfAgentHints) {
+                printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted: true, skipped });
+            }
         }, 500);
         let forwardingShutdown = false;
         const forwardSignal = (signal) => {
@@ -426,8 +507,10 @@ export async function cmdStart(opts = {}) {
             }
             console.log(`⏱ done in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
             // ECWeb 自动后台启动
-            if (!ecwebStartedBeforeDaemon)
-                await startEcwebIfEnabled(p);
+            const ecwebStarted = ecwebStartedBeforeDaemon || await startEcwebIfEnabled(p);
+            if (shouldPrintNoSelfAgentHints) {
+                printNoSelfAgentHints({ daemonConfig: loadDaemonConfig(), ecwebStarted, skipped });
+            }
             return;
         }
         // 超时
@@ -514,6 +597,8 @@ export async function cmdRestart(opts = {}) {
     }
     if (rejectPidIsolatedLifecycle('restart', initialStatus, ping))
         return;
+    if (!requireFreshSourceBuild())
+        return;
     // 版本检查与自动升级
     console.log('📦 Checking for updates...');
     const upgrade = await tryUpgrade();
@@ -557,6 +642,8 @@ export async function cmdRestart(opts = {}) {
             console.log(`⚠ ${WEB_PACKAGE_NAME} upgrade failed (${ecwebUpgrade.from} → ${ecwebUpgrade.to})`);
             break;
     }
+    if (!requireCompletedDataMigration(resolveRoot()))
+        return;
     // 停止所有活 main 进程（可能不止一个）
     const status = scanInstances();
     const aliveMains = status.mains.filter(m => m.alive);
@@ -813,7 +900,7 @@ export async function cmdStatus() {
         // Runtime statistics (read from sessions filesystem)
         if (fs.existsSync(p.sessionsDir)) {
             try {
-                const { scanChatDirs, scanMetaFiles, readJsonFile, readLastJsonlLine } = await import('../core/session/session-fs-store.js');
+                const { chatDirPath, scanChatDirs, scanMetaFiles, readJsonFile, readLastJsonlLine } = await import('../core/session/session-fs-store.js');
                 const chatDirs = scanChatDirs(p.sessionsDir);
                 const allSessions = [];
                 for (const { dirPath } of chatDirs) {
@@ -832,23 +919,42 @@ export async function cmdStatus() {
                 }
                 // 最近 5 个（按 updatedAt 倒排）
                 const recentSessions = [...allSessions].sort((a, b) => b.updatedAt - a.updatedAt).slice(0, 5);
-                // 检测 orphan：session 的 channel 实例名不在任何 self-agent 配置内
+                // 检测 orphan：按物理 session 路由而非历史 meta 判定。保留的旧
+                // 实例副本在唯一的当前实例已存在时属于迁移来源，不应误报。
                 let orphanCount = 0;
                 try {
                     const { agents } = loadAllAgents();
                     const configChannelNames = new Set();
+                    const configuredByAgentType = new Map();
                     for (const cfg of agents) {
                         // AUN 是从 agent 自身 AID 隐式派生的内建通道，不出现在 cfg.channels 里。
                         // 不补这条，所有 aun#<aid>#main 会话都会被误判成 orphan。
                         configChannelNames.add(`aun#${cfg.aid}#main`);
                         for (const inst of cfg.channels) {
                             // effective key: <type>#<selfAID>#<name>
-                            configChannelNames.add(`${inst.type}#${cfg.aid}#${inst.name}`);
+                            const channelKey = `${inst.type}#${cfg.aid}#${inst.name}`;
+                            configChannelNames.add(channelKey);
+                            const identity = `${inst.type}\0${cfg.aid}`;
+                            configuredByAgentType.set(identity, [...(configuredByAgentType.get(identity) ?? []), channelKey]);
                         }
                     }
-                    for (const s of allSessions) {
-                        if (!configChannelNames.has(s.channel) && !isNonAgentSessionChannel(s.channel))
-                            orphanCount++;
+                    // The daemon control identity owns AUN transcripts but deliberately
+                    // has no Agent config, so include it explicitly in route validity.
+                    const daemonConfig = readJsonFile(p.daemonConfig);
+                    if (daemonConfig?.aid)
+                        configChannelNames.add(`aun#${daemonConfig.aid}#main`);
+                    for (const chat of chatDirs) {
+                        const channelKey = chat.channelKey;
+                        if (!channelKey || configChannelNames.has(channelKey) || isNonAgentSessionChannel(channelKey))
+                            continue;
+                        const [type, aid] = channelKey.split('#');
+                        const candidates = type && aid ? configuredByAgentType.get(`${type}\0${aid}`) : undefined;
+                        if (candidates?.length === 1) {
+                            const canonical = chatDirPath(p.sessionsDir, type, chat.channelId, type === 'aun' ? aid : undefined, candidates[0]);
+                            if (canonical !== chat.dirPath && fs.existsSync(canonical))
+                                continue;
+                        }
+                        orphanCount++;
                     }
                 }
                 catch { }

package/dist/cli/data-command.js

@@ -0,0 +1,132 @@
+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 { scanInstances } from '../utils/instance-registry.js';
+import { isProcessRunning, killProcess } from '../utils/cross-platform.js';
+import { ipcQuery } from '../ipc.js';
+import { cmdStart, cmdStop } from './daemon-commands.js';
+function printSummary(manifest) {
+    const counts = manifest.operations.reduce((result, operation) => {
+        result[operation.status] = (result[operation.status] ?? 0) + 1;
+        return result;
+    }, {});
+    console.log(`migration: ${manifest.id}`);
+    console.log(`state: ${manifest.state}`);
+    console.log(`operations: ${manifest.operations.length}`);
+    console.log(`status: ${Object.entries(counts).map(([key, value]) => `${key}=${value}`).join(', ') || 'none'}`);
+    if (manifest.warnings.length) {
+        console.log('warnings:');
+        for (const warning of manifest.warnings)
+            console.log(`  - ${warning}`);
+        console.log('note: 上述数据无法唯一归属，因此被原样保留；本次不会迁移、修改或删除它们。');
+        console.log('next: 可继续迁移已计划项；如需迁移这些保留项，请补齐所属 Agent/通道或匹配的 Trigger 定义后重新执行 --dry-run。');
+    }
+    const failed = manifest.operations.filter(operation => operation.status === 'error');
+    if (failed.length) {
+        console.log('errors:');
+        for (const operation of failed)
+            console.log(`  - ${operation.id}: ${operation.error}`);
+    }
+}
+function latestMigrationId(root) {
+    const dir = path.join(root, 'data', 'daemon', 'migrations');
+    const candidates = fs.readdirSync(dir, { withFileTypes: true })
+        .filter(entry => entry.isFile() && entry.name.endsWith('.json'))
+        .map(entry => ({ name: entry.name.slice(0, -'.json'.length), mtime: fs.statSync(path.join(dir, entry.name)).mtimeMs }))
+        .sort((left, right) => right.mtime - left.mtime);
+    if (!candidates[0])
+        throw new Error('no migration manifest found');
+    return candidates[0].name;
+}
+async function daemonIpcReachable() {
+    const response = await ipcQuery(resolvePaths().socket, { type: 'ping' }, 1_000);
+    return response?.pong === true;
+}
+function liveRuntime() {
+    const status = scanInstances();
+    return {
+        mainCount: status.mains.filter(instance => instance.alive).length,
+        monitorPids: status.restartMonitors
+            .filter(instance => instance.alive)
+            .map(instance => instance.record.pid),
+    };
+}
+function delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+async function stopRestartMonitors(pids) {
+    for (const pid of pids)
+        killProcess(pid);
+    for (let attempt = 0; attempt < 8 && pids.some(isProcessRunning); attempt++)
+        await delay(250);
+    for (const pid of pids)
+        if (isProcessRunning(pid))
+            killProcess(pid, true);
+}
+async function waitForMaintenanceWindow() {
+    for (let attempt = 0; attempt < 12; attempt++) {
+        const runtime = liveRuntime();
+        if (runtime.mainCount === 0 && runtime.monitorPids.length === 0 && !await daemonIpcReachable())
+            return;
+        await delay(250);
+    }
+    const runtime = liveRuntime();
+    const ipc = await daemonIpcReachable();
+    throw new Error(`cannot begin migration while runtime remains active (main=${runtime.mainCount}, restart-monitor=${runtime.monitorPids.length}, ipc=${ipc})`);
+}
+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]');
+        return;
+    }
+    const root = resolveRoot();
+    if (args.includes('--dry-run')) {
+        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');
+    if (verify) {
+        // A completed migration's destination becomes live runtime data. Operator
+        // verification therefore validates source integrity and target structure
+        // without treating normal post-migration writes as a migration conflict.
+        const manifest = verifyDataMigration(readDataMigration(root, requestedId ?? latestMigrationId(root)), { strictTargetContent: false });
+        printSummary(manifest);
+        if (manifest.state === 'completed_with_errors')
+            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;
+    }
+}

package/dist/cli/index.js

@@ -53,6 +53,7 @@ AUN:
   mv                迁移项目目录和会话路径
 
 维护命令:
+  data migrate      迁移 per-Agent 用户数据（显式维护窗口）
   mode              切换开发源码与 npm 包运行模式
   restart-monitor   运行 daemon 重启监控器
   bench             AUN 消息性能基准测试
@@ -103,13 +104,13 @@ export async function main(args) {
 仅初始化 defaults.json:
   ec init                          交互式（写完 defaults.json 后嵌套 agent new）
   ec init --non-interactive [选项]
-    --baseagent <claude|codex|gemini>    默认: PATH 中第一个可用项
+    --baseagent <claude|codex|gemini|ecagent>    默认: PATH 中第一个可用项；ecagent 需显式选择
     --force                              已存在 defaults.json 时覆盖
 
 云部署非交互式初始化（结构化 JSON 输出）:
   ec init --non-interactive --owner <aid> [--format json] [选项]
     --owner <aid>                        必填。唯一 daemon owner AID
-    --baseagent <claude|codex|gemini>    可选。默认从 PATH 检测
+    --baseagent <claude|codex|gemini|ecagent>    可选。默认从 PATH 检测，ecagent 需显式选择
     --projectpath <abs-path>             可选。默认项目目录（必须绝对路径，自动创建）
     --ecweb                              可选。安装 EC Web 并启用自启动
     --format json                        可选但推荐。stdout 输出 init.result JSON
@@ -161,7 +162,7 @@ export async function main(args) {
                 const { suppressSdkLogs } = await import('../aun/aid/index.js');
                 suppressSdkLogs();
                 const nonInteractive = args.includes('--non-interactive');
-                await cmdInit({
+                const initialized = await cmdInit({
                     nonInteractive,
                     baseagent: getArgValue(args, '--baseagent'),
                     force: args.includes('--force'),
@@ -170,6 +171,8 @@ export async function main(args) {
                     ecweb: args.includes('--ecweb'),
                     format: getArgValue(args, '--format'),
                 });
+                if (!initialized)
+                    process.exitCode = 1;
             }
             break;
         case 'start':
@@ -253,6 +256,11 @@ export async function main(args) {
             }
             await cmdDiagnose();
             break;
+        case 'data': {
+            const { cmdData } = await import('./data-command.js');
+            await cmdData(args.slice(1));
+            break;
+        }
         case 'net': {
             const { cmdNet } = await import('./net-check.js');
             await cmdNet(args.slice(1));