pi-cursor-bridge 0.1.15 → 0.1.17

package/.codex-plugin/plugin.json

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

package/README.md

@@ -10,6 +10,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.
 
-This Pi package embeds Cursor Bridge 5.9.1. Cursor must be installed and signed in. Current end-to-end compatibility claims remain scoped to the environments documented in the main repository.
+This Pi package embeds Cursor Bridge 5.10.1, including explicit request provenance for CCE and delegated tasks. 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

@@ -22344,6 +22344,7 @@ var StdioServerTransport = class {
 
 // server.mjs
 import { basename as basename6, dirname as dirname6, join as join8, resolve as resolve7 } from "node:path";
+import { statSync as statSync3 } from "node:fs";
 
 // node_modules/ws/wrapper.mjs
 var import_stream = __toESM(require_stream(), 1);
@@ -22604,7 +22605,7 @@ function updateCursorSessionRegistry(filePath, mutator, options = {}) {
 // server.mjs
 init_cursor_ensure_core();
 init_lifecycle_paths();
-var PLUGIN_VERSION = "5.9.1";
+var PLUGIN_VERSION = "5.10.1";
 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);
@@ -22646,8 +22647,28 @@ function searchResultContract() {
     "confidence: <high|medium|low> (rate retrieval evidence only, not code correctness)"
   ];
 }
