agent-bridge-aun 1.0.35 → 1.0.39

package/README.md

@@ -10,7 +10,7 @@
 
 该插件依赖 `@agentunion/fastaun`，要求 Node.js 22.16 或更高版本。
 
-附件回复按图片、视频和普通文件分组发送。MIME 类型为 `video/*` 的附件使用 EvolCore 标准 `type: "video"` 消息，使支持视频预览的 Peer 客户端显示播放器；保留原话题和请求引用。视频沿用 EvolCore 标准上传流程：通过 SDK 上传可公开读取的对象，发送不带分享 URL 的标准对象引用，便于接收端取得下载票据及播放器分段读取；持有对象地址者可读取视频。图片和普通文件继续使用仅原 Peer 可访问的限时分享。该流程由插件独立实现，不调用 `ec` 命令，也不改变各 Agent 插件的产物回传策略。
+附件回复按图片、视频和普通文件分组发送，并保留原话题和请求引用。图片使用不带普通说明正文的 `type: "image"` 消息，说明和下载链接另发加密文本，兼容 AUN 网页的图片卡片显示规则；MIME 类型为 `video/*` 的附件使用 `type: "video"`，普通文件使用 `type: "file"`，二者正文均附下载链接。三类附件参考 EvolCore 的标准附件格式，由插件直接通过 AUN SDK 上传可公开读取的对象，发送不带受限分享 URL 的标准对象引用，便于接收端取得下载票据及播放器分段读取。持有对象地址者可读取附件；旧版本已发送的私有分享不会自动改为公开。发送失败或状态未确认时仍向原 Peer 提供下载链接，不自动重发附件。图片已发送而说明失败时明确报告说明发送阶段，不误报 FS 上传失败。附件链路不调用 `ec` 命令，也不依赖 EvolCore 运行。
 
 ABWeb 的 AUN 设置只展示已连接 AID，并按来源分组。成功注册并记录在插件 `created_aids` 中的 AID 属于本工程；共享密钥库中其余 AID 属于 EvolCore。旧版 `created-aids.json` 记录继续兼容。来源只用于展示，连接和关联由 AUN 插件直接管理。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。
 

package/dist/src-ts/agent.js

@@ -1,7 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentOperationError = exports.AgentError = void 0;
+exports.abortable = abortable;
 exports.errorDetails = errorDetails;
