mu-agent-bridge 1.0.57 → 1.0.58

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

@@ -169,6 +169,7 @@ class ChatgptCdpClient {
         return { supported: true, turns: result.turns, complete: false, missingReasons };
     }
     async switchSession(session) {
+        await this.waitForGeneration();
         await this.recoverDraft();
         const locate = `[...document.querySelectorAll(${JSON.stringify(sidebarSelector)})].find(item =>
       item.getAttribute('data-app-action-sidebar-thread-id') === ${JSON.stringify(session.id)}
@@ -192,6 +193,7 @@ class ChatgptCdpClient {
     })()`, "ChatGPT 会话切换未确认，未发送消息");
     }
     async createSession(_name) {
+        await this.waitForGeneration();
         await this.recoverDraft();
         const before = await this.activeSession();
         const state = await this.evaluate(`JSON.stringify({ editor: document.querySelector(${JSON.stringify(exports.editorSelector)})?.innerText ?? null, turns: document.querySelectorAll(${JSON.stringify(exports.turnSelector)}).length, generating: Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)})) })`);
@@ -336,6 +338,7 @@ class ChatgptCdpClient {
     }
     async directTurn(text, timeoutMs, attachments, slot, outputDirectory, startedAt) {
         await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "ChatGPT 桌面端输入框未就绪");
+        await this.waitForGeneration();
         await this.recoverDraft();
         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 || "[]"));
@@ -658,6 +661,9 @@ class ChatgptCdpClient {
         }
         throw new Error(message);
     }
+    waitForGeneration() {
+        return this.waitFor(`!Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)}))`, "ChatGPT 桌面端仍在生成回复，等待超时；未清理输入或切换会话");
+    }
     rejectPending(error) {
         for (const pending of this.pending.values())
             pending.reject(error);

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

@@ -52,6 +52,7 @@ class WorkbuddyPlugin {
     /** 重载后待恢复的会话身份。 */
     recoverableSessionId;
     recoverableConversationId;
+    sessionBindings = new Map();
     activeDesktopConversationId;
     desktopSessionValid = true;
     knownSessions = new Set();
@@ -81,6 +82,7 @@ class WorkbuddyPlugin {
         this.activeSessionId = undefined;
         this.recoverableSessionId = undefined;
         this.recoverableConversationId = undefined;
+        this.sessionBindings.clear();
         this.activeDesktopConversationId = undefined;
         this.activeExpert = undefined;
         this.expertSession = false;
@@ -94,6 +96,8 @@ class WorkbuddyPlugin {
             const saved = await this.loadKnownSessions(this.sessionDataDir);
             for (const sessionId of saved.sessionIds)
                 this.knownSessions.add(sessionId);
+            for (const [sessionId, binding] of Object.entries(saved.bindings ?? {}))
+                this.sessionBindings.set(sessionId, binding);
             savedBinding = saved.active;
         }
         this.sessionOperations = [];
@@ -336,11 +340,14 @@ class WorkbuddyPlugin {
             return;
         }
         if (this.knownSessions.has(sessionId)) {
-            if (this.recoverableSessionId !== sessionId || !this.recoverableConversationId || !this.client.activateConversation)
+            const binding = this.sessionBindings.get(sessionId);
+            const conversationId = binding?.conversationId ?? (this.recoverableSessionId === sessionId ? this.recoverableConversationId : undefined);
+            if (!conversationId || !this.client.activateConversation)
                 throw new Error("WorkBuddy 不支持恢复旧 WorkBuddy 会话");
-            await this.client.activateConversation(this.recoverableConversationId);
+            await this.client.activateConversation(conversationId);
             this.activeSessionId = sessionId;
-            this.activeDesktopConversationId = this.recoverableConversationId;
+            this.activeDesktopConversationId = conversationId;
+            this.activeExpert = binding?.expert;
             this.desktopSessionValid = true;
             this.recoverableSessionId = undefined;
             this.recoverableConversationId = undefined;
@@ -374,7 +381,14 @@ class WorkbuddyPlugin {
             const active = parsed.active;
             if (active !== undefined && (!active || typeof active.sessionId !== "string" || !sessionIds.includes(active.sessionId) || typeof active.conversationId !== "string" || !active.conversationId.trim() || (active.expert !== undefined && active.expert !== null && typeof active.expert !== "string")))
                 throw new Error("活动会话绑定无效");
-            return { sessionIds: new Set(sessionIds), ...(active ? { active: active } : {}) };
+            const activeBinding = active;
+            const bindingsValue = parsed.bindings;
+            if (bindingsValue !== undefined && (!bindingsValue || typeof bindingsValue !== "object" || Array.isArray(bindingsValue) || Object.entries(bindingsValue).some(([sessionId, binding]) => !sessionIds.includes(sessionId) || !binding || typeof binding !== "object" || typeof binding.conversationId !== "string" || !binding.conversationId.trim() || (binding.expert !== undefined && binding.expert !== null && typeof binding.expert !== "string"))))
+                throw new Error("会话绑定列表无效");
+            const bindings = (bindingsValue ?? {});
+            if (activeBinding && !bindings[activeBinding.sessionId])
+                bindings[activeBinding.sessionId] = { conversationId: activeBinding.conversationId, expert: activeBinding.expert };
+            return { sessionIds: new Set(sessionIds), ...(activeBinding ? { active: activeBinding } : {}), bindings };
         }
         catch (error) {
             if (error.code === "ENOENT")
@@ -391,7 +405,9 @@ class WorkbuddyPlugin {
             await (0, promises_1.mkdir)(this.sessionDataDir, { recursive: true });
             const file = (0, node_path_1.join)(this.sessionDataDir, "known-sessions.json");
             const active = this.desktopSessionValid && this.activeSessionId && this.activeDesktopConversationId ? { sessionId: this.activeSessionId, conversationId: this.activeDesktopConversationId, expert: this.activeExpert } : undefined;
-            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active })}\n`, { mode: 0o600 });
+            if (active)
+                this.sessionBindings.set(active.sessionId, { conversationId: active.conversationId, expert: active.expert });
+            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active, bindings: Object.fromEntries(this.sessionBindings) })}\n`, { mode: 0o600 });
             await (0, promises_1.rename)(`${file}.tmp`, file);
         });
         this.sessionWrites = write;

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

