ocx-cursor 0.5.0 → 0.5.2

package/README.md

@@ -3,244 +3,116 @@
 [![npm version](https://img.shields.io/npm/v/ocx-cursor.svg)](https://www.npmjs.com/package/ocx-cursor)
 [![CI](https://github.com/hiddenest/opencodex-cursor-bridge/actions/workflows/ci.yml/badge.svg)](https://github.com/hiddenest/opencodex-cursor-bridge/actions/workflows/ci.yml)
 
-Use active [OpenCodex](https://github.com/lidge-jun/opencodex) models in Cursor through its custom OpenAI endpoint. The package runs a loopback-only gateway, registers it in Cursor, and keeps Cursor's custom model list in sync.
+Use your active [OpenCodex](https://github.com/lidge-jun/opencodex) models in Cursor through a local OpenAI-compatible gateway.
 
-## Requirements
-
-- macOS with Cursor installed at `/Applications/Cursor.app`
-- Node.js 22.5 or newer
-- OpenCodex installed and configured
-
-Launch Cursor and sign in once before setup. Cursor creates the Safe Storage key that the installer uses to encrypt the gateway API key.
-
-## Setup
+> [!WARNING]
+> This package edits private JavaScript files inside `Cursor.app`. The changes invalidate Cursor's vendor signature, so Cursor may report that the installation is corrupt. The installer saves original files under `~/.opencodex/cursor-bridge/cursor-app-backups`. Reinstall Cursor to restore a signed app.
 
-### 1. Install OpenCodex
+## Quick start
 
-[OpenCodex](https://github.com/lidge-jun/opencodex) requires Node.js 18 or newer and bundles its own Bun runtime. This bridge requires Node.js 22.5 or newer, so install Node.js 22 or later before continuing.
+You need macOS, Node.js 22.5 or newer, and Cursor at `/Applications/Cursor.app`.
 
-Install OpenCodex without `sudo` from a user-owned Node.js installation:
+Install and configure OpenCodex:
 
 ```bash
 npm install --global @bitkyc08/opencodex
 ocx init
-```
-
-The bridge service looks for `ocx` at `~/.local/bin/ocx` and `/opt/homebrew/bin/ocx`. If `command -v ocx` prints another path, link it into `~/.local/bin`:
-
-```bash
-mkdir -p ~/.local/bin
-if [[ "$(command -v ocx)" != "$HOME/.local/bin/ocx" ]]; then
-  ln -sf "$(command -v ocx)" ~/.local/bin/ocx
-fi
-```
-
-`ocx init` opens the interactive provider setup. You can also configure providers through the dashboard or terminal:
-
-```bash
-ocx gui
-ocx login <provider>
-```
-
-Install OpenCodex as a login service, then verify it:
-
-```bash
 ocx service install
 ocx service status
-curl http://127.0.0.1:10100/v1/models
 ```
 
-If you configured OpenCodex with a service API token, include it in the request:
+Check the configured models:
 
 ```bash
-curl \
-  --header "Authorization: Bearer $(cat ~/.opencodex/service-api-token)" \
-  http://127.0.0.1:10100/v1/models
+ocx models --json
 ```
 
-See the [OpenCodex documentation](https://lidge-jun.github.io/opencodex/) for provider-specific setup.
-
-### 2. Install the Cursor bridge
-
-Quit Cursor completely, confirm that OpenCodex is running, then initialize the bridge:
+Launch Cursor and sign in once, then quit it. Run the bridge installer:
 
 ```bash
 npx ocx-cursor init
+~/.local/bin/ocx-cursor status
 ```
 
-No tunnel or public domain is required. `init` uses `http://127.0.0.1:10101/v1` and performs these actions:
-
-1. Generates a gateway API key in `~/.opencodex/cursor-bridge/secret`.
-2. Installs the `com.opencodex.cursor-bridge` LaunchAgent.
-3. Tests the local gateway and OpenCodex model endpoint.
-4. Stores the key in Cursor with macOS Safe Storage encryption.
-5. Registers the local gateway as Cursor's OpenAI base URL.
-6. Adds active OpenCodex models to Cursor under `opencodex/*`.
-7. Enables Cursor's local-agent mode and installs the model metadata patches described below.
-
-`init` patches ten JavaScript files inside `Cursor.app`:
-
-- Eight Cursor bundles get the local-mode build flag.
-- The Desktop and Glass workbench bundles retain OpenCodex display names, effort choices, and Fast metadata when Cursor refreshes its server catalog.
-- Both local-agent runtimes display names such as `GPT 5.6 Sol` while keeping `opencodex/gpt-5.6-sol` as the request ID.
+`init` registers `http://127.0.0.1:10101/v1` in Cursor. You do not need a domain or tunnel. Open Cursor after the status command reports `Service: running` and `Gateway: healthy`.
 
-Original files are copied to `~/.opencodex/cursor-bridge/cursor-app-backups` before they are changed. The LaunchAgent watches the same files and reapplies the patches after a Cursor update, once Cursor has quit.
-
-> [!WARNING]
-> Patching `Cursor.app` invalidates its vendor code signature. Cursor may show “Your Cursor installation appears to be corrupt.” This is expected for this integration. Reinstall Cursor to restore an unmodified, vendor-signed app.
-
-The installer links `ocx-cursor` into `~/.local/bin`. Add that directory to `PATH` if needed:
+Add the installed command to your shell path if needed:
 
 ```bash
 export PATH="$HOME/.local/bin:$PATH"
 ```
 
-Check the service before opening Cursor:
-
-```bash
-ocx-cursor status
-curl http://127.0.0.1:10101/healthz
-```
-
-The status output should show `Service: running` and `Gateway: healthy`. Open Cursor after both checks pass.
-
-To use an explicit HTTPS reverse proxy instead, pass its URL directly. This is optional and not used by the default setup:
-
-```bash
-npx ocx-cursor init --base-url https://cursor-api.example.com/v1
-```
+## What init changes
 
-### Fast mode
-
-OpenAI models whose OpenCodex catalog advertises the `priority` service tier show a Fast toggle in Cursor. Fast is off by default. When enabled, the bridge sends `service_tier: "priority"` to OpenCodex, which increases generation speed and consumes more usage.
-
-Fast requires an OpenCodex version that preserves `service_tier` on its Chat Completions compatibility endpoint. Models without the `priority` tier, including Anthropic subscription models, do not receive the toggle.
+| Area | Change |
+| --- | --- |
+| Cursor settings | Stores the gateway key with macOS Safe Storage and sets the local base URL. |
+| Cursor model state | Adds active models under `opencodex/*` with names, effort choices, and Fast metadata. |
+| `Cursor.app` | Enables local-agent mode in eight bundles and patches two local-agent runtimes. |
+| Login service | Installs `com.opencodex.cursor-bridge`, refreshes models, and reapplies patches after Cursor updates. |
 
-## How requests are routed
+Requests stay on loopback until OpenCodex sends them to your configured provider:
 
 ```text
-Cursor
-  -> OpenCodex Cursor Bridge on http://127.0.0.1:10101/v1
-  -> OpenCodex on http://127.0.0.1:10100
-  -> configured provider
+Cursor -> 127.0.0.1:10101 -> OpenCodex on 127.0.0.1:10100 -> provider
 ```
 
-The gateway API key is generated during `init` and stored in Cursor with macOS Safe Storage encryption. The bridge requires this bearer token on every `/v1/*` request and binds to `127.0.0.1` by default.
-
-## Commands
-
-| Command | Purpose |
-| --- | --- |
-| `ocx-cursor init [--base-url URL]` | Install the service, test the endpoint, configure Cursor, and sync models. Cursor must be closed. |
-| `ocx-cursor install` | Reinstall the LaunchAgent and verify app patches, or queue them until Cursor quits. |
-| `ocx-cursor update` | Download the latest release from npm, reinstall the service, verify patches, and sync models. |
-| `ocx-cursor sync` | Refresh the active model catalog. The service queues the update while Cursor runs. |
-| `ocx-cursor launch` | Experimentally launch Cursor with live effort and Fast metadata injection. Keep the command running. |
-| `ocx-cursor status` | Show service health, model count, and pending sync state. |
-| `ocx-cursor uninstall` | Remove the LaunchAgent, command link, and bridge home directory. |
-
-`uninstall` leaves Cursor's custom endpoint, model records, and app patches in place. Reinstall Cursor if you want to restore its original signed files.
+The gateway requires its generated bearer token on every `/v1/*` request. It binds to `127.0.0.1` unless you change `OCX_CURSOR_HOST`.
 
-`update` preserves the existing gateway API key and Cursor endpoint. If Cursor is running, app patches and model sync are queued until it quits. The command updates only this companion package; update OpenCodex separately with your package manager.
+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 mapping
+## Model behavior
 
-The bridge maps source model IDs to Cursor aliases:
+The bridge reads OpenCodex's active `/v1/models` response and creates stable Cursor aliases:
 
 ```text
-anthropic/claude-sonnet-5  -> opencodex/claude-sonnet-5
-gpt-5.6-sol                -> opencodex/gpt-5.6-sol
+anthropic/claude-sonnet-5 -> opencodex/claude-sonnet-5
+gpt-5.6-sol               -> opencodex/gpt-5.6-sol
 ```
 
-The catalog includes every model returned by OpenCodex's active `/v1/models` endpoint, including models from the `cursor/*` provider. Cursor-backed aliases use the `opencodex/cursor/*` prefix so they remain distinct from Cursor's built-in entries.
-
-Cursor removes custom effort metadata from its database during startup. The companion LaunchAgent patches the Desktop and Glass catalog storage steps so `opencodex/*` display names, effort, and Fast metadata survive server refreshes. It monitors the installed bundles and local-agent runtimes, then reapplies their patches when Cursor replaces the app during an update.
-
-`init`, `install`, and `update` also patch Cursor's local model runtimes so provider refreshes keep human-readable names such as `GPT 5.6 Sol` while requests continue using stable `opencodex/*` model IDs.
+Cursor shows readable names such as `GPT 5.6 Sol`. Reasoning models receive an effort selector. Models with OpenCodex's `priority` service tier receive a Fast toggle.
 
-Cursor sends some built-in function tools with `strict: true` even when their JSON schema is not valid for strict mode. The gateway changes that flag to `false` for OpenCodex requests, preventing errors such as `additionalProperties is required to be supplied and to be false` without changing tool arguments.
+Cursor can send `strict: true` with function schemas that fail strict validation. The gateway changes the flag to `false` before forwarding those requests. It leaves tool names, descriptions, and arguments intact.
 
-### Experimental live model metadata
+## Commands and configuration
 
-`ocx-cursor launch` starts Cursor with a random loopback-only debugging port and keeps `opencodex/*` effort and Fast metadata in the live model catalog:
-
-```bash
-ocx-cursor launch
-```
-
-Keep the command running for the lifetime of Cursor. This does not modify `Cursor.app`, but it depends on Cursor's private workbench code and supports only known Cursor builds.
-
-## Configuration
+| Command | Purpose |
+| --- | --- |
+| `ocx-cursor init` | Install the service, configure Cursor, patch the app, and sync models. Cursor must be closed. |
+| `ocx-cursor install` | Reinstall the service and check app patches. Running Cursor defers app changes until exit. |
+| `ocx-cursor update` | Install the newest npm release and run `install`. |
+| `ocx-cursor sync` | Refresh the active model list. |
+| `ocx-cursor status` | Show service health and pending model sync. |
+| `ocx-cursor uninstall` | Remove the service, command link, and bridge state. |
 
-| Variable | Default | Purpose |
-| --- | --- | --- |
-| `OCX_CURSOR_BASE_URL` | `http://127.0.0.1:10101/v1` | Endpoint used by `init` when `--base-url` is absent. |
-| `OCX_CURSOR_HOME` | `~/.opencodex/cursor-bridge` | Service state, API key, catalog, and logs. |
-| `OCX_CURSOR_HOST` | `127.0.0.1` | Local gateway bind address. |
-| `OCX_CURSOR_PORT` | `10101` | Local gateway port. Also changes the default Cursor endpoint. |
-| `OCX_BIN` | `~/.local/bin/ocx` | OpenCodex CLI path. |
+`uninstall` does not restore Cursor settings or patched app files. Reinstall Cursor if you want a clean vendor build.
 
-The gateway accepts these routes:
+| Variable | Default |
+| --- | --- |
+| `OCX_CURSOR_BASE_URL` | `http://127.0.0.1:10101/v1` |
+| `OCX_CURSOR_HOME` | `~/.opencodex/cursor-bridge` |
+| `OCX_CURSOR_HOST` | `127.0.0.1` |
+| `OCX_CURSOR_PORT` | `10101` |
+| `OCX_BIN` | `~/.local/bin/ocx` |
 
-- `GET /v1/models`
-- `POST /v1/chat/completions`
-- `POST /v1/responses` and `/v1/responses/compact`
-- `POST /v1/messages`
+The bridge reads an OpenCodex service token from `~/.opencodex/service-api-token` when that file exists.
 
 ## Troubleshooting
 
-### Cursor returns 401
-
-Quit Cursor and run `init` again. It preserves the bridge key, tests the local endpoint, and writes the matching encrypted value back to Cursor:
-
-```bash
-npx ocx-cursor init
-```
-
-### The local gateway is unavailable
-
-Check the service and logs, then reinstall it if needed:
-
-```bash
-ocx-cursor status
-tail -n 100 ~/.opencodex/cursor-bridge/service.error.log
-tail -n 100 ~/.opencodex/cursor-bridge/service.log
-ocx-cursor install
-```
-
-### Models or effort options are missing
-
-Quit Cursor and run:
-
-```bash
-ocx-cursor sync
-ocx-cursor status
-```
-
-If the status shows a pending sync, wait until every Cursor Helper process has exited. The service applies the queued catalog automatically.
-
-### Patches are missing after a Cursor update
-
-Quit every Cursor window and wait for its Helper processes to stop. The LaunchAgent detects replaced app files and reapplies local mode, metadata, and display-name patches. Check the result with:
+| Symptom | Fix |
+| --- | --- |
+| Cursor returns 401 | Quit Cursor and rerun `npx ocx-cursor init`. |
+| Models or effort choices are missing | Quit Cursor, run `ocx-cursor sync`, then check `ocx-cursor status`. |
+| A Cursor update removed the patches | Quit Cursor and run `ocx-cursor install`. |
+| The gateway is unavailable | Run `ocx-cursor status` and inspect the logs below. |
+| The bridge cannot find `ocx` | Run `ln -sf "$(command -v ocx)" ~/.local/bin/ocx`. |
 
 ```bash
-ocx-cursor install
 tail -n 100 ~/.opencodex/cursor-bridge/service.log
+tail -n 100 ~/.opencodex/cursor-bridge/service.error.log
 ```
 
-The patcher stops without modifying a file when a Cursor release no longer matches its known code structure. Check `service.error.log` in that case.
-
-### OpenCodex models cannot be loaded
-
-Check OpenCodex first:
-
-```bash
-ocx status
-ocx models --json
-curl http://127.0.0.1:10100/v1/models
-```
-
-If `ocx models --json` works in your shell but fails in the bridge, check that `ocx` is available at `~/.local/bin/ocx` or `/opt/homebrew/bin/ocx`. The macOS LaunchAgent does not load your interactive shell profile.
+The patcher stops when a Cursor update no longer matches its known code structure. It reports the file and mismatch in `service.error.log` without replacing that file.
 
 ## Development
 
@@ -250,14 +122,4 @@ npm run check
 npm pack --dry-run
 ```
 
-The code uses `node:sqlite`, so development requires Node.js 22.5 or newer.
-
-## Compatibility
-
-The package writes Cursor's local state database, uses Cursor's Safe Storage format, and modifies private code inside `Cursor.app`. Cursor does not document these interfaces. A Cursor update can change them.
-
-The current release supports macOS. It does not configure Windows Credential Manager, Linux keyrings, or system services outside launchd.
-
-## License
-
-MIT
+The project uses the MIT license.

package/package.json

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

package/src/cursor-patch.mjs

@@ -9,28 +9,44 @@ import {
   cursorWorkbenchFile,
 } from "./paths.mjs";
 
-export const cursorPatchMarker = "/*ocx-cursor-model-metadata-v3*/";
+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*/";
 
 export function isCursorModelMetadataBundle(file) {
   return file === cursorWorkbenchFile || file === cursorGlassWorkbenchFile;
 }
 
 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(?:-v2)?\*\/(?<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;
+const localRuntimeProviderPickerInput = /supportsReasoning:(?<reasoning>!0===\(null===\((?<capability>[A-Za-z_$][\w$]*)=(?<model>[A-Za-z_$][\w$]*)\.capabilities\)\|\|void 0===\k<capability>\?void 0:\k<capability>\.supports_reasoning\)),supportsVision:/g;
+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"]);
 
+function replaceSingleMatch(source, pattern, replacement, label) {
+  const matches = [...source.matchAll(pattern)];
+  if (matches.length !== 1) throw new Error(`Expected one Cursor ${label}, found ${matches.length}`);
+  const match = matches[0];
+  const value = typeof replacement === "function" ? replacement(match) : replacement;
+  return `${source.slice(0, match.index)}${value}${source.slice(match.index + match[0].length)}`;
+}
+
 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 ocxCursorVariants=(ocxCursorStored?.variants??ocxCursorModel.variants??[]).map(ocxCursorVariant=>({...ocxCursorVariant,displayName:ocxCursorPrettyLabel(ocxCursorVariant.displayName),displayNameOutsidePicker:ocxCursorPrettyLabel(ocxCursorVariant.displayNameOutsidePicker)}));return{...ocxCursorModel,clientDisplayName:ocxCursorDisplayName,inputboxShortModelName:ocxCursorDisplayName,parameterDefinitions:ocxCursorStored?.parameterDefinitions??ocxCursorModel.parameterDefinitions??[],variants:ocxCursorVariants,legacySlugs:ocxCursorStored?.legacySlugs??ocxCursorModel.legacySlugs??[],supportsThinking:ocxCursorStored?.supportsThinking??ocxCursorModel.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*/")) {
+  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}`);
@@ -81,19 +97,103 @@ export function patchCursorBundleSource(source, options = {}) {
   };
 }
 
-export function patchCursorLocalRuntimeSource(source) {
-  if (source.includes(cursorLocalRuntimePatchMarker)) return { status: "already-patched", source };
+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:[]})}`;
-  return {
-    status: "patched",
-    source: `${source.slice(0, match.index)}${replacement}${source.slice(match.index + match[0].length)}`,
-  };
+  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)}`;
+}
+
+function patchCursorLocalRuntimeCapabilities(source) {
+  source = replaceSingleMatch(source, localRuntimeVisionCapability, (match) => {
+    const object = match.groups.object;
+    return `${match[0].slice(0, -1)},"boolean"==typeof ${object}.supports_fast?{supports_fast:${object}.supports_fast}:{})`;
+  }, "local model capability parser");
+
+  source = replaceSingleMatch(source, localRuntimePickerInput, (match) => {
+    const capabilities = match.groups.capabilities;
+    return match[0].replace(
+      ",supportsVision:",
+      `,reasoningEfforts:Array.isArray(${capabilities}?.reasoning_effort)?${capabilities}.reasoning_effort:void 0,supportsFast:!0===${capabilities}?.supports_fast,supportsVision:`,
+    );
+  }, "local picker input mapper");
+
+  source = patchCursorLocalRuntimeProviderCapabilities(source);
+
+  source = replaceSingleMatch(source, localRuntimeRequestParameters, (match) => {
+    const { payload, parameters } = match.groups;
+    return `${match[0]}const ocxCursorFast=${parameters}?.find(ocxCursorParameter=>ocxCursorParameter.id==="fast")?.value;if(ocxCursorFast==="true")${payload}.service_tier="priority";else if(ocxCursorFast==="false")delete ${payload}.service_tier;`;
+  }, "local request parameter mapper");
+
+  const exportMatches = [...source.matchAll(localRuntimeBuilderExport)];
+  if (exportMatches.length !== 1) {
+    throw new Error(`Expected one Cursor local picker builder export, found ${exportMatches.length}`);
+  }
+  const builderName = exportMatches[0].groups.builder;
+  const builderStart = source.indexOf(`function ${builderName}(`, exportMatches[0].index);
+  if (builderStart === -1) throw new Error("Cursor local picker builder was not found");
+  const builderHead = source.slice(builderStart, builderStart + 1_000);
+  const modelBuilderName = /\.push\((?<name>[A-Za-z_$][\w$]*)\(/.exec(builderHead)?.groups.name;
+  if (!modelBuilderName) throw new Error("Cursor local picker model builder was not found");
+
+  const modelBuilderStart = source.indexOf(`function ${modelBuilderName}(`, builderStart);
+  const modelBuilderSource = source.slice(modelBuilderStart, modelBuilderStart + 6_000);
+  const signature = new RegExp(`function ${modelBuilderName}\\((?<model>[A-Za-z_$][\\w$]*),(?<tier>[A-Za-z_$][\\w$]*)\\)\\{var [^;]+;const (?<effort>[A-Za-z_$][\\w$]*)=function\\((?<inner>[A-Za-z_$][\\w$]*)\\)\\{`).exec(modelBuilderSource);
+  if (!signature) throw new Error("Cursor local picker model effort builder was not found");
+  const { model, effort } = signature.groups;
+  const effortPrefix = `const ${effort}=function(`;
+  const effortIndex = modelBuilderSource.indexOf(effortPrefix);
+  const effortReplacement = `const ${effort}=Array.isArray(${model}.reasoningEfforts)&&${model}.reasoningEfforts.length>0?{param:"reasoning_effort",values:${model}.reasoningEfforts,defaultValue:${model}.reasoningEfforts.includes("medium")?"medium":${model}.reasoningEfforts.includes("high")?"high":${model}.reasoningEfforts[0]}:function(`;
+  let patchedBuilder = `${modelBuilderSource.slice(0, effortIndex)}${effortReplacement}${modelBuilderSource.slice(effortIndex + effortPrefix.length)}`;
+
+  const definitions = new RegExp(`(?<name>[A-Za-z_$][\\w$]*)=\\[\\.\\.\\.void 0!==${effort}\\?`).exec(patchedBuilder)?.groups.name;
+  const parameterClass = /new (?<name>[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)?)\(\{id:"reasoning"/.exec(patchedBuilder)?.groups.name;
+  if (!definitions || !parameterClass) throw new Error("Cursor local picker parameter definition builder was not found");
+  const definitionsEnd = patchedBuilder.indexOf("];var ", patchedBuilder.indexOf(`${definitions}=[`));
+  if (definitionsEnd === -1) throw new Error("Cursor local picker parameter definitions were not terminated");
+  const fastDefinition = `];${model}.supportsFast&&${definitions}.push(new ${parameterClass}({id:"fast",name:"Fast",markdownTooltip:"Use priority processing with increased usage.",parameterType:{booleanParameter:{values:[{value:"false"},{value:"true",displayName:"Fast",increasesModelCost:!0}]}},isCycleableByHotkey:!1}))`;
+  patchedBuilder = `${patchedBuilder.slice(0, definitionsEnd)}${fastDefinition}${patchedBuilder.slice(definitionsEnd + 1)}`;
+
+  const variantMatch = new RegExp(`variants:(?<call>[A-Za-z_$][\\w$]*\\(${effort},(?<context>[A-Za-z_$][\\w$]*),(?<display>[A-Za-z_$][\\w$]*),(?<tier>[A-Za-z_$][\\w$]*)\\))`).exec(patchedBuilder);
+  if (!variantMatch) throw new Error("Cursor local picker variant builder was not found");
+  const variantReplacement = `variants:ocxCursorFastVariants(${variantMatch.groups.call},${model}.supportsFast,${variantMatch.groups.display})`;
+  patchedBuilder = `${patchedBuilder.slice(0, variantMatch.index)}${variantReplacement}${patchedBuilder.slice(variantMatch.index + variantMatch[0].length)}`;
+
+  source = `${source.slice(0, modelBuilderStart)}${patchedBuilder}${source.slice(modelBuilderStart + modelBuilderSource.length)}`;
+  const helper = `${cursorLocalRuntimeCapabilitiesPatchMarker}function ocxCursorFastVariants(e,t,n){if(!t)return e;const r=e.length>0?e:[{parameterValues:[],displayName:n,displayNameOutsidePicker:n,isMaxMode:!1,isDefaultNonMaxConfig:!0,isDefaultMaxConfig:!0}];return r.flatMap(e=>[{...e,parameterValues:[...(e.parameterValues??[]),{id:"fast",value:"false"}]},{...e,parameterValues:[...(e.parameterValues??[]),{id:"fast",value:"true"}],displayName:e.displayName+" Fast",displayNameOutsidePicker:(e.displayNameOutsidePicker??e.displayName)+" Fast",isDefaultNonMaxConfig:!1,isDefaultMaxConfig:!1}])}`;
+  return `${source.slice(0, builderStart)}${helper}${source.slice(builderStart)}`;
+}
+
+function patchCursorLocalRuntimeProviderCapabilities(source) {
+  return replaceSingleMatch(source, localRuntimeProviderPickerInput, (match) => {
+    const { model, reasoning } = match.groups;
+    return `supportsReasoning:${reasoning},reasoningEfforts:Array.isArray(${model}.capabilities?.reasoning_effort)?${model}.capabilities.reasoning_effort:void 0,supportsFast:!0===${model}.capabilities?.supports_fast,supportsVision:`;
+  }, "standalone local provider picker mapper");
+}
+
+export function patchCursorLocalRuntimeSource(source) {
+  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 };
+  }
+  return { status: "patched", source: patchCursorLocalRuntimeCapabilities(displayPatched) };
 }
 
 export async function cursorWorkbenchSignature(file = cursorWorkbenchFile) {

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);
       });