agent-bridge-aun 1.0.11 → 1.0.13

package/README.md

@@ -6,4 +6,4 @@
 
 该插件依赖 `@agentunion/fastaun`，要求 Node.js 22.16 或更高版本。
 
-ABWeb 的 AUN 设置展示本机 AID 和已连接 AID，不再依赖 `ec` 命令。"本机 AID"来自插件密钥库（`store.list()`），`ec stop` 后仍然可见；"本工程 · 已连接"是插件当前保持连接的身份。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。关联时只要求 AID 在本地密钥库中，由插件直接建立连接，不再执行 `ec agent set/reload` 配置 EvolCore 路由。
+ABWeb 的 AUN 设置只展示已连接 AID，并按来源分组。插件通过 SDK 密钥库枚举 AID，再逐个建立连接；只有连接成功的身份才会显示。EvolCore 来源身份只用于连接状态检测，不订阅消息，避免重复收信；本工程创建的身份负责消息收发。连接状态检测不调用 `ec agent list/show`。将 EvolCore 身份关联到 Agent 时仍使用既有 `ec agent set/reload` 路由配置，该配置不参与连接状态检测。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。

package/dist/src-ts/plugin.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveRuntimePort = resolveRuntimePort;
+function resolveRuntimePort(config, runtime, pluginId, envName, fallback) {
+    const injected = runtime?.ports?.[pluginId];
+    if (typeof injected === "number" && Number.isInteger(injected) && injected > 0)
+        return injected;
+    const configured = config.cdpPort;
+    if (typeof configured === "number" && Number.isInteger(configured) && configured > 0)
+        return configured;
+    const environment = Number(process.env[envName] ?? "");
+    return Number.isInteger(environment) && environment > 0 ? environment : fallback;
+}

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

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runEc = runEc;
+exports.configureAidForPlugin = configureAidForPlugin;
+const node_child_process_1 = require("node:child_process");
+const node_util_1 = require("node:util");
+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 ?? "未知错误"}`);
+}

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

@@ -8,8 +8,9 @@ const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
 const node_url_1 = require("node:url");
 const messages_1 = require("./messages");
+const evolcore_1 = require("./evolcore");
 const manifest = {
-    id: "aun", version: "1.0.11", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.10", 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,6 +39,7 @@ class AunPlugin {
     store;
     clients = new Map();
     identities = new Set();
+    legacyCreatedAids = new Set();
     bindings = {};
     bindingTimes = {};
     creating = false;
@@ -55,13 +57,11 @@ class AunPlugin {
     }
     identity = {
         list: async () => {
-            // 不再依赖 ec 命令：本地密钥库的 AID 全部列出，本工程连接的 AID 以 clients 为准
-            const local = this.listStoreAids();
+            const connected = [...this.clients.keys()];
             return {
-                evolcore: [],
-                muAgentBridge: [...this.clients.keys()].sort(),
+                evolcore: connected.filter((aid) => !this.identities.has(aid) && !this.legacyCreatedAids.has(aid)).sort(),
+                muAgentBridge: connected.filter((aid) => this.identities.has(aid) || this.legacyCreatedAids.has(aid)).sort(),
                 localMuAgentBridge: [...this.identities].filter((aid) => !this.clients.has(aid)).sort(),
-                local,
             };
         },
         create: async (aid, owner) => {
@@ -72,12 +72,11 @@ class AunPlugin {
             this.creating = true;
             try {
                 if (!this.identities.has(aid)) {
-                    const result = await this.store.register({ aid, type: "agent", owner });
+                    // 创建身份沿用 EvolCore 的 legacy 注册流程。Owner AID 是本地归属配置，
+                    // 只有明确执行 Owner 关系绑定时才进入 aid_register_* 双签流程。
+                    const result = await this.store.register(aid);
                     if (!result.ok)
                         throw new Error(redact(result.error?.message ?? result.error?.code ?? "AID 注册失败"));
-                    const ownership = result.data?.ownership_status ?? result.data?.state ?? result.data?.operation_state;
-                    if (ownership && ownership !== "active")
-                        return { aid, status: "等待 Owner 确认", operation_id: result.data?.operation_id };
                     const loaded = this.store.load(aid);
                     if (!loaded.ok || !loaded.data)
                         throw new Error(loaded.error?.message ?? "注册后未能加载本地身份");
@@ -96,7 +95,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;
@@ -109,7 +108,7 @@ class AunPlugin {
                         throw new Error("AID 格式无效");
                     if (this.context?.pluginStatus(pluginId) !== "ready")
                         throw new Error("目标 Agent 插件未启动");
-                    if (this.identities.has(aid)) {
+                    if (this.identities.has(aid) || this.legacyCreatedAids.has(aid)) {
                         if (!this.clients.has(aid))
                             await this.connectAid(aid);
                         if (!this.clients.has(aid))
@@ -122,20 +121,15 @@ class AunPlugin {
                         this.bindings[aid] = pluginId;
                     }
                     else {
-                        // 不再调用 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))
+                        const connected = await this.identity.list();
+                        if (![...connected.evolcore, ...connected.muAgentBridge].includes(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 {
@@ -169,6 +163,18 @@ 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} 必须是字符串`);
@@ -209,12 +215,10 @@ class AunPlugin {
             this.identities.add(this.aid);
         for (const aid of this.identities)
             await this.connectAid(aid);
-        // 密钥库中的其余 AID 也自动连接：不再依赖 ec 或 EvolCore 进程
-        for (const aid of this.listStoreAids()) {
-            this.identities.add(aid);
+        // AUN 插件直接连接本地密钥库中的所有 AID，不依赖 ec 进程或 CLI。
+        for (const aid of this.listStoreAids())
             if (!this.clients.has(aid))
                 await this.connectAid(aid);
-        }
     }
     async connectAid(aid) {
         try {
@@ -222,12 +226,14 @@ class AunPlugin {
             if (!loaded.ok || !loaded.data)
                 throw new Error(loaded.error?.message ?? "本地密钥库中不存在该 AID");
             const client = new this.sdk.AUNClient(loaded.data.aid);
-            const subscription = client.on("message.received", (payload) => this.onMessage(payload, aid));
+            const subscription = this.identities.has(aid) || this.legacyCreatedAids.has(aid)
+                ? client.on("message.received", (payload) => this.onMessage(payload, aid))
+                : undefined;
             try {
                 await client.connect();
             }
             catch (error) {
-                subscription.unsubscribe();
+                subscription?.unsubscribe();
                 await client.close();
                 throw error;
             }
@@ -244,7 +250,7 @@ class AunPlugin {
     async deactivate(_reason) {
         this.status = "degraded";
         for (const { client, subscription } of this.clients.values()) {
-            subscription.unsubscribe();
+            subscription?.unsubscribe();
             await client.close();
         }
         this.clients.clear();
@@ -261,11 +267,11 @@ class AunPlugin {
     async handle(_request) { throw new Error("AUN 是入站通道插件"); }
     path() {
         const configured = this.config.aun_path;
-        // 默认与 EvolCore 共用同一密钥库目录，保证已注册的 AID 直接可用
-        return typeof configured === "string" && configured.trim() ? configured : (0, node_path_1.resolve)(process.env.AUN_HOME ?? process.env.EVOLCORE_HOME ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".evolcore"));
+        if (typeof configured === "string" && configured.trim())
+            return configured;
+        return (0, node_path_1.resolve)(process.env.AUN_HOME ?? process.env.EVOLCORE_HOME ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".evolcore"));
     }
     newStore() {
-        // 与 EvolCore 共用密钥库时沿用其固定 seed 和 CA 证书路径
         const rootCaPath = typeof this.config.root_ca_path === "string" && this.config.root_ca_path ? this.config.root_ca_path : (0, node_path_1.join)(this.path(), "CA", "root", "root.crt");
         return new this.sdk.AIDStore({ aunPath: this.path(), encryptionSeed: typeof this.config.encryption_seed === "string" && this.config.encryption_seed ? this.config.encryption_seed : "evol", verifySsl: typeof this.config.verify_ssl === "boolean" ? this.config.verify_ssl : true, rootCaPath: (0, node_fs_1.existsSync)(rootCaPath) ? rootCaPath : undefined });
     }
@@ -312,8 +318,8 @@ class AunPlugin {
     }
     listIdentities = async (_request, response) => {
         const groups = await this.identity.list();
-        const connected = new Set([...groups.evolcore, ...groups.muAgentBridge, ...groups.localMuAgentBridge ?? []]);
-        const localAids = (groups.local ?? []).filter((aid) => !connected.has(aid));
+        const connected = new Set([...groups.evolcore, ...groups.muAgentBridge]);
+        const localAids = this.listStoreAids().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 || []], ["本机 AID", identities.groups.local || []], ["本工程 · 未连接", identities.groups.localMuAgentBridge || []]]
+      const entries = [["本工程 · 已连接", identities.groups.muAgentBridge || []], ["EvolCore · 已连接", identities.groups.evolcore || []]]
         .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.muAgentBridge || []).length} 个已连接，${(identities.groups.local || []).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.evolcore || []).length + (identities.groups.muAgentBridge || []).length} 个已连接 AID`);
     } catch (error) { show(String(error), true); }
     finally { loading = false; }
   }

package/dist/src-ts/plugins/aun/public/index.html

@@ -6,7 +6,7 @@
     <header><h1>AUN 身份</h1><button id="refresh" type="button">刷新</button></header>
     <p id="status" role="status"></p>
     <div class="table-scroll"><table><thead><tr><th>AID</th><th>来源</th><th>已关联 Agent</th><th>操作</th></tr></thead><tbody id="identities"></tbody></table></div>
-    <form id="create-form"><h2>创建 AID</h2><div class="fields"><label>新 AID<input name="aid" required placeholder="new.agentid.cn"></label><label>Owner AID<input name="ownerAid" required></label></div><button type="submit">创建</button></form>
+    <form id="create-form"><h2>创建 AID</h2><div class="fields"><label>新 AID<input name="aid" required placeholder="例如：example.agentid.cn"></label><label>Owner AID<input name="ownerAid" required placeholder="例如：owner.agentid.cn（本地归属配置）"><small class="hint">Owner AID 用于本地归属和 Agent 关联；创建身份本身沿用 AUN 的普通注册流程</small></label></div><button type="submit">创建</button></form>
     <form id="config-form"><h2>通道配置</h2><div class="fields"><label>默认 Agent<select name="agent_plugin"></select></label><label>允许的来源<input name="allow_from"></label><label>AUN 存储路径<input name="aun_path"></label><label>加密种子<input name="encryption_seed" type="password" autocomplete="new-password" placeholder="留空则不修改"></label></div><button type="submit">保存配置</button></form>
   </main>
   <script src="/abweb/channels/aun/app.js"></script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-aun",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "mu-agent-bridge 的 AUN 通道插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "aun",
-  "version": "1.0.11",
+  "version": "1.0.10",
   "type": "channel",
   "displayName": "AUN 通道",
   "entry": "dist/src-ts/plugins/aun/index.js",