evolclaw 2.6.0 → 2.6.2

package/dist/index.js

@@ -204,9 +204,11 @@ async function main() {
         showIdleMonitor: () => true,
         accumulateErrors: () => true,
     };
-    // 注册渠道插件的 adapter 和 policy
-    for (const inst of channelInstances) {
-        // 设置项目路径提供器（如果需要）
+    // ── MessageBridge：Channel ↔ Core 消息桥梁 ──
+    const msgBridge = new MessageBridge(config, sessionManager, processor, messageQueue, cmdHandler, eventBus);
+    // ── Channel instance registration (shared by startup and hot-load) ──
+    function registerChannelInstance(inst) {
+        // 1. 项目路径提供器
         if (inst.onProjectPathRequest && inst.channel.onProjectPathRequest) {
             inst.channel.onProjectPathRequest(async (channelId) => {
                 const session = await sessionManager.getOrCreateSession(inst.adapter.channelName, channelId, config.projects?.defaultPath || process.cwd(), undefined, undefined, undefined, undefined);
@@ -215,7 +217,7 @@ async function main() {
                     : path.resolve(process.cwd(), session.projectPath);
             });
         }
-        // 注册 adapter、policy 和 options（注入 channelType）
+        // 2. 注册 adapter、policy 和 options（注入 channelType）
         const opts = inst.channelType
             ? { ...inst.options, channelType: inst.channelType }
             : inst.options;
@@ -225,18 +227,13 @@ async function main() {
         if (inst.policy) {
             cmdHandler.registerPolicy(inst.adapter.channelName, inst.policy);
         }
-        // 注册交互回调：渠道收到用户操作后路由到 InteractionRouter
+        // 3. 交互回调
         if (inst.adapter.onInteraction) {
             inst.adapter.onInteraction((response) => {
                 interactionRouter.handle(response);
             });
         }
-    }
-    // ── MessageBridge：Channel ↔ Core 消息桥梁 ──
-    const msgBridge = new MessageBridge(config, sessionManager, processor, messageQueue, cmdHandler, eventBus);
-    // ── 渠道消息注册 ──
-    // 连接插件系统的渠道
-    for (const inst of channelInstances) {
+        // 4. MessageBridge 注册（按 channelType 分发）
         const channelType = inst.channelType || inst.adapter.channelName;
         if (channelType === 'feishu') {
             msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async ({ channelId: chatId, content, images, peerId, peerName, messageId, mentions, threadId, rootId, chatType }) => {
@@ -251,7 +248,6 @@ async function main() {
             }), inst.adapter, channelType);
         }
         if (channelType === 'wechat') {
-            // 注入 EventBus（用于 channel:health 事件）
             if (inst.channel.setEventBus) {
                 inst.channel.setEventBus(eventBus);
             }
@@ -281,6 +277,19 @@ async function main() {
                     replyContext: opts.replyContext,
                 });
             }), (channelId, text, replyContext) => inst.channel.sendMessage(channelId, text, replyContext), inst.adapter, channelType);
+            // AUN 重连失败通知
+            if (inst.channel.setOnChannelDown) {
+                inst.channel.setOnChannelDown(() => {
+                    eventBus.publish({
+                        type: 'channel:health',
+                        channel: channelType,
+                        channelName: inst.adapter.channelName,
+                        status: 'auth_error',
+                        message: `⚠️ AUN 渠道 ${inst.adapter.channelName} 断连，自动重试已用尽。\n使用 /check rty aun 手动重连`,
+                        timestamp: Date.now(),
+                    });
+                });
+            }
         }
         if (channelType === 'dingtalk') {
             msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
@@ -310,11 +319,40 @@ async function main() {
                 });
             }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
         }
-        // 通用：撤回消息 → 中断执行中任务（所有支持 onRecall 的渠道）
+        if (channelType === 'wecom') {
+            msgBridge.register(inst.adapter.channelName, (handler) => inst.channel.onMessage(async (event) => {
+                handler({
+                    channel: channelType,
+                    channelId: event.channelId,
+                    content: event.content,
+                    chatType: event.chatType || 'private',
+                    peerId: event.peerId || '',
+                    peerName: event.peerName,
+                    messageId: event.messageId,
+                });
+            }), (channelId, text) => inst.channel.sendMessage(channelId, text), inst.adapter, channelType);
+        }
+        // 5. 撤回消息 → 中断执行中任务
         inst.channel.onRecall?.((messageId) => {
             msgBridge.cancel(messageId);
         });
     }
