agent-bridge-aun 1.0.33 → 1.0.35

package/README.md

@@ -15,3 +15,5 @@
 ABWeb 的 AUN 设置只展示已连接 AID，并按来源分组。成功注册并记录在插件 `created_aids` 中的 AID 属于本工程；共享密钥库中其余 AID 属于 EvolCore。旧版 `created-aids.json` 记录继续兼容。来源只用于展示，连接和关联由 AUN 插件直接管理。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。
 
 AUN 独立包支持核心后台每五分钟检测更新；可信提供者在自动安装策略下会下载新副本并重载通道。
+
+显式关联已有 EvolCore Agent 的 AID 时，先执行 `ec agent disable <aid>`，再配置 `ecagent` 路由并重载。`ec` 不存在或命令失败时，只将所选 AID 的 JSON 配置更新为 `enabled=false`、`active_baseagent=ecagent` 和对应路由；其它 AID 保持原值。仍有 EvolCore 运行实例时，必须确认重载成功才完成关联，避免原 Claude 与桌面 Agent 同时回复。纯密钥库身份不调用 `ec`，解绑不自动启用原 Agent。

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

@@ -4,10 +4,14 @@ exports.runEc = runEc;
 exports.configureAidForPlugin = configureAidForPlugin;
 const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
+const promises_1 = require("node:fs/promises");
+const node_crypto_1 = require("node:crypto");
+const node_os_1 = require("node:os");
+const node_path_1 = require("node:path");
 const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
-async function runEc(args) {
+async function runEc(args, home) {
     try {
-        const { stdout } = await execFileAsync("ec", args, { shell: process.platform === "win32", timeout: 15_000, maxBuffer: 1024 * 1024 });
+        const { stdout } = await execFileAsync("ec", args, { shell: process.platform === "win32", timeout: 60_000, env: { ...process.env, ...(home ? { EVOLCORE_HOME: home } : {}) }, windowsHide: true, maxBuffer: 1024 * 1024 });
         return JSON.parse(stdout);
     }
     catch (error) {
@@ -21,24 +25,96 @@ async function runEc(args) {
         throw error;
     }
 }
-async function configureAidForPlugin(pluginId, aid, port, run = runEc) {
-    if (!aid)
-        return;
+async function ecIsRunning(home) {
+    const records = [];
+    try {
+        records.push(Number(await (0, promises_1.readFile)((0, node_path_1.join)(home, "daemon.pid"), "utf8")));
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+    }
+    const directory = (0, node_path_1.join)(home, "data", "instance");
+    let names;
+    try {
+        names = await (0, promises_1.readdir)(directory);
+    }
+    catch (error) {
+        if (error.code !== "ENOENT")
+            throw error;
+        names = [];
+    }
+    for (const name of names.filter(name => /^main-\d+\.json$/.test(name))) {
+        records.push(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(directory, name), "utf8")).pid);
+    }
+    return records.some(pid => {
+        if (!Number.isSafeInteger(pid) || pid <= 0)
+            return false;
+        try {
+            process.kill(pid, 0);
+            return true;
+        }
+        catch (error) {
+            if (error.code === "ESRCH")
+                return false;
+            throw error;
+        }
+    });
+}
+async function configureAidForPlugin(pluginId, aid, port, run = runEc, home = process.env.EVOLCORE_HOME ?? (0, node_path_1.join)((0, node_os_1.homedir)(), ".evolcore")) {
+    if (!/^[a-z0-9][a-z0-9_.-]+$/i.test(aid) || !aid.includes("."))
+        throw new Error("AID 格式无效");
     if (!/^[a-z0-9_-]+$/.test(pluginId))
         throw new Error("插件 ID 格式无效");
-    // 通过 daemon 的统一插件代理访问所有 Agent；否则 qwenwork 的裸 /v1 路由在有插件 HTTP 注册表时不存在。
+    if (!Number.isInteger(port) || port < 1 || port > 65535)
+        throw new Error("后台端口无效");
     const path = pluginId === "dsh" ? "/dsh/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"]);
