evolcore 0.0.25 → 0.0.27

package/dist/cli/bench.js

@@ -381,26 +381,26 @@ async function cliAuth(aid, slotId) {
 // ==================== Main Command ====================
 export async function cmdBench(args) {
     if (isHelpFlag(args[0]) || wantsHelp(args)) {
-        console.log(`用法: ec bench [options]
-
-AUN 消息系统性能基准测试。使用多个本地 AID 并发互发消息，
-测量吞吐量、延迟、丢失率，以及认证性能和账号切换性能。
-
-Options:
-  --aids N          使用的 AID 数量 (默认 3, 范围 2-10)
-  --rounds N        每个 AID 发送的消息轮数 (默认 20)
-  --concurrency N   最大并发发送数 (默认 5)
-  --wait N          发送后等待传播的秒数 (默认 3)
-  --encrypt         发送加密消息（E2EE）
-  --file            文件传输验证模式（压缩 evolcore 目录，拆片发送，接收后 MD5 校验+解压）
-  --cli             使用 CLI 子进程调用（测试完整命令行链路，含进程启动开销）
-  --aun-path <path> 自定义 AUN 目录
-  --format json     以 JSON 输出结果
-
-示例:
-  ec bench --aids 5 --rounds 10
-  ec bench --file --rounds 50
-  ec bench --encrypt --aids 5 --rounds 20
+        console.log(`用法: ec bench [options]
+
+AUN 消息系统性能基准测试。使用多个本地 AID 并发互发消息，
+测量吞吐量、延迟、丢失率，以及认证性能和账号切换性能。
+
+Options:
+  --aids N          使用的 AID 数量 (默认 3, 范围 2-10)
+  --rounds N        每个 AID 发送的消息轮数 (默认 20)
+  --concurrency N   最大并发发送数 (默认 5)
+  --wait N          发送后等待传播的秒数 (默认 3)
+  --encrypt         发送加密消息（E2EE）
+  --file            文件传输验证模式（压缩 evolcore 目录，拆片发送，接收后 MD5 校验+解压）
+  --cli             使用 CLI 子进程调用（测试完整命令行链路，含进程启动开销）
+  --aun-path <path> 自定义 AUN 目录
+  --format json     以 JSON 输出结果
+
+示例:
+  ec bench --aids 5 --rounds 10
+  ec bench --file --rounds 50
+  ec bench --encrypt --aids 5 --rounds 20
   ec bench --cli --aids 3 --rounds 5`);
         return;
     }

package/dist/cli/config.js

@@ -1,10 +1,10 @@
 import { isHelpFlag, wantsHelp, getArgValue } from './help.js';
 import { initConfigManager } from '../config/config-manager.js';
 import { resolveConfigCommand } from '../config/resolved-config-op.js';
-import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommand, } from '../config/config-operation-service.js';
+import { AUTHENTICATED_CONFIG_ROLE_ENV, executeResolvedConfigCommandAsync, } from '../config/config-operation-service.js';
 import { ipcQuery } from '../ipc.js';
 import { resolvePaths } from '../paths.js';
-import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
+import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { splitConfigBatchGetArgv } from './cli-argv.js';
 function emit(formatJson, payload, text) {
     if (formatJson)
@@ -31,6 +31,7 @@ function getResultPayload(result) {
         ...(result.source ? { source: result.source } : {}),
         ...(result.schemaDefault ? { schemaDefault: true } : {}),
         ...(result.note ? { note: result.note } : {}),
+        ...(result.roleDetails ? { role: result.roleDetails } : {}),
     };
 }
 function getResultLine(result) {
@@ -39,7 +40,10 @@ function getResultLine(result) {
         : !result.source
             ? `${result.field} = ${JSON.stringify(result.value)} (${result.scope})`
             : `${result.field} = ${JSON.stringify(result.value)} [source: ${result.source.target}]`;
-    return result.note ? `${head}\n  ↳ ${result.note}` : head;
+    const role = result.roleDetails
+        ? `\n  role: explicit=${JSON.stringify(result.roleDetails.explicitRole)} effective=${JSON.stringify(result.roleDetails.effectiveRole)} [${result.roleDetails.effectiveRoleSource}]`
+        : '';
+    return `${head}${role}${result.note ? `\n  ↳ ${result.note}` : ''}`;
 }
 function renderConfigExecution(result, formatJson) {
     if (!result.ok)
@@ -56,6 +60,7 @@ function renderConfigExecution(result, formatJson) {
                 value: result.value,
                 scope: result.scope,
                 file: result.file,
+                ...(result.roleDetails ? { role: result.roleDetails } : {}),
             }, () => `Set ${result.field} = ${JSON.stringify(result.value)} [${result.scope}]`);
         case 'unset':
             return emit(formatJson, {
@@ -63,6 +68,7 @@ function renderConfigExecution(result, formatJson) {
                 field: result.field,
                 removed: result.removed,
                 ...(result.removed ? { scope: result.scope } : {}),
+                ...(result.roleDetails ? { role: result.roleDetails } : {}),
             }, () => result.removed ? `Removed ${result.field} from ${result.scope}` : `${result.field} was not set`);
         case 'show':
             return emit(formatJson, { ok: true, scope: result.scope, configs: result.configs }, () => JSON.stringify(result.configs, null, 2));
@@ -122,7 +128,7 @@ function managedSession(formatJson) {
     const sessionId = process.env.EVOLCORE_SESSION_ID;
     if (!sessionId)
         fail(formatJson, 'NO_SESSION', 'EVOLCORE_SESSION_ID is not set');
-    const delegationToken = process.env[AGENT_DELEGATION_TOKEN_ENV];
+    const delegationToken = readDelegationCredential();
     if (!delegationToken) {
         fail(formatJson, 'DELEGATION_REQUIRED', `${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task`);
     }
@@ -152,10 +158,13 @@ async function runManagedConfig(args, formatJson) {
     renderConfigExecution(response.result, formatJson);
 }
 function renderBatchGet(results, formatJson) {
-    const allOk = results.every(entry => entry.ok);
+    // Unsupported runner fields are compatibility misses, not a failure of the
+    // supported fields in the same aggregate request. Keep the per-field error
+    // while allowing clients to consume the successful values.
+    const batchOk = results.every(entry => entry.ok || entry.code === 'UNSUPPORTED_FIELD');
     if (formatJson) {
         console.log(JSON.stringify({
-            ok: allOk,
+            ok: batchOk,
             results: results.map(entry => entry.ok
                 ? getResultPayload(entry)
                 : { ok: false, field: entry.field, code: entry.code, error: entry.error }),
@@ -169,21 +178,21 @@ function renderBatchGet(results, formatJson) {
                 console.error(`${entry.field}: Error: ${entry.error} (${entry.code})`);
         }
     }
-    if (!allOk)
+    if (!batchOk)
         process.exit(1);
 }
-function runDirectBatchGet(fields, rest, formatJson) {
-    const results = fields.map(field => {
+async function runDirectBatchGet(fields, rest, formatJson) {
+    const results = await Promise.all(fields.map(async (field) => {
         const resolved = resolveConfigCommand(['config', 'get', field, ...rest]);
         if (!resolved.ok)
             return { ok: false, field, code: resolved.code, error: resolved.reason };
-        const result = executeResolvedConfigCommand(resolved.command);
+        const result = await executeResolvedConfigCommandAsync(resolved.command, { role: 'owner' });
         if (!result.ok)
             return { ok: false, field, code: result.code, error: result.error };
         if (result.subcommand === 'get')
             return result;
         return { ok: false, field, code: 'UNEXPECTED_RESULT', error: `config get ${field} produced a non-get result` };
-    });
+    }));
     renderBatchGet(results, formatJson);
 }
 async function runManagedBatchGet(fields, rest, formatJson) {
@@ -196,26 +205,31 @@ async function runManagedBatchGet(fields, rest, formatJson) {
     }
     renderConfigExecution(response.result, formatJson);
 }
-const HELP = `Usage: ec config <command> [options]
-
-Fields:
-  get <field> [<field> ...]     one or more fields (batch)
-  set <field> <value>
-  unset <field>
-
-Scoped commands:
-  show | effective | fields [field] | validate | init
-
-Global commands:
-  list | snapshot | prune | history | diff | restore | current | boots
-  schema                        overview of all schemas
-  schema <name> [<version>]     view a schema definition
-  schema <name> --list          list a schema's versions
-
-Selectors:
-  --self <aid> [--peer <peerKey>] | --default | --process
-
-Output:
+const HELP = `Usage: ec config <command> [options]
+
+Fields:
+  get <field> [<field> ...]     one or more fields (batch)
+  set <field> <value>
+  unset <field>
+
+Scoped commands:
+  show | effective | fields [field] | validate | init
+
+Global commands:
+  list | snapshot | prune | history | diff | restore | current | boots
+  schema                        overview of all schemas
+  schema <name> [<version>]     view a schema definition
+  schema <name> --list          list a schema's versions
+
+Selectors:
+  --self <aid> [--peer <peerKey>] | --default | --process
+
+Relation role (AUN peer AID):
+  get role --self <aid> --peer <peer-aid>
+  set role <role-id> --self <aid> --peer <peer-aid>
+  unset role --self <aid> --peer <peer-aid>
+
+Output:
   --format json`;
 export async function cmdConfig(args) {
     const subcommand = args[0];
@@ -241,13 +255,21 @@ export async function cmdConfig(args) {
         fail(formatJson, 'SCHEMA_INIT_FAILED', error instanceof Error ? error.message : String(error));
     }
     if (isBatchGet) {
-        runDirectBatchGet(batchGet.fields, batchGet.rest, formatJson);
+        await runDirectBatchGet(batchGet.fields, batchGet.rest, formatJson);
         return;
     }
     const resolved = resolveConfigCommand(['config', ...args]);
     if (!resolved.ok)
         fail(formatJson, resolved.code, resolved.reason);
-    renderConfigExecution(executeResolvedConfigCommand(resolved.command, {
+    renderConfigExecution(await executeResolvedConfigCommandAsync(resolved.command, {
         role: process.env[AUTHENTICATED_CONFIG_ROLE_ENV],
+        roleContext: {
+            self: resolved.command.self || '',
+            actorRole: process.env[AUTHENTICATED_CONFIG_ROLE_ENV] || 'owner',
+            actorRoleSource: 'local-cli',
+            isDaemonOwner: false,
+            fromControlChannel: false,
+            aunAvailable: true,
+        },
     }), formatJson);
 }

package/dist/cli/contact.js

@@ -1,7 +1,8 @@
 import { resolvePaths } from '../paths.js';
+import { loadAllAgents } from '../config-store.js';
 import { executeResolvedContactCommand, resolveContactCommand, } from '../config/contact-operation-service.js';
 import { ipcQuery } from '../ipc.js';
-import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
+import { AGENT_DELEGATION_TOKEN_ENV, readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 export async function cmdContact(args) {
     if (args.length === 0 || isHelpFlag(args[0]) || wantsHelp(args)) {
@@ -14,9 +15,17 @@ export async function cmdContact(args) {
         output(result, json);
         return;
     }
-    const resolved = resolveContactCommand(args);
-    if (!resolved.ok)
-        fail(resolved.reason, resolved.code);
+    if (!args.includes('--self') && isListCommand(args) && !process.env.EVOLCORE_SELF_AID?.trim()) {
+        output(await executeAggregateList(args), json);
+        return;
+    }
+    const resolved = resolveContactCommand(withDefaultSelf(args));
+    if (!resolved.ok) {
+        const message = resolved.code === 'INVALID_SELF' && !args.includes('--self')
+            ? `${resolved.reason}; multiple local Agents are configured, add --self <agent-aid>`
+            : resolved.reason;
+        fail(message, resolved.code);
+    }
     const result = await executeResolvedContactCommand(resolved.command);
     if (!result.ok)
         fail(result.error, result.code, result.data);
@@ -30,7 +39,7 @@ function output(value, json) {
 }
 async function runManaged(args, json) {
     const sessionId = process.env.EVOLCORE_SESSION_ID;
-    const delegationToken = process.env[AGENT_DELEGATION_TOKEN_ENV];
+    const delegationToken = readDelegationCredential();
     if (!delegationToken)
         fail(`${AGENT_DELEGATION_TOKEN_ENV} is not set for the active task`, 'DELEGATION_REQUIRED');
     let response = null;
@@ -58,15 +67,63 @@ function fail(message, code = 'INVALID_ARGUMENT', data) {
     throw error;
 }
 function printHelp() {
-    console.log(`Usage:
-  ec contact add <primaryId> --self <agent-aid>
-  ec contact block <primaryId> --self <agent-aid>
-  ec contact unblock <primaryId> --self <agent-aid>
-  ec contact list --blocked --self <agent-aid>
-
-Options:
-  --self <agent-aid>  必填，本端 agent AID
-  --blocked           list 必填，仅列出已拉黑联系人
-  --format json       输出 JSON
+    console.log(`Usage:
+  ec contact add <primaryId> --self <agent-aid>
+  ec contact block <primaryId> --self <agent-aid>
+  ec contact unblock <primaryId> --self <agent-aid>
+  ec contact list --blocked [--self <agent-aid>]
+  ec contact list --pending [--self <agent-aid>]
+  ec contact list --all [--self <agent-aid>]
+  ec contact approve <primaryId> --request-id <id> [--self <agent-aid>]
+  ec contact reject <primaryId> --request-id <id> [--self <agent-aid>]
+  ec contact block-request <primaryId> --request-id <id> [--self <agent-aid>]
+
+Options:
+  --self <agent-aid>  本端 agent AID；省略时从当前运行环境推断
+  --blocked           仅列出已拉黑联系人
+  --pending           仅列出待审核联系人申请
+  --all               列出所有联系人及状态
+  --request-id <id>   联系人申请 ID（审批命令必填）
+  --contact-revision <revision>  申请审批时使用的联系人版本（可选）
+  --format json       输出 JSON
   --help, -h          显示帮助`);
 }
+function withDefaultSelf(args) {
+    if (args.includes('--self'))
+        return args;
+    const selfAid = resolveStandaloneSelfAid();
+    return selfAid ? [...args, '--self', selfAid] : args;
+}
+function isListCommand(args) {
+    return args[0] === 'list';
+}
+async function executeAggregateList(args) {
+    const agents = loadAllAgents().agents.map(agent => agent.aid).filter(Boolean).sort();
+    const results = [];
+    for (const aid of agents) {
+        const resolved = resolveContactCommand([...args, '--self', aid]);
+        if (!resolved.ok)
+            fail(resolved.reason, resolved.code);
+        const result = await executeResolvedContactCommand(resolved.command);
+        if (!result.ok)
+            fail(result.error, result.code, result.data);
+        results.push(result);
+    }
+    return {
+        ok: true,
+        operation: args.includes('--blocked') ? 'list-blocked'
+            : args.includes('--pending') ? 'list-pending' : 'list-all',
+        scope: 'all-agents',
+        agents: results,
+    };
+}
+/** Resolve the local Agent identity for standalone CLI commands. */
+export function resolveStandaloneSelfAid() {
+    const runtimeAid = process.env.EVOLCORE_SELF_AID?.trim();
+    if (runtimeAid)
+        return runtimeAid;
+    const agents = loadAllAgents().agents
+        .map(agent => agent.aid)
+        .filter(Boolean);
+    return agents.length === 1 ? agents[0] : undefined;
+}

package/dist/cli/ctl-command.js

@@ -1,30 +1,30 @@
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
 import { isHelpFlag, wantsHelp } from './help.js';
-import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
+import { readDelegationCredential } from '../core/auth/agent-delegation.js';
 // ==================== Ctl ====================
-const CTL_HELP = `用法: ec ctl <command> [args...]
-
-查询:
-  status                    查看会话状态
-  status --format json      查看当前任务的结构化运行上下文
-  pwd                       显示当前项目路径
-  help                      显示帮助
-
-会话:
-  name <名称>               重命名当前会话
-
-消息:
-  send <消息内容>           主动发送文本消息（proactive 模式）
-  file [channel] <path>     发送项目内文件
-  queue [--after <time>] [--before <time>]  查看/管理会话消息队列
-
-示例:
-  ec ctl status
-  ec ctl status --format json
-  ec ctl name "新会话名称"
-  ec ctl send "任务已完成"
-  ec ctl file report.md
+const CTL_HELP = `用法: ec ctl <command> [args...]
+
+查询:
+  status                    查看会话状态
+  status --format json      查看当前任务的结构化运行上下文
+  pwd                       显示当前项目路径
+  help                      显示帮助
+
+会话:
+  name <名称>               重命名当前会话
+
+消息:
+  send <消息内容>           主动发送文本消息（proactive 模式）
+  file [channel] <path>     发送项目内文件
+  queue [--after <time>] [--before <time>]  查看/管理会话消息队列
+
+示例:
+  ec ctl status
+  ec ctl status --format json
+  ec ctl name "新会话名称"
+  ec ctl send "任务已完成"
+  ec ctl file report.md
   ec ctl queue --full`;
 export async function cmdCtl(args) {
     if (args.length === 0) {
@@ -47,7 +47,7 @@ export async function cmdCtl(args) {
         type: 'ctl',
         cmd,
         sessionId,
-        delegationToken: process.env[AGENT_DELEGATION_TOKEN_ENV],
+        delegationToken: readDelegationCredential(),
     }, 10_000);
     if (!result) {
         console.error('错误: 无法连接 evolcore 服务');