agent-bridge-aun 1.0.31 → 1.0.32

package/dist/src-ts/agent.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentError = void 0;
+exports.AgentOperationError = exports.AgentError = void 0;
+exports.errorDetails = errorDetails;
 class AgentError extends Error {
     constructor(message, options) {
         super(message, options);
@@ -8,3 +9,26 @@ class AgentError extends Error {
     }
 }
 exports.AgentError = AgentError;
+/** 保留底层错误码，避免只留下 fetch failed 或超时这类表层提示。 */
+function errorDetails(error) {
+    const parts = [];
+    const seen = new Set();
+    for (let current = error; current && !seen.has(current) && seen.size < 5;) {
+        seen.add(current);
+        const value = current;
+        const message = typeof value.message === "string" ? value.message : String(current);
+        parts.push(`${message}${value.code ? `（${String(value.code)}）` : ""}`);
+        current = value.cause;
+    }
+    return parts.join("；原因：") || String(error);
+}
+class AgentOperationError extends AgentError {
+    code;
+    stage;
+    constructor(code, stage, cause) {
+        super(`${code}：${stage}失败：${errorDetails(cause)}`, { cause });
+        this.code = code;
+        this.stage = stage;
+    }
+}
+exports.AgentOperationError = AgentOperationError;

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

@@ -8,6 +8,7 @@ exports.uploadAunAttachments = uploadAunAttachments;
 const node_crypto_1 = require("node:crypto");
 const node_util_1 = require("node:util");
 const attachments_1 = require("../../attachments");
+const agent_1 = require("../../agent");
 const aidPattern = /^[a-z0-9][a-z0-9_-]{2,63}\.[a-z0-9-]+(?:\.[a-z0-9-]+)+$/;
 const mimePattern = /^[A-Za-z0-9!#$&^_.+-]+\/[A-Za-z0-9!#$&^_.+-]+$/;
 const imageTypes = new Set(["image/png", "image/jpeg", "image/webp"]);
@@ -252,13 +253,15 @@ async function uploadAunAttachments(client, ownerAid, peerAid, items) {
         // 视频播放器不携带 AID 凭据，沿用 EvolCore 的标准可读对象上传方式。
         const video = contentType.startsWith("video/");
         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: video, overwrite: video })
+            .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 });
+        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))

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

