ocx-cursor 1.0.0 → 1.0.2

package/README.md

@@ -6,7 +6,7 @@
 Use your active [OpenCodex](https://github.com/lidge-jun/opencodex) models in Cursor through an authenticated HTTPS endpoint on your Mac.
 
 > [!WARNING]
-> The installer edits two private workbench files inside `Cursor.app`. This invalidates Cursor's vendor signature. Cursor may report a corrupt installation. The bridge saves the original files under `~/.opencodex/cursor-bridge/cursor-app-backups`. Reinstall Cursor to restore a signed app.
+> The installer edits two private workbench files inside `Cursor.app`. This invalidates Cursor's vendor signature, so the bridge removes the app's quarantine attribute after each patch to prevent macOS from reporting a corrupt installation. The bridge saves the original files under `~/.opencodex/cursor-bridge/cursor-app-backups`. Reinstall Cursor to restore a vendor-signed app.
 
 ## Requirements
 
@@ -125,14 +125,18 @@ The patch keeps the model metadata that Cursor would discard. It leaves Cursor's
 
 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.
 
+On macOS, the patch monitor pauses while Cursor's `ShipIt` updater is running. After Cursor and the updater stop, it waits until all patch targets remain unchanged for five seconds before writing them. This prevents the bridge from modifying `Cursor.app` while an in-app update is replacing it.
+
 ## Commands
 
 | Command | Action |
 | --- | --- |
 | `ocx-cursor init --base-url URL` | Install the service, test the HTTPS endpoint, configure Cursor, and sync models. |
 | `ocx-cursor install` | Reinstall the service and check the two metadata patches. |
+| `ocx-cursor stop` | Stop the service without removing its configuration or state. |
+| `ocx-cursor start` | Start the installed service. |
 | `ocx-cursor update` | Install the current npm release and restart the service. |
-| `ocx-cursor sync` | Read the active OpenCodex catalog and update Cursor. |
+| `ocx-cursor sync` | With Cursor closed, pause the service, verify the app patch, sync the active catalog, and restart the service. |
 | `ocx-cursor status` | Print service, gateway, catalog, and pending-sync status. |
 | `ocx-cursor uninstall` | Remove the service, command link, and bridge state. |
 
@@ -159,7 +163,7 @@ The bridge reads `~/.opencodex/service-api-token` when OpenCodex uses service au
 | Cursor returns 401 | Quit Cursor and rerun `npx ocx-cursor init --base-url https://YOUR_HOST/v1`. |
 | The hostname returns 502 | Run `ocx-cursor status`, then check that the tunnel points to port `10101`. |
 | Cloudflare returns 1016 | Run `cloudflared tunnel info ocx-cursor` and check the service. |
-| Models or controls are missing | Quit Cursor and run `ocx-cursor sync`. |
+| Models or controls are missing | Quit Cursor and run `ocx-cursor sync`. It repairs the foreground app patch before writing model metadata. |
 | A Cursor update removed the patch | Quit Cursor and run `ocx-cursor install`. |
 
 Read the service logs:

package/bin/ocx-cursor.mjs

@@ -5,7 +5,7 @@ import process from "node:process";
 import { createInterface } from "node:readline/promises";
 import { configureCursorOpenAI, storedCursorOpenAIBaseUrl } from "../src/cursor-config.mjs";
 import { cursorIsRunning } from "../src/cursor-state.mjs";
-import { installService, prepareInstallSecret, serviceStatus, uninstallService, updateService } from "../src/install.mjs";
+import { installService, prepareInstallSecret, repairCursorMetadataPatch, serviceStatus, startService, stopService, uninstallService, updateService } from "../src/install.mjs";
 import { cursorOpenAIBaseUrl, pendingFile } from "../src/paths.mjs";
 import { runService } from "../src/service.mjs";
 import { normalizeBaseUrl, testEndpoint } from "../src/setup.mjs";
@@ -19,6 +19,8 @@ Usage:
                         Install the service, test the endpoint, configure Cursor,
                         and sync models
   ocx-cursor install    Install and start the macOS companion service
+  ocx-cursor stop       Stop the companion service without removing its state
+  ocx-cursor start      Start the installed companion service
   ocx-cursor update     Install the latest companion release and restart it
   ocx-cursor sync       Sync active OpenCodex models into Cursor
   ocx-cursor launch [--port <port>]
@@ -71,6 +73,10 @@ function printSync(result) {
 }
 
 function printCursorPatches(result) {
+  if (!result.cursorInstalled) {
+    process.stdout.write("Cursor is not installed; app patches will be applied after it is installed.\n");
+    return;
+  }
   if (result.cursorPatches === null) {
     process.stdout.write("Cursor app patches will be applied after Cursor quits.\n");
     return;
@@ -131,7 +137,29 @@ async function main() {
     await updateService();
     return;
   }
+  if (command === "stop") {
+    stopService();
+    process.stdout.write("Stopped OpenCodex Cursor Bridge.\n");
+    return;
+  }
+  if (command === "start") {
+    await startService();
+    process.stdout.write("Started OpenCodex Cursor Bridge.\n");
+    return;
+  }
   if (command === "sync") {
+    if (!cursorIsRunning()) {
+      stopService();
+      try {
+        const cursorPatches = await repairCursorMetadataPatch();
+        const changed = cursorPatches.filter(({ status }) => status === "patched").length;
+        process.stdout.write(`Verified ${cursorPatches.length} Cursor metadata patches (${changed} changed).\n`);
+        printSync(await syncNow());
+      } finally {
+        await startService();
+      }
+      return;
+    }
     printSync(await syncNow());
     return;
   }

package/package.json

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

package/src/catalog.mjs

@@ -83,6 +83,7 @@ export function normalizeActiveCatalog(configured, active, fastModelIds = new Se
     if (typeof model?.id !== "string" || model.owned_by === "opencodex") continue;
     const configuredModel = configuredById.get(model.id);
     const provider = model.id.includes("/") ? model.id.split("/", 1)[0] : String(model.owned_by || "openai").toLowerCase();
+    if (provider === "cursor") continue;
     const inputModalities = Array.isArray(configuredModel?.inputModalities)
       ? configuredModel.inputModalities
       : Array.isArray(model.capabilities?.input_modalities)

package/src/cursor-patch.mjs

@@ -1,7 +1,9 @@
+import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
 import { chmod, copyFile, mkdir, readFile, rename, stat, writeFile } from "node:fs/promises";
-import { basename, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import {
+  cursorAppPath,
   cursorBundleFiles,
   cursorGlassWorkbenchFile,
   cursorLocalRuntimeFiles,
@@ -10,8 +12,9 @@ import {
   cursorWorkbenchFile,
 } from "./paths.mjs";
 
-export const cursorPatchMarker = "/*ocx-cursor-model-metadata-v5*/";
+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 cursorLocalModeDisabled = "localMode:!1";
 export const cursorLocalModeEnabled = "localMode:!0";
 export const cursorLocalRuntimePatchMarker = "/*ocx-cursor-local-model-display-v2*/";
@@ -24,7 +27,8 @@ 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[234])?\*\/(?<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[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 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;
@@ -32,6 +36,14 @@ const localRuntimeProviderPickerInput = /supportsReasoning:(?<reasoning>!0===\(n
 const localRuntimeRequestParameters = /function\((?<payload>[A-Za-z_$][\w$]*),(?<model>[A-Za-z_$][\w$]*),(?<parameters>[A-Za-z_$][\w$]*),(?<apiType>[A-Za-z_$][\w$]*),(?<route>[A-Za-z_$][\w$]*),(?<extended>[A-Za-z_$][\w$]*)=!1\)\{(?=const [A-Za-z_$][\w$]*=function\([A-Za-z_$][\w$]*\)\{var [A-Za-z_$][\w$]*;const [A-Za-z_$][\w$]*=.*?\["reasoning","effort","thought_level"\]\.includes)/g;
 const localRuntimeBuilderExport = /buildBottlerocketPickerModels:\(\)=>(?<builder>[A-Za-z_$][\w$]*)/g;
 const transientPatchErrorCodes = new Set(["EACCES", "EBUSY", "EPERM"]);
+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",
+  });
+}
 
 function replaceSingleMatch(source, pattern, replacement, label) {
   const matches = [...source.matchAll(pattern)];
@@ -41,13 +53,34 @@ function replaceSingleMatch(source, pattern, replacement, label) {
   return `${source.slice(0, match.index)}${value}${source.slice(match.index + match[0].length)}`;
 }
 
+async function withWritableDirectory(file, callback) {
+  const directory = dirname(file);
+  const previous = directoryPatchQueues.get(directory) || Promise.resolve();
+  const current = previous.catch(() => {}).then(async () => {
+    const directoryMode = (await stat(directory)).mode & 0o777;
+    const restoreDirectoryMode = (directoryMode & 0o200) === 0;
+    if (restoreDirectoryMode) await chmod(directory, directoryMode | 0o200);
+    try {
+      return await callback();
+    } finally {
+      if (restoreDirectoryMode) await chmod(directory, directoryMode);
+    }
+  });
+  directoryPatchQueues.set(directory, current);
+  try {
+    return await current;
+  } finally {
+    if (directoryPatchQueues.get(directory) === current) directoryPatchQueues.delete(directory);
+  }
+}
+
 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=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}}),`;
+  return `${cursorPatchMarker}${catalog}=[...${catalog},...(this._reactiveStorageService.applicationUserPersistentStorage.availableDefaultModels2??[]).filter(ocxCursorStoredModel=>typeof ocxCursorStoredModel?.name==="string"&&ocxCursorStoredModel.name.startsWith("opencodex/")&&!${catalog}.some(ocxCursorFreshModel=>ocxCursorFreshModel?.name===ocxCursorStoredModel.name))].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) {
+function patchCursorModelMetadataSource(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*/") || source.includes("/*ocx-cursor-model-metadata-v4*/")) {
+  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*/") || source.includes("/*ocx-cursor-model-metadata-v5*/")) {
     const matches = [...source.matchAll(previousCatalogInjection)];
     if (matches.length !== 1) {
       throw new Error(`Expected one legacy Cursor model metadata hook, found ${matches.length}`);
@@ -70,6 +103,24 @@ export function patchCursorWorkbenchSource(source) {
   return { status: "patched", source: patched };
 }
 
+export function patchCursorByokModelRoutingSource(source) {
+  if (source.includes(cursorByokRoutingPatchMarker)) return { status: "already-patched", source };
+  const patched = replaceSingleMatch(source, byokModelRouting, (match) => {
+    const { functionName, model, settings, isClaude, isGemini } = match.groups;
+    return `function ${functionName}(${model},${settings}){${cursorByokRoutingPatchMarker}return ${isClaude}(${model})?${settings}.useClaudeKey?"anthropic":void 0:${isGemini}(${model})?${settings}.useGoogleKey?"google":void 0:${settings}.useOpenAIKey&&(${model}.startsWith("opencodex/")||${settings}.aiSettings?.userAddedModels?.includes(${model}))?"openai":void 0}`;
+  }, "BYOK model routing hook");
+  return { status: "patched", source: patched };
+}
+
+export function patchCursorWorkbenchSource(source) {
+  const metadata = patchCursorModelMetadataSource(source);
+  const routing = patchCursorByokModelRoutingSource(metadata.source);
+  return {
+    status: metadata.status === "patched" || routing.status === "patched" ? "patched" : "already-patched",
+    source: routing.source,
+  };
+}
+
 export function patchCursorLocalModeSource(source) {
   const disabledCount = source.split(cursorLocalModeDisabled).length - 1;
   if (disabledCount > 1) {
@@ -214,9 +265,11 @@ async function writePatchedFile(file, source, patched, backupDirectory) {
 
   const mode = (await stat(file)).mode & 0o777;
   const temporary = `${file}.ocx-cursor-${process.pid}`;
-  await writeFile(temporary, patched.source, { mode });
-  await chmod(temporary, mode);
-  await rename(temporary, file);
+  await withWritableDirectory(file, async () => {
+    await writeFile(temporary, patched.source, { mode });
+    await chmod(temporary, mode);
+    await rename(temporary, file);
+  });
   return { status: patched.status, signature: await cursorWorkbenchSignature(file), backupPath };
 }
 
@@ -310,33 +363,80 @@ export function startCursorModelMetadataPatchMonitor(options = {}) {
 
 export function startCursorPatchMonitor(options = {}) {
   const intervalMs = options.intervalMs || 250;
+  const stableMs = options.stableMs || 0;
   const bundleFiles = options.file ? [options.file] : (options.bundleFiles || options.files || cursorBundleFiles);
   const runtimeFiles = options.file ? [] : (options.localRuntimeFiles || cursorLocalRuntimeFiles);
   const files = [...bundleFiles, ...runtimeFiles];
   const localRuntimeFiles = new Set(runtimeFiles);
   const lastSignatures = new Map();
+  let stableFingerprint = null;
+  let stableSince = 0;
   let patchPromise = null;
   let stopped = false;
 
-  const check = async () => {
-    if (stopped || patchPromise || options.shouldPatch?.() === false) return patchPromise;
-    patchPromise = Promise.all(files.map(async (file) => {
-      let signature;
+  const resetStability = () => {
+    stableFingerprint = null;
+    stableSince = 0;
+  };
+
+  const filesAreStable = async () => {
+    if (stableMs === 0) return true;
+    const signatures = await Promise.all(files.map(async (file) => {
       try {
-        signature = await cursorWorkbenchSignature(file);
+        return await cursorWorkbenchSignature(file);
       } catch {
-        return;
-      }
-      if (signature === lastSignatures.get(file)) return;
-      try {
-        const result = await ensureCursorPatchFile(file, localRuntimeFiles, options);
-        lastSignatures.set(file, result.signature);
-        options.onResult?.(result);
-      } catch (error) {
-        if (!transientPatchErrorCodes.has(error.code)) lastSignatures.set(file, signature);
-        options.onError?.(error, file);
+        return null;
       }
-    })).finally(() => {
+    }));
+    if (signatures.some((signature) => signature === null)) {
+      resetStability();
+      return false;
+    }
+    const fingerprint = signatures.join("|");
+    const now = (options.now || Date.now)();
+    if (fingerprint !== stableFingerprint) {
+      stableFingerprint = fingerprint;
+      stableSince = now;
+      return false;
+    }
+    return now - stableSince >= stableMs;
+  };
+
+  const check = async () => {
+    if (stopped || patchPromise) return patchPromise;
+    if (options.shouldPatch?.() === false) {
+      resetStability();
+      lastSignatures.clear();
+      return null;
+    }
+    patchPromise = (async () => {
+      if (!await filesAreStable()) return [];
+      let retryAfterStabilityDelay = false;
+      const results = await Promise.all(files.map(async (file) => {
+        let signature;
+        try {
+          signature = await cursorWorkbenchSignature(file);
+        } catch {
+          return;
+        }
+        if (signature === lastSignatures.get(file)) return;
+        try {
+          const result = await ensureCursorPatchFile(file, localRuntimeFiles, options);
+          lastSignatures.set(file, result.signature);
+          options.onResult?.(result);
+          return result;
+        } catch (error) {
+          if (transientPatchErrorCodes.has(error.code)) retryAfterStabilityDelay = true;
+          else lastSignatures.set(file, signature);
+          options.onError?.(error, file);
+        }
+      }));
+      if (retryAfterStabilityDelay) resetStability();
+      const patched = results.filter((result) => result?.status === "patched");
+      if (patched.length > 0) await options.onPatched?.(patched);
+      if (results.length === files.length && results.every(Boolean)) await options.onReady?.(results);
+      return results;
+    })().finally(() => {
       patchPromise = null;
     });
     return patchPromise;

package/src/cursor-state.mjs

@@ -64,6 +64,17 @@ export function cursorIsRunning() {
   }
 }
 
+export function cursorUpdateIsRunning(execute = execFileSync) {
+  try {
+    execute("pgrep", ["-f", "(com\\.todesktop\\.230313mzl4w4u92|co\\.anysphere\\.cursor[^ ]*)\\.ShipIt"], {
+      stdio: "ignore",
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export function defaultEffort(model) {
   const modelId = model.sourceId.split("/").at(-1);
   if (/^(?:gpt|gemini)-/.test(modelId) && model.reasoningEfforts.includes("medium")) return "medium";

package/src/install.mjs

@@ -4,10 +4,11 @@ import { access, chmod, copyFile, cp, lstat, mkdir, mkdtemp, readFile, readlink,
 import { tmpdir } from "node:os";
 import { dirname, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-import { ensureCursorModelMetadataPatched } from "./cursor-patch.mjs";
+import { clearCursorAppQuarantine, ensureCursorModelMetadataPatched } from "./cursor-patch.mjs";
 import { cursorIsRunning } from "./cursor-state.mjs";
 import {
   cliLinkFile,
+  cursorAppPath,
   installRoot,
   installedPackageRoot,
   launchAgentFile,
@@ -39,16 +40,16 @@ function commandOutput(command, args) {
   }
 }
 
-function bootout(label) {
+function bootout(label, execute = execFileSync) {
   try {
-    execFileSync("launchctl", ["bootout", `${launchDomain}/${label}`], { stdio: "ignore" });
+    execute("launchctl", ["bootout", `${launchDomain}/${label}`], { stdio: "ignore" });
   } catch {}
 }
 
-async function bootstrap(plist) {
+async function bootstrap(plist, execute = execFileSync) {
   for (let attempt = 0; attempt < 5; attempt += 1) {
     try {
-      execFileSync("launchctl", ["bootstrap", launchDomain, plist], { stdio: "ignore" });
+      execute("launchctl", ["bootstrap", launchDomain, plist], { stdio: "ignore" });
       return;
     } catch (error) {
       if (attempt === 4) throw error;
@@ -168,27 +169,50 @@ function launchAgent(nodePath) {
 export async function installService() {
   await mkdir(dirname(launchAgentFile), { recursive: true });
   const { legacyPlist, secretStatus } = await prepareInstallSecret();
-  const cursorPatches = cursorIsRunning()
-    ? null
-    : await Promise.all(cursorModelMetadataFiles.map(async (file) => ({
-      file,
-      ...await ensureCursorModelMetadataPatched({ file }),
-    })));
-  await copyPackage();
-  await installCliLink();
-
-  const nodePath = (await exists("/opt/homebrew/bin/node")) ? "/opt/homebrew/bin/node" : process.execPath;
-  await writeFile(launchAgentFile, launchAgent(nodePath), { mode: 0o644 });
   bootout(serviceLabel);
   bootout(legacyServiceLabel);
-  await bootstrap(launchAgentFile);
+  let cursorInstalled;
+  let cursorPatches;
+  try {
+    cursorInstalled = await exists(cursorAppPath);
+    cursorPatches = cursorIsRunning() || !cursorInstalled
+      ? null
+      : await repairCursorMetadataPatch();
+    await copyPackage();
+    await installCliLink();
+
+    const nodePath = (await exists("/opt/homebrew/bin/node")) ? "/opt/homebrew/bin/node" : process.execPath;
+    await writeFile(launchAgentFile, launchAgent(nodePath), { mode: 0o644 });
+    await bootstrap(launchAgentFile);
+  } catch (error) {
+    if (await exists(launchAgentFile)) await bootstrap(launchAgentFile).catch(() => {});
+    throw error;
+  }
 
   if (legacyPlist.startsWith(dirname(legacyLaunchAgentFile)) && await exists(legacyPlist)) {
     const disabled = `${legacyPlist}.disabled-by-${serviceLabel}`;
     await rm(disabled, { force: true });
     await rename(legacyPlist, disabled);
   }
-  return { installRoot, launchAgentFile, cliLinkFile, secretStatus, cursorPatches };
+  return { installRoot, launchAgentFile, cliLinkFile, secretStatus, cursorInstalled, cursorPatches };
+}
+
+export async function repairCursorMetadataPatch(options = {}) {
+  const running = options.cursorRunning ?? cursorIsRunning();
+  if (running) throw new Error("Quit Cursor before repairing its metadata patch");
+  const appPath = options.cursorAppPath || cursorAppPath;
+  const pathExists = options.exists || exists;
+  if (!await pathExists(appPath)) throw new Error("Cursor is not installed in /Applications");
+
+  const patchFile = options.ensureCursorModelMetadataPatched || ensureCursorModelMetadataPatched;
+  const files = options.files || cursorModelMetadataFiles;
+  const patches = await Promise.all(files.map(async (file) => ({
+    file,
+    ...await patchFile({ file }),
+  })));
+  const clearQuarantine = options.clearCursorAppQuarantine || clearCursorAppQuarantine;
+  clearQuarantine({ appPath });
+  return patches;
 }
 
 export async function updateService(options = {}) {
@@ -209,6 +233,21 @@ export async function updateService(options = {}) {
   }
 }
 
+export function stopService(options = {}) {
+  bootout(serviceLabel, options.execFileSync || execFileSync);
+}
+
+export async function startService(options = {}) {
+  const plist = options.launchAgentFile || launchAgentFile;
+  const pathExists = options.exists || exists;
+  if (!await pathExists(plist)) {
+    throw new Error("OpenCodex Cursor Bridge is not installed; run ocx-cursor install first");
+  }
+  const execute = options.execFileSync || execFileSync;
+  bootout(serviceLabel, execute);
+  await bootstrap(plist, execute);
+}
+
 export async function uninstallService() {
   bootout(serviceLabel);
   await rm(launchAgentFile, { force: true });

package/src/paths.mjs

@@ -14,7 +14,8 @@ export const stderrFile = join(installRoot, "service.error.log");
 export const launchAgentFile = join(homedir(), "Library", "LaunchAgents", `${serviceLabel}.plist`);
 export const legacyLaunchAgentFile = join(homedir(), "Library", "LaunchAgents", `${legacyServiceLabel}.plist`);
 export const cursorDatabaseFile = join(homedir(), "Library", "Application Support", "Cursor", "User", "globalStorage", "state.vscdb");
-export const cursorAppOutDirectory = "/Applications/Cursor.app/Contents/Resources/app/out";
+export const cursorAppPath = "/Applications/Cursor.app";
+export const cursorAppOutDirectory = join(cursorAppPath, "Contents", "Resources", "app", "out");
 export const cursorWorkbenchFile = join(cursorAppOutDirectory, "vs", "workbench", "workbench.desktop.main.js");
 export const cursorGlassWorkbenchFile = join(cursorAppOutDirectory, "vs", "workbench", "workbench.glass.main.js");
 export const cursorModelMetadataFiles = [cursorWorkbenchFile, cursorGlassWorkbenchFile];

package/src/service.mjs

@@ -1,9 +1,10 @@
 import { randomBytes } from "node:crypto";
 import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
 import { buildActiveCatalog } from "./catalog.mjs";
-import { startCursorModelMetadataPatchMonitor } from "./cursor-patch.mjs";
+import { clearCursorAppQuarantine, startCursorModelMetadataPatchMonitor } from "./cursor-patch.mjs";
 import {
   cursorIsRunning,
+  cursorUpdateIsRunning,
   readPendingCatalog,
 } from "./cursor-state.mjs";
 import { startGateway } from "./gateway.mjs";
@@ -27,6 +28,7 @@ export async function runService(options = {}) {
   let refreshPromise = null;
   let cursorSyncPromise = null;
   let wasCursorRunning = cursorIsRunning();
+  let cursorPatchReady = false;
   let stopped = false;
 
   const refresh = async () => {
@@ -37,7 +39,10 @@ export async function runService(options = {}) {
         if (JSON.stringify(next) === JSON.stringify(catalog)) return;
         catalog = next;
         await saveCatalogSnapshot(catalog);
-        const result = await applyOrQueueCatalog(catalog, { createBackup: false });
+        const result = await applyOrQueueCatalog(catalog, {
+          createBackup: false,
+          defer: !cursorPatchReady,
+        });
         process.stdout.write(`${result.status === "queued" ? "Queued" : "Synced"} ${result.modelCount} Cursor models\n`);
       } catch (error) {
         process.stderr.write(`Catalog refresh failed: ${error.message}\n`);
@@ -61,19 +66,36 @@ export async function runService(options = {}) {
   const server = startGateway({ secret, getCatalog: () => catalog, host: options.host, port: options.port });
   const patchMonitor = startCursorModelMetadataPatchMonitor({
     intervalMs: options.cursorPatchIntervalMs,
-    shouldPatch: () => !cursorIsRunning(),
+    stableMs: options.cursorPatchStableMs ?? 5_000,
+    shouldPatch: () => !cursorIsRunning() && !cursorUpdateIsRunning(),
     onResult: (result) => {
       if (result.status === "patched") process.stdout.write(`Patched Cursor app file ${result.file} (backup: ${result.backupPath})\n`);
     },
-    onError: (error, file) => process.stderr.write(`Cursor patch failed for ${file}: ${error.message}\n`),
+    onPatched: () => {
+      try {
+        clearCursorAppQuarantine();
+      } catch (error) {
+        process.stderr.write(`Cursor quarantine removal failed: ${error.message}\n`);
+      }
+    },
+    onReady: () => {
+      cursorPatchReady = true;
+      wasCursorRunning = true;
+    },
+    onError: (error, file) => {
+      cursorPatchReady = false;
+      process.stderr.write(`Cursor patch failed for ${file}: ${error.message}\n`);
+    },
   });
   const refreshTimer = setInterval(refresh, options.refreshIntervalMs || 15_000);
   const pendingTimer = setInterval(() => {
     if (cursorSyncPromise) return;
     if (cursorIsRunning()) {
       wasCursorRunning = true;
+      cursorPatchReady = false;
       return;
     }
+    if (!cursorPatchReady) return;
     cursorSyncPromise = (async () => {
       const pending = await readPendingCatalog();
       const next = pending || (wasCursorRunning ? catalog : null);

package/src/sync.mjs

@@ -25,16 +25,20 @@ export async function saveCatalogSnapshot(catalog) {
 }
 
 export async function applyOrQueueCatalog(catalog, options = {}) {
-  if (cursorIsRunning()) {
-    await writePendingCatalog(catalog);
+  const running = options.cursorRunning ?? cursorIsRunning();
+  const queueCatalog = options.writePendingCatalog || writePendingCatalog;
+  if (options.defer || running) {
+    await queueCatalog(catalog);
     return {
       status: "queued",
       modelCount: catalog.length,
       effortCount: catalog.filter(({ reasoningEfforts }) => reasoningEfforts.length > 0).length,
     };
   }
-  const result = await syncCursorDatabase(catalog, options);
-  await clearPendingCatalog();
+  const syncDatabase = options.syncCursorDatabase || syncCursorDatabase;
+  const clearPending = options.clearPendingCatalog || clearPendingCatalog;
+  const result = await syncDatabase(catalog, options);
+  await clearPending();
   return { status: "synced", ...result };
 }