ocx-cursor 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocx-cursor",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Use OpenCodex models in Cursor through an authenticated HTTPS gateway",
   "keywords": [
     "opencodex",

package/src/catalog.mjs

@@ -39,7 +39,7 @@ export function aliasFor(sourceId) {
 
 export function inferredEfforts(sourceId) {
   const modelId = sourceId.split("/").at(-1);
-  if (/^claude-(?:fable-5|sonnet-5|opus-(?:5|4-[78]))$/.test(modelId)) return [...allowedEfforts];
+  if (/^claude-(?:fable-5(?:-1)?|sonnet-5|opus-(?:5|4-[78]))$/.test(modelId)) return [...allowedEfforts];
   if (/^claude-(?:opus-4-6|sonnet-4-6)$/.test(modelId)) return ["low", "medium", "high", "max"];
   if (/^gpt-5\.6-(?:luna|sol|terra)$/.test(modelId)) return [...allowedEfforts];
   if (/^gpt-5\.[45](?:$|-)/.test(modelId)) return ["low", "medium", "high", "xhigh"];

package/src/cursor-patch.mjs

@@ -16,12 +16,21 @@ export const cursorPatchMarker = "/*ocx-cursor-model-metadata-v6*/";
 export const legacyCursorPatchMarker = "/*ocx-cursor-model-metadata*/";
 export const cursorByokRoutingPatchMarker = "/*ocx-cursor-byok-model-routing-v1*/";
 export const cursorSubagentModelsPatchMarker = "/*ocx-cursor-subagent-models-v1*/";
-export const cursorSubagentCredentialsPatchMarker = "/*ocx-cursor-subagent-credentials-v1*/";
-export const cursorSubagentLegacyDetailsPatchMarker = "/*ocx-cursor-subagent-legacy-details-v1*/";
+export const cursorSubagentCredentialsPatchMarker = "/*ocx-cursor-subagent-credentials-v2*/";
+export const legacyCursorSubagentCredentialsPatchMarker = "/*ocx-cursor-subagent-credentials-v1*/";
+export const cursorSubagentLegacyDetailsPatchMarker = "/*ocx-cursor-subagent-legacy-details-v2*/";
+export const legacyCursorSubagentLegacyDetailsPatchMarker = "/*ocx-cursor-subagent-legacy-details-v1*/";
 export const cursorSubagentPromptRoutingPatchMarker = "/*ocx-cursor-subagent-prompt-routing-v3*/";
-export const cursorSubagentExecutionRoutingPatchMarker = "/*ocx-cursor-subagent-execution-routing-v5*/";
+export const cursorSubagentExecutionRoutingPatchMarker = "/*ocx-cursor-subagent-execution-routing-v6*/";
 export const cursorSubagentRunRoutingPatchMarker = "/*ocx-cursor-subagent-run-routing-v1*/";
 export const cursorSubagentRuntimeCredentialsPatchMarker = "/*ocx-cursor-subagent-runtime-credentials-v1*/";
+export const cursorSubagentModelDisplayPatchMarker = "/*ocx-cursor-subagent-model-display-v2*/";
+export const legacyCursorSubagentModelDisplayPatchMarker = "/*ocx-cursor-subagent-model-display-v1*/";
+export const cursorSubagentTaskArgsDisplayPatchMarker = "/*ocx-cursor-subagent-task-args-display-v5*/";
+export const legacyCursorSubagentTaskArgsDisplayV4PatchMarker = "/*ocx-cursor-subagent-task-args-display-v4*/";
+export const legacyCursorSubagentTaskArgsDisplayV3PatchMarker = "/*ocx-cursor-subagent-task-args-display-v3*/";
+export const legacyCursorSubagentTaskArgsDisplayV2PatchMarker = "/*ocx-cursor-subagent-task-args-display-v2*/";
+export const legacyCursorSubagentTaskArgsDisplayPatchMarker = "/*ocx-cursor-subagent-task-args-display-v1*/";
 export const cursorRoutedSubagentTypesPatchMarker = "/*ocx-cursor-hide-routed-subagent-types-v1*/";
 export const cursorLocalModeDisabled = "localMode:!1";
 export const cursorLocalModeEnabled = "localMode:!0";
@@ -39,22 +48,34 @@ const previousCatalogInjection = /\/\*ocx-cursor-model-metadata(?:-v[2-5])?\*\/(
 const byokModelRouting = /function (?<functionName>[A-Za-z_$][\w$]*)\((?<model>[A-Za-z_$][\w$]*),(?<settings>[A-Za-z_$][\w$]*)\)\{return (?<isClaude>[A-Za-z_$][\w$]*)\(\k<model>\)\?\k<settings>\.useClaudeKey\?"anthropic":void 0:(?<isGemini>[A-Za-z_$][\w$]*)\(\k<model>\)\?\k<settings>\.useGoogleKey\?"google":void 0:\k<settings>\.useOpenAIKey\?"openai":void 0\}/g;
 const explicitSubagentModelFilter = /function (?<functionName>[A-Za-z_$][\w$]*)\((?<model>[A-Za-z_$][\w$]*),(?<isUserAdded>[A-Za-z_$][\w$]*),(?<storage>[A-Za-z_$][\w$]*)\)\{return \k<isUserAdded>===!0\?!0:(?<hasProviderOverride>[A-Za-z_$][\w$]*)\(\k<storage>\)\|\|(?<usesByok>[A-Za-z_$][\w$]*)\(\k<model>,\k<storage>\)\}(?=function [A-Za-z_$][\w$]*\([A-Za-z_$][\w$]*\)\{const\{modelDetails:)/g;
 const explicitSubagentModelSelection = /function (?<functionName>[A-Za-z_$][\w$]*)\((?<input>[A-Za-z_$][\w$]*)\)\{const\{modelDetails:(?<modelDetails>[A-Za-z_$][\w$]*),flagEnabled:(?<flagEnabled>[A-Za-z_$][\w$]*),availableModels:(?<availableModels>[A-Za-z_$][\w$]*),storage:(?<storage>[A-Za-z_$][\w$]*),resolveModelParametersForSubmission:(?<resolveParameters>[A-Za-z_$][\w$]*)\}=\k<input>,(?<maxMode>[A-Za-z_$][\w$]*)=\k<modelDetails>\.maxMode===!0;/g;
+const explicitSubagentByokGuard = /if\((?<hasByok>[A-Za-z_$][\w$]*)\((?<modelDetails>[A-Za-z_$][\w$]*)\)\|\|!\((?<flagEnabled>[A-Za-z_$][\w$]*)\|\|(?<maxMode>[A-Za-z_$][\w$]*)\)\)return\{\};/g;
 const explicitSubagentRequestedModel = /new (?<requestedModelType>[A-Za-z_$][\w$]*)\(\{modelId:(?<model>[A-Za-z_$][\w$]*)\.name,maxMode:(?<maxMode>[A-Za-z_$][\w$]*),parameters:(?<parameters>[A-Za-z_$][\w$]*)\.map\((?<parameter>[A-Za-z_$][\w$]*)=>new (?<parameterType>[A-Za-z_$][\w$]*)\(\{id:\k<parameter>\.id,value:\k<parameter>\.value\}\)\)\}\)(?=\}\)\}\})/g;
 const explicitSubagentSelectionCall = /getSelectedSubagentModelSelections\((?<modelDetails>[A-Za-z_$][\w$]*)\)\{return (?<selector>[A-Za-z_$][\w$]*)\(\{modelDetails:\k<modelDetails>,flagEnabled:(?<featureGate>[\s\S]*?),availableModels:this\.modelConfigService\.getAvailableDefaultModels\(\),storage:this\.reactiveStorageService\.applicationUserPersistentStorage,resolveModelParametersForSubmission:\((?<model>[A-Za-z_$][\w$]*),(?<maxMode>[A-Za-z_$][\w$]*)\)=>this\.modelConfigService\.resolveModelParametersForSubmission\(\k<model>,void 0,\k<maxMode>\)\}\)\}/g;
 const agentModelDetailsType = /(?<type>[A-Za-z_$][\w$]*)=[A-Za-z_$][\w$]*\.makeMessageType\("agent\.v1\.ModelDetails"/g;
 const selectedSubagentLegacyDetails = /selectedSubagentModelDetails:(?<options>[A-Za-z_$][\w$]*)\.selectedSubagentModelsLegacy/g;
+const legacySelectedSubagentDetailsInjection = /selectedSubagentModelDetails:\/\*ocx-cursor-subagent-legacy-details-v1\*\/(?<options>[A-Za-z_$][\w$]*)\.selectedSubagentModelsLegacy\?\.length\?[\s\S]*?credentials:ocxCursorModel\.credentials\}\)\)/g;
 const agentCustomSystemPrompt = /customSystemPrompt:(?<options>[A-Za-z_$][\w$]*)\.customSystemPrompt(?=,harness:)/g;
 const agentRequestAction = /(?<prefix>conversationState:[A-Za-z_$][\w$]*\([A-Za-z_$][\w$]*\),action:)(?<action>[A-Za-z_$][\w$]*)(?=,modelDetails:)/g;
 const legacySubagentPromptRouting = /customSystemPrompt:\(\(\)=>\{\/\*ocx-cursor-subagent-prompt-routing-v1\*\/const ocxCursorModelIds=\((?<options>[A-Za-z_$][\w$]*)\.selectedSubagentModels[\s\S]*?\}\)\(\)(?=,harness:)/g;
 const legacySubagentRequestRouting = /(?<prefix>conversationState:[A-Za-z_$][\w$]*\([A-Za-z_$][\w$]*\),action:)\(\(\)=>\{\/\*ocx-cursor-subagent-prompt-routing-v2\*\/[\s\S]*?return (?<action>[A-Za-z_$][\w$]*)\}\)\(\)(?=,modelDetails:)/g;
 const createOrResumeSubagentStart = /async createOrResumeSubagent\((?<input>[A-Za-z_$][\w$]*)\)\{/g;
 const legacySubagentExecutionRouting = /(?<start>async createOrResumeSubagent\((?<input>[A-Za-z_$][\w$]*)\)\{)\/\*ocx-cursor-subagent-execution-routing-v[1-4]\*\/[\s\S]*?(?=let [A-Za-z_$][\w$]*,[A-Za-z_$][\w$]*=\k<input>\.resumeAgentId;)/g;
+const currentSubagentExecutionRouting = /(?<start>async createOrResumeSubagent\((?<input>[A-Za-z_$][\w$]*)\)\{)\/\*ocx-cursor-subagent-execution-routing-v5\*\/[\s\S]*?(?=const [A-Za-z_$][\w$]*=\{mode:)/g;
+const subagentSpawnMethod = /(?<start>async _createOrResumeSubagentSpawn\((?<input>[A-Za-z_$][\w$]*),[A-Za-z_$][\w$]*\)\{)(?<body>[\s\S]*?)(?=async runSubagentWithHandle\()/g;
 const legacySubagentModelConfigFixup = /(?<fixup>[A-Za-z_$][\w$]*)=ocxCursorRequestedModel\?void 0:typeof this\._modelConfigService\.fixupModelConfigForCurrentFlag=="function"\?this\._modelConfigService\.fixupModelConfigForCurrentFlag\(\{modelName:(?<input>[A-Za-z_$][\w$]*)\.modelId,maxMode:(?<composerConfig>[A-Za-z_$][\w$]*)\.maxMode===!0\}\):void 0/g;
 const subagentModelConfigFixup = /(?<fixup>[A-Za-z_$][\w$]*)=typeof this\._modelConfigService\.fixupModelConfigForCurrentFlag=="function"\?this\._modelConfigService\.fixupModelConfigForCurrentFlag\(\{modelName:(?<input>[A-Za-z_$][\w$]*)\.modelId,maxMode:(?<composerConfig>[A-Za-z_$][\w$]*)\.maxMode===!0\}\):void 0/g;
 const appendSubagentComposer = /(?<declaration>const (?<result>[A-Za-z_$][\w$]*)=await this\._composerDataService\.appendSubComposer\((?<composer>[A-Za-z_$][\w$]*)\))/g;
 const runSubagentWithHandle = /async runSubagentWithHandle\((?<input>[A-Za-z_$][\w$]*),(?<handle>[A-Za-z_$][\w$]*)\)\{return this\._runSubagent\(\k<input>,\k<handle>\)\}/g;
 const runSubagentModelConfigFixup = /(?<fixed>[A-Za-z_$][\w$]*)=\(typeof this\._modelConfigService\.fixupModelConfigForCurrentFlag=="function"\?this\._modelConfigService\.fixupModelConfigForCurrentFlag\(\{modelName:(?<resolved>[A-Za-z_$][\w$]*),maxMode:(?<maxMode>[A-Za-z_$][\w$]*)\}\):void 0\)\?\.selectedModels\?\?\[\],(?<stored>[A-Za-z_$][\w$]*)=(?<config>[A-Za-z_$][\w$]*)\?\.selectedModels\?\?\[\]/g;
 const requestedModelCredentials = /(?<prefix>new [A-Za-z_$][\w$]*\(\{modelId:(?<model>[A-Za-z_$][\w$]*),maxMode:(?<details>[A-Za-z_$][\w$]*)\.maxMode,parameters:[\s\S]*?,credentials:)this\.convertModelDetailsToCredentials\(\k<details>\)(?<suffix>\}\))(?=\}convertModelDetailsToCredentials)/g;
+const subagentModelDisplaySelection = /function (?<functionName>[A-Za-z_$][\w$]*)\((?<input>[A-Za-z_$][\w$]*)\)\{return \k<input>\.resumeTargetComposerId!==void 0\?\k<input>\.subagentModelName:\k<input>\.bestOfNModelName!==void 0\?\k<input>\.bestOfNModelName:\k<input>\.taskParamModelName\?\?\k<input>\.subagentModelName\}/g;
+const legacySubagentModelDisplaySelection = /function (?<functionName>[A-Za-z_$][\w$]*)\((?<input>[A-Za-z_$][\w$]*)\)\{\/\*ocx-cursor-subagent-model-display-v1\*\/return \k<input>\.subagentModelName\?\.startsWith\("opencodex\/"\)\?\k<input>\.subagentModelName:\k<input>\.resumeTargetComposerId!==void 0\?\k<input>\.subagentModelName:\k<input>\.bestOfNModelName!==void 0\?\k<input>\.bestOfNModelName:\k<input>\.taskParamModelName\?\?\k<input>\.subagentModelName\}/g;
+const subagentTaskArgsContext = /(?<args>[A-Za-z_$][\w$]*)=(?<argsExtractor>[A-Za-z_$][\w$]*)\((?<bubble>[A-Za-z_$][\w$]*)\),(?<resume>[A-Za-z_$][\w$]*)=(?<resumeExtractor>[A-Za-z_$][\w$]*)\(\k<args>\),[\s\S]{0,400}?(?<taskModel>[A-Za-z_$][\w$]*)=\k<resume>===void 0\?\k<bubble>\.params\?\.model:void 0/g;
+const directSubagentTaskArgsContext = /subagentTypeName:(?<bubble>[A-Za-z_$][\w$]*)\.params\?\.name[\s\S]{0,2500}?taskParamModelName:(?<taskModel>[A-Za-z_$][\w$]*)\}\);return/g;
+const legacySubagentTaskArgsDisplayV4 = /taskParamModelName:\/\*ocx-cursor-subagent-task-args-display-v4\*\/\(\(\)=>\{[\s\S]*?\}\)\(\)/g;
+const legacySubagentTaskArgsDisplayV3 = /taskParamModelName:\/\*ocx-cursor-subagent-task-args-display-v3\*\/\(\(\)=>\{[\s\S]*?return ocxCursorTaskModel\}\)\(\)/g;
+const legacySubagentTaskArgsDisplayV2 = /taskParamModelName:\/\*ocx-cursor-subagent-task-args-display-v2\*\/\(\(\)=>\{[\s\S]*?return ocxCursorTaskModel\}\)\(\)/g;
+const legacySubagentTaskArgsDisplay = /taskParamModelName:\/\*ocx-cursor-subagent-task-args-display-v1\*\/(?<taskModel>[A-Za-z_$][\w$]*)\?\?(?<args>[A-Za-z_$][\w$]*)\?\.model/g;
 const rawSubagentLoad = /(?<raw>[A-Za-z_$][\w$]*)=this\.subagentsService\.peekRawSubagents\(\)/g;
 const localModelConstructor = /function (?<functionName>[A-Za-z_$][\w$]*)\(e,t\)\{return new (?<modelType>[A-Za-z_$][\w$]*\.[A-Za-z_$][\w$]*)\(\{modelId:e,displayModelId:e,displayName:null!=t\?t:e,displayNameShort:null!=t\?t:e,aliases:\[\]\}\)\}/g;
 const localRuntimeVisionCapability = /"boolean"==typeof (?<object>[A-Za-z_$][\w$]*)\.supports_vision\?\{supports_vision:\k<object>\.supports_vision\}:\{\}\)/g;
@@ -67,16 +88,45 @@ const directoryPatchQueues = new Map();
 
 export function clearCursorAppQuarantine(options = {}) {
   const execute = options.execFileSync || execFileSync;
-  execute("/usr/bin/xattr", ["-dr", "com.apple.quarantine", options.appPath || cursorAppPath], {
-    stdio: "ignore",
-  });
+  const appPath = options.appPath || cursorAppPath;
+  try {
+    execute("/usr/bin/xattr", ["-dr", "com.apple.quarantine", appPath], {
+      stdio: "ignore",
+    });
+  } catch (error) {
+    // Read-only nested app directories can make recursive xattr traversal fail
+    // even after the bundle root has no quarantine attribute. List root
+    // attributes so probe failures and a real remaining quarantine are never
+    // hidden.
+    try {
+      const rootAttributes = execute("/usr/bin/xattr", [appPath], {
+        encoding: "utf8",
+      });
+      const hasRootQuarantine = String(rootAttributes)
+        .split(/\r?\n/)
+        .some((attribute) => attribute.trim() === "com.apple.quarantine");
+      if (!hasRootQuarantine) return;
+    } catch {
+      // Fail closed when the root probe itself cannot be completed.
+    }
+    throw error;
+  }
 }
 
 export function finalizeCursorAppPatch(options = {}) {
   const execute = options.execFileSync || execFileSync;
   const appPath = options.appPath || cursorAppPath;
+  const verifyArgs = ["--verify", "--deep", "--strict", appPath];
+  let signatureIsValid = false;
+  try {
+    execute("/usr/bin/codesign", verifyArgs, { stdio: "ignore" });
+    signatureIsValid = true;
+  } catch {
+    // A rewritten bundle invalidates Cursor's signature and needs a fresh ad-hoc signature.
+  }
+  if (signatureIsValid) return;
   execute("/usr/bin/codesign", ["--force", "--sign", "-", appPath], { stdio: "ignore" });
-  execute("/usr/bin/codesign", ["--verify", "--deep", "--strict", appPath], { stdio: "ignore" });
+  execute("/usr/bin/codesign", verifyArgs, { stdio: "ignore" });
   clearCursorAppQuarantine({ ...options, appPath, execFileSync: execute });
 }
 
@@ -158,6 +208,14 @@ export function patchCursorExplicitSubagentModelsSource(source) {
 
 export function patchCursorSubagentCredentialsSource(source) {
   if (source.includes(cursorSubagentCredentialsPatchMarker)) return { status: "already-patched", source };
+  if (source.includes(legacyCursorSubagentCredentialsPatchMarker)) {
+    let upgraded = source.replace(legacyCursorSubagentCredentialsPatchMarker, cursorSubagentCredentialsPatchMarker);
+    upgraded = replaceSingleMatch(upgraded, explicitSubagentByokGuard, (match) => {
+      const { hasByok, modelDetails, flagEnabled, maxMode } = match.groups;
+      return `if(${hasByok}(${modelDetails})&&!${modelDetails}.modelName?.startsWith("opencodex/")||!(${flagEnabled}||${maxMode}))return{};`;
+    }, "explicit subagent BYOK guard");
+    return { status: "patched", source: upgraded };
+  }
   let patched = replaceSingleMatch(source, explicitSubagentModelSelection, (match) => {
     const { functionName, input, modelDetails, flagEnabled, availableModels, storage, resolveParameters, maxMode } = match.groups;
     return `function ${functionName}(${input}){${cursorSubagentCredentialsPatchMarker}const{modelDetails:${modelDetails},flagEnabled:${flagEnabled},availableModels:${availableModels},storage:${storage},resolveModelParametersForSubmission:${resolveParameters},resolveCredentialsForSubmission:ocxCursorResolveCredentials}=${input},${maxMode}=${modelDetails}.maxMode===!0;`;
@@ -170,19 +228,29 @@ export function patchCursorSubagentCredentialsSource(source) {
     const { modelDetails, selector, featureGate, model, maxMode } = match.groups;
     return `getSelectedSubagentModelSelections(${modelDetails}){return ${selector}({modelDetails:${modelDetails},flagEnabled:${featureGate},availableModels:this.modelConfigService.getAvailableDefaultModels(),storage:this.reactiveStorageService.applicationUserPersistentStorage,resolveModelParametersForSubmission:(${model},${maxMode})=>this.modelConfigService.resolveModelParametersForSubmission(${model},void 0,${maxMode}),resolveCredentialsForSubmission:ocxCursorModel=>ocxCursorModel.startsWith("opencodex/")?this.convertModelDetailsToCredentials({apiKey:this.cursorAuthenticationService.openAIKey()??void 0,openaiApiBaseUrl:this.reactiveStorageService.applicationUserPersistentStorage.openAIBaseUrl}):void 0})}`;
   }, "explicit subagent selection caller");
+  patched = replaceSingleMatch(patched, explicitSubagentByokGuard, (match) => {
+    const { hasByok, modelDetails, flagEnabled, maxMode } = match.groups;
+    return `if(${hasByok}(${modelDetails})&&!${modelDetails}.modelName?.startsWith("opencodex/")||!(${flagEnabled}||${maxMode}))return{};`;
+  }, "explicit subagent BYOK guard");
   return { status: "patched", source: patched };
 }
 
 export function patchCursorSubagentLegacyDetailsSource(source) {
   if (source.includes(cursorSubagentLegacyDetailsPatchMarker)) return { status: "already-patched", source };
-  const modelDetailsMatches = [...source.matchAll(agentModelDetailsType)];
+  let restored = source;
+  if (restored.includes(legacyCursorSubagentLegacyDetailsPatchMarker)) {
+    restored = replaceSingleMatch(restored, legacySelectedSubagentDetailsInjection, (match) => {
+      return `selectedSubagentModelDetails:${match.groups.options}.selectedSubagentModelsLegacy`;
+    }, "legacy explicit subagent model details");
+  }
+  const modelDetailsMatches = [...restored.matchAll(agentModelDetailsType)];
   if (modelDetailsMatches.length !== 1) {
     throw new Error(`Expected one Cursor agent model details type, found ${modelDetailsMatches.length}`);
   }
   const modelDetailsType = modelDetailsMatches[0].groups.type;
-  const patched = replaceSingleMatch(source, selectedSubagentLegacyDetails, (match) => {
+  const patched = replaceSingleMatch(restored, selectedSubagentLegacyDetails, (match) => {
     const { options } = match.groups;
-    return `selectedSubagentModelDetails:${cursorSubagentLegacyDetailsPatchMarker}${options}.selectedSubagentModelsLegacy?.length?${options}.selectedSubagentModelsLegacy:${options}.selectedSubagentModels?.filter(ocxCursorModel=>ocxCursorModel.modelId.startsWith("opencodex/")).map(ocxCursorModel=>new ${modelDetailsType}({modelId:ocxCursorModel.modelId,displayModelId:ocxCursorModel.modelId,displayName:ocxCursorModel.modelId,displayNameShort:ocxCursorModel.modelId,aliases:[],maxMode:ocxCursorModel.maxMode,credentials:ocxCursorModel.credentials}))`;
+    return `selectedSubagentModelDetails:${cursorSubagentLegacyDetailsPatchMarker}[...(${options}.selectedSubagentModelsLegacy??[]),...(${options}.selectedSubagentModels??[]).filter(ocxCursorModel=>ocxCursorModel.modelId.startsWith("opencodex/")&&!(${options}.selectedSubagentModelsLegacy??[]).some(ocxCursorLegacyModel=>ocxCursorLegacyModel.modelId===ocxCursorModel.modelId)).map(ocxCursorModel=>new ${modelDetailsType}({modelId:ocxCursorModel.modelId,displayModelId:ocxCursorModel.modelId,displayName:ocxCursorModel.modelId,displayNameShort:ocxCursorModel.modelId,aliases:[],maxMode:ocxCursorModel.maxMode,credentials:ocxCursorModel.credentials}))]`;
   }, "legacy explicit subagent model details");
   return { status: "patched", source: patched };
 }
@@ -215,11 +283,34 @@ export function patchCursorSubagentPromptRoutingSource(source) {
 export function patchCursorSubagentExecutionRoutingSource(source) {
   if (source.includes(cursorSubagentExecutionRoutingPatchMarker)) return { status: "already-patched", source };
   let restored = source;
+  let restoredLegacySpawn = false;
+  if (restored.includes("/*ocx-cursor-subagent-execution-routing-v5*/")) {
+    restored = replaceSingleMatch(restored, currentSubagentExecutionRouting, (match) => match.groups.start, "current subagent execution routing");
+    const spawnMatches = [...restored.matchAll(subagentSpawnMethod)];
+    if (spawnMatches.length === 1) {
+      const { start, input, body } = spawnMatches[0].groups;
+      const routedBody = body
+        .replaceAll("ocxCursorRequestedModel?void 0:", `${input}.modelId?.startsWith("opencodex/")?void 0:`)
+        .replaceAll("ocxCursorRequestedModel&&", `${input}.modelId?.startsWith("opencodex/")&&`)
+        .replaceAll("modelName:ocxCursorRequestedModel", `modelName:${input}.modelId`)
+        .replaceAll("modelId:ocxCursorRequestedModel", `modelId:${input}.modelId`);
+      if (routedBody !== body) {
+        restored = replaceSingleMatch(restored, subagentSpawnMethod, `${start}${routedBody}`, "current subagent spawn routing");
+        restoredLegacySpawn = true;
+      }
+    }
+  }
   if (restored.includes("/*ocx-cursor-subagent-execution-routing-v4*/")) {
-    restored = replaceSingleMatch(restored, legacySubagentModelConfigFixup, (match) => {
-      const { fixup, input, composerConfig } = match.groups;
-      return `${fixup}=typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
-    }, "legacy subagent model config fixup");
+    const legacyFixups = [...restored.matchAll(legacySubagentModelConfigFixup)];
+    if (legacyFixups.length > 1) {
+      throw new Error(`Expected at most one Cursor legacy subagent model config fixup, found ${legacyFixups.length}`);
+    }
+    if (legacyFixups.length === 1) {
+      restored = replaceSingleMatch(restored, legacySubagentModelConfigFixup, (match) => {
+        const { fixup, input, composerConfig } = match.groups;
+        return `${fixup}=typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
+      }, "legacy subagent model config fixup");
+    }
   }
   if (restored.includes("/*ocx-cursor-subagent-execution-routing-v1*/") || restored.includes("/*ocx-cursor-subagent-execution-routing-v2*/") || restored.includes("/*ocx-cursor-subagent-execution-routing-v3*/") || restored.includes("/*ocx-cursor-subagent-execution-routing-v4*/")) {
     restored = replaceSingleMatch(restored, legacySubagentExecutionRouting, (match) => match.groups.start, "legacy subagent execution routing");
@@ -228,14 +319,28 @@ export function patchCursorSubagentExecutionRoutingSource(source) {
     const { input } = match.groups;
     return `${match[0]}${cursorSubagentExecutionRoutingPatchMarker}const ocxCursorModelMarker=typeof ${input}.prompt==="string"?/^\\s*<ocx-subagent-model>(opencodex\\/[A-Za-z0-9._\\/-]+)<\\/ocx-subagent-model>\\s*/.exec(${input}.prompt):null,ocxCursorRequestedModel=ocxCursorModelMarker?.[1];if(ocxCursorRequestedModel&&!${input}.resumeAgentId){const ocxCursorModelAvailable=this._modelConfigService.getAvailableDefaultModels().some(ocxCursorModel=>ocxCursorModel?.name===ocxCursorRequestedModel);if(!ocxCursorModelAvailable)throw new Error("OpenCodex subagent model is unavailable: "+ocxCursorRequestedModel);${input}={...${input},modelId:ocxCursorRequestedModel}}if(ocxCursorModelMarker)${input}={...${input},prompt:${input}.prompt.slice(ocxCursorModelMarker[0].length)};`;
   }, "subagent execution entrypoint");
-  patched = replaceSingleMatch(patched, subagentModelConfigFixup, (match) => {
-    const { fixup, input, composerConfig } = match.groups;
-    return `${fixup}=ocxCursorRequestedModel?void 0:typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
-  }, "subagent model config fixup");
-  patched = replaceSingleMatch(patched, appendSubagentComposer, (match) => {
-    const { declaration, composer } = match.groups;
-    return `ocxCursorRequestedModel&&(${composer}.modelConfig={modelName:ocxCursorRequestedModel,maxMode:${composer}.modelConfig?.maxMode===!0,selectedModels:[{modelId:ocxCursorRequestedModel,parameters:[]}]});${declaration}`;
-  }, "final subagent model config");
+  const configFixups = [...patched.matchAll(subagentModelConfigFixup)];
+  if (configFixups.length > 1) throw new Error(`Expected at most one Cursor subagent model config fixup, found ${configFixups.length}`);
+  const allowMissingConfigFixup = restoredLegacySpawn || source.includes("/*ocx-cursor-subagent-execution-routing-v4*/");
+  if (configFixups.length === 0 && !allowMissingConfigFixup) {
+    throw new Error("Expected one Cursor subagent model config fixup, found 0");
+  }
+  if (configFixups.length === 1) {
+    patched = replaceSingleMatch(patched, subagentModelConfigFixup, (match) => {
+      const { fixup, input, composerConfig } = match.groups;
+      // The execution entrypoint and the composer-spawn helper are separate
+      // methods in current Cursor builds. The requested model marker is scoped
+      // to createOrResumeSubagent, so derive routing from the already-normalized
+      // request model here instead of referencing that out-of-scope variable.
+      return `${fixup}=${input}.modelId?.startsWith("opencodex/")?void 0:typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${input}.modelId,maxMode:${composerConfig}.maxMode===!0}):void 0`;
+    }, "subagent model config fixup");
+  }
+  if (!restoredLegacySpawn) {
+    patched = replaceSingleMatch(patched, appendSubagentComposer, (match) => {
+      const { declaration, composer } = match.groups;
+      return `(${composer}.modelConfig?.modelName?.startsWith("opencodex/"))&&(${composer}.modelConfig={modelName:${composer}.modelConfig.modelName,maxMode:${composer}.modelConfig?.maxMode===!0,selectedModels:[{modelId:${composer}.modelConfig.modelName,parameters:[]}]});${declaration}`;
+    }, "final subagent model config");
+  }
   return { status: "patched", source: patched };
 }
 
@@ -261,6 +366,56 @@ export function patchCursorSubagentRuntimeCredentialsSource(source) {
   return { status: "patched", source: patched };
 }
 
+export function patchCursorSubagentModelDisplaySource(source) {
+  if (source.includes(cursorSubagentModelDisplayPatchMarker)) return { status: "already-patched", source };
+  let restored = source;
+  if (restored.includes(legacyCursorSubagentModelDisplayPatchMarker)) {
+    restored = replaceSingleMatch(restored, legacySubagentModelDisplaySelection, (match) => {
+      const { functionName, input } = match.groups;
+      return `function ${functionName}(${input}){return ${input}.resumeTargetComposerId!==void 0?${input}.subagentModelName:${input}.bestOfNModelName!==void 0?${input}.bestOfNModelName:${input}.taskParamModelName??${input}.subagentModelName}`;
+    }, "legacy subagent model display selector");
+  }
+  const patched = replaceSingleMatch(restored, subagentModelDisplaySelection, (match) => {
+    const { functionName, input } = match.groups;
+    return `function ${functionName}(${input}){${cursorSubagentModelDisplayPatchMarker}return ${input}.resumeTargetComposerId!==void 0?${input}.subagentModelName:${input}.bestOfNModelName!==void 0?${input}.bestOfNModelName:${input}.taskParamModelName?.startsWith("opencodex/")?${input}.taskParamModelName:${input}.taskParamModelName?.startsWith("composer-")&&${input}.subagentModelName?.startsWith("opencodex/")?${input}.subagentModelName:${input}.taskParamModelName??${input}.subagentModelName}`;
+  }, "subagent model display selector");
+  return { status: "patched", source: patched };
+}
+
+export function patchCursorSubagentTaskArgsDisplaySource(source) {
+  if (source.includes(cursorSubagentTaskArgsDisplayPatchMarker)) return { status: "already-patched", source };
+  const legacyContexts = [...source.matchAll(subagentTaskArgsContext)];
+  const contexts = legacyContexts.length > 0
+    ? legacyContexts
+    : [...source.matchAll(directSubagentTaskArgsContext)];
+  if (contexts.length !== 1) {
+    throw new Error(`Expected one Cursor subagent task args context, found ${contexts.length}`);
+  }
+  const { args, bubble, taskModel } = contexts[0].groups;
+  const prompt = args ? `${bubble}.params?.prompt??${args}?.prompt??""` : `${bubble}.params?.prompt??""`;
+  const fallback = args ? `${taskModel}??${args}?.model` : taskModel;
+  const replacement = `taskParamModelName:${cursorSubagentTaskArgsDisplayPatchMarker}/<ocx-subagent-model>(opencodex\\/[^<]+)<\\/ocx-subagent-model>/.exec(${prompt})?.[1]??${fallback}`;
+  if (source.includes(legacyCursorSubagentTaskArgsDisplayV4PatchMarker)) {
+    const upgraded = replaceSingleMatch(source, legacySubagentTaskArgsDisplayV4, replacement, "v4 subagent task args model display field");
+    return { status: "patched", source: upgraded };
+  }
+  if (source.includes(legacyCursorSubagentTaskArgsDisplayV3PatchMarker)) {
+    const upgraded = replaceSingleMatch(source, legacySubagentTaskArgsDisplayV3, replacement, "v3 subagent task args model display field");
+    return { status: "patched", source: upgraded };
+  }
+  if (source.includes(legacyCursorSubagentTaskArgsDisplayV2PatchMarker)) {
+    const upgraded = replaceSingleMatch(source, legacySubagentTaskArgsDisplayV2, replacement, "v2 subagent task args model display field");
+    return { status: "patched", source: upgraded };
+  }
+  if (source.includes(legacyCursorSubagentTaskArgsDisplayPatchMarker)) {
+    const upgraded = replaceSingleMatch(source, legacySubagentTaskArgsDisplay, replacement, "legacy subagent task args model display field");
+    return { status: "patched", source: upgraded };
+  }
+  const field = new RegExp(`taskParamModelName:${taskModel}(?=[},])`, "g");
+  const patched = replaceSingleMatch(source, field, replacement, "subagent task args model display field");
+  return { status: "patched", source: patched };
+}
+
 export function patchCursorRoutedSubagentTypesSource(source) {
   if (source.includes(cursorRoutedSubagentTypesPatchMarker)) return { status: "already-patched", source };
   const patched = replaceSingleMatch(source, rawSubagentLoad, (match) => {
@@ -280,9 +435,11 @@ export function patchCursorWorkbenchSource(source) {
   const executionRouting = patchCursorSubagentExecutionRoutingSource(promptRouting.source);
   const runRouting = patchCursorSubagentRunRoutingSource(executionRouting.source);
   const runtimeCredentials = patchCursorSubagentRuntimeCredentialsSource(runRouting.source);
-  const subagentTypes = patchCursorRoutedSubagentTypesSource(runtimeCredentials.source);
+  const modelDisplay = patchCursorSubagentModelDisplaySource(runtimeCredentials.source);
+  const taskArgsDisplay = patchCursorSubagentTaskArgsDisplaySource(modelDisplay.source);
+  const subagentTypes = patchCursorRoutedSubagentTypesSource(taskArgsDisplay.source);
   return {
-    status: metadata.status === "patched" || routing.status === "patched" || subagents.status === "patched" || credentials.status === "patched" || legacyDetails.status === "patched" || promptRouting.status === "patched" || executionRouting.status === "patched" || runRouting.status === "patched" || runtimeCredentials.status === "patched" || subagentTypes.status === "patched"
+    status: metadata.status === "patched" || routing.status === "patched" || subagents.status === "patched" || credentials.status === "patched" || legacyDetails.status === "patched" || promptRouting.status === "patched" || executionRouting.status === "patched" || runRouting.status === "patched" || runtimeCredentials.status === "patched" || modelDisplay.status === "patched" || taskArgsDisplay.status === "patched" || subagentTypes.status === "patched"
       ? "patched"
       : "already-patched",
     source: subagentTypes.source,

package/src/gateway.mjs

@@ -45,7 +45,169 @@ function disableStrictFunctionTools(tools) {
   }
 }
 
-export function rewriteModelAliasBody(body, catalog) {
+function normalizeCursorTool(tool) {
+  if (!isRecord(tool) || tool.type !== undefined || typeof tool.name !== "string" || !isRecord(tool.input_schema)) {
+    return tool;
+  }
+  const definition = {
+    name: tool.name,
+    ...(typeof tool.description === "string" ? { description: tool.description } : {}),
+    parameters: tool.input_schema,
+    ...(typeof tool.strict === "boolean" ? { strict: tool.strict } : {}),
+  };
+  return { type: "function", function: definition };
+}
+
+function normalizeToolChoice(choice) {
+  if (!isRecord(choice) || typeof choice.type !== "string") return choice;
+  if (choice.type === "auto") return "auto";
+  if (choice.type === "none") return "none";
+  if (choice.type === "any") return "required";
+  if (choice.type === "tool" && typeof choice.name === "string") {
+    return { type: "function", function: { name: choice.name } };
+  }
+  return choice;
+}
+
+function normalizeCursorTooling(payload) {
+  if (Array.isArray(payload.tools)) payload.tools = payload.tools.map(normalizeCursorTool);
+  if (payload.tool_choice !== undefined) payload.tool_choice = normalizeToolChoice(payload.tool_choice);
+}
+
+function toolResultText(value) {
+  if (typeof value === "string") return value;
+  if (Array.isArray(value)) return value.map(toolResultText).filter(Boolean).join("\n");
+  if (isRecord(value)) {
+    if (typeof value.text === "string") return value.text;
+    if (value.content !== undefined) return toolResultText(value.content);
+    try {
+      return JSON.stringify(value);
+    } catch {
+      return "";
+    }
+  }
+  return value === undefined || value === null ? "" : String(value);
+}
+
+function openAiToolCallFromCursorBlock(block) {
+  let args = "{}";
+  try {
+    args = JSON.stringify(block.input ?? {}) ?? "{}";
+  } catch {
+    // Keep the request valid if Cursor supplied a non-serializable input value.
+  }
+  return {
+    id: block.id,
+    type: "function",
+    function: {
+      name: block.name,
+      arguments: args,
+    },
+  };
+}
+
+export function normalizeCursorChatMessages(messages) {
+  if (!Array.isArray(messages)) return messages;
+  const normalized = [];
+  for (const message of messages) {
+    if (!isRecord(message) || !Array.isArray(message.content)) {
+      normalized.push(message);
+      continue;
+    }
+    if (message.role === "assistant") {
+      const allToolUses = message.content.filter((block) => isRecord(block) && block.type === "tool_use");
+      const toolUses = allToolUses.filter((block) => typeof block.id === "string" && block.id.length > 0 && typeof block.name === "string");
+      if (allToolUses.length > toolUses.length) {
+        normalized.push(message);
+        continue;
+      }
+      if (toolUses.length === 0) {
+        normalized.push(message);
+        continue;
+      }
+      const existingToolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : [];
+      const existingIds = new Set(existingToolCalls.map((call) => call?.id).filter((id) => typeof id === "string"));
+      const newToolUses = toolUses.filter((block) => !existingIds.has(block.id));
+      const content = message.content.filter((block) => !(isRecord(block) && block.type === "tool_use"));
+      normalized.push({
+        ...message,
+        content: content.length > 0 ? content : null,
+        tool_calls: [
+          ...existingToolCalls,
+          ...newToolUses.map((block) => openAiToolCallFromCursorBlock(block)),
+        ],
+      });
+      continue;
+    }
+    const toolResults = message.content.filter((block) => isRecord(block) && block.type === "tool_result");
+    if (message.role !== "user" || toolResults.length === 0) {
+      normalized.push(message);
+      continue;
+    }
+    if (toolResults.some((block) => typeof block.tool_use_id !== "string" || block.tool_use_id.length === 0)) {
+      normalized.push(message);
+      continue;
+    }
+    for (const block of toolResults) {
+      normalized.push({
+        role: "tool",
+        tool_call_id: block.tool_use_id,
+        content: toolResultText(block.content),
+      });
+    }
+    const remainingContent = message.content.filter((block) => !(isRecord(block) && block.type === "tool_result"));
+    if (remainingContent.length > 0) normalized.push({ ...message, content: remainingContent });
+  }
+  return normalized;
+}
+
+function enrichSubagentModelTools(tools, catalog) {
+  if (!Array.isArray(tools)) return;
+  const aliases = catalog.map(({ alias }) => alias).filter((alias) => alias.startsWith(managedPrefix));
+  if (aliases.length === 0) return;
+  const modelList = aliases.map((alias) => `- ${alias}`).join("\n");
+  const modelListPattern = /(If the user explicitly asks for the model of a subagent\/task,[\s\S]*?)(?=\n\nIf the user isn't asking)/;
+  for (const tool of tools) {
+    if (!isRecord(tool) || tool.type !== "function") continue;
+    const definition = isRecord(tool.function) ? tool.function : tool;
+    if (typeof definition.name !== "string" || !/^(subagent|task)$/i.test(definition.name)) continue;
+    if (typeof definition.description === "string" && modelListPattern.test(definition.description)) {
+      definition.description = definition.description.replace(modelListPattern, `$1\n${modelList}`);
+    }
+    const model = definition.parameters?.properties?.model;
+    if (!isRecord(model)) continue;
+    if (Array.isArray(model.enum)) {
+      model.enum = [...new Set([...model.enum, ...aliases])];
+    }
+    if (typeof model.description === "string") {
+      model.description += ` Available OpenCodex model slugs: ${aliases.join(", ")}.`;
+    }
+  }
+}
+
+function restoreRoutedSubagentModels(messages, catalog) {
+  if (!Array.isArray(messages)) return;
+  const aliases = new Set(catalog.map(({ alias }) => alias));
+  const restore = (text) => {
+    if (typeof text !== "string") return text;
+    const requested = [...text.matchAll(/<ocx-subagent-model>(opencodex\/[^<]+)<\/ocx-subagent-model>/g)]
+      .map((match) => match[1])
+      .find((alias) => aliases.has(alias));
+    return requested ? text.split("composer-2.5").join(requested) : text;
+  };
+  for (const message of messages) {
+    if (!isRecord(message)) continue;
+    if (typeof message.content === "string") {
+      message.content = restore(message.content);
+    } else if (Array.isArray(message.content)) {
+      for (const part of message.content) {
+        if (isRecord(part) && typeof part.text === "string") part.text = restore(part.text);
+      }
+    }
+  }
+}
+
+export function rewriteModelAliasBody(body, catalog, route = "POST /v1/chat/completions") {
   if (!body?.length) return body;
   let payload;
   try {
@@ -54,6 +216,12 @@ export function rewriteModelAliasBody(body, catalog) {
     return body;
   }
   if (!isRecord(payload) || typeof payload.model !== "string" || !payload.model.startsWith(managedPrefix)) return body;
+  restoreRoutedSubagentModels(payload.messages, catalog);
+  if (route === "POST /v1/chat/completions") {
+    payload.messages = normalizeCursorChatMessages(payload.messages);
+    normalizeCursorTooling(payload);
+    enrichSubagentModelTools(payload.tools, catalog);
+  }
 
   const variant = /^(opencodex\/.+?)\[([^\]]+)\]$/.exec(payload.model);
   let alias = variant?.[1] || payload.model;
@@ -203,7 +371,7 @@ export function startGateway(options) {
       const upstream = options.upstream || opencodexEndpoint();
       const receivedBody = await readBody(req);
       if (downstreamClosed) return;
-      const body = rewriteModelAliasBody(receivedBody, catalog);
+      const body = rewriteModelAliasBody(receivedBody, catalog, route);
       const token = options.serviceToken !== undefined ? options.serviceToken : await serviceToken();
       if (downstreamClosed) return;
       upstreamReq = http.request({