@@ -8,10 +8,11 @@ const node_module_1 = require("node:module");
 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 messages_1 = require("./messages");
 const attachments_1 = require("./attachments");
 const manifest = {
-    id: "aun", version: "1.0.31", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.32", 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",
@@ -799,7 +800,9 @@ class AunPlugin {
         }
     }
     async processMessage(message, aid, agentPlugin) {
-        let replyAttempted = false;
+        let deliveryFailed = false;
+        const trace = { aid, peer: message.peerId, threadId: message.threadId ?? "", messageId: message.messageId ?? "", agentPlugin };
+        this.context?.logger.info("AUN 收到任务", { ...trace, stage: "接收消息", attachments: message.attachments?.length ?? 0 });
         const client = this.clients.get(aid)?.client;
         let attachments = [];
         let uploadedItems;
@@ -824,9 +827,9 @@ class AunPlugin {
             }
         }
         catch (error) {
-            this.context?.logger.warn("AUN 附件下载失败", { error: safeError(error), ...(error instanceof attachments_1.AunDownloadUrlError ? { downloadUrl: error.diagnostic } : {}) });
+            this.context?.logger.warn("AUN 附件下载失败", { ...trace, stage: "下载入站附件", error: safeError((0, agent_1.errorDetails)(error)), ...(error instanceof attachments_1.AunDownloadUrlError ? { downloadUrl: error.diagnostic } : {}) });
             try {
-                await this.sendText(aid, message.peerId, `附件接收失败：${safeError(error)}`, message.threadId);
+                await this.sendText(aid, message.peerId, `附件接收失败：下载入站附件失败：${safeError((0, agent_1.errorDetails)(error))}`, message.threadId);
             }
             catch { /* 尽力反馈 */ }
             return;
@@ -838,13 +841,18 @@ class AunPlugin {
             reply: async (text) => {
                 if (!text.trim())
                     return;
-                replyAttempted = true;
-                await this.sendText(aid, message.peerId, text, message.threadId);
+                try {
+                    await this.sendText(aid, message.peerId, text, message.threadId);
+                    this.context?.logger.info("AUN 文本已发送", { ...trace, stage: "发送文本消息" });
+                }
+                catch (error) {
+                    deliveryFailed = true;
+                    throw new agent_1.AgentOperationError("AUN_TEXT_SEND_FAILED", "发送 AUN 文本消息（结果未确认，不自动重发）", error);
+                }
             },
             replyAttachments: async (items, text) => {
                 if (!items.length)
                     return;
-                replyAttempted = true;
                 let sent = 0;
                 let groupsCount = 0;
                 let sending = false;
@@ -852,6 +860,7 @@ class AunPlugin {
                     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 })) });
                     if (!uploadedRefs || uploadedItems !== items) {
                         uploadedItems = items;
                         uploadedRefs = refs;
@@ -873,32 +882,37 @@ class AunPlugin {
                         sending = true;
                         // message.send 失败时可能已送达，不自动重试或降级明文，避免重复发送和泄露引用。
                         await client.call("message.send", { to: message.peerId, payload, encrypt: true });
+                        this.context?.logger.info("AUN 附件消息已发送", { ...trace, stage: "发送附件消息", kind, count: group.length });
                         sending = false;
                         sent++;
                     }
                 }
                 catch (error) {
+                    deliveryFailed = true;
+                    const failure = sending ? new agent_1.AgentOperationError("AUN_ATTACHMENT_SEND_FAILED", "发送 AUN 附件消息（FS 上传已完成）", error) : error;
                     const progress = sending ? `（已确认发送 ${sent}/${groupsCount} 组，当前组结果未确认，请勿重复发送）` : "";
                     try {
-                        await this.sendText(aid, message.peerId, `附件回传失败${progress}：${safeError(error)}`, message.threadId);
+                        await this.sendText(aid, message.peerId, `附件回传失败${progress}：${safeError((0, agent_1.errorDetails)(failure))}`, message.threadId);
                     }
                     catch { /* 尽力反馈 */ }
-                    throw error;
+                    throw failure;
                 }
             },
         };
         try {
+            this.context?.logger.info("AUN 开始调用 Agent", { ...trace, stage: "调用 Agent" });
             await this.ingress.publish(channelMessage);
+            this.context?.logger.info("AUN 任务处理完成", { ...trace, stage: "回复已发送" });
         }
         catch (error) {
-            this.context?.logger.warn("AUN 消息处理失败", { error: safeError(error) });
-            if (!replyAttempted) {
+            this.context?.logger.warn("AUN 消息处理失败", { ...trace, stage: deliveryFailed ? "回传回复" : "执行 Agent 任务", error: safeError((0, agent_1.errorDetails)(error)) });
+            if (!deliveryFailed) {
                 const action = attachments.length > 0 ? "附件处理失败" : newSessionCommand.test(message.text.trim()) ? "新建会话失败" : "消息处理失败";
                 try {
-                    await channelMessage.reply(`${action}：${safeError(error)}`);
+                    await channelMessage.reply(`${action}：${safeError((0, agent_1.errorDetails)(error))}`);
                 }
                 catch (replyError) {
-                    this.context?.logger.warn("AUN 错误回复失败", { error: safeError(replyError) });
+                    this.context?.logger.warn("AUN 错误回复失败", { ...trace, stage: "发送最终错误消息", error: safeError((0, agent_1.errorDetails)(replyError)) });
                 }
             }
         }

package/package.json

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

package/plugin.json

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