pi-cursor-bridge 0.1.10 → 0.1.12

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "cursor-bridge",
-  "version": "5.8.0+codex.20260901100252",
+  "version": "5.8.2+codex.20260904092304",
   "description": "Evidence-backed Cursor Context Engine search and bounded Cursor Agent execution, including a UI-suppressed minimal runtime.",
   "author": {
     "name": "Vanyangyang"

package/README.md

@@ -2,12 +2,14 @@
 
 Use Cursor's project index and Agent search from Pi, with compact `path:line` evidence and optional bounded Cursor task execution.
 
+⭐ If Cursor Bridge helps you, please consider giving it a [Star on GitHub](https://github.com/Vanyangyang/cursor-bridge)—it helps others discover the project.
+
 ```powershell
 pi install npm:pi-cursor-bridge
 ```
 
 Restart Pi after installation. Initialize the current project by asking Pi to initialize Cursor Bridge for the absolute project path, then use it normally. The package includes the `cce-routing` and `cursor-delegate` Skills and registers the native Cursor Bridge MCP tools directly in Pi.
 
-This Pi package embeds Cursor Bridge 5.8.0. Cursor must be installed and signed in. Current end-to-end compatibility claims remain scoped to the environments documented in the main repository.
+This Pi package embeds Cursor Bridge 5.8.2. Cursor must be installed and signed in. Current end-to-end compatibility claims remain scoped to the environments documented in the main repository.
 
-Full documentation: [English](https://github.com/Vanyangyang/cursor-bridge#readme) · [简体中文](https://github.com/Vanyangyang/cursor-bridge/blob/master/README.zh-CN.md)
+Full documentation: [English](https://github.com/Vanyangyang/cursor-bridge#readme) · [简体中文](https://github.com/Vanyangyang/cursor-bridge/blob/main/README.zh-CN.md)

package/dist/cursor-bridge.mjs

@@ -22604,7 +22604,7 @@ function updateCursorSessionRegistry(filePath, mutator, options = {}) {
 // server.mjs
 init_cursor_ensure_core();
 init_lifecycle_paths();
-var PLUGIN_VERSION = "5.8.0";
+var PLUGIN_VERSION = "5.8.2";
 var CDP_PORT2 = Number(process.env.CURSOR_BRIDGE_CDP_PORT || 9223);
 var ORIGIN = `http://localhost:${CDP_PORT2}`;
 var QUERY_TIMEOUT = Number(process.env.CURSOR_BRIDGE_TIMEOUT || 3e5);
@@ -22744,11 +22744,6 @@ function summarizeCdpPages(list) {
     page: first && first.url ? String(first.url).slice(0, 60) : ""
   };
 }
-function isBlankAgentsWindow(page) {
-  if (!page || !isAgentsWindowTitle(page.title)) return false;
-  if (page.probeError || !page.capabilities) return true;
-  return page.capabilities.uiFlavor !== "agents_v2" && !page.capabilities.hasWritableInput;
-}
 var NORMAL_AGENTS_PRESENTATION_REFRESH_MS = 5 * 60 * 1e3;
 function shouldRecoverNormalAgentsPresentation({
   runtimeMode,
@@ -22769,25 +22764,6 @@ function shouldRecoverNormalAgentsPresentation({
   if (!Number.isFinite(previousAt)) return true;
   return Number(now) - previousAt >= Math.max(0, Number(refreshMs) || 0);
 }
-async function reloadPageTarget(page, timeoutMs = 5e3) {
-  if (!page || !page.webSocketDebuggerUrl) return false;
-  const c = makeClient(page.webSocketDebuggerUrl);
-  try {
-    await Promise.race([
-      c.ready,
-      new Promise((_, reject) => setTimeout(() => reject(new Error("Timed out connecting to the CDP target")), timeoutMs))
-    ]);
-    await Promise.race([
-      c.send("Page.reload", { ignoreCache: true }),
-      new Promise((_, reject) => setTimeout(() => reject(new Error("Timed out reloading the CDP target")), timeoutMs))
-    ]);
-    return true;
-  } catch {
-    return false;
-  } finally {
-    c.close();
-  }
-}
 async function inspectPageTarget(page) {
   const c = makeClient(page.webSocketDebuggerUrl);
   const probeMs = Number(process.env.CURSOR_BRIDGE_PAGE_PROBE_TIMEOUT || 5e3);
@@ -22807,24 +22783,6 @@ async function inspectPageTarget(page) {
     c.close();
   }
 }
-async function recoverBlankAgentsWindows(inspected) {
-  const pages = Array.isArray(inspected) ? inspected : [];
-  const recovered = [];
-  for (const page of pages) {
-    if (!isBlankAgentsWindow(page)) {
-      recovered.push(page);
-      continue;
-    }
-    const reloaded = await reloadPageTarget(page);
-    if (!reloaded) {
-      recovered.push(page);
-      continue;
-    }
-    await sleep2(800);
-    recovered.push(await inspectPageTarget(page));
-  }
-  return recovered;
-}
 function pagesWithFlavor(pages, flavor) {
   return (Array.isArray(pages) ? pages : []).filter((page) => page && page.capabilities && page.capabilities.uiFlavor === flavor);
 }
@@ -22855,7 +22813,7 @@ async function findPage(options = {}) {
   if (options.targetId && options.preferAgentsV2 !== true && options.preferLegacy !== true) {
     return selectCursorPageCandidate(pages, options);
   }
-  const inspected = await recoverBlankAgentsWindows(await Promise.all(pages.map(inspectPageTarget)));
+  const inspected = await Promise.all(pages.map(inspectPageTarget));
   return selectPageForUiPreference(inspected, options) || pages[0];
 }
 function makeClient(wsUrl) {
@@ -22941,10 +22899,71 @@ var INPUT_PICKER_BODY = `
     .filter(e=>e.offsetParent!==null&&!e.disabled&&e.getAttribute('aria-disabled')!=='true'&&e.getAttribute('contenteditable')!=='false')
     .sort((a,b)=>(b.classList&&b.classList.contains('ui-prompt-input-editor__input')?1:0)-(a.classList&&a.classList.contains('ui-prompt-input-editor__input')?1:0))[0]||null;`;
 var EXPR_VISIBLE = `(function(){${INPUT_PICKER_BODY}return !!pickInput();})()`;
-function exprFill(text) {
-  const js = JSON.stringify(text);
-  return `(function(){${INPUT_PICKER_BODY}const inp=pickInput();if(!inp)return 'NO_INPUT';inp.focus();try{const s=getSelection();const r=document.createRange();r.selectNodeContents(inp);s.removeAllRanges();s.addRange(r);}catch(e){}const ok=document.execCommand('insertText',false,${js});try{inp.dispatchEvent(new InputEvent('input',{bubbles:true,inputType:'insertText',data:${js}}));}catch(e){inp.dispatchEvent(new Event('input',{bubbles:true}));}return ok?(inp.innerText||'').slice(0,30):'EXEC_FAIL';})()`;
+var CHAT_PANEL_NEXT_STEP = "Complete or close the current Customize/Settings dialog, open Cursor's main Agent/Chat panel or New Chat, then retry the same request.";
+function classifyChatPanelDiagnostic(snapshot = {}) {
+  const evidence = {
+    writableInputVisible: snapshot.writableInputVisible === true || snapshot.hasWritableInput === true,
+    inputCandidateCount: Number.isFinite(Number(snapshot.inputCandidateCount)) ? Number(snapshot.inputCandidateCount) : 0,
+    settingsOrCustomizeVisible: snapshot.settingsOrCustomizeVisible === true,
+    modalVisible: snapshot.modalVisible === true,
+    modalLabel: snapshot.modalLabel ? String(snapshot.modalLabel) : null,
+    signInControlVisible: snapshot.signInControlVisible === true,
+    signInVisible: snapshot.signInVisible === true,
+    agentSurfaceVisible: snapshot.agentSurfaceVisible === true,
+    composerCount: Number.isFinite(Number(snapshot.composerCount)) ? Number(snapshot.composerCount) : 0,
+    visibilityState: String(snapshot.visibilityState || "unknown"),
+    focused: typeof snapshot.focused === "boolean" ? snapshot.focused : null,
+    pageTitle: snapshot.pageTitle ? String(snapshot.pageTitle) : null,
+    probeError: snapshot.probeError ? String(snapshot.probeError) : null,
+    inputStateChanged: snapshot.inputStateChanged === true
+  };
+  let state = "composer_input_unavailable";
+  let needsAction = "open_new_chat";
+  let message = "Cursor shows an Agent/Chat surface, but no writable input was detected.";
+  if (evidence.signInVisible) {
+    state = "sign_in_required";
+    needsAction = "sign_in_to_cursor";
+    message = "Cursor is showing a sign-in surface instead of a writable Agent/Chat input.";
+  } else if (evidence.settingsOrCustomizeVisible) {
+    state = "settings_or_customize_open";
+    needsAction = "complete_or_close_configuration";
+    message = "Cursor is showing Customize/Settings instead of a writable Agent/Chat input.";
+  } else if (evidence.modalVisible) {
+    state = "modal_dialog_open";
+    needsAction = "complete_or_close_dialog";
+    message = "A visible Cursor dialog is blocking access to the Agent/Chat input.";
+  } else if (evidence.probeError || ["hidden", "prerender", "unloaded"].includes(evidence.visibilityState)) {
+    state = "cursor_window_unavailable";
+    needsAction = "make_cursor_window_available";
+    message = "The selected Cursor page is unavailable or not visible.";
+  } else if (evidence.inputStateChanged) {
+    state = "input_state_changed";
+    needsAction = "open_new_chat";
+    message = "Cursor's Agent/Chat input changed while the request was being prepared.";
+  } else if (!evidence.agentSurfaceVisible && evidence.composerCount === 0) {
+    state = "agent_chat_panel_not_open";
+    needsAction = "open_agent_chat_panel";
+    message = "Cursor's main Agent/Chat panel is not open.";
+  }
+  return {
+    schemaVersion: 1,
+    code: "CURSOR_CHAT_PANEL_UNAVAILABLE",
+    state,
+    message,
+    needsAction,
+    nextStep: CHAT_PANEL_NEXT_STEP,
+    retryable: true,
+    evidence
+  };
+}
+function createChatPanelUnavailableError(snapshot) {
+  const uiDiagnostic = classifyChatPanelDiagnostic(snapshot);
+  const error2 = new Error(`${uiDiagnostic.code}: ${uiDiagnostic.message} ${uiDiagnostic.nextStep}`);
+  error2.code = uiDiagnostic.code;
+  error2.uiDiagnostic = uiDiagnostic;
+  return error2;
 }
+var EXPR_PREPARE_INPUT = `(function(){${INPUT_PICKER_BODY}const inp=pickInput();if(!inp)return 'NO_INPUT';inp.focus();try{const s=getSelection();const r=document.createRange();r.selectNodeContents(inp);s.removeAllRanges();s.addRange(r);}catch(e){}return 'READY';})()`;
 var EXPR_SNAP = `(function(){
   const md=[...document.querySelectorAll('.markdown-root,.aichat-container [class*=markdown]')]
     .filter(e=>e.offsetParent!==null&&!e.closest('.ui-model-picker__trigger,[class*=model-picker]'));
@@ -22955,14 +22974,17 @@ var EXPR_SNAP = `(function(){
   ${INPUT_PICKER_BODY}
   const input=pickInput();
   const inputText=String(input&&(input.innerText||input.textContent)||'').trim();
-  return JSON.stringify({messageCount:texts.length,replyLength:last.length,replyHash:hash,stop,inputTextLength:inputText.length});
+  const composer=input&&(input.closest('.composer-bar,.ui-prompt-input,.agent-prompt-input-root')||input.parentElement);
+  const sendButtons=composer?[...composer.querySelectorAll('button.ui-prompt-input-submit-button[data-state="send"],button.ui-prompt-input-submit-button[aria-label="Send message"],button[aria-label="Send"]')]
+    .filter(button=>button.offsetParent!==null&&!button.disabled&&button.closest('.composer-bar,.ui-prompt-input,.agent-prompt-input-root')===composer):[];
+  return JSON.stringify({messageCount:texts.length,replyLength:last.length,replyHash:hash,stop,inputTextLength:inputText.length,sendReady:sendButtons.length===1});
 })()`;
 var EXPR_CLICK_SEND = `(function(){${INPUT_PICKER_BODY}
   const input=pickInput();if(!input)return 'NO_INPUT';
-  const composer=input.closest('.composer-bar')||input.parentElement;
+  const composer=input.closest('.composer-bar,.ui-prompt-input,.agent-prompt-input-root')||input.parentElement;
   if(!composer)return 'NO_COMPOSER';
-  const buttons=[...composer.querySelectorAll('button.ui-prompt-input-submit-button[data-state="send"],button[aria-label="Send"]')]
-    .filter(button=>button.offsetParent!==null&&!button.disabled&&button.closest('.composer-bar')===input.closest('.composer-bar'));
+  const buttons=[...composer.querySelectorAll('button.ui-prompt-input-submit-button[data-state="send"],button.ui-prompt-input-submit-button[aria-label="Send message"],button[aria-label="Send"]')]
+    .filter(button=>button.offsetParent!==null&&!button.disabled&&button.closest('.composer-bar,.ui-prompt-input,.agent-prompt-input-root')===composer);
   if(buttons.length!==1)return buttons.length?'AMBIGUOUS_SEND':'NO_SEND';
   buttons[0].click();return 'CLICKED';
 })()`;
@@ -23080,7 +23102,7 @@ function exprClickBoundComposerStop(agentId) {
 var EXPR_FIND_NEWAGENT = `(function(){const b=[...document.querySelectorAll('button,[role=button],a.action-label,.codicon')].find(e=>{if(e.offsetParent===null||e.closest('.glass-sidebar-agent-menu-btn'))return false;const s=(e.getAttribute('aria-label')||'')+' '+(e.getAttribute('title')||'')+' '+(e.innerText||'');return /(?:^|\\s)New (?:Agent|Chat)(?:\\s|$)/i.test(s);});if(!b)return '';const r=b.getBoundingClientRect();return JSON.stringify({x:Math.round(r.x+r.width/2),y:Math.round(r.y+r.height/2)});})()`;
 var MODEL_PICKER_VISIBLE_BODY = `
   const visible=(node)=>!!(node&&(node.offsetParent!==null||(node.getClientRects&&node.getClientRects().length>0)));
-  const composers=[...document.querySelectorAll('.composer-bar[data-composer-id],.composer-bar,.ui-prompt-input-root')].filter(visible);
+  const composers=[...document.querySelectorAll('.composer-bar[data-composer-id],.composer-bar,.ui-prompt-input-root,.agent-prompt-input-root,.ui-prompt-input')].filter(visible);
   const composer=composers[composers.length-1]||document;
 `;
 var EXPR_MODEL_PICKER_TRIGGER = `(function(){
@@ -23136,15 +23158,23 @@ function selectModelPickerRow(rows, requested, kind = "model") {
   const candidates = (Array.isArray(rows) ? rows : []).filter((row) => row && row.disabled !== true && (kind === "any" || row.kind === kind)).map((row) => {
     const normalized = normalizeModelPickerText(row.text);
     let score = normalized === wanted ? 1e3 : 0;
-    if (!score && normalized.startsWith(wanted)) score = 800;
-    if (!score && wanted.startsWith(normalized)) score = 700;
-    if (!score && normalized.includes(wanted)) score = 600;
+    if (kind !== "parameter") {
+      if (!score && normalized.startsWith(wanted)) score = 800;
+      if (!score && wanted.startsWith(normalized)) score = 700;
+      if (!score && normalized.includes(wanted)) score = 600;
+    }
     return { row, score, distance: Math.abs(normalized.length - wanted.length) };
   }).filter((entry) => entry.score > 0).sort((a, b) => b.score - a.score || a.distance - b.distance);
   if (candidates.length === 0) return null;
   if (candidates.length > 1 && candidates[0].score === candidates[1].score && candidates[0].distance === candidates[1].distance) return null;
   return candidates[0].row;
 }
+function createModelSelectionError(message, failureClass, retryable, diagnostic = {}) {
+  const error2 = new Error(message);
+  error2.code = `CURSOR_MODEL_${String(failureClass || "PROBE_ERROR").toUpperCase()}`;
+  error2.modelSelectionFailure = { failureClass, retryable, ...diagnostic };
+  return error2;
+}
 var WORKSPACE_SECTION_BODY = `
   const headText=(el)=>String(el&&(el.innerText||el.textContent)||'').trim();
   const isNewAgentButton=(node)=>{
@@ -23398,17 +23428,44 @@ var REACT_ADAPTER_BODY = `
   const a=findAdapter();`;
 var EXPR_AGENT_ADAPTER_READY = `(function(){${REACT_ADAPTER_BODY}return !!a;})()`;
 var EXPR_PAGE_CAPABILITIES = `(function(){${INPUT_PICKER_BODY}
+  const visible=node=>!!(node&&(node.offsetParent!==null||(typeof node.getClientRects==='function'&&node.getClientRects().length>0)));
+  const label=node=>String(node&&(node.getAttribute&&(
+    node.getAttribute('aria-label')||node.getAttribute('title'))||node.innerText||node.textContent)||'').replace(/\\s+/g,' ').trim();
   const input=pickInput();
+  const inputCandidateCount=[...document.querySelectorAll(${JSON.stringify(CURSOR_INPUT_SELECTOR)})].filter(visible).length;
   const hasV2Sidebar=!!document.querySelector('.glass-sidebar-agent-list-container');
   const hasLegacyInput=!!document.querySelector('.aislash-editor-input');
   const hasLegacyHistory=!!document.querySelector('.compact-agent-history-react-menu-label')||
     [...document.querySelectorAll('button,[role=button],a.action-label,.codicon')].some(e=>/Show Chat History|Chat History|Agent History/i.test((e.getAttribute('aria-label')||'')+' '+(e.getAttribute('title')||'')));
+  const dialogs=[...document.querySelectorAll('[role="dialog"],dialog[open],.monaco-dialog-box,.quick-input-widget')].filter(visible);
+  const dialog=dialogs[dialogs.length-1]||null;
+  const dialogHeading=dialog&&dialog.querySelector('h1,h2,h3,[role="heading"]');
+  const dialogLabel=dialog?String(dialog.getAttribute('aria-label')||dialog.getAttribute('title')||label(dialogHeading)||'').slice(0,120):null;
+  const pageTitle=String(document.title||'').replace(/\\s+/g,' ').trim();
+  const pagePath=String(globalThis.location&&globalThis.location.pathname||'');
+  const headings=[...document.querySelectorAll('h1,h2,h3,[role="heading"]')]
+    .filter(node=>visible(node)&&!node.closest('.markdown-root,.composer-messages-container,.composer-react-transcript-root,.aichat-container'))
+    .map(label).filter(Boolean).slice(0,40);
+  const configurationText=[pageTitle,pagePath,...headings,label(dialogHeading)].join(' ');
+  const configurationSelector='.ui-customize-view,.settings-editor,.settings-body,.preferences-editor,[class*="settings-editor"],[class*="preferences-editor"],[data-testid*="customize"]';
+  const settingsOrCustomizeVisible=[...document.querySelectorAll(configurationSelector)].some(visible)||/(?:settings?|customize|preferences|\u8BBE\u7F6E|\u8A2D\u5B9A|\u81EA\u5B9A\u4E49|\u81EA\u8A02)/i.test(configurationText);
+  const authControls=[...document.querySelectorAll('button,a,[role="button"],[role="link"]')]
+    .filter(node=>visible(node)&&!node.closest('.markdown-root,.composer-messages-container,.composer-react-transcript-root'));
+  const signInPattern=/(?:sign|log)\\s*in(?:\\s+to\\s+cursor)?|authenticate(?:\\s+cursor)?|continue with (?:google|github|email|sso)|\u767B\u5F55|\u767B\u5165/i;
+  const signInControlVisible=authControls.some(node=>signInPattern.test(label(node)));
+  const signInVisible=authControls.some(node=>signInPattern.test(label(node))&&!node.closest(configurationSelector));
+  const composerCount=[...document.querySelectorAll('.composer-bar[data-composer-id],.composer-bar,.ui-prompt-input-root')].filter(visible).length;
+  const agentSurfaceVisible=composerCount>0||[...document.querySelectorAll('.glass-sidebar-agent-list-container,.compact-agent-history-react-menu-label,.aichat-container')].some(visible)||authControls.some(node=>/(?:New (?:Agent|Chat)|(?:Chat|Agent) History)/i.test(label(node)));
   const uiFlavor=hasV2Sidebar||(input&&input.classList&&input.classList.contains('ui-prompt-input-editor__input'))?'agents_v2':hasLegacyInput?'legacy':'unknown';
   return JSON.stringify({
-    hasWritableInput:!!input,uiFlavor,
+    hasWritableInput:!!input,inputCandidateCount,uiFlavor,
     agentAdapterKind:hasV2Sidebar?'agents_v2':hasLegacyHistory?'legacy':'none',
     hasComposer:!!document.querySelector('.composer-bar[data-composer-id]'),
-    visible:document.visibilityState==='visible',focused:typeof document.hasFocus==='function'&&document.hasFocus(),documentTitle:String(document.title||'')
+    modalVisible:!!dialog,modalLabel:dialogLabel,
+    settingsOrCustomizeVisible,signInControlVisible,signInVisible,agentSurfaceVisible,composerCount,
+    visibilityState:String(document.visibilityState||'unknown'),
+    visible:document.visibilityState==='visible',focused:typeof document.hasFocus==='function'&&document.hasFocus(),
+    documentTitle:pageTitle,pageTitle:pageTitle.slice(0,160)
   });
 })()`;
 var EXPR_HISTORY_ENTRIES = `(function(){${REACT_ADAPTER_BODY}
@@ -23826,6 +23883,7 @@ var CursorBridge = class {
         status: outcome,
         finishedAt: job.finishedAt || now,
         error: job.error || null,
+        uiDiagnostic: job.uiDiagnostic || null,
         terminalEvidence: job.terminalEvidence || null,
         resultUnavailable: job.resultUnavailable === true
       };
@@ -24426,6 +24484,7 @@ var CursorBridge = class {
       resultUnavailable: false,
       terminalEvidence: null,
       providerError: null,
+      uiDiagnostic: null,
       sendState: "not_sent",
       reservationScope: null,
       controlTail: Promise.resolve(),
@@ -24460,6 +24519,7 @@ var CursorBridge = class {
     const e = error2 instanceof Error ? error2 : new Error(String(error2));
     job.error = e.message;
     if (e.providerError) job.providerError = e.providerError;
+    if (e.uiDiagnostic) job.uiDiagnostic = e.uiDiagnostic;
     if (e.terminalEvidence) job.terminalEvidence = e.terminalEvidence;
     job.status = "failed";
     job.phase = "failed";
@@ -24769,7 +24829,8 @@ var CursorBridge = class {
         this._throwIfCancelledBeforeSend(options);
         await this._applyModelPreference(c, options.modelPreference, options);
         this._throwIfCancelledBeforeSend(options);
-        const filled = await evalJS(c, exprFill(prompt));
+        const filled = await this._fillPrompt(c, prompt, options);
+        if (filled === "NO_INPUT") await this._throwChatPanelUnavailableAfterNoInput(c);
         if (filled === "NO_INPUT" || filled === "EXEC_FAIL") throw new Error("Failed to enter the query because the input state was invalid");
         await sleep2(450);
         this._throwIfCancelledBeforeSend(options);
@@ -24888,25 +24949,83 @@ var CursorBridge = class {
     modelRow = selectModelPickerRow(expanded && expanded.rows, requestedModel, "model");
     return { snapshot: expanded, modelRow };
   }
-  async _selectedEffortRow(c, modelRow, effort) {
-    let snapshot = await this._readModelPickerRows(c);
-    let effortRow = selectModelPickerRow(snapshot.rows, cursorEffortUiValue(effort), "parameter");
-    if (!effortRow) {
-      snapshot = await this._openModelPickerControl(c, snapshot, "effort_control");
-      effortRow = selectModelPickerRow(snapshot.rows, cursorEffortUiValue(effort), "parameter");
+  _inspectModelPickerRows(snapshot, requested, kind) {
+    const rows = (snapshot && Array.isArray(snapshot.rows) ? snapshot.rows : []).filter((row) => row && row.disabled !== true && row.kind === kind);
+    const wanted = normalizeModelPickerText(requested);
+    const exact = rows.filter((row) => normalizeModelPickerText(row.text) === wanted);
+    return {
+      snapshot,
+      row: exact.length === 1 ? exact[0] : null,
+      ambiguous: exact.length > 1,
+      available: rows.map((row) => row.text)
+    };
+  }
+  async _waitForModelPickerMatch(c, requested, kind, job, options = {}) {
+    const timeoutMs = Math.max(0, Number(options.timeoutMs ?? 700));
+    const pollMs = Math.max(10, Number(options.pollMs ?? 100));
+    const stableMs = Math.max(0, Number(options.stableMs ?? 250));
+    const deadline = Date.now() + timeoutMs;
+    let stableSignature = null;
+    let stableSince = 0;
+    let last = this._inspectModelPickerRows({ open: false, rows: [] }, requested, kind);
+    do {
+      this._throwIfCancelledBeforeSend(job);
+      last = this._inspectModelPickerRows(await this._readModelPickerRows(c), requested, kind);
+      if (last.row) return { ...last, state: "matched" };
+      const signature = JSON.stringify(last.available);
+      if (last.available.length > 0) {
+        if (signature !== stableSignature) {
+          stableSignature = signature;
+          stableSince = Date.now();
+        } else if (Date.now() - stableSince >= stableMs) {
+          return { ...last, state: last.ambiguous ? "ambiguous" : "unsupported" };
+        }
+      } else {
+        stableSignature = null;
+        stableSince = 0;
+      }
+      if (Date.now() >= deadline) break;
+      await sleep2(Math.min(pollMs, Math.max(0, deadline - Date.now())));
+    } while (Date.now() <= deadline);
+    return { ...last, state: last.ambiguous ? "ambiguous" : "not_rendered" };
+  }
+  async _selectedEffortRow(c, modelRow, effort, job) {
+    const requested = cursorEffortUiValue(effort);
+    const snapshot = await this._readModelPickerRows(c);
+    const immediate = this._inspectModelPickerRows(snapshot, requested, "parameter");
+    if (immediate.row) return { ...immediate, state: "matched", attempts: ["visible"] };
+    const attempts = [];
+    const effortControl = (snapshot.rows || []).find((row) => row.kind === "effort_control" && row.disabled !== true);
+    if (effortControl) {
+      this._throwIfCancelledBeforeSend(job);
+      attempts.push("effort_control");
+      await this._clickModelPickerPoint(c, effortControl);
+      const result2 = await this._waitForModelPickerMatch(c, requested, "parameter", job, { timeoutMs: 700 });
+      if (result2.state !== "not_rendered") return { ...result2, attempts };
     }
-    if (effortRow) return effortRow;
+    this._throwIfCancelledBeforeSend(job);
+    attempts.push("model_hover");
     await this._hoverModelPickerPoint(c, modelRow);
-    await sleep2(400);
-    snapshot = await this._readModelPickerRows(c);
-    effortRow = selectModelPickerRow(snapshot.rows, cursorEffortUiValue(effort), "parameter");
-    if (!effortRow && modelRow && modelRow.hasSubmenu) {
+    let result = await this._waitForModelPickerMatch(c, requested, "parameter", job, { timeoutMs: 700 });
+    if (result.state !== "not_rendered") return { ...result, attempts };
+    if (modelRow && modelRow.hasSubmenu) {
+      this._throwIfCancelledBeforeSend(job);
+      attempts.push("model_click");
       await this._clickModelPickerPoint(c, modelRow);
-      await sleep2(350);
-      snapshot = await this._readModelPickerRows(c);
-      effortRow = selectModelPickerRow(snapshot.rows, cursorEffortUiValue(effort), "parameter");
+      result = await this._waitForModelPickerMatch(c, requested, "parameter", job, { timeoutMs: 1100 });
     }
-    return effortRow;
+    return { ...result, attempts };
+  }
+  async _waitForSelectedModelPickerRow(c, requested, kind, job, timeoutMs = 1500) {
+    const deadline = Date.now() + timeoutMs;
+    do {
+      this._throwIfCancelledBeforeSend(job);
+      const inspected = this._inspectModelPickerRows(await this._readModelPickerRows(c), requested, kind);
+      if (inspected.row && inspected.row.selected) return inspected.row;
+      if (Date.now() >= deadline) break;
+      await sleep2(Math.min(100, Math.max(0, deadline - Date.now())));
+    } while (Date.now() <= deadline);
+    return null;
   }
   async _applyModelPreference(c, preference, job) {
     if (!preference) {
@@ -24915,63 +25034,167 @@ var CursorBridge = class {
     }
     const requestedModel = String(preference.model || "").trim();
     const requestedEffort = preference.effort ? normalizeCursorModelEffort(preference.effort, "") : null;
-    const opened = await this._openModelPicker(c);
-    let located = await this._findModelPickerModel(c, opened, requestedModel);
-    let modelRow = located.modelRow;
-    if (!modelRow) {
-      throw new Error(`Configured Cursor model is unavailable or ambiguous: ${requestedModel}`);
-    }
-    let selectedEffortRow = null;
-    if (requestedEffort && modelRow.hasSubmenu) {
-      selectedEffortRow = await this._selectedEffortRow(c, modelRow, requestedEffort);
-      if (!selectedEffortRow) {
-        throw new Error(`Cursor model ${requestedModel} does not expose effort ${requestedEffort}`);
-      }
-      if (!selectedEffortRow.selected || !modelRow.selected) {
-        await this._clickModelPickerPoint(c, selectedEffortRow);
-        await sleep2(550);
-      }
-    } else if (!modelRow.selected) {
-      await this._clickModelPickerPoint(c, modelRow);
-      await sleep2(550);
-    }
-    let trigger = await this._readModelPickerTrigger(c);
-    if (!trigger.found || !normalizeModelPickerText(trigger.text).includes(normalizeModelPickerText(requestedModel))) {
-      const reopened = await this._openModelPicker(c);
-      located = await this._findModelPickerModel(c, reopened, requestedModel);
-      const selected = selectModelPickerRow(located.snapshot.rows.filter((row) => row.selected), requestedModel, "model");
-      if (!selected) throw new Error(`Cursor did not confirm configured model ${requestedModel}`);
-      modelRow = selected;
-    }
+    let modelRow = null;
     let effectiveEffort = null;
-    if (requestedEffort) {
-      const reopened = await this._openModelPicker(c);
-      located = await this._findModelPickerModel(c, reopened, requestedModel);
+    let primaryError = null;
+    try {
+      const opened = await this._openModelPicker(c);
+      let located = await this._findModelPickerModel(c, opened, requestedModel);
       modelRow = located.modelRow;
-      if (!modelRow) throw new Error(`Cursor model row disappeared while applying effort: ${requestedModel}`);
-      let effortRow = await this._selectedEffortRow(c, modelRow, requestedEffort);
-      if (!effortRow) {
-        throw new Error(`Cursor model ${requestedModel} does not expose effort ${requestedEffort}`);
+      if (!modelRow) {
+        throw createModelSelectionError(
+          `Configured Cursor model is unavailable or ambiguous: ${requestedModel}`,
+          "model_unavailable",
+          false,
+          { available: (located.snapshot.rows || []).filter((row) => row.kind === "model").map((row) => row.text) }
+        );
       }
-      if (!effortRow.selected) {
-        await this._clickModelPickerPoint(c, effortRow);
-        await sleep2(450);
+      let effortPickerReopened = false;
+      const resolveEffort = async () => {
+        let outcome = await this._selectedEffortRow(c, modelRow, requestedEffort, job);
+        if (!outcome.row && outcome.state === "not_rendered" && !effortPickerReopened) {
+          effortPickerReopened = true;
+          await this._closeModelPicker(c);
+          const reopened = await this._openModelPicker(c);
+          located = await this._findModelPickerModel(c, reopened, requestedModel);
+          modelRow = located.modelRow;
+          if (!modelRow) {
+            throw createModelSelectionError(
+              `Cursor model row disappeared while applying effort: ${requestedModel}`,
+              "model_unavailable",
+              true
+            );
+          }
+          outcome = await this._selectedEffortRow(c, modelRow, requestedEffort, job);
+          outcome.attempts = ["picker_reopen", ...outcome.attempts || []];
+        }
+        return outcome;
+      };
+      const throwEffortFailure = (outcome) => {
+        const failureClass = outcome.state === "ambiguous" ? "effort_ambiguous" : outcome.state === "unsupported" ? "effort_unsupported" : "effort_menu_not_rendered";
+        const message = failureClass === "effort_menu_not_rendered" ? `Cursor effort menu did not render for model ${requestedModel}` : failureClass === "effort_ambiguous" ? `Cursor model ${requestedModel} exposes ambiguous effort ${requestedEffort}` : `Cursor model ${requestedModel} does not expose effort ${requestedEffort}`;
+        throw createModelSelectionError(
+          message,
+          failureClass,
+          failureClass === "effort_menu_not_rendered",
+          { available: outcome.available || [], attempts: outcome.attempts || [] }
+        );
+      };
+      if (requestedEffort && modelRow.hasSubmenu) {
+        const selectedEffort = await resolveEffort();
+        if (!selectedEffort.row) throwEffortFailure(selectedEffort);
+        if (!selectedEffort.row.selected || !modelRow.selected) {
+          this._throwIfCancelledBeforeSend(job);
+          await this._clickModelPickerPoint(c, selectedEffort.row);
+          await sleep2(550);
+        }
+      } else if (!modelRow.selected) {
+        this._throwIfCancelledBeforeSend(job);
+        await this._clickModelPickerPoint(c, modelRow);
+        await sleep2(550);
       }
-      trigger = await this._readModelPickerTrigger(c);
-      const detailMatches = normalizeModelPickerText(`${trigger.detail || ""} ${trigger.text || ""}`).includes(normalizeModelPickerText(requestedEffort));
-      if (!detailMatches) {
-        const verify = await this._openModelPicker(c);
-        const verifiedModel = await this._findModelPickerModel(c, verify, requestedModel);
-        const selectedModel = verifiedModel.modelRow;
-        effortRow = await this._selectedEffortRow(c, selectedModel, requestedEffort);
+      let trigger2 = await this._readModelPickerTrigger(c);
+      if (!trigger2.found || !normalizeModelPickerText(trigger2.text).includes(normalizeModelPickerText(requestedModel))) {
+        const reopened = await this._openModelPicker(c);
+        located = await this._findModelPickerModel(c, reopened, requestedModel);
+        const selected = selectModelPickerRow(located.snapshot.rows.filter((row) => row.selected), requestedModel, "model");
+        if (!selected) {
+          throw createModelSelectionError(
+            `Cursor did not confirm configured model ${requestedModel}`,
+            "model_not_confirmed",
+            true
+          );
+        }
+        modelRow = selected;
+      }
+      if (requestedEffort) {
+        const reopened = await this._openModelPicker(c);
+        located = await this._findModelPickerModel(c, reopened, requestedModel);
+        modelRow = located.modelRow;
+        if (!modelRow) {
+          throw createModelSelectionError(
+            `Cursor model row disappeared while applying effort: ${requestedModel}`,
+            "model_unavailable",
+            true
+          );
+        }
+        const effortOutcome = await resolveEffort();
+        if (!effortOutcome.row) throwEffortFailure(effortOutcome);
+        let effortRow = effortOutcome.row;
+        if (!effortRow.selected) {
+          effortRow = await this._waitForSelectedModelPickerRow(
+            c,
+            cursorEffortUiValue(requestedEffort),
+            "parameter",
+            job
+          );
+        }
         if (!effortRow || !effortRow.selected) {
-          throw new Error(`Cursor did not confirm effort ${requestedEffort} for model ${requestedModel}`);
+          throw createModelSelectionError(
+            `Cursor did not confirm effort ${requestedEffort} for model ${requestedModel}`,
+            "effort_not_confirmed",
+            true
+          );
+        }
+        effectiveEffort = requestedEffort;
+      }
+    } catch (error2) {
+      primaryError = error2 instanceof Error ? error2 : new Error(String(error2));
+      let failure = primaryError.modelSelectionFailure;
+      if (!failure) {
+        const pickerUnavailable = /model picker (?:is unavailable|did not open)/i.test(primaryError.message);
+        failure = {
+          failureClass: pickerUnavailable ? "picker_did_not_open" : "probe_error",
+          retryable: true
+        };
+      }
+      const diagnostic = {
+        configured: true,
+        applied: false,
+        requestedModel,
+        requestedEffort,
+        failureClass: failure.failureClass,
+        retryable: failure.retryable === true,
+        errorCode: primaryError.code || `CURSOR_MODEL_${String(failure.failureClass).toUpperCase()}`,
+        available: failure.available || [],
+        attempts: failure.attempts || [],
+        runtimeMode: this.runtimeMode,
+        lastError: primaryError.message,
+        failedAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      primaryError.modelSelection = diagnostic;
+      if (job) job.modelSelection = diagnostic;
+      throw primaryError;
+    } finally {
+      try {
+        await this._closeModelPicker(c);
+      } catch (cleanupError) {
+        const message = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
+        if (!primaryError) {
+          const error2 = createModelSelectionError(message, "picker_cleanup_failed", true);
+          const diagnostic = {
+            configured: true,
+            applied: false,
+            requestedModel,
+            requestedEffort,
+            failureClass: "picker_cleanup_failed",
+            retryable: true,
+            errorCode: error2.code,
+            available: [],
+            attempts: [],
+            runtimeMode: this.runtimeMode,
+            lastError: message,
+            failedAt: (/* @__PURE__ */ new Date()).toISOString()
+          };
+          error2.modelSelection = diagnostic;
+          if (job) job.modelSelection = diagnostic;
+          throw error2;
         }
+        if (primaryError.modelSelection) primaryError.modelSelection.cleanupError = message;
+        if (job && job.modelSelection) job.modelSelection.cleanupError = message;
       }
-      effectiveEffort = requestedEffort;
     }
-    await this._closeModelPicker(c);
-    trigger = await this._readModelPickerTrigger(c);
+    const trigger = await this._readModelPickerTrigger(c);
     const result = {
       configured: true,
       applied: true,
@@ -24985,19 +25208,24 @@ var CursorBridge = class {
     if (job) job.modelSelection = result;
     return result;
   }
-  async _ensureChatPanel(c) {
-    let vis = await evalJS(c, EXPR_VISIBLE);
-    if (!vis) {
-      await chord(c, 2, "L", "KeyL", 76);
-      await sleep2(1300);
-      vis = await evalJS(c, EXPR_VISIBLE);
-    }
-    if (!vis) {
-      await chord(c, 2, "I", "KeyI", 73);
-      await sleep2(1300);
-      vis = await evalJS(c, EXPR_VISIBLE);
+  async _readChatPanelDiagnostic(c) {
+    try {
+      return JSON.parse(await evalJS(c, EXPR_PAGE_CAPABILITIES) || "{}");
+    } catch (error2) {
+      return { probeError: error2 instanceof Error ? error2.message : String(error2) };
     }
-    if (!vis) throw new Error("Unable to open the Cursor chat or agent input panel. Confirm that Cursor is signed in and its window is available.");
+  }
+  async _ensureChatPanel(c) {
+    const snapshot = await this._readChatPanelDiagnostic(c);
+    if (snapshot.modalVisible !== true && snapshot.hasWritableInput === true) return snapshot;
+    throw createChatPanelUnavailableError(snapshot);
+  }
+  async _throwChatPanelUnavailableAfterNoInput(c) {
+    const snapshot = await this._readChatPanelDiagnostic(c);
+    throw createChatPanelUnavailableError({
+      ...snapshot,
+      inputStateChanged: snapshot.hasWritableInput === true
+    });
   }
   // 清空对话上下文：定位 "New Agent" 钮后【Alt+click】——Alt 修饰使其执行 Replace Agent（清空旧对话），
   // 而非新建（aria 标注 "New Agent (Ctrl+N) / [Alt] Replace Agent"）。2026-06-08 实测回复区 markdown DOM 清空
@@ -25145,6 +25373,38 @@ var CursorBridge = class {
       }
     }
   }
+  async _fillPrompt(c, text, job, timeoutMs = 2500) {
+    const prepared = await evalJS(c, EXPR_PREPARE_INPUT);
+    if (prepared !== "READY") return prepared;
+    try {
+      await c.send("Input.insertText", { text: String(text) });
+    } catch {
+      return "EXEC_FAIL";
+    }
+    const deadline = Date.now() + timeoutMs;
+    let snapshot = {};
+    do {
+      this._throwIfCancelledBeforeSend(job);
+      try {
+        snapshot = JSON.parse(await evalJS(c, EXPR_SNAP));
+      } catch {
+      }
+      if (Number(snapshot.inputTextLength || 0) > 0 && snapshot.sendReady === true) {
+        return String(text).slice(0, 30);
+      }
+      if (Date.now() >= deadline) break;
+      await sleep2(Math.min(100, Math.max(0, deadline - Date.now())));
+    } while (Date.now() <= deadline);
+    const error2 = new Error("Cursor composer did not become send-ready after trusted input");
+    error2.code = "CURSOR_COMPOSER_NOT_SEND_READY";
+    error2.confirmedNotSent = true;
+    error2.composerDiagnostic = {
+      inputTextLength: Number(snapshot.inputTextLength || 0),
+      sendReady: snapshot.sendReady === true,
+      runtimeMode: this.runtimeMode
+    };
+    throw error2;
+  }
   async _confirmSubmission(c, baselineCount = 0, providerErrorBaseline = "") {
     const accepted = async () => {
       await this._throwIfNewProviderError(c, providerErrorBaseline);
@@ -25234,7 +25494,8 @@ var CursorBridge = class {
       this._throwIfCancelledBeforeSend(job);
       await this._applyModelPreference(c, job.modelPreference, job);
       this._throwIfCancelledBeforeSend(job);
-      const filled = await evalJS(c, exprFill(job.prompt));
+      const filled = await this._fillPrompt(c, job.prompt, job);
+      if (filled === "NO_INPUT") await this._throwChatPanelUnavailableAfterNoInput(c);
       if (filled === "NO_INPUT" || filled === "EXEC_FAIL") throw new Error("Failed to enter the parallel_agent task");
       await sleep2(350);
       this._throwIfCancelledBeforeSend(job);
@@ -25353,7 +25614,8 @@ var CursorBridge = class {
       this._throwIfCancelledBeforeSend(job);
       job.responseBaseline = await this._captureSessionResponseBaseline(c);
       const providerErrorBaseline = providerErrorSignature(await this._readProviderError(c));
-      const filled = await evalJS(c, exprFill(job.prompt));
+      const filled = await this._fillPrompt(c, job.prompt, job);
+      if (filled === "NO_INPUT") await this._throwChatPanelUnavailableAfterNoInput(c);
       if (filled === "NO_INPUT" || filled === "EXEC_FAIL") {
         throw cursorSessionError("SESSION_INPUT_FAILED", "failed to enter the continued task");
       }
@@ -26197,6 +26459,7 @@ var CursorBridge = class {
       resultUnavailable: job.resultUnavailable,
       terminalEvidence: job.terminalEvidence,
       providerError: job.providerError,
+      uiDiagnostic: job.uiDiagnostic,
       sendState: job.sendState,
       reservationScope: job.reservationScope,
       reservationHeld: this.activeParallel.has(job.id),
@@ -26412,6 +26675,21 @@ async function ensureBridgeCursor(targetBridge, reason) {
   }
   return r;
 }
+function toolErrorResult(error2) {
+  const message = error2 instanceof Error ? error2.message : String(error2);
+  if (error2 && error2.uiDiagnostic) {
+    const payload = {
+      error: { code: error2.code || error2.uiDiagnostic.code || "CURSOR_BRIDGE_ERROR", message },
+      uiDiagnostic: error2.uiDiagnostic
+    };
+    return {
+      content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
+      structuredContent: payload,
+      isError: true
+    };
+  }
+  return { content: [{ type: "text", text: `Error: ${message}` }], isError: true };
+}
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
   tools: buildToolDefinitions(bridge)
 }));
@@ -26513,7 +26791,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request2) => {
     }
     throw new Error(`Unknown tool: ${name}`);
   } catch (error2) {
-    return { content: [{ type: "text", text: `Error: ${error2 instanceof Error ? error2.message : String(error2)}` }], isError: true };
+    return toolErrorResult(error2);
   }
 });
 async function main() {
@@ -26553,6 +26831,7 @@ export {
   EXPR_MODEL_PICKER_ROWS,
   EXPR_MODEL_PICKER_TRIGGER,
   EXPR_PAGE_CAPABILITIES,
+  EXPR_PREPARE_INPUT,
   EXPR_PROVIDER_ERROR,
   EXPR_VISIBLE,
   EXPR_VISIBLE_COMPOSER,
@@ -26560,16 +26839,16 @@ export {
   bridge,
   buildContextEnginePrompt,
   buildToolDefinitions,
+  classifyChatPanelDiagnostic,
   classifyParallelTerminalIcon,
+  createChatPanelUnavailableError,
   createProviderError,
   cursorStartupBehavior,
   exprClickBoundComposerStop,
   exprClickSelectedAgentStop,
   exprCreateAgentForWorkspace,
-  exprFill,
   exprInspectWorkspaceRepository,
   exprOpenAgent,
-  isBlankAgentsWindow,
   isConfirmedCompletedReply,
   isDurablyRegisteredParallelEntry,
   isSessionTurnReplyReady,
@@ -26597,6 +26876,7 @@ export {
   shouldRecoverNormalAgentsPresentation,
   shouldScheduleParallelOriginRestore,
   summarizeCdpPages,
+  toolErrorResult,
   uncertainSubmissionReservationScope,
   updateStableEntryObservation
 };

package/extensions/index.ts

@@ -10,7 +10,7 @@ const hostWorkspaceId = hostCwd.replace(/\\/g, "/").toLowerCase();
 export default createStdioMcpExtension({
   label: "Cursor Bridge",
   clientName: "pi-cursor-bridge",
-  packageVersion: "0.1.10",
+  packageVersion: "0.1.12",
   serverName: "cursor-bridge",
   serverScript: join(packageRoot, "dist", "cursor-bridge.mjs"),
   cwd: hostCwd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cursor-bridge",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Use Cursor Context Engine and bounded, explicitly continuous Cursor Agent execution from the Pi coding agent.",
   "type": "module",
   "license": "MIT",
@@ -47,6 +47,6 @@
   },
   "piPackage": {
     "embeddedProduct": "Cursor Bridge",
-    "embeddedProductVersion": "5.8.0"
+    "embeddedProductVersion": "5.8.2"
   }
 }