mu-agent-bridge 1.0.64 → 1.0.65

package/dist/src-ts/plugin-manager.js

@@ -802,7 +802,8 @@ class PluginManager {
     async discoverDirectory(directory, label, manifestFile = (0, node_path_1.join)(directory, "plugin.json")) {
         try {
             const manifest = (0, plugin_manifest_1.validateManifest)(JSON.parse(await (0, promises_1.readFile)(manifestFile, "utf8")), directory);
-            if (this.plugins.has(manifest.id))
+            const existing = this.plugins.get(manifest.id);
+            if (existing && (existing.instance || (0, node_path_1.resolve)(existing.record.path) === (0, node_path_1.resolve)(directory)))
                 return;
             let packageName;
             let coreConstraint;
@@ -821,6 +822,20 @@ class PluginManager {
             const coreVersion = require((0, node_path_1.resolve)(__dirname, "../../package.json")).version;
             const error = coreConstraint && !(0, version_manager_1.satisfiesVersion)(coreVersion, coreConstraint) ? `核心版本 ${coreVersion} 不满足插件要求 ${coreConstraint}` : undefined;
             const record = { id: manifest.id, version: manifest.version, type: manifest.type ?? "other", displayName: manifest.displayName ?? manifest.id, status: error ? "failed" : "discovered", capabilities: manifest.capabilities, manifest, path: directory, ...(packageName ? { packageName } : {}), ...(coreConstraint ? { coreConstraint } : {}), ...(error ? { error } : {}) };
+            if (existing) {
+                const versionOrder = (0, version_manager_1.compareVersions)(record.version, existing.record.version);
+                const candidateManaged = (0, node_path_1.resolve)(directory).startsWith(`${(0, node_path_1.resolve)(this.options.stateDir, "npm")}${node_path_1.sep}`);
+                const existingManaged = (0, node_path_1.resolve)(existing.record.path).startsWith(`${(0, node_path_1.resolve)(this.options.stateDir, "npm")}${node_path_1.sep}`);
+                // 新版本优先；同版本保留托管包，避免核心内置旧副本遮蔽显式安装包。
+                const existingFailed = existing.record.status === "failed";
+                const candidateFailed = record.status === "failed";
+                const keepExisting = candidateFailed !== existingFailed ? candidateFailed : versionOrder < 0 || (versionOrder === 0 && (!candidateManaged || existingManaged));
+                if (keepExisting) {
+                    this.log("info", "忽略插件候选，保留当前可用版本", { id: manifest.id, ignoredPath: directory, ignoredVersion: record.version, selectedVersion: existing.record.version, reason: record.error }, "插件发现");
+                    return;
+                }
+                this.log("info", "插件候选已替换", { id: manifest.id, ignoredPath: existing.record.path, ignoredVersion: existing.record.version, selectedVersion: record.version }, "插件发现");
+            }
             this.applyPluginTrust(record);
             this.plugins.set(manifest.id, { record });
             if (packageName && /^agent-bridge-[a-z0-9-]+$/.test(packageName)) {

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

@@ -12,7 +12,7 @@ const agent_1 = require("../../agent");
 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.34", 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 +86,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(),
             };
         },
@@ -125,42 +125,29 @@ class AunPlugin {
             }
         },
         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;
-                    }
-                }
-                else
-                    throw new Error("必须指定要关联的 AID");
-                if (aid)
-                    this.bindingTimes[aid] = new Date().toISOString();
+                const loaded = this.store.load(aid);
+                if (!loaded.ok || !loaded.data)
+                    throw new Error("AID 不在本地密钥库中，无法关联");
+                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 +155,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 +188,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 +206,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 +234,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 +294,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 +320,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/dist/tests-ts/aun-plugin.test.js

@@ -86,9 +86,14 @@ async function runAunCommand(routes, response, argv) {
             close() { }
         },
         AUNClient: class {
+            aid;
             async connect() { }
             async close() { }
-            on(_event, handler) { receive = handler; return { unsubscribe() { } }; }
+            constructor(aid) {
+                this.aid = aid;
+            }
+            on(_event, handler) { if (this.aid === "selected.agentid.cn")
+                receive = handler; return { unsubscribe() { } }; }
             async call(_method, params) { sent.push(params); }
         },
     };