+    const ecagent = { baseUrl: `http://127.0.0.1:${port}${path}`, apiKey: "mab-local", model: pluginId };
+    try {
+        // MAB 直接接收 AUN 消息，先停用该 AID 的 EvolCore Agent，避免双重回复。
+        const disabled = await run(["agent", "disable", aid, "--format", "json"], home);
+        if (!disabled?.ok)
+            throw new Error(`停用原 Agent 失败：${disabled?.code ?? ""} ${disabled?.error ?? "未知错误"}`);
+        for (const [key, value] of [
+            ...Object.entries(ecagent).map(([key, value]) => [`baseagents.ecagent.${key}`, value]),
+            ["active_baseagent", "ecagent"],
+        ]) {
+            const result = await run(["agent", "set", aid, key, value, "--format", "json"], home);
+            if (!result?.ok)
+                throw new Error(`配置 ${key} 失败：${result?.code ?? ""} ${result?.error ?? "未知错误"}`);
+        }
+        const result = await run(["agent", "reload", aid, "--format", "json"], home);
         if (!result?.ok)
-            throw new Error(`配置 AID ${aid} 失败：${key}；${result?.code ?? ""} ${result?.error ?? "未知错误"}`);
+            throw new Error(`重载失败：${result?.code ?? ""} ${result?.error ?? "未知错误"}`);
+        return "ec";
+    }
+    catch (commandError) {
+        const file = (0, node_path_1.join)(home, "agents", aid, "config.json");
+        const config = JSON.parse(await (0, promises_1.readFile)(file, "utf8"));
+        if (!config || typeof config !== "object" || Array.isArray(config) || config.baseagents && (typeof config.baseagents !== "object" || Array.isArray(config.baseagents)))
+            throw new Error(`AID ${aid} 原配置格式无效，未覆盖文件`);
+        config.enabled = false;
+        config.active_baseagent = "ecagent";
+        config.baseagents = { ...config.baseagents, ecagent: { ...config.baseagents?.ecagent, ...ecagent } };
+        const temporary = `${file}.mab-${(0, node_crypto_1.randomUUID)()}.tmp`;
+        try {
+            await (0, promises_1.writeFile)(temporary, `${JSON.stringify(config, null, 2)}\n`, { mode: 0o600 });
+            await (0, promises_1.rename)(temporary, file);
+        }
+        finally {
+            await (0, promises_1.rm)(temporary, { force: true });
+        }
+        // 写盘不能关闭运行中的旧 Agent；存在活跃实例时必须确认重载成功。
+        if (await ecIsRunning(home)) {
+            try {
+                const result = await run(["agent", "reload", aid, "--format", "json"], home);
+                if (!result?.ok)
+                    throw new Error(result?.error ?? "重载失败");
+            }
+            catch (error) {
+                throw new AggregateError([commandError, error], `AID ${aid} 配置已保存，但 EvolCore 仍在运行，原 Agent 未确认停用：${error instanceof Error ? error.message : error}`);
+            }
+        }
+        return "json";
     }
-    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

@@ -9,10 +9,11 @@ const node_path_1 = require("node:path");
 const node_os_1 = require("node:os");
 const node_url_1 = require("node:url");
 const agent_1 = require("../../agent");
+const evolcore_1 = require("./evolcore");
 const messages_1 = require("./messages");
 const attachments_1 = require("./attachments");
 const manifest = {
-    id: "aun", version: "1.0.33", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.35", 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", "cli"],
     configSchema: "config.schema.json",
@@ -86,7 +87,7 @@ class AunPlugin {
             const known = new Set([...this.clients.keys(), ...this.listStoreAids()]);
             return {
                 evolcore: [...known].filter((aid) => !own.has(aid)).sort(),
-                muAgentBridge: [...this.clients.keys()].filter((aid) => own.has(aid)).sort(),
+                muAgentBridge: [...known].filter((aid) => own.has(aid)).sort(),
                 localMuAgentBridge: [...own].filter((aid) => !known.has(aid)).sort(),
             };
         },
