evolclaw 3.1.2 → 3.1.4

package/dist/cli/init-channel.js

@@ -8,9 +8,8 @@
 import fs from 'fs';
 import readline from 'readline';
 import path from 'path';
-import os from 'os';
 import crypto from 'crypto';
-import { aidLocalDir } from '../paths.js';
+import { aidLocalDir, aunPath as defaultAunPath } from '../paths.js';
 import { selectInstance } from './init.js';
 import { npmInstallGlobal } from '../utils/npm-ops.js';
 import { loadAllAgents, loadAgent } from '../config-store.js';
@@ -442,7 +441,7 @@ export async function setupAunAid(rl, _config) {
             }
         }
         // Check if AID exists locally
-        const aunPath = path.join(os.homedir(), '.aun');
+        const aunPath = defaultAunPath();
         const aidDir = path.join(aunPath, 'AIDs', aid);
         if (fs.existsSync(aidDir) && fs.existsSync(path.join(aidDir, 'private'))) {
             console.log(`  ✓ AID ${aid} 已存在`);

package/dist/cli/init.js

@@ -4,6 +4,7 @@ import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
 import { saveDefaultsSafe, loadAllAgents } from '../config-store.js';
+import { isCodexSdkAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -14,8 +15,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 detectAvailable() {
-    return BASEAGENT_CANDIDATES.filter(b => commandExists(b));
+    return BASEAGENT_CANDIDATES.filter(isBaseagentAvailable);
 }
 function pickDefault(available) {
     return (available.includes('claude') ? 'claude' : available[0]);
@@ -45,9 +51,10 @@ export async function cmdInit(options) {
     // ── 2. 探测 baseagent ──
     const available = detectAvailable();
     if (available.length === 0) {
-        console.log('❌ 未检测到任何 baseagent CLI，请先安装至少一款：');
-        for (const b of BASEAGENT_CANDIDATES)
-            console.log(`  - ${b}`);
+        console.log('❌ 未检测到可用 baseagent。请安装至少一款：');
+        console.log('  - claude CLI');
+        console.log('  - gemini CLI');
+        console.log('  - optional dependency @openai/codex-sdk');
         console.log('\n安装后重新运行 evolclaw init');
         return;
     }
@@ -70,7 +77,7 @@ export async function cmdInit(options) {
                 return;
             }
             if (!available.includes(options.baseagent)) {
-                console.log(`❌ ${options.baseagent} 未在 PATH 中检测到（可用: ${available.join('/')}）`);
+                console.log(`❌ ${options.baseagent} 当前环境不可用（可用: ${available.join('/')}）`);
                 return;
             }
             chosen = options.baseagent;
@@ -104,7 +111,7 @@ export async function cmdInit(options) {
                 continue;
             }
             if (!available.includes(input)) {
-                console.log(`  ${input} 未在 PATH 中检测到（可用: ${available.join('/')}）`);
+                console.log(`  ${input} 当前环境不可用（可用: ${available.join('/')}）`);
                 continue;
             }
             chosen = input;

package/dist/cli/link-rules.js

@@ -2,6 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { kitsRulesDir, resolvePaths } from '../paths.js';
 import { atomicWriteJson, atomicReadJson } from '../utils/atomic-write.js';
+import { wantsHelp } from './help.js';
 const isWindows = process.platform === 'win32';
 const KNOWN_BASEAGENTS = ['cc', 'codex', 'gemini'];
 function statePath() {
@@ -196,7 +197,7 @@ function disconnect(ba) {
 }
 // ── 入口 ──
 export function cmdLinkRules(args) {
-    if (args.includes('--help') || args.includes('-h')) {
+    if (wantsHelp(args)) {
         showHelp();
         return;
     }

package/dist/cli/net-check.js

@@ -1,12 +1,14 @@
 import fs from 'fs';
 import path from 'path';
-import os from 'os';
 import net from 'net';
 import tls from 'tls';
 import dns from 'dns/promises';
 import https from 'https';
 // @ts-ignore
 import { WebSocket } from 'ws';
+import { aunPath as defaultAunPath } from '../paths.js';
+import { createAunClient } from '../aun/aid/client.js';
+import { isHelpFlag } from './help.js';
 const GREEN = '\x1b[32m';
 const RED = '\x1b[31m';
 const YELLOW = '\x1b[33m';
@@ -217,10 +219,9 @@ async function runCheck(aid, formatJson) {
     let accessToken;
     try {
         const start = Date.now();
-        const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-        const { AUNClient } = await import('@agentunion/fastaun');
+        const aunPath = process.env.AUN_HOME || defaultAunPath();
         const result = await suppressSdkOutput(async () => {
-            const client = new AUNClient({ aun_path: aunPath, debug: false });
+            const client = await createAunClient({ aunPath });
             await client.auth.createAid({ aid });
             const authResult = await client.auth.authenticate({ aid });
             await client.close().catch(() => { });
@@ -268,10 +269,9 @@ async function runCheck(aid, formatJson) {
     // ── Step 9: RPC 调用 (meta.ping) ──
     try {
         const start = Date.now();
-        const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-        const { AUNClient } = await import('@agentunion/fastaun');
+        const aunPath = process.env.AUN_HOME || defaultAunPath();
         const sendResult = await suppressSdkOutput(async () => {
-            const client = new AUNClient({ aun_path: aunPath, debug: false });
+            const client = await createAunClient({ aunPath });
             await client.auth.createAid({ aid });
             const authResult = await client.auth.authenticate({ aid });
             const at = authResult?.access_token || client._access_token;
@@ -291,8 +291,7 @@ async function runCheck(aid, formatJson) {
     // CLI 模拟 app 发送 echo[nc]，向多个目标测试链路
     try {
         const echoStart = Date.now();
-        const aunPath = process.env.AUN_HOME || path.join(os.homedir(), '.aun');
-        const { AUNClient } = await import('@agentunion/fastaun');
+        const aunPath = process.env.AUN_HOME || defaultAunPath();
         // 选择 6 个测试目标，按消息数量、域、有无证书均衡选择
         const allAids = await getAidList();
         const myDomain = aid.split('.').slice(1).join('.');
@@ -421,7 +420,7 @@ async function runCheck(aid, formatJson) {
             const label = targetLabel(target);
             try {
                 const replyText = await suppressSdkOutput(async () => {
-                    const client = new AUNClient({ aun_path: aunPath, debug: false });
+                    const client = await createAunClient({ aunPath });
                     await client.auth.createAid({ aid });
                     const authResult = await client.auth.authenticate({ aid });
                     const at = authResult?.access_token || client._access_token;
@@ -564,7 +563,7 @@ function shuffle(arr) {
 export async function cmdNet(args) {
     const sub = args[0];
     const formatJson = args.includes('--format') && args.includes('json');
-    if (sub === 'help' || sub === '--help' || sub === '-h') {
+    if (isHelpFlag(sub)) {
         console.log(`用法: evolclaw net check [<aid>] [--format json]
 
 检查 AUN 网络链路连通性（10 步逐层诊断）。