evolcore 0.0.35 → 0.0.37

package/dist/cli/agent-create.js

@@ -4,14 +4,12 @@ import path from 'path';
 import readline from 'readline';
 import { parse } from 'yaml';
 import { resolvePaths, aunPath as defaultAunPath, agentConfig, agentDataDir, agentPersonalDir, aidLocalDir, agentMdPath } from '../paths.js';
-import { loadDefaults, loadAgent, saveAgent, ensureAgentDirSkeleton, loadDaemonConfig } from '../config-store.js';
+import { loadDefaults, loadAgent, saveAgent, ensureAgentDirSkeleton } from '../config-store.js';
 import { ConfigTarget, write as cfgWrite, ensureFile as cfgEnsure, read as cfgRead } from '../config/config-manager.js';
 import { ipcQuery } from '../ipc.js';
 import { CONFIG_SCHEMA_VERSION } from '../types.js';
 import { ensureInitialRoleRegistry } from '../config/role-service.js';
-import { addContact } from '../config/contact-request-service.js';
 import { getCodexAppServerAvailability } from '../agents/codex-runner.js';
-import { resolveEcagentConfig } from '../agents/baseagent.js';
 import { AUTO_BASEAGENT_CANDIDATES, BASEAGENT_CANDIDATES, detectAvailableBaseagents, } from '../agents/baseagent-availability.js';
 import { agentProjectRootFromDefaults, deriveAgentProjectPath } from '../utils/project-path.js';
 import { isValidAid } from '../aun/aid/validation.js';
@@ -21,6 +19,19 @@ import { isHClassPath, isLClassPath, isSameOrDescendant } from '../core/permissi
 import { MAIN_CLI_BIN } from '../product.js';
 import { uploadAvatarFile, uploadAvatarUrl } from '../utils/avatar-upload.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