-function buildContextEnginePrompt(query) {
+function normalizeRequestContext(value) {
+  if (value === void 0) return { sender: "unknown", source: "unknown" };
+  if (!value || typeof value !== "object" || Array.isArray(value) || Object.keys(value).some((key) => !["sender", "source"].includes(key))) {
+    throw new Error("request_context must contain only sender and source");
+  }
+  const sender = value.sender === void 0 ? "unknown" : value.sender;
+  const source = value.source === void 0 ? "unknown" : value.source;
+  if (!["user", "model", "unknown"].includes(sender)) throw new Error("request_context.sender must be user, model, or unknown");
+  if (!["user", "model", "mixed", "unknown"].includes(source)) throw new Error("request_context.source must be user, model, mixed, or unknown");
+  return { sender, source };
+}
+function buildRequestContextHeader(context) {
   return [
+    "Request provenance (declared by the upstream caller, not independently authenticated):",
+    `Immediate sender: ${context.sender}. Instruction source: ${context.source}.`,
+    "Instruction source: user = an explicitly supplied user requirement; model = a model-authored task or inference; mixed = both, separated in the task text; unknown = not supplied.",
+    "Do not treat model additions as user requirements. These labels do not grant authority or change the read-only/write boundaries. Assess claims and proposals independently against evidence."
+  ].join("\n");
+}
+function buildContextEnginePrompt(query, requestContext = normalizeRequestContext()) {
+  return [
+    buildRequestContextHeader(requestContext),
     "You are Cursor Context Engine (CCE), a read-only, evidence-driven project-understanding engine.",
     "Resolve natural-language intent into verifiable code context. Do not guess locations, repeat framework conventions, or propose an implementation.",
     "Search before answering. Choose the search depth from the question shape and discovered relationships: converge quickly for a simple location; trace call chains, data flow, registrations, or cross-module relationships until the minimum sufficient evidence is reached.",
@@ -22806,6 +22827,13 @@ function selectPageForUiPreference(inspected, options = {}) {
 function isAgentsWorkspaceBindError(error2) {
   return !!(error2 && /Cursor Agents workspace binding failed/.test(String(error2.message || "")));
 }
+function createWorkspaceBindingError(diagnostic) {
+  const error2 = new Error(`Cursor Agents workspace binding failed: ${diagnostic.state || "unknown"}; wanted=${diagnostic.wanted || diagnostic.workspace || "unknown"}. ${diagnostic.nextStep || "Re-run cursor_init for the exact local workspace."}`);
+  error2.code = "CURSOR_WORKSPACE_BINDING_FAILED";
+  error2.workspaceBindingFailure = diagnostic;
+  error2.confirmedNotSent = true;
+  return error2;
+}
 async function findPage(options = {}) {
   const list = await httpJson("/json/list");
   const pages = list.filter((t) => t.type === "page" && t.webSocketDebuggerUrl);
@@ -22895,9 +22923,10 @@ var CURSOR_INPUT_SELECTOR = [
   ".aislash-editor-input"
 ].join(",");
 var INPUT_PICKER_BODY = `
-  const pickInput=()=>[...document.querySelectorAll(${JSON.stringify(CURSOR_INPUT_SELECTOR)})]
+  const inputCandidates=()=>[...document.querySelectorAll(${JSON.stringify(CURSOR_INPUT_SELECTOR)})]
     .filter(e=>e.offsetParent!==null&&!e.disabled&&e.getAttribute('aria-disabled')!=='true'&&e.getAttribute('contenteditable')!=='false')
-    .sort((a,b)=>(b.classList&&b.classList.contains('ui-prompt-input-editor__input')?1:0)-(a.classList&&a.classList.contains('ui-prompt-input-editor__input')?1:0))[0]||null;`;
+    .sort((a,b)=>(b.classList&&b.classList.contains('ui-prompt-input-editor__input')?1:0)-(a.classList&&a.classList.contains('ui-prompt-input-editor__input')?1:0));
+  const pickInput=()=>inputCandidates()[0]||null;`;
 var EXPR_VISIBLE = `(function(){${INPUT_PICKER_BODY}return !!pickInput();})()`;
 var CHAT_PANEL_NEXT_STEP = "Complete or close the current Customize/Settings dialog, open Cursor's main Agent/Chat panel or New Chat, then retry the same request.";
 function classifyChatPanelDiagnostic(snapshot = {}) {
@@ -23202,75 +23231,216 @@ function createModelSelectionError(message, failureClass, retryable, diagnostic
   error2.modelSelectionFailure = { failureClass, retryable, ...diagnostic };
   return error2;
 }
-var WORKSPACE_SECTION_BODY = `
+var WORKSPACE_SECTION_BODY = String.raw`
+  const workspaceScalar=value=>value&&typeof value==='object'&&'value' in value?value.value:value;
+  const normalizeWorkspacePath=value=>{
+    let path=String(value||'').replace(/\\/g,'/').replace(/^\/([a-z]:\/)/i,'$1').replace(/\/+$/,'');
+    return /^[a-z]:\//i.test(path)||path.startsWith('//')?path.toLowerCase():path;
+  };
+  const localWorkspacePath=identifier=>{
+    const uri=identifier&&(identifier.uri||identifier.configPath);
+    if(!uri||uri.scheme!=='file'||uri.authority)return '';
+    return normalizeWorkspacePath(uri.fsPath||uri.path);
+  };
+  const inputAgentHeaders=input=>{
+    const headers=new Set();
+    for(let node=input,n=0;node&&n<12;n++,node=node.parentElement){
+      const key=Object.keys(node).find(key=>key.startsWith('__reactFiber$'));
+      for(let f=key&&node[key],i=0;f&&i<36;i++,f=f.return){
+        const selected=f.memoizedProps&&f.memoizedProps.selectedAgent;
+        const header=selected&&selected.reference&&selected.reference.header;
+        if(header)headers.add(header);
+      }
+    }
+    return [...headers];
+  };
   const headText=(el)=>String(el&&(el.innerText||el.textContent)||'').trim();
   const isNewAgentButton=(node)=>{
     if(!node)return false;
     const aria=String(node.getAttribute&&node.getAttribute('aria-label')||'').trim();
-    const text=String(node.innerText||'').trim().split('\\n')[0].trim();
+    const text=String(node.innerText||'').trim().split('\n')[0].trim();
     return /^New Agent$/i.test(aria)||/^New Agent$/i.test(text);
   };
   const findNewAgent=(root)=>[...(root&&root.querySelectorAll?root.querySelectorAll('button,[role=button]'):[])].find(isNewAgentButton)||null;
   const collectWorkspaceSections=()=>{
     const sections=[];
-    const seen=new Set();
-    const add=(head,node,button)=>{
-      const name=String(head||'').trim();
-      if(!name)return;
-      const key=name.toLowerCase();
-      if(seen.has(key))return;
-      seen.add(key);
-      sections.push({head:name,node,button:button||findNewAgent(node)});
-    };
+    const heads=new Set(document.querySelectorAll('.ui-sidebar-section-head'));
     for(const section of document.querySelectorAll('section.glass-sidebar-workspace-section-root')){
-      add(headText(section.querySelector('.ui-sidebar-section-head')),section,null);
+      const head=section.querySelector('.ui-sidebar-section-head');
+      if(head)heads.add(head);
     }
-    for(const headEl of document.querySelectorAll('.ui-sidebar-section-head')){
+    for(const headEl of heads){
       const name=headText(headEl);
       if(!name)continue;
+      let metadata=null;
+      const key=Object.keys(headEl).find(key=>key.startsWith('__reactFiber$'));
+      for(let f=key&&headEl[key],i=0;f&&i<36;i++,f=f.return){
+        const p=f.memoizedProps;
+        if(p&&p.section&&Array.isArray(p.section.projects)){metadata=p.section;break;}
+      }
       let scope=headEl;
       let chosen=null;
       for(let i=0;scope&&i<16;i++,scope=scope.parentElement){
-        const nested=[...scope.querySelectorAll('.ui-sidebar-section-head')].map(headText).filter(Boolean);
-        const unique=[...new Set(nested.map((h)=>h.toLowerCase()))];
+        const nested=[...scope.querySelectorAll('.ui-sidebar-section-head')];
         const button=findNewAgent(scope);
-        if(button&&unique.length===1&&unique[0]===name.toLowerCase()){
+        if(button&&nested.length===1&&nested[0]===headEl){
           chosen={node:scope,button};
           break;
         }
       }
-      add(name,chosen?chosen.node:headEl,chosen&&chosen.button);
+      const source=metadata&&(metadata.newAgentTargetSource||metadata);
+      sections.push({head:name,metadata,source,button:chosen&&chosen.button});
     }
     return sections;
   };
+  const inspectWorkspace=projectPath=>{
+    const wanted=normalizeWorkspacePath(projectPath);
+    const sections=collectWorkspaceSections();
+    const available=sections.map(s=>({
+      title:s.head,sectionId:s.metadata&&s.metadata.id||null,
+      projects:(s.source&&s.source.projects||[]).map(p=>({
+        type:p.type,workspaceId:p.workspaceIdentifier&&p.workspaceIdentifier.id||null,
+        path:localWorkspacePath(p.workspaceIdentifier)||null,remoteAuthority:p.remoteAuthority||null,
+        repoUrls:Array.isArray(p.repoUrls)?p.repoUrls:[]
+      }))
+    }));
+    const matches=[];
+    for(const section of sections){
+      for(const project of section.source&&section.source.projects||[]){
+        if(project.type==='workspace'&&localWorkspacePath(project.workspaceIdentifier)===wanted){
+          matches.push({section,project});
+        }
+      }
+    }
+    const fail=state=>({ok:false,state,wanted,available,
+      nextStep:'In Cursor Agents Window, add or open the exact local folder (or .code-workspace file) '+projectPath+'. Ensure it has one registered local workspace creation target, then run cursor_init with that same path. Repository titles and historical Agents cannot establish the target.'});
+    if(!matches.length)return {diagnostic:fail(sections.some(s=>s.metadata)?'workspace_registration_required':'workspace_identity_unavailable')};
+    if(matches.length!==1)return {diagnostic:fail('workspace_ambiguous')};
+    const {section,project}=matches[0];
+    if(project.remoteAuthority||!project.workspaceIdentifier.id)return {diagnostic:fail('workspace_environment_unverified')};
+    // Cursor's section-level New Agent action chooses among registered targets.
+    // Do not click it when a second workspace could win that choice.
+    if(section.source.projects.length!==1)return {diagnostic:fail('workspace_creation_target_ambiguous')};
+    if(!section.button)return {diagnostic:fail('workspace_new_agent_unavailable')};
+    return {section,diagnostic:{ok:true,state:'workspace_ready',workspace:wanted,
+      workspaceId:project.workspaceIdentifier.id,sectionId:section.metadata.id,
+      environment:'local',identitySource:'registered_workspace_file_uri',repoUrls:Array.isArray(project.repoUrls)?project.repoUrls:[]}};
+  };
 `;
 function exprCreateAgentForWorkspace(projectPath) {
-  const workspaceLabel = JSON.stringify(basename6(String(projectPath || "")).trim().toLowerCase());
   return `(function(){
     ${WORKSPACE_SECTION_BODY}
-    const wanted=${workspaceLabel};
-    const sections=collectWorkspaceSections();
-    const available=sections.map((section)=>section.head).filter(Boolean);
-    const matches=sections.filter((section)=>section.head.toLowerCase()===wanted);
-    if(matches.length===0)return JSON.stringify({ok:false,state:'repository_not_found',wanted,available});
-    if(matches.length>1)return JSON.stringify({ok:false,state:'repository_ambiguous',wanted,count:matches.length});
-    const button=matches[0].button;
-    if(!button)return JSON.stringify({ok:false,state:'repository_new_agent_unavailable',wanted});
-    button.click();
-    return JSON.stringify({ok:true,state:'repository_agent_created',workspace:wanted});
+    ${INPUT_PICKER_BODY}
+    const result=inspectWorkspace(${JSON.stringify(String(projectPath || ""))});
+    if(!result.diagnostic.ok)return JSON.stringify(result.diagnostic);
+    const previousAgentIds=[...new Set(inputCandidates().flatMap(inputAgentHeaders)
+      .map(header=>String(workspaceScalar(header.id)||'')).filter(Boolean))];
+    result.section.button.click();
+    return JSON.stringify({...result.diagnostic,state:'workspace_agent_creation_requested',previousAgentIds});
   })()`;
 }
 function exprInspectWorkspaceRepository(projectPath) {
-  const workspaceLabel = JSON.stringify(basename6(String(projectPath || "")).trim().toLowerCase());
   return `(function(){
     ${WORKSPACE_SECTION_BODY}
-    const wanted=${workspaceLabel};
-    const sections=collectWorkspaceSections();
-    const available=sections.map((section)=>section.head).filter(Boolean);
-    const matches=sections.filter((section)=>section.head.toLowerCase()===wanted);
-    if(matches.length===0)return JSON.stringify({ok:false,state:'repository_not_found',wanted,available});
-    if(matches.length>1)return JSON.stringify({ok:false,state:'repository_ambiguous',wanted,count:matches.length});
-    return JSON.stringify({ok:true,state:'repository_ready',workspace:wanted});
+    return JSON.stringify(inspectWorkspace(${JSON.stringify(String(projectPath || ""))}).diagnostic);
+  })()`;
+}
+function exprRegisterAgentsWorkspace(projectPath, workspaceFile = false) {
+  return `(async function(){
+    ${WORKSPACE_SECTION_BODY}
+    const path=${JSON.stringify(String(projectPath || ""))};
+    const before=inspectWorkspace(path).diagnostic;
+    if(before.state!=='workspace_registration_required')return JSON.stringify(before);
+    const fail=(state,error)=>JSON.stringify({...before,state,error});
+    const services=new Set();
+    for(const node of document.querySelectorAll('button[aria-label="Open Workspace"],.ui-sidebar-section-head')){
+      const key=Object.keys(node).find(k=>k.startsWith('__reactFiber$'));
+      for(let f=key&&node[key],i=0;f&&i<48;i++,f=f.return){
+        for(let d=f.dependencies&&f.dependencies.firstContext;d;d=d.next){
+          const service=d.memoizedValue&&d.memoizedValue.workspace&&d.memoizedValue.workspace.instantiationService;
+          if(service)services.add(service);
+        }
+      }
+    }
+    const candidates=new Map();
+    for(const service of services){
+      const entries=new Map();
+      for(let s=service,i=0;s&&i<8;i++,s=s._parent){
+        for(const [id,value] of s._services&&s._services._entries||[]){
+          if(!entries.has(String(id)))entries.set(String(id),value);
+        }
+      }
+      const projects=entries.get('glassWorkspacesService');
+      const workspaces=entries.get('workspacesService');
+      const URI=entries.get('environmentService')?.userHome?.constructor;
+      if(typeof projects?.replaceWorkspaceProject==='function'&&typeof URI?.file==='function'
+          &&typeof workspaces?.getSingleFolderWorkspaceIdentifier==='function'
+          &&typeof workspaces?.getWorkspaceIdentifier==='function'
+          &&typeof projects?.refresh==='function'){
+        candidates.set(projects,{projects,workspaces,URI});
+      }
+    }
+    if(candidates.size!==1)return fail('workspace_registration_unavailable','Expected one Cursor workspace registration service');
+    try{
+      const {projects,workspaces,URI}=[...candidates.values()][0];
+      const uri=URI.file(path);
+      const identifier=await workspaces[${JSON.stringify(workspaceFile ? "getWorkspaceIdentifier" : "getSingleFolderWorkspaceIdentifier")}](uri);
+      if(!identifier?.id||localWorkspacePath(identifier)!==normalizeWorkspacePath(path)){
+        return fail('workspace_registration_identity_mismatch','Cursor returned a different workspace identity');
+      }
+      const current=inspectWorkspace(path).diagnostic;
+      if(current.state!=='workspace_registration_required')return JSON.stringify(current);
+      // addProject can skip folders already represented by Agent history.
+      // With no 'replaces', this public service method upserts only this exact ID.
+      await projects.replaceWorkspaceProject({project:{type:'workspace',workspaceIdentifier:identifier}});
+      await projects.refresh();
+      return JSON.stringify({ok:false,state:'workspace_registration_requested',wanted:before.wanted,
+        workspaceId:identifier.id,registrationSource:'cursor_glass_workspaces_service'});
+    }catch(error){return fail('workspace_registration_failed',String(error.message||error));}
+  })()`;
+}
+function exprInspectAgentWorkspace(projectPath, options = {}) {
+  return `(function(){
+    ${WORKSPACE_SECTION_BODY}
+    ${INPUT_PICKER_BODY}
+    const wanted=normalizeWorkspacePath(${JSON.stringify(String(projectPath || ""))});
+    const options=${JSON.stringify(options)};
+    const rawId=id=>String(id||'').replace(/^local:/,'');
+    const excluded=new Set((options.excludedAgentIds||[]).map(rawId));
+    const fail=(state,observed=null)=>({ok:false,state,wanted,observed,
+      nextStep:'Inspect task sendState before retrying. Select the exact local workspace '+${JSON.stringify(String(projectPath || ""))}+' in Cursor and retry cursor_init when no task may still be running. The Agent must expose an existing local environment for that same path; do not substitute a repository alias, cloud target, or another worktree.'});
+    const inputs=inputCandidates();
+    if(inputs.length!==1)return JSON.stringify(fail('agent_workspace_identity_unavailable',{inputCount:inputs.length}));
+    const headers=inputAgentHeaders(inputs[0]);
+    const ids=[...new Set(headers.map(header=>rawId(workspaceScalar(header.id))).filter(Boolean))];
+    if(ids.length!==1||excluded.has(ids[0])||options.agentId&&ids[0]!==rawId(options.agentId)){
+      return JSON.stringify(fail('agent_workspace_identity_unavailable',{
+        inputCount:inputs.length,headerCount:headers.length,candidateAgentIds:ids,
+        identitySource:'writable_input_react_ancestors',expectedAgentId:options.agentId||null,
+        excludedAgentIdsMatched:ids.filter(id=>excluded.has(id))
+      }));
+    }
+    const id=ids[0];
+    if(options.requireInputFocus&&document.activeElement!==inputs[0])return JSON.stringify(fail('agent_input_focus_mismatch'));
+    let observed;
+    for(const header of headers){
+      const target=workspaceScalar(header.targetEnvironment);
+      const environment=workspaceScalar(header.environment);
+      const location=workspaceScalar(header.location);
+      observed={agentId:'local:'+id,targetType:target&&target.type||null,
+        workspaceId:environment&&environment.id||null,path:localWorkspacePath(environment)||null,
+        targetPath:localWorkspacePath(target&&target.environment)||null,locationType:location&&location.type||null};
+      if(!wanted||!environment||!environment.id||!target||target.type!=='existing'
+        ||environment.remoteAuthority||target.remoteAuthority||target.environment&&target.environment.remoteAuthority
+        ||observed.path!==wanted||observed.targetPath!==wanted||target.environment.id!==environment.id
+        ||location&&(location.type!=='local'&&location.type!=='worktree'
+          ||localWorkspacePath(location.environment)!==wanted
+          ||location.type==='worktree'&&normalizeWorkspacePath(location.worktreePath)!==wanted)){
+        return JSON.stringify(fail('agent_workspace_mismatch',observed));
+      }
+    }
+    return JSON.stringify({ok:true,state:'agent_workspace_verified',workspace:wanted,
+      environment:'local',identitySource:'selected_agent_existing_file_uri',...observed});
   })()`;
 }
 var EXPR_HISTORY_OPEN = `(function(){return !![...document.querySelectorAll('.compact-agent-history-react-menu-label')].find(e=>e.offsetParent!==null);})()`;
@@ -23749,7 +23919,8 @@ var CursorBridge = class {
       initialized: !!this.projectPath,
       reinitializable: true,
       interactionPreference: "agents_v2_when_open_else_legacy",
-      cursorUiPreferencePreserved: true
+      cursorUiPreferencePreserved: true,
+      workspaceBinding: this._lastWorkspaceBinding || null
     };
   }
   sessionRegistryView() {
@@ -24175,6 +24346,8 @@ var CursorBridge = class {
     return result;
   }
   async initializeWorkspace(projectPath) {
+    if (this._healing) await this._healing.catch(() => {
+    });
     if (this.busy || this.activeParallel.size > 0 || this.queue.length > 0) {
       throw new Error("cursor_init cannot change workspace while Cursor tasks are queued or running");
     }
@@ -24185,8 +24358,9 @@ var CursorBridge = class {
     this.workspaceSource = "persistent_init";
     this.workspaceUpdatedAt = saved.updatedAt;
     this._lastLifecycle = null;
+    this._lastWorkspaceBinding = null;
     try {
-      await this._ensureCursor();
+      await this._ensureCursor({ registerWorkspace: true });
     } catch (error2) {
       const lifecycle = this._lastLifecycle;
       const recoverableStatuses = /* @__PURE__ */ new Set([
@@ -24222,8 +24396,9 @@ var CursorBridge = class {
       lifecycle: this._lastLifecycle
     };
   }
-  async _findAgentsWorkspace(projectPath) {
+  async _findAgentsWorkspace(projectPath, { registerWorkspace = false } = {}) {
     if (!projectPath) return null;
+    this._lastWorkspaceBinding = null;
     let page;
     try {
       page = await findPage({ purpose: "fifo", preferAgentsV2: true });
@@ -24234,14 +24409,33 @@ var CursorBridge = class {
     const c = makeClient(page.webSocketDebuggerUrl);
     try {
       await c.ready;
-      const repository = JSON.parse(await evalJS(c, exprInspectWorkspaceRepository(projectPath)) || "{}");
+      let repository = JSON.parse(await evalJS(c, exprInspectWorkspaceRepository(projectPath)) || "{}");
+      if (registerWorkspace && repository.state === "workspace_registration_required") {
+        const registration = await this._withUiLock(async () => {
+          if (this.busy || this.activeParallel.size > 0 || this.queue.length > 0) {
+            return { ok: false, state: "workspace_registration_busy", error: "Cursor tasks became queued or running before registration" };
+          }
+          return JSON.parse(await evalJS(c, exprRegisterAgentsWorkspace(projectPath, statSync3(projectPath).isFile())) || "{}");
+        });
+        repository = registration;
+        if (registration.state === "workspace_registration_requested") {
+          for (let attempt = 0; attempt < 20; attempt++) {
+            repository = JSON.parse(await evalJS(c, exprInspectWorkspaceRepository(projectPath)) || "{}");
+            if (repository.state !== "workspace_registration_required") break;
+            await sleep2(250);
+          }
+          repository = { ...repository, registration };
+        }
+      }
+      this._lastWorkspaceBinding = { ...repository, checkedAt: (/* @__PURE__ */ new Date()).toISOString() };
       if (!repository.ok) return null;
       return {
         targetId: page.id,
         targetUiFlavor: "agents_v2",
         workspace: repository.workspace
       };
-    } catch {
+    } catch (error2) {
+      this._lastWorkspaceBinding = { ok: false, state: "workspace_probe_failed", wanted: projectPath, error: String(error2.message || error2) };
       return null;
     } finally {
       c.close();
@@ -24371,16 +24565,18 @@ var CursorBridge = class {
       recovery: normalized === "minimal" ? "Switch CCE to normal mode before opening Cursor manually." : null
     };
   }
-  async contextEngine(query) {
+  async contextEngine(query, options = {}) {
     const text = String(query || "").trim();
     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), {
+    const job = this._enqueue("context_engine", buildContextEnginePrompt(text, requestContext), {
+      requestContext,
       timeoutMs: QUERY_TIMEOUT,
       newChat: true,
       execution: "fifo",
@@ -24406,6 +24602,7 @@ var CursorBridge = class {
     const text = String(prompt || "").trim();
     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();
     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");
@@ -24433,7 +24630,9 @@ var CursorBridge = class {
       throw cursorSessionError("SESSION_EXECUTION_INVALID", "persistent sessions require execution=parallel_agent and never fall back to FIFO");
     }
     const readOnly = options.readOnly === true;
-    const timeoutMs = Math.max(3e4, Math.min(9e5, Number(options.timeoutMs || 6e5)));
+    const requestedTimeoutMs = Number(options.timeoutMs ?? 6e5);
+    if (!Number.isFinite(requestedTimeoutMs)) throw new Error("timeout_ms must be finite");
+    const timeoutMs = Math.max(3e4, Math.min(9e5, requestedTimeoutMs));
     const allowedPaths = Array.isArray(options.allowedPaths) ? options.allowedPaths.map((x) => String(x).trim()).filter(Boolean) : [];
     if (readOnly && allowedPaths.length > 0) {
       throw new Error("read_only=true cannot be combined with allowed_paths because a read-only task cannot declare a write scope");
@@ -24454,7 +24653,7 @@ var CursorBridge = class {
       throw cursorSessionError("SESSION_WORKSPACE_REQUIRED", "initialize one workspace before creating or continuing a session");
     }
     const contract = String(options.completionContract || "").trim();
-    let fullPrompt = text + DO_LANGUAGE_CONTRACT;
+    let fullPrompt = buildRequestContextHeader(requestContext) + "\n\nTask:\n" + text + DO_LANGUAGE_CONTRACT;
     if (readOnly) fullPrompt += "\n\nRead-only boundary: Do not modify, create, or delete files, and do not run commands that change workspace state.";
     if (allowedPaths.length > 0) {
       fullPrompt += "\n\nAllowed modification scope (do not cross this boundary):\n" + allowedPaths.map((x) => "- " + x).join("\n");
@@ -24493,8 +24692,10 @@ var CursorBridge = class {
       }
     }
     const job = this._enqueue("do", fullPrompt, {
+      requestContext,
       taskId,
       timeoutMs,
+      requestedTimeoutMs,
       newChat: sessionMode !== "continue",
       execution,
       readOnly,
@@ -24556,7 +24757,9 @@ var CursorBridge = class {
       id,
       kind,
       prompt,
+      requestContext: options.requestContext || normalizeRequestContext(),
       timeoutMs: options.timeoutMs,
+      requestedTimeoutMs: options.requestedTimeoutMs ?? options.timeoutMs,
       newChat: options.newChat,
       preferLegacyUi: options.preferLegacyUi === true,
       execution: options.execution || "fifo",
@@ -24635,6 +24838,7 @@ var CursorBridge = class {
     if (isTerminalTask(job)) return;
     const e = error2 instanceof Error ? error2 : new Error(String(error2));
     job.error = e.message;
+    if (e.workspaceBindingFailure) job.workspaceBinding = e.workspaceBindingFailure;
     if (e.providerError) job.providerError = e.providerError;
     if (e.uiDiagnostic) job.uiDiagnostic = e.uiDiagnostic;
     if (e.terminalEvidence) job.terminalEvidence = e.terminalEvidence;
@@ -24721,7 +24925,7 @@ var CursorBridge = class {
   // 自愈：每次查询前委托 ensureCursorRunning。并发去重。失败静默降级（_run 报清晰错）。
   // 统一走 ensureCursorRunning 复用其【单一身份校验来源】（cdpUp + cdpIsCursor）——避免热路径裸 /json/version 检查
   // 绕过身份校验、在别的 IDE 占 9223 时驱动错应用（2026-06-08 review #6）。
-  _ensureCursor() {
+  _ensureCursor({ registerWorkspace = false } = {}) {
     this._refreshPersistedRuntimeMode();
     if (this._healing) return this._healing;
     this._healing = (async () => {
@@ -24734,23 +24938,17 @@ var CursorBridge = class {
           ...this.projectPath ? { projectPath: this.projectPath } : {}
         });
         this._lastLifecycle = lifecycleFromEnsureResult(rr, this.runtimeMode);
-        if (!rr.ok && rr.status === "workspace-not-ready" && rr.projectPath) {
-          const agentsWorkspace = await this._findAgentsWorkspace(rr.projectPath);
+        if ((rr.ok || rr.status === "workspace-not-ready") && rr.projectPath) {
+          const agentsWorkspace = await this._findAgentsWorkspace(rr.projectPath, { registerWorkspace });
           if (agentsWorkspace) {
             this._lastLifecycle = promoteAgentsWorkspaceLifecycle(this._lastLifecycle, agentsWorkspace);
-          }
-        }
-        if (rr.ok && rr.lifecycleMode === "attached" && rr.workspaceAction === "reused-agents-window" && rr.projectPath) {
-          const agentsWorkspace = await this._findAgentsWorkspace(rr.projectPath);
-          if (agentsWorkspace) {
-            this._lastLifecycle = promoteAgentsWorkspaceLifecycle(this._lastLifecycle, agentsWorkspace);
-          } else {
+          } else if (rr.ok && (rr.workspaceAction === "reused-agents-window" || this._lastWorkspaceBinding)) {
             this._lastLifecycle = {
               ...this._lastLifecycle,
               status: "workspace-not-ready",
-              message: `Cursor is reachable, but Cursor Bridge could not verify workspace ${rr.projectPath} in the attached Agents Window.`,
+              message: `Cursor is reachable, but Cursor Bridge could not verify workspace ${rr.projectPath} in the Agents Window (${this._lastWorkspaceBinding?.state || "workspace_probe_unavailable"}).`,
               needsAction: "open_workspace_in_cursor",
-              nextStep: `Open workspace ${rr.projectPath} in Cursor, then retry the same operation.`,
+              nextStep: this._lastWorkspaceBinding?.nextStep || `Open workspace ${rr.projectPath} in Cursor, then retry the same operation.`,
               retryable: true
             };
           }
@@ -24885,10 +25083,11 @@ var CursorBridge = class {
             this.activeParallel.delete(job.id);
             this._failJob(job, error2);
           } else if (error2 && error2.sent) {
+            job.firstWaitError ||= error2.message;
             job.error = `Submission state is uncertain; monitoring continues by agentId: ${error2.message}`;
             if (job.agentId) {
               job.phase = "running";
-              job.reservationScope = job.readOnly ? "agent" : "paths";
+              job.reservationScope = job.effectiveExecution === "fifo" ? "global" : job.readOnly ? "agent" : "paths";
               this.activeParallel.set(job.id, job);
               this._startParallelMonitor(job);
             } else {
@@ -24927,10 +25126,11 @@ var CursorBridge = class {
           try {
             await this._newChat(c, {
               uiFlavor: options.targetUiFlavor,
-              projectPath: options.projectPath || this._lastLifecycle && this._lastLifecycle.projectPath || this.projectPath
+              projectPath: options.projectPath || this._lastLifecycle && this._lastLifecycle.projectPath || this.projectPath,
+              job: options
             });
           } catch (error2) {
-            if (attempt === 0 && options.targetUiFlavor === "agents_v2" && isAgentsWorkspaceBindError(error2)) {
+            if (attempt === 0 && options.targetUiFlavor === "agents_v2" && isAgentsWorkspaceBindError(error2) && !error2.workspaceBindingFailure) {
               const fallback = await findPage({ purpose: "fifo", preferLegacy: true });
               if (fallback && fallback.id !== page.id) {
                 options.fallbackReason = "agents_window_unbound_use_workbench";
@@ -24956,11 +25156,13 @@ var CursorBridge = class {
           baseline = JSON.parse(await evalJS(c, EXPR_SNAP));
         } catch {
         }
+        options.responseBaseline = baseline;
         const providerErrorBaseline = providerErrorSignature(await this._readProviderError(c));
+        await this._verifyAgentsWorkspace(c, options, "before_send");
         options.sendState = "dispatching";
         try {
           await chord(c, 0, "Enter", "Enter", 13);
-          await this._confirmSubmission(c, baseline.messageCount || 0, providerErrorBaseline);
+          await this._confirmSubmission(c, baseline.messageCount || 0, providerErrorBaseline, options);
           options.sendState = "sent";
           options.sentAt = options.sentAt || (/* @__PURE__ */ new Date()).toISOString();
           await this._bindFifoAgentAfterSend(c, options, historyBefore, providerErrorBaseline);
@@ -25350,11 +25552,19 @@ var CursorBridge = class {
   async _newChat(c, options = {}) {
     if (options.uiFlavor === "agents_v2" && options.projectPath) {
       const created = JSON.parse(await evalJS(c, exprCreateAgentForWorkspace(options.projectPath)) || "{}");
+      if (options.job) {
+        options.job.workspaceBindingChecks = { before_create: { ...created, checkedAt: (/* @__PURE__ */ new Date()).toISOString() } };
+      }
       if (!created.ok) {
-        const available = Array.isArray(created.available) ? `; available=${created.available.join(", ")}` : "";
-        throw new Error(`Cursor Agents workspace binding failed: ${created.state || "unknown"}; wanted=${created.wanted || basename6(options.projectPath)}${available}`);
+        throw createWorkspaceBindingError(created);
       }
       await sleep2(1100);
+      const actual = JSON.parse(await evalJS(c, exprInspectAgentWorkspace(options.projectPath, { excludedAgentIds: created.previousAgentIds })) || "{}");
+      if (options.job) options.job.workspaceBindingChecks.after_create = { ...actual, checkedAt: (/* @__PURE__ */ new Date()).toISOString() };
+      if (!actual.ok) throw createWorkspaceBindingError(actual);
+      if (actual.workspaceId !== created.workspaceId) {
+        throw createWorkspaceBindingError({ ...actual, ok: false, state: "created_workspace_id_mismatch" });
+      }
       return true;
     }
     return this._clickNewAgent(c, true);
@@ -25491,6 +25701,7 @@ var CursorBridge = class {
     }
   }
   async _fillPrompt(c, text, job, timeoutMs = 2500) {
+    await this._verifyAgentsWorkspace(c, job);
     const prepared = await evalJS(c, EXPR_PREPARE_INPUT);
     if (prepared !== "READY") return prepared;
     try {
@@ -25522,7 +25733,19 @@ var CursorBridge = class {
     };
     throw error2;
   }
-  async _confirmSubmission(c, baselineCount = 0, providerErrorBaseline = "") {
+  async _verifyAgentsWorkspace(c, job, stage = "before_fill") {
+    if (!job || job.targetUiFlavor !== "agents_v2") return;
+    const projectPath = job.projectPath || this.projectPath;
+    const diagnostic = JSON.parse(await evalJS(c, exprInspectAgentWorkspace(projectPath, {
+      agentId: job.agentId || job.provisionalAgentId || job.workspaceBinding?.agentId,
+      requireInputFocus: stage === "before_send"
+    })) || "{}");
+    job.workspaceBinding = { ...diagnostic, checkedAt: (/* @__PURE__ */ new Date()).toISOString() };
+    job.workspaceBindingChecks = { ...job.workspaceBindingChecks, [stage]: job.workspaceBinding };
+    if (!diagnostic.ok) throw createWorkspaceBindingError(diagnostic);
+  }
+  async _confirmSubmission(c, baselineCount = 0, providerErrorBaseline = "", job = null) {
+    let lastSnapshot = {};
     const accepted = async () => {
       await this._throwIfNewProviderError(c, providerErrorBaseline);
       let snap = {};
@@ -25530,6 +25753,7 @@ var CursorBridge = class {
         snap = JSON.parse(await evalJS(c, EXPR_SNAP));
       } catch {
       }
+      lastSnapshot = snap;
       const inputTextLength = Number(snap.inputTextLength);
       return Number(snap.stop || 0) > 0 || Number(snap.messageCount || 0) > Number(baselineCount || 0) || Number.isFinite(inputTextLength) && inputTextLength === 0;
     };
@@ -25537,15 +25761,30 @@ var CursorBridge = class {
       await sleep2(250);
       if (await accepted()) return "enter";
     }
+    try {
+      await this._verifyAgentsWorkspace(c, job, "before_send_fallback");
+    } catch (error3) {
+      error3.confirmedNotSent = false;
+      error3.sent = true;
+      throw error3;
+    }
     const clicked = await evalJS(c, EXPR_CLICK_SEND);
-    if (clicked === "CLICKED") {
+    if (clicked === "CLICKED" || clicked === "NO_SEND") {
       for (let i = 0; i < 20; i++) {
         await sleep2(250);
-        if (await accepted()) return "button";
+        if (await accepted()) return clicked === "CLICKED" ? "button" : "enter";
       }
     }
-    const error2 = new Error(`Cursor did not accept the submission (submit_not_accepted: ${clicked || "unknown"}); the prompt remains in the input and no orphan task was created`);
-    error2.confirmedNotSent = true;
+    const error2 = new Error(`Cursor submission could not be confirmed (submission_uncertain: ${clicked || "unknown"}); Enter was dispatched, so inspect the bound Agent before retrying`);
+    error2.confirmedNotSent = false;
+    error2.sent = true;
+    error2.composerDiagnostic = {
+      inputTextLength: Number.isFinite(Number(lastSnapshot.inputTextLength)) ? Number(lastSnapshot.inputTextLength) : null,
+      sendReady: lastSnapshot.sendReady === true,
+      stop: Number(lastSnapshot.stop || 0),
+      messageCount: Number(lastSnapshot.messageCount || 0),
+      fallbackResult: clicked || "unknown"
+    };
     throw error2;
   }
   async _readProviderError(c) {
@@ -25587,9 +25826,9 @@ var CursorBridge = class {
       this._throwIfCancelledBeforeSend(job);
       let createdForWorkspace = false;
       try {
-        createdForWorkspace = job.targetUiFlavor === "agents_v2" && job.projectPath ? await this._newChat(c, { uiFlavor: job.targetUiFlavor, projectPath: job.projectPath }) : await this._clickNewAgent(c, false);
+        createdForWorkspace = job.targetUiFlavor === "agents_v2" && job.projectPath ? await this._newChat(c, { uiFlavor: job.targetUiFlavor, projectPath: job.projectPath, job }) : await this._clickNewAgent(c, false);
       } catch (error2) {
-        if (isAgentsWorkspaceBindError(error2)) {
+        if (isAgentsWorkspaceBindError(error2) && !error2.workspaceBindingFailure) {
           return { fallbackReason: "Agents Window could not bind the current repository; downgraded to FIFO/workbench before submission" };
         }
         throw error2;
@@ -25622,9 +25861,10 @@ var CursorBridge = class {
         baseline = JSON.parse(await evalJS(c, EXPR_SNAP));
       } catch {
       }
+      await this._verifyAgentsWorkspace(c, job, "before_send");
       job.sendState = "dispatching";
       await chord(c, 0, "Enter", "Enter", 13);
-      await this._confirmSubmission(c, baseline.messageCount || 0, providerErrorBaseline);
+      await this._confirmSubmission(c, baseline.messageCount || 0, providerErrorBaseline, job);
       sent = true;
       job.sendState = "sent";
       job.sentAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -25739,9 +25979,10 @@ var CursorBridge = class {
       }
       await sleep2(350);
       this._throwIfCancelledBeforeSend(job);
+      await this._verifyAgentsWorkspace(c, job, "before_send");
       job.sendState = "dispatching";
       await chord(c, 0, "Enter", "Enter", 13);
-      await this._confirmSubmission(c, job.responseBaseline.messageCount, providerErrorBaseline);
+      await this._confirmSubmission(c, job.responseBaseline.messageCount, providerErrorBaseline, job);
       sent = true;
       job.sendState = "sent";
       job.sentAt = (/* @__PURE__ */ new Date()).toISOString();
@@ -25915,7 +26156,12 @@ var CursorBridge = class {
     }
     if (!this._monitorOwns(job, generation)) return;
     const detail = lastCollectionError ? `; last collection error: ${lastCollectionError}` : "";
-    throw new Error(`Cursor parallel_agent task timed out (${job.timeoutMs}ms)${detail}`);
+    const recovered = await this._withJobLock(job, async () => {
+      if (!this._monitorOwns(job, generation)) return true;
+      const result = await this._reapParallelJobLocked(job, { reattach: false, preserveMonitor: true });
+      return isTerminalTask(job) || result.state === "terminal_uncollected";
+    });
+    if (!recovered) throw new Error(`Cursor ${job.effectiveExecution || job.execution || "Agent"} task timed out (${job.timeoutMs}ms)${detail}`);
   }
   async _requestExactAgentSelection(c, agentId) {
     if (!await this._ensureHistoryOpen(c)) return "REACT_ADAPTER_UNAVAILABLE";
@@ -26011,7 +26257,7 @@ var CursorBridge = class {
     job.resultUnavailable = true;
     job.terminalEvidence = evidence || "stable_completed_history_icon";
     job.recoveryState = "terminal_result_uncollected";
-    job.reservationScope = uncertainSubmissionReservationScope(job, error2);
+    job.reservationScope = job.effectiveExecution === "fifo" ? "global" : uncertainSubmissionReservationScope(job, error2);
     this._safeSettleSessionJob(job, "terminal_result_uncollected", { needsAttention: true });
   }
   _abandonJob(job, reason) {
@@ -26059,7 +26305,7 @@ var CursorBridge = class {
       job.recoveryState = "agent_missing";
       return { stable: false, error: "The bound agentId was not found in Agent History", entry: second || first || null };
     }
-    const stable = first.id === second.id && first.showSpinner === second.showSpinner && String(first.icon || "") === String(second.icon || "");
+    const stable = first.id === second.id && second.id === job.agentId && first.showSpinner === second.showSpinner && String(first.icon || "") === String(second.icon || "");
     return { stable, entry: second, error: stable ? null : "Agent History state is not yet stable" };
   }
   async _reapParallelJob(job, options = {}) {
@@ -26068,15 +26314,15 @@ var CursorBridge = class {
   }
   async _reapParallelJobLocked(job, options = {}) {
     if (!job || isTerminalTask(job)) return { changed: false, state: "terminal", task: this._taskView(job, true) };
-    if (job.execution !== "parallel_agent" || !this.activeParallel.has(job.id)) {
+    if (!this.activeParallel.has(job.id)) {
       return { changed: false, state: "not_parallel_reservation", task: this._taskView(job, true) };
     }
     if (!job.agentId) {
       job.lastRecoveryAt = (/* @__PURE__ */ new Date()).toISOString();
       job.recoveryState = "unbound_agent";
-      return { changed: false, state: "unbound_agent", task: this._taskView(job, true) };
+      return { changed: false, state: "unbound_agent", next: "The FIFO orphan has no agentId that can be safely rebound. Confirm that it stopped in the Cursor UI before explicitly abandoning it.", task: this._taskView(job, true) };
     }
-    this._invalidateParallelMonitor(job);
+    if (!options.preserveMonitor) this._invalidateParallelMonitor(job);
     const observed = await this._readStableParallelEntry(job);
     if (!observed.stable || !observed.entry) {
       return { changed: false, state: job.recoveryState || "unstable", error: observed.error, task: this._taskView(job, true) };
@@ -26324,7 +26570,7 @@ var CursorBridge = class {
     if (action === "reap") {
       const result = await this._reapParallelJobLocked(job, { reattach: true });
       if (result.state === "not_parallel_reservation" && job.phase === "orphaned") {
-        result.next = job.agentId ? "FIFO is bound to an agentId, but reap applies only to parallel_agent. Use cancel for a targeted stop, or abandon after confirmation." : "The FIFO orphan has no agentId that can be safely rebound. Confirm that it stopped in the Cursor UI before explicitly abandoning it.";
+        result.next = job.agentId ? "The bound task has no recoverable reservation. Inspect its current state before cancelling." : "The FIFO orphan has no agentId that can be safely rebound. Confirm that it stopped in the Cursor UI before explicitly abandoning it.";
       }
       return { found: true, action, ...result };
     }
@@ -26382,10 +26628,13 @@ var CursorBridge = class {
     }
     const canTargetStop = job.execution === "parallel_agent" || !!job.agentId;
     if (canTargetStop && (job.execution === "parallel_agent" || job.phase === "orphaned")) {
-      if (job.execution === "parallel_agent") {
+      if (this.activeParallel.has(job.id)) {
         this._invalidateParallelMonitor(job);
         const reaped = await this._reapParallelJobLocked(job, { reattach: false });
-        if (isTerminalTask(job)) return { found: true, action, ...reaped };
+        if (isTerminalTask(job) || reaped.state === "terminal_uncollected") {
+          job.cancelRequested = false;
+          return { found: true, action, ...reaped };
+        }
       }
       job.phase = "cancelling";
       job.recoveryState = "stopping";
@@ -26520,6 +26769,7 @@ var CursorBridge = class {
       } catch {
         s = { stop: 0, messageCount: 0, replyLength: 0, replyHash: 0 };
       }
+      if (job) job.lastWaitObservation = { at: (/* @__PURE__ */ new Date()).toISOString(), stop: s.stop, messageCount: s.messageCount, replyLength: s.replyLength, sawStop: sawStop || s.stop > 0 };
       if (s.stop > 0) sawStop = true;
       if (sawStop && s.stop === 0 && s.replyLength > 0) {
         await sleep2(800);
@@ -26560,6 +26810,10 @@ var CursorBridge = class {
     if (includeResult) this._markTaskResultCollected(job);
     const view = {
       taskId: job.id,
+      requestedTimeoutMs: job.requestedTimeoutMs ?? job.timeoutMs,
+      effectiveTimeoutMs: job.timeoutMs,
+      firstWaitError: job.firstWaitError || null,
+      lastWaitObservation: job.lastWaitObservation || null,
       kind: job.kind,
       status: job.status,
       phase: job.phase,
@@ -26569,6 +26823,9 @@ var CursorBridge = class {
       allowedPaths: job.allowedPaths,
       modelPreference: job.modelPreference,
       modelSelection: job.modelSelection,
+      requestContext: job.requestContext || normalizeRequestContext(),
+      workspaceBinding: job.workspaceBinding || null,
+      workspaceBindingChecks: job.workspaceBindingChecks || null,
       projectPath: job.projectPath,
       sessionMode: job.sessionMode || "isolated",
       sessionId: job.sessionId || null,
@@ -26612,7 +26869,7 @@ var CursorBridge = class {
       if (job.recoveryState === "terminal_result_uncollected") {
         view.attention = "Agent History proves that the underlying task ended, but its final reply has not been collected. Retry with reap, or explicitly abandon only if a missing reply is acceptable.";
       } else {
-        view.attention = job.agentId ? job.execution === "parallel_agent" ? "Use cursor_task_control(action=reap) to recheck the original agentId. Use cancel when a stop is needed, and abandon only after manual confirmation while accepting residual write risk." : "FIFO is bound to an agentId. Use cursor_task_control(action=cancel) with the exact expected_agent_id for a targeted stop." : "This orphan has no agentId that can be safely rebound and globally blocks new delegation. Confirm that it stopped in the Cursor UI, then explicitly release it with cursor_task_control(action=abandon).";
+        view.attention = job.agentId ? job.execution === "parallel_agent" ? "Use cursor_task_control(action=reap) to recheck the original agentId. Use cancel when a stop is needed, and abandon only after manual confirmation while accepting residual write risk." : "FIFO is bound to an agentId. Use reap to collect or resume monitoring; use cancel with the exact expected_agent_id to stop running work." : "This orphan has no agentId that can be safely rebound and globally blocks new delegation. Confirm that it stopped in the Cursor UI, then explicitly release it with cursor_task_control(action=abandon).";
       }
     }
     return view;
@@ -26696,16 +26953,26 @@ function buildSearchInputSchema() {
   return {
     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." }
+      query: { type: "string", description: "Describe the behavior, concept, symbol relationship, or ownership boundary to locate. State intent instead of guessing a directory." },
+      request_context: REQUEST_CONTEXT_SCHEMA
     },
     required: ["query"]
   };
 }
+var REQUEST_CONTEXT_SCHEMA = {
+  type: "object",
+  additionalProperties: false,
+  description: "Caller-declared provenance for this request only, not authentication or authorization. Missing values remain unknown; never infer them from the chosen model. Separate user requirements and model additions in mixed task text.",
+  properties: {
+    sender: { type: "string", enum: ["user", "model", "unknown"], description: "Who directly sends this Bridge request. AI callers should declare model, even when acting on a user request." },
+    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." }
+  }
+};
 function buildToolDefinitions(bridgeInstance) {
   return [
     {
       name: "cursor_init",
-      description: "Initialize or reinitialize CCE for one local workspace. Give only the project path: Bridge saves it, finds Cursor, ensures the required connection, and opens or verifies the matching project. If Cursor was opened too early without CCE access, initialization safely keeps the binding and tells the user to save, close Cursor once, and repeat the same initialization sentence; it never force-closes Cursor. Cursor login and the user's old/new UI preference are preserved. When both UIs are open, Bridge selects the new Agents Window and creates work in the matching repository instead of Home.",
+      description: "Initialize or reinitialize CCE for one local workspace. Give only the project path: Bridge saves it, finds Cursor, ensures the required connection, and opens or verifies the matching project. In Agents Window, initialization registers a missing local workspace through Cursor's project service and verifies its exact path before reporting ready. If Cursor was opened too early without CCE access, initialization safely keeps the binding and tells the user to save, close Cursor once, and repeat the same initialization sentence; it never force-closes Cursor. Cursor login and the user's old/new UI preference are preserved. When both UIs are open, Bridge selects the new Agents Window and creates work in the matching repository instead of Home.",
       inputSchema: {
         type: "object",
         properties: {
@@ -26726,10 +26993,11 @@ 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." },
+          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." },
           read_only: { type: "boolean", default: false, description: "Set true when Cursor must not change the workspace." },
-          timeout_ms: { type: "integer", minimum: 3e4, maximum: 9e5, default: 6e5, description: "One monitoring budget after submission, shared by FIFO and automatic Agent recovery. Expiry needs attention; it does not cancel work. Explicit reap may start a new budget. The default is 10 minutes." },
+          timeout_ms: { type: "integer", minimum: 3e4, maximum: 9e5, default: 6e5, description: "One monitoring budget after submission, shared by FIFO and automatic Agent recovery. Default 10 minutes, maximum 15 minutes; task status reports requested and effective budgets. Expiry probes the bound Agent once for completion; it does not cancel or resend work. Explicit reap may start a new budget for a still-running bound Agent, including FIFO." },
           allowed_paths: { type: "array", items: { type: "string" }, description: "Workspace-relative paths Cursor may write. Parallel write tasks require non-overlapping paths. This declaration is not a filesystem sandbox." },
           completion_contract: { type: "string", description: "Optional acceptance checks or a required final-report format." },
           session_mode: { type: "string", enum: [...CURSOR_SESSION_MODES], default: "isolated", description: "isolated preserves the current clean-task behavior. create starts an update-safe persistent session. continue sends one new turn to the exact session_id." },
@@ -26855,11 +27123,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 || ""));
+      const result = await bridge.contextEngine(String(args && args.query || ""), { requestContext: args && args.request_context });
       return { content: [{ type: "text", text: String(result) }] };
     }
     if (name === "cursor_do") {
       const result = await bridge.doTask(String(args && args.prompt || ""), {
+        requestContext: args && args.request_context,
         background: !args || args.background !== false,
         execution: args && args.execution,
         readOnly: !!(args && args.read_only),
@@ -27002,8 +27271,10 @@ export {
   exprClickBoundComposerStop,
   exprClickSelectedAgentStop,
   exprCreateAgentForWorkspace,
+  exprInspectAgentWorkspace,
   exprInspectWorkspaceRepository,
   exprOpenAgent,
+  exprRegisterAgentsWorkspace,
   isConfirmedCompletedReply,
   isCursorEffortOptionText,
   isDurablyRegisteredParallelEntry,
@@ -27017,6 +27288,7 @@ export {
   normalizeCursorRuntimeMode,
   normalizeDelegationMode,
   normalizeModelPickerText,
+  normalizeRequestContext,
   pathsOverlap,
   promoteAgentsWorkspaceLifecycle,
   providerErrorSignature,

package/extensions/index.ts

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

package/package.json

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

package/skills/cce-routing/SKILL.md

@@ -41,7 +41,7 @@ Call `cursor_context_engine` once with the question's real intent. Include a kno
 - Describe the relationship or behavior to establish and the evidence needed.
 - Preserve the language of the user's current substantive request unless the user explicitly asks for another language. Do not infer or persist a different language from the operating system when the conversation already provides a clear signal.
 - Do not prescribe Cursor's internal search sequence, harness, Explore usage, or number of files.
-- Do not invent hidden parameters; the public input is only `query`.
+- Keep investigation intent in `query`. Use the optional `request_context` only to declare provenance: AI callers use `sender="model"`; `source` is `user`, `model`, `mixed`, or `unknown`. A retrieval question you inferred is model-authored even when it serves a user goal. Separate user requirements and your additions when using `mixed`; never guess missing provenance.
 - Allow a cold or large workspace enough time to complete its serialized Cursor UI turn.
 
 ## Verify and continue

package/skills/cursor-delegate/SKILL.md

@@ -7,6 +7,8 @@ description: "Delegate bounded light-to-medium implementation, investigation, do
 
 Use Cursor as an execution partner. Keep direction, scope decisions, risk ownership, result review, and final verification with the primary agent.
 
+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.
+
 ## 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.

package/skills/cursor-delegate/references/delegation-contract.md

@@ -16,6 +16,7 @@ Provide every task independently:
 | Field | Requirement |
 |---|---|
 | `prompt` | State one objective, the necessary context, prohibited actions, and the expected report. Use the current user-task language unless the user explicitly requests another language. Do not ask Cursor to repeat the primary agent's scope decision. |
+| `request_context` | Declare `sender` (`user/model/unknown`) and instruction `source` (`user/model/mixed/unknown`) for this turn. AI callers use sender=model. Label user-confirmed requirements and model additions separately for mixed prompts. Omitted fields remain unknown; these declarations never authorize work. |
 | `execution` | Use only `fifo` or `parallel_agent`. Use `fifo` when safe parallelism cannot be demonstrated. |
 | `read_only` | Use `true` for lookup and analysis; use `false` for any file modification. |
 | `allowed_paths` | Required when `read_only=false`. Provide the smallest workspace-relative path set, with no glob, absolute path, or workspace-escaping `..`. Omit it when `read_only=true`. This is not a filesystem sandbox. |
@@ -40,6 +41,7 @@ Parallel read-only task:
 ```json
 {
   "prompt": "Read the specified files and return conclusions without modifying any file.",
+  "request_context": { "sender": "model", "source": "model" },
   "execution": "parallel_agent",
   "read_only": true,
   "background": true,
@@ -52,6 +54,7 @@ Bounded write task:
 ```json
 {
   "prompt": "Implement the specified tool script under the fixed design without expanding scope.",
+  "request_context": { "sender": "model", "source": "model" },
   "execution": "parallel_agent",
   "read_only": false,
   "background": true,