+    // ── 注册所有渠道实例 ──
+    for (const inst of channelInstances) {
+        registerChannelInstance(inst);
+    }
+    // ── 设置热加载回调 ──
+    cmdHandler.setHotLoadChannel(async (inst) => {
+        registerChannelInstance(inst);
+        channelInstances.push(inst);
+        await inst.connect();
+        eventBus.publish({
+            type: 'channel:connected',
+            channel: (inst.channelType || inst.adapter.channelName).toLowerCase(),
+            channelName: inst.adapter.channelName,
+            timestamp: Date.now(),
+        });
+    });
     // ── 连接所有渠道 ──
     const connected = await channelLoader.connectAll(channelInstances);
     // 预填充 Feishu 已知 thread_id（重启后避免误判话题创建）
@@ -326,7 +364,6 @@ async function main() {
         }
     }
     for (const name of connected) {
-        // 查找对应实例以获取 channelType
         const inst = channelInstances.find(i => i.adapter.channelName === name);
         const type = inst?.channelType || name;
         eventBus.publish({
@@ -336,22 +373,6 @@ async function main() {
             timestamp: Date.now()
         });
     }
-    // AUN 重连失败通知：通过 channel:health 事件
-    for (const inst of channelInstances) {
-        const channelType = inst.channelType || inst.adapter.channelName;
-        if (channelType === 'aun' && inst.channel.setOnChannelDown) {
-            inst.channel.setOnChannelDown(() => {
-                eventBus.publish({
-                    type: 'channel:health',
-                    channel: channelType,
-                    channelName: inst.adapter.channelName,
-                    status: 'auth_error',
-                    message: `⚠️ AUN 渠道 ${inst.adapter.channelName} 断连，自动重试已用尽。\n使用 /check rty aun 手动重连`,
-                    timestamp: Date.now(),
-                });
-            });
-        }
-    }
     // 统一 channel:health 跨通道通知（仅 auth_error）
     // 按 (channelType, ownerId) 去重，避免同类型多实例重复通知
     eventBus.subscribe('channel:health', (event) => {

package/dist/templates/skills.md

@@ -1,8 +1,8 @@
 ---
 name: evolclaw-ctl
-version: 1.0.0
-description: EvolClaw 运行时自管理指令，仅在 evolclaw 托管环境中可用
-trigger: 用户询问或需要切换模型、调整推理强度、查看运行状态、压缩上下文、检查通道健康、管理权限模式、发送文件、重启服务、重连渠道时
+version: 1.1.0
+description: 仅在 evolclaw 运行时可用
+trigger: 用户询问或需要切换模型、调整推理强度、查看运行状态、压缩上下文、检查通道健康、管理权限模式、重启服务、重连渠道等
 ---
 
 # EvolClaw Ctl
@@ -35,6 +35,8 @@ trigger: 用户询问或需要切换模型、调整推理强度、查看运行
 - `evolclaw ctl agentmd` — 查看当前 agent.md
 - `evolclaw ctl agentmd put` — 发布本地 agent.md
 - `evolclaw ctl agentmd set <内容>` — 直接设置 agent.md 内容
+- `evolclaw ctl aid` — 列出所有 AUN 实例及连接状态
+- `evolclaw ctl aid new <aid>` — 创建新 AID 并热加载（仅 AUN 通道）
 
 ## 使用示例
 

package/dist/utils/init-channel.js

@@ -580,9 +580,9 @@ export async function cmdInitWechat() {
     process.exit(1);
 }
 // ==================== AUN ====================
-// 最低 @agentunion/aun-node 版本要求
-const MIN_AUN_CORE_SDK = [0, 2, 12];
-const AUN_CORE_SDK_PKG = '@agentunion/aun-node';
+// 最低 @agentunion/fastaun 版本要求
+const MIN_AUN_CORE_SDK = [0, 2, 14];
+const AUN_CORE_SDK_PKG = '@agentunion/fastaun';
 function compareVersion(a, min) {
     const parts = a.split('.').map(n => parseInt(n, 10));
     if (parts.length < 3 || parts.some(isNaN))
@@ -711,10 +711,83 @@ export async function checkAunEnvironment(rl) {
     console.log('');
     return true;
 }
-function isValidAid(name) {
+export function isValidAid(name) {
     const labels = name.split('.');
     return labels.length >= 3 && labels.every(l => /^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?$/.test(l));
 }
+/**
+ * Non-interactive AID creation + agent.md publish.
+ * Reuses the same logic as `evolclaw init --non-interactive --channel aun`.
+ *
+ * Returns the created AID string, or throws on failure.
+ */
+export async function createAidSilent(opts) {
+    const aunPath = path.join(os.homedir(), '.aun');
+    const aidDir = path.join(aunPath, 'AIDs', opts.aid);
+    // Skip creation if AID already exists locally
+    if (fs.existsSync(aidDir) && fs.existsSync(path.join(aidDir, 'private'))) {
+        return { aid: opts.aid, alreadyExisted: true };
+    }
+    const { AUNClient } = await import('@agentunion/fastaun');
+    let client = new AUNClient({ aun_path: aunPath });
+    const result = await client.auth.createAid({ aid: opts.aid });
+    // Download CA root cert (if not already present)
+    const caDownloaded = await downloadCaRoot(aunPath, result.gateway || '');
+    // Rebuild client with CA cert + AID identity for uploadAgentMd
+    const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
+    if (caDownloaded && fs.existsSync(caCertPath)) {
+        try {
+            await client.close();
+        }
+        catch { /* ignore */ }
+        client = new AUNClient({ aun_path: aunPath, root_ca_path: caCertPath, aid: opts.aid });
+    }
+    // Write initial agent.md (initialized: false, name = aid first label)
+    const agentName = opts.aid.split('.')[0];
+    const agentMdContent = `---\naid: "${opts.aid}"\nname: "${agentName}"\ntype: "ai"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\ninitialized: false\n---\n`;
+    const agentMdPath = path.join(aidDir, 'agent.md');
+    try {
+        await client.auth.uploadAgentMd(agentMdContent);
+    }
+    catch (e) {
+        // Non-fatal: first connection will auto-retry
+    }
+    fs.writeFileSync(agentMdPath, agentMdContent, 'utf-8');
+    try {
+        await client.close();
+    }
+    catch { /* ignore */ }
+    if (!fs.existsSync(agentMdPath)) {
+        throw new Error(`agent.md write verification failed: ${agentMdPath}`);
+    }
+    return { aid: opts.aid, alreadyExisted: false };
+}
+/**
+ * Append a new AUN instance to the config's channels.aun array and save.
+ * Handles upgrade from single-object to array format.
+ */
+export function appendAunInstance(config, inst) {
+    if (!config.channels)
+        config.channels = {};
+    const newInst = {
+        name: inst.name,
+        enabled: inst.enabled ?? true,
+        aid: inst.aid,
+        ...(inst.owner && { owner: inst.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];
+    }
+    const p = resolvePaths();
+    fs.writeFileSync(p.config, JSON.stringify(config, null, 2) + '\n');
+}
 export async function setupAunAid(rl, _config) {
     let aid = '';
     let gatewayPort; // only used locally for AID creation, not written to config
@@ -755,7 +828,7 @@ export async function setupAunAid(rl, _config) {
         console.log('  正在创建 AID...');
         let failed = false;
         try {
-            const { AUNClient } = await import('@agentunion/aun-node');
+            const { AUNClient } = await import('@agentunion/fastaun');
             let client = new AUNClient({ aun_path: aunPath });
             // 如果用户指定了自定义端口，手动设置 gateway URL；否则让 SDK 自动发现
             if (gatewayPort) {

package/dist/utils/init.js

@@ -408,14 +408,14 @@ export async function cmdInit(options) {
             // 自动安装 AUN SDK
             const { resolveAunCoreSdkPkg, npmInstallGlobal, downloadCaRoot } = await import('./init-channel.js');
             if (!resolveAunCoreSdkPkg()) {
-                console.log('正在安装 @agentunion/aun-node...');
-                await npmInstallGlobal('@agentunion/aun-node@latest');
+                console.log('正在安装 @agentunion/fastaun...');
+                await npmInstallGlobal('@agentunion/fastaun@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('@agentunion/aun-node');
+                const { AUNClient } = await import('@agentunion/fastaun');
                 let client = new AUNClient({ aun_path: aunPath });
                 // 让 SDK 通过 well-known 自动发现网关
                 const result = await client.auth.createAid({ aid: options.aunAid });

package/dist/utils/upgrade.js

@@ -0,0 +1,100 @@
+import fs from 'fs';
+import path from 'path';
+import { execFile } from 'child_process';
+import { getPackageRoot } from '../paths.js';
+/**
+ * 比较两个 semver 版本号 (a.b.c 格式)
+ * 返回 -1 (a < b), 0 (a == b), 1 (a > b)
+ * 自动剥离 pre-release 标签 (e.g. 2.6.0-beta.1 → 2.6.0)
+ */
+export function compareVersions(a, b) {
+    const pa = a.split('-')[0].split('.').map(Number);
+    const pb = b.split('-')[0].split('.').map(Number);
+    const len = Math.max(pa.length, pb.length);
+    for (let i = 0; i < len; i++) {
+        const na = pa[i] ?? 0;
+        const nb = pb[i] ?? 0;
+        if (na < nb)
+            return -1;
+        if (na > nb)
+            return 1;
+    }
+    return 0;
+}
+/**
+ * 检查当前安装是否为 npm link 开发模式。
+ * 正式全局安装的路径结构为 .../node_modules/evolclaw，
+ * 而 npm link 指向项目源码目录，其父目录不是 node_modules。
+ */
+export function isLinkedInstall() {
+    const pkgRoot = getPackageRoot();
+    return path.basename(path.dirname(pkgRoot)) !== 'node_modules';
+}
+/** 获取本地 package.json 中的版本号 */
+export function getLocalVersion() {
+    const pkgPath = path.join(getPackageRoot(), 'package.json');
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+    return pkg.version;
+}
+/**
+ * 查询 npm registry 上 evolclaw 的最新版本。
+ * 超时 15 秒，失败返回 null。
+ */
+export function checkLatestVersion() {
+    return new Promise((resolve) => {
+        execFile('npm', ['view', 'evolclaw', 'version'], { timeout: 15000 }, (err, stdout) => {
+            if (err) {
+                resolve(null);
+                return;
+            }
+            const ver = stdout.trim();
+            resolve(ver || null);
+        });
+    });
+}
+/**
+ * 执行 npm install -g evolclaw@latest
+ */
+function runInstall() {
+    return new Promise((resolve) => {
+        execFile('npm', ['install', '-g', 'evolclaw@latest'], { timeout: 120000 }, (err, _stdout, stderr) => {
+            if (err) {
+                resolve({ ok: false, error: stderr || err.message });
+            }
+            else {
+                resolve({ ok: true });
+            }
+        });
+    });
+}
+/**
+ * 完整升级流程：检查 → 比较 → 安装（失败重试一次）
+ */
+export async function tryUpgrade() {
+    // 开发模式跳过
+    if (isLinkedInstall()) {
+        return { status: 'skipped' };
+    }
+    const localVer = getLocalVersion();
+    // 查询 registry
+    const remoteVer = await checkLatestVersion();
+    if (!remoteVer) {
+        return { status: 'skipped', error: 'Failed to check remote version' };
+    }
+    // 版本比较
+    if (compareVersions(localVer, remoteVer) >= 0) {
+        return { status: 'no-update', from: localVer };
+    }
+    // 有新版本，执行升级（失败重试一次）
+    for (let attempt = 0; attempt < 2; attempt++) {
+        const result = await runInstall();
+        if (result.ok) {
+            return { status: 'upgraded', from: localVer, to: remoteVer };
+        }
+        if (attempt === 1) {
+            return { status: 'failed', from: localVer, to: remoteVer, error: result.error };
+        }
+    }
+    // unreachable
+    return { status: 'failed', from: localVer, to: remoteVer };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "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",
@@ -23,8 +23,8 @@
     "prepublishOnly": "npm run build && npm test"
   },
   "dependencies": {
+    "@agentunion/fastaun": "^0.2.15",
     "@anthropic-ai/claude-agent-sdk": "^0.2.100",
-    "@agentunion/aun-node": "^0.2.12",
     "image-type": "^6.0.0",
     "qrcode-terminal": "^0.12.0"
   },
@@ -37,8 +37,8 @@
     "pure-qqbot": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^25.5.0",
     "@types/form-data": "^2.2.1",
+    "@types/node": "^25.5.0",
     "@types/qrcode-terminal": "^0.12.2",
     "@vitest/coverage-v8": "^4.1.0",
     "tsx": "^4.19.0",