evolcore 0.0.35 → 0.0.36

package/dist/core/command/agent-control.js

@@ -1,3 +1,5 @@
+import fs from 'node:fs';
+import { ownerResolver } from '../ownership/owner-resolver.js';
 import { agentFullAccessStatus, agentFullAccessWriteError } from '../role/runtime-policy.js';
 import { initializationSummary } from '../../cli/agent-create.js';
 import { agentDelete, agentEnable, agentDisable, agentList, agentShow, agentSet, agentReload, } from '../../cli/agent.js';
@@ -12,7 +14,8 @@ import { uploadAvatar, uploadAvatarUrl } from '../../utils/avatar-upload.js';
 import { agentmdGet, agentmdPut, updateAgentMdFrontmatterName } from '../../aun/aid/agentmd.js';
 import { isValidAid } from '../../aun/aid/validation.js';
 import { isSupportedBaseagent } from '../../agents/baseagent.js';
-const SUPPORTED_AGENT_PATCH_FIELDS = new Set(['aid', 'name', 'avatar', 'active_baseagent', 'baseagents', 'projects', 'owners', 'fullaccess', 'chatmode', 'channels', 'channelOwners']);
+import { resolveProviderServiceForBaseagent } from '../../config/providers.js';
+const SUPPORTED_AGENT_PATCH_FIELDS = new Set(['aid', 'name', 'avatar', 'active_baseagent', 'baseagents', 'projects', 'owner', 'owners', 'fullaccess', 'chatmode', 'channels', 'channelOwners']);
 const HIDDEN_VALUE = '[hidden]';
 const SENSITIVE_CONFIG_KEYS = new Set([
     'apikey',
@@ -192,6 +195,28 @@ function normalizeStringList(value, label) {
     }
     return { ok: true, value: out };
 }
+function normalizeOwnerPatch(value, label, options) {
+    if (Object.hasOwn(value, 'owner')) {
+        if (value.owner === null && !options.required)
+            return { ok: true, value: undefined };
+        if (typeof value.owner !== 'string')
+            return { ok: false, error: `${label}.owner 必须是字符串` };
+        const owner = value.owner.trim();
+        if (!owner && options.required)
+            return { ok: false, error: `${label}.owner 不能为空` };
+        return { ok: true, value: owner || undefined };
+    }
+    if (Object.hasOwn(value, 'owners')) {
+        if (!Array.isArray(value.owners))
+            return { ok: false, error: `${label}.owners 必须是字符串数组` };
+        const first = value.owners.find(item => typeof item === 'string' && item.trim());
+        const owner = typeof first === 'string' ? first.trim() : undefined;
+        if (!owner && options.required)
+            return { ok: false, error: `${label}.owners 至少需要一个 owner` };
+        return { ok: true, value: owner };
+    }
+    return { ok: false, error: `${label} 缺少 owner` };
+}
 function normalizeChannelOwnersPatch(value) {
     if (!Array.isArray(value))
         return { ok: false, error: 'channelOwners 必须是数组' };
@@ -207,15 +232,15 @@ function normalizeChannelOwnersPatch(value) {
         if (!type || !name)
             return { ok: false, error: `channelOwners[${idx}] 缺少 type/name` };
         if (type === 'aun')
-            return { ok: false, error: 'AUN 渠道 owner 由 agent 顶层 owners 管理，不支持 channelOwners 编辑' };
-        const owners = normalizeStringList(item.owners, `channelOwners[${idx}].owners`);
-        if (!owners.ok)
-            return owners;
+            return { ok: false, error: 'AUN 渠道 owner 由 agent 顶层 owner 管理，不支持 channelOwners 编辑' };
+        const owner = normalizeOwnerPatch(item, `channelOwners[${idx}]`, { required: false });
+        if (!owner.ok)
+            return owner;
         const key = `${type}\0${name}`;
         if (seen.has(key))
             return { ok: false, error: `channelOwners 重复渠道: ${type}/${name}` };
         seen.add(key);
-        out.push({ type, name, owners: owners.value });
+        out.push({ type, name, owner: owner.value });
     }
     return { ok: true, value: out };
 }
@@ -237,14 +262,17 @@ function applyChannelOwnersPatch(config, patch) {
             ownerAids: channel.ownerAids,
             admins: channel.admins,
         });
