mu-agent-bridge 1.0.21 → 1.0.23

package/dist/src-ts/plugin-manager.js

@@ -249,6 +249,16 @@ class PluginManager {
             throw new agent_1.AgentError(`unknown plugin: ${id}`);
         if (loaded.instance && loaded.record.status === "ready")
             return;
+        if (loaded.instance) {
+            try {
+                await loaded.instance.deactivate("reload");
+            }
+            catch (error) {
+                this.log("warn", `插件恢复前清理失败：${id}`, { error: error instanceof Error ? error.message : String(error) }, "插件生命周期");
+            }
+            this.unregisterHttpRoutes(id);
+            loaded.instance = undefined;
+        }
         if (path.has(id)) {
             const reason = `插件存在循环依赖：${[...path, id].join(" -> ")}`;
             loaded.record.status = "failed";
@@ -268,8 +278,9 @@ class PluginManager {
         for (const dependency of Object.keys(loaded.record.manifest.dependencies ?? {}))
             await this.startWithDependencies(dependency, next);
         loaded.record.status = "starting";
+        let instance;
         try {
-            const instance = await this.load(loaded.record);
+            instance = await this.load(loaded.record);
             const dataDir = (0, node_path_1.join)(this.options.stateDir, id);
             await (0, promises_1.mkdir)(dataDir, { recursive: true });
             const configPath = (0, node_path_1.join)(dataDir, "config.json");
@@ -322,6 +333,16 @@ class PluginManager {
             this.log("info", `插件已启动：${id}`, { version: loaded.record.version }, "插件生命周期");
         }
         catch (error) {
+            if (instance) {
+                try {
+                    await instance.deactivate("reload");
+                }
+                catch (cleanupError) {
+                    this.log("warn", `插件启动失败后的清理失败：${id}`, { error: cleanupError instanceof Error ? cleanupError.message : String(cleanupError) }, "插件生命周期");
+                }
+                this.unregisterHttpRoutes(id);
+            }
+            loaded.instance = undefined;
             loaded.record.status = "failed";
             loaded.record.error = error instanceof Error ? error.message : String(error);
             this.log("error", `插件启动失败：${id}`, { error: loaded.record.error }, "插件生命周期");

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

@@ -108,7 +108,7 @@
         item.type = "button";
         item.textContent = label;
         item.title = title;
-        item.onclick = () => { void run().catch((cause) => error(String(cause))); };
+        item.onclick = () => { item.disabled = true; void run().catch((cause) => error(String(cause))).finally(() => { item.disabled = false; void load(false); }); };
         return item;
     }
     async function load(refreshCatalog = true) {

package/dist/src-ts/plugins/chatgpt/cdp-client.js

@@ -5,6 +5,7 @@ const node_child_process_1 = require("node:child_process");
 exports.editorSelector = '[data-codex-composer="true"][contenteditable="true"]';
 exports.turnSelector = '[data-chatgpt-conversation-turn="true"]';
 exports.userBubbleSelector = "[data-user-message-bubble]";
+const assistantMessageSelector = '[data-markdown-text-style="assistant-message"]';
 const turnIdAttribute = "data-chatgpt-conversation-turn-id";
 const contentUnitSelector = "[data-content-search-unit-key]";
 const sendButtonSelector = 'button[aria-label="Send"], button[aria-label="发送"]';
@@ -88,7 +89,8 @@ class ChatgptCdpClient {
                 if (!response.ok)
                     throw new Error(`ChatGPT CDP /json HTTP ${response.status}`);
                 const targets = await response.json();
-                const page = targets.find((target) => target.type === "page" && /chatgpt|codex/i.test(`${target.title} ${target.url}`));
+                const page = targets.find((target) => target.type === "page" && (/chatgpt|codex/i.test(`${target.title} ${target.url}`)
+                    || target.url === "app://-/index.html"));
                 if (page?.webSocketDebuggerUrl)
                     return page;
                 last = new Error(`未找到 ChatGPT/Codex 页面 target（端口 ${this.port}）`);
@@ -111,6 +113,7 @@ class ChatgptCdpClient {
         await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "ChatGPT 桌面端输入框未就绪");
         const beforeTurnsJson = await this.evaluate(`JSON.stringify([...document.querySelectorAll(${JSON.stringify(exports.turnSelector)})].map(turn => ({ id: turn.getAttribute(${JSON.stringify(turnIdAttribute)}), users: turn.querySelectorAll(${JSON.stringify(exports.userBubbleSelector)}).length })))`);
         const beforeTurns = JSON.parse(String(beforeTurnsJson || "[]"));
+        const beforeAssistantCount = Number(await this.evaluate(`document.querySelectorAll(${JSON.stringify(assistantMessageSelector)}).length`));
         const ready = await this.evaluate(`(() => {
       const editor = document.querySelector(${JSON.stringify(exports.editorSelector)});
       if (!editor || editor.innerText.trim()) return false;
@@ -164,7 +167,13 @@ class ChatgptCdpClient {
           const fresh = oldIndex < 0 || index >= before.length || users.length > (old?.users ?? 0);
           return fresh && users.item(users.length - 1)?.innerText.trim() === ${JSON.stringify(text.trim())};
         });
-        if (!turn) return JSON.stringify({ reply: "", active: false });
+        if (!turn) {
+          const assistants = [...document.querySelectorAll(${JSON.stringify(assistantMessageSelector)})];
+          const fallback = assistants.length > ${beforeAssistantCount}
+            ? assistants.at(-1)?.innerText.trim() ?? ""
+            : "";
+          return JSON.stringify({ reply: fallback, active: Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)})) });
+        }
         const user = turn.querySelectorAll(${JSON.stringify(exports.userBubbleSelector)}).item(turn.querySelectorAll(${JSON.stringify(exports.userBubbleSelector)}).length - 1);
         const unit = user?.closest(${JSON.stringify(contentUnitSelector)});
         const units = [...turn.querySelectorAll(${JSON.stringify(contentUnitSelector)})];

package/dist/tests-ts/chatgpt-plugin.test.js

@@ -35,6 +35,20 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
     strict_1.default.equal(client.connected(), true);
     client.close();
 });
+(0, node_test_1.default)("ChatGPT/Codex 桌面端使用 app 页面 target 时可以连接", async () => {
+    let connectedUrl = "";
+    const client = new chatgpt_1.ChatgptCdpClient({
+        timeoutMs: 100,
+        fetchImpl: async () => new Response(JSON.stringify([{ type: "page", title: "请只回复：CDP连通测试成功", url: "app://-/index.html", webSocketDebuggerUrl: "ws://127.0.0.1:9230/devtools/page/2" }])),
+        webSocketFactory: (url) => {
+            connectedUrl = url.toString();
+            return { set onmessage(_) { }, set onclose(_) { }, set onerror(_) { }, set onopen(handler) { queueMicrotask(handler); }, close() { }, send() { } };
+        },
+    });
+    await client.connect();
+    strict_1.default.equal(connectedUrl, "ws://127.0.0.1:9230/devtools/page/2");
+    client.close();
+});
 (0, node_test_1.default)("ChatGPT CDP 只返回本轮新用户消息之后的回复", async () => {
     let messageHandler;
     let sentText = "";

package/dist/tests-ts/plugin-manager.test.js

@@ -428,3 +428,41 @@ const channel_sessions_1 = require("../src-ts/channel-sessions");
     strict_1.default.equal(manifest.clientDownloadUrl, "https://tongyi.aliyun.com/");
     strict_1.default.throws(() => validateManifest({ id: "demo", version: "1.0.0", entry: "index.js", apiVersion: "1", capabilities: ["chat"], clientDownloadUrl: "file:///C:/QwenWorkCN.exe" }), /客户端下载地址/);
 });
+(0, node_test_1.default)("启动失败清理实例和路由，再次启动及重载可以恢复", async () => {
+    const root = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "mab-recovery-"));
+    try {
+        const dir = (0, node_path_1.join)(root, "recover");
+        await (0, promises_1.mkdir)(dir);
+        await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "plugin.json"), JSON.stringify({ id: "recover", version: "1.0.0", entry: "index.js", apiVersion: "1", capabilities: [] }));
+        await (0, promises_1.writeFile)((0, node_path_1.join)(dir, "index.js"), `module.exports = class {
+      async activate(ctx) { this.ctx = ctx; ctx.http.register('GET','/partial',(_,res)=>res.end('ok')); if(globalThis.recoveryFail) throw new Error('桌面连接失败'); }
+      async deactivate() { globalThis.recoveryCleaned = (globalThis.recoveryCleaned || 0) + 1; }
+      async health() { return {status: globalThis.recoveryOffline ? 'failed' : 'ready'}; }
+    }`);
+        const manager = new plugin_manager_1.PluginManager({ pluginsDir: root, stateDir: (0, node_path_1.join)(root, "state") });
+        await manager.discover();
+        globalThis.recoveryFail = true;
+        await strict_1.default.rejects(manager.start("recover"), /桌面连接失败/);
+        strict_1.default.equal(manager.list()[0].status, "failed");
+        strict_1.default.equal(globalThis.recoveryCleaned, 1);
+        strict_1.default.equal(manager.get("recover")?.instance, undefined);
+        strict_1.default.equal(await manager.dispatchHttp({ method: "GET", url: "/partial" }, {}), false);
+        globalThis.recoveryFail = false;
+        await manager.start("recover");
+        strict_1.default.equal(manager.list()[0].status, "ready");
+        strict_1.default.equal(manager.list()[0].error, undefined);
+        await manager.stop("recover");
+        globalThis.recoveryFail = true;
+        await strict_1.default.rejects(manager.reload("recover"), /桌面连接失败/);
+        globalThis.recoveryFail = false;
+        globalThis.recoveryOffline = false;
+        await manager.reload("recover");
+        strict_1.default.equal(manager.list()[0].status, "ready");
+        await manager.stop("recover");
+    }
+    finally {
+        for (const key of ['recoveryFail', 'recoveryCleaned', 'recoveryOffline'])
+            delete globalThis[key];
+        await (0, promises_1.rm)(root, { recursive: true, force: true });
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-agent-bridge",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "将 AUN Agent 连接到本地桌面 AI 客户端的插件平台。",
   "main": "dist/src-ts/cli.js",
   "bin": {

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

@@ -108,7 +108,7 @@
         item.type = "button";
         item.textContent = label;
         item.title = title;
-        item.onclick = () => { void run().catch((cause) => error(String(cause))); };
+        item.onclick = () => { item.disabled = true; void run().catch((cause) => error(String(cause))).finally(() => { item.disabled = false; void load(false); }); };
         return item;
     }
     async function load(refreshCatalog = true) {

package/plugins/abweb/dist/src-ts/plugins/abweb/public/app.ts

@@ -75,7 +75,7 @@
   }
   function button(label: string, title: string, run: () => Promise<void>): HTMLButtonElement {
     const item = document.createElement("button"); item.type = "button"; item.textContent = label; item.title = title;
-    item.onclick = () => { void run().catch((cause) => error(String(cause))); }; return item;
+    item.onclick = () => { item.disabled = true; void run().catch((cause) => error(String(cause))).finally(() => { item.disabled = false; void load(false); }); }; return item;
   }
   async function load(refreshCatalog = true): Promise<void> {
     if (loading) return;

package/plugins/chatgpt/dist/src-ts/plugins/chatgpt/cdp-client.js

@@ -5,6 +5,7 @@ const node_child_process_1 = require("node:child_process");
 exports.editorSelector = '[data-codex-composer="true"][contenteditable="true"]';
 exports.turnSelector = '[data-chatgpt-conversation-turn="true"]';
 exports.userBubbleSelector = "[data-user-message-bubble]";
+const assistantMessageSelector = '[data-markdown-text-style="assistant-message"]';
 const turnIdAttribute = "data-chatgpt-conversation-turn-id";
 const contentUnitSelector = "[data-content-search-unit-key]";
 const sendButtonSelector = 'button[aria-label="Send"], button[aria-label="发送"]';
@@ -88,7 +89,8 @@ class ChatgptCdpClient {
                 if (!response.ok)
                     throw new Error(`ChatGPT CDP /json HTTP ${response.status}`);
                 const targets = await response.json();
-                const page = targets.find((target) => target.type === "page" && /chatgpt|codex/i.test(`${target.title} ${target.url}`));
+                const page = targets.find((target) => target.type === "page" && (/chatgpt|codex/i.test(`${target.title} ${target.url}`)
+                    || target.url === "app://-/index.html"));
                 if (page?.webSocketDebuggerUrl)
                     return page;
                 last = new Error(`未找到 ChatGPT/Codex 页面 target（端口 ${this.port}）`);
@@ -111,6 +113,7 @@ class ChatgptCdpClient {
         await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "ChatGPT 桌面端输入框未就绪");
         const beforeTurnsJson = await this.evaluate(`JSON.stringify([...document.querySelectorAll(${JSON.stringify(exports.turnSelector)})].map(turn => ({ id: turn.getAttribute(${JSON.stringify(turnIdAttribute)}), users: turn.querySelectorAll(${JSON.stringify(exports.userBubbleSelector)}).length })))`);
         const beforeTurns = JSON.parse(String(beforeTurnsJson || "[]"));
+        const beforeAssistantCount = Number(await this.evaluate(`document.querySelectorAll(${JSON.stringify(assistantMessageSelector)}).length`));
         const ready = await this.evaluate(`(() => {
       const editor = document.querySelector(${JSON.stringify(exports.editorSelector)});
       if (!editor || editor.innerText.trim()) return false;
@@ -164,7 +167,13 @@ class ChatgptCdpClient {
           const fresh = oldIndex < 0 || index >= before.length || users.length > (old?.users ?? 0);
           return fresh && users.item(users.length - 1)?.innerText.trim() === ${JSON.stringify(text.trim())};
         });
-        if (!turn) return JSON.stringify({ reply: "", active: false });
+        if (!turn) {
+          const assistants = [...document.querySelectorAll(${JSON.stringify(assistantMessageSelector)})];
+          const fallback = assistants.length > ${beforeAssistantCount}
+            ? assistants.at(-1)?.innerText.trim() ?? ""
+            : "";
+          return JSON.stringify({ reply: fallback, active: Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)})) });
+        }
         const user = turn.querySelectorAll(${JSON.stringify(exports.userBubbleSelector)}).item(turn.querySelectorAll(${JSON.stringify(exports.userBubbleSelector)}).length - 1);
         const unit = user?.closest(${JSON.stringify(contentUnitSelector)});
         const units = [...turn.querySelectorAll(${JSON.stringify(contentUnitSelector)})];