ocx-cursor 0.5.1 → 0.5.2

package/README.md

@@ -59,6 +59,8 @@ Cursor -> 127.0.0.1:10101 -> OpenCodex on 127.0.0.1:10100 -> provider
 
 The gateway requires its generated bearer token on every `/v1/*` request. It binds to `127.0.0.1` unless you change `OCX_CURSOR_HOST`.
 
+Active OpenCodex `cursor/*` models are exposed under `opencodex/cursor/*`. The provider is experimental; the bridge cancels its upstream request when Cursor ends the matching client request.
+
 ## Model behavior
 
 The bridge reads OpenCodex's active `/v1/models` response and creates stable Cursor aliases:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocx-cursor",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "OpenCodex companion service for Cursor custom models",
   "keywords": [
     "opencodex",

package/src/cursor-patch.mjs

@@ -9,11 +9,12 @@ import {
   cursorWorkbenchFile,
 } from "./paths.mjs";
 
-export const cursorPatchMarker = "/*ocx-cursor-model-metadata-v4*/";
+export const cursorPatchMarker = "/*ocx-cursor-model-metadata-v5*/";
 export const legacyCursorPatchMarker = "/*ocx-cursor-model-metadata*/";
 export const cursorLocalModeDisabled = "localMode:!1";
 export const cursorLocalModeEnabled = "localMode:!0";
-export const cursorLocalRuntimePatchMarker = "/*ocx-cursor-local-model-display*/";
+export const cursorLocalRuntimePatchMarker = "/*ocx-cursor-local-model-display-v2*/";
+export const legacyCursorLocalRuntimePatchMarker = "/*ocx-cursor-local-model-display*/";
 export const cursorLocalRuntimeCapabilitiesPatchMarker = "/*ocx-cursor-local-model-capabilities-v3*/";
 export const legacyCursorLocalRuntimeCapabilitiesPatchMarker = "/*ocx-cursor-local-model-capabilities-v2*/";
 
@@ -22,7 +23,7 @@ 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[23])?\*\/(?<catalog>[A-Za-z_$][\w$]*)=\k<catalog>\.map\(ocxCursorModel=>\{.*?\}\),(?=(?<batch>[A-Za-z_$][\w$]*)\(\(\)=>\{this\._reactiveStorageService\.setApplicationUserPersistentStorage\("availableDefaultModels2",\k<catalog>\))/g;
+const previousCatalogInjection = /\/\*ocx-cursor-model-metadata(?:-v[234])?\*\/(?<catalog>[A-Za-z_$][\w$]*)=\k<catalog>\.map\(ocxCursorModel=>\{.*?\}\),(?=(?<batch>[A-Za-z_$][\w$]*)\(\(\)=>\{this\._reactiveStorageService\.setApplicationUserPersistentStorage\("availableDefaultModels2",\k<catalog>\))/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;
@@ -40,12 +41,12 @@ function replaceSingleMatch(source, pattern, replacement, label) {
 }
 
 function metadataInjection(catalog) {
-  return `${cursorPatchMarker}${catalog}=${catalog}.map(ocxCursorModel=>{if(!ocxCursorModel.name.startsWith("opencodex/"))return ocxCursorModel;const ocxCursorStored=(this._reactiveStorageService.applicationUserPersistentStorage.availableDefaultModels2??[]).find(ocxCursorCandidate=>ocxCursorCandidate?.name===ocxCursorModel.name);const ocxCursorDisplayWords={claude:"Claude",codex:"Codex",composer:"Composer",deepseek:"DeepSeek",fable:"Fable",fast:"Fast",flash:"Flash",gpt:"GPT",grok:"Grok",hy3:"HY3",kimi:"Kimi",luna:"Luna",max:"Max",mimo:"MiMo",mini:"Mini",opus:"Opus",pro:"Pro",qwen:"Qwen",sol:"Sol",sonnet:"Sonnet",spark:"Spark",terra:"Terra"};const ocxCursorDisplayName=ocxCursorModel.name.split("/").at(-1).split("-").map(ocxCursorWord=>{if(ocxCursorDisplayWords[ocxCursorWord])return ocxCursorDisplayWords[ocxCursorWord];const ocxCursorAttached=/^(qwen|kimi|gpt|claude|grok)(\\d+(?:\\.\\d+)*)$/.exec(ocxCursorWord);if(ocxCursorAttached)return ocxCursorDisplayWords[ocxCursorAttached[1]]+" "+ocxCursorAttached[2];if(/^v\\d/i.test(ocxCursorWord))return"V"+ocxCursorWord.slice(1);if(/^k\\d/i.test(ocxCursorWord))return"K"+ocxCursorWord.slice(1);if(/^\\d/.test(ocxCursorWord))return ocxCursorWord;return ocxCursorWord.slice(0,1).toUpperCase()+ocxCursorWord.slice(1)}).join(" ");const ocxCursorPrettyLabel=ocxCursorValue=>typeof ocxCursorValue==="string"?ocxCursorValue.split(ocxCursorModel.name).join(ocxCursorDisplayName):ocxCursorValue;const ocxCursorDefinitions=Array.isArray(ocxCursorModel.parameterDefinitions)&&ocxCursorModel.parameterDefinitions.length>0?ocxCursorModel.parameterDefinitions:ocxCursorStored?.parameterDefinitions??[];const ocxCursorVariantSource=Array.isArray(ocxCursorModel.variants)&&ocxCursorModel.variants.length>0?ocxCursorModel.variants:ocxCursorStored?.variants??[];const ocxCursorVariants=ocxCursorVariantSource.map(ocxCursorVariant=>({...ocxCursorVariant,displayName:ocxCursorPrettyLabel(ocxCursorVariant.displayName),displayNameOutsidePicker:ocxCursorPrettyLabel(ocxCursorVariant.displayNameOutsidePicker)}));const ocxCursorLegacySlugs=Array.isArray(ocxCursorModel.legacySlugs)&&ocxCursorModel.legacySlugs.length>0?ocxCursorModel.legacySlugs:ocxCursorStored?.legacySlugs??[];return{...ocxCursorModel,clientDisplayName:ocxCursorDisplayName,inputboxShortModelName:ocxCursorDisplayName,parameterDefinitions:ocxCursorDefinitions,variants:ocxCursorVariants,legacySlugs:ocxCursorLegacySlugs,supportsThinking:void 0!==ocxCursorModel.supportsThinking?ocxCursorModel.supportsThinking:ocxCursorStored?.supportsThinking}}),`;
+  return `${cursorPatchMarker}${catalog}=${catalog}.map(ocxCursorModel=>{if(!ocxCursorModel.name.startsWith("opencodex/"))return ocxCursorModel;const ocxCursorStored=(this._reactiveStorageService.applicationUserPersistentStorage.availableDefaultModels2??[]).find(ocxCursorCandidate=>ocxCursorCandidate?.name===ocxCursorModel.name);const ocxCursorDisplayWords={claude:"Claude",codex:"Codex",composer:"Composer",deepseek:"DeepSeek",fable:"Fable",fast:"Fast",flash:"Flash",gpt:"GPT",grok:"Grok",hy3:"HY3",kimi:"Kimi",luna:"Luna",max:"Max",mimo:"MiMo",mini:"Mini",opus:"Opus",pro:"Pro",qwen:"Qwen",sol:"Sol",sonnet:"Sonnet",spark:"Spark",terra:"Terra"};const ocxCursorDisplayName=ocxCursorStored?.clientDisplayName??((ocxCursorModel.name.startsWith("opencodex/cursor/")?"Cursor ":"")+ocxCursorModel.name.split("/").at(-1).split("-").map(ocxCursorWord=>{if(ocxCursorDisplayWords[ocxCursorWord])return ocxCursorDisplayWords[ocxCursorWord];const ocxCursorAttached=/^(qwen|kimi|gpt|claude|grok)(\\d+(?:\\.\\d+)*)$/.exec(ocxCursorWord);if(ocxCursorAttached)return ocxCursorDisplayWords[ocxCursorAttached[1]]+" "+ocxCursorAttached[2];if(/^v\\d/i.test(ocxCursorWord))return"V"+ocxCursorWord.slice(1);if(/^k\\d/i.test(ocxCursorWord))return"K"+ocxCursorWord.slice(1);if(/^\\d/.test(ocxCursorWord))return ocxCursorWord;return ocxCursorWord.slice(0,1).toUpperCase()+ocxCursorWord.slice(1)}).join(" "));const ocxCursorPrettyLabel=ocxCursorValue=>typeof ocxCursorValue==="string"?ocxCursorValue.split(ocxCursorModel.name).join(ocxCursorDisplayName):ocxCursorValue;const ocxCursorDefinitions=Array.isArray(ocxCursorModel.parameterDefinitions)&&ocxCursorModel.parameterDefinitions.length>0?ocxCursorModel.parameterDefinitions:ocxCursorStored?.parameterDefinitions??[];const ocxCursorVariantSource=Array.isArray(ocxCursorModel.variants)&&ocxCursorModel.variants.length>0?ocxCursorModel.variants:ocxCursorStored?.variants??[];const ocxCursorVariants=ocxCursorVariantSource.map(ocxCursorVariant=>({...ocxCursorVariant,displayName:ocxCursorPrettyLabel(ocxCursorVariant.displayName),displayNameOutsidePicker:ocxCursorPrettyLabel(ocxCursorVariant.displayNameOutsidePicker)}));const ocxCursorLegacySlugs=Array.isArray(ocxCursorModel.legacySlugs)&&ocxCursorModel.legacySlugs.length>0?ocxCursorModel.legacySlugs:ocxCursorStored?.legacySlugs??[];return{...ocxCursorModel,clientDisplayName:ocxCursorDisplayName,inputboxShortModelName:ocxCursorDisplayName,parameterDefinitions:ocxCursorDefinitions,variants:ocxCursorVariants,legacySlugs:ocxCursorLegacySlugs,supportsThinking:void 0!==ocxCursorModel.supportsThinking?ocxCursorModel.supportsThinking:ocxCursorStored?.supportsThinking}}),`;
 }
 
 export function patchCursorWorkbenchSource(source) {
   if (source.includes(cursorPatchMarker)) return { status: "already-patched", source };
-  if (source.includes(legacyCursorPatchMarker) || source.includes("/*ocx-cursor-model-metadata-v2*/") || source.includes("/*ocx-cursor-model-metadata-v3*/")) {
+  if (source.includes(legacyCursorPatchMarker) || source.includes("/*ocx-cursor-model-metadata-v2*/") || source.includes("/*ocx-cursor-model-metadata-v3*/") || source.includes("/*ocx-cursor-model-metadata-v4*/")) {
     const matches = [...source.matchAll(previousCatalogInjection)];
     if (matches.length !== 1) {
       throw new Error(`Expected one legacy Cursor model metadata hook, found ${matches.length}`);
@@ -98,13 +99,18 @@ export function patchCursorBundleSource(source, options = {}) {
 
 function patchCursorLocalRuntimeDisplayName(source) {
   if (source.includes(cursorLocalRuntimePatchMarker)) return source;
+  if (source.includes(legacyCursorLocalRuntimePatchMarker)) {
+    return source
+      .replace(legacyCursorLocalRuntimePatchMarker, cursorLocalRuntimePatchMarker)
+      .replace('e.startsWith("opencodex/")?e.split("/")', 'e.startsWith("opencodex/")?(e.startsWith("opencodex/cursor/")?"Cursor ":"")+e.split("/")');
+  }
   const matches = [...source.matchAll(localModelConstructor)];
   if (matches.length !== 1) {
     throw new Error(`Expected one Cursor local model constructor, found ${matches.length}`);
   }
   const match = matches[0];
   const { functionName, modelType } = match.groups;
-  const replacement = `function ${functionName}(e,t){${cursorLocalRuntimePatchMarker}const ocxCursorDisplayWords={claude:"Claude",codex:"Codex",composer:"Composer",deepseek:"DeepSeek",fable:"Fable",fast:"Fast",flash:"Flash",gpt:"GPT",grok:"Grok",hy3:"HY3",kimi:"Kimi",luna:"Luna",max:"Max",mimo:"MiMo",mini:"Mini",opus:"Opus",pro:"Pro",qwen:"Qwen",sol:"Sol",sonnet:"Sonnet",spark:"Spark",terra:"Terra"};const ocxCursorDisplayName=null!=t?t:e.startsWith("opencodex/")?e.split("/").at(-1).split("-").map(ocxCursorWord=>{if(ocxCursorDisplayWords[ocxCursorWord])return ocxCursorDisplayWords[ocxCursorWord];const ocxCursorAttached=/^(qwen|kimi|gpt|claude|grok)(\\d+(?:\\.\\d+)*)$/.exec(ocxCursorWord);if(ocxCursorAttached)return ocxCursorDisplayWords[ocxCursorAttached[1]]+" "+ocxCursorAttached[2];if(/^v\\d/i.test(ocxCursorWord))return"V"+ocxCursorWord.slice(1);if(/^k\\d/i.test(ocxCursorWord))return"K"+ocxCursorWord.slice(1);if(/^\\d/.test(ocxCursorWord))return ocxCursorWord;return ocxCursorWord.slice(0,1).toUpperCase()+ocxCursorWord.slice(1)}).join(" "):e;return new ${modelType}({modelId:e,displayModelId:e,displayName:ocxCursorDisplayName,displayNameShort:ocxCursorDisplayName,aliases:[]})}`;
+  const replacement = `function ${functionName}(e,t){${cursorLocalRuntimePatchMarker}const ocxCursorDisplayWords={claude:"Claude",codex:"Codex",composer:"Composer",deepseek:"DeepSeek",fable:"Fable",fast:"Fast",flash:"Flash",gpt:"GPT",grok:"Grok",hy3:"HY3",kimi:"Kimi",luna:"Luna",max:"Max",mimo:"MiMo",mini:"Mini",opus:"Opus",pro:"Pro",qwen:"Qwen",sol:"Sol",sonnet:"Sonnet",spark:"Spark",terra:"Terra"};const ocxCursorDisplayName=null!=t?t:e.startsWith("opencodex/")?(e.startsWith("opencodex/cursor/")?"Cursor ":"")+e.split("/").at(-1).split("-").map(ocxCursorWord=>{if(ocxCursorDisplayWords[ocxCursorWord])return ocxCursorDisplayWords[ocxCursorWord];const ocxCursorAttached=/^(qwen|kimi|gpt|claude|grok)(\\d+(?:\\.\\d+)*)$/.exec(ocxCursorWord);if(ocxCursorAttached)return ocxCursorDisplayWords[ocxCursorAttached[1]]+" "+ocxCursorAttached[2];if(/^v\\d/i.test(ocxCursorWord))return"V"+ocxCursorWord.slice(1);if(/^k\\d/i.test(ocxCursorWord))return"K"+ocxCursorWord.slice(1);if(/^\\d/.test(ocxCursorWord))return ocxCursorWord;return ocxCursorWord.slice(0,1).toUpperCase()+ocxCursorWord.slice(1)}).join(" "):e;return new ${modelType}({modelId:e,displayModelId:e,displayName:ocxCursorDisplayName,displayNameShort:ocxCursorDisplayName,aliases:[]})}`;
   return `${source.slice(0, match.index)}${replacement}${source.slice(match.index + match[0].length)}`;
 }
 
@@ -176,15 +182,17 @@ function patchCursorLocalRuntimeProviderCapabilities(source) {
 }
 
 export function patchCursorLocalRuntimeSource(source) {
-  if (source.includes(cursorLocalRuntimeCapabilitiesPatchMarker)) return { status: "already-patched", source };
-  if (source.includes(legacyCursorLocalRuntimeCapabilitiesPatchMarker)) {
-    const upgraded = patchCursorLocalRuntimeProviderCapabilities(source).replace(
+  const displayPatched = patchCursorLocalRuntimeDisplayName(source);
+  if (displayPatched.includes(cursorLocalRuntimeCapabilitiesPatchMarker)) {
+    return { status: displayPatched === source ? "already-patched" : "patched", source: displayPatched };
+  }
+  if (displayPatched.includes(legacyCursorLocalRuntimeCapabilitiesPatchMarker)) {
+    const upgraded = patchCursorLocalRuntimeProviderCapabilities(displayPatched).replace(
       legacyCursorLocalRuntimeCapabilitiesPatchMarker,
       cursorLocalRuntimeCapabilitiesPatchMarker,
     );
     return { status: "patched", source: upgraded };
   }
-  const displayPatched = patchCursorLocalRuntimeDisplayName(source);
   return { status: "patched", source: patchCursorLocalRuntimeCapabilities(displayPatched) };
 }
 

package/src/cursor-state.mjs

@@ -42,12 +42,14 @@ function displayWord(value) {
 }
 
 export function displayNameFor(model) {
-  return model.sourceId.split("/").at(-1).split("-").map(displayWord).join(" ");
+  const displayName = model.sourceId.split("/").at(-1).split("-").map(displayWord).join(" ");
+  return model.provider === "cursor" || model.sourceId.startsWith("cursor/") ? `Cursor ${displayName}` : displayName;
 }
 
 export function cursorIsRunning() {
   try {
-    execFileSync("pgrep", ["-f", "/Applications/Cursor.app/Contents/"], { stdio: "ignore" });
+    // Match the main binary only: orphaned crashpad helpers under Contents/ outlive the app.
+    execFileSync("pgrep", ["-f", "/Applications/Cursor.app/Contents/MacOS/Cursor"], { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -165,6 +167,9 @@ function syncSelectedModel(state, catalog) {
   const composer = state.aiSettings?.modelConfig?.composer;
   if (!composer || !Array.isArray(composer.selectedModels)) return;
   const byAlias = new Map(catalog.map((model) => [model.alias, model]));
+  composer.selectedModels = composer.selectedModels.filter((selected) => (
+    typeof selected?.modelId !== "string" || !selected.modelId.startsWith(managedPrefix) || byAlias.has(selected.modelId)
+  ));
   for (const selected of composer.selectedModels) {
     const model = byAlias.get(selected.modelId);
     if (!model || (model.reasoningEfforts.length === 0 && !model.supportsFast)) continue;
@@ -187,7 +192,7 @@ export function applyCatalogToState(state, catalog) {
   const keepUnmanaged = (value) => typeof value !== "string" || !value.startsWith(managedPrefix);
   const existingModels = Array.isArray(state.availableDefaultModels2) ? state.availableDefaultModels2 : [];
   state.availableDefaultModels2 = [
-    ...existingModels.filter((model) => !(model?.isUserAdded && typeof model.name === "string" && model.name.startsWith(managedPrefix))),
+    ...existingModels.filter((model) => !(typeof model?.name === "string" && model.name.startsWith(managedPrefix))),
     ...catalog.map(cursorModel),
   ];
   state.aiSettings ||= {};
@@ -199,6 +204,14 @@ export function applyCatalogToState(state, catalog) {
     ...(Array.isArray(state.aiSettings.modelOverrideEnabled) ? state.aiSettings.modelOverrideEnabled.filter(keepUnmanaged) : []),
     ...aliases,
   ];
+  if (state.aiSettings.modelParameterPreferences && typeof state.aiSettings.modelParameterPreferences === "object") {
+    const activeAliases = new Set(aliases);
+    for (const alias of Object.keys(state.aiSettings.modelParameterPreferences)) {
+      if (alias.startsWith(managedPrefix) && !activeAliases.has(alias)) {
+        delete state.aiSettings.modelParameterPreferences[alias];
+      }
+    }
+  }
   syncSelectedModel(state, catalog);
   return state;
 }

package/src/gateway.mjs

@@ -118,10 +118,15 @@ async function serviceToken() {
   }
 }
 
-function authorized(req, expected) {
-  const supplied = String(req.headers.authorization || "").replace(/^Bearer\s+/i, "").trim();
-  const actual = Buffer.from(supplied);
-  return actual.length === expected.length && timingSafeEqual(actual, expected);
+export function authorized(req, expected) {
+  const supplied = [
+    String(req.headers.authorization || "").replace(/^Bearer\s+/i, "").trim(),
+    String(req.headers["x-api-key"] || "").trim(),
+  ];
+  return supplied.some((value) => {
+    const actual = Buffer.from(value);
+    return actual.length === expected.length && timingSafeEqual(actual, expected);
+  });
 }
 
 function json(res, status, body) {
@@ -161,7 +166,7 @@ function upstreamHeaders(req, body, token, upstream) {
 
 export function startGateway(options) {
   const host = options.host || gatewayHost;
-  const port = options.port || gatewayPort;
+  const port = options.port ?? gatewayPort;
   const expected = Buffer.from(options.secret);
   let activeRequests = 0;
 
@@ -179,16 +184,29 @@ export function startGateway(options) {
     if (activeRequests >= 8) return json(res, 429, { error: { message: "bridge concurrency limit reached", type: "rate_limit_error" } });
 
     activeRequests += 1;
-    res.once("close", () => { activeRequests = Math.max(0, activeRequests - 1); });
+    let upstreamReq;
+    let downstreamClosed = false;
+    const cancelUpstream = () => {
+      downstreamClosed = true;
+      if (upstreamReq && !upstreamReq.destroyed) upstreamReq.destroy();
+    };
+    req.once("aborted", cancelUpstream);
+    res.once("close", () => {
+      activeRequests = Math.max(0, activeRequests - 1);
+      if (!res.writableEnded) cancelUpstream();
+    });
     try {
       if (route === "GET /v1/models") {
         return json(res, 200, enrichModelList(await activeModels(), catalog));
       }
 
-      const upstream = opencodexEndpoint();
-      const body = rewriteModelAliasBody(await readBody(req), catalog);
-      const token = await serviceToken();
-      const upstreamReq = http.request({
+      const upstream = options.upstream || opencodexEndpoint();
+      const receivedBody = await readBody(req);
+      if (downstreamClosed) return;
+      const body = rewriteModelAliasBody(receivedBody, catalog);
+      const token = options.serviceToken !== undefined ? options.serviceToken : await serviceToken();
+      if (downstreamClosed) return;
+      upstreamReq = http.request({
         hostname: upstream.host,
         port: upstream.port,
         method: req.method,
@@ -204,6 +222,7 @@ export function startGateway(options) {
         });
       });
       upstreamReq.on("error", (error) => {
+        if (downstreamClosed) return;
         if (!res.headersSent) json(res, 502, { error: { message: "OpenCodex upstream unavailable", type: "upstream_error" } });
         else res.destroy(error);
       });