@@ -142,7 +147,10 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
     const plugin = new aun_1.AunPlugin({ sdk, ingress: { publish } });
     try {
         await plugin.activate({ dataDir: root, config, logger, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
-        await run(async (payload) => { await handler(payload); }, sent, storage, logs);
+        if (!Object.keys(config.bindings ?? {}).length)
+            strict_1.default.equal(handler, undefined);
+        await run(async (payload) => { if (handler)
+            await handler(payload); }, sent, storage, logs, plugin);
     }
     finally {
         await plugin.deactivate("stop");
@@ -361,7 +369,7 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
         await plugin.activate({ dataDir: root, config: { identities: [aids[0]] }, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: {
                 register(route) { routes.set(`${route.method} ${route.path}`, route.handler); return () => undefined; }, unregister() { },
             } });
-        strict_1.default.deepEqual(connects, aids);
+        strict_1.default.deepEqual(connects, []);
         for (const aid of aids) {
             const result = await runAunCommand(routes, commandResponse(), ["create", aid, "--owner", "owner.agentid.cn"]);
             strict_1.default.equal(result.statusCode, 200);
@@ -937,7 +945,7 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
     const plugin = new aun_1.AunPlugin({ sdk, ingress: { publish: async () => undefined } });
     try {
         process.env.EVOLCORE_HOME = aunPath;
-        await plugin.activate({ dataDir, config: {}, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
+        await plugin.activate({ dataDir, config: { bindings: { "existing.agentid.cn": "workbuddy" } }, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
         strict_1.default.deepEqual(connects, ["existing.agentid.cn"]);
         strict_1.default.deepEqual(subscriptions, ["existing.agentid.cn"]);
         strict_1.default.deepEqual(await plugin.identity.list(), { evolcore: ["existing.agentid.cn"], muAgentBridge: [], localMuAgentBridge: [] });
@@ -991,7 +999,41 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
         await (0, promises_1.rm)(root, { recursive: true, force: true });
     }
 });
-(0, node_test_1.default)("共享密钥库中的 AID 自动连接并保留 EvolCore 来源", async () => {
+(0, node_test_1.default)("AUN 启动只连接显式绑定身份，旧 identities 不接管共享密钥库", async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "aun-explicit-only-"));
+    const connected = [];
+    const closed = [];
+    const sdk = {
+        AIDStore: class {
+            list() { return { ok: true, data: { identities: ["selected.agentid.cn", "external.agentid.cn"].map(aid => ({ aid })) } }; }
+            load(aid) { return { ok: true, data: { aid } }; }
+            close() { }
+        },
+        AUNClient: class {
+            aid;
+            constructor(aid) {
+                this.aid = aid;
+            }
+            on() { return { unsubscribe() { } }; }
+            async connect() { connected.push(this.aid); }
+            async close() { closed.push(this.aid); }
+        },
+    };
+    const plugin = new aun_1.AunPlugin({ sdk, ingress: { publish: async () => undefined } });
+    try {
+        await plugin.activate({ dataDir: root, config: { aid: "external.agentid.cn", identities: ["external.agentid.cn"], bindings: { "selected.agentid.cn": "workbuddy" } }, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
+        strict_1.default.deepEqual(connected, ["selected.agentid.cn"]);
+        strict_1.default.ok((await plugin.identity.list()).evolcore.includes("external.agentid.cn"));
+        await plugin.identity.unbind("workbuddy", "selected.agentid.cn", 26107);
+        strict_1.default.deepEqual(closed, ["selected.agentid.cn"]);
+        strict_1.default.deepEqual((await plugin.health()).details?.bindings, {});
+    }
+    finally {
+        await plugin.deactivate("stop");
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});
+(0, node_test_1.default)("共享密钥库中的 AID 仅列出并保留 EvolCore 来源", async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "aun-origin-"));
     const dataDir = (0, node_path_1.join)(root, "aun");
     await (0, promises_1.mkdir)(dataDir);
@@ -1046,14 +1088,14 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
     try {
         await plugin.activate({ dataDir, config: { created_aids: ["created.agentid.cn"] }, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
         strict_1.default.deepEqual(await plugin.identity.list(), { evolcore: ["shared.agentid.cn"], muAgentBridge: ["created.agentid.cn", "legacy.agentid.cn"], localMuAgentBridge: [] });
-        strict_1.default.deepEqual(subscriptions, storeIds);
+        strict_1.default.deepEqual(subscriptions, []);
         await plugin.deactivate("stop");
     }
     finally {
         await (0, promises_1.rm)(root, { recursive: true, force: true });
     }
 });
-(0, node_test_1.default)("默认密钥库指向共享 AUN 目录并自动连接其中全部 AID", async () => {
+(0, node_test_1.default)("默认共享 AUN 密钥库可列出全部 AID 但不自动连接", async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "aun-keystore-"));
     const dataDir = (0, node_path_1.join)(root, "aun");
     await (0, promises_1.mkdir)(dataDir);
@@ -1078,9 +1120,9 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
         try {
             await plugin.activate({ dataDir, config: {}, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
             strict_1.default.equal(plugin.path(), root);
-            // 密钥库中的全部 AID 在启动时自动连接，无需 ec 或手动关联
+            // 共享密钥库中的身份可见，但未手动绑定时不建立连接。
             strict_1.default.deepEqual((await plugin.identity.list()).evolcore, ["devwin.agentid.cn", "qwenwork.agentid.cn"]);
-            strict_1.default.equal(clients.length, 2);
+            strict_1.default.equal(clients.length, 0);
         }
         finally {
             delete process.env.AUN_HOME;
@@ -1137,18 +1179,18 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
         const second = (async function* () { yield Buffer.from('{"aid":"second.agentid.pub","owner_aid":"owner.agentid.pub"}'); })();
         await route.handler(second, response);
         strict_1.default.equal(response.statusCode, 201);
-        // bridge、second 已连接；offline-store 在首次 activate 时即自动连接
-        strict_1.default.equal(clients.length, 3);
+        // 只有显式创建的 bridge、second 建立连接，尚未订阅消息。
+        strict_1.default.equal(clients.length, 2);
         // 关联不再调用 ec：AID 在本地密钥库即可直接绑定
         await plugin.identity.bind("dsh", "bridge.agentid.pub", 26107);
         const boundAt = JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(root, "config.json"), "utf8")).binding_times["bridge.agentid.pub"];
         strict_1.default.ok(Number.isFinite(Date.parse(boundAt)));
-        // 密钥库中的 offline-store 已自动连接，绑定只更新关联记录
+        // 首次绑定共享身份时才建立连接并订阅消息。
         await plugin.identity.bind("doubao", "offline-store.agentid.cn", 26107);
         strict_1.default.ok(JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(root, "config.json"), "utf8")).bindings["offline-store.agentid.cn"]);
         strict_1.default.equal(clients.length, 3);
-        // 自动连接时 offline-store 先建立连接，bridge 是第二个客户端
-        const bridgeClient = clients[1];
+        // bridge 是本次显式创建的第一个客户端。
+        const bridgeClient = clients[0];
         await bridgeClient.emit({ from: "peer.agentid.pub", message_id: "m1", payload: { text: "你好" } });
         strict_1.default.equal(received[0].agentPlugin, "dsh");
         await received[0].reply("收到");
@@ -1162,11 +1204,11 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
         strict_1.default.equal(calls.filter((call) => call === "client.close").length, 3);
         strict_1.default.equal(calls.at(-1), "store.close");
         await plugin.activate({ dataDir: root, config: JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(root, "config.json"), "utf8")), logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
-        // 重启后 identities 已含全部三个 AID，各自恢复连接
-        strict_1.default.equal(clients.length, 6);
+        // 重启后只恢复两个显式绑定的身份。
+        strict_1.default.equal(clients.length, 5);
         const health = await plugin.health();
-        // 自动连接时 offline-store 先建链，顺序与其余 AID 不同
-        strict_1.default.deepEqual([...health.details?.aids].sort(), ["bridge.agentid.pub", "offline-store.agentid.cn", "second.agentid.pub"]);
+        // 未绑定的 second 不恢复连接。
+        strict_1.default.deepEqual([...health.details?.aids].sort(), ["bridge.agentid.pub", "offline-store.agentid.cn"]);
         strict_1.default.deepEqual(health.details?.bindings, { "bridge.agentid.pub": "dsh", "offline-store.agentid.cn": "doubao" });
         await routes.find((entry) => entry.path === "/api/plugins/aun/identities").handler({}, response);
         strict_1.default.equal(response.body.bindingTimes["bridge.agentid.pub"], boundAt);
@@ -1306,7 +1348,7 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
     const plugin = new aun_1.AunPlugin({ sdk, ingress: { publish: async () => undefined } });
     try {
         globalThis.fetch = (async () => { fetchCalls++; throw new Error("不应从 Gateway 下载信任根"); });
-        await plugin.activate({ dataDir, config: { aid: "previous.agentid.cn", identities: ["previous.agentid.cn"], aun_path: aunPath }, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
+        await plugin.activate({ dataDir, config: { aid: "previous.agentid.cn", identities: ["previous.agentid.cn"], bindings: { "previous.agentid.cn": "workbuddy" }, aun_path: aunPath }, logger: { info() { }, warn() { }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
         strict_1.default.equal(storeOptions.length, 2);
         strict_1.default.equal(storeOptions[1].rootCaPath, (0, node_path_1.join)(dataDir, "CA", "root", "root.crt"));
         strict_1.default.deepEqual(events, ["store.close", "client.connect"]);
@@ -1351,3 +1393,107 @@ async function withAunAttachmentPlugin(run, publish, config = { allow_from: "pee
         }
     }, async () => { throw new Error(`WORKBUDDY_ARTIFACT_READ_FAILED：读取文件 ${"目录/".repeat(120)}；原因：ENOENT：产物文件已经删除；token=private-token`); });
 });
+(0, node_test_1.default)("AUN 绑定写盘失败清理新连接，解绑关闭失败仍删除连接并更新健康状态", async () => {
+    for (const existingConnection of [false, true]) {
+        const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "aun-binding-cleanup-"));
+        const aid = "cleanup.agentid.cn";
+        let closed = 0;
+        let subscriptions = 0;
+        let closeFails = false;
+        const warnings = [];
+        const sdk = {
+            AIDStore: class {
+                list() { return { ok: true, data: { identities: [{ aid }] } }; }
+                load() { return { ok: true, data: { aid } }; }
+                close() { }
+            },
+            AUNClient: class {
+                on() { subscriptions++; return { unsubscribe() { subscriptions--; } }; }
+                async connect() { }
+                async close() { closed++; if (closeFails)
+                    throw new Error("关闭失败"); }
+            },
+        };
+        const plugin = new aun_1.AunPlugin({ sdk, ingress: { publish: async () => undefined } });
+        try {
+            await plugin.activate({ dataDir: root, config: {}, logger: { info() { }, warn(message, fields) { warnings.push(JSON.stringify([message, fields])); }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => "ready", http: { register() { }, unregister() { } } });
+            if (existingConnection)
+                await plugin.identity.create(aid, "owner.agentid.cn");
+            await (0, promises_1.rm)((0, node_path_1.join)(root, "config.json"), { force: true });
+            await (0, promises_1.mkdir)((0, node_path_1.join)(root, "config.json"));
+            await strict_1.default.rejects(plugin.identity.bind("workbuddy", aid, 26107));
+            strict_1.default.deepEqual((await plugin.health()).details?.bindings, {});
+            strict_1.default.deepEqual((await plugin.health()).details?.aids, existingConnection ? [aid] : []);
+            strict_1.default.equal(subscriptions, 0);
+            strict_1.default.equal(closed, existingConnection ? 0 : 1);
+            await (0, promises_1.rm)((0, node_path_1.join)(root, "config.json"), { recursive: true });
+            await plugin.identity.bind("workbuddy", aid, 26107);
+            strict_1.default.equal(subscriptions, 1);
+            closeFails = true;
+            await plugin.identity.unbind("workbuddy", aid, 26107);
+            strict_1.default.match(warnings.join("\n"), /AUN.*关闭.*cleanup.agentid.cn.*关闭失败/);
+            const health = await plugin.health();
+            strict_1.default.deepEqual(health.details?.aids, []);
+            strict_1.default.deepEqual(health.details?.bindings, {});
+            strict_1.default.equal(health.details?.connected, false);
+            strict_1.default.equal(health.message, "暂无已连接 AID");
+            strict_1.default.equal(subscriptions, 0);
+        }
+        finally {
+            await plugin.deactivate("stop");
+            await (0, promises_1.rm)(root, { recursive: true, force: true });
+        }
+    }
+});
+(0, node_test_1.default)("AUN 旧绑定目标不存在时保留配置并跳过连接，记录具体身份", async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "aun-missing-target-"));
+    const logs = [];
+    let connects = 0;
+    const sdk = {
+        AIDStore: class {
+            list() { return { ok: true, data: { identities: [{ aid: "external.agentid.cn" }] } }; }
+            close() { }
+        },
+        AUNClient: class {
+            async connect() { connects++; }
+        },
+    };
+    const plugin = new aun_1.AunPlugin({ sdk, ingress: { publish: async () => undefined } });
+    try {
+        await plugin.activate({ dataDir: root, config: { bindings: { "external.agentid.cn": "qwenwork" } }, logger: { info() { }, warn(message, fields) { logs.push(JSON.stringify([message, fields])); }, error() { } }, callPlugin: async () => ({ text: "" }), pluginStatus: () => undefined, http: { register() { }, unregister() { } } });
+        strict_1.default.equal(connects, 0);
+        strict_1.default.deepEqual((await plugin.health()).details?.bindings, { "external.agentid.cn": "qwenwork" });
+        strict_1.default.match(logs.join("\n"), /external.agentid.cn.*qwenwork/);
+    }
+    finally {
+        await plugin.deactivate("stop");
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});
+(0, node_test_1.default)("AUN 有在途消息时拒绝解绑，最终回复完成后才能解除关联", async () => {
+    let started;
+    let release;
+    const taskStarted = new Promise(resolve => { started = resolve; });
+    const taskGate = new Promise(resolve => { release = resolve; });
+    await withAunAttachmentPlugin(async (receive, sent, _storage, _logs, plugin) => {
+        const task = receive({ from: "peer.agentid.cn", message_id: "unbind-busy", payload: { text: "执行任务" } });
+        try {
+            await taskStarted;
+            await strict_1.default.rejects(plugin.identity.unbind("qwenwork", "local.agentid.cn", 26107), /正在处理消息.*完成后.*解绑/);
+            strict_1.default.deepEqual((await plugin.health()).details?.bindings, { "local.agentid.cn": "qwenwork" });
+            strict_1.default.equal((await plugin.health()).details?.connected, true);
+        }
+        finally {
+            release();
+            await task;
+        }
+        strict_1.default.equal(sent.at(-1).payload.text, "任务最终回复");
+        await plugin.identity.unbind("qwenwork", "local.agentid.cn", 26107);
+        strict_1.default.deepEqual((await plugin.health()).details?.bindings, {});
+        strict_1.default.equal((await plugin.health()).details?.connected, false);
+    }, async (message) => {
+        started();
+        await taskGate;
+        await message.reply("任务最终回复");
+    });
+});

package/dist/tests-ts/installer-assets.test.js

@@ -67,6 +67,8 @@ const node_util_1 = require("node:util");
     strict_1.default.match(setup, /TopMost = \$true/);
     strict_1.default.match(setup, /BringToFront\(\)/);
     strict_1.default.match(setup, /Invoke-AunCommand @\('list'\)/);
+    strict_1.default.match(setup, /自动解除未安装千问办公的残留绑定/);
+    strict_1.default.match(setup, /Invoke-AunCommand @\('unbind', \[string\]\$binding\.Name\)/);
     for (const id of ["qwenwork", "doubao", "workbuddy", "dsh"])
         strict_1.default.ok(setup.includes(id), "缺少 Agent " + id);
     strict_1.default.match(setup, /choices\[0\]\.message\.content/);

package/dist/tests-ts/plugin-manager.test.js

@@ -45,6 +45,35 @@ const node_http_1 = require("node:http");
 const plugin_manager_1 = require("../src-ts/plugin-manager");
 const version_manager_1 = require("../src-ts/version-manager");
 const channel_sessions_1 = require("../src-ts/channel-sessions");
+(0, node_test_1.default)("启动时内置新版替代状态目录旧插件，保留较新及同版托管插件", async () => {
+    for (const [bundled, managed, expectedManaged] of [["1.0.31", "1.0.29", false], ["1.0.31", "1.0.32", true], ["1.0.31", "1.0.31", true], ["1.0.10", "1.0.9", false], ["1.0.9", "1.0.10", true]]) {
+        const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-plugin-precedence-"));
+        const bundledDir = (0, node_path_1.join)(root, "plugins", "aun");
+        const managedDir = (0, node_path_1.join)(root, "state", "npm", "agent-bridge-aun", "node_modules", "agent-bridge-aun");
+        try {
+            for (const [dir, version] of [[bundledDir, bundled], [managedDir, managed]]) {
+                await (0, promises_1.mkdir)(dir, { recursive: true });
+                await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "package.json"), JSON.stringify({ name: "agent-bridge-aun", version, agentBridge: { plugin: "./plugin.json" } }));
+                await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "plugin.json"), JSON.stringify({ id: "aun", version, entry: "index.js", apiVersion: "1", capabilities: [] }));
+                await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "index.js"), "module.exports={activate:async()=>{},deactivate:async()=>{},health:async()=>({status:'ready'})};");
+            }
+            const manager = new plugin_manager_1.PluginManager({ pluginsDir: (0, node_path_1.join)(root, "plugins"), stateDir: (0, node_path_1.join)(root, "state"), publisherResolver: async () => "m2lihui" });
+            await manager.discover();
+            strict_1.default.equal(manager.list()[0].path, expectedManaged ? managedDir : bundledDir);
+            strict_1.default.equal(manager.list()[0].version, expectedManaged ? managed : bundled);
+            strict_1.default.equal(manager.packageInfo("aun").managed, expectedManaged);
+            await manager.start("aun");
+            const instance = manager.get("aun").instance;
+            await manager.discover();
+            strict_1.default.equal(manager.get("aun").instance, instance);
+            strict_1.default.equal(manager.get("aun").record.status, "ready");
+            await manager.stop("aun", "stop");
+        }
+        finally {
+            await (0, promises_1.rm)(root, { recursive: true, force: true });
+        }
+    }
+});
 (0, node_test_1.default)("后台桌面重启先停止插件再启动，拒绝无关插件", { skip: process.platform === "win32" }, async () => {
     const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-desktop-restart-"));
     const manager = new plugin_manager_1.PluginManager({ pluginsDir: (0, node_path_1.join)(root, "plugins"), stateDir: (0, node_path_1.join)(root, "state") });
@@ -1157,3 +1186,25 @@ const channel_sessions_1 = require("../src-ts/channel-sessions");
         await (0, promises_1.rm)(root, { recursive: true, force: true });
     }
 });
