evolclaw 3.1.3 → 3.1.5

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;
@@ -423,11 +419,14 @@ export async function agentCreateInteractive(opts = {}) {
         catch (e) {
             console.warn(`  ⚠ agent.md generation failed: ${e?.message || e}`);
         }
-        // Attempt hot-load via IPC (if daemon is running)
+        // Attempt hot-load via IPC (if daemon is running).
+        // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
+        // >3s, so use a generous timeout to avoid a false "service not running"
+        // report while the daemon actually finishes bringing the agent online.
         let hotLoaded = false;
         let hotLoadError;
         try {
-            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid });
+            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid }, 30_000);
             if (ipcResult?.ok) {
                 hotLoaded = true;
             }
@@ -547,10 +546,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;
@@ -575,11 +572,14 @@ export async function agentCreateNonInteractive(opts) {
     catch (e) {
         console.warn(`⚠ agent.md generation failed: ${e?.message || e}`);
     }
-    // Attempt hot-load via IPC (if daemon is running)
+    // Attempt hot-load via IPC (if daemon is running).
+    // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
+    // >3s, so use a generous timeout to avoid a false "service not running"
+    // report while the daemon actually finishes bringing the agent online.
     let hotLoaded = false;
     let hotLoadError;
     try {
-        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid });
+        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid }, 30_000);
         if (ipcResult?.ok) {
             hotLoaded = true;
         }
