agent-bridge-feishu 1.0.1 → 1.0.3

package/README.md

@@ -9,4 +9,8 @@
 
 也可以直接配置飞书开放平台应用的 `app_id` 和 `app_secret`。通过配置中的 `agent_plugin` 或管理界面的绑定功能指定目标 Agent。
 
+可以保存多个机器人。设置页按 App ID 显示每个机器人的连接状态和关联 Agent；每个机器人独立建立飞书长连接，消息和回复使用收到消息的同一机器人。旧版顶层 `app_id/app_secret` 会作为第一条机器人配置读取。不同机器人和 AUN 身份即使关联同一个 Agent，也使用各自的会话；通道会话列表可在 ABWeb 的「通信记录」中查看。
+
+保存后 App Secret 以密码掩码保留在输入框，刷新或重连无需再次复制。掩码仅代表后台已保存密钥，状态接口不会返回真实密钥。更换 App ID 时需要填写对应的新密钥。扫码授权完成后自动保存两项凭据并连接；连接失败会显示具体原因，不影响已保存的凭据。
+
 飞书应用需要开启机器人能力和接收消息事件权限。插件默认使用飞书中国区 API，可通过 `api_base` 指定其他区域地址。

package/config.schema.json

@@ -1,14 +1,61 @@
 {
   "type": "object",
   "properties": {
-    "app_id": { "type": "string" },
-    "app_secret": { "type": "string", "secret": true },
-    "agent_plugin": { "type": "string" },
-    "bindings": { "type": "object", "additionalProperties": { "type": "string" } },
-    "allow_from": { "type": "string" },
-    "allow_chats": { "type": "string" },
-    "ws_url": { "type": "string" },
-    "api_base": { "type": "string" }
+    "app_id": {
+      "type": "string"
+    },
+    "app_secret": {
+      "type": "string",
+      "secret": true
+    },
+    "agent_plugin": {
+      "type": "string"
+    },
+    "bindings": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "allow_from": {
+      "type": "string"
+    },
+    "allow_chats": {
+      "type": "string"
+    },
+    "ws_url": {
+      "type": "string"
+    },
+    "api_base": {
+      "type": "string"
+    },
+    "bots": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "app_id",
+          "app_secret"
+        ],
+        "properties": {
+          "app_id": {
+            "type": "string",
+            "minLength": 1
+          },
+          "app_secret": {
+            "type": "string",
+            "minLength": 1,
+            "secret": true
+          }
+        }
+      }
+    },
+    "binding_times": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    }
   },
   "additionalProperties": false
 }

package/dist/src-ts/plugins/feishu/client.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeishuClient = void 0;
 exports.parseFeishuEvent = parseFeishuEvent;
