pi-cursor-bridge 0.2.6 → 0.2.8

package/.codex-plugin/plugin.json

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

package/README.md

@@ -12,6 +12,6 @@ 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.
 
-Pi wrapper 0.2.6 embeds Cursor Bridge 6.0.6, including Cursor 3.21 model-provider alias matching and `reasoning_effort` verification for Grok 4.7/high. Its result contract returns a compact receipt for background `cursor_do` work: poll `cursor_status(task_id)` normally, retrieve the terminal raw reply with `cursor_status(task_id, detail="result")`, check `isError` before using its content, and use `detail="full"` only when diagnostics are needed. Cursor must be installed and signed in. Current end-to-end compatibility claims remain scoped to the environments documented in the main repository.
+Pi wrapper 0.2.8 embeds Cursor Bridge 6.0.8, including Cursor 3.21 model-provider alias matching and `reasoning_effort` verification for Grok 4.7/high. Its result contract returns a compact receipt for background `cursor_do` work: poll `cursor_status(task_id)` normally, retrieve the terminal raw reply with `cursor_status(task_id, detail="result")`, check `isError` before using its content, and use `detail="full"` only when diagnostics are needed. 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/main/README.zh-CN.md)

package/dist/cursor-bridge.mjs

@@ -12907,6 +12907,11 @@ async function ensureCursorViaSupervisor(options = {}) {
       ok: !!response.ok,
       status: response.status,
       message: response.message,
+      needsAction: response.needsAction || null,
+      nextStep: response.nextStep || null,
+      retryable: response.retryable === true,
+      cursorExecutable: response.cursorExecutable || null,
+      cursorExecutableSource: response.cursorExecutableSource || null,
       port: response.port,
       exe: response.exe,
       cursorPid: response.cursorPid || null,
@@ -22985,7 +22990,7 @@ function updateCursorSessionRegistry(filePath, mutator, options = {}) {
 // server.mjs
 init_cursor_ensure_core();
 init_lifecycle_paths();
-var PLUGIN_VERSION = "6.0.6";
+var PLUGIN_VERSION = "6.0.8";
 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);
@@ -23373,6 +23378,24 @@ var EXPR_PROVIDER_ERROR = `(function(){
   const signature=[title,message,requestId||''].join('|');
   return JSON.stringify({found:true,title,message,requestId,retryAvailable,signature});
 })()`;
+var STOP_COMPOSER_BODY = `
+  const findStopComposers=(rawId)=>{
+    const legacy=[...document.querySelectorAll('.composer-bar[data-composer-id]')]
+      .filter(e=>e.offsetParent!==null&&e.dataset.composerId&&(!rawId||e.dataset.composerId===rawId));
+    if(legacy.length)return {modern:false,composers:legacy};
+    return {modern:true,composers:[...document.querySelectorAll('[data-agent-panel-conversation-shell][data-glass-agent-id]')]
+      .filter(e=>e.offsetParent!==null&&e.dataset.glassAgentId&&(!rawId||e.dataset.glassAgentId===rawId))};
+  };
+  const modernComposerStatus=(composer,entries)=>{
+    const ownStatus=composer.dataset.composerStatus;
+    if(ownStatus)return ownStatus;
+    const matches=entries.filter(e=>e&&e.id==='local:'+composer.dataset.glassAgentId);
+    if(matches.length!==1)return null;
+    const entry=matches[0];
+    if(entry.showSpinner||entry.icon==='loading')return 'generating';
+    return ({'check-circled':'completed','circle-slash':'cancelled',warning:'failed','needs-attention':'needs_attention'})[entry.icon]||null;
+  };
+`;
 function exprClickSelectedAgentStop(agentId) {
   const expected = JSON.stringify(String(agentId));
   return `(function(){
@@ -23385,52 +23408,52 @@ function exprClickSelectedAgentStop(agentId) {
     if(!selected||selected.id!==${expected}){
       return JSON.stringify({clicked:false,state:'selected_agent_mismatch',selectedId:selected&&selected.id||null,selectedCount:selectedEntries.length});
     }
+    ${STOP_COMPOSER_BODY}
     const expectedComposerId=String(${expected}).replace(/^local:/,'');
-    const composers=[...document.querySelectorAll('.composer-bar[data-composer-id]')]
-      .filter(e=>e.offsetParent!==null&&e.dataset.composerId===expectedComposerId);
+    const {modern,composers}=findStopComposers(expectedComposerId);
     if(composers.length!==1){
       return JSON.stringify({clicked:false,state:'composer_identity_mismatch',selectedId:selected.id,count:composers.length});
     }
     const composer=composers[0];
-    if(composer.dataset.composerStatus!=='generating'){
-      return JSON.stringify({clicked:false,state:'composer_not_generating',selectedId:selected.id,status:composer.dataset.composerStatus||null});
+    const status=modern?modernComposerStatus(composer,entries):composer.dataset.composerStatus||null;
+    if(status!=='generating'){
+      return JSON.stringify({clicked:false,state:'composer_not_generating',selectedId:selected.id,status});
     }
-    const generationButtons=[...composer.querySelectorAll('button.ui-prompt-input-submit-button[data-state="stop"][aria-label="Stop generation"]')]
-      .filter(button=>button.offsetParent!==null&&!button.disabled&&button.closest('.composer-bar')===composer);
+    const belongs=button=>button.offsetParent!==null&&!button.disabled&&button.closest(modern?'[data-glass-agent-id]':'.composer-bar')===composer;
+    const generationButtons=[...composer.querySelectorAll(modern?'button.ui-prompt-input-submit-button[aria-label="Stop generation"]':'button.ui-prompt-input-submit-button[data-state="stop"][aria-label="Stop generation"]')]
+      .filter(belongs);
     const commandButtons=[...composer.querySelectorAll('button.ui-shell-tool-call__glass-stop[aria-label="Stop command"]')]
-      .filter(button=>button.offsetParent!==null&&!button.disabled&&button.closest('.composer-bar')===composer);
+      .filter(belongs);
     const buttons=[...generationButtons,...commandButtons];
     if(buttons.length!==1){
       return JSON.stringify({clicked:false,state:buttons.length?'ambiguous_stop_controls':'stop_control_missing',selectedId:selected.id,count:buttons.length});
     }
     buttons[0].click();
-    return JSON.stringify({clicked:true,state:'clicked',selectedId:selected.id,composerId:composer.dataset.composerId,control:generationButtons.length?'stop_generation':'stop_command'});
+    return JSON.stringify({clicked:true,state:'clicked',selectedId:selected.id,composerId:expectedComposerId,control:generationButtons.length?'stop_generation':'stop_command'});
   })()`;
 }
-var EXPR_VISIBLE_COMPOSER = `(function(){
-  const composers=[...document.querySelectorAll('.composer-bar[data-composer-id]')]
-    .filter(e=>e.offsetParent!==null&&e.dataset.composerId);
-  if(composers.length!==1){
-    return JSON.stringify({ok:false,state:composers.length?'ambiguous_composers':'composer_missing',count:composers.length});
-  }
-  const composer=composers[0];
-  return JSON.stringify({
-    ok:true,
-    id:'local:'+composer.dataset.composerId,
-    composerId:composer.dataset.composerId,
-    status:composer.dataset.composerStatus||null
-  });
-})()`;
 function exprClickBoundComposerStop(agentId) {
   const expected = JSON.stringify(String(agentId));
   return `(function(){
+    ${STOP_COMPOSER_BODY}
     const expectedComposerId=String(${expected}).replace(/^local:/,'');
-    const composers=[...document.querySelectorAll('.composer-bar[data-composer-id]')]
-      .filter(e=>e.offsetParent!==null&&e.dataset.composerId===expectedComposerId);
+    const {modern,composers}=findStopComposers(expectedComposerId);
     if(composers.length!==1){
       return JSON.stringify({clicked:false,state:'composer_identity_mismatch',count:composers.length});
     }
     const composer=composers[0];
+    if(modern){
+      ${REACT_ADAPTER_BODY}
+      const status=modernComposerStatus(composer,a?a.entries():[]);
+      if(status!=='generating')return JSON.stringify({clicked:false,state:'composer_not_generating',status,composerId:expectedComposerId});
+      const belongs=button=>button.offsetParent!==null&&!button.disabled&&button.closest('[data-glass-agent-id]')===composer;
+      const generationButtons=[...composer.querySelectorAll('button.ui-prompt-input-submit-button[aria-label="Stop generation"]')].filter(belongs);
+      const commandButtons=[...composer.querySelectorAll('button.ui-shell-tool-call__glass-stop[aria-label="Stop command"]')].filter(belongs);
+      const buttons=[...generationButtons,...commandButtons];
+      if(buttons.length!==1)return JSON.stringify({clicked:false,state:buttons.length?'ambiguous_stop_controls':'stop_control_missing',count:buttons.length,composerId:expectedComposerId});
+      buttons[0].click();
+      return JSON.stringify({clicked:true,state:'clicked',composerId:expectedComposerId,control:generationButtons.length?'stop_generation':'stop_command'});
+    }
     if(composer.dataset.composerStatus!=='generating'){
       return JSON.stringify({clicked:false,state:'composer_not_generating',status:composer.dataset.composerStatus||null,composerId:composer.dataset.composerId});
     }
@@ -23458,21 +23481,45 @@ 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 = `
+  ${INPUT_PICKER_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,.agent-prompt-input-root,.ui-prompt-input')].filter(visible);
-  const composer=composers[composers.length-1]||document;
+  const inputs=inputCandidates();
+  const ownerSelector='.composer-bar[data-composer-id],.composer-bar,.ui-prompt-input-root,.agent-prompt-input-root,.ui-prompt-input';
+  const composer=inputs.length===1?inputs[0].closest(ownerSelector):null;
+  const triggerSelector='.ui-model-picker__trigger,.vscode-model-picker__trigger';
+  const candidates=composer?[...composer.querySelectorAll(triggerSelector)]
+    .filter(node=>visible(node)&&node.closest(ownerSelector)===composer):[];
+  const trigger=candidates.length===1?candidates[0]:null;
+  const shell=inputs.length===1?inputs[0].closest('[data-agent-panel-conversation-shell][data-glass-agent-id]'):null;
+  const owner=trigger?{triggerId:trigger.getAttribute('id'),composerId:composer.getAttribute('data-composer-id'),agentId:shell&&shell.getAttribute('data-glass-agent-id')}:null;
 `;
 var EXPR_MODEL_PICKER_TRIGGER = `(function(){
   ${MODEL_PICKER_VISIBLE_BODY}
-  const triggerSelector='.ui-model-picker__trigger,.vscode-model-picker__trigger';
-  const candidates=[...composer.querySelectorAll(triggerSelector)].filter(visible);
-  const trigger=candidates[candidates.length-1]||[...document.querySelectorAll(triggerSelector)].filter(visible).pop();
-  if(!trigger)return JSON.stringify({found:false,state:'trigger_missing'});
+  if(!trigger)return JSON.stringify({found:false,state:inputs.length!==1?'input_ambiguous':!composer?'composer_missing':candidates.length>1?'trigger_ambiguous':'trigger_missing',inputCount:inputs.length,triggerCount:candidates.length});
   const rect=trigger.getBoundingClientRect();
   const text=String(trigger.querySelector('.ui-model-picker__trigger-text,.vscode-model-picker__trigger-text')?.innerText||trigger.innerText||'').replace(/\\s+/g,' ').trim();
   const detail=String(trigger.querySelector('.ui-model-picker__trigger-variant-suffix,.vscode-model-picker__trigger-variant-suffix')?.innerText||'').replace(/\\s+/g,' ').trim();
-  return JSON.stringify({found:true,state:'ready',text,detail,x:Math.round(rect.x+rect.width/2),y:Math.round(rect.y+rect.height/2)});
+  const x=Math.round(rect.x+rect.width/2),y=Math.round(rect.y+rect.height/2);
+  let state='ready';
+  if(trigger.disabled||trigger.getAttribute('aria-disabled')==='true'||trigger.closest('[inert]')||getComputedStyle(trigger).pointerEvents==='none')state='trigger_disabled';
+  else if(!Number.isFinite(x)||!Number.isFinite(y)||rect.width<=0||rect.height<=0||x<0||y<0||x>=innerWidth||y>=innerHeight)state='trigger_offscreen';
+  else {const hit=document.elementFromPoint(x,y);if(!hit||hit!==trigger&&!trigger.contains(hit))state='trigger_occluded';}
+  return JSON.stringify({found:true,state,interactive:state==='ready',expanded:trigger.getAttribute('aria-expanded'),text,detail,x,y,...owner});
 })()`;
+function exprActivateClosedModelPicker(expected) {
+  return `(function(){
+    const expected=${JSON.stringify(expected)};
+    const current=JSON.parse(${EXPR_MODEL_PICKER_TRIGGER});
+    if(!current.found||current.interactive!==true||current.expanded!=='false')return JSON.stringify({clicked:false,state:'trigger_not_closed_and_interactive'});
+    if(!current.triggerId||['triggerId','composerId','agentId','x','y'].some(key=>(current[key]??null)!==(expected[key]??null)))return JSON.stringify({clicked:false,state:'trigger_changed'});
+    ${MODEL_PICKER_VISIBLE_BODY}
+    if(!trigger||trigger.getAttribute('id')!==current.triggerId)return JSON.stringify({clicked:false,state:'trigger_changed'});
+    // Use the same button's normal click handler after a native click failed
+    // to expand it. The closed-state and hit checks occur in this same turn.
+    trigger.click();
+    return JSON.stringify({clicked:true,state:'closed_trigger_activated',owner});
+  })()`;
+}
 function classifyModelPickerRowKind(text, hasItemName, menuTestId, submenuTestId, ariaHaspopup, hasParamCheck, inSubmenu) {
   const menu = String(menuTestId || "").toLowerCase();
   const submenu = String(submenuTestId || "").toLowerCase();
@@ -23489,7 +23536,32 @@ function classifyModelPickerRowKind(text, hasItemName, menuTestId, submenuTestId
 var EXPR_MODEL_PICKER_ROWS = `(function(){
   ${MODEL_PICKER_VISIBLE_BODY}
   ${classifyModelPickerRowKind.toString()}
-  const menus=[...document.querySelectorAll('[data-testid="model-picker-menu"],[data-testid="selected-auto-menu"],[data-testid*="model-parameters"],[data-testid*="parameter-submenu"],[data-component="menu-popup"][data-submenu]')].filter(visible);
+  const visibleMenus=[...document.querySelectorAll('[data-testid="model-picker-menu"],[data-testid="selected-auto-menu"],[data-testid*="model-parameters"],[data-testid*="parameter-submenu"],[data-component="menu-popup"][data-submenu]')].filter(visible);
+  const menus=[];
+  if(trigger){
+    // Modern menus are portalled. Follow the exact trigger's accessibility
+    // links, including submenu triggers, instead of adopting another picker.
+    const ids=new Set(),controls=new Set();
+    const link=node=>{
+      const id=node.getAttribute('id');if(id)ids.add(id);
+      for(const id of String(node.getAttribute('aria-controls')||'').split(/\\s+/).filter(Boolean))controls.add(id);
+    };
+    link(trigger);
+    for(let pass=0;pass<visibleMenus.length;pass++){
+      let changed=false;
+      for(const menu of visibleMenus){
+        if(menus.includes(menu))continue;
+        const id=menu.getAttribute('id'),labelledBy=String(menu.getAttribute('aria-labelledby')||'').split(/\\s+/).filter(Boolean);
+        if(!(id&&controls.has(id))&&!labelledBy.some(id=>ids.has(id)))continue;
+        menus.push(menu);link(menu);
+        for(const node of menu.querySelectorAll('[id],[aria-controls]'))link(node);
+        changed=true;
+      }
+      if(!changed)break;
+    }
+    if(!ids.size&&!controls.size&&visibleMenus.length===1
+      &&[...document.querySelectorAll(triggerSelector)].filter(visible).length===1)menus.push(visibleMenus[0]);
+  }
   const rows=[];
   const seen=new Set();
   for(const menu of menus){
@@ -23524,8 +23596,11 @@ var EXPR_MODEL_PICKER_ROWS = `(function(){
       });
     }
   }
-  return JSON.stringify({open:menus.length>0,rows});
+  return JSON.stringify({open:menus.length>0,rows,owner});
 })()`;
+function modelPickerOwnerKey(owner) {
+  return owner && JSON.stringify([owner.triggerId || null, owner.composerId || null, owner.agentId || null]);
+}
 var EXPR_SELECTED_AGENT_MODEL_CONFIG = `(function(){
   ${INPUT_PICKER_BODY}
   const inputs=inputCandidates();
@@ -23540,12 +23615,90 @@ var EXPR_SELECTED_AGENT_MODEL_CONFIG = `(function(){
       if(data&&data.modelConfig&&!configs.includes(data.modelConfig))configs.push(data.modelConfig);
     }
   }
-  if(configs.length!==1)return JSON.stringify({found:false,state:'model_config_ambiguous',configCount:configs.length});
-  const config=configs[0];
-  return JSON.stringify({found:true,modelName:String(config.modelName||''),selectedModels:(config.selectedModels||[]).map(model=>({
-    modelId:String(model&&model.modelId||''),
-    parameters:Object.fromEntries((model&&model.parameters||[]).map(parameter=>[String(parameter&&parameter.id||''),String(parameter&&parameter.value||'')]))
-  }))});
+  if(configs.length>1)return JSON.stringify({found:false,state:'model_config_ambiguous',configCount:configs.length});
+  if(configs.length===1){
+    const config=configs[0];
+    return JSON.stringify({found:true,modelName:String(config.modelName||''),selectedModels:(config.selectedModels||[]).map(model=>({
+      modelId:String(model&&model.modelId||''),
+      parameters:Object.fromEntries((model&&model.parameters||[]).map(parameter=>[String(parameter&&parameter.id||''),String(parameter&&parameter.value||'')]))
+    }))});
+  }
+  // Cursor 3.23's IDE input is Solid; its model trigger is a mounted React
+  // picker whose initialSelections/initialAutoMode come from this composer.
+  const source='legacy_composer_model_trigger';
+  const fail=(state)=>JSON.stringify({found:false,state,source});
+  const input=inputs[0],composer=input.closest('.composer-bar[data-composer-id]');
+  if(!composer||input.closest('.composer-bar')!==composer
+    ||composer.parentElement&&composer.parentElement.closest('.composer-bar')
+    ||composer.querySelectorAll('.composer-bar').length)return fail('legacy_composer_ambiguous');
+  const composerId=composer.getAttribute('data-composer-id');
+  const owners=[...document.querySelectorAll('.composer-bar[data-composer-id]')]
+    .filter(node=>node.getAttribute('data-composer-id')===composerId);
+  if(typeof composerId!=='string'||!composerId.trim()||owners.length!==1||owners[0]!==composer)return fail('legacy_composer_ambiguous');
+  const triggers=[...composer.querySelectorAll('.vscode-model-picker__trigger')];
+  if(triggers.length!==1||!triggers[0].classList.contains('vscode-model-picker__trigger')
+    ||triggers[0].closest('.composer-bar')!==composer)return fail('legacy_model_trigger_ambiguous');
+  const trigger=triggers[0],keys=Object.keys(trigger).filter(key=>key.startsWith('__reactFiber$'));
+  if(keys.length!==1)return fail('legacy_model_tree_unconfirmed');
+  const levels=[],visited=new Set();
+  let root=null,currentRoot=null;
+  for(let fiber=trigger[keys[0]];fiber;fiber=fiber.return){
+    if(levels.length>=256||visited.has(fiber))return fail('legacy_model_tree_unconfirmed');
+    const alternate=fiber.alternate||null;
+    if(alternate&&(alternate===fiber||alternate.alternate!==fiber||visited.has(alternate)))return fail('legacy_model_tree_unconfirmed');
+    visited.add(fiber);if(alternate)visited.add(alternate);
+    const pair=alternate?[fiber,alternate]:[fiber];
+    levels.push(pair);
+    const state=fiber.stateNode;
+    if(state&&state.current){
+      if(fiber.tag!==3||fiber.return||!pair.includes(state.current)||alternate&&(alternate.tag!==3||alternate.stateNode!==state))return fail('legacy_model_tree_unconfirmed');
+      root=state;currentRoot=state.current;break;
+    }
+  }
+  if(!root)return fail('legacy_model_tree_unconfirmed');
+  // DOM expandos may retain an old fiber or a borrowed return chain. Each
+  // edge must belong to the committed parent's actual child/sibling list.
+  const currentPath=[currentRoot],currentVisited=new Set(currentPath);
+  let parent=currentRoot,nodeBudget=2048;
+  for(let depth=levels.length-2;depth>=0;depth--){
+    const candidates=[],siblings=new Set();
+    for(let child=parent.child;child;child=child.sibling){
+      if(--nodeBudget<0||siblings.has(child))return fail('legacy_model_tree_unconfirmed');
+      siblings.add(child);
+      if(levels[depth].includes(child))candidates.push(child);
+    }
+    if(candidates.length!==1||currentVisited.has(candidates[0]))return fail('legacy_model_tree_unconfirmed');
+    parent=candidates[0];currentVisited.add(parent);currentPath.push(parent);
+  }
+  if(parent.stateNode!==trigger)return fail('legacy_model_tree_unconfirmed');
+  const snapshots=new Set();
+  for(const fiber of currentPath){
+    const props=fiber.memoizedProps;
+    if(!props||!Object.prototype.hasOwnProperty.call(props,'initialSelections')
+      &&!Object.prototype.hasOwnProperty.call(props,'initialAutoMode'))continue;
+    if(!Object.prototype.hasOwnProperty.call(props,'initialSelections')||!Object.prototype.hasOwnProperty.call(props,'initialAutoMode')
+      ||!Array.isArray(props.initialSelections)||typeof props.initialAutoMode!=='boolean')return fail('legacy_model_schema_unconfirmed');
+    // Auto is never evidence for a named model, even if stale selections remain.
+    if(props.initialAutoMode)return fail('legacy_model_auto');
+    if(props.initialSelections.length!==1)return fail('legacy_model_selection_ambiguous');
+    const selected=props.initialSelections[0];
+    if(!selected||typeof selected.modelId!=='string'||!selected.modelId.trim()
+      ||selected.modelId!==selected.modelId.trim()||selected.count!==1||!Array.isArray(selected.parameters))return fail('legacy_model_schema_unconfirmed');
+    if(selected.modelId.toLowerCase()==='default')return fail('legacy_model_auto');
+    const parameters=[];
+    for(const parameter of selected.parameters){
+      if(!parameter||typeof parameter.id!=='string'||!parameter.id.trim()||parameter.id!==parameter.id.trim()
+        ||typeof parameter.value!=='string'||!parameter.value.length||parameters.some(entry=>entry[0]===parameter.id))return fail('legacy_model_schema_unconfirmed');
+      parameters.push([parameter.id,parameter.value]);
+    }
+    parameters.sort((a,b)=>a[0]<b[0]?-1:a[0]>b[0]?1:0);
+    snapshots.add(JSON.stringify({modelName:selected.modelId,selectedModels:[{modelId:selected.modelId,parameters:Object.fromEntries(parameters)}]}));
+  }
+  if(!snapshots.size)return fail('legacy_model_schema_unconfirmed');
+  if(snapshots.size!==1)return fail('legacy_model_config_ambiguous');
+  const snapshot=JSON.parse([...snapshots][0]);
+  if(root.current!==currentRoot)return fail('legacy_model_tree_unconfirmed');
+  return JSON.stringify({found:true,...snapshot,source});
 })()`;
 function normalizeModelPickerText(value) {
   return String(value || "").trim().toLowerCase().replace(/extra[\s_-]*high/g, "xhigh").replace(/[^a-z0-9]+/g, "");
@@ -23709,30 +23862,93 @@ function matchSelectedAgentModelConfig(snapshot, requestedModel, requestedEffort
   return { modelId: match.modelId, effort: effort || null };
 }
 function exprSelectAgentWorkspace(projectPath) {
-  return `(async function(){
-    const wanted=String(${JSON.stringify(String(projectPath || ""))}).replace(/\\\\/g,'/').replace(/^\\/([a-z]:\\/)/i,'$1').replace(/\\/+$/,'').toLowerCase();
-    const normalize=value=>String(value||'').replace(/\\\\/g,'/').replace(/^\\/([a-z]:\\/)/i,'$1').replace(/\\/+$/,'').toLowerCase();
+  return String.raw`(async function(){
+    const normalize=value=>String(value||'').replace(/\\/g,'/').replace(/^\/([a-z]:\/)/i,'$1').replace(/\/+$/,'').toLowerCase();
+    const wanted=normalize(${JSON.stringify(String(projectPath || ""))});
     const visible=node=>!!(node&&(node.offsetParent!==null||(node.getClientRects&&node.getClientRects().length>0)));
     const pathTriggers=()=>[...document.querySelectorAll('button.ui-select-trigger,button[aria-haspopup="menu"]')]
-      .filter(visible).filter(node=>/^[a-z]:\\//i.test(normalize(node.innerText||node.textContent)));
+      .filter(visible).filter(node=>/^[a-z]:\//i.test(normalize(node.innerText||node.textContent)));
     const triggers=pathTriggers();
     const fail=(state,extra={})=>JSON.stringify({ok:false,state,wanted,...extra,
       nextStep:'Select the exact local workspace '+${JSON.stringify(String(projectPath || ""))}+' in the new Agent project picker before retrying.'});
     if(triggers.length!==1)return fail(triggers.length?'workspace_project_selector_ambiguous':'workspace_project_selector_unavailable',{triggerCount:triggers.length});
     triggers[0].click();
     await new Promise(resolve=>setTimeout(resolve,350));
-    const menus=[...document.querySelectorAll('[data-component="menu-popup"],[role="menu"]')].filter(visible)
-      .filter(menu=>String(menu.getAttribute('aria-label')||'')==='Select a project'||menu.querySelector('[aria-label="Select a project"]'));
+    const menus=[...new Set([...document.querySelectorAll('[data-component="menu-popup"],[role="menu"]')].filter(visible)
+      .map(menu=>menu.getAttribute('role')==='menu'&&menu.getAttribute('aria-label')==='Select a project'
+        ?menu:menu.querySelector('[role="menu"][aria-label="Select a project"]')).filter(visible))];
+    if(menus.length!==1)return fail(menus.length?'workspace_project_option_ambiguous':'workspace_project_option_unavailable',{menuCount:menus.length});
     const rows=[];const seen=new Set();
     for(const menu of menus){
       for(const row of menu.querySelectorAll('[data-component="menu-row"][role="menuitem"],[role="option"]')){
         if(!visible(row)||seen.has(row))continue;seen.add(row);rows.push(row);
       }
     }
-    const available=rows.map(row=>String(row.innerText||row.textContent||'').replace(/\\s+/g,' ').trim());
-    const matches=rows.filter(row=>normalize(row.innerText||row.textContent)===wanted);
+    const available=rows.map(row=>String(row.innerText||row.textContent||'').replace(/\s+/g,' ').trim());
+    const rowWorkspace=row=>{
+      const key=Object.keys(row).find(key=>key.startsWith('__reactFiber$'));
+      const levels=[];const visited=new Set();
+      let root=null,currentRoot=null,hasProject=false,belowMenu=true;
+      for(let fiber=key&&row[key];fiber;fiber=fiber.return){
+        if(levels.length>=256||visited.has(fiber))return null;
+        visited.add(fiber);
+        const alternate=fiber.alternate||null;
+        if(alternate&&(alternate===fiber||alternate.alternate!==fiber||visited.has(alternate)))return null;
+        const pair=alternate?[fiber,alternate]:[fiber];
+        levels.push(pair);
+        if(pair.some(node=>node.stateNode===menus[0]))belowMenu=false;
+        if(belowMenu&&pair.some(node=>node.memoizedProps&&Object.prototype.hasOwnProperty.call(node.memoizedProps,'project')))hasProject=true;
+        const state=fiber.stateNode;
+        if(state&&state.current){
+          if(!pair.includes(state.current)||alternate&&alternate.stateNode!==state)return null;
+          root=state;currentRoot=state.current;break;
+        }
+      }
+      // Older pickers expose the complete path as row text without project metadata.
+      if(!hasProject)return {path:normalize(row.innerText||row.textContent)};
+      if(!root)return null;
+      // A DOM expando can retain an old fiber, including a borrowed current return
+      // chain. Prove every edge through the committed parent's child/sibling list.
+      const currentPath=[currentRoot];const currentVisited=new Set(currentPath);
+      let parent=currentRoot,nodeBudget=2048;
+      for(let depth=levels.length-2;depth>=0;depth--){
+        const candidates=[];const siblings=new Set();
+        for(let child=parent.child;child;child=child.sibling){
+          if(--nodeBudget<0||siblings.has(child))return null;
+          siblings.add(child);
+          if(levels[depth].includes(child))candidates.push(child);
+        }
+        if(candidates.length!==1||currentVisited.has(candidates[0]))return null;
+        parent=candidates[0];currentVisited.add(parent);currentPath.push(parent);
+      }
+      if(parent.stateNode!==row)return null;
+      const menuIndexes=currentPath.flatMap((node,index)=>node.stateNode===menus[0]?[index]:[]);
+      if(menuIndexes.length!==1)return null;
+      const projects=new Set();
+      for(const fiber of currentPath.slice(menuIndexes[0]+1)){
+        const props=fiber.memoizedProps;
+        if(props&&Object.prototype.hasOwnProperty.call(props,'project'))projects.add(props.project);
+      }
+      if(!projects.size)return null;
+      const identities=new Set();
+      for(const project of projects){
+        const identifier=project&&project.workspaceIdentifier;
+        const uri=identifier&&(identifier.uri||identifier.configPath);
+        if(!project||project.remoteAuthority||!identifier||identifier.remoteAuthority||typeof identifier.id!=='string'||!identifier.id.trim()
+          ||!uri||uri.scheme!=='file'||uri.authority||uri.remoteAuthority)return null;
+        const paths=[uri.fsPath,uri._fsPath,uri.path].filter(value=>typeof value==='string'&&value.length).map(normalize);
+        if(!paths.length||paths.some(path=>path!==paths[0]))return null;
+        identities.add(JSON.stringify([identifier.id,paths[0]]));
+      }
+      if(identities.size!==1)return null;
+      const [workspaceId,path]=JSON.parse([...identities][0]);
+      return {path,workspaceId,root,currentRoot};
+    };
+    const matches=rows.map(row=>({row,identity:rowWorkspace(row)})).filter(match=>match.identity&&match.identity.path===wanted);
     if(matches.length!==1)return fail(matches.length?'workspace_project_option_ambiguous':'workspace_project_option_unavailable',{available});
-    matches[0].click();
+    const selected=matches[0];
+    if(selected.identity.root&&selected.identity.root.current!==selected.identity.currentRoot)return fail('workspace_project_option_unavailable',{available});
+    selected.row.click();
     await new Promise(resolve=>setTimeout(resolve,350));
     return JSON.stringify({ok:true,state:'workspace_project_selection_requested',workspace:wanted,available});
   })()`;
@@ -23902,7 +24118,11 @@ var REACT_ADAPTER_BODY = `
     let globalSelectAgent=null;
     let globalSelectedAgentId=null;
     let sectionIdByAgentId=null;
-    for(const root of document.querySelectorAll('.glass-sidebar-agent-list-container')){
+    const roots=new Set([
+      ...document.querySelectorAll('.glass-sidebar-agent-list-container'),
+      ...document.querySelectorAll('.ui-sidebar-section-head')
+    ]);
+    for(const root of roots){
       const nodes=[]; let n=root;
       for(let i=0;n&&i<24;i++,n=n.parentElement)nodes.push(n);
       for(const node of nodes){
@@ -24021,6 +24241,26 @@ var REACT_ADAPTER_BODY = `
     };
   };
   const a=findAdapter();`;
+var EXPR_VISIBLE_COMPOSER = `(function(){
+  ${STOP_COMPOSER_BODY}
+  const {modern,composers}=findStopComposers(null);
+  if(composers.length!==1){
+    return JSON.stringify({ok:false,state:composers.length?'ambiguous_composers':'composer_missing',count:composers.length});
+  }
+  const composer=composers[0];
+  let status=composer.dataset.composerStatus||null;
+  if(modern){
+    ${REACT_ADAPTER_BODY}
+    status=modernComposerStatus(composer,a?a.entries():[]);
+  }
+  const composerId=modern?composer.dataset.glassAgentId:composer.dataset.composerId;
+  return JSON.stringify({
+    ok:true,
+    id:'local:'+composerId,
+    composerId,
+    status
+  });
+})()`;
 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)));
@@ -25655,7 +25895,7 @@ var CursorBridge = class {
   }
   async _readModelPickerRows(c, options) {
     const snapshot = await this._readModelPickerValue(c, EXPR_MODEL_PICKER_ROWS, "rows", options);
-    return { open: snapshot.open === true, rows: Array.isArray(snapshot.rows) ? snapshot.rows : [] };
+    return { open: snapshot.open === true, rows: Array.isArray(snapshot.rows) ? snapshot.rows : [], owner: snapshot.owner || null };
   }
   async _readSelectedAgentModelConfig(c, options) {
     return this._readModelPickerValue(c, EXPR_SELECTED_AGENT_MODEL_CONFIG, "selected_agent_model_config", options);
@@ -25673,19 +25913,67 @@ var CursorBridge = class {
     if (!point || !Number.isFinite(Number(point.x)) || !Number.isFinite(Number(point.y))) return;
     await c.send("Input.dispatchMouseEvent", { type: "mouseMoved", x: Number(point.x), y: Number(point.y) });
   }
-  async _openModelPicker(c) {
-    const trigger = await this._readModelPickerTrigger(c);
-    if (!trigger.found) {
-      throw new Error("Cursor model picker is unavailable in the active Agent composer");
-    }
-    let snapshot = await this._readModelPickerRows(c);
-    if (!snapshot.open) {
-      await this._clickModelPickerPoint(c, trigger);
-      await sleep2(450);
-      snapshot = await this._readModelPickerRows(c);
-    }
-    if (!snapshot.open) throw new Error("Cursor model picker did not open");
-    return { trigger, ...snapshot };
+  async _activateClosedModelPicker(c, trigger, options) {
+    return this._readModelPickerValue(c, exprActivateClosedModelPicker(trigger), "closed_trigger_activation", options);
+  }
+  async _openModelPicker(c, job = null, options = {}) {
+    const timeoutMs = Math.max(0, Number(options.timeoutMs ?? 2e3));
+    const pollMs = Math.max(10, Number(options.pollMs ?? 50));
+    const stableMs = Math.max(0, Number(options.stableMs ?? 100));
+    const recoveryDelayMs = Math.max(0, Number(options.recoveryDelayMs ?? 750));
+    const deadline = Date.now() + timeoutMs;
+    let trigger = null, snapshot = { open: false, rows: [] };
+    let stableSignature = null, stableSince = 0, clicked = false, clickedOwner = null;
+    let clickedAt = 0, recoveryAttempted = false, lastPollError = null;
+    const attempts = [];
+    do {
+      this._throwIfCancelledBeforeSend(job);
+      if (deadline - Date.now() < 10) break;
+      try {
+        snapshot = await this._readModelPickerRows(c, { timeoutMs: deadline - Date.now() });
+        if (deadline - Date.now() < 10) break;
+        trigger = await this._readModelPickerTrigger(c, { timeoutMs: deadline - Date.now() });
+      } catch (error2) {
+        if (error2.code !== "CDP_COMMAND_TIMEOUT" || Date.now() < deadline) throw error2;
+        lastPollError = error2.pickerRead || { code: error2.code, message: error2.message };
+        break;
+      }
+      this._throwIfCancelledBeforeSend(job);
+      const sameOwner = modelPickerOwnerKey(snapshot.owner) === modelPickerOwnerKey(trigger);
+      if (snapshot.open && trigger.found && sameOwner && (!clicked || clickedOwner === modelPickerOwnerKey(trigger))) return { trigger, ...snapshot };
+      if (snapshot.open && !sameOwner && !attempts.includes("owner_changed")) attempts.push("owner_changed");
+      if (!clicked) {
+        const interactive = trigger.found && trigger.interactive !== false;
+        const signature = interactive ? JSON.stringify([trigger.triggerId, trigger.composerId, trigger.agentId, trigger.x, trigger.y]) : null;
+        if (!interactive || signature !== stableSignature) {
+          stableSignature = signature;
+          stableSince = Date.now();
+          const state = trigger.state || (interactive ? "ready" : "trigger_missing");
+          if (!attempts.includes(state)) attempts.push(state);
+        }
+        if (interactive && Date.now() - stableSince >= stableMs) {
+          this._throwIfCancelledBeforeSend(job);
+          await this._clickModelPickerPoint(c, trigger);
+          clicked = true;
+          clickedAt = Date.now();
+          clickedOwner = modelPickerOwnerKey(trigger);
+          attempts.push("click_once", "wait_menu");
+        }
+      } else if (!recoveryAttempted && !snapshot.open && sameOwner && clickedOwner === modelPickerOwnerKey(trigger) && trigger.interactive === true && trigger.expanded === "false" && Date.now() - clickedAt >= recoveryDelayMs && deadline - Date.now() >= 10) {
+        this._throwIfCancelledBeforeSend(job);
+        recoveryAttempted = true;
+        const recovered = await this._activateClosedModelPicker(c, trigger, { timeoutMs: deadline - Date.now() });
+        attempts.push(recovered.clicked ? "activate_confirmed_closed_trigger" : recovered.state || "activation_rejected");
+      }
+      if (Date.now() >= deadline) break;
+      await sleep2(Math.min(pollMs, Math.max(0, deadline - Date.now())));
+    } while (Date.now() < deadline);
+    throw createModelSelectionError("Cursor model picker did not open", "picker_did_not_open", true, {
+      attempts,
+      trigger,
+      lastPollError,
+      menu: { open: snapshot.open, rows: (snapshot.rows || []).slice(0, 20) }
+    });
   }
   async _closeModelPicker(c) {
     for (let attempt = 0; attempt < 3; attempt++) {
@@ -25697,24 +25985,29 @@ var CursorBridge = class {
     }
     if ((await this._readModelPickerRows(c)).open) throw new Error("Cursor model picker did not close after selection");
   }
-  async _openModelPickerControl(c, snapshot, controlKind) {
+  async _openModelPickerControl(c, snapshot, controlKind, job = null) {
+    this._throwIfCancelledBeforeSend(job);
     const control = (snapshot && snapshot.rows || []).find((row) => row.kind === controlKind && row.disabled !== true);
     if (!control) return snapshot;
+    this._throwIfCancelledBeforeSend(job);
     await this._clickModelPickerPoint(c, control);
     await sleep2(400);
     let next = await this._readModelPickerRows(c);
     const expectedKind = controlKind === "model_control" ? "model" : "parameter";
     if (!next.rows.some((row) => row.kind === expectedKind)) {
+      this._throwIfCancelledBeforeSend(job);
       await this._hoverModelPickerPoint(c, control);
       await sleep2(350);
       next = await this._readModelPickerRows(c);
     }
     return next;
   }
-  async _findModelPickerModel(c, snapshot, requestedModel) {
+  async _findModelPickerModel(c, snapshot, requestedModel, job = null) {
+    this._throwIfCancelledBeforeSend(job);
     let modelRow = selectModelPickerRow(snapshot && snapshot.rows, requestedModel, "model");
     if (modelRow) return { snapshot, modelRow };
-    const expanded = await this._openModelPickerControl(c, snapshot, "model_control");
+    const expanded = await this._openModelPickerControl(c, snapshot, "model_control", job);
+    this._throwIfCancelledBeforeSend(job);
     modelRow = selectModelPickerRow(expanded && expanded.rows, requestedModel, "model");
     return { snapshot: expanded, modelRow };
   }
@@ -25859,9 +26152,9 @@ var CursorBridge = class {
         if (job) job.modelSelection = result2;
         return result2;
       }
-      const opened = await this._openModelPicker(c);
+      const opened = await this._openModelPicker(c, job);
       stage = "locate_model";
-      let located = await this._findModelPickerModel(c, opened, requestedModel);
+      let located = await this._findModelPickerModel(c, opened, requestedModel, job);
       modelRow = located.modelRow;
       if (!modelRow) {
         throw createModelSelectionError(
@@ -25877,8 +26170,8 @@ var CursorBridge = class {
         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);
+          const reopened = await this._openModelPicker(c, job);
+          located = await this._findModelPickerModel(c, reopened, requestedModel, job);
           modelRow = located.modelRow;
           if (!modelRow) {
             throw createModelSelectionError(
@@ -25921,8 +26214,8 @@ var CursorBridge = class {
           this._throwIfCancelledBeforeSend(job);
           await this._clickModelPickerPoint(c, modelRow);
           await sleep2(550);
-          const reopened = await this._openModelPicker(c);
-          located = await this._findModelPickerModel(c, reopened, requestedModel);
+          const reopened = await this._openModelPicker(c, job);
+          located = await this._findModelPickerModel(c, reopened, requestedModel, job);
           modelRow = located.modelRow;
           if (!modelRow) {
             throw createModelSelectionError(
@@ -25949,8 +26242,8 @@ var CursorBridge = class {
       stage = "verify_model";
       let trigger2 = await this._readModelPickerTrigger(c);
       if (!trigger2.found || !normalizeModelPickerModelText(trigger2.text).includes(normalizeModelPickerModelText(requestedModel))) {
-        const reopened = await this._openModelPicker(c);
-        located = await this._findModelPickerModel(c, reopened, requestedModel);
+        const reopened = await this._openModelPicker(c, job);
+        located = await this._findModelPickerModel(c, reopened, requestedModel, job);
         const selected = selectModelPickerRow(located.snapshot.rows.filter((row) => row.selected), requestedModel, "model");
         if (!selected) {
           throw createModelSelectionError(
@@ -25963,8 +26256,8 @@ var CursorBridge = class {
       }
       if (requestedEffort) {
         stage = "verify_effort";
-        const reopened = await this._openModelPicker(c);
-        located = await this._findModelPickerModel(c, reopened, requestedModel);
+        const reopened = await this._openModelPicker(c, job);
+        located = await this._findModelPickerModel(c, reopened, requestedModel, job);
         modelRow = located.modelRow;
         if (!modelRow) {
           throw createModelSelectionError(
@@ -26019,6 +26312,8 @@ var CursorBridge = class {
         errorCode: primaryError.code || `CURSOR_MODEL_${String(failure.failureClass).toUpperCase()}`,
         available: failure.available || [],
         attempts: failure.attempts || [],
+        trigger: failure.trigger || null,
+        lastPollError: failure.lastPollError || null,
         menu: failure.menu || null,
         runtimeMode: this.runtimeMode,
         lastError: primaryError.message,
@@ -28106,6 +28401,7 @@ export {
   createChatPanelUnavailableError,
   createProviderError,
   cursorStartupBehavior,
+  exprActivateClosedModelPicker,
   exprClickBoundComposerStop,
   exprClickSelectedAgentStop,
   exprCreateAgentForWorkspace,

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.2.6",
+  packageVersion: "0.2.8",
   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.2.6",
+  "version": "0.2.8",
   "description": "Windows only. 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": "6.0.6"
+    "embeddedProductVersion": "6.0.8"
   }
 }