mu-agent-bridge 1.0.73 → 1.0.78

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkbuddyCdpClient = exports.chineseLocaleScript = exports.assistantSelector = exports.editorSelector = void 0;
+exports.WorkbuddyCdpClient = exports.chineseLocaleScript = exports.assistantSelector = exports.editorSelector = exports.WORKBUDDY_MAX_WAIT_MS = void 0;
+exports.formatInteraction = formatInteraction;
+exports.interactionChoice = interactionChoice;
 const agent_1 = require("../../agent");
 const node_crypto_1 = require("node:crypto");
 const promises_1 = require("node:fs/promises");
@@ -8,6 +10,9 @@ const node_url_1 = require("node:url");
 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"]';
+exports.WORKBUDDY_MAX_WAIT_MS = 20 * 60 * 1000;
+class WorkbuddyCdpTransportError extends Error {
+}
 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) {
@@ -20,6 +25,23 @@ function interactionChoice(value, options) {
 }
 exports.editorSelector = '[data-slate-editor][contenteditable="true"]';
 exports.assistantSelector = '.cr-agent[data-message-id] [data-assistant-content]';
+const conversationMatchesFunction = `(id => {
+    const selected = [...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_'))?.getAttribute('data-conversation-id') || null;
+    const editor = document.querySelector(${JSON.stringify(exports.editorSelector)});
+    if (selected !== id || !editor) return false;
+    const key = Object.keys(editor).find(key => key.startsWith('__reactFiber'));
+    for (let fiber = editor[key]; fiber; fiber = fiber.return) {
+      if (fiber.memoizedProps && 'viewConversationId' in fiber.memoizedProps) return (fiber.memoizedProps.viewConversationId || null) === id;
+    }
+    // 旧版界面没有输入组件会话属性，沿用侧栏校验。
+    return true;
+  })`;
+function conversationMatchesScript(conversationId) {
+    return `${conversationMatchesFunction}(${JSON.stringify(conversationId)})`;
+}
+function conversationChangedError() {
+    return new agent_1.AgentOperationError("WORKBUDDY_CONVERSATION_CHANGED", "等待 WorkBuddy 回复", new Error("桌面会话已切换或新任务标识未确认，未读取其他任务结果；原桌面任务未被停止，请勿重复提交"));
+}
 exports.chineseLocaleScript = `(() => {
   const key = 'CODEBUDDY_IDE_STORAGE_LANG';
   const legacyKey = 'workbuddy-language';
@@ -36,6 +58,8 @@ class WorkbuddyCdpClient {
     pending = new Map();
     pendingInteraction;
     pendingInteractionCleanup;
+    recentlyCreatedConversationId;
+    replyDeadline;
     port;
     timeoutMs;
     fetchImpl;
@@ -61,7 +85,7 @@ class WorkbuddyCdpClient {
     })()`);
         if (clicked !== true)
             throw new Error(`WorkBuddy 未找到会话 ${id}`);
