agent-bridge-aun 1.0.21 → 1.0.22

package/README.md

@@ -2,14 +2,14 @@
 
 `agent-bridge-aun` 为 mu-agent-bridge 提供 AUN 消息通道，支持使用已有 AID 或通过管理 API 注册 AID，并将收到的文本交给指定 Agent 插件处理。
 
-安装后在 ABWeb 的插件管理中启动 AUN 通道。配置 `aid` 和可选的 `agent_plugin`；默认 Agent 插件为 `qwenwork`。AID 创建接口为 `POST /api/plugins/aun/aid`，请求内容为 `{"aid":"新AID.agentid.cn","owner_aid":"所有者AID.agentid.cn"}`。
+安装后在 ABWeb 的插件管理中启动 AUN 通道。配置 `aid` 和可选的 `agent_plugin`；默认 Agent 插件为 `qwenwork`。配置字段 `owner_aid` 是可选字符串，用作默认 Owner。AID 创建接口为 `POST /api/plugins/aun/aid`，请求内容为 `{"aid":"新AID.agentid.cn","owner_aid":"所有者AID.agentid.cn"}`。
 
 创建使用 SDK 的兼容注册流程；Owner AID 只保存为本地归属配置，不代表 AUN 协议 Owner 关系已签名或激活。Gateway 信任根使用随插件提供并校验指纹的 AUN 根证书，不从 Gateway 下载未经验证的 CA 链。
 
-核心支持插件命令后，可运行 `mab aun status`、`mab aun list`、`mab aun agents`、`mab aun create <aid> --owner <owner-aid> [--agent <plugin-id>]`、`mab aun bind <aid> <plugin-id>` 和 `mab aun unbind <plugin-id>`。Agent 从当前已就绪的插件动态发现。创建后连接或关联失败时，响应会标明 AID 已创建；先用 `mab aun list` 检查，不要重试创建。命令不会记录原始参数或 Owner AID。
+核心支持插件命令后，可运行 `mab aun status`、`mab aun list`、`mab aun agents`、`mab aun default-owner`、`mab aun default-owner set <owner-aid>`、`mab aun create <aid> [--owner <owner-aid>] [--agent <plugin-id>]`、`mab aun bind <aid> <plugin-id>` 和 `mab aun unbind <plugin-id>`。`default-owner` 不带参数显示当前配置，`default-owner set <owner-aid>` 校验格式并持久化新的默认值。`create` 明确传入 `--owner` 时优先使用该值；省略时回退到同一配置中的 `owner_aid`，两者都没有时返回错误，不会创建 AID。创建新身份时，实际使用的 Owner 会保存为下次默认值。ABWeb 从同一插件配置读取 `owner_aid` 并预填创建表单，因此 CLI 和 ABWeb 共用默认 Owner。Agent 从当前已就绪的插件动态发现。创建后连接或关联失败时，响应会标明 AID 已创建；先用 `mab aun list` 检查，不要重试创建。运行日志不记录原始参数或 Owner AID；默认 Owner 查询会在终端显示当前值。
 
 该插件依赖 `@agentunion/fastaun`，要求 Node.js 22.16 或更高版本。
 
-ABWeb 的 AUN 设置只展示已连接 AID，并按来源分组。插件通过 SDK 密钥库枚举 AID，再逐个建立连接；只有连接成功的身份才会显示。EvolCore 来源身份只用于连接状态检测，不订阅消息，避免重复收信；本工程创建的身份负责消息收发。连接状态检测不调用 `ec agent list/show`。将 EvolCore 身份关联到 Agent 时仍使用既有 `ec agent set/reload` 路由配置，该配置不参与连接状态检测。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。
+ABWeb 的 AUN 设置只展示已连接 AID，并按来源分组。成功注册并记录在插件 `created_aids` 中的 AID 属于本工程；共享密钥库中其余 AID 属于 EvolCore。旧版 `created-aids.json` 记录继续兼容。来源只用于展示，连接和关联由 AUN 插件直接管理。列表先显示已关联 Agent 的身份，各组按最近成功关联的时间倒序排列，时间相同或旧记录没有时间时按 AID 名称排序。关联时间保存在插件配置的 `binding_times` 中，刷新或重启后保留；旧记录不补造时间，再次关联成功后开始记录。
 
 AUN 独立包支持核心后台每五分钟检测更新；可信提供者在自动安装策略下会下载新副本并重载通道。

package/config.schema.json