@@ -367,7 +367,7 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
     strict_1.default.equal(sends, 1);
     await plugin.deactivate();
 });
-(0, node_test_1.default)("ChatGPT 固定 CDP 操作读取侧栏并按主机和 ID 切换，正在生成时阻止切换", async () => {
+(0, node_test_1.default)("ChatGPT 固定 CDP 操作按主机和 ID 切换，生成中等待且超时不切换", async () => {
     const { runInNewContext } = await Promise.resolve().then(() => __importStar(require("node:vm")));
     const entries = [{ id: 'a"\\', host: "h1", title: "旧会话" }, { id: 'a"\\', host: "h2", title: "目标会话" }];
     let selected = 0;
@@ -384,6 +384,7 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
     };
     let onMessage = null;
     const client = new chatgpt_1.ChatgptCdpClient({
+        timeoutMs: 300,
         fetchImpl: async () => new Response(JSON.stringify([{ type: "page", url: "app://-/index.html", webSocketDebuggerUrl: "ws://localhost:9230/a" }])),
         webSocketFactory: () => ({
             set onmessage(fn) { onMessage = fn; },
@@ -409,8 +410,9 @@ const chatgpt_1 = require("../src-ts/plugins/chatgpt");
         strict_1.default.equal(selected, 1);
         strict_1.default.deepEqual(await client.activeSession(), entries[1]);
         generating = true;
-        await strict_1.default.rejects(client.switchSession(entries[0]), /正在生成/);
-        strict_1.default.equal(selected, 1);
+        setTimeout(() => { generating = false; }, 100);
+        await client.switchSession(entries[0]);
+        strict_1.default.equal(selected, 0);
     }
     finally {
         client.close();

package/dist/tests-ts/installer-assets.test.js

@@ -44,6 +44,8 @@ const node_util_1 = require("node:util");
     strict_1.default.match(setup, /\$npmCommand\.Source prefix --global/);
     strict_1.default.match(setup, /@\(\$nodeDirectory, \$npmDirectory, \$npmPrefix\)/);
     strict_1.default.match(setup, /mu-agent-bridge@latest --engine-strict/);
+    strict_1.default.match(setup, /--prefer-online/);
+    strict_1.default.match(setup, /npm 安装遇到版本尚未同步或文件占用.*重试/);
     strict_1.default.doesNotMatch(setup, /mu-agent-bridge@\d+\.\d+\.\d+/);
     strict_1.default.match(setup, /api\/agents\/availability/);
     strict_1.default.match(setup, /function Find-AgentExecutable/);

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

@@ -1137,6 +1137,42 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
         await (0, promises_1.rm)(dataDir, { recursive: true, force: true });
     }
 });
+(0, node_test_1.default)("workbuddy 多个 AUN 会话交替后重载仍分别恢复桌面会话", async () => {
+    const dataDir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "wb-multiple-sessions-"));
+    let creates = 0;
+    let desktopId = "desktop-initial";
+    const calls = [];
+    const client = {
+        connect: async () => undefined, close() { }, connected: () => true,
+        conversationId: async () => desktopId,
+        activateConversation: async (id) => { desktopId = id; },
+        createTask: async () => { desktopId = `desktop-${++creates}`; },
+        direct: async (task) => { calls.push(`${desktopId}:${task}`); return task; },
+    };
+    const context = { dataDir, config: { transport: "cdp" }, logger: { info() { }, warn() { }, error() { } } };
+    try {
+        const first = new workbuddy_1.WorkbuddyPlugin({ client });
+        await first.activate(context);
+        await first.handle({ task: "peer-a 首条", sessionId: "session-a" });
+        await first.handle({ task: "peer-b 首条", sessionId: "session-b" });
+        await first.handle({ task: "peer-a 续聊", sessionId: "session-a" });
+        await first.deactivate("reload");
+        desktopId = "desktop-after-restart";
+        const second = new workbuddy_1.WorkbuddyPlugin({ client });
+        await second.activate(context);
+        await second.handle({ task: "peer-b 重载后续聊", sessionId: "session-b" });
+        await second.handle({ task: "peer-a 重载后续聊", sessionId: "session-a" });
+        strict_1.default.deepEqual(calls, [
+            "desktop-1:peer-a 首条", "desktop-2:peer-b 首条", "desktop-1:peer-a 续聊",
+            "desktop-2:peer-b 重载后续聊", "desktop-1:peer-a 重载后续聊",
+        ]);
+        strict_1.default.equal(creates, 2);
+        await second.deactivate("stop");
+    }
+    finally {
+        await (0, promises_1.rm)(dataDir, { recursive: true, force: true });
+    }
+});
 (0, node_test_1.default)("workbuddy 新建失败的会话 ID 重启后仍禁止重试", async () => {
     const dataDir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "wb-failed-session-"));
     let creates = 0;

package/package.json

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

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

@@ -169,6 +169,7 @@ class ChatgptCdpClient {
         return { supported: true, turns: result.turns, complete: false, missingReasons };
     }
     async switchSession(session) {
+        await this.waitForGeneration();
         await this.recoverDraft();
         const locate = `[...document.querySelectorAll(${JSON.stringify(sidebarSelector)})].find(item =>
       item.getAttribute('data-app-action-sidebar-thread-id') === ${JSON.stringify(session.id)}
@@ -192,6 +193,7 @@ class ChatgptCdpClient {
     })()`, "ChatGPT 会话切换未确认，未发送消息");
     }
     async createSession(_name) {
+        await this.waitForGeneration();
         await this.recoverDraft();
         const before = await this.activeSession();
         const state = await this.evaluate(`JSON.stringify({ editor: document.querySelector(${JSON.stringify(exports.editorSelector)})?.innerText ?? null, turns: document.querySelectorAll(${JSON.stringify(exports.turnSelector)}).length, generating: Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)})) })`);
@@ -336,6 +338,7 @@ class ChatgptCdpClient {
     }
     async directTurn(text, timeoutMs, attachments, slot, outputDirectory, startedAt) {
         await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "ChatGPT 桌面端输入框未就绪");
+        await this.waitForGeneration();
         await this.recoverDraft();
         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 || "[]"));
