evolclaw 2.5.3 → 2.5.5

package/dist/utils/init-channel.js

@@ -10,7 +10,7 @@ import readline from 'readline';
 import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
-import { createRequire } from 'module';
+import { fileURLToPath } from 'url';
 import { execFile, execFileSync } from 'child_process';
 import { promisify } from 'util';
 import { resolvePaths } from '../paths.js';
@@ -20,8 +20,9 @@ import { isWindows } from './cross-platform.js';
 const execFileAsync = promisify(execFile);
 export async function npmInstallGlobal(pkg) {
     const npmCmd = isWindows ? 'npm.cmd' : 'npm';
+    const execOpts = { timeout: 180000, shell: isWindows };
     try {
-        await execFileAsync(npmCmd, ['install', '-g', pkg], { timeout: 180000 });
+        await execFileAsync(npmCmd, ['install', '-g', pkg], execOpts);
     }
     catch (e) {
         if (e.stderr?.includes('EACCES') || e.message?.includes('EACCES')) {
@@ -563,9 +564,9 @@ export async function cmdInitWechat() {
     process.exit(1);
 }
 // ==================== AUN ====================
-// 最低 @eleans/aun-core-sdk 版本要求
-const MIN_AUN_CORE_SDK = [0, 2, 9];
-const AUN_CORE_SDK_PKG = '@eleans/aun-core-sdk';
+// 最低 @agentunion/aun-node 版本要求
+const MIN_AUN_CORE_SDK = [0, 2, 12];
+const AUN_CORE_SDK_PKG = '@agentunion/aun-node';
 function compareVersion(a, min) {
     const parts = a.split('.').map(n => parseInt(n, 10));
     if (parts.length < 3 || parts.some(isNaN))
@@ -577,35 +578,31 @@ function compareVersion(a, min) {
     return parts[2] >= min[2];
 }
 export function resolveAunCoreSdkPkg() {
-    // Strategy 1: createRequire (works when evolclaw and SDK share the same node_modules)
+    const pkgName = AUN_CORE_SDK_PKG;
+    // Strategy 1: walk up node_modules from this file (no require.resolve — avoids ESM exports issues)
     try {
-        const esmRequire = createRequire(import.meta.url);
-        const entry = esmRequire.resolve(AUN_CORE_SDK_PKG);
-        const pkgPath = path.join(path.dirname(entry), 'package.json');
-        if (!fs.existsSync(pkgPath)) {
-            // 向上回溯查找 package.json
-            let dir = path.dirname(entry);
-            for (let i = 0; i < 5; i++) {
-                const candidate = path.join(dir, 'package.json');
-                if (fs.existsSync(candidate)) {
-                    const data = JSON.parse(fs.readFileSync(candidate, 'utf-8'));
-                    if (data.name === AUN_CORE_SDK_PKG)
-                        return { version: data.version, path: candidate };
-                }
-                dir = path.dirname(dir);
+        let dir = path.dirname(fileURLToPath(import.meta.url));
+        while (true) {
+            const candidate = path.join(dir, 'node_modules', pkgName, 'package.json');
+            if (fs.existsSync(candidate)) {
+                const data = JSON.parse(fs.readFileSync(candidate, 'utf-8'));
+                if (data.name === pkgName)
+                    return { version: data.version, path: candidate };
             }
-        }
-        else {
-            const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
-            return { version: data.version, path: pkgPath };
+            const parent = path.dirname(dir);
+            if (parent === dir)
+                break;
+            dir = parent;
         }
     }
-    catch { /* fall through to strategy 2 */ }
-    // Strategy 2: npm root -g fallback (handles Windows / path mismatch)
+    catch { /* fall through */ }
+    // Strategy 2: npm root -g fallback (globally installed SDK)
     try {
         const npmCmd = isWindows ? 'npm.cmd' : 'npm';
-        const globalRoot = execFileSync(npmCmd, ['root', '-g'], { encoding: 'utf-8', timeout: 10000 }).trim();
-        const pkgPath = path.join(globalRoot, AUN_CORE_SDK_PKG, 'package.json');
+        const globalRoot = execFileSync(npmCmd, ['root', '-g'], {
+            encoding: 'utf-8', timeout: 10000, shell: isWindows,
+        }).trim();
+        const pkgPath = path.join(globalRoot, pkgName, 'package.json');
         if (fs.existsSync(pkgPath)) {
             const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
             return { version: data.version, path: pkgPath };
@@ -704,25 +701,32 @@ export async function setupAunAid(rl, _config) {
         console.log('  正在创建 AID...');
         let failed = false;
         try {
-            const { AUNClient } = await import('@eleans/aun-core-sdk');
+            const { AUNClient } = await import('@agentunion/aun-node');
             const client = new AUNClient({ aun_path: aunPath });
-            // Set gateway URL from AID domain + port
-            const domain = aid.split('.').slice(1).join('.');
-            const port = gatewayPort || 443;
-            client._gatewayUrl = `wss://gateway.${domain}:${port}/aun`;
+            // 如果用户指定了自定义端口，手动设置 gateway URL；否则让 SDK 自动发现
+            if (gatewayPort) {
+                const domain = aid.split('.').slice(1).join('.');
+                client._gatewayUrl = `wss://gateway.${domain}:${gatewayPort}/aun`;
+            }
             const result = await client.auth.createAid({ aid });
             console.log(`  ✓ AID ${result.aid} 创建成功`);
-            // 下载 CA 根证书（如果本地不存在）
+            // 下载 CA 根证书（如果本地不存在），从 SDK 返回的实际网关 URL 派生
             const caDir = path.join(aunPath, 'CA', 'root');
             const caCertPath = path.join(caDir, 'root.crt');
-            if (!fs.existsSync(caCertPath)) {
+            if (!fs.existsSync(caCertPath) && result.gateway) {
                 try {
                     fs.mkdirSync(caDir, { recursive: true });
-                    // Derive HTTPS URL from gateway WebSocket URL (same as SDK's _gatewayHttpUrl)
-                    const resp = await fetch(`https://gateway.${domain}:${port}/pki/chain`);
+                    const gwHttp = result.gateway.replace(/^wss?:/, 'https:').replace(/\/aun$/, '');
+                    const resp = await fetch(`${gwHttp}/pki/chain`, { redirect: 'follow' });
                     if (resp.ok) {
-                        fs.writeFileSync(caCertPath, await resp.text());
-                        console.log('  ✓ CA 根证书已下载');
+                        const body = await resp.text();
+                        if (body.includes('BEGIN CERTIFICATE')) {
+                            fs.writeFileSync(caCertPath, body);
+                            console.log('  ✓ CA 根证书已下载');
+                        }
+                        else {
+                            console.warn('  ⚠ CA 根证书响应内容无效，跳过写入');
+                        }
                     }
                 }
                 catch (e) {
@@ -788,15 +792,29 @@ export async function cmdInitAun() {
         return;
     }
     const config = JSON.parse(fs.readFileSync(p.config, 'utf-8'));
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        if (config.channels?.aun?.aid) {
-            const answer = (await ask(rl, '已有 AUN 配置，是否重新配置？[y/N] ')).trim().toLowerCase();
-            if (answer !== 'y' && answer !== 'yes') {
-                console.log('已取消');
+    // Normalize existing instances and filter out placeholders
+    const allInstances = normalizeChannelInstances(config.channels?.aun, 'aun');
+    const validInstances = [];
+    for (let i = 0; i < allInstances.length; i++) {
+        const inst = allInstances[i];
+        if (!inst.aid || inst.aid.includes('your-') || inst.aid.includes('placeholder'))
+            continue;
+        validInstances.push({ ...inst, originalIndex: i });
+    }
+    let choice = null;
+    if (validInstances.length > 0) {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        try {
+            choice = await selectInstance(rl, 'aun', validInstances);
+            if (choice === null)
                 return;
-            }
         }
+        finally {
+            rl.close();
+        }
+    }
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    try {
         if (!await checkAunEnvironment(rl)) {
             return;
         }
@@ -805,11 +823,43 @@ export async function cmdInitAun() {
             return;
         if (!config.channels)
             config.channels = {};
-        config.channels.aun = {
-            enabled: true,
-            aid: result.aid,
-            owner: result.owner,
-        };
+        if (choice && choice.action === 'overwrite' && Array.isArray(config.channels.aun)) {
+            const idx = validInstances[choice.index]?.originalIndex ?? choice.index;
+            config.channels.aun[idx].aid = result.aid;
+            config.channels.aun[idx].owner = result.owner;
+            config.channels.aun[idx].enabled = true;
+        }
+        else if (choice && choice.action === 'overwrite' && !Array.isArray(config.channels.aun)) {
+            config.channels.aun = config.channels.aun || {};
+            config.channels.aun.aid = result.aid;
+            config.channels.aun.owner = result.owner;
+            config.channels.aun.enabled = true;
+        }
+        else if (choice && choice.action === 'add') {
+            const newInst = {
+                name: choice.name,
+                enabled: true,
+                aid: result.aid,
+                owner: result.owner,
+            };
+            if (Array.isArray(config.channels.aun)) {
+                config.channels.aun.push(newInst);
+            }
+            else if (config.channels.aun) {
+                const oldInst = { ...config.channels.aun, name: config.channels.aun.name || 'aun' };
+                config.channels.aun = [oldInst, newInst];
+            }
+            else {
+                config.channels.aun = [newInst];
+            }
+        }
+        else {
+            config.channels.aun = {
+                enabled: true,
+                aid: result.aid,
+                owner: result.owner,
+            };
+        }
         if (!config.channels.defaultChannel)
             config.channels.defaultChannel = 'aun';
         fs.writeFileSync(p.config, JSON.stringify(config, null, 2) + '\n');

package/dist/utils/init.js

@@ -408,28 +408,34 @@ export async function cmdInit(options) {
             // 自动安装 AUN SDK
             const { resolveAunCoreSdkPkg, npmInstallGlobal } = await import('./init-channel.js');
             if (!resolveAunCoreSdkPkg()) {
-                console.log('正在安装 @eleans/aun-core-sdk...');
-                await npmInstallGlobal('@eleans/aun-core-sdk@latest');
+                console.log('正在安装 @agentunion/aun-node...');
+                await npmInstallGlobal('@agentunion/aun-node@latest');
             }
             // 创建 AID（如果本地不存在）
             const aunPath = path.join(os.homedir(), '.aun');
             const aidDir = path.join(aunPath, 'AIDs', options.aunAid);
             if (!fs.existsSync(path.join(aidDir, 'private'))) {
-                const { AUNClient } = await import('@eleans/aun-core-sdk');
+                const { AUNClient } = await import('@agentunion/aun-node');
                 const client = new AUNClient({ aun_path: aunPath });
-                const domain = options.aunAid.split('.').slice(1).join('.');
-                client._gatewayUrl = `wss://gateway.${domain}:443/aun`;
-                await client.auth.createAid({ aid: options.aunAid });
-                // 下载 CA 根证书（如果本地不存在）
+                // 让 SDK 通过 well-known 自动发现网关
+                const result = await client.auth.createAid({ aid: options.aunAid });
+                // 下载 CA 根证书（如果本地不存在），从 SDK 返回的实际网关 URL 派生
                 const caDir = path.join(aunPath, 'CA', 'root');
                 const caCertPath = path.join(caDir, 'root.crt');
-                if (!fs.existsSync(caCertPath)) {
+                if (!fs.existsSync(caCertPath) && result.gateway) {
                     try {
                         fs.mkdirSync(caDir, { recursive: true });
-                        const resp = await fetch(`https://gateway.${domain}/pki/chain`);
+                        const gwHttp = result.gateway.replace(/^wss?:/, 'https:').replace(/\/aun$/, '');
+                        const resp = await fetch(`${gwHttp}/pki/chain`, { redirect: 'follow' });
                         if (resp.ok) {
-                            fs.writeFileSync(caCertPath, await resp.text());
-                            console.log('✓ CA 根证书已下载');
+                            const body = await resp.text();
+                            if (body.includes('BEGIN CERTIFICATE')) {
+                                fs.writeFileSync(caCertPath, body);
+                                console.log('✓ CA 根证书已下载');
+                            }
+                            else {
+                                console.warn('⚠ CA 根证书响应内容无效，跳过写入');
+                            }
                         }
                     }
                     catch (e) {
@@ -619,7 +625,10 @@ export async function selectInstance(rl, channelType, instances) {
     console.log(`\n发现已有 ${typeLabel} 机器人：`);
     const letters = 'abcdefghijklmnopqrstuvwxyz';
     for (let i = 0; i < instances.length; i++) {
-        console.log(`  ${letters[i]}. ${instances[i].name}`);
+        const inst = instances[i];
+        const id = inst.aid || inst.appId || inst.botId || inst.clientId || inst.token?.slice(0, 16) || '';
+        const suffix = id ? ` (${id})` : '';
+        console.log(`  ${letters[i]}. ${inst.name}${suffix}`);
     }
     const addLetter = letters[instances.length];
     console.log(`  ${addLetter}. 添加新机器人`);

package/evolclaw-install-aun.md

@@ -50,11 +50,13 @@ npm install -g evolclaw
 
 | 参数 | 说明 | 示例 |
 |------|------|------|
-| `--aun-aid` | **必填**，你的 AUN Agent ID | `mybot.agentid.pub` |
-| `--aun-owner` | **必填**，Owner 的 AUN ID | `alice.agentid.pub` |
+| `--aun-aid` | **必填**，Agent 自身的 AID，作为 bot 在 AUN 网络上的独立身份 | `mybot.agentid.pub` |
+| `--aun-owner` | **必填**，Owner 的 AID，用于接收欢迎消息和管理权限 | `alice.agentid.pub` |
 | `--default-path` | 默认项目路径（可选，默认当前目录） | `/home/user/myproject` |
 
-如果用户在触发安装时已提供 Owner AID（例如消息中包含"将 xxx 添加为 Owner ID"），直接使用该值，否则询问用户。
+**注意**：`--aun-aid` 和 `--aun-owner` 必须是不同的 AID。Agent 需要独立身份，不能与 Owner 相同。
+
+如果用户在触发安装时已提供 Owner AID（例如消息中包含"将 xxx 添加为 Owner ID"），直接使用该值，否则询问用户。Agent AID 必须单独询问用户，不能默认使用 Owner AID。
 
 ### 步骤 4：非交互式初始化
 
@@ -146,3 +148,111 @@ EvolClaw 首次连接 AUN 网络时自动：
 evolclaw restart
 evolclaw logs
 ```
+
+**Q: 如何清理损坏的 AID 重新注册？**
+```bash
+rm -rf ~/.aun/AIDs/<aid>
+evolclaw init --non-interactive --channel aun --aun-aid <aid> --aun-owner <owner>
+```
+
+---
+
+## Windows 故障排除（自动诊断）
+
+以下步骤面向 AI Agent 自动执行，按 if-then 格式编写。
+
+### evolclaw 命令不可用
+
+如果 `evolclaw --version` 返回 command not found 或无法识别：
+
+**原因**：npm 全局 bin 目录不在系统 PATH 中。
+
+**修复**：
+
+```bash
+# 1. 获取 npm 全局 bin 目录
+npm config get prefix
+# Windows 输出示例：C:\Users\<user>\AppData\Roaming\npm
+# Unix 输出示例：/usr/local/
+
+# 2. 将该目录加入 PATH
+# Windows (PowerShell, 当前用户永久生效):
+[Environment]::SetEnvironmentVariable("Path", "$([Environment]::GetEnvironmentVariable('Path', 'User'));C:\Users\<user>\AppData\Roaming\npm", "User")
+# Unix:
+echo 'export PATH="$(npm config get prefix)/bin:$PATH"' >> ~/.bashrc && source ~/.bashrc
+
+# 3. 验证
+evolclaw --version
+```
+
+### SDK 找不到 Claude Code 可执行体
+
+**症状**：`evolclaw start` 后日志出现 `spawn ENOENT`、`executable not found`、或 SDK 报 `Could not find claude-code executable`。
+
+**原因**：Claude Code CLI 未安装，或安装后不在 PATH 中。
+
+**修复**：
+
+```bash
+# 1. 检查 claude 是否可用
+# Windows:
+where claude
+# Unix:
+which claude
+
+# 2. 如果不存在，安装 Claude Code CLI
+npm install -g @anthropic-ai/claude-code
+
+# 3. 如果已安装但不在 PATH，同上一节方法将 npm 全局 bin 目录加入 PATH
+
+# 4. 验证
+claude --version
+```
+
+安装完成后 SDK 会自动发现 `claude` 可执行体，无需额外配置。
+
+**备用方案**：如果因 SDK 平台包版本错位（win32-x64 二进制滞后于 SDK 主包）导致 SDK 内置可执行体不可用，但系统已有独立安装的 `claude`，可在 `~/.evolclaw/data/evolclaw.json` 中显式指定路径：
+
+```json
+{
+  "agents": {
+    "anthropic": {
+      "pathToClaudeCodeExecutable": "C:\\Users\\<user>\\AppData\\Roaming\\npm\\claude.cmd"
+    }
+  }
+}
+```
+
+此配置仅作为 SDK 自动发现失败时的 escape hatch。
+
+### SDK 平台包版本错位
+
+**症状**：`npm install -g evolclaw` 成功，但启动时 SDK 报原生模块加载失败。
+
+**诊断**：
+```bash
+# 检查 SDK 主包版本
+node -e "console.log(require('@anthropic-ai/claude-agent-sdk/package.json').version)"
+
+# 检查平台包是否存在
+node -e "try{require('@anthropic-ai/claude-code-win32-x64');console.log('OK')}catch(e){console.log('MISSING:',e.message)}"
+```
+
+**修复**：确保系统有独立安装的 Claude Code CLI（`npm install -g @anthropic-ai/claude-code`），SDK 会优先使用 PATH 中的 `claude`。
+
+### npm install 报 spawn EINVAL
+
+**症状**：`npm install -g evolclaw` 过程中报 `spawn EINVAL`。
+
+**原因**：Node.js 24+ 的安全变更（CVE-2024-27980）与部分 npm 脚本不兼容。
+
+**修复**：
+
+```bash
+# 1. 升级到 evolclaw >= 2.5.4
+npm install -g evolclaw@latest
+
+# 2. 如仍报错，先手动安装 AUN SDK 依赖再执行 init
+npm install -g @agentunion/aun-node
+evolclaw init --non-interactive --channel aun --aun-aid <aid> --aun-owner <owner>
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",
@@ -11,7 +11,8 @@
     "dist/",
     "!dist/experimental/",
     "data/evolclaw.sample.json",
-    "evolclaw-install-aun.md"
+    "evolclaw-install-aun.md",
+    "aun/pyproject.toml"
   ],
   "scripts": {
     "dev": "tsx watch src/index.ts",
@@ -24,7 +25,7 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.100",
-    "@eleans/aun-core-sdk": "^0.2.9",
+    "@agentunion/aun-node": "^0.2.12",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@openai/codex-sdk": "^0.118.0",
     "@types/form-data": "^2.2.1",