evolcore 0.0.35 → 0.0.37

package/dist/cli/init.js

@@ -7,14 +7,15 @@ import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
 import { saveDefaultsSafe, loadAllAgents, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
 import { ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
-import { ensureControlAgentMd, generateControlAid, resolveControlAidDomain } from '../aun/aid/control-aid.js';
+import { ensureControlAgentMd, generateControlAid, resolveControlAidDomain, submitControlAidRegistration, } from '../aun/aid/control-aid.js';
+import { isValidAid } from '../aun/aid/validation.js';
 import { getCodexAppServerAvailability } from '../agents/codex-runner.js';
-import { DEFAULT_ECAGENT_BASE_URL, resolveEcagentConfig } from '../agents/baseagent.js';
+import { resolveCodexCliPath, resolveCodexPowerShellShimPath, } from '../agents/baseagent.js';
 import { defaultProjectsRoot } from '../utils/project-path.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST } from '../product.js';
 import { autostartInstalled, autostartPlatformLabel, configureAutostart } from '../utils/autostart.js';
-import { askInit, isInitCancelledError, printInitCancelHint } from './init-cancel.js';
-import { AUTO_BASEAGENT_CANDIDATES, BASEAGENT_CANDIDATES, detectAvailableBaseagents, } from '../agents/baseagent-availability.js';
+import { askInit, printInitCancelHint } from './init-cancel.js';
+import { AUTO_BASEAGENT_CANDIDATES, BASEAGENT_CANDIDATES, detectAvailableBaseagents, detectBaseagentDetails, } from '../agents/baseagent-availability.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return askInit(rl, question);
@@ -28,7 +29,7 @@ export function expandLeadingTildePath(value, homeDir = os.homedir()) {
     }
     return value;
 }
-function detectAvailable(codexAvailability = getCodexAppServerAvailability()) {
+async function detectAvailable(codexAvailability = getCodexAppServerAvailability()) {
     return detectAvailableBaseagents(codexAvailability);
 }
 /** Offer installation only when the probe positively identified an old CLI. */
@@ -63,23 +64,23 @@ export async function maybeUpgradeCodexForInit(availability, dependencies) {
 function pickDefault(available) {
     return AUTO_BASEAGENT_CANDIDATES.find(candidate => available.includes(candidate));
 }
-function ecagentUnavailableReason() {
-    try {
-        resolveEcagentConfig({ agents: { ecagent: {} } });
-        return undefined;
-    }
-    catch (error) {
-        return error instanceof Error ? error.message : String(error);
-    }
+function pickInteractiveDefault(available) {
+    return available.includes('ecagent') ? 'ecagent' : pickDefault(available);
+}
+function hasConfiguredProcessOwner(config) {
+    const controlAid = config.aid?.toLowerCase();
+    return [config.owner, ...(config.owners ?? [])].some(owner => (typeof owner === 'string'
+        && isValidAid(owner)
+        && owner.toLowerCase() !== controlAid));
 }
-function buildDefaults(chosen, available, projectsDefaultPath, ecagentConfig) {
+function buildDefaults(chosen, available, projectsDefaultPath) {
     const baseagents = {};
     for (const b of available) {
         baseagents[b] = {};
     }
     // ecagent is bundled with EvolCore, so declare it even when the caller
     // supplies a reduced availability list (for example, a test probe).
-    baseagents.ecagent = ecagentConfig ?? baseagents.ecagent ?? {};
+    baseagents.ecagent = baseagents.ecagent ?? {};
     return {
         $schema_version: 1,
         active_baseagent: chosen,
@@ -87,13 +88,13 @@ function buildDefaults(chosen, available, projectsDefaultPath, ecagentConfig) {
         ...(projectsDefaultPath ? { projects: { defaultPath: projectsDefaultPath } } : {}),
     };
 }
-function writeDefaults(chosen, available, projectsDefaultPath, ecagentConfig) {
-    saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath, ecagentConfig));
+function writeDefaults(chosen, available, projectsDefaultPath) {
+    saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath));
 }
 function hasCompletedInitConfig() {
     const p = resolvePaths();
     const daemon = loadDaemonConfig();
-    if (!daemon.aid || !Array.isArray(daemon.owners) || daemon.owners.length === 0)
+    if (!daemon.aid)
         return false;
     try {
         const defaults = JSON.parse(fs.readFileSync(p.defaultsConfig, 'utf8'));
@@ -132,23 +133,6 @@ function applyExplicitAutostart(enabled, runtimeRoot) {
 export function needsControlAidInit(aid, isTty) {
     return !aid && isTty;
 }
-/** 解析用户输入的 owner AID 列表：按空白/逗号分隔，去空、去重、按 isValid 分流。
- *  空输入 → valid:[]（视为跳过）。 */
-export function parseOwnerAids(raw, isValid) {
-    const tokens = raw.split(/[\s,]+/).map(t => t.trim()).filter(Boolean);
-    const valid = [];
-    const invalid = [];
-    for (const t of tokens) {
-        if (isValid(t)) {
-            if (!valid.includes(t))
-                valid.push(t);
-        }
-        else {
-            invalid.push(t);
-        }
-    }
-    return { valid, invalid };
-}
 function installErrorMessage(e) {
     return String(e?.stderr || e?.message || e).trim();
 }
@@ -255,7 +239,7 @@ export async function cmdInit(options) {
             }
         }
     }
-    const available = detectAvailable(codexAvailability);
+    const available = await detectAvailable(codexAvailability);
     if (available.length === 0) {
         console.log('❌ 未检测到可用 baseagent。请安装至少一款：');
         console.log('  - claude CLI');
@@ -264,21 +248,32 @@ export async function cmdInit(options) {
         console.log('\n安装后重新运行 ec init');
         return false;
     }
-    console.log('检测到可用的 baseagent:');
-    for (const b of available) {
-        const version = b === 'codex' ? codexAvailability.version : undefined;
-        console.log(`  ● ${b}${version ? ` (CLI ${version})` : ''}`);
+    console.log('baseagent 检测结果:');
+    const detections = detectBaseagentDetails(codexAvailability);
+    for (const detection of detections) {
+        if (detection.detected) {
+            const version = detection.version ? `，CLI ${detection.version}` : '';
+            const source = detection.detectionSource.includes('内置') ? '内置' : `可用${version}`;
+            console.log(`  ● ${detection.id} (${source})`);
+        }
+        else if (detection.version || (detection.id === 'codex'
+            && (resolveCodexCliPath() || resolveCodexPowerShellShimPath()))) {
+            console.log(`  ○ ${detection.id} (已安装但不可用：${detection.reason ?? '未知原因'})`);
+        }
+        else {
+            console.log(`  ○ ${detection.id} (未安装)`);
+        }
     }
     console.log('');
     const defaultsPath = p.defaultsConfig;
     const defaultsExisted = fs.existsSync(defaultsPath);
     // “已初始化”以 daemon.json 为准：文件存在且控制 AID 已生成。
-    // 删除 daemon.json（aid 丢失）即视为未初始化，向导会重新补全 aid + owners。
+    // 删除 daemon.json（aid 丢失）即视为未初始化，向导会重新补全 aid。
     const initialized = fs.existsSync(p.daemonConfig) && !!loadDaemonConfig().aid;
     // ── 3. 非交互式分支 ──
     if (options?.nonInteractive) {
         if (defaultsExisted && !options.force) {
-            // defaults 已存在且未 --force：不重写 defaults，但仍落到共享 tail（幂等补全控制 AID/owners）。
+            // defaults 已存在且未 --force：不重写 defaults，但仍落到共享 tail（幂等补全控制 AID）。
             console.log(`配置已存在: ${defaultsPath}（加 --force 可覆盖）`);
         }
         else {
@@ -295,19 +290,12 @@ export async function cmdInit(options) {
                     console.log(`❌ ${options.baseagent} 当前环境不可用${reason ? `：${reason}` : `（可用: ${available.join('/')}）`}`);
                     return false; // 硬错误：不落 tail
                 }
-                if (options.baseagent === 'ecagent') {
-                    const reason = ecagentUnavailableReason();
-                    if (reason) {
-                        console.log(`❌ ecagent 当前环境不可用：${reason}`);
-                        return false;
-                    }
-                }
                 chosen = options.baseagent;
             }
             else {
                 const defaultBaseagent = pickDefault(available);
                 if (!defaultBaseagent) {
-                    console.log('❌ ecagent 为可选 baseagent，请显式使用 --baseagent ecagent，并配置 API key');
+                    console.log('❌ ecagent 为可选 baseagent，请显式使用 --baseagent ecagent');
                     return false;
                 }
                 chosen = defaultBaseagent;
@@ -333,11 +321,7 @@ export async function cmdInit(options) {
     async function runInteractive() {
         const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         async function askBaseagent() {
-            const defaultBa = pickDefault(available);
-            if (available.length === 1 && defaultBa) {
-                console.log(`  baseagent: ${defaultBa}`);
-                return defaultBa;
-            }
+            const defaultBa = pickInteractiveDefault(available);
             let chosen = null;
             while (chosen === null) {
                 const defaultHint = defaultBa ? ` [${defaultBa}]` : '';
@@ -391,59 +375,13 @@ export async function cmdInit(options) {
                 return resolved;
             }
         }
-        async function askEcagentConfig() {
-            let configured;
-            try {
-                const raw = JSON.parse(fs.readFileSync(defaultsPath, 'utf8'));
-                const candidate = raw?.baseagents?.ecagent;
-                if (candidate && typeof candidate === 'object' && !Array.isArray(candidate)) {
-                    configured = candidate;
-                }
-            }
-            catch {
-                // A malformed or missing defaults file should not prevent the user
-                // from supplying a fresh ecagent configuration during init.
-                configured = undefined;
-            }
-            const usable = (value) => {
-                if (typeof value !== 'string')
-                    return false;
-                const normalized = value.trim();
-                if (!normalized)
-                    return false;
-                const lower = normalized.toLowerCase();
-                return !lower.includes('your-') && !lower.includes('placeholder');
-            };
-            const configuredBaseUrl = [
-                configured?.baseUrl,
-                process.env.ECAGENT_BASE_URL,
-                DEFAULT_ECAGENT_BASE_URL,
-            ].find(usable) || DEFAULT_ECAGENT_BASE_URL;
-            const baseUrl = (await ask(rl, `ecagent Base URL [${configuredBaseUrl}]: `)).trim() || configuredBaseUrl;
-            const configuredApiKey = usable(configured?.apiKey) ? configured.apiKey.trim() : undefined;
-            const environmentApiKeyName = !configuredApiKey
-                ? (usable(process.env.ECAGENT_API_KEY)
-                    ? 'ECAGENT_API_KEY'
-                    : usable(process.env.OPENAI_API_KEY) ? 'OPENAI_API_KEY' : undefined)
-                : undefined;
-            let apiKey = '';
-            while (!apiKey) {
-                const suffix = configuredApiKey || environmentApiKeyName ? '（回车保留当前配置）' : '（必填）';
-                const input = (await ask(rl, `ecagent API Key ${suffix}: `)).trim();
-                apiKey = input || configuredApiKey || (environmentApiKeyName ? '${' + environmentApiKeyName + '}' : '');
-                if (!apiKey)
-                    console.log('  API Key 不能为空，请重新输入');
-            }
-            return { apiKey, baseUrl };
-        }
         try {
             if (defaultsExisted) {
                 const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
                 if (ans === 'y' || ans === 'yes') {
                     const chosen = await askBaseagent();
-                    const ecagentConfig = chosen === 'ecagent' ? await askEcagentConfig() : undefined;
                     const projectsDefaultPath = await askProjectsDefaultPath();
-                    writeDefaults(chosen, available, projectsDefaultPath, ecagentConfig);
+                    writeDefaults(chosen, available, projectsDefaultPath);
                     console.log(`\n✓ 已覆盖: ${defaultsPath}`);
                     console.log(`  active_baseagent: ${chosen}\n`);
                 }
@@ -453,9 +391,8 @@ export async function cmdInit(options) {
             }
             else {
                 const chosen = await askBaseagent();
-                const ecagentConfig = chosen === 'ecagent' ? await askEcagentConfig() : undefined;
                 const projectsDefaultPath = await askProjectsDefaultPath();
-                writeDefaults(chosen, available, projectsDefaultPath, ecagentConfig);
+                writeDefaults(chosen, available, projectsDefaultPath);
                 console.log(`\n✓ 已创建: ${defaultsPath}`);
                 console.log(`  active_baseagent: ${chosen}\n`);
             }
@@ -468,7 +405,7 @@ export async function cmdInit(options) {
         }
     }
 }
-/** 补全控制 AID + owners（可单独调用，不走 baseagent 向导）。 */
+/** 补全控制 AID + owner（可单独调用，不走 baseagent 向导）。 */
 export async function initTail(options = {}) {
     // 提示创建 agent（两分支汇合后执行一次）
     const { agents } = loadAllAgents();
@@ -481,7 +418,6 @@ export async function initTail(options = {}) {
     let controlAidReady = !!daemonConfig.aid;
     let autoStartReady = true;
     const autoStartExplicit = options.autoStart !== undefined;
-    let ownerBindingInterrupted = false;
     if (daemonConfig.aid) {
         console.log(`✓ 控制 AID 已存在: ${daemonConfig.aid}`);
         try {
@@ -508,11 +444,10 @@ export async function initTail(options = {}) {
     if (!options.nonInteractive && process.stdin.isTTY) {
         const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
         try {
-            await handleOwnersPrompt(rl);
-            if (!ownerBindingInterrupted) {
-                await handleEcwebPrompt(rl);
-                await handleAutostartPrompt(rl);
-            }
+            if (!await handleOwnersPrompt(rl))
+                return false;
+            await handleEcwebPrompt();
+            await handleAutostartPrompt();
         }
         finally {
             try {
@@ -521,12 +456,16 @@ export async function initTail(options = {}) {
             catch { /* ignore */ }
         }
     }
-    else if (options.autoStart !== undefined) {
-        autoStartReady = applyAutostart(options.autoStart);
+    else {
+        if (!hasConfiguredProcessOwner(loadDaemonConfig())) {
+            console.error('❌ 未配置有效的进程级管理者 AID；请在交互式终端运行 ec init 完成配置。');
+            return false;
+        }
+        if (options.autoStart !== undefined) {
+            autoStartReady = applyAutostart(options.autoStart);
+        }
     }
-    if (ownerBindingInterrupted)
-        return false;
-    async function handleAutostartPrompt(rl) {
+    async function handleAutostartPrompt() {
         if (options.autoStart !== undefined) {
             autoStartReady = applyAutostart(options.autoStart);
             return;
@@ -537,12 +476,7 @@ export async function initTail(options = {}) {
             console.log(`✓ ${autostartPlatformLabel()} 登录自启已启用`);
             return;
         }
-        const platform = autostartPlatformLabel();
-        const answer = (await ask(rl, `\n是否启用 ${platform} 登录自启？[y/N] `)).trim().toLowerCase();
-        if (answer === 'y' || answer === 'yes')
-            autoStartReady = applyAutostart(true);
-        else
-            console.log(`  已跳过 ${platform} 登录自启（可日后重新运行 ec init 开启）`);
+        autoStartReady = applyAutostart(true);
     }
     function applyAutostart(enabled) {
         const result = configureAutostart(enabled, resolvePaths().root);
@@ -560,84 +494,50 @@ export async function initTail(options = {}) {
     }
     async function handleOwnersPrompt(rl) {
         const daemonConfigForOwners = loadDaemonConfig();
-        if (daemonConfigForOwners.aid && (!daemonConfigForOwners.owners || daemonConfigForOwners.owners.length === 0)) {
-            const needOwner = (await ask(rl, '\n是否配置进程级管理者（Owner AID）？[Y/n] ')).trim().toLowerCase();
-            if (!needOwner || needOwner === 'y' || needOwner === 'yes') {
-                console.log('\n📡 进程级管理者绑定 — 请用 evol app 扫描二维码\n');
-                // QR 绑定流程需要暂时关闭 rl，因为它会创建自己的输入监听
-                rl.pause();
-                try {
-                    const { runDaemonOwnerQrBindFlow } = await import('./init-channel.js');
-                    const result = await runDaemonOwnerQrBindFlow();
-                    if (result.action === 'bound') {
-                        console.log(`  ✓ 已配置管理者: ${result.boundAid}`);
-                    }
-                    else if (result.action === 'manual') {
-                        // QR 流程失败，恢复 rl 并提示手动输入
-                        rl.resume();
-                        await promptOwnersManually(rl);
-                    }
-                    else {
-                        ownerBindingInterrupted = true;
-                    }
+        if (!hasConfiguredProcessOwner(daemonConfigForOwners)) {
+            let ownerAid = '';
+            while (!ownerAid) {
+                const input = (await ask(rl, '请输入 EvolCore 管理者 AID: ')).trim();
+                if (!isValidAid(input)) {
+                    console.log(`  ⚠ 跳过非法 AID: ${input}`);
+                    console.log('  未输入合法 AID，不可跳过，请重新输入');
+                    continue;
                 }
-                catch (e) {
-                    if (isInitCancelledError(e))
-                        throw e;
-                    console.log(`  ⚠ 扫码绑定不可用: ${e?.message || e}`);
-                    rl.resume();
-                    await promptOwnersManually(rl);
+                if (daemonConfigForOwners.aid && input.toLowerCase() === daemonConfigForOwners.aid.toLowerCase()) {
+                    console.log('  ⚠ 管理者 AID 不能与本机 EvolCore 控制 AID 相同，请重新输入');
+                    continue;
                 }
-                // QR 流程成功完成后恢复 rl
-                rl.resume();
-            }
-            else {
-                console.log('  已跳过 owners 配置（可日后编辑 daemon.json 或重跑 ec init）');
+                ownerAid = input;
             }
-        }
-    }
-    async function promptOwnersManually(rl) {
-        const { isValidAid } = await import('../aun/aid/index.js');
-        const raw = (await ask(rl, '\n请输入 EvolCore 管理者 AID: ')).trim();
-        if (raw) {
-            const { valid, invalid } = parseOwnerAids(raw, isValidAid);
-            if (invalid.length > 0)
-                console.log(`  ⚠ 跳过非法 AID: ${invalid.join(', ')}`);
-            if (valid.length > 0) {
-                saveDaemonConfig({ ...loadDaemonConfig(), owners: valid });
-                console.log(`  ✓ 已配置管理者: ${valid.join(', ')}`);
+            try {
+                saveDaemonConfig({ ...daemonConfigForOwners, owner: ownerAid });
             }
-            else {
-                console.log('  未输入合法 AID，已跳过 owners 配置');
+            catch (error) {
+                console.error(`  ❌ 进程级管理者配置失败: ${error instanceof Error ? error.message : String(error)}`);
+                return false;
             }
+            console.log(`✓ 已配置进程级管理者: ${ownerAid}`);
         }
-        else {
-            console.log('  已跳过 owners 配置（可日后编辑 daemon.json 或重跑 ec init）');
+        if (daemonConfigForOwners.aid) {
+            console.log('\nℹ️ 一期不在 ec init 中执行 Evol App 扫码绑定。');
+            console.log('  请先启动 EvolCore，发起绑定后由外部 Owner SDK 明确审批：');
+            console.log('  ec aid bind <ownerAid>');
+            console.log('  使用 ec aid bind status 查看共识与运行态同步。');
         }
+        return true;
     }
-    async function handleEcwebPrompt(rl) {
+    async function handleEcwebPrompt() {
         const daemonConfigForEcweb = loadDaemonConfig();
         if (ecwebService(daemonConfigForEcweb.services)?.enabled === undefined) {
-            const ans = (await ask(rl, '\n是否在 ec start 时自动启动 ECWeb 控制台？[y/N] ')).trim().toLowerCase();
-            if (ans === 'y' || ans === 'yes') {
-                const installResult = await ensureEcwebInstalledForInit();
-                if (installResult.ok) {
-                    const cfg = loadDaemonConfig();
-                    saveDaemonConfig({
-                        ...cfg,
-                        services: setEcwebEnabled(cfg.services, true),
-                    });
-                    console.log('  ✓ 已启用 ECWeb（ec start 将自动在后台启动）');
-                    console.log('  提示：首次访问运行 ec watch web 查看配对码和 URL');
-                }
-                else {
-                    const cfg = loadDaemonConfig();
-                    saveDaemonConfig({
-                        ...cfg,
-                        services: setEcwebEnabled(cfg.services, false),
-                    });
-                    console.log('  提示：安装完成后运行 ec start；如需立即打开控制台，运行 ec watch web');
-                }
+            const installResult = await ensureEcwebInstalledForInit();
+            if (installResult.ok) {
+                const cfg = loadDaemonConfig();
+                saveDaemonConfig({
+                    ...cfg,
+                    services: setEcwebEnabled(cfg.services, true),
+                });
+                console.log('  ✓ 已启用 ECWeb（ec start 将自动在后台启动）');
+                console.log('  提示：首次访问运行 ec watch web 查看配对码和 URL');
             }
             else {
                 const cfg = loadDaemonConfig();
@@ -645,7 +545,7 @@ export async function initTail(options = {}) {
                     ...cfg,
                     services: setEcwebEnabled(cfg.services, false),
                 });
-                console.log('  已跳过（可日后运行 ec watch web 手动启动，或编辑 daemon.json）');
+                console.log('  提示：安装完成后运行 ec start；如需立即打开控制台，运行 ec watch web');
             }
         }
     }
@@ -665,7 +565,7 @@ export async function initTail(options = {}) {
     console.log('\n✓ EvolCore 初始化完成');
     const finalCfg = loadDaemonConfig();
     console.log(`  控制 AID: ${finalCfg.aid || '(未配置)'}`);
-    console.log(`  管理者: ${finalCfg.owners?.join(', ') || '(未配置)'}`);
+    console.log('  协议 Owner: 启动后使用 ec aid bind status 核验');
     console.log(`  ECWeb 自启动: ${ecwebService(finalCfg.services)?.enabled ? '已启用' : '已禁用'}`);
     const { agents: finalAgents } = loadAllAgents();
     if (finalAgents.length === 0) {
@@ -737,7 +637,8 @@ function emitResult(result, format) {
         process.stdout.write(JSON.stringify(result) + '\n');
     }
     else if (result.success) {
-        console.log(`✓ 初始化成功: controlAid=${result.controlAid} ownerAid=${result.ownerAid}`);
+        console.log(`✓ 初始化成功: controlAid=${result.controlAid}，Owner 绑定: ${result.bindingStatus}`);
+        console.log(`  启动服务后查询: ec aid bind status --subject ${result.controlAid}`);
     }
     else {
         console.error(`❌ ${result.error.code}: ${result.error.message}`);
@@ -768,7 +669,7 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
     if (!isValidAid(opts.owner)) {
         fail('INVALID_OWNER', `invalid owner AID: ${opts.owner}`, EXIT_USAGE, format);
     }
-    const ownerAid = opts.owner;
+    const ownerAid = opts.owner.toLowerCase();
     // ── 2. 单进程互斥 ──
     const aliveMains = scanInstances().mains.filter(m => m.alive);
     if (aliveMains.length > 0) {
@@ -776,9 +677,9 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
         fail('DAEMON_RUNNING', `EvolCore daemon is running (PID: ${pids}); run 'ec stop' first`, EXIT_USAGE, format);
     }
     // ── 3. baseagent 探测 + 校验 ──
-    const available = dependencies.availableBaseagents ?? detectAvailable();
-    if (available.length === 0 || (available.length === 1 && available[0] === 'ecagent' && ecagentUnavailableReason())) {
-        fail('BASEAGENT_UNAVAILABLE', 'no usable baseagent detected (install claude/codex/gemini or configure bundled ecagent)', EXIT_USAGE, format);
+    const available = dependencies.availableBaseagents ?? await detectAvailable();
+    if (available.length === 0) {
+        fail('BASEAGENT_UNAVAILABLE', 'no usable baseagent detected (install claude/codex/gemini or use bundled ecagent)', EXIT_USAGE, format);
     }
     let chosenBaseagent;
     if (opts.baseagent) {
@@ -789,17 +690,12 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
             const reason = opts.baseagent === 'codex' ? getCodexAppServerAvailability().reason : undefined;
             fail('BASEAGENT_UNAVAILABLE', `${opts.baseagent} not available${reason ? `: ${reason}` : ''}`, EXIT_USAGE, format);
         }
-        if (opts.baseagent === 'ecagent') {
-            const reason = ecagentUnavailableReason();
-            if (reason)
-                fail('BASEAGENT_UNAVAILABLE', reason, EXIT_USAGE, format);
-        }
         chosenBaseagent = opts.baseagent;
     }
     else {
         const defaultBaseagent = pickDefault(available);
         if (!defaultBaseagent) {
-            fail('BASEAGENT_UNAVAILABLE', 'ecagent is optional; pass --baseagent ecagent after configuring its API key', EXIT_USAGE, format);
+            fail('BASEAGENT_UNAVAILABLE', 'ecagent is optional; pass --baseagent ecagent to select it explicitly', EXIT_USAGE, format);
         }
         chosenBaseagent = defaultBaseagent;
     }
@@ -819,16 +715,8 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
         }
         projectsDefaultPath = opts.projectpath;
     }
-    // ── 5. owner 冲突检测 ──
+    // ── 5. 读取现有配置；协议冲突由 SDK 注册意图及共识判定 ──
     const existingCfg = loadDaemonConfig();
-    const existingOwners = existingCfg.owners ?? [];
-    const sameOwner = existingOwners.length === 1 && existingOwners[0] === ownerAid;
-    const differentOwner = existingOwners.length > 0 && !sameOwner;
-    if (differentOwner && !opts.force) {
-        fail('OWNER_EXISTS', `owners already set to [${existingOwners.join(', ')}]; use --force to override`, EXIT_USAGE, format);
-    }
-    const forced = differentOwner && !!opts.force;
-    const previousOwners = forced ? [...existingOwners] : undefined;
     // ── 6. EC Web 安装（先安装成功，再写 enabled 配置）──
     if (opts.ecweb === true) {
         const ensureEcweb = dependencies.ensureEcweb ?? (() => ensureEcwebInstalledForInit({ quiet: true }));
@@ -860,13 +748,14 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
     if (!controlAid) {
         try {
             const aidDomain = resolveControlAidDomain(existingCfg.aun?.defaultAidDomain);
-            const { aid } = await generateControlAid(aidDomain);
+            const { aid } = await generateControlAid(aidDomain, { silent: format === 'json' });
             controlAid = aid;
         }
         catch (e) {
             fail('CONTROL_AID_CREATE_FAILED', `control AID creation failed: ${e?.message || e}`, EXIT_RUNTIME, format);
         }
     }
+    let controlAgentMdError;
     if (controlAid) {
         const certPath = path.join(resolvePaths().root, 'AIDs', controlAid, 'public', 'cert.pem');
         if (!fs.existsSync(certPath)) {
@@ -874,6 +763,7 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
             // cannot be signed or uploaded by this process. Avoid entering the SDK
             // network path during non-interactive init; later daemon startup can
             // retry once the identity material is provisioned.
+            controlAgentMdError = `Local certificate not found for ${controlAid}`;
             console.error(`control AID agent.md publish skipped: local certificate not found for ${controlAid}`);
         }
         else {
@@ -881,6 +771,7 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
                 await ensureControlAgentMd(controlAid);
             }
             catch (e) {
+                controlAgentMdError = installErrorMessage(e);
                 // A registered control AID remains usable when the Name Service is
                 // temporarily unavailable; startup and the next init retry publication.
                 if (format === 'json') {
@@ -894,13 +785,12 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
             }
         }
     }
-    // ── 9. 写 daemon.json（aid + owners + ecweb）──
+    // ── 9. 先保存控制身份，再调用 Owner 绑定服务；不写本地 Owner 授权 ──
     try {
         const next = {
             ...existingCfg,
             $schema_version: existingCfg.$schema_version ?? 1,
             aid: controlAid,
-            owners: [ownerAid],
             ...(opts.ecweb === true
                 ? { services: setEcwebEnabled(existingCfg.services, true) }
                 : {}),
@@ -924,13 +814,21 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
         }
         autostartWarning = autostart.warning;
     }
-    // ── 10. 输出 init.result ──
+    // ── 10. 复用 Agent 创建流程的显式 Owner 绑定；不等待人工审批 ──
+    let binding;
+    try {
+        binding = await (dependencies.submitRegistration ?? submitControlAidRegistration)(controlAid, ownerAid, {
+            ...(controlAgentMdError ? { agentMdError: controlAgentMdError } : {}),
+        });
+    }
+    catch (error) {
+        binding = { status: 'failed', error: { code: 'BIND_SUBMIT_FAILED', message: installErrorMessage(error) } };
+    }
     const result = {
         type: 'init.result',
         success: true,
         controlAid: controlAid,
         ownerAid,
-        owners: [ownerAid],
         ecwebEnabled: opts.ecweb === true || ecwebService(existingCfg.services)?.enabled === true,
         baseagent: chosenBaseagent,
         projectsDefaultPath: projectsDefaultPath ?? null,
@@ -938,7 +836,16 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
         daemonConfigPath: p.daemonConfig,
         ...(autostartBackend ? { autoStartBackend: autostartBackend } : {}),
         ...(autostartWarning ? { autoStartWarning: autostartWarning } : {}),
-        ...(forced ? { forced: true, previousOwners } : {}),
+        bindingStatus: binding.status,
+        binding,
+        bindingCommand: `ec aid bind ${ownerAid} --subject ${controlAid}`,
     };
+    if (binding.status === 'failed' || binding.status === 'unknown') {
+        const error = binding.error ?? { code: 'BIND_SUBMIT_FAILED', message: 'Registration invitation was not confirmed' };
+        emitResult({ ...result, success: false, initialized: true, error }, format);
+        process.exitCode = ['INVALID_OWNER', 'OWNER_INTENT_CONFLICT', 'OWNER_ALREADY_BOUND', 'BIND_CONFLICT'].includes(error.code)
+            ? EXIT_USAGE : EXIT_RUNTIME;
+        return;
+    }
     emitResult(result, format);
 }

package/dist/cli/queue-command.js

@@ -3,6 +3,7 @@ import { ipcQuery } from '../ipc.js';
 import { readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
+import { parseTimeArg, TIME_ARG_FORMATS } from './cli-argv.js';
 export async function cmdQueue(args) {
     args = canonicalizeEvolcoreCommandArgv(['ec', 'queue', ...args]).slice(2);
     if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
@@ -12,8 +13,10 @@ export async function cmdQueue(args) {
 
 查询:
   --agent <aid>           必填，目标 agent（如 mybot.agentid.pub）
-  --after <time>          只显示 adapter 接收时间晚于该值的消息（epoch ms 或 ISO）
-  --before <time>         只显示 adapter 接收时间早于该值的消息（epoch ms 或 ISO）
+  --after <time>          只显示 adapter 接收时间晚于该值的消息
+  --before <time>         只显示 adapter 接收时间早于该值的消息
+                          <time>：epoch 毫秒/秒、ISO 8601、YYYY-MM-DD HH:mm:ss [+08:00]、
+                          YYYY/MM/DD HH:mm:ss、相对时间 30s/5m/2h/1d、now
   --showid                显示 messageId
   --full                  显示完整消息内容（不截断）
   --format json           以 JSON 格式输出
@@ -143,9 +146,9 @@ JSON 时间字段:
 function parseQueueTime(value, flag) {
     if (value === undefined)
         return undefined;
-    const parsed = /^\d+$/.test(value) ? Number(value) : Date.parse(value);
-    if (!Number.isFinite(parsed)) {
-        console.error(`❌ ${flag} 必须是 epoch 毫秒或 ISO 时间: ${value}`);
+    const parsed = parseTimeArg(value);
+    if (parsed === undefined) {
+        console.error(`❌ ${flag} 不是有效时间: ${value}（支持 ${TIME_ARG_FORMATS}）`);
         process.exit(1);
     }
     return parsed;
@@ -181,9 +184,9 @@ export function parseQueueOperationArgv(argv) {
         const value = flags.get(flag);
         if (value === undefined)
             return undefined;
-        const parsed = /^\d+$/.test(value) ? Number(value) : Date.parse(value);
-        if (!Number.isFinite(parsed))
-            throw new Error(`Invalid ${flag}`);
+        const parsed = parseTimeArg(value);
+        if (parsed === undefined)
+            throw new Error(`Invalid ${flag}（支持 ${TIME_ARG_FORMATS}）`);
         return parsed;
     };
     const after = time('--after');