+import { logger } from '../utils/logger.js';
+import { creationOwnershipBinding } from '../core/ownership/owner-resolver.js';
+/** Select the creation lifecycle independently of --non-interactive. */
+export function resolveAgentCreateMode(args) {
+    if (args.includes('--initialize') && args.includes('--bootstrap')) {
+        throw new Error('--initialize and --bootstrap are mutually exclusive');
+    }
+    for (const flag of ['--initialize', '--bootstrap']) {
+        if (args.filter(arg => arg === flag).length > 1)
+            throw new Error(`${flag} must be supplied once`);
+    }
+    return args.includes('--bootstrap') ? 'bootstrap' : 'initialize';
+}
 /** Parse the current Agent's Bootstrap welcome subcommand. */
 export function parseAgentWelcomeArgs(args) {
     const tail = args.at(-2) === '--format' && args.at(-1) === 'json' ? args.slice(0, -2) : args;
@@ -71,24 +82,17 @@ export function parseAgentTags(raw) {
     return [...new Set(tags)];
 }
 export function validateAgentOwnerOptions(options) {
-    if (options.owner !== undefined && options.owners !== undefined) {
-        return 'Options --owner and --owners are mutually exclusive';
-    }
-    if (options.owners !== undefined && (!Array.isArray(options.owners) || options.owners.length === 0)) {
-        return '--owners must be a non-empty JSON array of AIDs';
-    }
-    const owners = options.owners ?? (options.owner !== undefined ? [options.owner] : []);
-    if (owners.some(owner => typeof owner !== 'string' || !isValidAid(owner))) {
-        return 'Every owner must be a valid AID';
+    const owner = options.owner?.trim();
+    if (owner !== undefined && !isValidAid(owner)) {
+        return 'Owner must be a valid AID';
     }
     return null;
 }
 /** Shared by the standalone CLI and the authenticated daemon command path. */
 export function parseAgentOwnerArgs(argv) {
+    if (argv.includes('--owners'))
+        throw new Error('--owners has been removed; use one --owner <aid>');
     const hasOwner = argv.includes('--owner');
-    const hasOwners = argv.includes('--owners');
-    if (hasOwner && hasOwners)
-        throw new Error('Options --owner and --owners are mutually exclusive');
     const value = (flag) => {
         if (argv.filter(arg => arg === flag).length !== 1)
             throw new Error(`${flag} must be supplied once`);
@@ -100,71 +104,17 @@ export function parseAgentOwnerArgs(argv) {
     const options = {};
     if (hasOwner)
         options.owner = value('--owner');
-    if (hasOwners) {
-        const raw = value('--owners');
-        try {
-            options.owners = JSON.parse(raw);
-        }
-        catch {
-            throw new Error('--owners must be a non-empty JSON array of AIDs');
-        }
-    }
     const error = validateAgentOwnerOptions(options);
     if (error)
         throw new Error(error);
-    if (options.owners)
-        options.owners = [...new Set(options.owners)];
     return options;
 }
-function withStaticOwners(config, ownersInput) {
-    const values = (ownersInput ?? []).map(value => value.trim()).filter(Boolean);
-    if (values.length === 0)
-        return config;
-    const owners = config.owners ?? [];
-    return { ...config, owners: [...new Set([...owners, ...values])] };
-}
-function withStaticOwner(config, owner) {
-    return withStaticOwners(config, owner ? [owner] : undefined);
-}
-/**
- * An Agent owner must be able to receive the new Agent's Bootstrap reply.
- * Contact admission is per local Agent, so materialize the new AID in each
- * locally managed owner's contact book immediately after creation. Human or
- * remote owners have no local contact book and are reported as skipped.
- */
-export async function syncOwnerContactsAfterCreate(createdAid, owners) {
-    const synced = [];
-    const skipped = [];
-    const errors = [];
-    for (const ownerAid of [...new Set((owners ?? []).map(value => value.trim()).filter(Boolean))]) {
-        if (ownerAid === createdAid)
-            continue;
-        const ownerConfig = path.join(resolvePaths().agentsDir, ownerAid, 'config.json');
-        if (!fs.existsSync(ownerConfig)) {
-            skipped.push(ownerAid);
-            continue;
-        }
-        try {
-            await addContact({
-                selfAid: ownerAid,
-                primaryId: createdAid,
-                actorId: 'agent-create-owner-sync',
-            });
-            synced.push(ownerAid);
-        }
-        catch (error) {
-            errors.push(`${ownerAid}: ${error instanceof Error ? error.message : String(error)}`);
-        }
-    }
-    return {
-        ...(synced.length > 0 ? { ownerContactsSynced: synced } : {}),
-        ...(skipped.length > 0 ? { ownerContactsSkipped: skipped } : {}),
-        ...(errors.length > 0 ? { ownerContactSyncErrors: errors } : {}),
-    };
-}
 function pickDefaultBaseagent(available) {
     return AUTO_BASEAGENT_CANDIDATES.find(candidate => available.includes(candidate)) ?? null;
 }
+function pickInteractiveDefaultBaseagent(available) {
+    return available.includes('ecagent') ? 'ecagent' : pickDefaultBaseagent(available);
+}
 function readProjectMetadata(project) {
     try {
         const packageJsonPath = path.join(project, 'package.json');
@@ -196,7 +146,6 @@ export function resolveAgentCreatePlan(options, projectCwd = process.cwd()) {
     const project = path.resolve(projectCwd, options.project || '.');
     const metadata = readProjectMetadata(project);
     const defaults = loadDefaults();
-    const daemon = loadDaemonConfig();
     const configuredBaseagent = defaults?.active_baseagent;
     const available = detectAvailableBaseagents();
     const defaultBaseagent = configuredBaseagent && available.includes(configuredBaseagent)
@@ -206,9 +155,9 @@ export function resolveAgentCreatePlan(options, projectCwd = process.cwd()) {
     const baseagentSource = options.baseagent
         ? 'argument'
         : configuredBaseagent && baseagent === configuredBaseagent ? 'defaults' : 'detected';
-    const owners = options.owners;
-    const owner = options.owner?.trim() || (owners === undefined ? daemon.owners?.[0] : undefined);
-    const ownerSource = owners !== undefined || options.owner?.trim() ? 'argument' : owner ? 'daemon' : 'none';
+    const hasExplicitOwner = options.owner !== undefined;
+    const owner = options.owner?.trim() || undefined;
+    const ownerSource = hasExplicitOwner ? 'argument' : 'none';
     const name = options.name?.trim() || metadata.name || projectSlug(project);
     // description 是可选字段：用户显式传入的必须合规（超长会在校验阶段被拒）；
     // 从 package.json 推导出来的超长值直接弃用、回落默认短描述——用户没设过它，
@@ -224,7 +173,7 @@ export function resolveAgentCreatePlan(options, projectCwd = process.cwd()) {
     const type = requestedType ? (normalizeAgentType(requestedType) ?? requestedType) : DEFAULT_AGENT_TYPE;
     const configExists = isValidAid(aid) && fs.existsSync(path.join(resolvePaths().agentsDir, aid, 'config.json'));
     return {
-        aid, project, baseagent, owner, owners, handoff: options.handoff, avatarFile: options.avatarFile, avatarUrl: options.avatarUrl,
+        aid, project, baseagent, owner, avatarFile: options.avatarFile, avatarUrl: options.avatarUrl,
         name, description, type, tags: options.tags,
         force: options.force === true, configExists, baseagentSource, ownerSource,
         nameSource: options.name?.trim() ? 'argument' : metadata.name ? 'package' : 'directory',
@@ -237,7 +186,7 @@ export function validateAgentCreatePlan(plan) {
     if (ownerError)
         return ownerError;
     if (!isValidAid(plan.aid))
-        return `Invalid AID "${plan.aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)`;
+        return `Invalid AID "${plan.aid}": must be a valid multi-level domain (e.g. mybot.agentid.cn)`;
     if (plan.avatarFile !== undefined && plan.avatarUrl !== undefined)
         return '--avatar-file and --avatar-url are mutually exclusive';
     if (plan.configExists && !plan.force)
@@ -250,6 +199,9 @@ export function validateAgentCreatePlan(plan) {
     const typeError = validateAgentType(plan.type);
     if (typeError)
         return `Invalid --type: ${typeError}`;
+    if (normalizeAgentType(plan.type) === 'agent' && !plan.owner) {
+        return 'An owner AID is required when creating an agent';
+    }
     // 只有显式传入的 --description 才会超限（package.json 的超长值在 resolve 阶段
     // 已被弃用）。必须在这里就拒绝：否则 plan 通过、直到 agentmdPut 上传才失败，
     // 而那处是 warn 级不中断创建，最终留下一张 SDK 兜底名片（--type/--name 全部丢失）。
@@ -265,22 +217,8 @@ export function validateAgentCreatePlan(plan) {
     if (!detectAvailableBaseagents().includes(plan.baseagent)) {
         return `${plan.baseagent} is not available in the current environment`;
     }
-    if (plan.baseagent === 'ecagent') {
-        const reason = ecagentUnavailableReason();
-        if (reason)
-            return reason;
-    }
     return null;
 }
-function ecagentUnavailableReason() {
-    try {
-        resolveEcagentConfig({ agents: { ecagent: {} } });
-        return undefined;
-    }
-    catch (error) {
-        return error instanceof Error ? error.message : String(error);
-    }
-}
 function saveInitialBehavior(aid, baseagent) {
     const behavior = {
         active_baseagent: baseagent,
@@ -302,7 +240,7 @@ export async function agentCreateInteractive(opts = {}) {
     const ask = (q) => new Promise(r => rl.question(q, r));
     try {
         const { aidCreate, buildInitialAgentMd, agentmdPut } = await import('../aun/aid/index.js');
-        const aidPrompt = opts.suggestedName ? `AID [${opts.suggestedName}]: ` : 'AID (e.g. mybot.agentid.pub): ';
+        const aidPrompt = opts.suggestedName ? `AID [${opts.suggestedName}]: ` : 'AID (e.g. mybot.agentid.cn): ';
         let aid = '';
         while (!aid) {
             const aidInput = (await ask(aidPrompt)).trim();
@@ -312,7 +250,7 @@ export async function agentCreateInteractive(opts = {}) {
                 continue;
             }
             if (!isValidAid(candidate)) {
-                console.log(`  ⚠ Invalid AID "${candidate}": must be a valid multi-level domain (e.g. mybot.agentid.pub)`);
+                console.log(`  ⚠ Invalid AID "${candidate}": must be a valid multi-level domain (e.g. mybot.agentid.cn)`);
                 continue;
             }
             aid = candidate;
@@ -327,19 +265,6 @@ export async function agentCreateInteractive(opts = {}) {
                 return { ok: false, error: 'Aborted.' };
         }
         console.log(`\nCreating agent: ${aid}\n`);
-        let aidCreated = false;
-        try {
-            const result = await aidCreate(aid);
-            try {
-                await result.client.close();
-            }
-            catch { /* ignore */ }
-            aidCreated = !result.alreadyExisted;
-            console.log(`  ✓ AID ${result.alreadyExisted ? 'reused' : 'created'}: ${aid}`);
-        }
-        catch (e) {
-            return { ok: false, error: `AID creation failed: ${e?.message || e}` };
-        }
         let suggestedProjectPath = '';
         try {
             suggestedProjectPath = deriveAgentProjectPath(agentProjectRootFromDefaults(loadDefaults(), p.root), aid);
@@ -366,16 +291,12 @@ export async function agentCreateInteractive(opts = {}) {
                 return { ok: false, error: 'Aborted.' };
         }
         const available = detectAvailableBaseagents();
-        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.' };
+        if (available.length === 0) {
+            return { ok: false, error: 'No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server, or use bundled ecagent.' };
         }
-        const defaultBa = pickDefaultBaseagent(available);
+        const defaultBa = pickInteractiveDefaultBaseagent(available);
         let baseagent;
-        if (available.length === 1 && defaultBa) {
-            console.log(`  Baseagent: ${defaultBa}`);
-            baseagent = defaultBa;
-        }
-        else {
+        {
             let chosen = null;
             while (chosen === null) {
                 const defaultHint = defaultBa ? ` [${defaultBa}]` : '';
@@ -392,40 +313,19 @@ 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;
         }
-        const daemonCfg = loadDaemonConfig();
-        const daemonHasOwner = !!daemonCfg.owners?.length;
         let owner;
-        let skipQrBinding = false;
-        if (daemonHasOwner) {
-            const defaultOwner = daemonCfg.owners[0];
-            while (true) {
-                const ownerInput = (await ask(`Owner AID [${defaultOwner}]: `)).trim();
-                if (!ownerInput) {
-                    owner = defaultOwner;
-                    break;
-                }
-                if (ownerInput.toLowerCase() === 'new' || ownerInput.toLowerCase() === 'qr') {
-                    break;
-                }
-                if (!isValidAid(ownerInput)) {
-                    console.log(`  ⚠ Invalid Owner AID "${ownerInput}"`);
-                    continue;
-                }
-                owner = ownerInput;
-                skipQrBinding = true;
-                break;
+        while (true) {
+            const ownerInput = (await ask('Owner AID (required): ')).trim();
+            if (!isValidAid(ownerInput)) {
+                console.log(`  ⚠ Invalid Owner AID "${ownerInput}"`);
+                continue;
             }
+            owner = ownerInput;
+            break;
         }
         const defaultName = aid.split('.')[0];
         const agentName = (await ask(`Display name [${defaultName}]: `)).trim() || defaultName;
@@ -438,14 +338,28 @@ export async function agentCreateInteractive(opts = {}) {
             if (tagErrors.length > 0)
                 return { ok: false, error: `Invalid tags: ${tagErrors.join('; ')}` };
         }
+        let aidCreated = false;
+        try {
+            // Keep the registration connection independent from Ownership. Its
+            // authentication can be short-lived, so only submit binding after the
+            // complete agent.md has been published and the daemon has hot-loaded it.
+            const result = await aidCreate(aid, { type: 'agent' });
+            try {
+                await result.client.close();
+            }
+            catch { /* ignore */ }
+            aidCreated = !result.alreadyExisted;
+            console.log(`  ✓ AID ${result.alreadyExisted ? 'reused' : 'created'}: ${aid}`);
+        }
+        catch (e) {
+            return { ok: false, error: `AID creation failed: ${e?.message || e}` };
+        }
         if (ownRl)
             rl.close();
-        saveAgent(withStaticOwner({ $schema_version: CONFIG_SCHEMA_VERSION, aid, enabled: true, lifecycle: 'created', channels: [], projects: { defaultPath: projectPath } }, owner));
+        saveAgent({ $schema_version: CONFIG_SCHEMA_VERSION, aid, enabled: true, lifecycle: 'created', channels: [], projects: { defaultPath: projectPath } });
         ensureInitialRoleRegistry(aid);
         saveInitialBehavior(aid, baseagent);
         ensureAgentDirSkeleton(aid);
-        if (owner)
-            await syncOwnerContactsAfterCreate(aid, [owner]);
         let agentmdUploaded = false;
         try {
             const content = buildInitialAgentMd({ aid, name: agentName, description: agentDescription, tags: agentTags });
@@ -470,6 +384,13 @@ export async function agentCreateInteractive(opts = {}) {
         catch (e) {
             console.warn(`  ⚠ agent.md generation failed: ${e?.message || e}`);
         }
+        if (owner && agentmdUploaded) {
+            const config = loadAgent(aid);
+            if (config) {
+                config.lifecycle = 'ownerpending';
+                saveAgent(config);
+            }
+        }
         let hotLoaded = false;
         let hotLoadError;
         try {
@@ -480,41 +401,39 @@ export async function agentCreateInteractive(opts = {}) {
                 hotLoadError = ipcResult.error;
         }
         catch { /* daemon not running */ }
-        let ownerBoundAid;
+        let ownerBindRequestedAid;
         let ownerBindSkipped = false;
         let ownerBindInterrupted = false;
-        if (!owner && !skipQrBinding && process.stdin.isTTY && daemonHasOwner) {
+        if (owner && agentmdUploaded && hotLoaded) {
             try {
-                const { runAgentOwnerQrBindFlow } = await import('./init-channel.js');
-                const bound = await runAgentOwnerQrBindFlow(aid, agentName);
-                if (bound.action === 'bound')
-                    ownerBoundAid = bound.boundAid;
-                else if (bound.action === 'manual') {
-                    ownerBindSkipped = true;
-                    ownerBoundAid = await promptAgentOwnerManually(aid);
-                }
-                else
-                    ownerBindInterrupted = true;
+                const bindResult = await ipcQuery(p.socket, {
+                    type: 'aid.ownership',
+                    argv: ['aid', 'bind', owner, '--subject', aid],
+                }, 30_000);
+                if (!bindResult?.ok)
+                    throw new Error(bindResult?.error || 'Ownership bind failed');
+                ownerBindRequestedAid = owner;
             }
-            catch {
-                ownerBindSkipped = true;
-                ownerBoundAid = await promptAgentOwnerManually(aid);
+            catch (error) {
+                ownerBindInterrupted = true;
+                logger.warn(`[agent-create] Ownership bind interrupted for ${aid}: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
-        const finalOwnerAid = owner ?? ownerBoundAid;
-        const ownerContactSync = await syncOwnerContactsAfterCreate(aid, finalOwnerAid ? [finalOwnerAid] : undefined);
+        else if (owner && agentmdUploaded) {
+            ownerBindSkipped = true;
+        }
         return {
             ok: true,
             aid,
+            ownerAid: owner,
             configPath: toPosix(path.join(agentDirPath, 'config.json')),
             aidCreated,
             agentmdUploaded,
             hotLoaded,
             hotLoadError,
-            ownerBoundAid,
+            ownerBindRequestedAid,
             ownerBindSkipped,
             ownerBindInterrupted,
-            ...ownerContactSync,
         };
     }
     finally {
@@ -526,32 +445,6 @@ export async function agentCreateInteractive(opts = {}) {
         }
     }
 }
-async function promptAgentOwnerManually(aid) {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        while (true) {
-            const owner = (await new Promise(resolve => rl.question('\n扫码未完成。手动输入 agent owner AID（留空跳过）: ', resolve))).trim();
-            if (!owner)
-                return undefined;
-            if (!isValidAid(owner)) {
-                console.log('  ⚠ Owner AID 格式无效');
-                continue;
-            }
-            const agent = loadAgent(aid);
-            if (!agent)
-                return undefined;
-            saveAgent(withStaticOwner(agent, owner));
-            try {
-                await ipcQuery(resolvePaths().socket, { type: 'evolagent.reload', name: aid }, 30_000);
-            }
-            catch { /* daemon not running */ }
-            return owner;
-        }
-    }
-    finally {
-        rl.close();
-    }
-}
 export async function agentCreateNonInteractive(opts, runtime = {}) {
     const p = resolvePaths();
     const { aidCreate, buildInitialAgentMd, agentmdPut } = await import('../aun/aid/index.js');
@@ -560,6 +453,10 @@ export async function agentCreateNonInteractive(opts, runtime = {}) {
     const ownerError = validateAgentOwnerOptions(opts);
     if (ownerError)
         return failValidating(ownerError);
+    const ownerAid = opts.owner?.trim();
+    const agentType = normalizeAgentType(opts.type ?? DEFAULT_AGENT_TYPE) ?? opts.type ?? DEFAULT_AGENT_TYPE;
+    if (agentType === 'agent' && !ownerAid)
+        return failValidating('An owner AID is required when creating an agent');
     if (opts.tags !== undefined) {
         const tagErrors = validateAgentTags(opts.tags, { minCount: AGENT_TAG_MIN_COUNT, maxCount: AGENT_TAG_MAX_COUNT });
         if (tagErrors.length > 0)
@@ -577,7 +474,7 @@ export async function agentCreateNonInteractive(opts, runtime = {}) {
         }
     }
     if (!isValidAid(opts.aid))
-        return failValidating(`Invalid AID "${opts.aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)`);
+        return failValidating(`Invalid AID "${opts.aid}": must be a valid multi-level domain (e.g. mybot.agentid.cn)`);
     if (hasSuppliedInitialization(opts.aid))
         return failValidating('Use agent initialize --resume for this target');
     const agentDirPath = path.join(p.agentsDir, opts.aid);
@@ -585,25 +482,20 @@ export async function agentCreateNonInteractive(opts, runtime = {}) {
     if (configExists && !opts.force)
         return failValidating(`Agent "${opts.aid}" already exists: ${agentDirPath}/config.json (use --force to overwrite)`);
     const available = detectAvailableBaseagents();
-    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.');
+    if (available.length === 0)
+        return failValidating('No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server, or use bundled ecagent.');
     let baseagent;
     if (opts.baseagent) {
         if (!BASEAGENT_CANDIDATES.includes(opts.baseagent))
             return failValidating(`Invalid baseagent: ${opts.baseagent} (options: ${BASEAGENT_CANDIDATES.join('/')})`);
         if (!available.includes(opts.baseagent))
             return failValidating(opts.baseagent === 'codex' ? getCodexAppServerAvailability().reason || `${opts.baseagent} is not available in the current environment` : `${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 {
         const defaultBaseagent = pickDefaultBaseagent(available);
         if (!defaultBaseagent)
-            return failValidating('ecagent is optional; pass --baseagent ecagent after configuring its API key');
+            return failValidating('ecagent is optional; pass --baseagent ecagent to select it explicitly');
         baseagent = defaultBaseagent;
     }
     if (!path.isAbsolute(opts.project))
@@ -619,8 +511,13 @@ export async function agentCreateNonInteractive(opts, runtime = {}) {
     opts.onPhase?.('validating', 'done');
     opts.onPhase?.('registering_aid', 'begin');
     let aidCreated = false;
+    // Do not persist a pending registration ownership intent here. Avatar
+    // publication uses an AUN short connection, and the SDK may resume that
+    // intent as soon as the short connection is authenticated, before the final
+    // agent.md (including avatar) has been published. Submit the bind only after
+    // the final card is in place and the Agent has a long-lived channel.
     try {
-        const result = await aidCreate(opts.aid);
+        const result = await aidCreate(opts.aid, { type: agentType });
         try {
             await result.client.close();
         }
@@ -643,17 +540,16 @@ export async function agentCreateNonInteractive(opts, runtime = {}) {
         catch { /* ignore */ }
     }
     opts.onPhase?.('config_saved', 'begin');
-    saveAgent(withStaticOwners({ $schema_version: CONFIG_SCHEMA_VERSION, aid: opts.aid, enabled: true, lifecycle: preservedLifecycle, channels: [], projects: { defaultPath: opts.project } }, opts.owners ?? (opts.owner ? [opts.owner] : undefined)));
+    saveAgent({ $schema_version: CONFIG_SCHEMA_VERSION, aid: opts.aid, enabled: true, lifecycle: preservedLifecycle, channels: [], projects: { defaultPath: opts.project } });
     ensureInitialRoleRegistry(opts.aid);
     saveInitialBehavior(opts.aid, baseagent);
     ensureAgentDirSkeleton(opts.aid);
-    const ownerContactSync = await syncOwnerContactsAfterCreate(opts.aid, opts.owners ?? (opts.owner ? [opts.owner] : undefined));
     opts.onPhase?.('config_saved', 'done');
     opts.onPhase?.('uploading_agentmd', 'begin');
     let agentmdUploaded = false;
     let agentmdError;
     try {
-        const content = buildInitialAgentMd({ aid: opts.aid, name: opts.name, description: opts.description, type: opts.type, tags: opts.tags });
+        const content = buildInitialAgentMd({ aid: opts.aid, name: opts.name, description: opts.description, type: agentType, tags: opts.tags });
         const aunPath = process.env.AUN_HOME || defaultAunPath();
         let lastError;
         for (let attempt = 1; attempt <= 3; attempt++) {
@@ -679,6 +575,13 @@ export async function agentCreateNonInteractive(opts, runtime = {}) {
         agentmdError = `generation failed: ${e?.message || e}`;
         opts.onPhase?.('uploading_agentmd', 'warn', agentmdError);
     }
+    if (ownerAid && agentmdUploaded) {
+        const config = loadAgent(opts.aid);
+        if (config) {
+            config.lifecycle = 'ownerpending';
+            saveAgent(config);
+        }
+    }
     let avatarUploaded = false;
     if (opts.avatarFile || opts.avatarUrl) {
         opts.onPhase?.('uploading_avatar', 'begin');
@@ -726,18 +629,57 @@ export async function agentCreateNonInteractive(opts, runtime = {}) {
         hotLoadError = error instanceof Error ? error.message : String(error);
         opts.onPhase?.('hot_loading', 'warn', hotLoadError);
     }
+    let ownerBindRequestedAid;
+    let ownerBindSkipped = false;
+    let ownerBindInterrupted = false;
+    let ownershipBinding;
+    if (ownerAid && agentmdUploaded && hotLoaded) {
+        try {
+            let state;
+            if (runtime.bindOwnerAgent) {
+                state = await runtime.bindOwnerAgent(opts.aid, ownerAid);
+            }
+            else {
+                const bindResult = await ipcQuery(p.socket, {
+                    type: 'aid.ownership',
+                    argv: ['aid', 'bind', ownerAid, '--subject', opts.aid],
+                }, 30_000);
+                if (!bindResult?.ok)
+                    throw new Error(bindResult?.error || 'Ownership bind failed');
+                state = bindResult.state;
+            }
+            ownerBindRequestedAid = ownerAid;
+            // Reusing an existing identity (including a failed-create retry) cannot
+            // prove that an SDK-reused task originated in this creation attempt.
+            const binding = aidCreated ? creationOwnershipBinding(state?.task, opts.aid, ownerAid) : undefined;
+            if (binding) {
+                opts.onOwnershipBinding?.(binding);
+                ownershipBinding = binding;
+            }
+        }
+        catch (error) {
+            ownerBindInterrupted = true;
+            logger.warn(`[agent-create] Ownership bind interrupted for ${opts.aid}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    else if (ownerAid && agentmdUploaded) {
+        ownerBindSkipped = true;
+    }
     return {
         ok: true,
         aid: opts.aid,
-        ownerAid: (opts.owners ?? (opts.owner ? [opts.owner] : undefined))?.[0],
+        ownerAid,
         configPath: toPosix(path.join(agentDirPath, 'config.json')),
         aidCreated,
         agentmdUploaded,
         agentmdError,
         hotLoaded,
         hotLoadError,
+        ownerBindRequestedAid,
+        ownerBindSkipped,
+        ownerBindInterrupted,
+        ...(ownershipBinding ? { ownershipBinding } : {}),
         ...(opts.avatarFile || opts.avatarUrl ? { avatarUploaded } : {}),
-        ...ownerContactSync,
     };
 }
 // ---- One-shot Agent initialization (kept with Agent creation) ----
@@ -755,7 +697,7 @@ export function initializationPath(aid) {
 }
 export function initializationFingerprint(plan) {
     return createHash('sha256').update(JSON.stringify([
-        plan.aid, plan.project, plan.baseagent, plan.owners, plan.name,
+        plan.aid, plan.project, plan.baseagent, plan.ownerAid, plan.name,
         plan.description, plan.type, plan.tags, plan.persona ?? null,
         plan.avatarFile ?? null, plan.avatarUrl ?? null,
     ])).digest('hex');
@@ -824,15 +766,17 @@ function failure(code, error = code) {
     throw Object.assign(new Error(error), { code });
 }
 export function validateInitializationPlan(plan) {
-    if (!plan.name?.trim() || !plan.description?.trim() || !Array.isArray(plan.tags) || !plan.owners?.length) {
-        failure('INITIALIZE_FIELDS_REQUIRED', 'Explicit name, description, tags and owners are required');
+    if (!plan.name?.trim() || !plan.description?.trim() || !Array.isArray(plan.tags) || !plan.ownerAid?.trim()) {
+        failure('INITIALIZE_FIELDS_REQUIRED', 'Explicit name, description, tags and one Owner AID are required');
     }
+    if (!isValidAid(plan.ownerAid))
+        failure('INVALID_ARGS', 'Owner must be a valid AID');
     if (plan.type !== 'agent')
         failure('INVALID_ARGS', 'Initialized targets must have type=agent');
     if (plan.avatarFile !== undefined && plan.avatarUrl !== undefined)
         failure('INVALID_ARGS', 'avatar-file and avatar-url are mutually exclusive');
     const error = validateAgentCreatePlan({
-        ...plan, force: false, configExists: false, baseagentSource: 'argument', ownerSource: 'argument',
+        ...plan, owner: plan.ownerAid, force: false, configExists: false, baseagentSource: 'argument', ownerSource: 'argument',
         nameSource: 'argument', descriptionSource: 'argument', typeSource: 'argument',
     });
     if (error)
@@ -931,6 +875,20 @@ export class AgentInitializationService {
         }
         return this.status(aid);
     }
+    resumeForOwner(aid, ownerAid) {
+        if (!ownerAid)
+            return;
+        try {
+            const record = readInitialization(aid);
+            if (!record || record.status !== 'in_progress' || record.phase !== 'ownerpending'
+                || this.running.has(aid))
+                return;
+            this.resume(aid, record.actor);
+        }
+        catch (error) {
+            logger.warn(`[Initialization] Owner-consensus recovery failed for ${aid}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     async cancel(aid) {
         const r = readInitialization(aid);
         if (!r || r.status === 'complete')
@@ -987,7 +945,6 @@ export class AgentInitializationService {
         if (r.configSaved && (!config || config.enabled === false))
             failure('INITIALIZE_TARGET_CHANGED');
         if (config && (config.initialization?.operationId !== r.operationId
-            || JSON.stringify(config.owners) !== JSON.stringify(r.plan.owners)
             || config.active_baseagent !== r.plan.baseagent || config.projects?.defaultPath !== r.plan.project)) {
             failure('INITIALIZE_TARGET_CHANGED');
         }
@@ -1000,13 +957,13 @@ export class AgentInitializationService {
     async run(r) {
         const p = r.plan;
         this.phase(r, 'registering_aid');
-        await this.deps.register(p.aid);
+        await this.deps.register(p.aid, p.ownerAid);
         this.phase(r, 'config_saved');
         fs.mkdirSync(p.project, { recursive: true });
         if (!loadAgent(p.aid)) {
             saveAgent({
                 $schema_version: CONFIG_SCHEMA_VERSION, aid: p.aid, enabled: true, lifecycle: 'created',
-                initialization: { mode: 'supplied', operationId: r.operationId }, channels: [], owners: p.owners,
+                initialization: { mode: 'supplied', operationId: r.operationId }, channels: [],
                 projects: { defaultPath: p.project }, active_baseagent: p.baseagent,
                 baseagents: { [p.baseagent]: {} }, chatmode: { private: 'interactive', group: 'proactive', nothuman: 'proactive' },
             });
@@ -1022,7 +979,6 @@ export class AgentInitializationService {
             fs.writeFileSync(file, p.persona, { encoding: 'utf8', mode: 0o600 });
         }
         const resolvedAvatarFile = p.avatarFile;
-        await syncOwnerContactsAfterCreate(p.aid, p.owners);
         this.phase(r, 'uploading_agentmd');
         let remote;
         if (r.publicationStarted) {
@@ -1088,13 +1044,22 @@ export class AgentInitializationService {
         }
         r.published = true;
         r.verified = true;
-        this.phase(r, 'hot_loading');
-        const config = loadAgent(p.aid);
-        if (config.lifecycle !== 'active') {
-            config.lifecycle = 'bootstrapping';
-            saveAgent(config);
+        const currentConfig = loadAgent(p.aid);
+        if (currentConfig.lifecycle !== 'ownerpending') {
+            currentConfig.lifecycle = 'ownerpending';
+            saveAgent(currentConfig);
         }
+        this.phase(r, 'hot_loading');
         await this.deps.hotLoad(p.aid);
+        if (this.deps.bindOwner)
+            await this.deps.bindOwner(p.aid, p.ownerAid);
+        this.phase(r, 'ownerpending');
+        const ownership = await this.deps.checkOwner(p.aid, p.ownerAid);
+        this.check(r);
+        if (ownership === 'pending')
+            return;
+        if (ownership === 'conflict')
+            failure('INITIALIZE_OWNER_CONFLICT', 'Fresh Ownership consensus does not confirm the requested Owner');
         this.phase(r, 'activating');
         if (p.persona !== undefined && fs.readFileSync(path.join(agentPersonalDir(p.aid), 'persona.md'), 'utf8') !== p.persona) {
             failure('INITIALIZE_PLAN_CONFLICT');
@@ -1145,9 +1110,11 @@ export function parseInitializationArgs(args) {
     const resume = args[0] === 'initialize';
     if ((!resume && args[0] !== 'new') || !isValidAid(args[1] ?? ''))
         throw new Error('Invalid initialization command or AID');
+    if (!resume && resolveAgentCreateMode(args) !== 'initialize')
+        throw new Error('--bootstrap cannot initialize an agent');
     const booleans = new Set(resume ? ['--resume'] : ['--initialize', '--non-interactive', '--dry-run']);
     const strings = new Set(resume ? ['--wait', '--format'] : [
-        '--project', '--baseagent', '--owner', '--owners', '--name', '--description', '--tags', '--type', '--avatar-file', '--avatar-url',
+        '--project', '--baseagent', '--owner', '--name', '--description', '--tags', '--type', '--avatar-file', '--avatar-url',
         '--persona-file', '--persona-text', '--wait', '--format',
     ]);
     const seen = new Set();
@@ -1164,8 +1131,8 @@ export function parseInitializationArgs(args) {
             values[flag] = value;
         }
     }
-    if (!seen.has(resume ? '--resume' : '--initialize'))
-        throw new Error(resume ? '--resume required' : '--initialize required');
+    if (resume && !seen.has('--resume'))
+        throw new Error('--resume required');
     if (values['--format'] !== undefined && values['--format'] !== 'json')
         throw new Error('--format must be json');
     if (seen.has('--persona-file') && seen.has('--persona-text'))
@@ -1201,7 +1168,7 @@ export function resolveInitializationPlan(args, context) {
         name: v['--name'], description: v['--description'], tags: parseAgentTags(v['--tags']), type: v['--type'],
     }, context?.projectCwd);
     return {
-        aid: p.aid, project: p.project, baseagent: p.baseagent ?? '', owners: p.owners ?? (p.owner ? [p.owner] : []),
+        aid: p.aid, project: p.project, baseagent: p.baseagent ?? '', ownerAid: p.owner ?? '',
         name: p.name, description: p.description, tags: p.tags, type: p.type,
         ...(persona !== undefined ? { persona } : {}),
         ...(v['--avatar-file'] !== undefined ? { avatarFile: v['--avatar-file'] } : {}),