+(0, node_test_1.default)("不兼容的新托管候选不遮蔽可用内置插件", async () => {
+    for (const managedFirst of [true, false]) {
+        const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-compatible-choice-"));
+        const manager = new plugin_manager_1.PluginManager({ pluginsDir: (0, node_path_1.join)(root, "plugins"), stateDir: (0, node_path_1.join)(root, "state"), publisherResolver: async () => "m2lihui" });
+        try {
+            const bundled = (0, node_path_1.join)(root, "plugins", "demo");
+            const managed = (0, node_path_1.join)(root, "state", "npm", "agent-bridge-demo", "node_modules", "agent-bridge-demo");
+            for (const [dir, version, requires] of [[bundled, "1.0.0", "*"], [managed, "2.0.0", ">=999.0.0"]]) {
+                await (0, promises_1.mkdir)(dir, { recursive: true });
+                await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "plugin.json"), JSON.stringify({ id: "demo", version, entry: "index.js", apiVersion: "1", capabilities: [] }));
+                await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "package.json"), JSON.stringify({ name: "agent-bridge-demo", agentBridge: { requires: { "mu-agent-bridge": requires } } }));
+            }
+            for (const dir of managedFirst ? [managed, bundled] : [bundled, managed])
+                await manager.discoverDirectory(dir, "demo");
+            strict_1.default.equal(manager.get("demo").record.path, bundled);
+            strict_1.default.equal(manager.get("demo").record.status, "discovered");
+        }
+        finally {
+            await (0, promises_1.rm)(root, { recursive: true, force: true });
+        }
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-agent-bridge",
-  "version": "1.0.64",
+  "version": "1.0.65",
   "description": "将 AUN Agent 连接到本地桌面 AI 客户端的插件平台。",
   "main": "dist/src-ts/cli.js",
   "bin": {

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

@@ -12,7 +12,7 @@ const agent_1 = require("../../agent");
 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.34", 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 +86,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(),
             };
         },
@@ -125,42 +125,29 @@ class AunPlugin {
             }
         },
         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;
-                    }
-                }
-                else
-                    throw new Error("必须指定要关联的 AID");
-                if (aid)
-                    this.bindingTimes[aid] = new Date().toISOString();
+                const loaded = this.store.load(aid);
+                if (!loaded.ok || !loaded.data)
+                    throw new Error("AID 不在本地密钥库中，无法关联");
+                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 +155,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 +188,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 +206,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 +234,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 +294,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 +320,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/plugins/aun/package.json

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

package/plugins/aun/plugin.json

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