-        await this.waitFor(`(() => [...document.querySelectorAll('[data-conversation-id]')].some(element => element.getAttribute('data-conversation-id') === ${JSON.stringify(id)} && String(element.className).includes('_selected_')))()`, "WorkBuddy 原会话切换未完成");
+        await this.waitFor(conversationMatchesScript(id), "WorkBuddy 原会话切换未完成");
     }
     async readHistorySnapshot() {
         return await this.evaluate(`(() => {
@@ -73,7 +97,7 @@ class WorkbuddyCdpClient {
         const assistant = element.querySelector('[data-assistant-content]');
         if (!id || (!user && !assistant)) return [];
         const content = (user || assistant).cloneNode(true);
-        content.querySelectorAll('.cr-reasoning,[class*="reasoning"],[data-testid*="reasoning"],[class*="tool"],[data-testid*="tool"],[class*="artifact"],[data-testid*="artifact"],[class*="attachment"],[data-testid*="attachment"],[data-slate-placeholder="true"],[data-slate-zero-width]').forEach(node => node.remove());
+        content.querySelectorAll('.cr-reasoning,.cr-process-row,[class*="reasoning"],[data-testid*="reasoning"],[class*="tool"],[data-testid*="tool"],[class*="artifact"],[data-testid*="artifact"],[class*="attachment"],[data-testid*="attachment"],[data-slate-placeholder="true"],[data-slate-zero-width]').forEach(node => node.remove());
         const finished = Boolean(element.querySelector('[data-testid="conversation-finished-footer"]'));
         const text = content.innerText?.trim() || content.textContent?.trim() || '';
         if (!user && !finished) return [];
@@ -102,7 +126,13 @@ class WorkbuddyCdpClient {
         if (this.connected())
             return;
         this.close();
-        const response = await this.fetchImpl(`http://127.0.0.1:${this.port}/json`);
+        let response;
+        try {
+            response = await this.fetchImpl(`http://127.0.0.1:${this.port}/json`, { signal: AbortSignal.timeout(this.commandTimeout()) });
+        }
+        catch (error) {
+            throw new Error(`WorkBuddy CDP 连接失败（端口 ${this.port}）；桌面升级后请在后台使用“重启桌面”恢复连接`, { cause: error });
+        }
         if (!response.ok)
             throw new Error(`WorkBuddy CDP /json HTTP ${response.status}`);
         const targets = await response.json();
@@ -115,7 +145,13 @@ class WorkbuddyCdpClient {
         socket.onclose = () => { if (this.socket === socket)
             this.close(); };
         try {
-            await new Promise((resolve, reject) => { const socket = this.socket; socket.onopen = () => resolve(); socket.onerror = () => reject(new Error("WorkBuddy CDP WebSocket 连接失败")); });
+            await new Promise((resolve, reject) => {
+                const timer = setTimeout(() => reject(new WorkbuddyCdpTransportError(`WorkBuddy CDP WebSocket 连接超时（端口 ${this.port}）`)), this.commandTimeout());
+                socket.onopen = () => { clearTimeout(timer); resolve(); };
+                socket.onerror = () => { clearTimeout(timer); reject(new WorkbuddyCdpTransportError(`WorkBuddy CDP WebSocket 连接失败（端口 ${this.port}）`)); };
+                socket.onclose = () => { clearTimeout(timer); if (this.socket === socket)
+                    this.close(); reject(new WorkbuddyCdpTransportError(`WorkBuddy CDP WebSocket 已关闭（端口 ${this.port}）`)); };
+            });
             await this.evaluate(exports.chineseLocaleScript);
         }
         catch (error) {
@@ -123,9 +159,16 @@ class WorkbuddyCdpClient {
             throw error;
         }
     }
-    close() { this.socket?.close(); this.socket = undefined; for (const pending of this.pending.values())
-        pending.reject(new Error("WorkBuddy CDP 已关闭")); this.pending.clear(); }
+    close() {
+        const socket = this.socket;
+        this.socket = undefined;
+        for (const pending of this.pending.values())
+            pending.reject(new WorkbuddyCdpTransportError(`WorkBuddy CDP 已关闭（端口 ${this.port}）`));
+        this.pending.clear();
+        socket?.close();
+    }
     async createTask() {
+        this.recentlyCreatedConversationId = undefined;
         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(`(() => { const state = ${snapshot}; const loginRequired = [...document.querySelectorAll('a,button,[role="button"]')].some(item => /^(?:登录|立即登录|sign in)$/i.test(item.textContent?.trim() ?? '')); return { ...state, loginRequired }; })()`);
         if (before.loginRequired)
@@ -133,7 +176,11 @@ class WorkbuddyCdpClient {
         try {
             await this.waitFor(`(() => { const button = [...document.querySelectorAll('button,[role="button"],[role="tab"]')].find(item => { const label = [item.innerText, item.textContent, item.getAttribute('aria-label'), item.getAttribute('title'), item.getAttribute('data-testid')].filter(Boolean).map(value => String(value).normalize('NFKC').replace(/\\s+/g, ' ').trim().toLowerCase()); return label.some(value => /^(?:新建任务|新建会话|新建对话|开始新任务|new (?:task|chat|conversation))$/.test(value)) && (!item.getClientRects || item.getClientRects().length > 0); }); if (!button || button.disabled || button.getAttribute('aria-disabled') === 'true') return false; button.click(); return true; })()`, "WorkBuddy 新建任务入口未找到或不可用");
             // WorkBuddy 首页不分配任务 ID；此时仅接受无选中任务的空白首页。
-            await this.waitFor(`(() => { const state = ${snapshot}; const blank = state.editor !== null && state.editor.trim() === '' && state.messages === 0; const clearedToUnselected = ${before.selected} && !state.selected && state.messages < ${before.messages}; return blank && ((state.conversationId && state.conversationId !== ${JSON.stringify(before.conversationId)}) || state.url !== ${JSON.stringify(before.url)} || (state.home && !state.selected) || clearedToUnselected); })()`, "WorkBuddy 新任务状态校验失败");
+            const created = await this.waitFor(`(() => { const state = ${snapshot}; const blank = state.editor !== null && state.editor.trim() === '' && state.messages === 0; const clearedToUnselected = ${before.selected} && !state.selected && state.messages < ${before.messages}; const valid = blank && ((state.conversationId && state.conversationId !== ${JSON.stringify(before.conversationId)}) || state.url !== ${JSON.stringify(before.url)} || (state.home && !state.selected) || clearedToUnselected); return valid && { conversationId: state.conversationId }; })()`, "WorkBuddy 新任务状态校验失败");
+            if (created?.conversationId) {
+                await this.waitFor(conversationMatchesScript(created.conversationId), "WorkBuddy 新会话输入组件未就绪");
+                this.recentlyCreatedConversationId = created.conversationId;
+            }
         }
         catch (error) {
             const summarize = (state) => {
@@ -195,17 +242,23 @@ class WorkbuddyCdpClient {
       return { clicked, skipped };
     })()`);
     }
-    async direct(text, timeoutMs = 3_600_000, expert, newTask = false) {
+    async direct(text, timeoutMs = exports.WORKBUDDY_MAX_WAIT_MS, expert, newTask = false) {
         return (await this.complete({ task: text, timeoutMs }, expert, newTask)).text;
     }
-    async complete(request, expert, newTask = false) {
+    async complete(request, expert, newTask = false, expectedConversationId) {
         let stage = "准备 WorkBuddy 桌面任务";
         try {
             (0, attachments_1.validateAttachments)(request.attachments);
             const text = request.task;
-            const timeoutMs = request.timeoutMs ?? 3_600_000;
+            const timeoutMs = Math.min(request.timeoutMs ?? exports.WORKBUDDY_MAX_WAIT_MS, exports.WORKBUDDY_MAX_WAIT_MS);
+            if (expectedConversationId === null && this.recentlyCreatedConversationId)
+                expectedConversationId = this.recentlyCreatedConversationId;
+            this.recentlyCreatedConversationId = undefined;
+            let conversationMatches = expectedConversationId === undefined ? "true" : conversationMatchesScript(expectedConversationId);
+            if (expectedConversationId !== undefined && !await this.evaluate(conversationMatches))
+                throw new Error("WorkBuddy 桌面任务与预期会话不符，未输入消息或确认选项");
             if (!this.pendingInteraction && request.sessionId && !newTask && !expert) {
-                const interaction = await this.readInteraction();
+                const interaction = await this.readInteraction(expectedConversationId);
                 if (interaction)
                     this.pendingInteraction = { ...interaction, sessionId: request.sessionId };
             }
@@ -213,18 +266,30 @@ class WorkbuddyCdpClient {
                 if (this.pendingInteraction.sessionId && this.pendingInteraction.sessionId !== request.sessionId)
                     throw new Error("WorkBuddy 正在等待另一个会话的选择");
                 stage = "继续 WorkBuddy 待确认的任务";
-                return await this.continueInteraction(text, timeoutMs, request.onMessage);
+                return await this.continueInteraction(text, timeoutMs, request.onMessage, request.signal, expectedConversationId);
+            }
+            if (expert) {
+                const assignedId = await this.selectExpert(expert, expectedConversationId);
+                if (expectedConversationId !== undefined && assignedId) {
+                    expectedConversationId = assignedId;
+                    conversationMatches = conversationMatchesScript(assignedId);
+                }
             }
-            if (expert)
-                await this.selectExpert(expert);
             else if (newTask)
                 await this.createTask();
+            if (expectedConversationId === null && this.recentlyCreatedConversationId) {
+                expectedConversationId = this.recentlyCreatedConversationId;
+                this.recentlyCreatedConversationId = undefined;
+                conversationMatches = conversationMatchesScript(expectedConversationId);
+                if (!await this.evaluate(conversationMatches))
+                    throw new Error("WorkBuddy 新会话已切换，未输入消息");
+            }
             stage = "填写 WorkBuddy 输入框";
             await this.waitFor(`Boolean(document.querySelector(${JSON.stringify(exports.editorSelector)}))`, "WorkBuddy 输入框未就绪");
             const before = JSON.parse(String(await this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => ({ id: element.getAttribute('data-message-id') })))`)));
             const beforeIds = new Set(before.map((item) => item.id).filter((id) => Boolean(id)));
-            if (!await this.evaluate(`(() => { const element = document.querySelector(${JSON.stringify(exports.editorSelector)}); if (!element) return false; element.focus(); const selection = window.getSelection(); const range = document.createRange(); range.selectNodeContents(element); selection?.removeAllRanges(); selection?.addRange(range); return true; })()`))
-                throw new Error("WorkBuddy 输入框未找到");
+            if (!await this.evaluate(`(() => { if (!(${conversationMatches})) return false; const element = document.querySelector(${JSON.stringify(exports.editorSelector)}); if (!element) return false; element.focus(); const selection = window.getSelection(); const range = document.createRange(); range.selectNodeContents(element); selection?.removeAllRanges(); selection?.addRange(range); return true; })()`))
+                throw new Error("WorkBuddy 输入框未找到或桌面会话已切换，未输入消息");
             await this.cdp("Input.dispatchKeyEvent", { type: "keyDown", key: "Backspace", code: "Backspace" });
             await this.cdp("Input.dispatchKeyEvent", { type: "keyUp", key: "Backspace", code: "Backspace" });
             await this.cdp("Input.insertText", { text });
@@ -248,10 +313,52 @@ class WorkbuddyCdpClient {
                 }
                 stage = "向 WorkBuddy 提交任务（尚未确认发送）";
                 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 发送按钮不可用");
+                let submissionError;
+                if (expectedConversationId === null) {
+                    const assignedId = await this.evaluate(`(async () => {
+          if (!(${conversationMatches})) return false;
+          const button = document.querySelector('button[aria-label="发送"]');
+          if (!button || button.disabled) return false;
+          const existingIds = new Set([...document.querySelectorAll('[data-conversation-id]')].map(item => item.getAttribute('data-conversation-id')));
+          button.click();
+          return await new Promise(resolve => {
+            let candidate; let timer; let timeout;
+            const finish = value => { clearInterval(timer); clearTimeout(timeout); document.removeEventListener('click', changed, true); document.removeEventListener('keydown', changed, true); resolve(value); };
+            const changed = () => finish(null);
+            document.addEventListener('click', changed, true);
+            document.addEventListener('keydown', changed, true);
+            const check = () => {
+              const id = [...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_'))?.getAttribute('data-conversation-id');
+              if (!id) { if (candidate) finish(null); return; }
+              if (existingIds.has(id) || candidate && candidate !== id) { finish(null); return; }
+              candidate = id;
+              if (${conversationMatchesFunction}(id)) finish(id);
+            };
+            timer = setInterval(check, 50);
+            timeout = setTimeout(() => finish(null), ${Math.max(1, Math.min(timeoutMs, this.timeoutMs * 0.9))});
+            check();
+          });
+        })()`);
+                    if (assignedId === false)
+                        throw new Error("WorkBuddy 发送按钮不可用或桌面会话已切换，未发送消息");
+                    if (typeof assignedId !== "string" || !assignedId)
+                        throw conversationChangedError();
+                    expectedConversationId = assignedId;
+                    conversationMatches = conversationMatchesScript(assignedId);
+                }
+                else {
+                    try {
+                        if (!await this.evaluate(`(() => { if (!(${conversationMatches})) return false; const button = document.querySelector('button[aria-label="发送"]'); if (!button || button.disabled) return false; button.click(); return true; })()`))
+                            throw new Error("WorkBuddy 发送按钮不可用或桌面会话已切换，未发送消息");
+                    }
+                    catch (error) {
+                        if (!(error instanceof WorkbuddyCdpTransportError))
+                            throw error;
+                        submissionError = error;
+                    }
+                }
                 stage = "等待 WorkBuddy 回复（任务已提交，桌面未被停止）";
-                const response = await this.waitForReply(beforeIds, timeoutMs, undefined, undefined, request.sessionId, request.onMessage, request.signal);
+                const response = await this.waitForReply(beforeIds, timeoutMs, undefined, undefined, request.sessionId, request.onMessage, request.signal, expectedConversationId ?? undefined, submissionError);
                 if (this.pendingInteraction && temporaryPaths.length)
                     this.pendingInteractionCleanup = temporaryPaths;
                 return response;
@@ -281,7 +388,7 @@ class WorkbuddyCdpClient {
             throw new agent_1.AgentOperationError("WORKBUDDY_TASK_FAILED", stage, error);
         }
     }
-    async continueInteraction(answer, timeoutMs, onMessage) {
+    async continueInteraction(answer, timeoutMs, onMessage, signal, expectedConversationId) {
         const interaction = this.pendingInteraction;
         const index = interactionChoice(answer, interaction.options);
         if (index === undefined)
@@ -289,12 +396,21 @@ class WorkbuddyCdpClient {
         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 选择项不可用");
+        const conversationMatches = expectedConversationId === undefined ? "true" : conversationMatchesScript(expectedConversationId);
+        let submissionError;
+        try {
+            if (!await this.evaluate(`(() => { if (!(${conversationMatches})) return false; 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 选择项不可用或桌面会话已切换，未确认选项");
+        }
+        catch (error) {
+            if (!(error instanceof WorkbuddyCdpTransportError))
+                throw error;
+            submissionError = error;
+        }
         this.pendingInteraction = undefined;
         let failure;
         try {
-            const response = await this.waitForReply(beforeIds, timeoutMs, interaction.messageId, interaction.initialText, interaction.sessionId, onMessage);
+            const response = await this.waitForReply(beforeIds, timeoutMs, interaction.messageId, interaction.initialText, interaction.sessionId, onMessage, signal, expectedConversationId ?? undefined, submissionError);
             if (!this.pendingInteraction)
                 this.pendingInteractionCleanup = undefined;
             return response;
@@ -317,62 +433,151 @@ class WorkbuddyCdpClient {
             }
         }
     }
-    async waitForReply(beforeIds, timeoutMs, changedId, initialText, sessionId, onMessage, signal) {
-        const deadline = Date.now() + timeoutMs;
+    async waitForReply(beforeIds, timeoutMs, changedId, initialText, sessionId, onMessage, signal, expectedConversationId, initialReadError) {
+        if (expectedConversationId === null)
+            throw conversationChangedError();
+        timeoutMs = Math.min(timeoutMs, exports.WORKBUDDY_MAX_WAIT_MS);
+        const started = Date.now();
+        const deadline = started + timeoutMs;
+        let originalConversationId = expectedConversationId;
+        let recoveryAttempts = 0;
+        let firstCdpError;
+        let lastCdpError;
+        let progressError;
+        let progressTask;
+        const timeoutError = () => new agent_1.AgentOperationError("WORKBUDDY_REPLY_TIMEOUT", "等待 WorkBuddy 回复", new Error(`已等待 ${Math.round((Date.now() - started) / 1000)} 秒，未读取到可确认完成的回复${firstCdpError ? `；首次 CDP 故障（端口 ${this.port}）：${(0, agent_1.errorDetails)(firstCdpError)}` : ""}${lastCdpError && lastCdpError !== firstCdpError ? `；最后恢复失败：${(0, agent_1.errorDetails)(lastCdpError)}` : ""}；桌面任务未被停止，请勿重复提交`));
+        const read = async (operation) => {
+            for (;;) {
+                if (progressError)
+                    throw progressError;
+                try {
+                    if (initialReadError) {
+                        const error = initialReadError;
+                        initialReadError = undefined;
+                        throw error;
+                    }
+                    return await operation();
+                }
+                catch (error) {
+                    if (!(error instanceof WorkbuddyCdpTransportError))
+                        throw error;
+                    firstCdpError ??= error;
+                    lastCdpError = error;
+                    this.replyDeadline = signal?.aborted ? started + exports.WORKBUDDY_MAX_WAIT_MS : deadline;
+                    if (Date.now() >= this.replyDeadline)
+                        throw timeoutError();
+                    if (onMessage && !signal?.aborted)
+                        await onMessage(`WorkBuddy CDP 读取中断（端口 ${this.port}）：${(0, agent_1.errorDetails)(error)}；正在恢复连接，原任务未重新提交。`);
+                    let recovered = false;
+                    let recoveryError = error;
+                    while (recoveryAttempts < 3 && Date.now() < this.replyDeadline) {
+                        recoveryAttempts++;
+                        try {
+                            this.close();
+                            await this.connect();
+                            const currentId = await this.conversationId();
+                            if (!originalConversationId || currentId !== originalConversationId)
+                                throw new Error(`重连后桌面会话与原任务不一致或无法确认（原会话 ${originalConversationId ?? "未知"}，当前 ${currentId ?? "未知"}）；未切换任务`);
+                            recovered = true;
+                            break;
+                        }
+                        catch (failure) {
+                            recoveryError = failure;
+                            lastCdpError = failure;
+                            if (recoveryAttempts < 3 && Date.now() < this.replyDeadline)
+                                await sleep(Math.min(1000, this.replyDeadline - Date.now()));
+                        }
+                    }
+                    if (!recovered) {
+                        if (Date.now() >= this.replyDeadline)
+                            throw timeoutError();
+                        throw new agent_1.AgentOperationError("WORKBUDDY_CDP_RECOVERY_FAILED", `恢复 WorkBuddy CDP 读取（端口 ${this.port}，共尝试 ${recoveryAttempts} 次）`, new Error(`首次故障：${(0, agent_1.errorDetails)(firstCdpError)}；恢复失败：${(0, agent_1.errorDetails)(recoveryError)}；桌面任务未被停止，未重新提交任务`, { cause: recoveryError }));
+                    }
+                    if (onMessage && !signal?.aborted)
+                        await onMessage(`WorkBuddy CDP 已恢复（端口 ${this.port}），继续读取原任务；未重新提交任务。`);
+                }
+            }
+        };
         const previousText = new Map();
         const stablePolls = new Map();
         const forwarded = new Set();
-        while (Date.now() < deadline || signal?.aborted) {
-            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)))
-                    .catch(error => { throw new agent_1.AgentOperationError("WORKBUDDY_ARTIFACT_READ_FAILED", "读取 WorkBuddy 已完成任务的产物（尚未上传 AUN FS）", error); });
-                if (attachments.length)
-                    return { text: reply ?? "", attachments };
-                if (reply || forwarded.size)
-                    return { text: reply };
-                if (signal?.aborted && latest.finished)
-                    throw new agent_1.AgentOperationError("WORKBUDDY_REQUEST_CANCELLED", "等待 WorkBuddy 取消后的任务结束", new Error("请求已取消，已确认本轮桌面生成结束，未返回正文或附件"));
-            }
-            if (onMessage) {
+        const progressTimer = onMessage ? setInterval(() => {
+            if (signal?.aborted || progressTask || progressError || Date.now() >= deadline)
+                return;
+            progressTask = Promise.resolve().then(() => onMessage(`WorkBuddy 已等待 ${Math.floor((Date.now() - started) / 1000)} 秒，尚未读取到可确认完成的回复；继续等待原任务，本次上限 ${Math.round(timeoutMs / 1000)} 秒。`))
+                .catch(error => { progressError = new agent_1.AgentOperationError("WORKBUDDY_PROGRESS_SEND_FAILED", "向原通道发送 WorkBuddy 进度", error); })
+                .finally(() => { progressTask = undefined; });
+        }, 30_000) : undefined;
+        try {
+            while (Date.now() < (signal?.aborted ? started + exports.WORKBUDDY_MAX_WAIT_MS : deadline)) {
+                this.replyDeadline = signal?.aborted ? started + exports.WORKBUDDY_MAX_WAIT_MS : deadline;
+                await sleep(Math.min(1000, this.replyDeadline - Date.now()));
+                this.replyDeadline = signal?.aborted ? started + exports.WORKBUDDY_MAX_WAIT_MS : deadline;
+                const current = JSON.parse(String(await read(() => this.evaluate(`JSON.stringify([...document.querySelectorAll('.cr-agent[data-message-id]')].map(element => { const conversationId = [...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_'))?.getAttribute('data-conversation-id'); const content = element.querySelector('[data-assistant-content]'); const textProperty = content?.innerText?.trim() ? 'innerText' : 'textContent'; let text = content?.[textProperty]?.trim() || ''; for (const thought of content?.querySelectorAll?.('.cr-reasoning,.cr-process-row') || []) text = text.replace(thought[textProperty] || '', ''); 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, conversationId }; }))`))));
+                const currentId = current.find(item => item.conversationId)?.conversationId;
+                if (originalConversationId && currentId && currentId !== originalConversationId)
+                    throw conversationChangedError();
+                originalConversationId ??= currentId;
+                const interaction = await read(() => this.readInteraction(originalConversationId));
+                const candidates = current.filter((item) => item.id && (!beforeIds.has(item.id) || item.id === changedId && item.text !== initialText));
                 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);
+                    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 read(() => this.readArtifacts(new Set(completed.map((item) => item.id)), originalConversationId))
+                        .catch(error => { if (error instanceof agent_1.AgentOperationError)
+                        throw error; throw new agent_1.AgentOperationError("WORKBUDDY_ARTIFACT_READ_FAILED", "读取 WorkBuddy 已完成任务的产物（尚未上传 AUN FS）", error); });
+                    if (attachments.length)
+                        return { text: reply ?? "", attachments };
+                    if (reply || forwarded.size)
+                        return { text: reply };
+                    if (signal?.aborted && latest.finished)
+                        throw new agent_1.AgentOperationError("WORKBUDDY_REQUEST_CANCELLED", "等待 WorkBuddy 取消后的任务结束", new Error("请求已取消，已确认本轮桌面生成结束，未返回正文或附件"));
+                }
+                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 timeoutError();
+        }
+        finally {
+            clearInterval(progressTimer);
+            await progressTask;
+            this.replyDeadline = undefined;
+            if (progressError)
+                throw progressError;
         }
-        throw new agent_1.AgentOperationError("WORKBUDDY_REPLY_TIMEOUT", "等待 WorkBuddy 回复", new Error(`已等待 ${Math.round(timeoutMs / 1000)} 秒，未确认任务完成；桌面任务未被停止，请勿重复提交`));
     }
-    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() || '' }; })())`);
+    async readInteraction(expectedConversationId) {
+        const conversationMatches = expectedConversationId === undefined ? "true" : conversationMatchesScript(expectedConversationId);
+        const raw = await this.evaluate(`(() => { if (!(${conversationMatches})) return false; return 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 === false)
+            throw conversationChangedError();
         if (!raw || raw === "null" || raw === "undefined")
             return undefined;
         const value = JSON.parse(String(raw));
@@ -466,8 +671,10 @@ class WorkbuddyCdpClient {
       if (failed) throw new Error('WorkBuddy 临时附件清理失败');
     })()`);
     }
-    async readArtifacts(messageIds) {
+    async readArtifacts(messageIds, expectedConversationId) {
+        const conversationMatches = expectedConversationId === undefined ? "true" : conversationMatchesScript(expectedConversationId);
         const result = await this.evaluate(`(async () => {
+      if (!(${conversationMatches})) return null;
       const ids = new Set(${JSON.stringify([...messageIds])});
       const urls = [];
       for (const message of document.querySelectorAll('.cr-agent[data-message-id]')) {
@@ -518,6 +725,8 @@ class WorkbuddyCdpClient {
       }
       return output;
     })()`);
+        if (result === null)
+            throw conversationChangedError();
         const attachments = [];
         for (const item of result) {
             let data;
@@ -556,9 +765,11 @@ class WorkbuddyCdpClient {
             attachments.push({ kind: imageType ? "image" : "file", data, filename: (0, attachments_1.attachmentFilename)(item.filename), contentType });
             (0, attachments_1.validateAttachments)(attachments);
         }
+        if (expectedConversationId !== undefined && !await this.evaluate(conversationMatches))
+            throw conversationChangedError();
         return attachments;
     }
-    async selectExpert(name) {
+    async selectExpert(name, expectedConversationId) {
         if (!await this.evaluate(`(() => { const element = [...document.querySelectorAll('button,[role="button"],a')].find((item) => item.textContent?.trim() === '专家·技能·连接器'); if (!element) return false; element.click(); return true; })()`))
             throw new Error("WorkBuddy 专家入口未找到");
         await this.waitFor(`Boolean(document.querySelector('input[placeholder="搜索专家"]'))`, "WorkBuddy 专家搜索框未就绪");
@@ -569,19 +780,50 @@ class WorkbuddyCdpClient {
                 throw new Error("WorkBuddy 专家搜索框未找到");
             await this.cdp("Input.insertText", { text: query });
             await this.waitFor(`(() => { const input = document.querySelector('input[placeholder="搜索专家"]'); const cards = document.querySelectorAll('article[role="button"] button[data-track-id="expert_summon_click"]'); return input?.value === ${JSON.stringify(query)} && cards.length > 0; })()`, "WorkBuddy 专家搜索超时");
-            const result = await this.evaluate(`(() => {
+            const result = await this.waitFor(`(async () => {
+        const expected = ${JSON.stringify(expectedConversationId)};
+        const selected = [...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_'))?.getAttribute('data-conversation-id') || null;
+        // 专家目录会卸载输入框；保留侧栏校验，召唤完成后再核对新输入组件。
+        if (expected !== undefined && (selected !== expected || document.querySelector(${JSON.stringify(exports.editorSelector)}) && !(${expectedConversationId === undefined ? "true" : conversationMatchesScript(expectedConversationId)}))) return { changed: true };
         const cards = [...document.querySelectorAll('article[role="button"]')].filter(card => card.querySelector('button[data-track-id="expert_summon_click"]'));
         const title = card => card.querySelector('[class*="_role_"]')?.textContent?.trim() || card.querySelector('img')?.alt || card.innerText.split('\\n').filter(Boolean)[1];
         const exact = cards.filter(card => title(card) === ${JSON.stringify(name)});
         const alias = cards.filter(card => card.querySelector('img')?.alt === ${JSON.stringify(name)} || card.querySelector('button[data-track-id="expert_summon_click"]')?.getAttribute('aria-label') === ${JSON.stringify(`召唤${name}`)});
         const related = cards.filter(card => title(card)?.includes(${JSON.stringify(name)}) || ${JSON.stringify(name)}.includes(title(card) || ''));
         const matches = exact.length ? exact : related.length === 1 ? related : alias.length === 1 ? alias : related;
+        if (!matches.length) return false;
         if (matches.length !== 1) return { names: matches.map(title) };
         const button = matches[0].querySelector('button[data-track-id="expert_summon_click"]');
-        button.click(); return { selected: true };
-      })()`);
-            if (result.selected)
-                return;
+        const existingIds = new Set([...document.querySelectorAll('[data-conversation-id]')].map(item => item.getAttribute('data-conversation-id')));
+        button.click();
+        const conversationId = await new Promise(resolve => {
+          let candidate; let timer; let timeout;
+          const finish = value => { clearInterval(timer); clearTimeout(timeout); document.removeEventListener('click', changed, true); document.removeEventListener('keydown', changed, true); resolve(value); };
+          const changed = () => finish(null);
+          // 专家会话可能异步创建，只接受本次召唤的新 ID；人工操作使绑定失效。
+          document.addEventListener('click', changed, true);
+          document.addEventListener('keydown', changed, true);
+          const check = () => {
+            const id = [...document.querySelectorAll('[data-conversation-id]')].find(item => String(item.className).includes('_selected_'))?.getAttribute('data-conversation-id');
+            if (!id || existingIds.has(id)) { if (candidate) finish(null); return; }
+            if (candidate && candidate !== id) { finish(null); return; }
+            candidate = id;
+            if (${conversationMatchesFunction}(id)) finish(id);
+          };
+          timer = setInterval(check, 50);
+          timeout = setTimeout(() => finish(null), ${Math.max(1, this.timeoutMs * 0.9)});
+          check();
+        });
+        return { selected: true, conversationId };
+      })()`, "WorkBuddy 专家匹配超时").catch(error => {
+                if (!(error instanceof Error) || error.message !== "WorkBuddy 专家匹配超时")
+                    throw error;
+                return {};
+            });
+            if (result.changed || result.selected && !result.conversationId)
+                throw new Error("WorkBuddy 专家新会话未就绪或桌面会话已切换，未输入消息");
+            if (result.selected && result.conversationId)
+                return result.conversationId;
             if (result.names?.length)
                 throw new Error(`WorkBuddy 专家匹配不唯一，请指定完整名称：${result.names.join("、")}`);
         }
@@ -590,8 +832,9 @@ class WorkbuddyCdpClient {
     async waitFor(expression, message) {
         const deadline = Date.now() + this.timeoutMs;
         while (Date.now() < deadline) {
-            if (await this.evaluate(expression))
-                return;
+            const value = await this.evaluate(expression);
+            if (value)
+                return value;
             await sleep(200);
         }
         throw new Error(message);
@@ -604,10 +847,28 @@ class WorkbuddyCdpClient {
     } if (message.id === undefined)
         return; const pending = this.pending.get(message.id); if (!pending)
         return; this.pending.delete(message.id); pending.resolve(message); }
-    async cdp(method, params = {}) { if (!this.socket)
-        throw new Error("WorkBuddy CDP 尚未连接"); const id = ++this.sequence; const result = new Promise((resolve, reject) => this.pending.set(id, { resolve, reject })); this.socket.send(JSON.stringify({ id, method, params })); return Promise.race([result, sleep(this.timeoutMs).then(() => { throw new Error(`CDP ${method} 超时`); })]); }
+    commandTimeout() { return Math.max(1, Math.min(this.timeoutMs, (this.replyDeadline ?? Infinity) - Date.now())); }
+    async cdp(method, params = {}) {
+        const socket = this.socket;
+        if (!socket || socket.readyState !== WebSocket.OPEN)
+            throw new WorkbuddyCdpTransportError(`WorkBuddy CDP 尚未连接（端口 ${this.port}，方法 ${method}）`);
+        const id = ++this.sequence;
+        return await new Promise((resolve, reject) => {
+            const cleanup = () => { clearTimeout(timer); this.pending.delete(id); };
+            const timer = setTimeout(() => { cleanup(); reject(new WorkbuddyCdpTransportError(`WorkBuddy CDP ${method} 超时（端口 ${this.port}）`)); }, this.commandTimeout());
+            this.pending.set(id, { resolve: value => { cleanup(); resolve(value); }, reject: error => { cleanup(); reject(error); } });
+            try {
+                socket.send(JSON.stringify({ id, method, params }));
+            }
+            catch (error) {
+                cleanup();
+                reject(new WorkbuddyCdpTransportError(`WorkBuddy CDP ${method} 发送失败（端口 ${this.port}）：${(0, agent_1.errorDetails)(error)}`, { cause: error }));
+            }
+        });
+    }
     async evaluate(expression) {
         const slot = `__agentBridgeEvaluation_${(0, node_crypto_1.randomUUID)().replaceAll("-", "")}`;
+        let failure;
         try {
             const wrapped = `(() => { const state = {}; globalThis[${JSON.stringify(slot)}] = state; state.promise = Promise.resolve((${expression})); return state.promise; })()`;
             const response = await this.cdp("Runtime.evaluate", { expression: wrapped, returnByValue: true, awaitPromise: true });
@@ -619,9 +880,14 @@ class WorkbuddyCdpClient {
             }
             return response.result?.result?.value;
         }
+        catch (error) {
+            failure = error;
+            throw error;
+        }
         finally {
             try {
-                await this.cdp("Runtime.evaluate", { expression: `delete globalThis[${JSON.stringify(slot)}]`, returnByValue: true });
+                if (!(failure instanceof WorkbuddyCdpTransportError))
+                    await this.cdp("Runtime.evaluate", { expression: `delete globalThis[${JSON.stringify(slot)}]`, returnByValue: true });
             }
             catch { /* 连接中断时保留原始错误，页面重载会释放槽位。 */ }
         }