agent-bridge-aun 1.0.49 → 1.0.50

package/README.md

@@ -23,7 +23,7 @@ mab aun repair-old-aids --json
 
 安装后在 ABWeb 的插件管理中启动 AUN 通道。收到的 AID 消息仅投递给用户在 AUN 身份页中明确关联的 Agent；未关联的 AID 消息会被忽略。旧配置中的 `agent_plugin` 字段不再作为默认路由。配置字段 `owner_aid` 是可选字符串，用作默认 Owner。AID 创建接口为 `POST /api/plugins/aun/aid`，请求内容为 `{"aid":"新AID.agentid.cn","owner_aid":"所有者AID.agentid.cn"}`。
 
-创建调用 SDK 0.5.31 的 `register(aid, { type: "agent", owner })`。注册、连接成功与 Owner 双边共识是不同状态；Owner 声明仍可能为 `single_sided/pending`，不能把“已创建”解释为归属已激活。创建后尝试把新 AID 加入 Owner 名录，默认 `allow_pa_use: true`；只有本地拥有 Owner 私钥且 Storage 可用时才能同步，失败通过 `directorySync` 单独返回。Gateway 信任根使用随插件提供并校验指纹的 AUN 根证书，不从 Gateway 下载未经验证的 CA 链。
+创建调用 SDK 0.5.31 的 `register(aid, { type: "agent", owner })`。注册、连接成功与 Owner 双边共识是不同状态；Owner 声明仍可能为 `single_sided/pending`，不能把“已创建”解释为归属已激活。创建后先读取新鲜签名归属；关联请求已送达但 Owner 尚未确认时，接口返回 `202`、`status: "等待 Owner 确认"`，页面和 CLI 仅给普通提醒，日志为 `info`，不重复注册或发送邀请，也不尝试用 Owner 公钥登录。仅共识成立后尝试把新 AID 加入 Owner 名录，默认 `allow_pa_use: true`；只有本地拥有 Owner 私钥且 Storage 可用时才能同步，失败通过 `directorySync` 单独返回。Gateway 信任根使用随插件提供并校验指纹的 AUN 根证书，不从 Gateway 下载未经验证的 CA 链。
 
 核心支持插件命令后，可运行 `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 <aid>`。关联或解绑只修改指定 AID，不会影响同一 Agent 下的其它 AID，也不会写入 Agent 全局 AID 配置。`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 查询会在终端显示当前值。
 

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

@@ -31,7 +31,7 @@ const ownership_1 = require("./ownership");
 const sdk_loader_1 = require("./sdk-loader");
 const owned_profiles_1 = require("./owned-profiles");
 const manifest = {
-    id: "aun", version: "1.0.49", type: "channel", displayName: "AUN 通道",
+    id: "aun", version: "1.0.50", 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",
@@ -332,6 +332,7 @@ class AunPlugin {
                     this.context?.logger.info("AUN 身份已创建", { aid });
                 }
                 const connectionError = !this.clients.has(aid) ? await this.connectAid(aid) : undefined;
+                let status = "已创建";
                 let directorySync;
                 try {
                     await this.syncOwnerDirectory(aid, owner);
@@ -339,10 +340,17 @@ class AunPlugin {
                     this.context?.logger.info("AUN 新 AID 已加入 Owner 名录", { aid });
                 }
                 catch (error) {
-                    directorySync = { status: "not_synced", error: safeError(error) };
-                    this.context?.logger.warn("AUN AID 已创建，但 Owner 名录未同步", { aid, error: directorySync.error });
+                    if (error instanceof fs_1.AunFsError && error.code === "OWNERSHIP_PENDING") {
+                        status = "等待 Owner 确认";
+                        directorySync = { status: "not_synced" };
+                        this.context?.logger.info("AUN AID 已创建并连接，关联请求已发送，等待 Owner 确认", { aid });
+                    }
+                    else {
+                        directorySync = { status: "not_synced", error: safeError(error) };
+                        this.context?.logger.warn("AUN AID 已创建，但 Owner 名录未同步", { aid, error: directorySync.error });
+                    }
                 }
-                return { aid, status: "已创建", connection: this.clients.has(aid) ? "ready" : "degraded", ...(connectionError ? { connectionError } : {}), directorySync };
+                return { aid, status, connection: this.clients.has(aid) ? "ready" : "degraded", ...(connectionError ? { connectionError } : {}), directorySync };
             }
             finally {
                 this.creating = false;
@@ -464,12 +472,25 @@ class AunPlugin {
     async syncOwnerDirectory(aid, ownerAid) {
         if (aid === ownerAid)
             throw new Error("新 AID 与 Owner AID 相同，未写入 Owner 名录");
+        const subClient = this.clients.get(aid)?.client;
+        if (this.store?.resolve && subClient?.checkOwnershipConsensus) {
+            const verified = await (0, ownership_1.readAunOwnership)(this.store, subClient, aid);
+            if (verified.declaredOwner !== ownerAid)
+                throw new fs_1.AunFsError("OWNERSHIP_CONFLICT", "指定 Owner 与已验签的现有 Owner 不同，未同步名录");
+            if (verified.ownership.status === "single_sided")
+                throw new fs_1.AunFsError("OWNERSHIP_PENDING", "关联请求已发送，等待 Owner 确认；确认前暂不加入通信名录，请勿重复创建 AID");
+            if (verified.ownership.status !== "consensus")
+                throw new fs_1.AunFsError("OWNERSHIP_UNAVAILABLE", `Owner 归属尚未核验完成（${verified.ownership.status}），未同步名录`);
+        }
         let client = this.ownerClients.get(ownerAid)?.client ?? this.clients.get(ownerAid)?.client;
         let temporary = false;
         if (!client) {
             const loaded = this.store?.load(ownerAid);
             if (!loaded?.ok || !loaded.data)
                 throw new Error("Owner AID 不在本地密钥库，AID 已创建但无法同步 Owner 名录");
+            // SDK load() 成功也可能只有公钥证书；list() 只返回持有有效私钥的身份。
+            if (!this.listStoreAids().includes(ownerAid))
+                throw new Error("本机没有 Owner 的有效私钥，AID 已创建但无法在本机同步 Owner 名录");
             await this.prepareTrustRoots(ownerAid);
             const trusted = this.store?.load(ownerAid);
             if (!trusted?.ok || !trusted.data)
@@ -1618,8 +1639,8 @@ class AunPlugin {
             let task;
             let operationError;
             if (verified.ownership.status !== "consensus") {
-                const local = this.store?.load(ownerAid);
-                const connectedOwner = this.clients.get(ownerAid)?.client;
+                const local = this.listStoreAids().includes(ownerAid) ? this.store?.load(ownerAid) : undefined;
+                const connectedOwner = this.ownerClients.get(ownerAid)?.client ?? this.clients.get(ownerAid)?.client;
                 let temporary;
                 try {
                     if (connectedOwner || local?.ok && local.data) {
@@ -1766,7 +1787,7 @@ class AunPlugin {
             await this.requireAgent(agent);
         }
         const created = await this.createIdentity(aid, owner);
-        const data = { created: true, aid, connection: created.connection ?? "ready", directorySync: created.directorySync };
+        const data = { created: true, aid, connection: created.connection ?? "ready", directorySync: created.directorySync, ...(created.status === "等待 Owner 确认" ? { status: created.status } : {}) };
         if (created.connection !== "ready")
             throw new AunCommandError("AID 已创建，但连接失败；请先执行 mab aun list 确认，不要重试创建", 502, { ...data, connectionError: created.connectionError });
         if (agent) {
@@ -1779,9 +1800,10 @@ class AunPlugin {
             }
         }
         return {
-            message: created.directorySync?.status === "not_synced"
-                ? `AID 已创建${agent ? `并关联到 ${agent}` : "并连接"}，但 Owner 名录未同步：${created.directorySync.error ?? "原因未知"}`
-                : agent ? `AID 已创建并关联到 ${agent}` : "AID 已创建并连接",
+            message: created.status === "等待 Owner 确认" ? `AID 已创建并连接${agent ? `并关联到 ${agent}` : ""}，关联请求已发送，等待 Owner 确认`
+                : created.directorySync?.status === "not_synced"
+                    ? `AID 已创建${agent ? `并关联到 ${agent}` : "并连接"}，但 Owner 名录未同步：${created.directorySync.error ?? "原因未知"}`
+                    : agent ? `AID 已创建并关联到 ${agent}` : "AID 已创建并连接",
             data: { ...data, ...(agent ? { agent } : {}) },
         };
     }

package/dist/src-ts/plugins/aun/public/app.js

@@ -73,14 +73,16 @@
     show("正在创建 AID 并连接，请稍候……");
     void request("/api/plugins/aun/aid", "POST", { aid, ownerAid: owner }).then((result) => {
       const failed = result.connection === "degraded";
-      const directoryFailed = result.directorySync?.status === "not_synced";
+      const pending = result.status === "等待 Owner 确认";
+      const directoryFailed = !pending && result.directorySync?.status === "not_synced";
       const message = [
         failed ? `${aid} 已创建，但连接失败：${result.connectionError || "未提供连接失败原因，请查看运行日志"}\n身份已经保存在本地，请勿重复注册。`
-          : result.status === "等待 Owner 确认" ? `${aid} 等待 Owner 确认` : `${aid} 已创建并连接`,
-        directoryFailed ? `Owner 名录未同步：${result.directorySync.error || "原因未知"}`
+          : `${aid} 已创建并连接`,
+        pending ? "关联请求已发送，等待 Owner 确认；确认前暂不加入通信名录，请勿重复创建 AID。"
+          : directoryFailed ? `Owner 名录未同步：${result.directorySync.error || "原因未知"}`
           : result.directorySync?.status === "synced" ? "已加入 Owner 名录，个人助理可按默认权限使用该联系人。" : "Owner 名录同步状态未知，请查看运行日志。",
       ].join("\n");
-      notify(failed || directoryFailed ? "AID 创建完成，部分步骤失败" : "AID 创建结果", message, failed || directoryFailed);
+      notify(failed || directoryFailed ? "AID 创建完成，部分步骤失败" : pending ? "等待 Owner 确认" : "AID 创建结果", message, failed || directoryFailed);
       return load();
     }).catch((error) => notify("创建 AID 失败", errorMessage(error), true));
   };

package/package.json

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

package/plugin.json

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