-        channel.owners = item.owners;
-        delete channel.owner;
+        if (item.owner)
+            channel.owner = item.owner;
+        else
+            delete channel.owner;
+        delete channel.owners;
         delete channel.ownerId;
         delete channel.ownerAid;
         delete channel.ownerIds;
         delete channel.ownerAids;
         delete channel.admins;
-        const after = JSON.stringify({ owners: channel.owners });
+        const after = JSON.stringify({ owner: channel.owner });
         if (before !== after)
             changed = true;
     }
@@ -294,7 +322,8 @@ function buildSafeAgentConfig(config) {
     return sanitizeConfigValue({
         ...config,
         active_baseagent: config.active_baseagent ?? null,
-        owners: config.owners ?? [],
+        owner: ownerResolver.knownOwner(config.aid) ?? null,
+        owners: ownerResolver.knownOwners(config.aid),
         channels: config.channels ?? [],
         baseagents: config.baseagents ?? {},
         projects: stripUnsupportedProjectFields(config.projects) ?? {},
@@ -311,6 +340,7 @@ function buildCreateProgressOnlyAgent(aid, progress) {
             model: null,
             effort: null,
             chatmode: null,
+            owner: null,
             owners: [],
             channels: [],
         },
@@ -325,6 +355,71 @@ function buildCreateProgressOnlyAgent(aid, progress) {
         createProgress: progress,
     };
 }
+function failedCreateRetryAllowed(aid, agentDir, service) {
+    const progress = readCreateStatus(agentDir);
+    if ((!progress && fs.existsSync(path.join(agentDir, 'create-status.json')))
+        || (progress && (!Array.isArray(progress.steps)
+            || progress.steps.some(step => !step || typeof step.phase !== 'string'
+                || !['in_progress', 'done', 'warn', 'failed'].includes(step.state))))) {
+        return { allowed: false, force: false, error: '已有创建进度无法读取，拒绝覆盖' };
+    }
+    if (progress && progress.aid !== aid) {
+        return { allowed: false, force: false, error: '创建进度状态与 AID 不匹配' };
+    }
+    if (progress?.status === 'in_progress') {
+        return { allowed: false, force: false, error: '该 Agent 正在创建中' };
+    }
+    if (progress?.status === 'failed' && (progress.currentPhase === 'hot_loading'
+        || progress.currentPhase === 'applying_config'
+        || progress.steps.some(step => step.phase === 'hot_loading' || step.phase === 'applying_config'))) {
+        return { allowed: false, force: false, error: '该 Agent 已进入加载流程，拒绝重建' };
+    }
+    const configPath = path.join(agentDir, 'config.json');
+    if (!fs.existsSync(configPath)) {
+        if (progress && progress.status !== 'failed') {
+            return { allowed: false, force: false, error: '已有创建记录不是可重试的失败状态' };
+        }
+        return { allowed: true, force: false };
+    }
+    if (progress?.status !== 'failed') {
+        return { allowed: false, force: false, error: `Agent "${aid}" already exists` };
+    }
+    let lifecycle;
+    try {
+        const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        if (!config || typeof config !== 'object' || Array.isArray(config) || config.aid !== aid) {
+            return { allowed: false, force: false, error: '已有 Agent 配置与 AID 不匹配，拒绝覆盖' };
+        }
+        lifecycle = config && typeof config === 'object' && !Array.isArray(config)
+            ? config.lifecycle
+            : undefined;
+    }
+    catch {
+        return { allowed: false, force: false, error: '已有 Agent 配置无法读取，拒绝覆盖' };
+    }
+    if (lifecycle !== 'created' && lifecycle !== 'ownerpending') {
+        return { allowed: false, force: false, error: `Agent "${aid}" 已进入运行生命周期，拒绝重建` };
+    }
+    // A legacy retry may have overwritten the original progress. Check live state
+    // independently before allowing the creator's destructive --force path.
+    if (!service)
+        return { allowed: false, force: false, error: '无法确认 Agent 运行状态，拒绝重建' };
+    try {
+        if (service.info(aid))
+            return { allowed: false, force: false, error: '该 Agent 已加载，拒绝重建' };
+        const ownership = ownerResolver.snapshot(aid);
+        if (ownership.connected || ownership.consensusStatus === 'consensus' || ownership.task?.status === 'completed') {
+            return { allowed: false, force: false, error: '该 Agent 已连接或已确认 Ownership，拒绝重建' };
+        }
+        if (ownership.requestStatus === 'error') {
+            return { allowed: false, force: false, error: '无法确认 Agent Ownership 状态，拒绝重建' };
+        }
+    }
+    catch {
+        return { allowed: false, force: false, error: '无法确认 Agent 运行状态，拒绝重建' };
+    }
+    return { allowed: true, force: true };
+}
 /** 后台异步：实际创建 agent + 落 model/effort/chatmode，全程写构建进度（D3）。
  *  失败仅写日志 + create-status，不回传（受理即返回）。
  *  agentSet key 对照 cli/agent.ts 的 setNestedValue：
@@ -338,6 +433,10 @@ async function runCreateInBackground(opts, w, service) {
             project: opts.project, owner: opts.owner,
             description: opts.description,
             tags: opts.tags,
+            // Publish the avatar before hot-load starts Ownership with agent.md.
+            avatarUrl: opts.avatarUrl,
+            force: opts.retryFailedCreate === true,
+            onOwnershipBinding: binding => w.setOwnershipBinding(binding),
             onPhase: (phase, state, detail) => {
                 if (state === 'begin') {
                     curPhase = phase;
@@ -355,24 +454,51 @@ async function runCreateInBackground(opts, w, service) {
             ? await service.create(createOptions)
             : await agentCreateNonInteractive(createOptions);
         if (!('ok' in res) || res.ok !== true) {
-            // 硬失败：onPhase('failed') 已写终态；这里仅兜底日志（防回调未覆盖的 return 路径）
-            const err = res.error;
+            // Service adapters may return a failure without emitting an onPhase callback.
+            const err = String(res.error || 'Agent creation failed');
+            w.finishFailed(curPhase, err);
             logger.warn(`[agent-control] create ${opts.aid} failed: ${err}`);
             return;
         }
-        // 环节 4：applying_config（model/effort/chatmode，agentCreateNonInteractive 之外）
-        if (opts.model || opts.effort || opts.chatmode) {
+        if (res.aidCreated && res.ownershipBinding)
+            w.setOwnershipBinding(res.ownershipBinding);
+        // 环节 4：applying_config（provider/model/effort/chatmode，agentCreateNonInteractive 之外）
+        if (opts.provider || opts.providerServiceType || opts.model || opts.effort || opts.chatmode) {
             curPhase = 'applying_config';
             w.begin('applying_config');
             let warned;
-            if (opts.model) {
+            if (opts.provider) {
+                const config = service?.readConfig(opts.aid) ?? cfgRead(ConfigTarget.Agent, { self: opts.aid });
+                if (!config)
+                    throw new Error('Agent config is unavailable after creation');
+                const baseagents = config.baseagents && typeof config.baseagents === 'object' ? { ...config.baseagents } : {};
+                const current = baseagents[opts.baseagent] && typeof baseagents[opts.baseagent] === 'object'
+                    ? { ...baseagents[opts.baseagent] }
+                    : {};
+                baseagents[opts.baseagent] = {
+                    ...current,
+                    provider: opts.provider,
+                    ...(opts.providerServiceType ? { providerServiceType: opts.providerServiceType } : {}),
+                    ...(opts.model ? { model: opts.model } : {}),
+                    ...(opts.effort ? { effort: opts.effort } : {}),
+                };
+                config.baseagents = baseagents;
+                if (service)
+                    service.writeConfig(opts.aid, config);
+                else
+                    cfgWrite(ConfigTarget.Agent, config, { self: opts.aid });
+                const reload = service ? await service.reload(opts.aid) : await agentReload(opts.aid);
+                if (!('ok' in reload) || !reload.ok)
+                    warned = `provider saved but Agent reload failed: ${reload.error || 'unknown error'}`;
+            }
+            if (!opts.provider && opts.model) {
                 const r = service
                     ? await service.setConfig(opts.aid, `baseagents.${opts.baseagent}.model`, opts.model)
                     : await agentSet(opts.aid, `baseagents.${opts.baseagent}.model`, opts.model);
                 if (!('ok' in r) || !r.ok)
                     warned = `model: ${r.error}`;
             }
-            if (opts.effort) {
+            if (!opts.provider && opts.effort) {
                 const r = service
                     ? await service.setConfig(opts.aid, `baseagents.${opts.baseagent}.effort`, opts.effort)
                     : await agentSet(opts.aid, `baseagents.${opts.baseagent}.effort`, opts.effort);
@@ -444,6 +570,8 @@ export async function execAgentAction(action, args, peerId, eventBus, service, s
         if (!a.aid || !a.name || !a.baseagent) {
             return { error: '缺少必填参数：aid / name / baseagent', code: 'INVALID_ARGS' };
         }
+        if (typeof a.aid !== 'string' || !isValidAid(a.aid))
+            return { error: '无效 Agent AID', code: 'INVALID_ARGS' };
         const owner = typeof a.owner === 'string' && a.owner.trim() ? a.owner.trim() : peerId.trim();
         if (!owner)
             return { error: '缺少 owner AID', code: 'INVALID_ARGS' };
@@ -453,16 +581,51 @@ export async function execAgentAction(action, args, peerId, eventBus, service, s
             return { error: 'project 缺失（调用方应先解析默认项目路径）', code: 'INVALID_ARGS' };
         }
         const model = typeof a.model === 'string' && a.model.trim() ? a.model.trim() : undefined;
+        if (a.provider !== undefined && typeof a.provider !== 'string')
+            return { error: 'provider 必须是字符串', code: 'INVALID_ARGS' };
+        const provider = typeof a.provider === 'string' && a.provider.trim() ? a.provider.trim() : undefined;
+        if (a.providerServiceType !== undefined && typeof a.providerServiceType !== 'string')
+            return { error: 'providerServiceType 必须是字符串', code: 'INVALID_ARGS' };
+        const providerServiceType = typeof a.providerServiceType === 'string' && a.providerServiceType.trim() ? a.providerServiceType.trim() : undefined;
+        if (provider) {
+            try {
+                const resolved = resolveProviderServiceForBaseagent(provider, a.baseagent, providerServiceType);
+                if (model && resolved.modelOverrides[model]?.enabled === false)
+                    throw new Error(`Model ${model} is disabled for provider ${provider}`);
+            }
+            catch (error) {
+                return { error: error.message || String(error), code: 'INVALID_ARGS' };
+            }
+        }
         const rawEffort = typeof a.effort === 'string' && a.effort.trim() ? a.effort.trim() : undefined;
         const effort = rawEffort && rawEffort !== 'auto' ? rawEffort : undefined;
         const description = typeof a.description === 'string' && a.description.trim()
             ? a.description.trim()
             : undefined;
         const tags = Array.isArray(a.tags) ? a.tags : undefined;
+        let avatarUrl;
+        if (a.avatarUrl !== undefined) {
+            if (typeof a.avatarUrl !== 'string' || !a.avatarUrl.trim()) {
+                return { error: 'avatarUrl 必须是非空 HTTPS URL', code: 'INVALID_ARGS' };
+            }
+            try {
+                const url = new URL(a.avatarUrl.trim());
+                if (url.protocol !== 'https:' || url.username || url.password || (url.port && url.port !== '443'))
+                    throw new Error('invalid avatar URL');
+                avatarUrl = url.toString();
+            }
+            catch {
+                return { error: 'avatarUrl 必须是不含认证信息的 HTTPS URL', code: 'INVALID_ARGS' };
+            }
+        }
+        const agentDir = path.join(resolvePaths().agentsDir, a.aid);
+        const retry = failedCreateRetryAllowed(a.aid, agentDir, service);
+        if (!retry.allowed)
+            return { error: retry.error || 'Agent 已存在', code: 'CONFLICT' };
         // D3: accepted=true 必须意味着后续 query 能查到该 AID 的创建状态。
         let progressWriter;
         try {
-            progressWriter = new CreateStatusWriter(path.join(resolvePaths().agentsDir, a.aid), a.aid);
+            progressWriter = new CreateStatusWriter(agentDir, a.aid, { requesterAid: peerId, ownerAid: owner });
         }
         catch (e) {
             return { error: `创建进度状态初始化失败: ${e?.message || e}`, code: 'INTERNAL' };
@@ -471,10 +634,11 @@ export async function execAgentAction(action, args, peerId, eventBus, service, s
         void runCreateInBackground({
             aid: a.aid, name: a.name, baseagent: a.baseagent,
             project: a.project, owner,
-            model, effort, description, tags, chatmode: a.chatmode,
+            provider, providerServiceType, model, effort, description, tags, chatmode: a.chatmode, avatarUrl,
+            retryFailedCreate: retry.force,
             eventBus,
         }, progressWriter, service).catch(e => logger.error(`[agent-control] runCreateInBackground unhandled ${a.aid}: ${e?.message || e}`));
-        return { data: { accepted: true, aid: a.aid } };
+        return { data: { accepted: true, aid: a.aid, creationId: progressWriter.creationId, ...(avatarUrl ? { avatarAccepted: true } : {}) } };
     }
     if (action === 'delete') {
         if (!a.aid)
@@ -551,8 +715,8 @@ export async function execAgentAction(action, args, peerId, eventBus, service, s
  *  直接通过 ConfigManager 读写 agent config（不走 agentSet，避免其内部自动 evolagent.reload）——
  *  重载由用户在 Agents 页操作列手动触发（带任务执行检查）。
  *  AUN 渠道绑定 agent 顶层 aid，不可通过 patch 编辑：拒绝改 aid、拒绝 channels 数组里出现 aun 条目。
- *  可写字段：name / avatar（旧版 App 兼容，单独提交 data URL）/ active_baseagent / baseagents / projects / owners / fullaccess / chatmode / channels（非 aun）/
- *  channelOwners（按 type/name 局部更新非 AUN channel owners，避免前端回写脱敏 credentials）。 */
+ *  可写字段：name / avatar（旧版 App 兼容，单独提交 data URL）/ active_baseagent / baseagents / projects / owner（旧版 owners[] 兼容）/
+ *  fullaccess / chatmode / channels（非 aun）/ channelOwners（按 type/name 局部更新非 AUN channel owner，避免前端回写脱敏 credentials）。 */
 export async function execAgentUpdate(args, subject) {
     const a = args ?? {};
     if (!a.aid)
@@ -606,7 +770,7 @@ export async function execAgentUpdate(args, subject) {
         return execAidAvatar({ aid: a.aid, data: p.avatar });
     let touched = false;
     const data = { aid: a.aid };
-    const hasConfigPatch = p.active_baseagent !== undefined || p.baseagents !== undefined || p.projects !== undefined || p.owners !== undefined || p.fullaccess !== undefined || p.chatmode !== undefined || p.channels !== undefined || p.channelOwners !== undefined;
+    const hasConfigPatch = p.active_baseagent !== undefined || p.baseagents !== undefined || p.projects !== undefined || p.owner !== undefined || p.owners !== undefined || p.fullaccess !== undefined || p.chatmode !== undefined || p.channels !== undefined || p.channelOwners !== undefined;
     if (p.active_baseagent !== undefined) {
         if (typeof p.active_baseagent !== 'string' || !p.active_baseagent.trim()) {
             return { error: `无效 active_baseagent: ${JSON.stringify(p.active_baseagent)}（必须是非空字符串）`, code: 'INVALID_ARGS' };
@@ -638,21 +802,8 @@ export async function execAgentUpdate(args, subject) {
         else
             delete config.projects;
     }
-    if (p.owners !== undefined) {
-        if (!Array.isArray(p.owners) || p.owners.length === 0) {
-            return { error: 'owners must contain at least one owner', code: 'LAST_OWNER_PROTECTED' };
-        }
-        const owners = [];
-        for (const rawOwner of p.owners) {
-            if (typeof rawOwner !== 'string' || !rawOwner.trim() || !isValidAid(rawOwner.trim())) {
-                return { error: `Invalid owner AID: ${JSON.stringify(rawOwner)}`, code: 'INVALID_ARGS' };
-            }
-            const owner = rawOwner.trim();
-            if (!owners.includes(owner))
-                owners.push(owner);
-        }
-        config.owners = owners;
-        touched = true;
+    if (p.owner !== undefined || p.owners !== undefined) {
+        return { error: 'Root owner/owners configuration is not supported; use ec aid bind', code: 'INVALID_ARGS' };
     }
     if (p.fullaccess !== undefined) {
         config.fullaccess = { enabled: p.fullaccess.enabled };
@@ -728,6 +879,7 @@ export async function execAgentQuery(args, service, subject) {
     const config = cfgRead(ConfigTarget.Agent, { self: aid });
     const safeConfig = buildSafeAgentConfig(config);
     const safeAgentConfig = safeConfig ?? {};
+    const ownership = ownerResolver.snapshot(aid);
     const fullaccessStatus = agentFullAccessStatus(aid, subject?.principalId ?? subject?.actorId);
     const data = {
         ...res,
@@ -737,9 +889,16 @@ export async function execAgentQuery(args, service, subject) {
             active_baseagent: safeAgentConfig.active_baseagent ?? res.config?.baseagent ?? null,
             projects: safeAgentConfig.projects ?? {},
             baseagents: safeAgentConfig.baseagents ?? {},
+            owner: safeConfig ? safeAgentConfig.owner : res.config?.owner ?? null,
             owners: safeAgentConfig.owners ?? res.config?.owners ?? [],
         },
         safeConfig,
+        ownership: {
+            relation: ownership.relation ?? null,
+            consensusStatus: ownership.consensusStatus,
+            checkedAt: ownership.checkedAt ?? null,
+            authorizationStatus: ownership.authorizationStatus,
+        },
         fullaccessStatus: {
             ...fullaccessStatus,
             canConfigure: agentFullAccessWriteError(aid, subject) === undefined,

package/dist/core/command/cli-intent-parser.js

@@ -1,4 +1,5 @@
-import { parseAgentWelcomeArgs, parseInitializationArgs } from '../../cli/agent-create.js';
+import { parseAgentWelcomeArgs, parseInitializationArgs, resolveAgentCreateMode } from '../../cli/agent-create.js';
+import { parseOwnershipCommand } from '../../aun/aid/ownership-operation.js';
 import { normalizeCliArgv } from '../../cli/cli-argv.js';
 import { resolveConfigCommand, } from '../../config/resolved-config-op.js';
 export { normalizeCliArgv, parseLegacyCliCommand, validateCliArgv } from '../../cli/cli-argv.js';
@@ -24,6 +25,8 @@ export function parseCliIntent(inputArgv, source = 'menu.cli', options = {}) {
     const cmd = argv[0];
     if (cmd === 'model')
         return parseModelCommand(argv, source);
+    if (cmd === 'thread')
+        return parseThreadCommand(argv, source);
     if (cmd === 'config')
         return parseConfigCommand(argv, source, options.defaultRelation);
     if (cmd === 'stats')
@@ -31,7 +34,7 @@ export function parseCliIntent(inputArgv, source = 'menu.cli', options = {}) {
     if (cmd === 'agent')
         return parseAgentCommand(argv, source);
     if (cmd === 'aid')
-        return parseAidCommand(argv, source);
+        return parseAidCommand(argv, source, options.defaultRelation?.self);
     if (cmd === 'storage')
         return parseStorageCommand(argv, source);
     if (cmd === 'version') {
@@ -48,6 +51,36 @@ export function parseCliIntent(inputArgv, source = 'menu.cli', options = {}) {
     }
     return raw(source, argv, `Unknown command: ${cmd}`);
 }
+function parseThreadCommand(argv, source) {
+    if (argv[1] !== 'summary' || !['show', 'log'].includes(argv[2] ?? '')) {
+        return raw(source, argv, 'Only thread summary show/log is available through remote CLI');
+    }
+    const action = argv[2];
+    const parsed = parseArgs(argv.slice(3));
+    const args = parsed.args;
+    if (Object.keys(args).some(key => !['self', 'format'].includes(key))) {
+        return raw(source, argv, 'Unsupported thread summary option');
+    }
+    if (parsed.positionals.length !== 1 || typeof args.self !== 'string' || !args.self.trim()) {
+        return raw(source, argv, 'thread summary show/log requires <peer>/<threadId> and --self');
+    }
+    if (args.format !== 'json') {
+        return raw(source, argv, 'Remote thread summary reads require --format json');
+    }
+    const pieces = parsed.positionals[0].split('/');
+    if (pieces.length !== 2 || !pieces[0] || !pieces[1]
+        || pieces[1] === 'main' || pieces[1] === 'current'
+        || !/^[A-Za-z0-9][A-Za-z0-9_.-]*$/.test(pieces[1])) {
+        return raw(source, argv, 'A concrete peer/threadId reference is required');
+    }
+    const operation = action === 'show' ? 'ec.thread.summary-show' : 'ec.thread.summary-log';
+    return recognized(operation, 'relation', source, {
+        self: args.self,
+        peer: pieces[0],
+        threadId: pieces[1],
+        action,
+    }, argv);
+}
 export function rawCliIntent(argv, source = 'menu.cli') {
     return {
         operation: 'cli.exec.raw',
@@ -157,7 +190,16 @@ function parseStatsCommand(argv, source) {
 }
 function parseAgentCommand(argv, source) {
     const subcmd = argv[1];
-    if ((subcmd === 'new' && argv.includes('--initialize')) || subcmd === 'initialize') {
+    let createMode;
+    if (subcmd === 'new') {
+        try {
+            createMode = resolveAgentCreateMode(argv.slice(1));
+        }
+        catch {
+            return raw(source, argv, 'Invalid creation mode');
+        }
+    }
+    if (createMode === 'initialize' || subcmd === 'initialize') {
         try {
             const parsed = parseInitializationArgs(argv.slice(1));
             return recognized('agent.initialize', 'control', source, { aid: parsed.aid }, argv, true);
@@ -195,8 +237,22 @@ function parseAgentCommand(argv, source) {
         return recognized('agent.getConfig', 'control', source, args, argv, true);
     return raw(source, argv, `Unknown agent subcommand: ${subcmd}`);
 }
-function parseAidCommand(argv, source) {
+function parseAidCommand(argv, source, defaultSelfAid) {
     const subcmd = argv[1];
+    if (subcmd === 'bind') {
+        try {
+            const command = parseOwnershipCommand(argv.slice(1));
+            const subjectAid = command.subjectAid ?? defaultSelfAid;
+            return recognized(command.action === 'bind' ? 'ec.aid.bind' : 'ec.aid.bind.status', 'agent', source, {
+                ...(subjectAid ? { self: subjectAid } : {}),
+                ...(command.subjectAid ? { subjectAid: command.subjectAid } : {}),
+                ...(command.action === 'bind' ? { ownerAid: command.ownerAid } : {}),
+            }, argv, command.action === 'bind');
+        }
+        catch (error) {
+            return raw(source, argv, error instanceof Error ? error.message : 'Invalid aid bind command');
+        }
+    }
     if (subcmd === 'avatar') {
         const tail = argv.slice(2);
         const aid = tail[0];