agent-bridge-aun 1.0.4 → 1.0.6

package/README.md

@@ -6,4 +6,4 @@
 
 该插件依赖 `@agentunion/fastaun`，要求 Node.js 22.16 或更高版本。
 
-ABWeb 的 AUN 设置仅展示已连接 AID。列表先显示已关联 Agent 的身份，同类中本工程身份在 EvolCore 身份前面；各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。
+ABWeb 的 AUN 设置展示本机 AID 和已连接 AID，不再依赖 `ec` 命令。"本机 AID"来自插件密钥库（`store.list()`），`ec stop` 后仍然可见；"本工程 · 已连接"是插件当前保持连接的身份。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。关联时只要求 AID 在本地密钥库中，由插件直接建立连接，不再执行 `ec agent set/reload` 配置 EvolCore 路由。

package/dist/src-ts/plugins/aun/index.js

@@ -6,10 +6,8 @@ const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const messages_1 = require("./messages");
-const evolcore_1 = require("./evolcore");
-const local_aids_1 = require("../../local-aids");
 const manifest = {
-    id: "aun", version: "1.0.4", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.6", type: "channel", displayName: "AUN 通道",
     entry: "dist/src-ts/plugins/aun/index.js", apiVersion: "1", process: "in-process",
     capabilities: ["channel", "channel.identity.create", "channel.receive", "channel.send", "health"],
     configSchema: "config.schema.json",
@@ -38,7 +36,6 @@ class AunPlugin {
     store;
     clients = new Map();
     identities = new Set();
-    legacyCreatedAids = new Set();
     bindings = {};
     bindingTimes = {};
     creating = false;
@@ -56,14 +53,13 @@ class AunPlugin {
     }
     identity = {
         list: async () => {
-            const connected = await (this.options.connectedAids ?? evolcore_1.listConnectedAids)().catch((error) => {
-                this.context?.logger.warn("查询 EvolCore 已连接身份失败", { error: safeError(error) });
-                return [];
-            });
+            // 不再依赖 ec 命令：本地密钥库的 AID 全部列出，本工程连接的 AID 以 clients 为准
+            const local = this.listStoreAids();
             return {
-                evolcore: connected.filter((aid) => !this.identities.has(aid) && !this.legacyCreatedAids.has(aid)),
-                muAgentBridge: [...new Set([...this.clients.keys(), ...connected.filter((aid) => this.legacyCreatedAids.has(aid))])].sort(),
+                evolcore: [],
+                muAgentBridge: [...this.clients.keys()].sort(),
                 localMuAgentBridge: [...this.identities].filter((aid) => !this.clients.has(aid)).sort(),
+                local,
             };
         },
         create: async (aid, owner) => {
@@ -98,7 +94,7 @@ class AunPlugin {
                 this.creating = false;
             }
         },
-        bind: async (pluginId, aid, port) => {
+        bind: async (pluginId, aid, _port) => {
             if (pluginId === "aun" || pluginId === "abweb")
                 throw new Error("只能关联 Agent 插件");
             const previous = this.bindings;
@@ -124,14 +120,20 @@ class AunPlugin {
                         this.bindings[aid] = pluginId;
                     }
                     else {
-                        if (!(await (0, evolcore_1.listConnectedAids)()).includes(aid))
+                        // 不再调用 ec：只要 AID 在本地密钥库中就直接连接并绑定
+                        const loaded = this.store.load(aid);
+                        if (!loaded.ok || !loaded.data)
+                            throw new Error("AID 不在本地密钥库中，无法关联");
+                        await this.connectAid(aid);
+                        if (!this.clients.has(aid))
                             throw new Error("AID 当前未连接");
-                        await (0, evolcore_1.configureAidForPlugin)(pluginId, aid, port);
                         for (const [identity, target] of Object.entries(this.bindings))
                             if (target === pluginId) {
                                 delete this.bindings[identity];
                                 delete this.bindingTimes[identity];
                             }
+                        this.bindings[aid] = pluginId;
+                        this.identities.add(aid);
                     }
                 }
                 else {
@@ -165,18 +167,6 @@ class AunPlugin {
     async activate(context) {
         this.context = context;
         this.config = { ...context.config };
-        this.legacyCreatedAids.clear();
-        try {
-            const created = JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(context.dataDir, "..", "created-aids.json"), "utf8"));
-            if (Array.isArray(created))
-                for (const aid of created)
-                    if (typeof aid === "string" && aidPattern.test(aid))
-                        this.legacyCreatedAids.add(aid);
-        }
-        catch (error) {
-            if (error.code !== "ENOENT")
-                context.logger.warn("读取旧版身份创建记录失败", { error: safeError(error) });
-        }
         for (const key of ["aid", "owner_aid", "aun_path", "encryption_seed", "root_ca_path", "allow_from", "agent_plugin"]) {
             if (this.config[key] !== undefined && typeof this.config[key] !== "string")
                 throw new Error(`${key} 必须是字符串`);
@@ -303,10 +293,16 @@ class AunPlugin {
             return this.json(response, 502, { error: safeError(error) });
         }
     };
+    listStoreAids() {
+        const result = this.store?.list();
+        if (!result?.ok || !Array.isArray(result.data?.identities))
+            return [];
+        return [...new Set(result.data.identities.filter((item) => item && typeof item.aid === "string" && aidPattern.test(item.aid)).map((item) => item.aid))].sort();
+    }
     listIdentities = async (_request, response) => {
         const groups = await this.identity.list();
-        const connected = new Set([...groups.evolcore, ...groups.muAgentBridge]);
-        const localAids = (await (0, local_aids_1.listExistingAids)()).filter((aid) => !connected.has(aid));
+        const connected = new Set([...groups.evolcore, ...groups.muAgentBridge, ...groups.localMuAgentBridge ?? []]);
+        const localAids = (groups.local ?? []).filter((aid) => !connected.has(aid));
         this.json(response, 200, { groups, localAids, bindings: this.bindings, bindingTimes: this.bindingTimes });
     };
     saveSettings = async (request, response) => {

package/dist/src-ts/plugins/aun/public/app.js

@@ -31,7 +31,7 @@
         configForm.elements.encryption_seed.value = "";
       }
       list.replaceChildren();
-      const entries = [["本工程 · 已连接", identities.groups.muAgentBridge || []], ["EvolCore · 已连接", identities.groups.evolcore || []]]
+      const entries = [["本工程 · 已连接", identities.groups.muAgentBridge || []], ["本机 AID", identities.groups.local || []], ["本工程 · 未连接", identities.groups.localMuAgentBridge || []]]
         .flatMap(([label, values], group) => values.map((aid) => ({ aid, label, group, bound: identities.bindings?.[aid] || agents.find((agent) => agent.id && agent.configAid === aid)?.id || "", time: Date.parse(identities.bindingTimes?.[aid] || "") || 0 })));
       entries.sort((a, b) => Number(Boolean(b.bound)) - Number(Boolean(a.bound)) || a.group - b.group || b.time - a.time || a.aid.localeCompare(b.aid));
       for (const { aid, label, bound } of entries) {
@@ -42,8 +42,8 @@
           select.value = bound; select.onchange = () => { if (select.value) void bind(aid, select.value); };
           cell.append(select); row.append(cell); list.append(row);
       }
-      if (!list.children.length) { const row = document.createElement("tr"); const cell = document.createElement("td"); cell.colSpan = 4; cell.textContent = "暂无已连接 AID"; row.append(cell); list.append(row); }
-      show(`${(identities.groups.evolcore || []).length + (identities.groups.muAgentBridge || []).length} 个已连接 AID`);
+      if (!list.children.length) { const row = document.createElement("tr"); const cell = document.createElement("td"); cell.colSpan = 4; cell.textContent = "暂无 AID"; row.append(cell); list.append(row); }
+      show(`${(identities.groups.muAgentBridge || []).length} 个已连接，${(identities.groups.local || []).length} 个本机 AID`);
     } catch (error) { show(String(error), true); }
     finally { loading = false; }
   }

package/package.json

@@ -1,13 +1,35 @@
 {
   "name": "agent-bridge-aun",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "mu-agent-bridge 的 AUN 通道插件。",
-  "keywords": ["mu-agent-bridge-plugin", "mu-agent-bridge-channel"],
-  "repository": { "type": "git", "url": "https://codeup.aliyun.com/6808da56fb3da14b899afd54/agent_bridge.git", "directory": "packages/aun" },
+  "keywords": [
+    "mu-agent-bridge-plugin",
+    "mu-agent-bridge-channel"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://codeup.aliyun.com/6808da56fb3da14b899afd54/agent_bridge.git",
+    "directory": "packages/aun"
+  },
   "main": "dist/src-ts/plugins/aun/index.js",
-  "files": ["dist/", "plugin.json", "config.schema.json", "README.md"],
-  "agentBridge": { "plugin": "./plugin.json", "type": "channel" },
-  "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" },
-  "engines": { "node": ">=22.16.0" },
-  "dependencies": { "@agentunion/fastaun": "0.5.18" }
+  "files": [
+    "dist/",
+    "plugin.json",
+    "config.schema.json",
+    "README.md"
+  ],
+  "agentBridge": {
+    "plugin": "./plugin.json",
+    "type": "channel"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
+  "engines": {
+    "node": ">=22.16.0"
+  },
+  "dependencies": {
+    "@agentunion/fastaun": "0.5.18"
+  }
 }

package/plugin.json

@@ -1,12 +1,18 @@
 {
   "id": "aun",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "channel",
   "displayName": "AUN 通道",
   "entry": "dist/src-ts/plugins/aun/index.js",
   "apiVersion": "1",
   "process": "in-process",
-  "capabilities": ["channel", "channel.identity.create", "channel.receive", "channel.send", "health"],
+  "capabilities": [
+    "channel",
+    "channel.identity.create",
+    "channel.receive",
+    "channel.send",
+    "health"
+  ],
   "configSchema": "config.schema.json",
   "managementPage": "/abweb/channels/aun"
 }

package/dist/src-ts/channel.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src-ts/local-aids.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.listExistingAids = listExistingAids;
-const promises_1 = require("node:fs/promises");
-const node_os_1 = require("node:os");
-const node_path_1 = require("node:path");
-async function listExistingAids() {
-    const root = (0, node_path_1.resolve)(process.env.EVOLCORE_HOME ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".evolcore"), "AIDs");
-    let names;
-    try {
-        names = await (0, promises_1.readdir)(root);
-    }
-    catch {
-        return [];
-    }
-    const available = await Promise.all(names.filter((name) => /^[a-zA-Z0-9.-]+$/.test(name)).map(async (name) => {
-        try {
-            await (0, promises_1.access)((0, node_path_1.join)(root, name, "private", "key.json"));
-            return name;
-        }
-        catch {
-            return undefined;
-        }
-    }));
-    return available.filter((name) => Boolean(name)).sort();
-}

package/dist/src-ts/plugins/aun/evolcore.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runEc = runEc;
-exports.configureAidForPlugin = configureAidForPlugin;
-exports.listConnectedAids = listConnectedAids;
-const node_child_process_1 = require("node:child_process");
-const node_util_1 = require("node:util");
-const local_aids_1 = require("../../local-aids");
-const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
-async function runEc(args) {
-    try {
-        const { stdout } = await execFileAsync("ec", args, { shell: process.platform === "win32", timeout: 15_000, maxBuffer: 1024 * 1024 });
-        return JSON.parse(stdout);
-    }
-    catch (error) {
-        const stdout = error.stdout;
-        if (stdout) {
-            try {
-                return JSON.parse(stdout);
-            }
-            catch { /* 保留原始命令错误 */ }
-        }
-        throw error;
-    }
-}
-async function configureAidForPlugin(pluginId, aid, port, run = runEc) {
-    if (!aid)
-        return;
-    if (!/^[a-z0-9_-]+$/.test(pluginId))
-        throw new Error("插件 ID 格式无效");
-    const path = pluginId === "dsh" ? "/dsh/v1" : pluginId === "qwenwork" ? "/v1" : `/api/agents/${pluginId}/v1`;
-    for (const [key, value] of [
-        ["baseagents.ecagent.baseUrl", `http://127.0.0.1:${port}${path}`],
-        ["baseagents.ecagent.apiKey", "mab-local"],
-        ["baseagents.ecagent.model", pluginId],
-        ["active_baseagent", "ecagent"],
-    ]) {
-        const result = await run(["agent", "set", aid, key, value, "--format", "json"]);
-        if (!result?.ok)
-            throw new Error(`配置 AID ${aid} 失败：${key}；${result?.code ?? ""} ${result?.error ?? "未知错误"}`);
-    }
-    const result = await run(["agent", "reload", aid, "--format", "json"]);
-    if (!result?.ok)
-        throw new Error(`重载 AID ${aid} 失败：${result?.code ?? ""} ${result?.error ?? "未知错误"}`);
-}
-async function listConnectedAids(run = runEc) {
-    const result = await run(["agent", "list", "--format", "json"]);
-    if (!result.ok || !Array.isArray(result.agents))
-        throw new Error("读取 EvolCore Agent 列表失败");
-    const candidates = result.agents.filter((agent) => agent.status === "running" && typeof agent.aid === "string" && /^[a-zA-Z0-9.-]+$/.test(agent.aid) && agent.channels?.some((channel) => channel.startsWith("aun#")));
-    const details = await Promise.all(candidates.map((agent) => run(["agent", "show", agent.aid, "--format", "json"]).catch(() => null)));
-    const local = new Set(await (0, local_aids_1.listExistingAids)());
-    return details.filter((detail) => detail?.ok && detail.status === "running" && detail.connection?.status === "connected" && local.has(detail.aid)).map((detail) => detail.aid).sort();
-}