+async function abortable(promise, signal) {
+    if (!signal)
+        return promise;
+    if (signal.aborted) {
+        // promise 已在调用方启动，先观察其拒绝，避免预取消时产生未处理拒绝。
+        void promise.catch(() => undefined);
+        signal.throwIfAborted();
+    }
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const cleanup = () => signal.removeEventListener("abort", abort);
+        const abort = () => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            reject(signal.reason);
+        };
+        signal.addEventListener("abort", abort, { once: true });
+        promise.then((value) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            resolve(value);
+        }, (error) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            reject(error);
+        });
+    });
+}
 class AgentError extends Error {
     constructor(message, options) {
         super(message, options);

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

@@ -250,30 +250,12 @@ async function uploadAunAttachments(client, ownerAid, peerAid, items) {
         const objectKey = `shared/${(0, node_crypto_1.randomUUID)()}/${filename.replace(/[^A-Za-z0-9._-]/g, "_")}`;
         const sha256 = digest(item.data);
         const contentType = item.contentType.toLowerCase();
-        // 视频播放器不携带 AID 凭据，沿用 EvolCore 的标准可读对象上传方式。
-        const video = contentType.startsWith("video/");
+        // 会话媒体控件不携带 AID 凭据，沿用 ec msg 的标准可读对象上传方式。
         const ref = { ownerAid, bucket: "default", objectKey, filename, contentType, sizeBytes: item.data.byteLength, sha256 };
-        const uploaded = await client.storage.writeBytes(`/${objectKey}`, item.data, { contentType, public: video, overwrite: video })
+        const uploaded = await client.storage.writeBytes(`/${objectKey}`, item.data, { contentType, public: true, overwrite: true })
             .catch(error => { throw new agent_1.AgentOperationError("AUN_FS_UPLOAD_FAILED", `上传 AUN FS 文件“${filename}”`, error); });
         checkedMetadata({ ...uploaded, size: uploaded.size ?? uploaded.size_bytes ?? item.data.byteLength }, ref);
-        if (video) {
-            result.push({ owner_aid: ownerAid, object_key: objectKey, filename, content_type: contentType, size_bytes: item.data.byteLength, sha256 });
-            continue;
-        }
-        const share = await client.storage.lowlevel.createShareLink({ owner: ownerAid, bucket: "default", objectKey, allowedAids: [peerAid], expireInSeconds: 86400 })
-            .catch(error => { throw new agent_1.AgentOperationError("AUN_FS_SHARE_FAILED", `创建 AUN FS 文件“${filename}”的接收方授权`, error); });
-        if (share.owner_aid && share.owner_aid !== ownerAid || share.bucket && share.bucket !== "default" || share.object_key && share.object_key !== objectKey)
-            throw new Error("AUN 附件分享对象不一致");
-        if (share.allowed_aids !== undefined && (!Array.isArray(share.allowed_aids) || share.allowed_aids.length !== 1 || share.allowed_aids[0] !== peerAid))
-            throw new Error("AUN 附件分享授权不一致");
-        const shareId = typeof share.share_id === "string" && /^[A-Za-z0-9]{10}$/.test(share.share_id) ? share.share_id : undefined;
-        if (share.share_id !== undefined && !shareId)
-            throw new Error("AUN 附件分享标识无效");
-        const url = typeof share.path_url === "string" && share.path_url ? share.path_url : shareId ? `https://${ownerAid}/${objectKey}?t=${shareId}` : "";
-        const token = url ? pathToken(url, ownerAid, objectKey) : undefined;
-        if (!token || shareId && shareId !== token)
-            throw new Error("AUN 附件分享链接无效");
-        result.push({ owner_aid: ownerAid, bucket: "default", object_key: objectKey, url, filename, content_type: item.contentType, size_bytes: item.data.byteLength, sha256 });
+        result.push({ owner_aid: ownerAid, object_key: objectKey, filename, content_type: contentType, size_bytes: item.data.byteLength, sha256 });
     }
     return result;
 }

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

@@ -13,13 +13,30 @@ const evolcore_1 = require("./evolcore");
 const messages_1 = require("./messages");
 const attachments_1 = require("./attachments");
 const manifest = {
-    id: "aun", version: "1.0.35", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.39", 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",
     managementPage: "/abweb/channels/aun",
 };
 const newSessionCommand = /^\/new(?:[ \t]+[^\r\n]+)?$/;
+const successfulSendStatuses = new Set(["accepted", "sent", "delivered", "duplicate"]);
+function attachmentDownloadLinks(refs) {
+    return refs.flatMap((ref) => typeof ref.url === "string" && ref.url ? [ref.url]
+        : typeof ref.owner_aid === "string" && typeof ref.object_key === "string" ? [`https://${ref.owner_aid}/${ref.object_key}`] : []);
+}
+function withAttachmentDownloadLinks(text, kind, refs) {
+    const links = attachmentDownloadLinks(refs);
+    if (!links.length)
+        return text;
+    return `${text || "附件已生成。"}\n${kind === "file" ? "文件" : "附件"}下载链接：\n${links.join("\n")}`;
+}
+function withFailureDownloadLinks(text, refs) {
+    const links = attachmentDownloadLinks(refs);
+    if (!links.length || text?.includes("下载链接"))
+        return text;
+    return `${text || "附件已生成。"}\n附件下载链接（消息未确认时）：\n${links.join("\n")}`;
+}
 async function loadSdk() {
     const resolver = (0, node_module_1.createRequire)(__filename);
     const dynamicImport = new Function("url", "return import(url)");
@@ -81,6 +98,60 @@ class AunPlugin {
         this.sdk = options.sdk;
         this.ingress = options.ingress;
     }
+    aunManagement = {
+        list: async () => {
+            const groups = await this.identity.list();
+            const aids = [...new Set([...groups.evolcore, ...groups.muAgentBridge, ...(groups.localMuAgentBridge ?? []), ...this.listStoreAids()])]
+                .filter((aid) => aidPattern.test(aid)).sort();
+            const bindings = Object.fromEntries(Object.entries(this.bindings)
+                .filter(([aid, agentId]) => aidPattern.test(aid) && /^[a-z][a-z0-9-]{1,63}$/.test(agentId) && agentId !== "aun" && agentId !== "abweb")
+                .sort(([left], [right]) => left.localeCompare(right)));
+            return { aids, bindings };
+        },
+        create: async ({ aid, ownerAid }) => {
+            if (typeof aid !== "string" || !aidPattern.test(aid.trim()))
+                throw new AunCommandError("AID 格式无效");
+            const validAid = aid.trim();
+            const owner = typeof ownerAid === "string" && ownerAid.trim()
+                ? ownerAid.trim()
+                : typeof this.config.owner_aid === "string" ? this.config.owner_aid.trim() : "";
+            if (!owner)
+                throw new AunCommandError("未提供 Owner AID，且未配置默认 Owner");
+            if (!aidPattern.test(owner))
+                throw new AunCommandError("Owner AID 格式无效");
+            const result = await this.createIdentity(validAid, owner);
+            const connection = result.connection === "ready" ? "ready" : "degraded";
+            if (connection !== "ready")
+                throw new AunCommandError("AID 已创建但连接失败，请先查询 AID 列表确认状态，不要重试创建", 502, { created: true, aid: validAid, connection });
+            return { aid: validAid, status: result.status, connection };
+        },
+        bind: async ({ aid, agentId, replace }) => {
+            if (typeof aid !== "string" || !aidPattern.test(aid.trim()))
+                throw new AunCommandError("AID 格式无效");
+            if (typeof agentId !== "string" || !/^[a-z][a-z0-9-]{1,63}$/.test(agentId) || agentId === "aun" || agentId === "abweb")
+                throw new AunCommandError("Agent 插件 ID 无效");
+            if (typeof replace !== "boolean")
+                throw new AunCommandError("必须明确指定是否替换现有绑定");
+            const validAid = aid.trim();
+            const previousAgent = this.bindings[validAid];
+            const existing = Object.entries(this.bindings)
+                .filter(([, target]) => target === agentId)
+                .map(([boundAid]) => boundAid)
+                .filter((previousAid) => previousAid !== validAid)
+                .sort();
+            if (previousAgent && previousAgent !== agentId)
+                throw new AunCommandError("该 AID 已绑定到其他 Agent，不能通过替换转移");
+            if (existing.length && !replace)
+                throw new AunCommandError("目标 Agent 已有其他 AID 绑定；如需替换请明确设置 replace");
+            try {
+                await this.patchAgentAid(agentId, validAid);
+            }
+            catch {
+                throw new AunCommandError("AUN 身份关联失败", 502);
+            }
+            return { aid: validAid, agent: agentId, replacedAids: existing };
+        },
+    };
     identity = {
         list: async () => {
             const own = new Set([...this.createdAids, ...this.legacyCreatedAids]);
@@ -672,16 +743,7 @@ class AunPlugin {
             this.validatePluginId(agent);
             await this.requireAgent(agent);
         }
-        let created;
-        try {
-            created = await this.identity.create(aid, owner);
-        }
-        catch (error) {
-            const exists = this.identities.has(aid) || this.listStoreAids().includes(aid);
-            if (exists)
-                throw new AunCommandError("AID 可能已创建，但后续连接或保存失败；请先执行 mab aun list 确认，不要重试创建", 502, { created: true, aid });
-            throw new AunCommandError(`AID 创建失败：${safeError(error).replaceAll(owner, "[已隐藏]")}`, 502);
-        }
+        const created = await this.createIdentity(aid, owner);
         const data = { created: true, aid, connection: created.connection ?? "ready" };
         if (created.connection !== "ready")
             throw new AunCommandError("AID 已创建，但连接失败；请先执行 mab aun list 确认，不要重试创建", 502, { ...data, connectionError: created.connectionError });
@@ -699,6 +761,17 @@ class AunPlugin {
             data: { ...data, ...(agent ? { agent } : {}) },
         };
     }
+    async createIdentity(aid, owner) {
+        try {
+            return await this.identity.create(aid, owner);
+        }
+        catch (error) {
+            if (this.identities.has(aid) || this.listStoreAids().includes(aid)) {
+                throw new AunCommandError("AID 可能已创建，但后续连接或保存失败；请先执行 mab aun list 确认，不要重试创建", 502, { created: true, aid });
+            }
+            throw new AunCommandError(`AID 创建失败：${safeError(error).replaceAll(owner, "[已隐藏]")}`, 502);
+        }
+    }
     async agents(readyOnly = true) {
         const payload = await this.controlRequest("/api/plugins");
         if (!Array.isArray(payload.plugins))
@@ -904,11 +977,13 @@ class AunPlugin {
                 let sent = 0;
                 let groupsCount = 0;
                 let sending = false;
+                let fallbackText;
+                let fallbackLinks = [];
                 try {
                     if (!client?.storage)
                         throw new Error("AUN SDK 不支持附件存储接口");
                     const refs = uploadedRefs && uploadedItems === items ? uploadedRefs : await (0, attachments_1.uploadAunAttachments)({ storage: client.storage }, aid, message.peerId, items);
-                    this.context?.logger.info("AUN FS 文件上传与授权完成", { ...trace, stage: "上传并授权附件", files: items.map(item => ({ filename: item.filename, sizeBytes: item.data.byteLength })) });
+                    this.context?.logger.info("AUN FS 标准附件上传完成", { ...trace, stage: "上传附件", files: items.map(item => ({ filename: item.filename, sizeBytes: item.data.byteLength })) });
                     if (!uploadedRefs || uploadedItems !== items) {
                         uploadedItems = items;
                         uploadedRefs = refs;
@@ -922,25 +997,44 @@ class AunPlugin {
                     }
                     groupsCount = groups.size;
                     for (const [kind, group] of groups) {
-                        const payload = { type: kind, text: text || (kind === "image" ? "图片已生成。" : kind === "video" ? "视频已生成。" : "文件已生成。"), attachments: group };
+                        const payloadText = withAttachmentDownloadLinks(text || (kind === "image" ? "图片已生成。" : kind === "video" ? "视频已生成。" : "文件已生成。"), kind, group);
+                        // AUN 网页会隐藏带普通正文的单图卡片，图片说明需另发文本。
+                        const payload = { type: kind, ...(kind === "image" ? {} : { text: payloadText }), attachments: group };
                         if (message.threadId)
                             payload.thread_id = message.threadId;
                         if (message.messageId)
                             payload.ref_message_id = message.messageId;
+                        fallbackText = payloadText;
+                        fallbackLinks = attachmentDownloadLinks(group);
                         sending = true;
                         // message.send 失败时可能已送达，不自动重试或降级明文，避免重复发送和泄露引用。
-                        await client.call("message.send", { to: message.peerId, payload, encrypt: true });
+                        const sendResult = await this.callAunWithRecovery(aid, { to: message.peerId, payload, encrypt: true });
+                        if (typeof sendResult?.status !== "string" || !successfulSendStatuses.has(sendResult.status))
+                            throw new Error(`AUN 附件发送状态未确认：${sendResult?.status === undefined ? "未返回状态" : String(sendResult.status)}`);
                         this.context?.logger.info("AUN 附件消息已发送", { ...trace, stage: "发送附件消息", kind, count: group.length });
                         sending = false;
                         sent++;
+                        if (kind === "image" && payloadText) {
+                            try {
+                                const { attachments: _attachments, ...caption } = payload;
+                                const result = await this.callAunWithRecovery(aid, { to: message.peerId, payload: { ...caption, type: "text", text: payloadText }, encrypt: true });
+                                if (typeof result?.status !== "string" || !successfulSendStatuses.has(result.status))
+                                    throw new Error(`AUN 图片说明发送状态未确认：${result?.status === undefined ? "未返回状态" : String(result.status)}`);
+                                this.context?.logger.info("AUN 图片说明已发送", { ...trace, stage: "发送图片说明" });
+                            }
+                            catch (error) {
+                                throw new agent_1.AgentOperationError("AUN_ATTACHMENT_CAPTION_SEND_FAILED", "图片已发送，发送 AUN 图片说明（结果未确认，不自动重发）", error);
+                            }
+                        }
                     }
                 }
                 catch (error) {
                     deliveryFailed = true;
                     const failure = sending ? new agent_1.AgentOperationError("AUN_ATTACHMENT_SEND_FAILED", "发送 AUN 附件消息（FS 上传已完成）", error) : error;
                     const progress = sending ? `（已确认发送 ${sent}/${groupsCount} 组，当前组结果未确认，请勿重复发送）` : "";
+                    const fallback = fallbackText && fallbackLinks.length ? `\n${withFailureDownloadLinks(fallbackText, fallbackLinks.map((url) => ({ url })))}` : "";
                     try {
-                        await this.sendText(aid, message.peerId, `附件回传失败${progress}：${safeError((0, agent_1.errorDetails)(failure))}`, message.threadId);
+                        await this.sendText(aid, message.peerId, `附件回传失败${progress}：${safeError((0, agent_1.errorDetails)(failure))}${fallback}`, message.threadId, true);
                     }
                     catch { /* 尽力反馈 */ }
                     throw failure;
@@ -965,18 +1059,44 @@ class AunPlugin {
             }
         }
     }
-    async sendText(aid, peerId, text, threadId) {
+    async sendText(aid, peerId, text, threadId, encryptedOnly = false) {
         const payload = { type: "text", text };
         if (threadId)
             payload.thread_id = threadId;
         const params = { to: peerId, payload, encrypt: true };
         try {
-            await this.clients.get(aid).client.call("message.send", params);
+            await this.callAunWithRecovery(aid, params);
+        }
+        catch (error) {
+            if (encryptedOnly || !this.isE2eeError(error))
+                throw error;
+            await this.callAunWithRecovery(aid, { ...params, encrypt: false });
+        }
+    }
+    async callAunWithRecovery(aid, params) {
+        const connection = this.clients.get(aid);
+        if (!connection)
+            throw new agent_1.AgentOperationError("AUN_CONNECTION_MISSING", "查找 AUN 身份连接", new Error(`AID ${aid} 当前没有已连接的客户端`));
+        try {
+            return await connection.client.call("message.send", params);
         }
         catch (error) {
-            if (!this.isE2eeError(error))
+            if (!isAunWriteNotStarted(error))
                 throw error;
-            await this.clients.get(aid).client.call("message.send", { ...params, encrypt: false });
+            this.context?.logger.warn("AUN 发送前连接已断开，正在恢复 AUN 到 Peer 的连接并重试一次", { aid, peer: params.to, stage: "恢复 AUN 连接", error: safeError((0, agent_1.errorDetails)(error)) });
+            try {
+                connection.reconnecting ??= connection.client.connect({ auto_reconnect: true }).finally(() => { connection.reconnecting = undefined; });
+                await connection.reconnecting;
+            }
+            catch (cause) {
+                throw new agent_1.AgentOperationError("AUN_RECONNECT_FAILED", "恢复 AUN 到 Peer 的连接（消息确认未写出）", cause);
+            }
+            try {
+                return await connection.client.call("message.send", params);
+            }
+            catch (cause) {
+                throw new agent_1.AgentOperationError("AUN_SEND_FAILED", "AUN 重连后发送消息（仅重试一次）", cause);
+            }
         }
     }
     isE2eeError(error) {
@@ -995,6 +1115,14 @@ exports.default = AunPlugin;
 function safeError(error) {
     return redact(error instanceof Error ? error.message : String(error));
 }
+function isAunWriteNotStarted(error) {
+    for (let current = error; current && typeof current === "object"; current = current.cause) {
+        const value = current;
+        if (value.name === "ConnectionError" && typeof value.message === "string" && /^(?:client is not connected|transport not connected|send cancelled before write:|transport closed$)/i.test(value.message))
+            return true;
+    }
+    return false;
+}
 async function readResponse(response, limit) {
     if (!response.body) {
         const raw = await response.text();

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

@@ -13,6 +13,9 @@ function normalizeAunMessage(payload, selfAid, allowFrom) {
     if (!peerId || peerId === selfAid || (rules.length > 0 && !rules.includes(peerId)))
         return undefined;
     const body = data.payload && typeof data.payload === "object" ? data.payload : {};
+    // 对端的系统事件只作通知，转为任务回复会导致两个 Agent 循环互答。
+    if (body.type === "error" || body.type === "notice")
+        return undefined;
     const text = typeof data.payload === "string" ? data.payload : typeof body.text === "string" ? body.text : "";
     let attachments = [];
     let attachmentError;

package/package.json

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

package/plugin.json

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