+const node_sdk_1 = require("@larksuiteoapi/node-sdk");
 const defaultTransport = { fetch, WebSocket };
 function parseFeishuEvent(input) {
     if (!input || typeof input !== "object")
@@ -33,6 +34,7 @@ class FeishuClient {
     config;
     transport;
     socket;
+    sdkClient;
     token = "";
     tokenExpires = 0;
     constructor(config, transport = defaultTransport) {
@@ -40,17 +42,47 @@ class FeishuClient {
         this.transport = transport;
     }
     async start(onMessage, signal) {
-        const url = this.config.ws_url ?? await this.endpoint();
-        const socket = new this.transport.WebSocket(url);
-        this.socket = socket;
-        await new Promise((resolve, reject) => {
-            socket.onopen = () => resolve();
-            socket.onerror = () => reject(new Error("飞书长连接失败"));
-        });
-        socket.onmessage = (event) => { void this.receive(String(event.data), onMessage); };
+        if (this.config.ws_url) {
+            const url = this.config.ws_url;
+            const socket = new this.transport.WebSocket(url);
+            this.socket = socket;
+            await new Promise((resolve, reject) => { socket.onopen = () => resolve(); socket.onerror = () => reject(new Error("飞书长连接失败")); });
+            socket.onmessage = (event) => { void this.receive(String(event.data), onMessage); };
+        }
+        else {
+            await this.startSdk(onMessage);
+        }
         signal?.addEventListener("abort", () => this.close(), { once: true });
     }
-    close() { this.socket?.close(); this.socket = undefined; }
+    close() { this.sdkClient?.close({ force: true }); this.sdkClient = undefined; this.socket?.close(); this.socket = undefined; }
+    async startSdk(onMessage) {
+        const dispatcher = new node_sdk_1.EventDispatcher({}).register({
+            "im.message.receive_v1": async (data) => { const event = parseFeishuEvent(data); if (event)
+                await onMessage(event); },
+        });
+        try {
+            await new Promise((resolve, reject) => {
+                const timer = setTimeout(() => { reject(new Error("飞书连接超时，请检查凭据及长连接订阅设置")); }, 20_000);
+                const finish = (error) => { clearTimeout(timer); if (error)
+                    reject(error);
+                else
+                    resolve(); };
+                const client = new node_sdk_1.WSClient({
+                    appId: this.config.app_id, appSecret: this.config.app_secret,
+                    ...(this.config.api_base ? { domain: this.apiBase() } : {}),
+                    loggerLevel: node_sdk_1.LoggerLevel.fatal,
+                    handshakeTimeoutMs: 10_000,
+                    onReady: () => finish(), onError: (error) => finish(error),
+                });
+                this.sdkClient = client;
+                void client.start({ eventDispatcher: dispatcher }).catch(finish);
+            });
+        }
+        catch (error) {
+            this.close();
+            throw error;
+        }
+    }
     async send(peerId, text, threadId) {
         const token = await this.accessToken();
         const body = { receive_id: peerId, msg_type: "text", content: JSON.stringify({ text }) };
@@ -83,16 +115,6 @@ class FeishuClient {
         if (event)
             await onMessage(event);
     }
-    async endpoint() {
-        const response = await this.transport.fetch(`${this.apiBase()}/open-apis/callback/ws/endpoint?app_id=${encodeURIComponent(this.config.app_id)}&app_secret=${encodeURIComponent(this.config.app_secret)}`);
-        if (!response.ok)
-            throw new Error(`获取飞书长连接地址失败：HTTP ${response.status}`);
-        const result = await response.json();
-        const url = result.data?.URL ?? result.data?.url;
-        if (result.code && result.code !== 0 || !url)
-            throw new Error(`获取飞书长连接地址失败：${result.msg ?? "响应无 URL"}`);
-        return url;
-    }
     async accessToken() {
         if (this.token && Date.now() < this.tokenExpires)
             return this.token;

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

@@ -5,35 +5,31 @@ const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const qrcode_1 = require("qrcode");
 const client_1 = require("./client");
-const manifest = { id: "feishu", version: "1.0.1", type: "channel", displayName: "飞书通道", entry: "dist/src-ts/plugins/feishu/index.js", apiVersion: "1", process: "in-process", capabilities: ["channel", "channel.bot.setup", "channel.receive", "channel.send", "health"], configSchema: "config.schema.json", managementPage: "/abweb/channels/feishu" };
+const manifest = { id: "feishu", version: "1.0.3", type: "channel", displayName: "飞书通道", entry: "dist/src-ts/plugins/feishu/index.js", apiVersion: "1", process: "in-process", capabilities: ["channel", "channel.bot.setup", "channel.receive", "channel.send", "health"], configSchema: "config.schema.json", managementPage: "/abweb/channels/feishu" };
 class FeishuPlugin {
     options;
     manifest = manifest;
     context;
-    client;
     ingress;
     config = {};
     bindings = {};
     status = "degraded";
     message = "尚未配置飞书机器人";
     unregister = [];
+    bots = [];
+    clients = new Map();
+    botStates = new Map();
+    bindingTimes = {};
     seen = new Set();
     constructor(options = {}) {
         this.options = options;
-        this.client = options.client;
         this.ingress = options.ingress;
     }
     identity = {
-        list: async () => ({ evolcore: [], muAgentBridge: this.config.app_id ? [String(this.config.app_id)] : [], localMuAgentBridge: [] }),
+        list: async () => ({ evolcore: [], muAgentBridge: this.bots.filter((bot) => this.botStates.get(bot.app_id)?.status === "ready").map((bot) => bot.app_id), localMuAgentBridge: [] }),
         create: async (aid) => { if (!aid.trim())
             throw new Error("机器人标识不能为空"); return { aid, status: "请通过配置接口提供 app_id 和 app_secret" }; },
-        bind: async (pluginId, aid) => { if (pluginId === "feishu" || pluginId === "abweb")
-            throw new Error("只能关联 Agent 插件"); if (aid && aid !== this.config.app_id)
-            throw new Error("飞书机器人标识不存在"); if (this.context?.pluginStatus(pluginId) !== "ready")
-            throw new Error("目标 Agent 插件未启动"); if (aid)
-            this.bindings[String(aid)] = pluginId;
-        else
-            delete this.bindings[String(this.config.app_id)]; await this.persist(); },
+        bind: async (pluginId, aid) => { await this.bindBot(aid || String(this.config.app_id || ""), aid ? pluginId : ""); },
     };
     async activate(context) {
         this.context = context;
@@ -56,36 +52,52 @@ class FeishuPlugin {
         }
         this.validate();
         this.bindings = this.config.bindings && typeof this.config.bindings === "object" ? { ...this.config.bindings } : {};
-        if (!this.config.app_id || !this.config.app_secret)
-            return;
-        this.client ??= new client_1.FeishuClient(this.config);
-        try {
-            await this.client.start((event) => this.onMessage(event));
-            this.status = "ready";
-            this.message = "已连接";
-        }
-        catch (error) {
-            this.status = "degraded";
-            this.message = error instanceof Error ? error.message : String(error);
-            context.logger.warn("飞书通道连接失败", { error: this.message });
+        this.bots = Array.isArray(this.config.bots) ? this.config.bots.map((bot) => ({ ...bot })) : [];
+        if (this.config.app_id && this.config.app_secret && !this.bots.some((bot) => bot.app_id === this.config.app_id))
+            this.bots.unshift({ app_id: this.config.app_id, app_secret: this.config.app_secret });
+        const ids = new Set();
+        for (const bot of this.bots) {
+            if (!bot || typeof bot.app_id !== "string" || !bot.app_id.trim() || typeof bot.app_secret !== "string" || !bot.app_secret.trim() || ids.has(bot.app_id))
+                throw new Error("机器人凭据无效或 App ID 重复");
+            ids.add(bot.app_id);
         }
+        this.bindingTimes = { ...(this.config.binding_times || {}) };
+        this.botStates.clear();
+        await Promise.all(this.bots.map(async (bot) => {
+            const client = this.options.clientFactory?.(bot) ?? this.options.client ?? new client_1.FeishuClient({ ...this.config, ...bot });
+            this.clients.set(bot.app_id, client);
+            try {
+                await client.start((event) => this.onMessage(event, bot.app_id));
+                this.botStates.set(bot.app_id, { status: "ready", message: "已连接" });
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                client.close();
+                this.botStates.set(bot.app_id, { status: "degraded", message });
+                context.logger.warn("飞书通道连接失败", { appId: bot.app_id, error: message });
+            }
+        }));
+        this.status = this.bots.length && this.bots.every((bot) => this.botStates.get(bot.app_id)?.status === "ready") ? "ready" : "degraded";
+        this.message = this.status === "ready" ? "已连接" : [...this.botStates.values()].find((state) => state.status !== "ready")?.message || "尚未配置飞书机器人";
     }
-    async deactivate(_reason) { this.client?.close(); for (const dispose of this.unregister.splice(0))
+    async deactivate(_reason) { for (const client of this.clients.values())
+        client.close(); this.clients.clear(); for (const dispose of this.unregister.splice(0))
         dispose(); this.status = "degraded"; this.context = undefined; }
     async health() { return { status: this.status, message: this.message, details: { appId: this.config.app_id || undefined, bindings: this.bindings } }; }
     async handle(_request) { throw new Error("飞书是入站通道插件"); }
-    async onMessage(event) {
+    async onMessage(event, appId) {
         const allowedFrom = this.csv("allow_from");
         const allowedChats = this.csv("allow_chats");
         if (allowedFrom.length && !allowedFrom.includes(event.peerId) || allowedChats.length && (!event.chatId || !allowedChats.includes(event.chatId)))
             return;
-        if (this.seen.has(event.messageId))
+        const key = JSON.stringify([appId, event.messageId]);
+        if (this.seen.has(key))
             return;
-        this.seen.add(event.messageId);
+        this.seen.add(key);
         if (this.seen.size > 10000)
             this.seen.delete(this.seen.values().next().value);
-        const channelMessage = { channel: "feishu", peerId: event.peerId, messageId: event.messageId, text: event.text, threadId: event.threadId, agentPlugin: this.bindings[String(this.config.app_id)] ?? this.config.agent_plugin ?? "qwenwork", reply: async (text) => { if (text.trim())
-                await this.client?.send(event.peerId, text, event.threadId); } };
+        const channelMessage = { channel: "feishu", recipientId: appId, chatId: event.chatId, peerId: event.peerId, messageId: event.messageId, text: event.text, threadId: event.threadId, agentPlugin: this.bindings[appId] ?? this.config.agent_plugin ?? "qwenwork", reply: async (text) => { if (text.trim())
+                await this.clients.get(appId)?.send(event.peerId, text, event.threadId); } };
         try {
             await this.ingress.publish(channelMessage);
         }
@@ -97,23 +109,54 @@ class FeishuPlugin {
         if (this.config[key] !== undefined && typeof this.config[key] !== "string")
             throw new Error(`${key} 必须是字符串`); }
     csv(key) { return String(this.config[key] ?? "").split(",").map((value) => value.trim()).filter(Boolean); }
-    async persist() { await (0, promises_1.mkdir)(this.context.dataDir, { recursive: true }); this.config.bindings = this.bindings; await (0, promises_1.writeFile)((0, node_path_1.join)(this.context.dataDir, "config.json"), `${JSON.stringify(this.config, null, 2)}\n`, { mode: 0o600 }); }
-    setupStatus = async (_request, response) => { this.json(response, 200, { app_id: this.config.app_id || "", configured: Boolean(this.config.app_id && this.config.app_secret), status: this.status, message: this.message, bindings: this.bindings, agent_plugin: this.config.agent_plugin || "", allow_from: this.config.allow_from || "", allow_chats: this.config.allow_chats || "" }); };
+    async persist() { await (0, promises_1.mkdir)(this.context.dataDir, { recursive: true }); this.config.bindings = this.bindings; this.config.bots = this.bots; 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 }); }
+    setupStatus = async (_request, response) => { this.json(response, 200, { app_id: this.config.app_id || "", configured: Boolean(this.config.app_id && this.config.app_secret), status: this.status, message: this.message, bots: this.bots.map((bot) => ({ app_id: bot.app_id, configured: true, ...(this.botStates.get(bot.app_id) || { status: "degraded", message: "等待连接" }), pluginId: this.bindings[bot.app_id] || "", binding_time: this.bindingTimes[bot.app_id] || "" })), bindings: this.bindings, agent_plugin: this.config.agent_plugin || "", allow_from: this.config.allow_from || "", allow_chats: this.config.allow_chats || "" }); };
     bindAgent = async (request, response) => {
         try {
             const body = await this.readJson(request);
             const pluginId = typeof body.pluginId === "string" ? body.pluginId.trim() : "";
-            if (!this.config.app_id || !pluginId)
-                return this.json(response, 400, { error: "请先配置机器人并选择 Agent" });
-            await this.identity.bind(pluginId, String(this.config.app_id), 0);
-            this.context?.logger.info("飞书 Agent 已关联", { appId: this.config.app_id, pluginId });
-            this.json(response, 200, { ok: true, app_id: this.config.app_id, pluginId });
+            const appId = typeof body.app_id === "string" ? body.app_id.trim() : String(this.config.app_id || "");
+            await this.bindBot(appId, pluginId);
+            this.json(response, 200, { ok: true, app_id: appId, pluginId });
         }
         catch (error) {
             this.context?.logger.warn("飞书 Agent 关联失败", { error: error instanceof Error ? error.message : String(error) });
             this.json(response, 400, { error: error instanceof Error ? error.message : String(error) });
         }
     };
+    async bindBot(appId, pluginId) {
+        if (!this.bots.some((bot) => bot.app_id === appId))
+            throw new Error("飞书机器人标识不存在");
+        if (pluginId && (["aun", "feishu", "abweb"].includes(pluginId) || this.context?.pluginStatus(pluginId) !== "ready"))
+            throw new Error("目标 Agent 插件未启动或类型无效");
+        const previous = { ...this.bindings };
+        const times = { ...this.bindingTimes };
+        if (pluginId) {
+            this.bindings[appId] = pluginId;
+            this.bindingTimes[appId] = new Date().toISOString();
+        }
+        else {
+            delete this.bindings[appId];
+            delete this.bindingTimes[appId];
+        }
+        try {
+            await this.persist();
+        }
+        catch (error) {
+            this.bindings = previous;
+            this.bindingTimes = times;
+            throw error;
+        }
+        this.context?.logger.info("飞书 Agent 关联已更新", { appId, pluginId });
+    }
+    saveBot(appId, appSecret) {
+        const index = this.bots.findIndex((bot) => bot.app_id === appId);
+        if (index < 0)
+            this.bots.push({ app_id: appId, app_secret: appSecret });
+        else
+            this.bots[index] = { ...this.bots[index], app_secret: appSecret };
+        this.config = { ...this.config, app_id: appId, app_secret: appSecret };
+    }
     servePage = async (request, response) => {
         const path = new URL(request.url ?? "/", "http://localhost").pathname;
         const file = path.endsWith("/app.js") ? "app.js" : path.endsWith("/style.css") ? "style.css" : "index.html";
@@ -128,19 +171,23 @@ class FeishuPlugin {
             this.json(response, 503, { error: "飞书设置页面资源不可用" });
         }
     };
-    configureBot = async (request, response) => { let raw = ""; for await (const chunk of request)
-        raw += Buffer.isBuffer(chunk) ? chunk.toString("utf8") : String(chunk); let body; try {
-        body = JSON.parse(raw || "{}");
-    }
-    catch {
-        response.statusCode = 400;
-        response.end(JSON.stringify({ error: "JSON 请求格式无效" }));
-        return;
-    } if (typeof body.app_id !== "string" || typeof body.app_secret !== "string" || !body.app_id.trim() || !body.app_secret.trim()) {
-        response.statusCode = 400;
-        response.end(JSON.stringify({ error: "app_id 和 app_secret 必填" }));
-        return;
-    } this.config = { ...this.config, ...body }; await this.persist(); response.statusCode = 200; response.setHeader("content-type", "application/json; charset=utf-8"); response.end(JSON.stringify({ app_id: body.app_id, status: "已保存，重载插件后连接" })); };
+    configureBot = async (request, response) => {
+        try {
+            const body = await this.readJson(request);
+            const appId = typeof body.app_id === "string" ? body.app_id.trim() : "";
+            const providedSecret = typeof body.app_secret === "string" ? body.app_secret.trim() : "";
+            const appSecret = providedSecret || (this.bots.find((bot) => bot.app_id === appId)?.app_secret || "");
+            if (!appId || !appSecret)
+                return this.json(response, 400, { error: "新机器人需要同时提供 App ID 和 App Secret" });
+            this.saveBot(appId, appSecret);
+            await this.persist();
+            this.context?.logger.info("飞书机器人凭据已保存", { appId });
+            this.json(response, 200, { app_id: appId, status: "已保存，重载插件后连接" });
+        }
+        catch (error) {
+            this.json(response, 400, { error: error instanceof Error ? error.message : String(error) });
+        }
+    };
     configureSettings = async (request, response) => {
         try {
             const body = await this.readJson(request);
@@ -170,7 +217,7 @@ class FeishuPlugin {
             const url = new URL(result.verification_uri_complete);
             if (url.protocol !== "https:")
                 throw new Error("飞书授权 URL 必须使用 HTTPS");
-            this.json(response, 200, { device_code: result.device_code, url: url.href, qr_url: url.href, qr_image: await (0, qrcode_1.toDataURL)(url.href, { width: 256, margin: 4 }), interval: Number(result.interval ?? 5), expires_in: Number(result.expire_in ?? 600) });
+            this.json(response, 200, { device_code: result.device_code, url: url.href, qr_url: url.href, qr_image: await (0, qrcode_1.toDataURL)(url.href, { width: 256, margin: 4 }), interval: Number(result.interval ?? 5), expires_in: Number(result.expires_in ?? result.expire_in ?? 600) });
         }
         catch (error) {
             this.json(response, 502, { error: error instanceof Error ? error.message : String(error) });
@@ -187,8 +234,9 @@ class FeishuPlugin {
             const appId = typeof result.client_id === "string" ? result.client_id : "";
             const appSecret = typeof result.client_secret === "string" ? result.client_secret : "";
             if (appId && appSecret) {
-                this.config = { ...this.config, app_id: appId, app_secret: appSecret };
+                this.saveBot(appId, appSecret);
                 await this.persist();
+                this.context?.logger.info("飞书授权凭据已自动保存", { appId });
                 return this.json(response, 200, { status: "completed", app_id: appId, owner_open_id: user?.open_id });
             }
             const errorCode = typeof result.error === "string" ? result.error : "";

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

@@ -7,57 +7,95 @@
   const authQr = find("#authorization-qr");
   const authUrl = find("#authorization-url");
   const credentials = find("#credentials");
-  const binding = find("#binding");
+  const botTable = find("#bots");
+  let bots = [];
+  let loading = false;
   const settings = find("#settings");
   let pollTimer;
   let setup = 0;
+  let savedAppId = "";
+  let secretMasked = false;
+  const authorizationKey = "mab-feishu-authorization";
 
   async function request(path, method = "GET", body) {
     const token = localStorage.getItem("mab-login-token");
-    const response = await fetch(path, { method, headers: { ...(token ? { authorization: `Bearer ${token}` } : {}), ...(body ? { "content-type": "application/json" } : {}) }, ...(body ? { body: JSON.stringify(body) } : {}) });
+    const response = await fetch(path, { method, signal: AbortSignal.timeout(30_000), headers: { ...(token ? { authorization: `Bearer ${token}` } : {}), ...(body ? { "content-type": "application/json" } : {}) }, ...(body ? { body: JSON.stringify(body) } : {}) });
     const result = await response.json();
     if (!response.ok) throw new Error(result.error || `请求失败：${response.status}`);
     return result;
   }
   function show(message, failed = false) { notice.textContent = message; notice.className = failed ? "error" : ""; }
-  async function load() {
+  async function load(refreshForm = true) {
+    if (loading) return;
+    loading = true;
     try {
       const [state, plugins] = await Promise.all([request("/api/plugins/feishu/setup/status"), request("/api/plugins")]);
       const agents = (plugins.plugins || []).filter((plugin) => plugin.type === "agent" && plugin.status === "ready");
       const options = agents.map((agent) => new Option(agent.displayName || agent.id, agent.id));
-      binding.elements.pluginId.replaceChildren(new Option("选择 Agent", ""), ...options.map((option) => option.cloneNode(true)));
+      bots = state.bots || [];
+      botTable.replaceChildren();
+      for (const bot of [...bots].sort((a, b) => Number(Boolean(b.pluginId)) - Number(Boolean(a.pluginId)) || Number(b.status === "ready") - Number(a.status === "ready") || (Date.parse(b.binding_time) || 0) - (Date.parse(a.binding_time) || 0))) {
+        const row = document.createElement("tr");
+        for (const text of [bot.app_id, bot.status === "ready" ? "已连接" : bot.message || "未连接", bot.pluginId || "未关联", bot.binding_time ? new Date(bot.binding_time).toLocaleString() : "—"]) { const cell = document.createElement("td"); cell.textContent = text; row.append(cell); }
+        const controls = document.createElement("td");
+        const select = document.createElement("select"); select.setAttribute("aria-label", `${bot.app_id} 关联 Agent`);
+        select.append(new Option("选择 Agent", ""), ...agents.map((agent) => new Option(agent.displayName || agent.id, agent.id))); select.value = bot.pluginId || "";
+        function button(text, action) { const button = document.createElement("button"); button.type = "button"; button.textContent = text; button.onclick = async () => { button.disabled = true; try { await action(); } catch (error) { show(String(error), true); } finally { button.disabled = false; } }; return button; }
+        async function bind(pluginId) { await request("/api/plugins/feishu/bind", "POST", { app_id: bot.app_id, pluginId }); await load(false); show(`${bot.app_id} ${pluginId ? "已关联 " + pluginId : "已解除关联"}`); }
+        controls.append(select, button("关联", () => bind(select.value)), button("解除", () => bind("")), button("编辑凭据", async () => { credentials.elements.app_id.value = bot.app_id; savedAppId = bot.app_id; secretMasked = true; credentials.elements.app_secret.value = "********"; credentials.elements.app_secret.required = false;  }));
+        row.append(controls); botTable.append(row);
+      }
+      if (refreshForm) {
       settings.elements.agent_plugin.replaceChildren(new Option("默认 Agent", ""), ...options);
       settings.elements.agent_plugin.value = state.agent_plugin || "";
       settings.elements.allow_from.value = state.allow_from || "";
       settings.elements.allow_chats.value = state.allow_chats || "";
       credentials.elements.app_id.value = state.app_id || "";
-      credentials.elements.app_secret.value = "";
+      savedAppId = state.configured ? state.app_id : "";
+      secretMasked = state.configured;
+      credentials.elements.app_secret.value = secretMasked ? "********" : "";
+      credentials.elements.app_secret.required = !state.configured;
+      credentials.elements.app_secret.placeholder = state.configured ? "已保存，留空使用已有凭据" : "App Secret 必填";
+      }
       find("#connection").textContent = state.message || state.status;
       find("#app-id").textContent = state.app_id || "未配置";
       const bound = state.bindings?.[state.app_id] || "";
       find("#bound-agent").textContent = bound || state.agent_plugin || "未关联";
-      binding.elements.pluginId.value = bound;
-      show(state.configured ? "机器人已配置" : "请授权或手动配置机器人凭据");
-    } catch (error) { show(String(error), true); }
+
+      show(state.configured ? state.status === "ready" ? "机器人已连接" : `凭据已保存，但连接失败：${state.message || state.status}` : "请授权或手动配置机器人凭据", state.configured && state.status !== "ready");
+      return state;
+    } catch (error) { show(String(error), true); throw error; } finally { loading = false; }
   }
   async function reconnect() {
     await request("/api/plugins/feishu/reload", "POST");
-    await load();
+    const state = await load(false);
+    const bot = state.bots?.find((bot) => bot.app_id === credentials.elements.app_id.value.trim());
+    if ((bot?.status || state.status) !== "ready") throw new Error(bot?.message || state.message || "飞书尚未连接");
   }
   async function poll(deviceCode, interval, deadline, currentSetup) {
     if (currentSetup !== setup) return;
-    if (Date.now() >= deadline) { authState.textContent = "授权已过期，请重新开始"; find("#begin").disabled = false; return; }
+    if (Date.now() >= deadline) { sessionStorage.removeItem(authorizationKey); authState.textContent = "授权已过期，请重新开始"; find("#begin").disabled = false; return; }
     try {
       const result = await request("/api/plugins/feishu/setup/poll", "POST", { device_code: deviceCode });
       if (currentSetup !== setup) return;
-      if (result.status === "completed") { authState.textContent = "授权完成，正在连接"; await reconnect(); if (currentSetup === setup) { authState.textContent = "授权完成"; find("#begin").disabled = false; } return; }
+      if (result.status === "completed") {
+        sessionStorage.removeItem(authorizationKey);
+        credentials.elements.app_id.value = result.app_id;
+        find("#app-id").textContent = result.app_id;
+        authState.textContent = "授权完成，凭据已自动保存，正在连接";
+        try { await reconnect(); authState.textContent = "授权完成，机器人已连接"; }
+        catch (error) { authState.textContent = "授权完成，凭据已自动保存，但连接失败"; show(String(error), true); }
+        find("#begin").disabled = false;
+        return;
+      }
+      if (["denied", "expired", "error"].includes(result.status)) sessionStorage.removeItem(authorizationKey);
       if (result.status === "denied") { authState.textContent = "授权已拒绝"; find("#begin").disabled = false; return; }
       if (result.status === "expired") { authState.textContent = "授权已过期，请重新开始"; find("#begin").disabled = false; return; }
       if (result.status === "error") { authState.textContent = `授权失败：${result.error || "未知错误"}`; find("#begin").disabled = false; return; }
       authState.textContent = "等待飞书授权";
       const nextInterval = interval + (result.slow_down ? 5000 : 0);
       pollTimer = setTimeout(() => void poll(deviceCode, nextInterval, deadline, currentSetup), nextInterval);
-    } catch (error) { if (currentSetup === setup) { authState.textContent = `授权检查失败：${String(error)}`; find("#begin").disabled = false; } }
+    } catch (error) { if (currentSetup === setup) { authState.textContent = `授权检查暂时失败，将重试：${String(error)}`; pollTimer = setTimeout(() => void poll(deviceCode, interval, deadline, currentSetup), interval); } }
   }
   find("#begin").onclick = async () => {
     const currentSetup = ++setup;
@@ -74,13 +112,36 @@
       authDetails.hidden = false;
       authState.textContent = "等待飞书授权";
       const interval = Math.max(1, Number(result.interval) || 5) * 1000;
-      pollTimer = setTimeout(() => void poll(result.device_code, interval, Date.now() + (Number(result.expires_in) || 600) * 1000, currentSetup), interval);
+      const deadline = Date.now() + (Number(result.expires_in) || 600) * 1000;
+      sessionStorage.setItem(authorizationKey, JSON.stringify({ deviceCode: result.device_code, interval, deadline }));
+      pollTimer = setTimeout(() => void poll(result.device_code, interval, deadline, currentSetup), interval);
     } catch (error) { if (currentSetup === setup) { authState.textContent = `启动授权失败：${String(error)}`; find("#begin").disabled = false; } }
   };
-  credentials.onsubmit = (event) => { event.preventDefault(); void request("/api/plugins/feishu/bot", "POST", { app_id: credentials.elements.app_id.value.trim(), app_secret: credentials.elements.app_secret.value }).then(reconnect).then(() => show("凭据已保存，正在连接")).catch((error) => show(String(error), true)); };
-  binding.onsubmit = (event) => { event.preventDefault(); void request("/api/plugins/feishu/bind", "POST", { pluginId: binding.elements.pluginId.value }).then(load).then(() => show("Agent 已关联")).catch((error) => show(String(error), true)); };
+  credentials.elements.app_id.oninput = () => {
+
+    const changed = credentials.elements.app_id.value.trim() !== savedAppId;
+    if (changed && secretMasked) { credentials.elements.app_secret.value = ""; secretMasked = false; }
+    credentials.elements.app_secret.required = changed;
+  };
+  credentials.elements.app_secret.oninput = () => { secretMasked = false;  };
+  credentials.elements.app_secret.addEventListener("invalid", () => show("首次配置或更换机器人时，App ID 和 App Secret 都需要填写", true));
+  credentials.onsubmit = async (event) => {
+    event.preventDefault(); const button = credentials.querySelector("button"); button.disabled = true; show("正在保存凭据并连接飞书");
+    try { await request("/api/plugins/feishu/bot", "POST", { app_id: credentials.elements.app_id.value.trim(), app_secret: secretMasked ? "" : credentials.elements.app_secret.value }); savedAppId = credentials.elements.app_id.value.trim(); secretMasked = true; credentials.elements.app_secret.value = "********"; await reconnect(); show("凭据已保存，机器人已连接"); }
+    catch (error) { show(String(error), true); }
+    finally { button.disabled = false; }
+  };
+
   settings.onsubmit = (event) => { event.preventDefault(); void request("/api/plugins/feishu/settings", "POST", { agent_plugin: settings.elements.agent_plugin.value, allow_from: settings.elements.allow_from.value, allow_chats: settings.elements.allow_chats.value }).then(load).then(() => show("配置已保存")).catch((error) => show(String(error), true)); };
-  find("#refresh").onclick = () => void load();
-  window.addEventListener("pagehide", () => { setup++; clearTimeout(pollTimer); });
-  void load();
+  find("#refresh").onclick = () => void load().catch(() => {});
+  window.addEventListener("pagehide", () => { setup++; clearTimeout(pollTimer); clearInterval(refreshTimer); });
+  void load().catch(() => {});
+  const refreshTimer = setInterval(() => { if (!document.hidden) void load(false).catch(() => {}); }, 10_000);
+  try {
+    const pending = JSON.parse(sessionStorage.getItem(authorizationKey) || "null");
+    if (pending && typeof pending.deviceCode === "string" && Number.isFinite(pending.deadline) && Number.isFinite(pending.interval) && pending.interval >= 1000) {
+      find("#begin").disabled = true;
+      void poll(pending.deviceCode, pending.interval, pending.deadline, setup);
+    }
+  } catch { sessionStorage.removeItem(authorizationKey); }
 })();

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

@@ -6,9 +6,10 @@
     <header><h1>飞书机器人</h1><button id="refresh" type="button">刷新</button></header>
     <p id="notice" role="status"></p>
     <dl><div><dt>连接状态</dt><dd id="connection">未配置</dd></div><div><dt>App ID</dt><dd id="app-id">未配置</dd></div><div><dt>关联 Agent</dt><dd id="bound-agent">未关联</dd></div></dl>
+    <section><h2>机器人关联</h2><div class="table-wrap"><table><thead><tr><th>App ID</th><th>连接状态</th><th>关联 Agent</th><th>最近关联时间</th><th>操作</th></tr></thead><tbody id="bots"></tbody></table></div></section>
     <section><h2>创建设备授权</h2><div class="actions"><button id="begin" type="button">创建飞书机器人</button><a id="authorization-link" target="_blank" rel="noopener noreferrer" hidden>打开飞书创建链接</a></div><div id="authorization-details" hidden><img id="authorization-qr" width="256" height="256" alt="飞书机器人创建授权二维码"><p id="authorization-url"></p></div><p id="authorization-state" role="status"></p></section>
     <form id="credentials"><h2>手动配置凭据</h2><div class="fields"><label>App ID<input name="app_id" required autocomplete="off"></label><label>App Secret<input name="app_secret" type="password" required autocomplete="new-password"></label></div><button type="submit">保存并连接</button></form>
-    <form id="binding"><h2>关联 Agent</h2><div class="fields"><label>Agent<select name="pluginId" required></select></label></div><button type="submit">关联</button></form>
+
     <form id="settings"><h2>通道配置</h2><div class="fields"><label>默认 Agent<select name="agent_plugin"></select></label><label>允许的 open_id<input name="allow_from"></label><label>允许的 chat_id<input name="allow_chats"></label></div><button type="submit">保存配置</button></form>
   </main>
   <script src="/abweb/channels/feishu/app.js"></script>

package/dist/src-ts/plugins/feishu/public/style.css

@@ -23,3 +23,8 @@ button:hover { background: #e5f2ea; }
 a { color: #176848; }
 .error { color: #a83427; }
 @media (max-width: 620px) { .fields, dl { grid-template-columns: 1fr; } }
+
+.table-wrap { overflow-x: auto; }
+table { width: 100%; border-collapse: collapse; font-size: 13px; }
+th, td { padding: 8px; text-align: left; border-bottom: 1px solid #d9dfdc; }
+td:last-child { display: flex; gap: 6px; flex-wrap: wrap; }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "agent-bridge-feishu",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "agent-bridge 的飞书通道插件。",
   "keywords": ["mu-agent-bridge-plugin", "mu-agent-bridge-channel"],
   "main": "dist/src-ts/plugins/feishu/index.js",
   "files": ["dist/", "plugin.json", "config.schema.json", "README.md"],
   "agentBridge": { "plugin": "./plugin.json", "type": "channel" },
   "engines": { "node": ">=22" },
-  "dependencies": { "qrcode": "^1.5.4" },
+  "dependencies": { "qrcode": "^1.5.4", "@larksuiteoapi/node-sdk": "1.74.0" },
   "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" }
 }

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "feishu",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "channel",
   "displayName": "飞书通道",
   "entry": "dist/src-ts/plugins/feishu/index.js",