agent-bridge-aun 1.0.32 → 1.0.34

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.32", 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",
@@ -83,10 +83,11 @@ class AunPlugin {
     identity = {
         list: async () => {
             const own = new Set([...this.createdAids, ...this.legacyCreatedAids]);
+            const known = new Set([...this.clients.keys(), ...this.listStoreAids()]);
             return {
-                evolcore: [...this.clients.keys()].filter((aid) => !own.has(aid)).sort(),
-                muAgentBridge: [...this.clients.keys()].filter((aid) => own.has(aid)).sort(),
-                localMuAgentBridge: [...own].filter((aid) => !this.clients.has(aid)).sort(),
+                evolcore: [...known].filter((aid) => !own.has(aid)).sort(),
+                muAgentBridge: [...known].filter((aid) => own.has(aid)).sort(),
+                localMuAgentBridge: [...own].filter((aid) => !known.has(aid)).sort(),
             };
         },
         create: async (aid, owner) => {
@@ -124,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) {
@@ -167,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;
             }
@@ -177,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 };
@@ -193,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 });
         },
     };
@@ -206,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 {
@@ -265,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);
@@ -281,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 {
@@ -945,7 +984,7 @@ class AunPlugin {
 exports.AunPlugin = AunPlugin;
 exports.default = AunPlugin;
 function safeError(error) {
-    return redact(error instanceof Error ? error.message : String(error)).slice(0, 240);
+    return redact(error instanceof Error ? error.message : String(error));
 }
 async function readResponse(response, limit) {
     if (!response.body) {

package/package.json

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

package/plugin.json

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