@@ -2,6 +2,7 @@
   "type": "object",
   "properties": {
     "identities": { "type": "array", "items": { "type": "string" } },
+    "created_aids": { "type": "array", "items": { "type": "string" } },
     "bindings": { "type": "object", "additionalProperties": { "type": "string" } },
     "binding_times": { "type": "object", "additionalProperties": { "type": "string" } },
     "aid": { "type": "string", "minLength": 1 },

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

@@ -10,12 +10,13 @@ const node_os_1 = require("node:os");
 const node_url_1 = require("node:url");
 const messages_1 = require("./messages");
 const manifest = {
-    id: "aun", version: "1.0.21", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.22", 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]+)?$/;
 async function loadSdk() {
     const resolver = (0, node_module_1.createRequire)(__filename);
     const dynamicImport = new Function("url", "return import(url)");
@@ -36,7 +37,8 @@ const cliCommands = [
     { name: "status", summary: "查看 AUN 通道状态", usage: "mab aun status" },
     { name: "list", summary: "查看已连接 AID 和 Agent 关联", usage: "mab aun list" },
     { name: "agents", summary: "列出当前已就绪的 Agent 插件", usage: "mab aun agents" },
-    { name: "create", summary: "创建并连接 AID，可选关联 Agent", usage: "mab aun create <aid> --owner <owner-aid> [--agent <plugin-id>]", examples: ["mab aun create new.agentid.cn --owner owner.agentid.cn --agent qwenwork"] },
+    { name: "default-owner", summary: "查询或设置默认 Owner AID", usage: "mab aun default-owner [set <owner-aid>]", examples: ["mab aun default-owner", "mab aun default-owner set owner.agentid.cn"] },
+    { name: "create", summary: "创建并连接 AID，可选关联 Agent", usage: "mab aun create <aid> [--owner <owner-aid>] [--agent <plugin-id>]", examples: ["mab aun create new.agentid.cn --owner owner.agentid.cn --agent qwenwork"] },
     { name: "bind", summary: "将 AID 关联到 Agent", usage: "mab aun bind <aid> <plugin-id>", examples: ["mab aun bind new.agentid.cn qwenwork"] },
     { name: "unbind", summary: "解除 Agent 与 AID 的关联", usage: "mab aun unbind <plugin-id>", examples: ["mab aun unbind qwenwork"] },
 ];
@@ -58,6 +60,7 @@ class AunPlugin {
     clients = new Map();
     identities = new Set();
     legacyCreatedAids = new Set();
+    createdAids = new Set();
     bindings = {};
     bindingTimes = {};
     creating = false;
@@ -75,10 +78,11 @@ class AunPlugin {
     }
     identity = {
         list: async () => {
+            const own = new Set([...this.createdAids, ...this.legacyCreatedAids]);
             return {
-                evolcore: [],
-                muAgentBridge: [...this.clients.keys()].sort(),
-                localMuAgentBridge: [...this.identities].filter((aid) => !this.clients.has(aid)).sort(),
+                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(),
             };
         },
         create: async (aid, owner) => {
@@ -95,6 +99,8 @@ class AunPlugin {
                         const result = await this.store.register(aid);
                         if (!result.ok)
                             throw new Error(redact(result.error?.message ?? result.error?.code ?? "AID 注册失败"));
+                        this.createdAids.add(aid);
+                        await this.persist();
                     }
                     const loaded = this.store.load(aid);
                     if (!loaded.ok || !loaded.data)
@@ -180,6 +186,7 @@ class AunPlugin {
     };
     async persist() {
         this.config.identities = [...this.identities].sort();
+        this.config.created_aids = [...new Set([...this.createdAids, ...this.legacyCreatedAids])].sort();
         this.config.bindings = this.bindings;
         this.config.binding_times = this.bindingTimes;
         await (0, promises_1.writeFile)((0, node_path_1.join)(this.context.dataDir, "config.json"), `${JSON.stringify(this.config, null, 2)}\n`, { mode: 0o600 });
@@ -188,6 +195,7 @@ class AunPlugin {
         this.context = context;
         this.config = { ...context.config };
         this.legacyCreatedAids.clear();
+        this.createdAids.clear();
         try {
             const created = JSON.parse(await (0, promises_1.readFile)((0, node_path_1.join)(context.dataDir, "..", "created-aids.json"), "utf8"));
             if (Array.isArray(created))
@@ -199,6 +207,10 @@ class AunPlugin {
             if (error.code !== "ENOENT")
                 context.logger.warn("读取旧版身份创建记录失败", { error: safeError(error) });
         }
+        for (const aid of Array.isArray(this.config.created_aids) ? this.config.created_aids : []) {
+            if (typeof aid === "string" && aidPattern.test(aid))
+                this.createdAids.add(aid);
+        }
         for (const key of ["aid", "owner_aid", "aun_path", "encryption_seed", "root_ca_path", "allow_from", "agent_plugin"]) {
             if (this.config[key] !== undefined && typeof this.config[key] !== "string")
                 throw new Error(`${key} 必须是字符串`);
@@ -487,6 +499,8 @@ class AunPlugin {
             const agents = await this.agents();
             return { message: agents.length ? `当前已就绪的 Agent 插件：\n${agents.map((agent) => `${agent.id}（${agent.displayName}）`).join("\n")}` : "暂无已就绪的 Agent 插件", data: agents };
         }
+        if (command === "default-owner")
+            return this.defaultOwnerCommand(args);
         if (command === "create")
             return this.createCommand(args);
         if (command === "bind" && args.length === 2) {
@@ -522,10 +536,29 @@ class AunPlugin {
             }
             return { message: `已解除 ${pluginId} 的 AID 关联`, data: { agent: pluginId, unboundAids } };
         }
-        if (!["status", "list", "agents", "create", "bind", "unbind"].includes(command ?? ""))
+        if (!["status", "list", "agents", "default-owner", "create", "bind", "unbind"].includes(command ?? ""))
             throw new AunCommandError(`未知 AUN 命令：${command ?? ""}`);
         throw new AunCommandError(`AUN 命令参数无效：${command}`);
     }
+    async defaultOwnerCommand(args) {
+        const owner = typeof this.config.owner_aid === "string" ? this.config.owner_aid.trim() : "";
+        if (!args.length)
+            return { message: owner ? `默认 Owner：${owner}` : "未配置默认 Owner", data: { owner_aid: owner || undefined } };
+        if (args.length !== 2 || args[0] !== "set")
+            throw new AunCommandError("AUN 默认 Owner 命令参数无效");
+        const nextOwner = args[1].trim();
+        if (!aidPattern.test(nextOwner))
+            throw new AunCommandError("Owner AID 格式无效");
+        this.config.owner_aid = nextOwner;
+        try {
+            await this.persist();
+        }
+        catch (error) {
+            this.config.owner_aid = owner;
+            throw error;
+        }
+        return { message: "默认 Owner 已保存", data: { configured: true } };
+    }
     async createCommand(args) {
         const aid = args[0] ?? "";
         if (!aidPattern.test(aid))
@@ -544,8 +577,10 @@ class AunPlugin {
             else
                 throw new AunCommandError(`不支持的创建参数：${option}`);
         }
+        if (!owner)
+            owner = typeof this.config.owner_aid === "string" ? this.config.owner_aid.trim() : "";
         if (!owner || !aidPattern.test(owner))
-            throw new AunCommandError("需要有效的 --owner AID");
+            throw new AunCommandError("需要有效的 --owner AID，或先设置默认 Owner");
         if (agent) {
             this.validatePluginId(agent);
             await this.requireAgent(agent);
@@ -703,12 +738,14 @@ class AunPlugin {
         const message = (0, messages_1.normalizeAunMessage)(payload, aid, typeof this.config.allow_from === "string" ? this.config.allow_from : undefined);
         if (!message || !this.seen.add(message.messageId ? `${aid}:${message.messageId}` : ""))
             return;
+        let replyAttempted = false;
         const channelMessage = {
             channel: "aun", recipientId: aid, peerId: message.peerId, messageId: message.messageId, text: message.text, threadId: message.threadId,
             agentPlugin: this.bindings[aid] || (typeof this.config.agent_plugin === "string" && this.config.agent_plugin.trim() ? this.config.agent_plugin.trim() : "qwenwork"),
             reply: async (text) => {
                 if (!text.trim())
                     return;
+                replyAttempted = true;
                 const payload = { type: "text", text };
                 if (message.threadId)
                     payload.thread_id = message.threadId;
@@ -728,6 +765,14 @@ class AunPlugin {
         }
         catch (error) {
             this.context?.logger.warn("AUN 消息处理失败", { error: safeError(error) });
+            if (!replyAttempted && newSessionCommand.test(message.text.trim())) {
+                try {
+                    await channelMessage.reply(`新建会话失败：${safeError(error)}`);
+                }
+                catch (replyError) {
+                    this.context?.logger.warn("AUN 错误回复失败", { error: safeError(replyError) });
+                }
+            }
         }
     }
     isE2eeError(error) {

package/dist/src-ts/plugins/aun/public/index.html

@@ -6,7 +6,7 @@
     <header><h1>AUN 身份</h1><button id="refresh" type="button">刷新</button></header>
     <p id="status" role="status"></p>
     <div class="table-scroll"><table><thead><tr><th>AID</th><th>来源</th><th>已关联 Agent</th><th>操作</th></tr></thead><tbody id="identities"></tbody></table></div>
-    <form id="create-form"><h2>创建 AID</h2><div class="fields"><label>新 AID<input name="aid" required placeholder="例如：example.agentid.cn"></label><label>Owner AID<input name="ownerAid" required placeholder="例如：owner.agentid.cn（本地归属配置）"><small class="hint">Owner 保存为本地归属配置；不代表 AUN 协议中的 Owner 关系已激活。</small></label></div><button type="submit">创建</button></form>
+    <form id="create-form"><h2>创建 AID</h2><div class="fields"><label>新 AID<input name="aid" required placeholder="例如：example.agentid.cn"></label><label>Owner AID<input name="ownerAid" placeholder="例如：owner.agentid.cn"><small class="hint">留空时使用已配置的默认 Owner；未配置时需填写。Owner 保存为本地归属配置；不代表 AUN 协议中的 Owner 关系已激活。</small></label></div><button type="submit">创建</button></form>
     <form id="config-form"><h2>通道配置</h2><div class="fields"><label>默认 Agent<select name="agent_plugin"></select></label><label>允许的来源<input name="allow_from"></label><label>AUN 存储路径<input name="aun_path"></label><label>加密种子<input name="encryption_seed" type="password" autocomplete="new-password" placeholder="留空则不修改"></label></div><button type="submit">保存配置</button></form>
   </main>
   <script src="/abweb/channels/aun/app.js"></script>

package/package.json

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

package/plugin.json

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