@@ -124,43 +125,38 @@ class AunPlugin {
                 this.creating = false;
             }
         },
-        bind: async (pluginId, aid, _port) => {
+        bind: async (pluginId, aid, port) => {
+            if (!aid || !aidPattern.test(aid))
+                throw new Error("AID 格式无效，必须指定要关联的 AID");
             if (pluginId === "aun" || pluginId === "abweb")
                 throw new Error("只能关联 Agent 插件");
+            if (this.context?.pluginStatus(pluginId) !== "ready")
+                throw new Error("目标 Agent 插件未启动");
             const previous = this.bindings;
             const previousTimes = this.bindingTimes;
-            this.bindings = { ...previous };
-            this.bindingTimes = { ...previousTimes };
+            const connection = this.clients.get(aid);
+            const hadIdentity = this.identities.has(aid);
+            const hadSubscription = Boolean(connection?.subscription);
             try {
-                if (aid) {
-                    if (!aidPattern.test(aid))
-                        throw new Error("AID 格式无效");
-                    if (this.context?.pluginStatus(pluginId) !== "ready")
-                        throw new Error("目标 Agent 插件未启动");
-                    if (this.identities.has(aid) || this.legacyCreatedAids.has(aid)) {
-                        if (!this.clients.has(aid))
-                            await this.connectAid(aid);
-                        if (!this.clients.has(aid))
-                            throw new Error("AID 当前未连接");
-                        this.bindings[aid] = pluginId;
-                    }
-                    else {
-                        // 本地身份由插件直接接管，不再通过 ec 配置路由。
-                        const loaded = this.store.load(aid);
-                        if (!loaded.ok || !loaded.data)
-                            throw new Error("AID 不在本地密钥库中，无法关联");
-                        this.identities.add(aid);
-                        if (!this.clients.has(aid))
-                            await this.connectAid(aid);
-                        if (!this.clients.has(aid))
-                            throw new Error("AID 当前未连接");
-                        this.bindings[aid] = pluginId;
-                    }
+                const loaded = this.store.load(aid);
+                if (!loaded.ok || !loaded.data)
+                    throw new Error("AID 不在本地密钥库中，无法关联");
+                // 仅接管用户本次选中的 EvolCore Agent；纯密钥库身份不调用 ec。
+                if ((0, node_fs_1.existsSync)((0, node_path_1.join)(this.path(), "agents", aid, "config.json"))) {
+                    const method = await (0, evolcore_1.configureAidForPlugin)(pluginId, aid, port, this.options.runEc ?? evolcore_1.runEc, this.path());
+                    if (method === "json")
+                        this.context?.logger.warn("ec 命令不可用或失败，已通过 JSON 停用原 Agent 并配置 ecagent", { aid, pluginId });
+                    else
+                        this.context?.logger.info("已通过 ec 命令停用原 Agent 并切换为 ecagent", { aid, pluginId });
                 }
-                else
-                    throw new Error("必须指定要关联的 AID");
-                if (aid)
-                    this.bindingTimes[aid] = new Date().toISOString();
+                this.identities.add(aid);
+                if (!connection)
+                    await this.connectAid(aid);
+                if (!this.clients.has(aid))
+                    throw new Error("AID 当前未连接");
+                this.bindings = { ...previous, [aid]: pluginId };
+                this.bindingTimes = { ...previousTimes, [aid]: new Date().toISOString() };
+                this.subscribeAid(aid);
                 await this.persist();
             }
             catch (error) {
@@ -168,6 +164,29 @@ class AunPlugin {
                 this.bindingTimes = previousTimes;
                 this.config.bindings = previous;
                 this.config.binding_times = previousTimes;
+                if (!hadIdentity)
+                    this.identities.delete(aid);
+                this.config.identities = [...this.identities].sort();
+                if (!hadSubscription) {
+                    this.clients.get(aid)?.subscription?.unsubscribe();
+                    if (connection)
+                        connection.subscription = undefined;
+                }
+                if (!connection) {
+                    try {
+                        await this.clients.get(aid)?.client.close();
+                    }
+                    catch (closeError) {
+                        this.context?.logger.warn("AUN 关联回滚关闭连接失败", { aid, error: safeError(closeError) });
+                    }
+                    finally {
+                        this.clients.delete(aid);
+                        if (!this.clients.size) {
+                            this.status = "degraded";
+                            this.healthMessage = "暂无已连接 AID";
+                        }
+                    }
+                }
                 this.context?.logger.error("AUN 身份关联失败", { aid, pluginId, error: safeError(error) });
                 throw error;
             }
@@ -178,6 +197,8 @@ class AunPlugin {
                 throw new Error("AID 格式无效");
             if (this.bindings[aid] !== pluginId)
                 throw new Error("指定 AID 当前未关联到该 Agent");
+            if ([...this.pendingMessages.keys()].some(key => JSON.parse(key)[0] === aid))
+                throw new Error("该 AID 正在处理消息，请等待任务完成后再解绑");
             const previous = this.bindings;
             const previousTimes = this.bindingTimes;
             this.bindings = { ...previous };
@@ -194,6 +215,21 @@ class AunPlugin {
                 this.config.binding_times = previousTimes;
                 throw error;
             }
+            const connection = this.clients.get(aid);
+            connection?.subscription?.unsubscribe();
+            try {
+                await connection?.client.close();
+            }
+            catch (error) {
+                this.context?.logger.warn("AUN 解绑已完成，关闭连接失败", { aid, pluginId, error: safeError(error) });
+            }
+            finally {
+                this.clients.delete(aid);
+                if (!this.clients.size) {
+                    this.status = "degraded";
+                    this.healthMessage = "暂无已连接 AID";
+                }
+            }
             this.context?.logger.info("AUN 单个身份关联已解除", { aid, pluginId });
         },
     };
@@ -207,6 +243,7 @@ class AunPlugin {
     async activate(context) {
         this.context = context;
         this.config = { ...context.config };
+        this.identities.clear();
         this.legacyCreatedAids.clear();
         this.createdAids.clear();
         try {
@@ -266,15 +303,25 @@ class AunPlugin {
         if (this.aid)
             this.identities.add(this.aid);
         this.acceptingMessages = true;
-        for (const aid of this.identities)
-            await this.connectAid(aid);
-        // 密钥库中的其余 AID 也自动连接：不再依赖 ec 或 EvolCore 进程
-        for (const aid of this.listStoreAids()) {
-            this.identities.add(aid);
-            if (!this.clients.has(aid))
+        // 只订阅明确关联 Agent 的身份，避免接管 EvolCore 或其它 AID 的消息。
+        for (const aid of Object.keys(this.bindings)) {
+            const target = this.bindings[aid];
+            if (!target || !context.pluginStatus(target)) {
+                context.logger.warn("AUN 跳过目标插件不存在的旧绑定，未连接身份", { aid, agentPlugin: target });
+                continue;
+            }
+            if (context.pluginStatus(target) !== "ready")
+                context.logger.warn("AUN 恢复已有显式绑定，目标插件尚未就绪；关联保持不变", { aid, agentPlugin: target, status: context.pluginStatus(target) });
+            if (aidPattern.test(aid))
                 await this.connectAid(aid);
         }
     }
+    subscribeAid(aid) {
+        const connection = this.clients.get(aid);
+        if (!connection || connection.subscription || !this.bindings[aid])
+            return;
+        connection.subscription = connection.client.on("message.received", (payload) => this.onMessage(payload, aid));
+    }
     async connectAid(aid) {
         try {
             await this.prepareTrustRoots(aid);
@@ -282,7 +329,7 @@ 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 = this.identities.has(aid) || this.legacyCreatedAids.has(aid)
+            const subscription = this.bindings[aid]
                 ? client.on("message.received", (payload) => this.onMessage(payload, aid))
                 : undefined;
             try {

package/package.json

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

package/plugin.json

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