@@ -658,6 +661,9 @@ class ChatgptCdpClient {
         }
         throw new Error(message);
     }
+    waitForGeneration() {
+        return this.waitFor(`!Boolean(document.querySelector(${JSON.stringify(stopButtonSelector)}))`, "ChatGPT 桌面端仍在生成回复，等待超时；未清理输入或切换会话");
+    }
     rejectPending(error) {
         for (const pending of this.pending.values())
             pending.reject(error);

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

@@ -52,6 +52,7 @@ class WorkbuddyPlugin {
     /** 重载后待恢复的会话身份。 */
     recoverableSessionId;
     recoverableConversationId;
+    sessionBindings = new Map();
     activeDesktopConversationId;
     desktopSessionValid = true;
     knownSessions = new Set();
@@ -81,6 +82,7 @@ class WorkbuddyPlugin {
         this.activeSessionId = undefined;
         this.recoverableSessionId = undefined;
         this.recoverableConversationId = undefined;
+        this.sessionBindings.clear();
         this.activeDesktopConversationId = undefined;
         this.activeExpert = undefined;
         this.expertSession = false;
@@ -94,6 +96,8 @@ class WorkbuddyPlugin {
             const saved = await this.loadKnownSessions(this.sessionDataDir);
             for (const sessionId of saved.sessionIds)
                 this.knownSessions.add(sessionId);
+            for (const [sessionId, binding] of Object.entries(saved.bindings ?? {}))
+                this.sessionBindings.set(sessionId, binding);
             savedBinding = saved.active;
         }
         this.sessionOperations = [];
@@ -336,11 +340,14 @@ class WorkbuddyPlugin {
             return;
         }
         if (this.knownSessions.has(sessionId)) {
-            if (this.recoverableSessionId !== sessionId || !this.recoverableConversationId || !this.client.activateConversation)
+            const binding = this.sessionBindings.get(sessionId);
+            const conversationId = binding?.conversationId ?? (this.recoverableSessionId === sessionId ? this.recoverableConversationId : undefined);
+            if (!conversationId || !this.client.activateConversation)
                 throw new Error("WorkBuddy 不支持恢复旧 WorkBuddy 会话");
-            await this.client.activateConversation(this.recoverableConversationId);
+            await this.client.activateConversation(conversationId);
             this.activeSessionId = sessionId;
-            this.activeDesktopConversationId = this.recoverableConversationId;
+            this.activeDesktopConversationId = conversationId;
+            this.activeExpert = binding?.expert;
             this.desktopSessionValid = true;
             this.recoverableSessionId = undefined;
             this.recoverableConversationId = undefined;
@@ -374,7 +381,14 @@ class WorkbuddyPlugin {
             const active = parsed.active;
             if (active !== undefined && (!active || typeof active.sessionId !== "string" || !sessionIds.includes(active.sessionId) || typeof active.conversationId !== "string" || !active.conversationId.trim() || (active.expert !== undefined && active.expert !== null && typeof active.expert !== "string")))
                 throw new Error("活动会话绑定无效");
-            return { sessionIds: new Set(sessionIds), ...(active ? { active: active } : {}) };
+            const activeBinding = active;
+            const bindingsValue = parsed.bindings;
+            if (bindingsValue !== undefined && (!bindingsValue || typeof bindingsValue !== "object" || Array.isArray(bindingsValue) || Object.entries(bindingsValue).some(([sessionId, binding]) => !sessionIds.includes(sessionId) || !binding || typeof binding !== "object" || typeof binding.conversationId !== "string" || !binding.conversationId.trim() || (binding.expert !== undefined && binding.expert !== null && typeof binding.expert !== "string"))))
+                throw new Error("会话绑定列表无效");
+            const bindings = (bindingsValue ?? {});
+            if (activeBinding && !bindings[activeBinding.sessionId])
+                bindings[activeBinding.sessionId] = { conversationId: activeBinding.conversationId, expert: activeBinding.expert };
+            return { sessionIds: new Set(sessionIds), ...(activeBinding ? { active: activeBinding } : {}), bindings };
         }
         catch (error) {
             if (error.code === "ENOENT")
@@ -391,7 +405,9 @@ class WorkbuddyPlugin {
             await (0, promises_1.mkdir)(this.sessionDataDir, { recursive: true });
             const file = (0, node_path_1.join)(this.sessionDataDir, "known-sessions.json");
             const active = this.desktopSessionValid && this.activeSessionId && this.activeDesktopConversationId ? { sessionId: this.activeSessionId, conversationId: this.activeDesktopConversationId, expert: this.activeExpert } : undefined;
-            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active })}\n`, { mode: 0o600 });
+            if (active)
+                this.sessionBindings.set(active.sessionId, { conversationId: active.conversationId, expert: active.expert });
+            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort(), active, bindings: Object.fromEntries(this.sessionBindings) })}\n`, { mode: 0o600 });
             await (0, promises_1.rename)(`${file}.tmp`, file);
         });
         this.sessionWrites = write;