agent-bridge-aun 1.0.34 → 1.0.36

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/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/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,16 +9,35 @@ 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.34", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.36", 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] : []);
+}
+function withAttachmentDownloadLinks(text, kind, refs) {
+    if (kind !== "image")
+        return text;
+    const links = attachmentDownloadLinks(refs);
+    if (!links.length)
+        return text;
+    return `${text || "图片已生成。"}\n图片下载链接（预览不可用时）：\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)");
@@ -80,6 +99,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]);
@@ -124,7 +197,7 @@ 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")
@@ -140,6 +213,14 @@ class AunPlugin {
                 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 });
+                }
                 this.identities.add(aid);
                 if (!connection)
                     await this.connectAid(aid);
@@ -663,16 +744,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 });
@@ -690,6 +762,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))
@@ -895,6 +978,8 @@ class AunPlugin {
                 let sent = 0;
                 let groupsCount = 0;
                 let sending = false;
+                let fallbackText;
+                let fallbackLinks = [];
                 try {
                     if (!client?.storage)
                         throw new Error("AUN SDK 不支持附件存储接口");
@@ -913,14 +998,19 @@ 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);
+                        const payload = { type: kind, 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 client.call("message.send", { 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++;
@@ -930,8 +1020,9 @@ class AunPlugin {
                     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;
@@ -956,7 +1047,7 @@ 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;
@@ -965,7 +1056,7 @@ class AunPlugin {
             await this.clients.get(aid).client.call("message.send", params);
         }
         catch (error) {
-            if (!this.isE2eeError(error))
+            if (encryptedOnly || !this.isE2eeError(error))
                 throw error;
             await this.clients.get(aid).client.call("message.send", { ...params, encrypt: false });
         }

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.34",
+  "version": "1.0.36",
   "description": "mu-agent-bridge 的 AUN 通道插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugin.json

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