evolclaw 3.1.2 → 3.1.4

package/dist/channels/aun.js

@@ -1,4 +1,4 @@
-import { AUNClient, GatewayDiscovery, E2EEError } from '@agentunion/fastaun';
+import { GatewayDiscovery, E2EEError } from '@agentunion/fastaun';
 import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
@@ -6,13 +6,14 @@ import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
-import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath } from '../paths.js';
+import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath, resolveRoot } from '../paths.js';
 import { saveToUploads, sanitizeFileName } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
 import { appendMessageLog, buildOutboundEntry } from '../core/message/message-log.js';
 import { chatDirPath } from '../core/session/session-fs-store.js';
 import { appendAidLifecycle } from '../aun/aid/identity.js';
-import { loadAgent, saveAgent } from '../config-store.js';
+import { createAunClient } from '../aun/aid/client.js';
+import { loadAgent, saveAgent, loadProcessConfig } from '../config-store.js';
 import { getProcessStartTime } from '../utils/process-introspect.js';
 import * as outbox from '../aun/outbox.js';
 import { guessMime, formatSize } from '../utils/media-cache.js';
@@ -445,6 +446,10 @@ export class AUNChannel {
         'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
         'merge', 'link', 'location', 'personal_card',
     ]);
+    /** Menu protocol 请求类型：自定义消息快速路径，绕过白名单直接分发到 bridge */
+    static MENU_REQUEST_TYPES = new Set([
+        'menu.list', 'menu.query', 'menu.options', 'menu.update', 'menu.action',
+    ]);
     // Reconnect state
     // SDK 自己跑无限指数退避（1s → 5min）；TS 层只在 SDK 够不到的两类场景下接管：
     //  1. flap：短命 connected 反复出现（SDK 不记忆跨轮 base delay，会从 1s 重新开始）
@@ -541,9 +546,12 @@ export class AUNChannel {
             this.client = null;
         }
         this.connected = false;
-        const aunPath = this.config.keystorePath || path.join(os.homedir(), '.aun');
+        const aunPath = this.config.keystorePath || resolveRoot();
         const aidName = this.config.aid;
