evolclaw 3.1.3 → 3.1.4

package/dist/cli/agent.js

@@ -2,7 +2,7 @@ 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';
@@ -46,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 };
@@ -68,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('.');
@@ -391,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;
@@ -547,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;
@@ -603,7 +597,7 @@ export async function agentCreateNonInteractive(opts) {
 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) {
@@ -869,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}` };
@@ -889,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;
+}