mu-agent-bridge 1.0.33 → 1.0.34

package/README.md

@@ -142,3 +142,5 @@ Windows 路径时，可设置 `DSH_INSTALL_DIR`。
 ## AUN 身份管理
 
 创建、连接、关联和 AUN 通信统一由独立 `agent-bridge-aun` 插件完成。安装并启动 AUN 后，在 ABWeb 的“通道 → AUN”创建或选择身份，再将已连接 AID 关联到已启动的 Agent；用 `mab status` 查看状态。Owner AID 仅作本地归属配置，不代表 AUN Owner 关系已激活。完整步骤见 [AUN 插件与 AID 身份管理](docs/aun-plugin-identities.md)；给 Codex、Claude Code 直接执行的 CLI 说明见 [使用说明](使用说明.md)。
+
+WorkBuddy 执行中的可见消息可经原通道逐条回传，同一请求去重并排除思考过程；配合 `agent-bridge-workbuddy@1.1.11` 使用。插件升级同时刷新内部依赖，避免继续运行旧版客户端。

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

@@ -366,7 +366,15 @@ class PluginManager {
                                 ? (request) => this.controlSession(target, request)
                                 : undefined;
                             const task = !message.text.trim() && message.attachments?.length ? "请处理收到的附件" : message.text;
-                            const response = await this.sessions.run(message, target, (sessionId) => this.handle(target, { task, sessionId, ...(message.attachments ? { attachments: message.attachments } : {}) }), control);
+                            const forwarded = new Set();
+                            const onMessage = async (text) => {
+                                if (!text.trim() || forwarded.has(text))
+                                    return;
+                                await message.reply(text);
+                                forwarded.add(text);
+                                this.recordMessage(target, "reply", text, message.peerId);
+                            };
+                            const response = await this.sessions.run(message, target, (sessionId, newSession) => this.handle(target, { task, sessionId, onMessage, ...(newSession ? { newSession: true } : {}), ...(message.attachments ? { attachments: message.attachments } : {}) }), control);
                             const attachments = response.attachments?.length ? response.attachments : (0, attachments_1.asAttachments)(response.images);
                             (0, attachments_1.validateAttachments)(attachments);
                             if (attachments.length) {
@@ -375,10 +383,10 @@ class PluginManager {
                                     throw new agent_1.AgentError("当前通道不支持附件回传");
                                 }
                                 await message.replyAttachments(attachments, response.text);
+                                this.recordMessage(target, "reply", response.text, message.peerId);
                             }
                             else
-                                await message.reply(response.text);
-                            this.recordMessage(target, "reply", response.text, message.peerId);
+                                await onMessage(response.text);
                         }
                         catch (error) {
                             this.recordMessage(target, "error", error instanceof Error ? error.message : String(error), message.peerId);
@@ -626,10 +634,13 @@ class PluginManager {
         const packagedFile = (0, node_path_1.join)(record.path, record.manifest.entry);
         const developmentFile = (0, node_path_1.resolve)(__dirname, "plugins", record.id, (0, node_path_1.basename)(record.manifest.entry));
         const file = (0, node_fs_1.existsSync)(packagedFile) ? packagedFile : developmentFile;
-        // CommonJS is the platform's compiled format; evict the module cache for reload.
+        // 同时刷新插件内部依赖，避免升级后仍运行旧版 CDP 客户端。
         const req = (0, node_module_1.createRequire)(file);
         const resolved = req.resolve(file);
-        delete req.cache[resolved];
+        const moduleRoot = (0, node_fs_1.existsSync)(packagedFile) ? (0, node_path_1.resolve)(record.path) : (0, node_path_1.dirname)(file);
+        for (const cached of Object.keys(req.cache))
+            if (cached === resolved || cached.startsWith(`${moduleRoot}${node_path_1.sep}`))
+                delete req.cache[cached];
         const mod = req(resolved);
         let value = mod.default ?? mod.plugin ?? mod;
         // Entries may export a ready instance, a factory, or a class. Supporting all

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

@@ -4,6 +4,17 @@ exports.WorkbuddyCdpClient = exports.assistantSelector = exports.editorSelector
 const node_crypto_1 = require("node:crypto");
 const attachments_1 = require("../../attachments");
 function sleep(ms) { return new Promise((resolve) => setTimeout(resolve, ms)); }
+const interactionOptionSelector = '.conversation-input-area [role="dialog"] button,.pending-sandbox-panel button,button[class*="conversation-"][class*="__option"]';
+function interactionText(value) { return value.normalize("NFKC").replace(/[\uFEFF\u200B]/g, "").trim(); }
+function formatInteraction(value) { return [value.prompt, ...value.options.map((option, index) => `${index + 1}. ${option}`)].filter(Boolean).join("\n"); }
+function interactionChoice(value, options) {
+    const input = interactionText(value).replace(/^[第\s]*(\d+)[、.。:：)]?\s*$/, "$1");
+    const number = Number(input);
+    if (Number.isInteger(number) && number >= 1 && number <= options.length && String(number) === input)
+        return number - 1;
+    const index = options.findIndex((option) => interactionText(option) === input);
+    return index >= 0 ? index : undefined;
+}
 exports.editorSelector = '[data-slate-editor][contenteditable="true"]';
 exports.assistantSelector = '.cr-agent[data-message-id] [data-assistant-content]';
 class WorkbuddyCdpClient {
@@ -11,11 +22,18 @@ class WorkbuddyCdpClient {
     socket;
     sequence = 0;
     pending = new Map();
+    pendingInteraction;
+    pendingInteractionCleanup;
     port;
     timeoutMs;
     fetchImpl;
     constructor(options = {}) { this.port = options.port ?? Number(process.env.WORKBUDDY_CDP_PORT ?? "9229"); this.timeoutMs = options.timeoutMs ?? 30_000; this.fetchImpl = options.fetchImpl ?? fetch; }
     connected() { return Boolean(this.socket); }
+    pendingInteractionSessionId() { return this.pendingInteraction?.sessionId; }
+    async conversationId() {
+        const value = await this.evaluate(`([...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_')))?.getAttribute('data-conversation-id')`);
+        return typeof value === "string" && value.trim() ? value : undefined;
+    }
     async connect() {
         if (this.socket)
             return;
@@ -39,18 +57,12 @@ class WorkbuddyCdpClient {
     close() { this.socket?.close(); this.socket = undefined; for (const pending of this.pending.values())
         pending.reject(new Error("WorkBuddy CDP 已关闭")); this.pending.clear(); }
     async createTask() {
-        const snapshot = `(() => {
-      const selected = [...document.querySelectorAll('[data-conversation-id]')].find((item) => String(item.className).includes('_selected_'));
-      const editor = document.querySelector(${JSON.stringify(exports.editorSelector)})?.cloneNode(true);
-      for (const placeholder of editor?.querySelectorAll('[data-slate-placeholder]') ?? []) placeholder.remove();
-      return { url: location.href.split(/[?#]/, 1)[0], conversationId: selected?.getAttribute('data-conversation-id') ?? null, messages: document.querySelectorAll('.cr-agent[data-message-id]').length, editor: editor?.textContent?.replace(/[\\uFEFF\\u200B]/g, '').trim() ?? null };
-    })()`;
+        const snapshot = `(() => { const selected = [...document.querySelectorAll('[data-conversation-id]')].find((item) => String(item.className).includes('_selected_')); const editor = document.querySelector(${JSON.stringify(exports.editorSelector)}); const text = editor?.cloneNode(true); text?.querySelectorAll('[data-slate-placeholder="true"],[data-slate-zero-width]').forEach((item) => item.remove()); return { url: location.href, conversationId: selected?.getAttribute('data-conversation-id') ?? null, selected: Boolean(selected), messages: document.querySelectorAll('.cr-agent[data-message-id]').length, editor: text?.textContent?.replace(/[\\uFEFF\\u200B]/g, '').trim() ?? null, home: Boolean(editor?.querySelector('[data-slate-placeholder="true"]')) }; })()`;
         const before = await this.evaluate(snapshot);
         if (!await this.evaluate(`(() => { const button = [...document.querySelectorAll('button,[role="button"]')].find((item) => item.textContent?.trim() === '新建任务'); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`))
             throw new Error("WorkBuddy 新建任务入口未找到或不可用");
-        // 落地页在首条消息前没有任务 ID；旧任务 ID 消失或启动时已经空白均可确认落地状态。
-        const wasLanding = before.conversationId === null && before.messages === 0 && before.editor === "";
-        await this.waitFor(`(() => { const state = ${snapshot}; return state.editor === '' && state.messages === 0 && (state.conversationId !== ${JSON.stringify(before.conversationId)} || state.url !== ${JSON.stringify(before.url)} || (${wasLanding} && state.conversationId === null)); })()`, "WorkBuddy 新任务状态校验失败");
+        // WorkBuddy 首页不分配任务 ID；此时仅接受无选中任务的空白首页。
+        await this.waitFor(`(() => { const state = ${snapshot}; const blank = state.editor !== null && state.editor.trim() === '' && state.messages === 0; return blank && ((state.conversationId && state.conversationId !== ${JSON.stringify(before.conversationId)}) || state.url !== ${JSON.stringify(before.url)} || (state.home && !state.selected)); })()`, "WorkBuddy 新任务状态校验失败");
     }
     async direct(text, timeoutMs = 240_000, expert, newTask = false) {
         return (await this.complete({ task: text, timeoutMs }, expert, newTask)).text;
@@ -59,6 +71,16 @@ class WorkbuddyCdpClient {
         (0, attachments_1.validateAttachments)(request.attachments);
         const text = request.task;
         const timeoutMs = request.timeoutMs ?? 240_000;
+        if (!this.pendingInteraction && request.sessionId && !newTask && !expert) {
+            const interaction = await this.readInteraction();
+            if (interaction)
+                this.pendingInteraction = { ...interaction, sessionId: request.sessionId };
+        }
+        if (this.pendingInteraction) {
+            if (this.pendingInteraction.sessionId && this.pendingInteraction.sessionId !== request.sessionId)
+                throw new Error("WorkBuddy 正在等待另一个会话的选择");
+            return this.continueInteraction(text, timeoutMs, request.onMessage);
+        }
         if (expert)
             await this.selectExpert(expert);
         else if (newTask)
@@ -91,28 +113,53 @@ class WorkbuddyCdpClient {
             await this.waitFor(`(() => { const button = document.querySelector('button[aria-label="发送"]'); return Boolean(button && !button.disabled); })()`, "WorkBuddy 发送按钮未就绪");
             if (!await this.evaluate(`(() => { const button = document.querySelector('button[aria-label="发送"]'); if (!button || button.disabled) return false; button.click(); return true; })()`))
                 throw new Error("WorkBuddy 发送按钮不可用");
-            const deadline = Date.now() + timeoutMs;
-            while (Date.now() < deadline) {
-                await sleep(1_000);
-                const current = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => ({ id: element.getAttribute('data-message-id'), text: element.querySelector('[data-assistant-content]')?.innerText, finished: Boolean(element.querySelector('[data-testid="conversation-finished-footer"]')) })))`)));
-                const completed = current.filter((item) => item.id && !beforeIds.has(item.id) && item.finished);
-                const reply = completed.filter((item) => item.text?.trim()).at(-1)?.text?.trim();
-                if (completed.length) {
-                    const attachments = await this.readArtifacts(new Set(completed.map((item) => item.id)));
-                    if (attachments.length)
-                        return { text: reply ?? "", attachments };
-                    if (reply)
-                        return { text: reply };
+            const response = await this.waitForReply(beforeIds, timeoutMs, undefined, undefined, request.sessionId, request.onMessage);
+            if (this.pendingInteraction && temporaryPaths.length)
+                this.pendingInteractionCleanup = temporaryPaths;
+            return response;
+        }
+        catch (error) {
+            failure = error;
+            throw error;
+        }
+        finally {
+            if (temporaryPaths.length && this.pendingInteractionCleanup !== temporaryPaths) {
+                try {
+                    await this.cleanupTemporaryFiles(temporaryPaths);
+                }
+                catch (error) {
+                    if (failure !== undefined)
+                        throw new AggregateError([failure, error], `${failure instanceof Error ? failure.message : String(failure)}；临时附件清理失败`, { cause: failure });
+                    throw error;
                 }
             }
-            throw new Error("WorkBuddy UI 回复超时");
+        }
+    }
+    async continueInteraction(answer, timeoutMs, onMessage) {
+        const interaction = this.pendingInteraction;
+        const index = interactionChoice(answer, interaction.options);
+        if (index === undefined)
+            return { text: formatInteraction(interaction) };
+        const temporaryPaths = this.pendingInteractionCleanup;
+        const before = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => element.getAttribute('data-message-id'))) `)));
+        const beforeIds = new Set((Array.isArray(before) ? before : []).filter((id) => typeof id === "string"));
+        if (!await this.evaluate(`(() => { const options = [...document.querySelectorAll(${JSON.stringify(interactionOptionSelector)})]; const option = options[${index}]; if (!option || option.disabled || option.getAttribute('aria-disabled') === 'true') return false; option.click(); return true; })()`))
+            throw new Error("WorkBuddy 选择项不可用");
+        this.pendingInteraction = undefined;
+        let failure;
+        try {
+            const response = await this.waitForReply(beforeIds, timeoutMs, interaction.messageId, interaction.initialText, interaction.sessionId, onMessage);
+            if (!this.pendingInteraction)
+                this.pendingInteractionCleanup = undefined;
+            return response;
         }
         catch (error) {
             failure = error;
             throw error;
         }
         finally {
-            if (temporaryPaths.length) {
+            if (temporaryPaths && !this.pendingInteraction) {
+                this.pendingInteractionCleanup = undefined;
                 try {
                     await this.cleanupTemporaryFiles(temporaryPaths);
                 }
@@ -124,6 +171,66 @@ class WorkbuddyCdpClient {
             }
         }
     }
+    async waitForReply(beforeIds, timeoutMs, changedId, initialText, sessionId, onMessage) {
+        const deadline = Date.now() + timeoutMs;
+        const previousText = new Map();
+        const stablePolls = new Map();
+        const forwarded = new Set();
+        while (Date.now() < deadline) {
+            await sleep(1_000);
+            const current = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => { const content = element.querySelector('[data-assistant-content]'); let text = content?.innerText?.trim() || ''; for (const thought of content?.querySelectorAll?.('.cr-reasoning') || []) text = text.replace(thought.innerText || '', ''); text = text.trim(); const finished = Boolean(element.querySelector('[data-testid="conversation-finished-footer"]')); const stopped = Boolean(text) && !document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"],[aria-busy="true"]'); return { id: element.getAttribute('data-message-id'), text, finished: finished, stopped: stopped }; }))`)));
+            const interaction = await this.readInteraction();
+            const candidates = current.filter((item) => item.id && (!beforeIds.has(item.id) || item.id === changedId && item.text !== initialText));
+            for (const item of candidates) {
+                const id = item.id;
+                const text = item.text?.trim() ?? "";
+                const count = text && text === previousText.get(id) ? (stablePolls.get(id) ?? 0) + 1 : text ? 1 : 0;
+                previousText.set(id, text);
+                stablePolls.set(id, count);
+            }
+            if (interaction) {
+                const body = candidates.map((item) => item.text?.trim()).filter((text) => Boolean(text && !forwarded.has(text)));
+                if (onMessage)
+                    for (const text of body) {
+                        await onMessage(text);
+                        forwarded.add(text);
+                    }
+                const latest = candidates.at(-1) ?? current.at(-1);
+                this.pendingInteraction = { ...interaction, messageId: interaction.messageId ?? latest?.id ?? undefined, initialText: interaction.initialText ?? latest?.text ?? "", sessionId };
+                return { text: [...(onMessage ? [] : body), formatInteraction(this.pendingInteraction)].join("\n\n") };
+            }
+            const latest = candidates.at(-1);
+            const completed = candidates.filter((item) => item.finished || Boolean(item.stopped && (stablePolls.get(item.id) ?? 0) >= 2));
+            const reply = candidates.map((item) => item.text?.trim()).filter((text) => text && !forwarded.has(text)).join("\n\n");
+            const latestComplete = latest && (latest.finished || Boolean(latest.stopped && (stablePolls.get(latest.id) ?? 0) >= 2));
+            if (latestComplete && completed.length) {
+                const attachments = await this.readArtifacts(new Set(completed.map((item) => item.id)));
+                if (attachments.length)
+                    return { text: reply ?? "", attachments };
+                if (reply || forwarded.size)
+                    return { text: reply };
+            }
+            if (onMessage) {
+                for (const item of candidates) {
+                    const text = item.text?.trim();
+                    if (text && (stablePolls.get(item.id) ?? 0) >= 2 && !forwarded.has(text)) {
+                        await onMessage(text);
+                        forwarded.add(text);
+                    }
+                }
+            }
+        }
+        throw new Error("WorkBuddy UI 回复超时");
+    }
+    async readInteraction() {
+        const raw = await this.evaluate(`JSON.stringify((() => { const nodes = [...document.querySelectorAll(${JSON.stringify(interactionOptionSelector)})]; if (!nodes.length) return null; const root = nodes[0].closest('[role="dialog"],.pending-sandbox-panel,.conversation-high-credit-approval') || nodes[0].parentElement; const rawOptions = nodes.map(node => (node.innerText || node.textContent)?.trim() || '').filter(Boolean); let prompt = root?.innerText?.trim() || ''; for (const option of rawOptions) prompt = prompt.replace(option, ''); return { prompt: prompt.replace(/\\n{2,}/g, '\\n').trim(), options: rawOptions.map(option => option.replace(/^\\d+\\s*[.、:：)]?\\s*/, '').trim()), messageId: nodes[0].closest('.cr-agent[data-message-id]')?.getAttribute('data-message-id') || undefined, initialText: nodes[0].closest('.cr-agent[data-message-id]')?.querySelector('[data-assistant-content]')?.innerText?.trim() || '' }; })())`);
+        if (!raw || raw === "null" || raw === "undefined")
+            return undefined;
+        const value = JSON.parse(String(raw));
+        if (!Array.isArray(value.options) || value.options.length === 0 || value.options.some((option) => typeof option !== "string" || !option.trim()))
+            return undefined;
+        return { prompt: typeof value.prompt === "string" ? value.prompt : "请选择：", options: value.options, ...(typeof value.messageId === "string" ? { messageId: value.messageId } : {}), ...(typeof value.initialText === "string" ? { initialText: value.initialText } : {}) };
+    }
     async injectAttachments(items, temporaryPaths = []) {
         const before = await this.evaluate(`JSON.stringify([...document.querySelector(${JSON.stringify(exports.editorSelector)}).querySelectorAll('[class*="_fileTag"]')].map(element => element.textContent?.trim()).filter(Boolean))`);
         if (JSON.parse(String(before)).length)

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

@@ -13,7 +13,7 @@ const plugin_1 = require("../../plugin");
 const cdp_client_1 = require("./cdp-client");
 const cli_client_1 = require("./cli-client");
 exports.workbuddyManifest = {
-    id: "workbuddy", version: "1.1.6", displayName: "WorkBuddy", type: "agent",
+    id: "workbuddy", version: "1.1.11", displayName: "WorkBuddy", type: "agent",
     entry: "dist/index.js", apiVersion: "1", process: "in-process",
     capabilities: ["chat", "health"], configSchema: "config.schema.json",
 };
@@ -41,6 +41,7 @@ class WorkbuddyPlugin {
     queue = Promise.resolve();
     pending = 0;
     activeSessionId;
+    activeDesktopConversationId;
     desktopSessionValid = true;
     knownSessions = new Set();
     sessionDataDir;
@@ -63,14 +64,18 @@ class WorkbuddyPlugin {
         this.cliPath = (0, cli_client_1.findCli)(typeof config.cliPath === "string" ? config.cliPath : undefined);
         this.failure = undefined;
         this.activeSessionId = undefined;
+        this.activeDesktopConversationId = undefined;
         this.activeExpert = undefined;
         this.expertSession = false;
         this.desktopSessionValid = true;
         this.knownSessions.clear();
         this.sessionDataDir = context.dataDir;
+        let savedBinding;
         if (this.sessionDataDir) {
-            for (const sessionId of await this.loadKnownSessions(this.sessionDataDir))
+            const saved = await this.loadKnownSessions(this.sessionDataDir);
+            for (const sessionId of saved.sessionIds)
                 this.knownSessions.add(sessionId);
+            savedBinding = saved.active;
         }
         this.sessionOperations = [];
         if (this.transport === "cli") {
@@ -91,6 +96,11 @@ class WorkbuddyPlugin {
                 throw error;
         }
         this.sessionOperations = (this.transport === "cdp" || !this.cliPath) && this.client?.createTask ? ["new"] : [];
+        if (savedBinding && this.sessionOperations.length && await this.client?.conversationId?.() === savedBinding.conversationId) {
+            this.activeSessionId = savedBinding.sessionId;
+            this.activeDesktopConversationId = savedBinding.conversationId;
+            this.activeExpert = savedBinding.expert;
+        }
     }
     async deactivate(_reason) {
         await this.queue;
@@ -111,7 +121,17 @@ class WorkbuddyPlugin {
         if (!request.task.trim())
             throw new Error("消息内容不能为空");
         (0, attachments_1.validateAttachments)(request.attachments);
-        const run = this.enqueue(() => this.complete(request));
+        const run = this.enqueue(async () => {
+            try {
+                return await this.complete(request);
+            }
+            finally {
+                if (this.activeSessionId && this.desktopSessionValid && this.client?.conversationId) {
+                    this.activeDesktopConversationId = await this.client.conversationId();
+                    await this.persistKnownSessions();
+                }
+            }
+        });
         const response = await run;
         return { ...response, sessionId: request.sessionId ?? response.sessionId };
     }
@@ -141,6 +161,9 @@ class WorkbuddyPlugin {
         const hasAttachments = Array.isArray(request.attachments) && request.attachments.length > 0;
         if (hasAttachments && !this.attachmentInput)
             throw new Error("WorkBuddy 当前传输不支持附件输入");
+        const pendingInteractionSessionId = this.client?.pendingInteractionSessionId?.();
+        if (!usesCli && pendingInteractionSessionId && pendingInteractionSessionId !== request.sessionId)
+            throw new Error("WorkBuddy 正在等待另一个会话的选择");
         if (usesCli && request.sessionId)
             throw new Error("CodeBuddy CLI 会话隔离未验证，不能处理带 sessionId 的请求");
         if (!usesCli && !request.sessionId && this.activeSessionId)
@@ -196,8 +219,13 @@ class WorkbuddyPlugin {
             throw new Error("WorkBuddy CDP 未连接");
         if (!this.client.createTask)
             throw new Error("WorkBuddy 客户端不支持新建会话");
-        if (this.activeSessionId === sessionId && this.desktopSessionValid)
+        if (this.activeSessionId === sessionId && this.desktopSessionValid) {
+            if (this.activeDesktopConversationId && await this.client.conversationId?.() !== this.activeDesktopConversationId) {
+                this.desktopSessionValid = false;
+                throw new Error("WorkBuddy 桌面任务已切换，请先创建新会话");
+            }
             return;
+        }
         if (this.knownSessions.has(sessionId))
             throw new Error("WorkBuddy 不支持恢复旧 WorkBuddy 会话");
         await this.createSession(sessionId);
@@ -205,6 +233,8 @@ class WorkbuddyPlugin {
     async createSession(sessionId, name) {
         // 点击失败时桌面可能已经切换，保留逻辑绑定但禁止向未知任务续发。
         this.desktopSessionValid = false;
+        this.activeSessionId = undefined;
+        this.activeDesktopConversationId = undefined;
         this.knownSessions.add(sessionId);
         await this.persistKnownSessions();
         await this.client.createTask(name);
@@ -221,11 +251,14 @@ class WorkbuddyPlugin {
             const sessionIds = parsed.sessionIds;
             if (!Array.isArray(sessionIds) || sessionIds.some((sessionId) => typeof sessionId !== "string" || !sessionId.trim()))
                 throw new Error("sessionIds 无效");
-            return new Set(sessionIds);
+            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 } : {}) };
         }
         catch (error) {
             if (error.code === "ENOENT")
-                return new Set();
+                return { sessionIds: new Set() };
             if (error instanceof SyntaxError || error instanceof Error)
                 throw new Error(`WorkBuddy 已知会话记录无效：${error.message}`);
             throw new Error("WorkBuddy 已知会话记录无效");
@@ -237,7 +270,8 @@ class WorkbuddyPlugin {
         const write = this.sessionWrites.catch(() => { }).then(async () => {
             await (0, promises_1.mkdir)(this.sessionDataDir, { recursive: true });
             const file = (0, node_path_1.join)(this.sessionDataDir, "known-sessions.json");
-            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort() })}\n`, { mode: 0o600 });
+            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 });
             await (0, promises_1.rename)(`${file}.tmp`, file);
         });
         this.sessionWrites = write;

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

@@ -190,6 +190,194 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
     strict_1.default.equal(clicks, 1);
     strict_1.default.ok(readinessChecks >= 3);
 });
+(0, node_test_1.default)("workbuddy CDP 页面已停止但没有完成标记时仍回传可见文本", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    let polls = 0;
+    const internal = client;
+    internal.cdp = async () => undefined;
+    internal.readArtifacts = async () => [];
+    internal.evaluate = async (expression) => {
+        if (expression.includes("finished:")) {
+            polls++;
+            return JSON.stringify([{ id: "new", text: "视频已停止", finished: false, stopped: true }]);
+        }
+        if (expression.includes("conversation-input-area"))
+            return "[]";
+        if (expression.includes('button[aria-label="发送"]'))
+            return true;
+        if (expression.includes("JSON.stringify"))
+            return "[]";
+        return true;
+    };
+    strict_1.default.deepEqual(await client.complete({ task: "继续", timeoutMs: 2_200 }), { text: "视频已停止" });
+    strict_1.default.ok(polls >= 2);
+});
+(0, node_test_1.default)("workbuddy CDP 选择后仍在处理时不能把工具状态当成最终回复", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    let polls = 0;
+    const internal = client;
+    internal.readArtifacts = async () => [];
+    const message = {
+        getAttribute: (name) => name === "data-message-id" ? "new" : name === "data-message-processing" && polls < 3 ? "true" : null,
+        querySelector: (selector) => selector === "[data-assistant-content]" ? { innerText: polls < 3 ? "执行中\nSensitiveProtection" : "图片已收到：1024×768" } : polls >= 3 ? {} : null,
+    };
+    internal.evaluate = async (expression) => {
+        if (expression.includes("finished:"))
+            polls++;
+        return (0, node_vm_1.runInNewContext)(expression, { document: {
+                querySelectorAll: (selector) => selector === ".cr-agent[data-message-id]" ? [message] : [],
+                querySelector: (selector) => selector.includes('button[aria-label="停止"]') && polls < 3 ? {} : null,
+            } });
+    };
+    strict_1.default.deepEqual(await internal.waitForReply(new Set(), 4_000), { text: "图片已收到：1024×768" });
+    strict_1.default.equal(polls, 3);
+});
+(0, node_test_1.default)("workbuddy CDP 选择框先回传选项，收到序号后点击并继续等待", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    let polls = 0;
+    let clicks = 0;
+    const internal = client;
+    internal.cdp = async () => undefined;
+    internal.readArtifacts = async () => [];
+    internal.evaluate = async (expression) => {
+        if (expression.includes("finished:")) {
+            polls++;
+            return JSON.stringify(polls === 1
+                ? [{ id: "new", text: "", finished: false, stopped: false }]
+                : [{ id: "new", text: "视频已开始", finished: true, stopped: true }]);
+        }
+        if (expression.includes("option.click")) {
+            clicks++;
+            return true;
+        }
+        if (expression.includes("conversation-input-area")) {
+            strict_1.default.match(expression, /conversation-input-area/);
+            return polls === 1 ? JSON.stringify({ prompt: "确认开始生成视频？", options: ["确认", "本次会话始终允许", "拒绝"], messageId: "new", initialText: "" }) : "[]";
+        }
+        if (expression.includes('button[aria-label="发送"]'))
+            return true;
+        if (expression.includes("JSON.stringify"))
+            return "[]";
+        return true;
+    };
+    strict_1.default.equal((await client.complete({ task: "生成视频", timeoutMs: 2_200 })).text, "确认开始生成视频？\n1. 确认\n2. 本次会话始终允许\n3. 拒绝");
+    strict_1.default.deepEqual(await client.complete({ task: "1", timeoutMs: 2_200 }), { text: "视频已开始" });
+    strict_1.default.equal(clicks, 1);
+});
+(0, node_test_1.default)("workbuddy CDP 回传敏感凭证选择框并按同一组选项继续", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    let clicked = -1;
+    const labels = ["允许访问", "允许加密访问（推荐）", "禁止访问"];
+    const root = { innerText: `是否允许模型访问敏感凭证？\n${labels.map((text, index) => `${index + 1}\n${text}`).join("\n")}` };
+    const nodes = labels.map((text, index) => ({
+        innerText: `${index + 1}\n${text}`, textContent: `${index + 1}${text}`,
+        parentElement: { innerText: "只有选项" },
+        closest: (selector) => selector.includes("pending-sandbox-panel") ? root : null,
+        getAttribute: () => null, click: () => { clicked = index; },
+    }));
+    const internal = client;
+    internal.evaluate = async (expression) => (0, node_vm_1.runInNewContext)(expression, { document: { querySelectorAll: (selector) => selector.includes(".pending-sandbox-panel button") ? nodes : [] } });
+    const interaction = await internal.readInteraction();
+    strict_1.default.deepEqual(interaction, { prompt: "是否允许模型访问敏感凭证？", options: labels, initialText: "" });
+    internal.pendingInteraction = interaction;
+    internal.waitForReply = async () => ({ text: "已继续" });
+    strict_1.default.deepEqual(await client.complete({ task: "2" }), { text: "已继续" });
+    strict_1.default.equal(clicked, 1);
+});
+(0, node_test_1.default)("workbuddy CDP 高额确认框只读取按钮选项", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    const labels = ["确认", "本次会话始终允许", "拒绝"];
+    const root = { innerText: `确认开始生成视频？\n积分消耗较高\n${labels.map((text, index) => `${index + 1}\n${text}`).join("\n")}` };
+    const nodes = labels.map((text, index) => ({
+        tagName: "BUTTON", className: "conversation-high-credit-approval__option", innerText: `${index + 1}\n${text}`, textContent: `${index + 1}${text}`,
+        closest: (selector) => selector.includes("conversation-high-credit-approval") ? root : null,
+        getAttribute: (name) => name === "data-message-id" ? "new" : null,
+        querySelector: () => ({ innerText: "" }), click: () => undefined,
+    }));
+    const descendants = nodes.flatMap((node, index) => [node,
+        { ...node, tagName: "SPAN", className: "conversation-high-credit-approval__option-num", innerText: String(index + 1) },
+        { ...node, tagName: "SPAN", className: "conversation-high-credit-approval__option-text", innerText: labels[index] },
+    ]);
+    const internal = client;
+    internal.evaluate = async (expression) => (0, node_vm_1.runInNewContext)(expression, { document: {
+            querySelectorAll: (selector) => {
+                return descendants.filter(node => selector.split(",").some(part => {
+                    if (part.startsWith("."))
+                        return part.slice(1) === node.className;
+                    if (part.startsWith("button") && node.tagName !== "BUTTON")
+                        return false;
+                    const classes = [...part.matchAll(/\[class\*=['"]([^'"]+)['"]\]/g)].map(match => match[1]);
+                    return classes.length > 0 && classes.every(value => node.className.includes(value));
+                }));
+            },
+        } });
+    strict_1.default.deepEqual(await internal.readInteraction(), { prompt: "确认开始生成视频？\n积分消耗较高", options: labels, initialText: "" });
+});
+(0, node_test_1.default)("workbuddy CDP 执行中的可见消息也回传，不等待最终答案", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    const forwarded = [];
+    let polls = 0;
+    const internal = client;
+    internal.readArtifacts = async () => [];
+    internal.evaluate = async (expression) => {
+        if (expression.includes("finished:")) {
+            polls++;
+            return JSON.stringify([{ id: "new", text: polls < 3 ? "请补充视频时长" : "视频已生成", finished: polls >= 3, stopped: false }]);
+        }
+        return "null";
+    };
+    strict_1.default.deepEqual(await internal.waitForReply(new Set(), 4_000, undefined, undefined, "peer", async (text) => { forwarded.push(text); }), { text: "视频已生成" });
+    strict_1.default.deepEqual(forwarded, ["请补充视频时长"]);
+});
+(0, node_test_1.default)("workbuddy CDP 多条可见消息逐条回传，不只取最新一条", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    const forwarded = [];
+    let polls = 0;
+    const internal = client;
+    internal.readArtifacts = async () => [];
+    internal.evaluate = async (expression) => {
+        if (expression.includes("finished:")) {
+            polls++;
+            return JSON.stringify([
+                { id: "first", text: "第一条结果", finished: true, stopped: true },
+                { id: "second", text: polls < 3 ? "第二条处理中" : "第二条结果", finished: polls >= 3, stopped: polls >= 3 },
+            ]);
+        }
+        return "null";
+    };
+    strict_1.default.deepEqual(await internal.waitForReply(new Set(), 4_000, undefined, undefined, "peer", async (text) => { forwarded.push(text); }), { text: "第二条结果" });
+    strict_1.default.deepEqual(forwarded, ["第一条结果", "第二条处理中"]);
+});
+(0, node_test_1.default)("workbuddy CDP 只过滤思考区域，保留全部可见正文", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    const content = { innerText: "深度思考\n内部推理\n请确认是否继续\n生成结果已保存", querySelectorAll: () => [{ innerText: "深度思考\n内部推理\n" }] };
+    const message = { getAttribute: () => "new", querySelector: (selector) => selector === "[data-assistant-content]" ? content : {} };
+    const internal = client;
+    internal.readArtifacts = async () => [];
+    internal.evaluate = async (expression) => (0, node_vm_1.runInNewContext)(expression, { document: {
+            querySelectorAll: (selector) => selector === ".cr-agent[data-message-id]" ? [message] : [],
+            querySelector: () => null,
+        } });
+    strict_1.default.deepEqual(await internal.waitForReply(new Set(), 2_000), { text: "请确认是否继续\n生成结果已保存" });
+});
+(0, node_test_1.default)("workbuddy CDP 选择框不截断同轮可见正文", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    const forwarded = [];
+    const internal = client;
+    internal.evaluate = async (expression) => expression.includes("finished:")
+        ? JSON.stringify([{ id: "new", text: "已准备好，请选择项目", finished: false, stopped: false }])
+        : JSON.stringify({ prompt: "选择项目", options: ["项目甲", "项目乙"] });
+    strict_1.default.deepEqual(await internal.waitForReply(new Set(), 2_000, undefined, undefined, "peer", async (text) => { forwarded.push(text); }), { text: "选择项目\n1. 项目甲\n2. 项目乙" });
+    strict_1.default.deepEqual(forwarded, ["已准备好，请选择项目"]);
+});
+(0, node_test_1.default)("workbuddy CDP 重载后从当前会话恢复选择框，不重复发送任务", async () => {
+    const client = new cdp_client_1.WorkbuddyCdpClient();
+    const internal = client;
+    internal.cdp = async () => { throw new Error("不应重新输入任务"); };
+    internal.evaluate = async (expression) => expression.includes("conversation-input-area") ? JSON.stringify({ prompt: "确认开始生成视频？", options: ["确认", "拒绝"] }) : "[]";
+    strict_1.default.deepEqual(await client.complete({ task: "查看待选项", sessionId: "session-a" }), { text: "确认开始生成视频？\n1. 确认\n2. 拒绝" });
+    strict_1.default.equal(client.pendingInteractionSessionId(), "session-a");
+});
 (0, node_test_1.default)("workbuddy CDP 附件改变正文时拒绝发送", async () => {
     const client = new cdp_client_1.WorkbuddyCdpClient();
     let sent = false;
@@ -495,21 +683,34 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
         await (0, promises_1.rm)(root, { recursive: true, force: true });
     }
 });
-(0, node_test_1.default)("workbuddy CDP 新建必须同时核验新任务身份和空白界面", async () => {
-    for (const [clearsMessages, changesIdentity] of [[true, true], [false, true], [true, false]]) {
-        let messages = 1;
+(0, node_test_1.default)("workbuddy CDP 新建核验新身份或空白首页，拒绝旧任务和残留草稿", async () => {
+    for (const [initialMessages, clearsMessages, changesIdentity, home, draft, succeeds] of [
+        [1, true, true, false, "", true],
+        [1, false, true, false, "", false],
+        [1, true, false, false, "", false],
+        [1, true, false, true, "", true],
+        [0, true, false, true, "", true],
+        [1, true, false, true, "未发送草稿", false],
+    ]) {
+        let messages = initialMessages;
         let conversationId = "old-conversation";
-        const button = { textContent: "新建任务", disabled: false, getAttribute: () => null, click: () => { if (clearsMessages)
+        let clicked = false;
+        const button = { textContent: "新建任务", disabled: false, getAttribute: () => null, click: () => { clicked = true; if (clearsMessages)
                 messages = 0; if (changesIdentity)
                 conversationId = "new-conversation"; } };
+        const editor = {
+            innerText: home ? `\uFEFF\n今天帮你做些什么？${draft}` : draft,
+            querySelector: () => home && clicked ? { textContent: "今天帮你做些什么？@ 添加上下文，/调用技能与指令" } : null,
+            cloneNode: () => ({ textContent: draft, querySelectorAll: () => [{ remove() { } }] }),
+        };
         const document = {
-            querySelectorAll: (selector) => selector === '.cr-agent[data-message-id]' ? Array(messages).fill({}) : selector === '[data-conversation-id]' ? [{ className: "_selected_old", getAttribute: () => conversationId }] : [button],
-            querySelector: () => ({ innerText: "", cloneNode: () => ({ textContent: "", querySelectorAll: () => [] }) }),
+            querySelectorAll: (selector) => selector === '.cr-agent[data-message-id]' ? Array(messages).fill({}) : selector === '[data-conversation-id]' ? home && clicked ? [] : [{ className: "_selected_old", getAttribute: () => conversationId }] : [button],
+            querySelector: () => editor,
         };
         const client = new cdp_client_1.WorkbuddyCdpClient({ timeoutMs: 1 });
         const evaluator = client;
         evaluator.evaluate = async (expression) => (0, node_vm_1.runInNewContext)(expression, { document, location: { href: "app://workbuddy/task/old" } });
-        if (clearsMessages && changesIdentity)
+        if (succeeds)
             await client.createTask();
         else
             await strict_1.default.rejects(() => client.createTask(), /新任务状态校验失败/);
@@ -521,7 +722,7 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
         let messages = initialId ? 1 : 0;
         let placeholderRemoved = false;
         const clone = { get textContent() { return placeholderRemoved ? "\uFEFF\u200B\n" : "\uFEFF\u200B\n今天帮你做些什么？"; }, querySelectorAll: () => [{ remove: () => { placeholderRemoved = true; } }] };
-        const editor = { innerText: "\uFEFF\u200B\n今天帮你做些什么？", cloneNode: () => { placeholderRemoved = false; return clone; } };
+        const editor = { innerText: "\uFEFF\u200B\n今天帮你做些什么？", querySelector: () => conversationId === null ? {} : null, cloneNode: () => { placeholderRemoved = false; return clone; } };
         const button = { textContent: "新建任务", disabled: false, getAttribute: () => null, click: () => { conversationId = null; messages = 0; } };
         const document = {
             querySelectorAll: (selector) => selector === '.cr-agent[data-message-id]' ? Array(messages).fill({}) : selector === '[data-conversation-id]' ? conversationId ? [{ className: "_selected_old", getAttribute: () => conversationId }] : [] : [button],
@@ -538,7 +739,7 @@ const cdp_client_1 = require("../src-ts/plugins/workbuddy/cdp-client");
     const button = { textContent: "新建任务", disabled: false, getAttribute: () => null, click: () => { messages = 0; } };
     const document = {
         querySelectorAll: (selector) => selector === '.cr-agent[data-message-id]' ? Array(messages).fill({}) : selector === '[data-conversation-id]' ? [] : [button],
-        querySelector: () => ({ innerText: "", cloneNode: () => ({ textContent: "", querySelectorAll: () => [] }) }),
+        querySelector: () => ({ innerText: "", querySelector: () => null, cloneNode: () => ({ textContent: "", querySelectorAll: () => [] }) }),
     };
     const client = new cdp_client_1.WorkbuddyCdpClient({ timeoutMs: 1 });
     const internal = client;
@@ -643,6 +844,36 @@ 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 重载只恢复仍指向同一桌面任务的绑定", async () => {
+    const dataDir = await (0, promises_1.mkdtemp)((0, node_path_1.join)((0, node_os_1.tmpdir)(), "wb-active-session-"));
+    let creates = 0;
+    let desktopId = "desktop-a";
+    const client = {
+        connect: async () => undefined, close() { }, connected: () => true,
+        conversationId: async () => desktopId,
+        createTask: async () => { creates++; }, direct: async (task) => 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: "首次", sessionId: "session-a" });
+        await first.deactivate("reload");
+        const second = new workbuddy_1.WorkbuddyPlugin({ client });
+        await second.activate(context);
+        strict_1.default.equal((await second.handle({ task: "继续", sessionId: "session-a" })).text, "继续");
+        strict_1.default.equal(creates, 1);
+        await second.deactivate("reload");
+        desktopId = "desktop-b";
+        const third = new workbuddy_1.WorkbuddyPlugin({ client });
+        await third.activate(context);
+        await strict_1.default.rejects(() => third.handle({ task: "不应串会话", sessionId: "session-a" }), /不支持恢复旧 WorkBuddy 会话/);
+        await third.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.33",
+  "version": "1.0.34",
   "description": "将 AUN Agent 连接到本地桌面 AI 客户端的插件平台。",
   "main": "dist/src-ts/cli.js",
   "bin": {

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

@@ -4,6 +4,17 @@ exports.WorkbuddyCdpClient = exports.assistantSelector = exports.editorSelector
 const node_crypto_1 = require("node:crypto");
 const attachments_1 = require("../../attachments");
 function sleep(ms) { return new Promise((resolve) => setTimeout(resolve, ms)); }
+const interactionOptionSelector = '.conversation-input-area [role="dialog"] button,.pending-sandbox-panel button,button[class*="conversation-"][class*="__option"]';
+function interactionText(value) { return value.normalize("NFKC").replace(/[\uFEFF\u200B]/g, "").trim(); }
+function formatInteraction(value) { return [value.prompt, ...value.options.map((option, index) => `${index + 1}. ${option}`)].filter(Boolean).join("\n"); }
+function interactionChoice(value, options) {
+    const input = interactionText(value).replace(/^[第\s]*(\d+)[、.。:：)]?\s*$/, "$1");
+    const number = Number(input);
+    if (Number.isInteger(number) && number >= 1 && number <= options.length && String(number) === input)
+        return number - 1;
+    const index = options.findIndex((option) => interactionText(option) === input);
+    return index >= 0 ? index : undefined;
+}
 exports.editorSelector = '[data-slate-editor][contenteditable="true"]';
 exports.assistantSelector = '.cr-agent[data-message-id] [data-assistant-content]';
 class WorkbuddyCdpClient {
@@ -11,11 +22,18 @@ class WorkbuddyCdpClient {
     socket;
     sequence = 0;
     pending = new Map();
+    pendingInteraction;
+    pendingInteractionCleanup;
     port;
     timeoutMs;
     fetchImpl;
     constructor(options = {}) { this.port = options.port ?? Number(process.env.WORKBUDDY_CDP_PORT ?? "9229"); this.timeoutMs = options.timeoutMs ?? 30_000; this.fetchImpl = options.fetchImpl ?? fetch; }
     connected() { return Boolean(this.socket); }
+    pendingInteractionSessionId() { return this.pendingInteraction?.sessionId; }
+    async conversationId() {
+        const value = await this.evaluate(`([...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_')))?.getAttribute('data-conversation-id')`);
+        return typeof value === "string" && value.trim() ? value : undefined;
+    }
     async connect() {
         if (this.socket)
             return;
@@ -39,18 +57,12 @@ class WorkbuddyCdpClient {
     close() { this.socket?.close(); this.socket = undefined; for (const pending of this.pending.values())
         pending.reject(new Error("WorkBuddy CDP 已关闭")); this.pending.clear(); }
     async createTask() {
-        const snapshot = `(() => {
-      const selected = [...document.querySelectorAll('[data-conversation-id]')].find((item) => String(item.className).includes('_selected_'));
-      const editor = document.querySelector(${JSON.stringify(exports.editorSelector)})?.cloneNode(true);
-      for (const placeholder of editor?.querySelectorAll('[data-slate-placeholder]') ?? []) placeholder.remove();
-      return { url: location.href.split(/[?#]/, 1)[0], conversationId: selected?.getAttribute('data-conversation-id') ?? null, messages: document.querySelectorAll('.cr-agent[data-message-id]').length, editor: editor?.textContent?.replace(/[\\uFEFF\\u200B]/g, '').trim() ?? null };
-    })()`;
+        const snapshot = `(() => { const selected = [...document.querySelectorAll('[data-conversation-id]')].find((item) => String(item.className).includes('_selected_')); const editor = document.querySelector(${JSON.stringify(exports.editorSelector)}); const text = editor?.cloneNode(true); text?.querySelectorAll('[data-slate-placeholder="true"],[data-slate-zero-width]').forEach((item) => item.remove()); return { url: location.href, conversationId: selected?.getAttribute('data-conversation-id') ?? null, selected: Boolean(selected), messages: document.querySelectorAll('.cr-agent[data-message-id]').length, editor: text?.textContent?.replace(/[\\uFEFF\\u200B]/g, '').trim() ?? null, home: Boolean(editor?.querySelector('[data-slate-placeholder="true"]')) }; })()`;
         const before = await this.evaluate(snapshot);
         if (!await this.evaluate(`(() => { const button = [...document.querySelectorAll('button,[role="button"]')].find((item) => item.textContent?.trim() === '新建任务'); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`))
             throw new Error("WorkBuddy 新建任务入口未找到或不可用");
-        // 落地页在首条消息前没有任务 ID；旧任务 ID 消失或启动时已经空白均可确认落地状态。
-        const wasLanding = before.conversationId === null && before.messages === 0 && before.editor === "";
-        await this.waitFor(`(() => { const state = ${snapshot}; return state.editor === '' && state.messages === 0 && (state.conversationId !== ${JSON.stringify(before.conversationId)} || state.url !== ${JSON.stringify(before.url)} || (${wasLanding} && state.conversationId === null)); })()`, "WorkBuddy 新任务状态校验失败");
+        // WorkBuddy 首页不分配任务 ID；此时仅接受无选中任务的空白首页。
+        await this.waitFor(`(() => { const state = ${snapshot}; const blank = state.editor !== null && state.editor.trim() === '' && state.messages === 0; return blank && ((state.conversationId && state.conversationId !== ${JSON.stringify(before.conversationId)}) || state.url !== ${JSON.stringify(before.url)} || (state.home && !state.selected)); })()`, "WorkBuddy 新任务状态校验失败");
     }
     async direct(text, timeoutMs = 240_000, expert, newTask = false) {
         return (await this.complete({ task: text, timeoutMs }, expert, newTask)).text;
@@ -59,6 +71,16 @@ class WorkbuddyCdpClient {
         (0, attachments_1.validateAttachments)(request.attachments);
         const text = request.task;
         const timeoutMs = request.timeoutMs ?? 240_000;
+        if (!this.pendingInteraction && request.sessionId && !newTask && !expert) {
+            const interaction = await this.readInteraction();
+            if (interaction)
+                this.pendingInteraction = { ...interaction, sessionId: request.sessionId };
+        }
+        if (this.pendingInteraction) {
+            if (this.pendingInteraction.sessionId && this.pendingInteraction.sessionId !== request.sessionId)
+                throw new Error("WorkBuddy 正在等待另一个会话的选择");
+            return this.continueInteraction(text, timeoutMs, request.onMessage);
+        }
         if (expert)
             await this.selectExpert(expert);
         else if (newTask)
@@ -91,28 +113,53 @@ class WorkbuddyCdpClient {
             await this.waitFor(`(() => { const button = document.querySelector('button[aria-label="发送"]'); return Boolean(button && !button.disabled); })()`, "WorkBuddy 发送按钮未就绪");
             if (!await this.evaluate(`(() => { const button = document.querySelector('button[aria-label="发送"]'); if (!button || button.disabled) return false; button.click(); return true; })()`))
                 throw new Error("WorkBuddy 发送按钮不可用");
-            const deadline = Date.now() + timeoutMs;
-            while (Date.now() < deadline) {
-                await sleep(1_000);
-                const current = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => ({ id: element.getAttribute('data-message-id'), text: element.querySelector('[data-assistant-content]')?.innerText, finished: Boolean(element.querySelector('[data-testid="conversation-finished-footer"]')) })))`)));
-                const completed = current.filter((item) => item.id && !beforeIds.has(item.id) && item.finished);
-                const reply = completed.filter((item) => item.text?.trim()).at(-1)?.text?.trim();
-                if (completed.length) {
-                    const attachments = await this.readArtifacts(new Set(completed.map((item) => item.id)));
-                    if (attachments.length)
-                        return { text: reply ?? "", attachments };
-                    if (reply)
-                        return { text: reply };
+            const response = await this.waitForReply(beforeIds, timeoutMs, undefined, undefined, request.sessionId, request.onMessage);
+            if (this.pendingInteraction && temporaryPaths.length)
+                this.pendingInteractionCleanup = temporaryPaths;
+            return response;
+        }
+        catch (error) {
+            failure = error;
+            throw error;
+        }
+        finally {
+            if (temporaryPaths.length && this.pendingInteractionCleanup !== temporaryPaths) {
+                try {
+                    await this.cleanupTemporaryFiles(temporaryPaths);
+                }
+                catch (error) {
+                    if (failure !== undefined)
+                        throw new AggregateError([failure, error], `${failure instanceof Error ? failure.message : String(failure)}；临时附件清理失败`, { cause: failure });
+                    throw error;
                 }
             }
-            throw new Error("WorkBuddy UI 回复超时");
+        }
+    }
+    async continueInteraction(answer, timeoutMs, onMessage) {
+        const interaction = this.pendingInteraction;
+        const index = interactionChoice(answer, interaction.options);
+        if (index === undefined)
+            return { text: formatInteraction(interaction) };
+        const temporaryPaths = this.pendingInteractionCleanup;
+        const before = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => element.getAttribute('data-message-id'))) `)));
+        const beforeIds = new Set((Array.isArray(before) ? before : []).filter((id) => typeof id === "string"));
+        if (!await this.evaluate(`(() => { const options = [...document.querySelectorAll(${JSON.stringify(interactionOptionSelector)})]; const option = options[${index}]; if (!option || option.disabled || option.getAttribute('aria-disabled') === 'true') return false; option.click(); return true; })()`))
+            throw new Error("WorkBuddy 选择项不可用");
+        this.pendingInteraction = undefined;
+        let failure;
+        try {
+            const response = await this.waitForReply(beforeIds, timeoutMs, interaction.messageId, interaction.initialText, interaction.sessionId, onMessage);
+            if (!this.pendingInteraction)
+                this.pendingInteractionCleanup = undefined;
+            return response;
         }
         catch (error) {
             failure = error;
             throw error;
         }
         finally {
-            if (temporaryPaths.length) {
+            if (temporaryPaths && !this.pendingInteraction) {
+                this.pendingInteractionCleanup = undefined;
                 try {
                     await this.cleanupTemporaryFiles(temporaryPaths);
                 }
@@ -124,6 +171,66 @@ class WorkbuddyCdpClient {
             }
         }
     }
+    async waitForReply(beforeIds, timeoutMs, changedId, initialText, sessionId, onMessage) {
+        const deadline = Date.now() + timeoutMs;
+        const previousText = new Map();
+        const stablePolls = new Map();
+        const forwarded = new Set();
+        while (Date.now() < deadline) {
+            await sleep(1_000);
+            const current = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => { const content = element.querySelector('[data-assistant-content]'); let text = content?.innerText?.trim() || ''; for (const thought of content?.querySelectorAll?.('.cr-reasoning') || []) text = text.replace(thought.innerText || '', ''); text = text.trim(); const finished = Boolean(element.querySelector('[data-testid="conversation-finished-footer"]')); const stopped = Boolean(text) && !document.querySelector('button[aria-label="停止"],button[aria-label="停止生成"],button[aria-label="Stop generating"],[aria-busy="true"]'); return { id: element.getAttribute('data-message-id'), text, finished: finished, stopped: stopped }; }))`)));
+            const interaction = await this.readInteraction();
+            const candidates = current.filter((item) => item.id && (!beforeIds.has(item.id) || item.id === changedId && item.text !== initialText));
+            for (const item of candidates) {
+                const id = item.id;
+                const text = item.text?.trim() ?? "";
+                const count = text && text === previousText.get(id) ? (stablePolls.get(id) ?? 0) + 1 : text ? 1 : 0;
+                previousText.set(id, text);
+                stablePolls.set(id, count);
+            }
+            if (interaction) {
+                const body = candidates.map((item) => item.text?.trim()).filter((text) => Boolean(text && !forwarded.has(text)));
+                if (onMessage)
+                    for (const text of body) {
+                        await onMessage(text);
+                        forwarded.add(text);
+                    }
+                const latest = candidates.at(-1) ?? current.at(-1);
+                this.pendingInteraction = { ...interaction, messageId: interaction.messageId ?? latest?.id ?? undefined, initialText: interaction.initialText ?? latest?.text ?? "", sessionId };
+                return { text: [...(onMessage ? [] : body), formatInteraction(this.pendingInteraction)].join("\n\n") };
+            }
+            const latest = candidates.at(-1);
+            const completed = candidates.filter((item) => item.finished || Boolean(item.stopped && (stablePolls.get(item.id) ?? 0) >= 2));
+            const reply = candidates.map((item) => item.text?.trim()).filter((text) => text && !forwarded.has(text)).join("\n\n");
+            const latestComplete = latest && (latest.finished || Boolean(latest.stopped && (stablePolls.get(latest.id) ?? 0) >= 2));
+            if (latestComplete && completed.length) {
+                const attachments = await this.readArtifacts(new Set(completed.map((item) => item.id)));
+                if (attachments.length)
+                    return { text: reply ?? "", attachments };
+                if (reply || forwarded.size)
+                    return { text: reply };
+            }
+            if (onMessage) {
+                for (const item of candidates) {
+                    const text = item.text?.trim();
+                    if (text && (stablePolls.get(item.id) ?? 0) >= 2 && !forwarded.has(text)) {
+                        await onMessage(text);
+                        forwarded.add(text);
+                    }
+                }
+            }
+        }
+        throw new Error("WorkBuddy UI 回复超时");
+    }
+    async readInteraction() {
+        const raw = await this.evaluate(`JSON.stringify((() => { const nodes = [...document.querySelectorAll(${JSON.stringify(interactionOptionSelector)})]; if (!nodes.length) return null; const root = nodes[0].closest('[role="dialog"],.pending-sandbox-panel,.conversation-high-credit-approval') || nodes[0].parentElement; const rawOptions = nodes.map(node => (node.innerText || node.textContent)?.trim() || '').filter(Boolean); let prompt = root?.innerText?.trim() || ''; for (const option of rawOptions) prompt = prompt.replace(option, ''); return { prompt: prompt.replace(/\\n{2,}/g, '\\n').trim(), options: rawOptions.map(option => option.replace(/^\\d+\\s*[.、:：)]?\\s*/, '').trim()), messageId: nodes[0].closest('.cr-agent[data-message-id]')?.getAttribute('data-message-id') || undefined, initialText: nodes[0].closest('.cr-agent[data-message-id]')?.querySelector('[data-assistant-content]')?.innerText?.trim() || '' }; })())`);
+        if (!raw || raw === "null" || raw === "undefined")
+            return undefined;
+        const value = JSON.parse(String(raw));
+        if (!Array.isArray(value.options) || value.options.length === 0 || value.options.some((option) => typeof option !== "string" || !option.trim()))
+            return undefined;
+        return { prompt: typeof value.prompt === "string" ? value.prompt : "请选择：", options: value.options, ...(typeof value.messageId === "string" ? { messageId: value.messageId } : {}), ...(typeof value.initialText === "string" ? { initialText: value.initialText } : {}) };
+    }
     async injectAttachments(items, temporaryPaths = []) {
         const before = await this.evaluate(`JSON.stringify([...document.querySelector(${JSON.stringify(exports.editorSelector)}).querySelectorAll('[class*="_fileTag"]')].map(element => element.textContent?.trim()).filter(Boolean))`);
         if (JSON.parse(String(before)).length)

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

@@ -13,7 +13,7 @@ const plugin_1 = require("../../plugin");
 const cdp_client_1 = require("./cdp-client");
 const cli_client_1 = require("./cli-client");
 exports.workbuddyManifest = {
-    id: "workbuddy", version: "1.1.6", displayName: "WorkBuddy", type: "agent",
+    id: "workbuddy", version: "1.1.11", displayName: "WorkBuddy", type: "agent",
     entry: "dist/index.js", apiVersion: "1", process: "in-process",
     capabilities: ["chat", "health"], configSchema: "config.schema.json",
 };
@@ -41,6 +41,7 @@ class WorkbuddyPlugin {
     queue = Promise.resolve();
     pending = 0;
     activeSessionId;
+    activeDesktopConversationId;
     desktopSessionValid = true;
     knownSessions = new Set();
     sessionDataDir;
@@ -63,14 +64,18 @@ class WorkbuddyPlugin {
         this.cliPath = (0, cli_client_1.findCli)(typeof config.cliPath === "string" ? config.cliPath : undefined);
         this.failure = undefined;
         this.activeSessionId = undefined;
+        this.activeDesktopConversationId = undefined;
         this.activeExpert = undefined;
         this.expertSession = false;
         this.desktopSessionValid = true;
         this.knownSessions.clear();
         this.sessionDataDir = context.dataDir;
+        let savedBinding;
         if (this.sessionDataDir) {
-            for (const sessionId of await this.loadKnownSessions(this.sessionDataDir))
+            const saved = await this.loadKnownSessions(this.sessionDataDir);
+            for (const sessionId of saved.sessionIds)
                 this.knownSessions.add(sessionId);
+            savedBinding = saved.active;
         }
         this.sessionOperations = [];
         if (this.transport === "cli") {
@@ -91,6 +96,11 @@ class WorkbuddyPlugin {
                 throw error;
         }
         this.sessionOperations = (this.transport === "cdp" || !this.cliPath) && this.client?.createTask ? ["new"] : [];
+        if (savedBinding && this.sessionOperations.length && await this.client?.conversationId?.() === savedBinding.conversationId) {
+            this.activeSessionId = savedBinding.sessionId;
+            this.activeDesktopConversationId = savedBinding.conversationId;
+            this.activeExpert = savedBinding.expert;
+        }
     }
     async deactivate(_reason) {
         await this.queue;
@@ -111,7 +121,17 @@ class WorkbuddyPlugin {
         if (!request.task.trim())
             throw new Error("消息内容不能为空");
         (0, attachments_1.validateAttachments)(request.attachments);
-        const run = this.enqueue(() => this.complete(request));
+        const run = this.enqueue(async () => {
+            try {
+                return await this.complete(request);
+            }
+            finally {
+                if (this.activeSessionId && this.desktopSessionValid && this.client?.conversationId) {
+                    this.activeDesktopConversationId = await this.client.conversationId();
+                    await this.persistKnownSessions();
+                }
+            }
+        });
         const response = await run;
         return { ...response, sessionId: request.sessionId ?? response.sessionId };
     }
@@ -141,6 +161,9 @@ class WorkbuddyPlugin {
         const hasAttachments = Array.isArray(request.attachments) && request.attachments.length > 0;
         if (hasAttachments && !this.attachmentInput)
             throw new Error("WorkBuddy 当前传输不支持附件输入");
+        const pendingInteractionSessionId = this.client?.pendingInteractionSessionId?.();
+        if (!usesCli && pendingInteractionSessionId && pendingInteractionSessionId !== request.sessionId)
+            throw new Error("WorkBuddy 正在等待另一个会话的选择");
         if (usesCli && request.sessionId)
             throw new Error("CodeBuddy CLI 会话隔离未验证，不能处理带 sessionId 的请求");
         if (!usesCli && !request.sessionId && this.activeSessionId)
@@ -196,8 +219,13 @@ class WorkbuddyPlugin {
             throw new Error("WorkBuddy CDP 未连接");
         if (!this.client.createTask)
             throw new Error("WorkBuddy 客户端不支持新建会话");
-        if (this.activeSessionId === sessionId && this.desktopSessionValid)
+        if (this.activeSessionId === sessionId && this.desktopSessionValid) {
+            if (this.activeDesktopConversationId && await this.client.conversationId?.() !== this.activeDesktopConversationId) {
+                this.desktopSessionValid = false;
+                throw new Error("WorkBuddy 桌面任务已切换，请先创建新会话");
+            }
             return;
+        }
         if (this.knownSessions.has(sessionId))
             throw new Error("WorkBuddy 不支持恢复旧 WorkBuddy 会话");
         await this.createSession(sessionId);
@@ -205,6 +233,8 @@ class WorkbuddyPlugin {
     async createSession(sessionId, name) {
         // 点击失败时桌面可能已经切换，保留逻辑绑定但禁止向未知任务续发。
         this.desktopSessionValid = false;
+        this.activeSessionId = undefined;
+        this.activeDesktopConversationId = undefined;
         this.knownSessions.add(sessionId);
         await this.persistKnownSessions();
         await this.client.createTask(name);
@@ -221,11 +251,14 @@ class WorkbuddyPlugin {
             const sessionIds = parsed.sessionIds;
             if (!Array.isArray(sessionIds) || sessionIds.some((sessionId) => typeof sessionId !== "string" || !sessionId.trim()))
                 throw new Error("sessionIds 无效");
-            return new Set(sessionIds);
+            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 } : {}) };
         }
         catch (error) {
             if (error.code === "ENOENT")
-                return new Set();
+                return { sessionIds: new Set() };
             if (error instanceof SyntaxError || error instanceof Error)
                 throw new Error(`WorkBuddy 已知会话记录无效：${error.message}`);
             throw new Error("WorkBuddy 已知会话记录无效");
@@ -237,7 +270,8 @@ class WorkbuddyPlugin {
         const write = this.sessionWrites.catch(() => { }).then(async () => {
             await (0, promises_1.mkdir)(this.sessionDataDir, { recursive: true });
             const file = (0, node_path_1.join)(this.sessionDataDir, "known-sessions.json");
-            await (0, promises_1.writeFile)(`${file}.tmp`, `${JSON.stringify({ sessionIds: [...this.knownSessions].sort() })}\n`, { mode: 0o600 });
+            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 });
             await (0, promises_1.rename)(`${file}.tmp`, file);
         });
         this.sessionWrites = write;

package/plugins/workbuddy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-workbuddy",
-  "version": "1.1.6",
+  "version": "1.1.11",
   "description": "agent-bridge 的 CodeBuddy CLI 插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugins/workbuddy/plugin.json

@@ -1,8 +1,8 @@
 {
   "id": "workbuddy",
-  "version": "1.1.6",
+  "version": "1.1.11",
   "type": "agent",
-  "displayName": "WorkBuddy（CodeBuddy CLI）",
+  "displayName": "WorkBuddy",
   "entry": "dist/src-ts/plugins/workbuddy/index.js",
   "apiVersion": "1",
   "process": "in-process",
@@ -11,5 +11,5 @@
     "health"
   ],
   "configSchema": "config.schema.json",
-  "clientDownloadUrl": "https://copilot.tencent.com/"
+  "clientDownloadUrl": "https://www.workbuddy.ai/"
 }