ocx-cursor 1.0.4 → 1.0.6

package/README.md

@@ -121,7 +121,7 @@ The installer patches these files:
 /Applications/Cursor.app/Contents/Resources/app/out/vs/workbench/workbench.glass.main.js
 ```
 
-The patch keeps the model metadata that Cursor would discard. It leaves Cursor's local-agent mode disabled and does not edit either local-agent runtime.
+The patch keeps the model metadata that Cursor would discard and allows managed `opencodex/` models in Cursor's explicit subagent model list, including the gateway credentials and legacy model details used by Cursor's agent protocol. Generated OpenCodex agent definitions are hidden from Cursor so model routing uses Cursor's built-in subagent types instead of creating one custom type per model. Other user-added and BYOK models remain excluded from the model list. It leaves Cursor's local-agent mode disabled and does not edit either local-agent runtime.
 
 The login service refreshes the catalog every 15 seconds. It waits for Cursor to quit before writing the state database or reapplying a patch after a Cursor update.
 

package/package.json

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

package/src/cursor-patch.mjs

@@ -15,6 +15,23 @@ import {
 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-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 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";
 export const cursorLocalRuntimePatchMarker = "/*ocx-cursor-local-model-display-v2*/";
@@ -29,6 +46,34 @@ export function isCursorModelMetadataBundle(file) {
 const catalogNormalization = /(?<normalization>\b(?<catalog>[A-Za-z_$][\w$]*)=\k<catalog>\.map\((?<item>[A-Za-z_$][\w$]*)=>(?<plain>[A-Za-z_$][\w$]*)\(\k<item>\)\)),(?=(?<batch>[A-Za-z_$][\w$]*)\(\(\)=>\{this\._reactiveStorageService\.setApplicationUserPersistentStorage\("availableDefaultModels2",\k<catalog>\))/g;
 const previousCatalogInjection = /\/\*ocx-cursor-model-metadata(?:-v[2-5])?\*\/(?<catalog>[A-Za-z_$][\w$]*)=[\s\S]*?,(?=(?<batch>[A-Za-z_$][\w$]*)\(\(\)=>\{this\._reactiveStorageService\.setApplicationUserPersistentStorage\("availableDefaultModels2",\k<catalog>\))/g;
 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 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 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;
 const localRuntimePickerInput = /toPickerInput\((?<model>[A-Za-z_$][\w$]*)\)\{var [A-Za-z_$][\w$]*;const [A-Za-z_$][\w$]*=this\.modelMetadataById\.get\(\k<model>\.modelId\),(?<capabilities>[A-Za-z_$][\w$]*)=.*?;return\{.*?supportsReasoning:[^,]+,supportsVision:/g;
@@ -48,8 +93,17 @@ export function clearCursorAppQuarantine(options = {}) {
 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 });
 }
 
@@ -120,12 +174,210 @@ export function patchCursorByokModelRoutingSource(source) {
   return { status: "patched", source: patched };
 }
 
+export function patchCursorExplicitSubagentModelsSource(source) {
+  if (source.includes(cursorSubagentModelsPatchMarker)) return { status: "already-patched", source };
+  const patched = replaceSingleMatch(source, explicitSubagentModelFilter, (match) => {
+    const { functionName, model, isUserAdded, storage, hasProviderOverride, usesByok } = match.groups;
+    return `function ${functionName}(${model},${isUserAdded},${storage}){${cursorSubagentModelsPatchMarker}return ${model}.startsWith("opencodex/")?!1:${isUserAdded}===!0?!0:${hasProviderOverride}(${storage})||${usesByok}(${model},${storage})}`;
+  }, "explicit subagent model filter");
+  return { status: "patched", source: patched };
+}
+
+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;`;
+  }, "explicit subagent selection hook");
+  patched = replaceSingleMatch(patched, explicitSubagentRequestedModel, (match) => {
+    const { requestedModelType, model, maxMode, parameters, parameter, parameterType } = match.groups;
+    return `new ${requestedModelType}({modelId:${model}.name,maxMode:${maxMode},credentials:ocxCursorResolveCredentials?.(${model}.name),parameters:${parameters}.map(${parameter}=>new ${parameterType}({id:${parameter}.id,value:${parameter}.value}))})`;
+  }, "explicit subagent requested model");
+  patched = replaceSingleMatch(patched, explicitSubagentSelectionCall, (match) => {
+    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 };
+  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(restored, selectedSubagentLegacyDetails, (match) => {
+    const { options } = match.groups;
+    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 };
+}
+
+export function patchCursorSubagentPromptRoutingSource(source) {
+  if (source.includes(cursorSubagentPromptRoutingPatchMarker)) return { status: "already-patched", source };
+  let restored = source;
+  if (restored.includes("/*ocx-cursor-subagent-prompt-routing-v1*/")) {
+    restored = replaceSingleMatch(restored, legacySubagentPromptRouting, (match) => {
+      return `customSystemPrompt:${match.groups.options}.customSystemPrompt`;
+    }, "legacy subagent prompt routing");
+  }
+  if (restored.includes("/*ocx-cursor-subagent-prompt-routing-v2*/")) {
+    restored = replaceSingleMatch(restored, legacySubagentRequestRouting, (match) => {
+      return `${match.groups.prefix}${match.groups.action}`;
+    }, "legacy subagent request routing");
+  }
+  const promptMatches = [...restored.matchAll(agentCustomSystemPrompt)];
+  if (promptMatches.length !== 1) {
+    throw new Error(`Expected one Cursor custom system prompt field, found ${promptMatches.length}`);
+  }
+  const options = promptMatches[0].groups.options;
+  const patched = replaceSingleMatch(restored, agentRequestAction, (match) => {
+    const { prefix, action } = match.groups;
+    return `${prefix}(()=>{${cursorSubagentPromptRoutingPatchMarker}const ocxCursorUserMessage=${action}.action.case==="userMessageAction"?${action}.action.value.userMessage:void 0;if(ocxCursorUserMessage){const ocxCursorModelIds=(${options}.selectedSubagentModels??[]).map(ocxCursorModel=>ocxCursorModel.modelId).filter(ocxCursorModelId=>ocxCursorModelId.startsWith("opencodex/")),ocxCursorRequestedModel=ocxCursorModelIds.find(ocxCursorModelId=>ocxCursorUserMessage.text?.includes(ocxCursorModelId)||ocxCursorUserMessage.richText?.includes(ocxCursorModelId));if(ocxCursorRequestedModel){for(const ocxCursorField of["text","richText"])typeof ocxCursorUserMessage[ocxCursorField]==="string"&&(ocxCursorUserMessage[ocxCursorField]=ocxCursorUserMessage[ocxCursorField].split(ocxCursorRequestedModel).join("composer-2.5"));ocxCursorUserMessage.text+=("\\n\\nLocal routing requirement: when calling the Subagent tool, its prompt must begin exactly with <ocx-subagent-model>"+ocxCursorRequestedModel+"</ocx-subagent-model>. Preserve this marker exactly.")}}return ${action}})()`;
+  }, "agent request action");
+  return { status: "patched", source: patched };
+}
+
+export function patchCursorSubagentExecutionRoutingSource(source) {
+  if (source.includes(cursorSubagentExecutionRoutingPatchMarker)) return { status: "already-patched", source };
+  let restored = source;
+  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");
+  }
+  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");
+  }
+  let patched = replaceSingleMatch(restored, createOrResumeSubagentStart, (match) => {
+    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");
+  return { status: "patched", source: patched };
+}
+
+export function patchCursorSubagentRunRoutingSource(source) {
+  if (source.includes(cursorSubagentRunRoutingPatchMarker)) return { status: "already-patched", source };
+  let patched = replaceSingleMatch(source, runSubagentWithHandle, (match) => {
+    const { input, handle } = match.groups;
+    return `async runSubagentWithHandle(${input},${handle}){${cursorSubagentRunRoutingPatchMarker}const ocxCursorStoredModel=${handle}.data.modelConfig?.modelName;return this._runSubagent(ocxCursorStoredModel?.startsWith("opencodex/")?{...${input},modelId:ocxCursorStoredModel}:${input},${handle})}`;
+  }, "subagent run input");
+  patched = replaceSingleMatch(patched, runSubagentModelConfigFixup, (match) => {
+    const { fixed, resolved, maxMode, stored, config } = match.groups;
+    return `${fixed}=${resolved}.startsWith("opencodex/")?${config}?.selectedModels??[]:(typeof this._modelConfigService.fixupModelConfigForCurrentFlag=="function"?this._modelConfigService.fixupModelConfigForCurrentFlag({modelName:${resolved},maxMode:${maxMode}}):void 0)?.selectedModels??[],${stored}=${config}?.selectedModels??[]`;
+  }, "subagent run model config");
+  return { status: "patched", source: patched };
+}
+
+export function patchCursorSubagentRuntimeCredentialsSource(source) {
+  if (source.includes(cursorSubagentRuntimeCredentialsPatchMarker)) return { status: "already-patched", source };
+  const patched = replaceSingleMatch(source, requestedModelCredentials, (match) => {
+    const { prefix, model, details, suffix } = match.groups;
+    return `${prefix}${cursorSubagentRuntimeCredentialsPatchMarker}${model}.startsWith("opencodex/")?this.convertModelDetailsToCredentials({apiKey:this.cursorAuthenticationService.openAIKey()??void 0,openaiApiBaseUrl:this.reactiveStorageService.applicationUserPersistentStorage.openAIBaseUrl}):this.convertModelDetailsToCredentials(${details})${suffix}`;
+  }, "subagent runtime credentials");
+  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 contexts = [...source.matchAll(subagentTaskArgsContext)];
+  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 replacement = `taskParamModelName:${cursorSubagentTaskArgsDisplayPatchMarker}/<ocx-subagent-model>(opencodex\\/[^<]+)<\\/ocx-subagent-model>/.exec(${bubble}.params?.prompt??${args}?.prompt??"")?.[1]??${taskModel}??${args}?.model`;
+  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) => {
+    const { raw } = match.groups;
+    return `${raw}=this.subagentsService.peekRawSubagents()?.filter(ocxCursorSubagent=>{${cursorRoutedSubagentTypesPatchMarker}const ocxCursorPrompt=ocxCursorSubagent?.prompt;return!ocxCursorPrompt?.includes("generated-by: opencodex")&&!ocxCursorPrompt?.includes("generated-by: ocx-cursor")})`;
+  }, "custom subagent loader");
+  return { status: "patched", source: patched };
+}
+
 export function patchCursorWorkbenchSource(source) {
   const metadata = patchCursorModelMetadataSource(source);
   const routing = patchCursorByokModelRoutingSource(metadata.source);
+  const subagents = patchCursorExplicitSubagentModelsSource(routing.source);
+  const credentials = patchCursorSubagentCredentialsSource(subagents.source);
+  const legacyDetails = patchCursorSubagentLegacyDetailsSource(credentials.source);
+  const promptRouting = patchCursorSubagentPromptRoutingSource(legacyDetails.source);
+  const executionRouting = patchCursorSubagentExecutionRoutingSource(promptRouting.source);
+  const runRouting = patchCursorSubagentRunRoutingSource(executionRouting.source);
+  const runtimeCredentials = patchCursorSubagentRuntimeCredentialsSource(runRouting.source);
+  const modelDisplay = patchCursorSubagentModelDisplaySource(runtimeCredentials.source);
+  const taskArgsDisplay = patchCursorSubagentTaskArgsDisplaySource(modelDisplay.source);
+  const subagentTypes = patchCursorRoutedSubagentTypesSource(taskArgsDisplay.source);
   return {
-    status: metadata.status === "patched" || routing.status === "patched" ? "patched" : "already-patched",
-    source: routing.source,
+    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,6 +45,52 @@ function disableStrictFunctionTools(tools) {
   }
 }
 
+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) {
   if (!body?.length) return body;
   let payload;
@@ -54,6 +100,8 @@ export function rewriteModelAliasBody(body, catalog) {
     return body;
   }
   if (!isRecord(payload) || typeof payload.model !== "string" || !payload.model.startsWith(managedPrefix)) return body;
+  restoreRoutedSubagentModels(payload.messages, catalog);
+  enrichSubagentModelTools(payload.tools, catalog);
 
   const variant = /^(opencodex\/.+?)\[([^\]]+)\]$/.exec(payload.model);
   let alias = variant?.[1] || payload.model;