pi-cursor-bridge 0.2.5 → 0.2.7

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "cursor-bridge",
-  "version": "6.0.5+codex.20260922110122",
+  "version": "6.0.7",
   "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.5 embeds Cursor Bridge 6.0.5, 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.7 embeds Cursor Bridge 6.0.7, 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,
@@ -12989,8 +12994,8 @@ function withLifecycle(result, mode, extra = {}) {
   };
 }
 async function ensureCursorRunning(options = {}) {
-  const bindingFile = options.workspaceFile || resolveWorkspaceBindingFile();
-  const bindingKey = options.workspaceKey || resolveWorkspaceBindingKey();
+  const bindingFile = Object.hasOwn(options, "workspaceFile") ? options.workspaceFile : resolveWorkspaceBindingFile();
+  const bindingKey = options.workspaceKey || resolveWorkspaceBindingKey(process.env, { cwd: options.adapterStartCwd ?? process.cwd() });
   const persistedBinding = readWorkspaceBinding(bindingFile, bindingKey);
   const hostProjectPath = resolveClaudeProjectPath();
   const projectPath = Object.hasOwn(options, "projectPath") ? options.projectPath : resolveProjectPath(persistedBinding && persistedBinding.projectPath || process.env.CURSOR_PROJECT_PATH, {
@@ -22985,7 +22990,7 @@ function updateCursorSessionRegistry(filePath, mutator, options = {}) {
 // server.mjs
 init_cursor_ensure_core();
 init_lifecycle_paths();
-var PLUGIN_VERSION = "6.0.5";
+var PLUGIN_VERSION = "6.0.7";
 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});
     }
@@ -23540,12 +23563,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 +23810,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 +24066,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 +24189,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)));
@@ -24282,12 +24470,12 @@ var CursorBridge = class {
     this.runtimeModeSource = options.runtimeMode !== void 0 ? "constructor" : persistedRuntimeMode ? "persistent" : process.env.CURSOR_BRIDGE_RUNTIME_MODE ? "environment" : "default";
     this.runtimeModeScope = persistedRuntimeMode ? "persistent" : options.runtimeMode !== void 0 ? "constructor" : process.env.CURSOR_BRIDGE_RUNTIME_MODE ? "environment" : "default";
     this.workspaceFile = options.workspaceFile === null ? null : resolve8(options.workspaceFile || resolveWorkspaceBindingFile());
-    this.workspaceKey = options.workspaceKey || resolveWorkspaceBindingKey();
+    this.workspaceKey = options.workspaceKey || resolveWorkspaceBindingKey(process.env, { cwd: this.adapterStartCwd });
     const persistedWorkspace = options.projectPath === void 0 ? readWorkspaceBinding(this.workspaceFile, this.workspaceKey) : null;
     this.projectPath = options.projectPath !== void 0 ? resolve8(String(options.projectPath)) : persistedWorkspace && persistedWorkspace.projectPath || null;
     this.workspaceSource = options.projectPath !== void 0 ? "constructor" : persistedWorkspace ? "persistent_init" : "auto_detect";
     this.workspaceUpdatedAt = persistedWorkspace && persistedWorkspace.updatedAt || null;
-    this.workspaceConfirmationRequired = this.workspaceKey === "default" && !!persistedWorkspace;
+    this.workspaceConfirmationRequired = this.workspaceKey === "default" && options.projectPath === void 0;
     this.modelPreferencesFile = options.modelPreferencesFile === null ? null : resolve8(options.modelPreferencesFile || resolveCursorModelPreferencesFile());
     this.modelPreferences = readCursorModelPreferences(this.modelPreferencesFile);
     this.sessionFile = options.sessionFile === null ? null : resolve8(options.sessionFile || resolveCursorSessionRegistryFile());
@@ -24303,6 +24491,8 @@ var CursorBridge = class {
     this.activeParallel = /* @__PURE__ */ new Map();
     this.currentJob = null;
     this._uiTail = Promise.resolve();
+    this._workspaceTail = Promise.resolve();
+    this._workspacePending = 0;
     this.parallelRestoreAgentId = null;
     this.parallelRestoreTargetId = null;
   }
@@ -24310,6 +24500,8 @@ var CursorBridge = class {
     const resolvedProjectPath = this.projectPath || this._lastLifecycle && this._lastLifecycle.projectPath || null;
     return {
       workspaceKey: this.workspaceKey,
+      workspaceIdentitySource: this.workspaceKey === "default" ? "unavailable" : this.workspaceKey.split(":")[0],
+      workspaceBusy: this._workspacePending > 0,
       workspaceConfirmationRequired: this.workspaceConfirmationRequired,
       workspaceBindingWarning: this.workspaceConfirmationRequired ? "This adapter has no host workspace identity. Run cursor_init with the intended project before using its shared saved binding." : null,
       projectPath: resolvedProjectPath,
@@ -24692,8 +24884,12 @@ var CursorBridge = class {
     if (!["reconcile", "collect_result", "close", "forget", "abandon"].includes(action)) {
       throw cursorSessionError("SESSION_ACTION_UNSUPPORTED", "expected reconcile, collect_result, close, forget, or abandon");
     }
-    if (action === "reconcile") return this._reconcileSession(id);
-    if (action === "collect_result") return this._reconcileSession(id, { collectResult: true });
+    if (action === "reconcile" || action === "collect_result") {
+      return this._withWorkspaceAdmission(() => {
+        this._assertWorkspaceConfirmed();
+        return this._reconcileSession(id, { collectResult: action === "collect_result" });
+      });
+    }
     let result;
     updateCursorSessionRegistry(this.sessionFile, (registry2) => {
       const session = registry2.sessions[id];
@@ -24746,6 +24942,10 @@ var CursorBridge = class {
     return result;
   }
   async initializeWorkspace(projectPath) {
+    const result = await this._withWorkspaceAdmission(() => this._initializeWorkspace(projectPath));
+    return { ...result, workspaceBusy: this._workspacePending > 0 };
+  }
+  async _initializeWorkspace(projectPath) {
     if (this._healing) await this._healing.catch(() => {
     });
     if (this.busy || this.activeParallel.size > 0 || this.queue.length > 0) {
@@ -24971,19 +25171,23 @@ var CursorBridge = class {
     if (!text) throw new Error("query must not be empty");
     if (text.length > 2e4) throw new Error("query exceeds the 20,000-character limit");
     const requestContext = normalizeRequestContext(options.requestContext);
-    this._assertWorkspaceConfirmed();
-    if (this._hasGlobalReservation()) {
-      throw new Error("A global Cursor reservation has an unconfirmed Stop state; resolve blockingTaskIds from cursor_status first");
-    }
-    await this._ensureCursor();
-    const job = this._enqueue("context_engine", buildContextEnginePrompt(text, requestContext), {
-      requestContext,
-      timeoutMs: QUERY_TIMEOUT,
-      newChat: true,
-      execution: "fifo",
-      readOnly: true,
-      allowedPaths: [],
-      modelPreference: this._modelPreferenceFor("cce")
+    const job = await this._withWorkspaceAdmission(async () => {
+      this._assertWorkspaceConfirmed(options.workspacePath);
+      if (this._hasGlobalReservation()) {
+        throw new Error("A global Cursor reservation has an unconfirmed Stop state; resolve blockingTaskIds from cursor_status first");
+      }
+      await this._ensureCursor();
+      this._assertWorkspaceConfirmed(options.workspacePath);
+      return this._enqueue("context_engine", buildContextEnginePrompt(text, requestContext), {
+        requestContext,
+        timeoutMs: QUERY_TIMEOUT,
+        newChat: true,
+        execution: "fifo",
+        readOnly: true,
+        allowedPaths: [],
+        modelPreference: this._modelPreferenceFor("cce"),
+        projectPath: this._lastLifecycle?.projectPath || this.projectPath || null
+      });
     });
     const result = normalizeCceSearchResult(await job.promise);
     this._markTaskResultCollected(job);
@@ -24997,6 +25201,14 @@ var CursorBridge = class {
     return this.contextEngine(query);
   }
   async doTask(prompt, options = {}) {
+    const admitted = await this._withWorkspaceAdmission(() => this._prepareTask(prompt, options));
+    if (admitted.duplicate) return admitted.response;
+    const job = admitted.job;
+    if (options.background !== false) return this._compactTaskView(job);
+    await job.promise;
+    return this._collectedTaskView(job);
+  }
+  async _prepareTask(prompt, options = {}) {
     if (!this.delegationEnabled) {
       throw new Error("cursor_do is disabled by CURSOR_BRIDGE_DELEGATION=off; restart the MCP server without that setting to enable delegation");
     }
@@ -25004,7 +25216,7 @@ var CursorBridge = class {
     if (!text) throw new Error("prompt must not be empty");
     if (text.length > 1e5) throw new Error("prompt exceeds the 100,000-character limit");
     const requestContext = normalizeRequestContext(options.requestContext);
-    this._assertWorkspaceConfirmed();
+    this._assertWorkspaceConfirmed(options.workspacePath);
     if (this._hasGlobalReservation()) {
       throw new Error("A global Cursor reservation has an unconfirmed Stop state; no new task may be submitted until it is explicitly recovered or released");
     }
@@ -25049,6 +25261,7 @@ var CursorBridge = class {
       throw cursorSessionError("SESSION_SCOPE_REQUIRED", "repeat read_only=true or an allowed_paths subset for every continued turn");
     }
     await this._ensureCursor();
+    this._assertWorkspaceConfirmed(options.workspacePath);
     const projectPath = this._lastLifecycle && this._lastLifecycle.projectPath || this.projectPath || null;
     if (sessionMode !== "isolated" && !projectPath) {
       throw cursorSessionError("SESSION_WORKSPACE_REQUIRED", "initialize one workspace before creating or continuing a session");
@@ -25089,7 +25302,8 @@ var CursorBridge = class {
       modelPreference = session.modelPreference || null;
       if (duplicate) {
         const existing = this.tasks.get(session.activeTaskId || session.lastTask && session.lastTask.taskId || "");
-        return existing ? { duplicate: true, ...options.background === false ? this._collectedTaskView(existing) : this._compactTaskView(existing) } : { duplicate: true, ...this._sessionView(session) };
+        const response = existing ? { duplicate: true, ...options.background === false ? this._collectedTaskView(existing) : this._compactTaskView(existing) } : { duplicate: true, ...this._sessionView(session) };
+        return { duplicate: true, response };
       }
     }
     const job = this._enqueue("do", fullPrompt, {
@@ -25113,9 +25327,7 @@ var CursorBridge = class {
       agentId: sessionMode === "continue" ? session && session.agentId : null,
       agentLabel: sessionMode === "continue" ? session && session.agentLabel : null
     });
-    if (options.background !== false) return this._compactTaskView(job);
-    await job.promise;
-    return this._collectedTaskView(job);
+    return { job };
   }
   _assertNoParallelPathConflict(allowedPaths) {
     if (this._hasGlobalReservation()) {
@@ -25305,6 +25517,17 @@ var CursorBridge = class {
     });
     return run;
   }
+  // Serialize target changes with preparation through enqueue, never with a running Agent.
+  // The UI lock cannot serve this purpose: initialization may acquire it to register a project.
+  _withWorkspaceAdmission(fn) {
+    this._workspacePending++;
+    const run = this._workspaceTail.then(fn, fn).finally(() => {
+      this._workspacePending--;
+    });
+    this._workspaceTail = run.catch(() => {
+    });
+    return run;
+  }
   _withJobLock(job, fn) {
     const previous = job.controlTail || Promise.resolve();
     const run = previous.then(fn, fn);
@@ -25336,6 +25559,8 @@ var CursorBridge = class {
           reason: "adapter-heal",
           runtimeMode: this.runtimeMode,
           adapterStartCwd: this.adapterStartCwd,
+          workspaceKey: this.workspaceKey,
+          workspaceFile: this.workspaceFile,
           ...this.projectPath ? { projectPath: this.projectPath } : {}
         });
         this._lastLifecycle = lifecycleFromEnsureResult(rr, this.runtimeMode);
@@ -27537,6 +27762,8 @@ var CursorBridge = class {
       pluginVersion: PLUGIN_VERSION,
       statusPath: "json-list",
       workspaceKey: workspace.workspaceKey,
+      workspaceIdentitySource: workspace.workspaceIdentitySource,
+      workspaceBusy: workspace.workspaceBusy,
       workspaceConfirmationRequired: workspace.workspaceConfirmationRequired,
       workspaceBindingWarning: workspace.workspaceBindingWarning,
       projectPath: workspace.projectPath,
@@ -27568,9 +27795,45 @@ var CursorBridge = class {
       cursorPid: lifecycle.cursorPid
     };
   }
-  _assertWorkspaceConfirmed() {
+  _workspaceRecoveryError(code, message, expectedProjectPath = null) {
+    const error2 = new Error(`${code}: ${message}`);
+    error2.code = code;
+    error2.workspaceRecovery = {
+      workspaceKey: this.workspaceKey,
+      currentProjectPath: this._lastLifecycle?.projectPath || this.projectPath || null,
+      expectedProjectPath,
+      tool: "cursor_init",
+      arguments: expectedProjectPath ? { path: expectedProjectPath } : null,
+      requiresIdle: true,
+      retrySafe: true,
+      submissionStarted: false,
+      nextStep: "Read cursor_status. When idle with no blocking tasks, run cursor_init with the caller's intended absolute project path, verify ready and the exact path, then retry this unsent request once. Never infer the target from a saved default binding or repository name."
+    };
+    return error2;
+  }
+  _assertWorkspaceConfirmed(workspacePath) {
+    let expected = null;
+    if (workspacePath !== void 0) {
+      if (typeof workspacePath !== "string" || !isAbsoluteWorkspacePath(workspacePath)) {
+        throw cursorSessionError("WORKSPACE_PATH_INVALID", "workspace_path must be an absolute project directory or .code-workspace path");
+      }
+      expected = normalizeWorkspacePath(workspacePath);
+    }
     if (this.workspaceConfirmationRequired) {
-      throw new Error("WORKSPACE_CONFIRMATION_REQUIRED: the saved default binding has no host workspace identity. Run cursor_init with the intended project before submitting work.");
+      throw this._workspaceRecoveryError("WORKSPACE_CONFIRMATION_REQUIRED", "this adapter has no host workspace identity. Run cursor_init with the intended project before submitting work; a saved default path is not confirmation.", expected);
+    }
+    if (expected) {
+      const current = this._lastLifecycle?.projectPath || this.projectPath;
+      if (!current) {
+        throw this._workspaceRecoveryError("WORKSPACE_INITIALIZATION_REQUIRED", "Run cursor_init with workspace_path before submitting work.", expected);
+      }
+      const canonical = (path) => {
+        const normalized = normalizeWorkspacePath(path);
+        return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+      };
+      if (canonical(current) !== canonical(expected)) {
+        throw this._workspaceRecoveryError("WORKSPACE_MISMATCH", "workspace_path does not match the current binding. Run cursor_init with the intended project when idle; no work was submitted.", expected);
+      }
     }
   }
   _ensureTaskCapacity() {
@@ -27618,10 +27881,10 @@ var CursorBridge = class {
       ...this.runtimeModeView(),
       ...this.modelPreferencesView(),
       ...this.sessionRegistryView(),
-      busy: uiBusy || parallelRunning > 0 || this.queue.length > 0,
+      busy: uiBusy || parallelRunning > 0 || this.queue.length > 0 || this._workspacePending > 0,
       uiBusy,
       parallelRunning,
-      idle: !uiBusy && parallelRunning === 0 && this.queue.length === 0,
+      idle: !uiBusy && parallelRunning === 0 && this.queue.length === 0 && this._workspacePending === 0,
       queued: this.queue.length,
       blockingTaskIds: [...this.activeParallel.values()].filter((job) => !isTerminalTask(job)).map((job) => job.id),
       globallyBlocked: globalBlocked,
@@ -27650,10 +27913,10 @@ var CursorBridge = class {
       }
     } : {
       ...this._compactStatusCommon(),
-      busy: uiBusy || parallelRunning > 0 || this.queue.length > 0,
+      busy: uiBusy || parallelRunning > 0 || this.queue.length > 0 || this._workspacePending > 0,
       uiBusy,
       parallelRunning,
-      idle: !uiBusy && parallelRunning === 0 && this.queue.length === 0,
+      idle: !uiBusy && parallelRunning === 0 && this.queue.length === 0 && this._workspacePending === 0,
       queued: this.queue.length,
       blockingTaskIds: [...this.activeParallel.values()].filter((job) => !isTerminalTask(job)).map((job) => job.id),
       globallyBlocked: globalBlocked,
@@ -27678,6 +27941,7 @@ function buildSearchInputSchema() {
     type: "object",
     properties: {
       query: { type: "string", description: "Describe the behavior, concept, symbol relationship, or ownership boundary to locate. State intent instead of guessing a directory." },
+      workspace_path: WORKSPACE_PATH_SCHEMA,
       request_context: REQUEST_CONTEXT_SCHEMA
     },
     required: ["query"]
@@ -27699,6 +27963,10 @@ var REQUEST_CONTEXT_SCHEMA = {
     source: { type: "string", enum: ["user", "model", "mixed", "unknown"], description: "user for explicitly supplied user requirements, model for model-authored tasks/inferences, mixed when the prompt clearly separates both; unknown when not established." }
   }
 };
+var WORKSPACE_PATH_SCHEMA = {
+  type: "string",
+  description: "The caller's intended absolute project directory or .code-workspace path. Supply it when known to reject stale or cross-task bindings before sending. This is a target assertion, not an automatic workspace switch. On a workspace confirmation, initialization, or mismatch error, check idle status, run cursor_init with this path, verify ready, and retry once."
+};
 function buildToolDefinitions(bridgeInstance) {
   return [
     {
@@ -27724,6 +27992,7 @@ function buildToolDefinitions(bridgeInstance) {
         type: "object",
         properties: {
           prompt: { type: "string", description: "The task Cursor should receive. State the goal, boundaries, and what a complete result looks like." },
+          workspace_path: WORKSPACE_PATH_SCHEMA,
           request_context: REQUEST_CONTEXT_SCHEMA,
           background: { type: "boolean", default: true, description: "When true, return the task ID immediately. When false, wait for the task to finish or need attention." },
           execution: { type: "string", enum: ["fifo", "parallel_agent"], default: "fifo", description: "fifo is the first-in, first-out serial queue and runs one task at a time in a clean chat. parallel_agent creates a separate top-level Cursor Agent." },
@@ -27816,29 +28085,35 @@ var server = new Server(
   { capabilities: { tools: { listChanged: true } } }
 );
 async function ensureBridgeCursor(targetBridge, reason) {
-  targetBridge._refreshPersistedRuntimeMode();
-  const { ensureCursorRunning: ensureCursorRunning2 } = await Promise.resolve().then(() => (init_launch_cursor(), launch_cursor_exports));
-  const r = await ensureCursorRunning2({
-    reason,
-    runtimeMode: targetBridge.runtimeMode,
-    adapterStartCwd: targetBridge.adapterStartCwd,
-    ...targetBridge.projectPath ? { projectPath: targetBridge.projectPath } : {}
+  return targetBridge._withWorkspaceAdmission(async () => {
+    targetBridge._refreshPersistedRuntimeMode();
+    const { ensureCursorRunning: ensureCursorRunning2 } = await Promise.resolve().then(() => (init_launch_cursor(), launch_cursor_exports));
+    const r = await ensureCursorRunning2({
+      reason,
+      runtimeMode: targetBridge.runtimeMode,
+      adapterStartCwd: targetBridge.adapterStartCwd,
+      workspaceKey: targetBridge.workspaceKey,
+      workspaceFile: targetBridge.workspaceFile,
+      // Prewarming Cursor is not permission to open another task's saved default project.
+      ...targetBridge.workspaceConfirmationRequired ? { projectPath: null } : targetBridge.projectPath ? { projectPath: targetBridge.projectPath } : {}
+    });
+    targetBridge._lastLifecycle = lifecycleFromEnsureResult(r, targetBridge.runtimeMode);
+    if (targetBridge.runtimeMode === "minimal") {
+      targetBridge._lastPresentation = r.presentation ? { ...r.presentation, at: (/* @__PURE__ */ new Date()).toISOString() } : await targetBridge.applyRuntimePresentation("hide");
+    }
+    return r;
   });
-  targetBridge._lastLifecycle = lifecycleFromEnsureResult(r, targetBridge.runtimeMode);
-  if (targetBridge.runtimeMode === "minimal") {
-    targetBridge._lastPresentation = r.presentation ? { ...r.presentation, at: (/* @__PURE__ */ new Date()).toISOString() } : await targetBridge.applyRuntimePresentation("hide");
-  }
-  return r;
 }
 function toolErrorResult(error2) {
   const message = error2 instanceof Error ? error2.message : String(error2);
-  if (error2 && (error2.uiDiagnostic || error2.modelSelection || error2.pickerRead || error2.cdp)) {
+  if (error2 && (error2.uiDiagnostic || error2.modelSelection || error2.pickerRead || error2.cdp || error2.workspaceRecovery)) {
     const payload = {
       error: { code: error2.code || error2.uiDiagnostic?.code || "CURSOR_BRIDGE_ERROR", message },
       ...error2.uiDiagnostic ? { uiDiagnostic: error2.uiDiagnostic } : {},
       ...error2.modelSelection ? { modelSelection: error2.modelSelection } : {},
       ...error2.pickerRead ? { pickerRead: error2.pickerRead } : {},
-      ...error2.cdp ? { cdp: error2.cdp } : {}
+      ...error2.cdp ? { cdp: error2.cdp } : {},
+      ...error2.workspaceRecovery ? { workspaceRecovery: error2.workspaceRecovery } : {}
     };
     return {
       content: [{ type: "text", text: JSON.stringify(payload, null, 2) }],
@@ -27859,11 +28134,12 @@ server.setRequestHandler(CallToolRequestSchema, async (request2) => {
       return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
     }
     if (name === "cursor_context_engine" || name === "cursor_search" || name === "cursor_search_deep") {
-      const result = await bridge.contextEngine(String(args && args.query || ""), { requestContext: args && args.request_context });
+      const result = await bridge.contextEngine(String(args && args.query || ""), { requestContext: args && args.request_context, workspacePath: args && args.workspace_path });
       return { content: [{ type: "text", text: String(result) }] };
     }
     if (name === "cursor_do") {
       const result = await bridge.doTask(String(args && args.prompt || ""), {
+        workspacePath: args && args.workspace_path,
         requestContext: args && args.request_context,
         background: !args || args.background !== false,
         execution: args && args.execution,

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.5",
+  packageVersion: "0.2.7",
   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.5",
+  "version": "0.2.7",
   "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.5"
+    "embeddedProductVersion": "6.0.7"
   }
 }

package/skills/cce-routing/SKILL.md

@@ -20,7 +20,7 @@ Call `cursor_context_engine` when one or more of these are true:
 
 Prefer one CCE investigation over starting an Explore subagent merely to locate or understand project code. Let Cursor choose focused or extended depth from what it discovers.
 
-When these semantic conditions match, make CCE the first project-discovery surface. Do not establish the answer through generic context-mode, grep, or blind local exploration before trying CCE. If Claude Code denies an initial context-mode collection call with a CCE routing message, call `cursor_context_engine` once instead of retrying another `ctx_*` tool. A failed, denied, unavailable, or `NOT_FOUND` CCE attempt releases this priority and allows a bounded local fallback.
+When these semantic conditions match, make CCE the first project-discovery surface. Do not establish the answer through generic context-mode, grep, or blind local exploration before trying CCE. If Claude Code denies an initial context-mode collection call with a CCE routing message, call `cursor_context_engine` once instead of retrying another `ctx_*` tool. A failed, denied, unavailable, or `NOT_FOUND` CCE attempt releases this priority and allows a bounded local fallback. A pre-send workspace-confirmation error may be recoverable; handle it below before falling back.
 
 ## Keep deterministic work local
 
@@ -30,10 +30,28 @@ Do not call CCE when any of these apply:
 - The needed code is already present in the current context.
 - The work is a trivial single-file edit or only requires running tests, inspecting logs, checking a build, or examining Git state.
 - The question concerns external libraries, APIs, current documentation, or the public web.
-- The user opted out of Cursor, CCE is unavailable, or the workspace is not initialized.
+- The user opted out of Cursor or CCE is unavailable.
 
 Do not submit the same lookup to CCE and another semantic system in parallel. Use a second evidence surface only to close a specific gap or verify a consequential claim.
 
+## Bind a known workspace before sending
+
+Pass the intended absolute `workspace_path` to `cursor_context_engine` when the installed schema supports it. Use the host-provided workspace root/current-task cwd unless the request explicitly targets another project. The field asserts the target before sending; it never switches or registers a project. Do not infer the target from a repository basename or a saved default binding.
+
+For an older schema without `workspace_path`, use `cursor_status` to verify the exact ready project path before sending. `initialized=true` only shows that a binding exists; it does not prove the current request is confirmed for the intended workspace. `cursor_init` is the only explicit operation that may initialize, register, or switch a workspace.
+
+If no target is known, do not infer or add `workspace_path`, and never call `cursor_init` for a guessed path. Existing safe host bindings may still be used; a workspace-confirmation error without a known target cannot use this recovery and should be reported before any necessary local fallback.
+
+## Recover one known workspace
+
+For a pre-send `WORKSPACE_CONFIRMATION_REQUIRED`, `WORKSPACE_INITIALIZATION_REQUIRED`, or `WORKSPACE_MISMATCH` error with a known target:
+
+1. Call `cursor_status`. Continue only when it confirms idle, no queued or blocking work, and `workspaceBusy=false` when that field is exposed.
+2. Call `cursor_init` with that exact absolute path. Require `ready=true`, `workspaceConfirmationRequired=false`, and the exact `projectPath`; in Agents Window also check `workspaceBinding.ok`, the local file-URI identity and workspace ID.
+3. Retry the original CCE query once.
+
+Do not treat these errors as CCE unavailability before this recovery. Do not initialize when status is busy, identity is ambiguous, `needs_attention` is present, or send state is uncertain; explain the condition and use only the necessary local fallback. Do not cancel other work, change the model, or retry in a loop.
+
 ## Submit one natural-language intent
 
 Call `cursor_context_engine` once with the question's real intent. Include a known symbol, subsystem, or path only when it is a useful lead.

package/skills/cursor-delegate/SKILL.md

@@ -9,6 +9,14 @@ Use Cursor as an execution partner. Keep direction, scope decisions, risk owners
 
 Declare `request_context` for each call: an AI caller uses `sender="model"`; set `source="user"` for explicitly supplied user requirements, `"model"` for your own task/inference, or `"mixed"` when both appear. In mixed prompts, label user-confirmed requirements separately from your additions. Use `"unknown"` where provenance is unavailable; a user asking you to use Cursor does not make your authored message user-authored. These labels are declarations, not authentication or extra permission, and do not carry over to later session turns.
 
+## Bind a known workspace
+
+For CCE or `cursor_do`, pass the intended absolute `workspace_path` when the installed tool schema supports it. Use the host-provided workspace root/current-task cwd unless the request explicitly targets another project. The field is a pre-send assertion: it never selects, switches, or registers a workspace. Do not infer the target from a repository basename or a saved default binding.
+
+With an older schema, use `cursor_status` to verify the exact ready project path before sending. `initialized=true` only means a binding exists; it does not confirm the workspace for this request. `cursor_init` remains the only explicit initialization, registration, or switch operation.
+
+On pre-send `WORKSPACE_CONFIRMATION_REQUIRED`, `WORKSPACE_INITIALIZATION_REQUIRED`, or `WORKSPACE_MISMATCH` with a known target, first call `cursor_status`. Only if it confirms idle, no queued or blocking work, and `workspaceBusy=false` when exposed, call `cursor_init` for the exact path. Require `ready=true`, `workspaceConfirmationRequired=false`, and the exact `projectPath`; in Agents Window also check `workspaceBinding.ok`, the local file-URI identity and workspace ID. Retry the original CCE query or `cursor_do` submission once. Do not run this recovery for `needs_attention`, uncertain send state, busy status, or ambiguous identity; report the condition and use the necessary local fallback. Do not cancel other work, change model settings, or retry in a loop.
+
 ## Respect execution controls
 
 - Do not call `cursor_do` when the user explicitly says not to use Cursor or not to delegate. A direct user opt-out always wins.
@@ -75,7 +83,7 @@ Do not choose parallel execution merely because there are many tasks. When depen
 
 1. Record the relevant pre-dispatch workspace state so later review can distinguish existing user changes.
 2. Form one independent task envelope per task using [delegation-contract.md](references/delegation-contract.md). Write its narrative instructions in the language of the user's current substantive task unless the user explicitly requests another language. Do not persist an inferred language or replace a clear conversational signal with the host/OS locale.
-3. Call `cursor_do` with `background=true` and save its compact submission receipt. Use `background=false` only when an immediate synchronous full result is required. Use only the documented `session_mode` and `session_id` fields when continuity is explicit; never infer continuity from the visible chat.
+3. Call `cursor_do` with `background=true` and save its compact submission receipt. Include `workspace_path` when the exact target is known and the schema supports it. Use `background=false` only when an immediate synchronous full result is required. Use only the documented `session_mode` and `session_id` fields when continuity is explicit; never infer continuity from the visible chat.
 4. Save each returned `task_id`; for persistent work also save `session_id`. Treat `agent_id` as verification evidence, not the continuation handle.
 5. If a parallel submission does not return a usable `agent_id`, stop expanding the parallel batch and use `fifo` or report the ambiguous state.