-        const encryptionSeed = this.config.encryptionSeed || process.env.AUN_ENCRYPTION_SEED || undefined;
+        const encryptionSeed = loadProcessConfig().aun?.encryptionSeed
+            || process.env.AUN_ENCRYPTION_SEED
+            || 'evol';
+        // Migration from ~/.aun is handled by ensureDataDirs() at startup with a marker file.
         // Gateway URL 解析：优先用配置的 gatewayUrl，否则通过 well-known 自动发现
         let gateway = this.config.gatewayUrl || '';
         if (!gateway) {
@@ -565,39 +573,39 @@ export class AUNChannel {
         logger.info(`${this.logPrefix()} Initializing: aid=${aidName}, gateway=${gateway}, aun_path=${aunPath}`);
         // Create client with FileSecretStore (AES-256-GCM)
         // 不传 encryption_seed 时，SDK 自动从 {aun_path}/.seed 文件派生密钥（与 aun_cli.py 对齐）
-        const rootCaPath = path.join(aunPath, 'CA', 'root', 'root.crt');
-        this.client = new AUNClient({
-            aun_path: aunPath,
-            root_ca_path: rootCaPath,
-            ...(encryptionSeed && { encryption_seed: encryptionSeed }),
-        }, this.config.aunSdkLog ?? true);
+        const client = await createAunClient({
+            aunPath,
+            encryptionSeed,
+            aunSdkLog: this.config.aunSdkLog ?? true,
+        });
+        this.client = client;
         // Set gateway URL (internal property, same as Python SDK)
-        this.client._gatewayUrl = gateway;
+        client._gatewayUrl = gateway;
         // Register event handlers before connecting
-        this.client.on('message.received', (data) => {
+        client.on('message.received', (data) => {
             this.trace('IN', 'message.received', data);
             const kind = (data && typeof data === 'object') ? data.kind ?? '' : '';
             const keys = (data && typeof data === 'object') ? Object.keys(data).join(',') : typeof data;
             logger.debug(`${this.logPrefix()}[DIAG] message.received: kind=${kind} keys=${keys}`);
             this.handleIncomingPrivateMessage(data);
         });
-        this.client.on('group.message_created', (data) => {
+        client.on('group.message_created', (data) => {
             this.trace('IN', 'group.message_created', data);
             const gid = (data && typeof data === 'object') ? data.group_id ?? '' : '';
             const sender = (data && typeof data === 'object') ? data.sender_aid ?? '' : '';
             logger.debug(`${this.logPrefix()}[DIAG] group.message_created: group_id=${gid} sender=${sender}`);
             this.handleIncomingGroupMessage(data);
         });
-        this.client.on('connection.state', (data) => {
+        client.on('connection.state', (data) => {
             // trace is handled inside handleConnectionState with throttling
             this.handleConnectionState(data);
         });
         // gateway 被踢/服务端主动断开（含同槽位互踢的 self/new extra_info）
-        this.client.on('gateway.disconnect', (data) => {
+        client.on('gateway.disconnect', (data) => {
             this.trace('IN', 'gateway.disconnect', data);
             this.handleGatewayDisconnect(data);
         });
-        this.client.on('message.recalled', (data) => {
+        client.on('message.recalled', (data) => {
             this.trace('IN', 'message.recalled', data);
             if (data && typeof data === 'object') {
                 const ids = data.message_ids;
@@ -611,12 +619,12 @@ export class AUNChannel {
                 }
             }
         });
-        this.client.on('message.undecryptable', (data) => {
+        client.on('message.undecryptable', (data) => {
             this.trace('IN', 'message.undecryptable', data);
             const d = data;
             logger.warn(`${this.logPrefix()} Message undecryptable: from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
         });
-        this.client.on('group.message_undecryptable', (data) => {
+        client.on('group.message_undecryptable', (data) => {
             this.trace('IN', 'group.message_undecryptable', data);
             const d = data;
             logger.warn(`${this.logPrefix()} Group message undecryptable: group=${d.group_id} from=${d.from} mid=${d.message_id} err=${d._decrypt_error}`);
@@ -624,7 +632,7 @@ export class AUNChannel {
         // Authenticate
         // Workaround: SDK 0.3.x _loadIdentityOrRaise doesn't set identity.aid from requested aid,
         // causing gateway "missing aid" error. Patch to backfill aid on loaded identity.
-        const authFlow = this.client._auth;
+        const authFlow = client._auth;
         if (authFlow && typeof authFlow._loadIdentityOrRaise === 'function') {
             const origLoad = authFlow._loadIdentityOrRaise.bind(authFlow);
             authFlow._loadIdentityOrRaise = (aid) => {
@@ -638,12 +646,12 @@ export class AUNChannel {
         try {
             logger.info(`${this.logPrefix()} Authenticating as ${aidName}...`);
             this.trace('OUT', 'auth.authenticate', { aid: aidName });
-            const auth = await this.client.auth.authenticate(aidName ? { aid: aidName } : undefined);
+            const auth = await client.auth.authenticate(aidName ? { aid: aidName } : undefined);
             this.trace('OUT', 'auth.authenticate.ok', { aid: auth.aid, gateway: auth.gateway, hasToken: !!auth.access_token });
             this.trace('IN', 'auth.result', { aid: auth.aid, gateway: auth.gateway, hasToken: !!auth.access_token });
             accessToken = auth.access_token;
             const resolvedGateway = auth.gateway || gateway;
-            this.client._gatewayUrl = resolvedGateway;
+            client._gatewayUrl = resolvedGateway;
             logger.info(`${this.logPrefix()} Authenticated as ${auth.aid ?? '?'}, gateway=${resolvedGateway}`);
         }
         catch (e) {
@@ -670,12 +678,12 @@ export class AUNChannel {
                 agentName: this.config.agentName,
                 channelName: this.config.channelName,
             });
-            this.trace('OUT', 'client.connect', { gateway: this.client._gatewayUrl, extra_info: extraInfo });
-            await this.client.connect({ access_token: accessToken, gateway: this.client._gatewayUrl, extra_info: extraInfo }, 
+            this.trace('OUT', 'client.connect', { gateway: client._gatewayUrl, extra_info: extraInfo });
+            await client.connect({ access_token: accessToken, gateway: client._gatewayUrl, extra_info: extraInfo }, 
             // max_attempts=0 = 无限重试（与 Go/Python 对齐），交由 SDK 自己跑指数退避
             // initial_delay=1s，max_delay=300s（5min 封顶）
             { auto_reconnect: true, retry: { max_attempts: 0, initial_delay: 1.0, max_delay: 300.0 } });
-            this.trace('OUT', 'client.connect.ok', { aid: this.client.aid });
+            this.trace('OUT', 'client.connect.ok', { aid: client.aid });
             this._aid = this.client.aid ?? undefined;
             const deviceId = this.client._device_id ?? '';
             this._chatId = this._aid ? `${this._aid}:${deviceId}:` : '';
@@ -781,9 +789,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             fs.mkdirSync(path.dirname(agentMdLocalPath), { recursive: true });
             fs.writeFileSync(agentMdLocalPath, newAgentMd, 'utf-8');
             logger.info(`${this.logPrefix()} Updated agent.md for ${aidName}`);
-            // Publish to AUN network via auth.uploadAgentMd
+            // Publish to AUN network via publishAgentMd (auto-sign)
             try {
-                await this.client.auth.uploadAgentMd(newAgentMd);
+                await this.client.publishAgentMd();
                 logger.info(`${this.logPrefix()} Published agent.md to AUN network`);
             }
             catch (e) {
@@ -800,8 +808,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 2. **查看帮助**：发送 \`/help\` 查看所有可用命令
 3. **切换项目**：发送 \`/project <项目名>\` 切换到其他项目
 4. **查看状态**：发送 \`/status\` 查看当前会话状态
-5. **查看 Agent 信息**：发送 \`/agentmd\` 查看 agent.md 内容
-6. **会话管理**：发送 \`/session\` 查看和切换会话
+5. **会话管理**：发送 \`/session\` 查看和切换会话
 
 💡 **提示**：
 - 直接发送消息即可与 Claude/Codex 对话
@@ -963,8 +970,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (p2pPayloadType === 'action_card_reply')
             return;
-        // menu.query：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
-        if (p2pPayloadType === 'menu.query') {
+        // menu.* 协议：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
+        if (AUNChannel.MENU_REQUEST_TYPES.has(p2pPayloadType)) {
             this.acknowledgeImmediately(messageId, seq);
             this.dispatchMessage({
                 channelId: chatId, userId: fromAid,
@@ -1069,8 +1076,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         {
             const payloadObj = (payload && typeof payload === 'object') ? payload : null;
             const payloadType = payloadObj?.type ?? '';
-            // menu.query：自定义消息快速路径
-            if (payloadType === 'menu.query') {
+            // menu.* 协议：自定义消息快速路径
+            if (AUNChannel.MENU_REQUEST_TYPES.has(payloadType)) {
                 this.acknowledgeImmediately(messageId, seq);
                 this.dispatchMessage({
                     channelId: groupId, userId: senderAid,
@@ -2373,11 +2380,10 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!this.client)
             return { type: null };
         try {
-            const md = await this.client.auth.downloadAgentMd(aid);
-            const typeMatch = md.match(/^type:\s*["']?(\w+)["']?/m);
-            const nameMatch = md.match(/^name:\s*["']?(.+?)["']?\s*$/m);
-            const type = typeMatch?.[1] === 'human' ? 'human' : 'ai';
-            const name = nameMatch?.[1]?.trim() || undefined;
+            const selfAgentDir = path.join(resolvePaths().agentsDir, this.config.aid);
+            const identity = await PeerIdentityCache.resolve('aun', aid, selfAgentDir, this.client, false);
+            const type = identity.type === 'human' ? 'human' : 'ai';
+            const name = identity.name || undefined;
             const info = { type, name };
             this.peerInfoCache.set(aid, info);
             setTimeout(() => this.peerInfoCache.delete(aid), 30 * 60 * 1000);
@@ -2385,7 +2391,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }
         catch (e) {
             logger.debug(`${this.logPrefix()} fetchPeerInfo failed for ${aid}: ${e}`);
-            return { type: null }; // no agent.md → unknown
+            return { type: null };
         }
     }
     /** 同步取 peerInfo 缓存，未命中返回 undefined，不发起任何网络请求。 */
@@ -2401,12 +2407,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     async uploadAgentMd(content) {
         if (!this.client)
             throw new Error('not connected');
-        await this.client.auth.uploadAgentMd(content);
+        const { agentMdPath } = await import('../paths.js');
+        const localPath = agentMdPath(this.config.aid);
+        fs.mkdirSync(path.dirname(localPath), { recursive: true });
+        fs.writeFileSync(localPath, content, 'utf-8');
+        await this.client.publishAgentMd();
     }
     async downloadAgentMd(aid) {
         if (!this.client)
             throw new Error('not connected');
-        return this.client.auth.downloadAgentMd(aid);
+        const { agentmdSync } = await import('../aun/aid/agentmd.js');
+        const result = await agentmdSync(aid, { client: this.client });
+        return result.content ?? '';
     }
 }
 // Plugin implementation

package/dist/cli/agent.js

@@ -2,12 +2,13 @@ import fs from 'fs';
 import path from 'path';
 import os from 'os';
 import readline from 'readline';
-import { resolvePaths } from '../paths.js';
+import { resolvePaths, agentMdPath as getAgentMdPathFromPaths, aunPath as defaultAunPath } from '../paths.js';
 import { loadDefaults, loadAllAgents, loadAgent, saveAgent, ensureAgentDirSkeleton } from '../config-store.js';
 import { ipcQuery } from '../ipc.js';
 import { CONFIG_SCHEMA_VERSION } from '../types.js';
 import { isValidChannelName } from '../core/channel-loader.js';
 import { commandExists } from '../utils/cross-platform.js';
+import { isCodexSdkAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
 const BASEAGENT_ENV_KEY = {
@@ -15,8 +16,13 @@ const BASEAGENT_ENV_KEY = {
     codex: 'OPENAI_API_KEY',
     gemini: 'GEMINI_API_KEY',
 };
+function isBaseagentAvailable(baseagent) {
+    if (baseagent === 'codex')
+        return isCodexSdkAvailable();
+    return commandExists(baseagent);
+}
 function detectAvailableBaseagents() {
-    return BASEAGENT_CANDIDATES.filter(b => commandExists(b));
+    return BASEAGENT_CANDIDATES.filter(isBaseagentAvailable);
 }
 function pickDefaultBaseagent(available) {
     if (available.length === 0)
@@ -40,12 +46,11 @@ function deriveAgentProjectPath(rootPath, aid) {
     return `${candidate}~${i}`;
 }
 function readAgentMdIdentity(aid) {
-    const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-    const agentMdPath = path.join(aunPath, 'AIDs', aid, 'agent.md');
+    const agentMdFilePath = getAgentMdPathFromPaths(aid);
     try {
-        if (!fs.existsSync(agentMdPath))
+        if (!fs.existsSync(agentMdFilePath))
             return { name: null, description: null };
-        const content = fs.readFileSync(agentMdPath, 'utf-8');
+        const content = fs.readFileSync(agentMdFilePath, 'utf-8');
         const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
         if (!fmMatch)
             return { name: null, description: null };
@@ -62,8 +67,7 @@ function readAgentMdIdentity(aid) {
     }
 }
 function getAgentMdPath(aid) {
-    const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-    return path.join(aunPath, 'AIDs', aid, 'agent.md');
+    return getAgentMdPathFromPaths(aid);
 }
 function getNestedValue(obj, keyPath) {
     const keys = keyPath.split('.');
@@ -316,7 +320,7 @@ export async function agentCreateInteractive(opts = {}) {
         // Baseagent
         const available = detectAvailableBaseagents();
         if (available.length === 0) {
-            return { ok: false, error: `No baseagent CLI detected on PATH. Install one of: ${BASEAGENT_CANDIDATES.join('/')}` };
+            return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.` };
         }
         const defaultBa = pickDefaultBaseagent(available);
         let baseagent;
@@ -333,7 +337,7 @@ export async function agentCreateInteractive(opts = {}) {
                     continue;
                 }
                 if (!available.includes(input)) {
-                    console.log(`  ${input} not detected on PATH. Available: ${available.join('/')}`);
+                    console.log(`  ${input} is not available in the current environment. Available: ${available.join('/')}`);
                     continue;
                 }
                 chosen = input;
@@ -385,10 +389,8 @@ export async function agentCreateInteractive(opts = {}) {
             if (agentDescription) {
                 content = content.replace(/^description:\s*".*?"$/m, `description: "${agentDescription}"`);
             }
-            const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-            const agentMdPath = path.join(aunPath, 'AIDs', aid, 'agent.md');
-            fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
-            fs.writeFileSync(agentMdPath, content, 'utf-8');
+            const aunPath = process.env.AUN_HOME || defaultAunPath();
+            // agentmdPut 会写本地文件到 agentMdPath(aid) 并调用 publishAgentMd
             // Upload with retry (3 attempts, 2s delay between retries)
             const MAX_ATTEMPTS = 3;
             const RETRY_DELAY_MS = 2000;
@@ -463,7 +465,7 @@ export async function agentCreateNonInteractive(opts) {
     // Baseagent
     const available = detectAvailableBaseagents();
     if (available.length === 0) {
-        return { ok: false, error: `No baseagent CLI detected on PATH. Install one of: ${BASEAGENT_CANDIDATES.join('/')}` };
+        return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.` };
     }
     let baseagent;
     if (opts.baseagent) {
@@ -471,7 +473,7 @@ export async function agentCreateNonInteractive(opts) {
             return { ok: false, error: `Invalid baseagent: ${opts.baseagent} (options: ${BASEAGENT_CANDIDATES.join('/')})` };
         }
         if (!available.includes(opts.baseagent)) {
-            return { ok: false, error: `${opts.baseagent} not detected on PATH (available: ${available.join('/')})` };
+            return { ok: false, error: `${opts.baseagent} is not available in the current environment (available: ${available.join('/')})` };
         }
         baseagent = opts.baseagent;
     }
@@ -541,10 +543,8 @@ export async function agentCreateNonInteractive(opts) {
         if (agentDescription) {
             content = content.replace(/^description:\s*".*?"$/m, `description: "${agentDescription}"`);
         }
-        const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-        const agentMdPath = path.join(aunPath, 'AIDs', opts.aid, 'agent.md');
-        fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
-        fs.writeFileSync(agentMdPath, content, 'utf-8');
+        const aunPath = process.env.AUN_HOME || defaultAunPath();
+        // agentmdPut 会写本地文件到 agentMdPath(aid) 并调用 publishAgentMd
         const MAX_ATTEMPTS = 3;
         const RETRY_DELAY_MS = 2000;
         let lastError;
@@ -592,11 +592,12 @@ export async function agentCreateNonInteractive(opts) {
         hotLoadError,
     };
 }
-// ==================== agentSyncAids ====================
+// ==================== agentSyncAids (deprecated) ====================
+/** @deprecated sync-aids 已废弃，不再从 CLI 调用 */
 export async function agentSyncAids() {
     const p = resolvePaths();
     const { aidList } = await import('../aun/aid/index.js');
-    const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
+    const aunPath = process.env.AUN_HOME || defaultAunPath();
     const allAids = aidList(aunPath);
     const localAids = allAids.filter(a => a.hasPrivateKey).map(a => a.aid);
     if (localAids.length === 0) {
@@ -862,12 +863,12 @@ export async function agentDelete(aid, purge = false) {
 }
 // ==================== agentRename ====================
 export async function agentRename(aid, newName) {
-    const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-    const agentMdPath = path.join(aunPath, 'AIDs', aid, 'agent.md');
-    if (!fs.existsSync(agentMdPath)) {
+    const aunPath = process.env.AUN_HOME || defaultAunPath();
+    const agentMdFilePath = getAgentMdPathFromPaths(aid);
+    if (!fs.existsSync(agentMdFilePath)) {
         return { ok: false, error: `agent.md not found for ${aid}. Run: evolclaw aid agentmd put ${aid}` };
     }
-    let content = fs.readFileSync(agentMdPath, 'utf-8');
+    let content = fs.readFileSync(agentMdFilePath, 'utf-8');
     const fmMatch = content.match(/^(---\n)([\s\S]*?)(\n---)/);
     if (!fmMatch) {
         return { ok: false, error: `agent.md has no valid frontmatter for ${aid}` };
@@ -882,8 +883,7 @@ export async function agentRename(aid, newName) {
         newFm = `name: "${newName}"\n${fm}`;
     }
     content = fmMatch[1] + newFm + fmMatch[3] + content.slice(fmMatch[0].length);
-    fs.writeFileSync(agentMdPath, content, 'utf-8');
-    // Upload
+    // agentmdPut 会写本地文件并 publishAgentMd
     let uploaded = false;
     try {
         const { agentmdPut } = await import('../aun/aid/index.js');

package/dist/cli/bench.js

@@ -6,7 +6,9 @@ import { execFile } from 'child_process';
 import { promisify } from 'util';
 import { aidList, aidCreate } from '../aun/aid/identity.js';
 import { msgSend, msgPull } from '../aun/msg/index.js';
-import { getPackageRoot } from '../paths.js';
+import { getPackageRoot, aunPath as defaultAunPath } from '../paths.js';
+import { createAunClient } from '../aun/aid/client.js';
+import { isHelpFlag } from './help.js';
 const execFileAsync = promisify(execFile);
 // ==================== ANSI ====================
 const GREEN = '\x1b[32m';
@@ -247,19 +249,11 @@ function filterBySize(results, received, cls, durationSec) {
     return computeMetrics(results.filter(r => r.sizeClass === cls), received.filter(r => r.sizeClass === cls), durationSec);
 }
 async function benchAuth(aids, concurrency, aunPath, slotId) {
-    const { AUNClient } = await import('@agentunion/fastaun');
-    const path = (await import('path')).default;
-    const fs = (await import('fs')).default;
-    const os = (await import('os')).default;
-    const resolvedAunPath = aunPath ?? path.join(os.homedir(), '.aun');
-    const caCertPath = path.join(resolvedAunPath, 'CA', 'root', 'root.crt');
+    const resolvedAunPath = aunPath ?? defaultAunPath();
     const tasks = aids.map(aid => async () => {
         const start = Date.now();
         try {
-            const clientOpts = { aun_path: resolvedAunPath, debug: false };
-            if (fs.existsSync(caCertPath))
-                clientOpts.root_ca_path = caCertPath;
-            const client = new AUNClient(clientOpts);
+            const client = await createAunClient({ aunPath: resolvedAunPath });
             await client.auth.createAid({ aid });
             const authResult = await client.auth.authenticate({ aid });
             const accessToken = authResult?.access_token ?? client._access_token;
@@ -363,7 +357,7 @@ async function cliAuth(aid, slotId) {
 }
 // ==================== Main Command ====================
 export async function cmdBench(args) {
-    if (args[0] === 'help' || args[0] === '--help' || args[0] === '-h') {
+    if (isHelpFlag(args[0])) {
         console.log(`用法: evolclaw bench [options]
 
 AUN 消息系统性能基准测试。使用多个本地 AID 并发互发消息，
@@ -411,14 +405,14 @@ Options:
     const aids = [];
     // AID is usable if: has private key + cert not expired + key/cert public key match
     const { aidShow } = await import('../aun/aid/identity.js');
-    const resolvedAunPath = aunPath ?? path.join(os.homedir(), '.aun');
+    const resolvedAunPath = aunPath ?? defaultAunPath();
     const usableAids = [];
     const skippedAids = [];
     for (const a of allAids) {
         if (!a.hasPrivateKey)
             continue;
         try {
-            const info = aidShow(a.aid, { aunPath });
+            const info = await aidShow(a.aid, { aunPath });
             if (!info.certExpiresAt) {
                 skippedAids.push({ aid: a.aid, reason: '无证书' });
                 continue;

package/dist/cli/help.js

@@ -0,0 +1,23 @@
+/**
+ * CLI help 检测 helper。
+ *
+ * 把 7 种历史写法统一为两个语义清晰的函数：
+ *   - isHelpFlag(token)：单 token 是否是 help 标记（'help' / '--help' / '-h'）
+ *   - wantsHelp(args)：args 任意位置出现 help 标记
+ *
+ * 两套 API 服务于不同语义：
+ *   - 顶层路由（如 cmdAid 看到第一个 token 是子命令名时）必须用 isHelpFlag(sub)，
+ *     否则 `ec aid delete --help` 会被顶层吞掉，永远到不了 delete 自己的 help。
+ *   - 单层命令（如 cmdLinkRules、cmdAid 的具体 sub 处理块内）用 wantsHelp(args)
+ *     更宽松，任意位置都识别。
+ */
+const HELP_TOKENS = new Set(['help', '--help', '-h']);
+export function isHelpFlag(token) {
+    return token !== undefined && HELP_TOKENS.has(token);
+}
+export function wantsHelp(args) {
+    for (const a of args)
+        if (HELP_TOKENS.has(a))
+            return true;
+    return false;
+}