@@ -603,7 +603,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) {
@@ -835,7 +835,7 @@ export async function agentChannelUpsert(opts) {
     return {
         ok: true,
         aid: opts.aid,
-        channelKey: `${opts.channel.type}#${encodeURIComponent(opts.aid)}#${opts.channel.name}`,
+        channelKey: `${opts.channel.type}#${opts.aid}#${opts.channel.name}`,
         reloaded,
     };
 }
@@ -869,12 +869,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 +889,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 { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
+import { isHelpFlag } from './help.js';
 const execFileAsync = promisify(execFile);
 // ==================== ANSI ====================
 const GREEN = '\x1b[32m';
@@ -246,42 +248,48 @@ function computeMetrics(results, received, durationSec) {
 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 tasks = aids.map(aid => async () => {
+async function benchAuth(aids, concurrency, aunPath) {
+    const tasks = aids.map((aid, index) => async () => {
         const start = Date.now();
+        const slotId = `${SLOT.bench}-${index}`;
+        let store = null;
+        let client = null;
         try {
-            const clientOpts = { aun_path: resolvedAunPath, debug: false };
-            if (fs.existsSync(caCertPath))
-                clientOpts.root_ca_path = caCertPath;
-            const client = new AUNClient(clientOpts);
-            await client.auth.createAid({ aid });
-            const authResult = await client.auth.authenticate({ aid });
-            const accessToken = authResult?.access_token ?? client._access_token;
-            const gateway = client._gatewayUrl ?? authResult?.gateway ?? '';
-            await client.connect({ access_token: accessToken, gateway, slot_id: slotId ?? '', connection_kind: 'short' }, { auto_reconnect: false });
+            store = await getAidStore({ slotId, aunPath });
+            client = await loadClient(store, aid);
+            await client.connect({ auto_reconnect: false });
+            const gateway = ''; // Gateway URL not exposed in 0.4.3
+            const authMs = Date.now() - start;
             try {
                 await client.close();
             }
             catch { }
-            return { aid, ok: true, authMs: Date.now() - start, gateway };
+            try {
+                store.close();
+            }
+            catch { }
+            return { aid, ok: true, authMs, gateway };
         }
         catch (e) {
+            if (client)
+                try {
+                    await client.close();
+                }
+                catch { }
+            if (store)
+                try {
+                    store.close();
+                }
+                catch { }
             return { aid, ok: false, authMs: Date.now() - start, error: e.message };
         }
     });
     return runPool(tasks, concurrency);
 }
-async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
+async function benchSwitch(aids, rounds, aunPath, useCli, encrypt) {
     const results = [];
     const start = Date.now();
     let seq = 0;
-    const slot = slotId ?? 'bench';
     for (let round = 0; round < rounds; round++) {
         for (let i = 0; i < aids.length; i++) {
             const from = aids[i];
@@ -292,8 +300,9 @@ async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
             let ok = false;
             let serverTimestamp;
             if (useCli) {
+                const slotId = `${SLOT.bench}-${i}`;
                 try {
-                    const res = await withTimeout(cliSend(from, to, text, slot, encrypt), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
+                    const res = await withTimeout(cliSend(from, to, text, slotId, encrypt), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
                     ok = res.ok;
                     serverTimestamp = res.timestamp;
                 }
@@ -302,8 +311,9 @@ async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
                 }
             }
             else {
+                const slotId = `${SLOT.bench}-${i}`;
                 try {
-                    const res = await withTimeout(msgSend({ from, to, body: { mode: 'text', text }, slotId: slot, aunPath, encrypt }), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
+                    const res = await withTimeout(msgSend({ from, to, body: { mode: 'text', text }, slotId, aunPath, encrypt }), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
                     ok = res.ok;
                     serverTimestamp = res.ok ? res.timestamp : undefined;
                 }
@@ -363,7 +373,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 并发互发消息，
@@ -398,7 +408,6 @@ Options:
     const defaultWait = encrypt ? '10' : '3';
     const waitSec = Math.max(1, parseInt(getArgValue(args, '--wait') || defaultWait, 10));
     const sessionId = crypto.randomBytes(4).toString('hex');
-    const benchSlot = `bench-${sessionId}`;
     if (!formatJson) {
         console.log(`\n${BOLD}  evolclaw bench${RST} — AUN 消息性能基准测试`);
         console.log(`  ${'━'.repeat(50)}`);
@@ -411,14 +420,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;
@@ -501,14 +510,15 @@ Options:
         authTasks.push(...aids);
     let authResults;
     if (cliMode) {
-        const cliAuthTasks = authTasks.map(aid => async () => {
-            const r = await cliAuth(aid, benchSlot);
+        const cliAuthTasks = authTasks.map((aid, index) => async () => {
+            const slotId = `${SLOT.bench}-${index}`;
+            const r = await cliAuth(aid, slotId);
             return { aid, ok: r.ok, authMs: r.authMs };
         });
         authResults = await runPool(cliAuthTasks, concurrency);
     }
     else {
-        authResults = await benchAuth(authTasks, concurrency, aunPath, benchSlot);
+        authResults = await benchAuth(authTasks, concurrency, aunPath);
     }
     const authOk = authResults.filter(r => r.ok);
     const authFail = authResults.filter(r => !r.ok);
@@ -598,7 +608,7 @@ Options:
     // Suppress SDK error logs during send phase (we track errors ourselves)
     const origError2 = console.error;
     console.error = () => { };
-    const sendFns = tasks.map(t => async () => {
+    const sendFns = tasks.map((t, taskIndex) => async () => {
         let lastError;
         let retries = 0;
         for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -611,10 +621,11 @@ Options:
                 ? buildFileChunkText(t.seq, fileChunks.length, sendTs, sessionId, fileChunks[t.seq]?.toString('base64') ?? '')
                 : buildMessageText(t.seq, t.sizeClass, sendTs, sessionId);
             const t0 = Date.now();
+            const slotId = `${SLOT.bench}-${taskIndex % concurrency}`;
             try {
                 const sendPromise = cliMode
-                    ? cliSend(t.from, t.to, text, benchSlot, encrypt)
-                    : msgSend({ from: t.from, to: t.to, body: { mode: 'text', text }, slotId: benchSlot, aunPath, encrypt });
+                    ? cliSend(t.from, t.to, text, slotId, encrypt)
+                    : msgSend({ from: t.from, to: t.to, body: { mode: 'text', text }, slotId, aunPath, encrypt });
                 const res = await withTimeout(sendPromise, SEND_TIMEOUT_MS, `${t.from.split('.')[0]}→${t.to.split('.')[0]}`);
                 if (cliMode) {
                     const cliRes = res;
@@ -928,7 +939,7 @@ Options:
     if (!formatJson)
         console.log(`${DIM}  Phase 5: 频繁切换账号收发测试${RST}`);
     const switchRounds = Math.max(2, Math.min(rounds, 5));
-    const switchOut = await benchSwitch(aids, switchRounds, aunPath, cliMode, benchSlot, encrypt);
+    const switchOut = await benchSwitch(aids, switchRounds, aunPath, cliMode, encrypt);
     const switchOkResults = switchOut.results.filter(r => r.ok);
     const switchLatencies = switchOkResults
         .filter(r => r.serverTimestamp !== undefined)

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;
+}