cursor-openai-byok 1.1.3 → 1.1.4

package/lib/cli.js

@@ -144,7 +144,7 @@ async function doctor(options) {
 
   try {
     const st = patcher.status(options);
-    checks.push({ name: "cursor", ok: st.supportedVersion, ...st });
+    checks.push({ name: "cursor", ok: st.supportedVersion && st.patched, ...st });
   } catch (err) {
     checks.push({ name: "cursor", ok: false, error: err.message });
   }
@@ -266,7 +266,7 @@ module.exports = {
 "package.json": function(module, exports, require, __filename, __dirname) {
 module.exports = {
   "name": "cursor-openai-byok",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Local BYOK bridge for Cursor using OpenAI-compatible providers.",
   "displayName": "Cursor OpenAI BYOK",
   "publisher": "cursor-openai-byok",
@@ -1028,8 +1028,7 @@ function candidateCursorAppRoots() {
 function findCursorAppRoot(explicitRoot) {
   const roots = explicitRoot ? [explicitRoot] : candidateCursorAppRoots();
   for (const root of roots) {
-    const workbench = workbenchPath(root);
-    if (fs.existsSync(workbench)) return root;
+    if (workbenchPaths(root).length > 0) return root;
   }
   throw new Error(`Cursor app root not found. Checked: ${roots.join(", ")}`);
 }
@@ -1038,6 +1037,13 @@ function workbenchPath(appRoot) {
   return path.join(appRoot, "out", "vs", "workbench", "workbench.desktop.main.js");
 }
 
+function workbenchPaths(appRoot) {
+  const dir = path.join(appRoot, "out", "vs", "workbench");
+  return ["workbench.desktop.main.js", "workbench.glass.main.js"]
+    .map((name) => path.join(dir, name))
+    .filter((file) => fs.existsSync(file));
+}
+
 function productJsonPath(appRoot) {
   return path.join(appRoot, "product.json");
 }
@@ -1056,6 +1062,7 @@ function readCursorInfo(appRoot) {
     version: product.version || pkg.version || "unknown",
     commit: product.commit || "unknown",
     workbenchPath: workbenchPath(appRoot),
+    workbenchPaths: workbenchPaths(appRoot),
   };
 }
 
@@ -1063,6 +1070,7 @@ module.exports = {
   candidateCursorAppRoots,
   findCursorAppRoot,
   workbenchPath,
+  workbenchPaths,
   readCursorInfo,
 };
 
@@ -1831,16 +1839,29 @@ const MODEL_ENRICH_NEEDLE = `s=XI_(s,a.models);`;
 function status(options = {}) {
   const appRoot = findCursorAppRoot(options.appRoot);
   const info = readCursorInfo(appRoot);
-  const source = fs.readFileSync(info.workbenchPath, "utf8");
-  const unary = findUnaryPatchPoint(source);
+  const bundles = info.workbenchPaths.map((workbenchPath) => bundleStatus(workbenchPath));
   return {
     ...info,
     supportedVersion: isSupportedVersion(info.version),
+    patched: bundles.every((bundle) => bundle.patched),
+    legacyPatched: bundles.some((bundle) => bundle.legacyPatched),
+    hasRunLoopNeedle: bundles.every((bundle) => bundle.hasRunLoopNeedle),
+    hasConnectNeedle: bundles.every((bundle) => bundle.hasConnectNeedle),
+    hasUnaryNeedle: bundles.every((bundle) => bundle.hasUnaryNeedle),
+    hasModelEnrichNeedle: bundles.some((bundle) => bundle.hasModelEnrichNeedle),
+    bundles,
+  };
+}
+
+function bundleStatus(workbenchPath) {
+  const source = fs.readFileSync(workbenchPath, "utf8");
+  return {
+    workbenchPath,
     patched: source.includes(MARKER),
     legacyPatched: source.includes(LEGACY_MARKER),
     hasRunLoopNeedle: !!findRunLoopPatchPoint(source),
     hasConnectNeedle: !!findConnectHelperNeedle(source),
-    hasUnaryNeedle: !!unary || source.includes(`await ${MARKER}().patchAvailableModels(`),
+    hasUnaryNeedle: !!findUnaryPatchPoint(source) || source.includes(`await ${MARKER}().patchAvailableModels(`),
     hasModelEnrichNeedle: source.includes(MODEL_ENRICH_NEEDLE),
   };
 }
@@ -1851,41 +1872,58 @@ function installPatch(options = {}) {
   if (!isSupportedVersion(info.version) && !options.force) {
     throw new Error(`Unsupported Cursor version ${info.version}. Re-run with --force only after validating needles.`);
   }
-  let source = fs.readFileSync(info.workbenchPath, "utf8");
-  if (source.includes(MARKER)) return { ...info, changed: false, alreadyInstalled: true };
-  if (source.includes(LEGACY_MARKER) && !options.force) {
-    throw new Error("Legacy local BYOK patch is already present. Restore Cursor from backup or use --force after manual review.");
+  const changes = [];
+  for (const workbenchPath of info.workbenchPaths) {
+    let source = fs.readFileSync(workbenchPath, "utf8");
+    if (source.includes(MARKER)) continue;
+    if (source.includes(LEGACY_MARKER) && !options.force) {
+      throw new Error(`Legacy local BYOK patch is already present in ${workbenchPath}. Restore Cursor from backup or use --force after manual review.`);
+    }
+    source = patchSource(source, workbenchPath);
+    changes.push({ workbenchPath, source });
   }
+  if (changes.length === 0) return { ...info, changed: false, alreadyInstalled: true };
+
+  const backupPaths = changes.map(({ workbenchPath }) => backupWorkbench(workbenchPath));
+  changes.forEach(({ workbenchPath, source }) => fs.writeFileSync(workbenchPath, source));
+  return { ...info, changed: true, backupPath: backupPaths[0], backupPaths };
+}
+
+function patchSource(source, workbenchPath) {
   const connectNeedle = findConnectHelperNeedle(source);
   const unary = findUnaryPatchPoint(source);
   const runLoop = findRunLoopPatchPoint(source);
-  if (!runLoop) throw new Error("AgentCompatService.runAgentLoop needle not found");
-  if (!connectNeedle) throw new Error("Connect helper needle not found");
-  if (!unary) throw new Error("Unary transport needle not found");
+  if (!runLoop) throw new Error(`AgentCompatService.runAgentLoop needle not found in ${workbenchPath}`);
+  if (!connectNeedle) throw new Error(`Connect helper needle not found in ${workbenchPath}`);
+  if (!unary) throw new Error(`Unary transport needle not found in ${workbenchPath}`);
 
-  const backupPath = backupWorkbench(info.workbenchPath);
   source = source.replace(connectNeedle, helperSnippet() + connectNeedle);
   source = source.replace(unary.needle, `${unary.call};try{if(${unary.service}?.typeName==="aiserver.v1.AiService"&&${unary.method}?.name==="AvailableModels")await ${MARKER}().patchAvailableModels(${unary.response}.message,${unary.request})}catch{}${unary.returnStatement}`);
   if (source.includes(MODEL_ENRICH_NEEDLE)) {
     source = source.replace(MODEL_ENRICH_NEEDLE, `s=XI_(s,a.models);s=await ${MARKER}().enrichModels(s);`);
   }
   source = source.replace(runLoop.needle, runLoop.needle + agentLoopSnippet(runLoop.vars));
-  fs.writeFileSync(info.workbenchPath, source);
-  return { ...info, changed: true, backupPath };
+  return source;
 }
 
 function uninstallPatch(options = {}) {
   const appRoot = findCursorAppRoot(options.appRoot);
   const info = readCursorInfo(appRoot);
-  const backups = findBackups(info.workbenchPath).filter((file) => {
-    const data = fs.readFileSync(file, "utf8");
-    return !data.includes(MARKER);
+  const restores = info.workbenchPaths.map((workbenchPath) => {
+    const backups = findBackups(workbenchPath).filter((file) => !fs.readFileSync(file, "utf8").includes(MARKER));
+    if (backups.length === 0) throw new Error(`No suitable cursor-openai-byok backup found for ${workbenchPath}`);
+    return { workbenchPath, restoredFrom: backups[backups.length - 1] };
   });
-  if (backups.length === 0) throw new Error("No suitable cursor-openai-byok backup found");
-  const latest = backups[backups.length - 1];
-  const currentBackup = backupWorkbench(info.workbenchPath, "pre-uninstall");
-  fs.copyFileSync(latest, info.workbenchPath);
-  return { ...info, restoredFrom: latest, currentBackup };
+  restores.forEach((restore) => {
+    restore.currentBackup = backupWorkbench(restore.workbenchPath, "pre-uninstall");
+    fs.copyFileSync(restore.restoredFrom, restore.workbenchPath);
+  });
+  return {
+    ...info,
+    restoredFrom: restores[0].restoredFrom,
+    currentBackup: restores[0].currentBackup,
+    restores,
+  };
 }
 
 function backupWorkbench(workbenchPath, label = "backup") {
@@ -1899,7 +1937,7 @@ function findBackups(workbenchPath) {
   const dir = path.dirname(workbenchPath);
   const base = path.basename(workbenchPath);
   return fs.readdirSync(dir)
-    .filter((name) => name.startsWith(`${base}.backup-cursor-openai-byok-`) || name.includes("cursor-openai-byok"))
+    .filter((name) => name.startsWith(`${base}.`) && name.includes("cursor-openai-byok"))
     .map((name) => path.join(dir, name))
     .sort();
 }
@@ -1964,9 +2002,10 @@ function findRunLoopPatchPoint(source) {
   const start = Math.max(0, source.lastIndexOf("async runAgentLoop", anchor));
   const segment = source.slice(start, anchor + 500);
   const args = segment.match(/const\{userText:(\w+),richText:(\w+),mode:(\w+),selectedContext:(\w+),requestContext:(\w+),modelDetails:(\w+),generationUUID:(\w+),conversationId:(\w+),messageId:(\w+),[\s\S]{0,900}?conversationState:(\w+),/);
-  const context = segment.match(/const\s+\w+=\w+,\[(\w+),\w+\]=\w+\.withCancel\(\)/);
-  const adapter = segment.match(/\w+=\w+\(\w+\.withName\("AgentCompatService\.agentClientService\.run"\)\),(\w+)=new\s+\w+\(this\.instantiationService,[^;]+?\);/);
-  if (!args || !context || !adapter) return null;
+  const context = segment.match(/const\s+[\w$]+=[\w$]+,\[([\w$]+),[\w$]+\]=[\w$]+\.withCancel\(\)/);
+  const adapter = segment.match(/[\w$]+=[\w$]+\([\w$]+\.withName\("AgentCompatService\.agentClientService\.run"\)\),([\w$]+)=new\s+[\w$]+\(this\.instantiationService,[^;]+?\);/);
+  const functionArgs = segment.match(/async runAgentLoop\([\w$]+,([\w$]+)\)/);
+  if (!args || !context || !adapter || !functionArgs) return null;
   const eventFactory = findInteractionUpdateFactory(source);
   if (!eventFactory) return null;
   const needleStart = segment.indexOf(args[0]);
@@ -1986,7 +2025,7 @@ function findRunLoopPatchPoint(source) {
       conversationState: args[10],
       contextExpression: context[1],
       adapter: adapter[1],
-      event: "t",
+      event: functionArgs[1],
       eventFactory,
     },
   };

package/lib/daemon-entry.js

@@ -488,7 +488,7 @@ module.exports = {
 "package.json": function(module, exports, require, __filename, __dirname) {
 module.exports = {
   "name": "cursor-openai-byok",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Local BYOK bridge for Cursor using OpenAI-compatible providers.",
   "displayName": "Cursor OpenAI BYOK",
   "publisher": "cursor-openai-byok",

package/lib/watcher-entry.js

@@ -115,7 +115,7 @@ module.exports = {
 "package.json": function(module, exports, require, __filename, __dirname) {
 module.exports = {
   "name": "cursor-openai-byok",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Local BYOK bridge for Cursor using OpenAI-compatible providers.",
   "displayName": "Cursor OpenAI BYOK",
   "publisher": "cursor-openai-byok",
@@ -510,8 +510,7 @@ function candidateCursorAppRoots() {
 function findCursorAppRoot(explicitRoot) {
   const roots = explicitRoot ? [explicitRoot] : candidateCursorAppRoots();
   for (const root of roots) {
-    const workbench = workbenchPath(root);
-    if (fs.existsSync(workbench)) return root;
+    if (workbenchPaths(root).length > 0) return root;
   }
   throw new Error(`Cursor app root not found. Checked: ${roots.join(", ")}`);
 }
@@ -520,6 +519,13 @@ function workbenchPath(appRoot) {
   return path.join(appRoot, "out", "vs", "workbench", "workbench.desktop.main.js");
 }
 
+function workbenchPaths(appRoot) {
+  const dir = path.join(appRoot, "out", "vs", "workbench");
+  return ["workbench.desktop.main.js", "workbench.glass.main.js"]
+    .map((name) => path.join(dir, name))
+    .filter((file) => fs.existsSync(file));
+}
+
 function productJsonPath(appRoot) {
   return path.join(appRoot, "product.json");
 }
@@ -538,6 +544,7 @@ function readCursorInfo(appRoot) {
     version: product.version || pkg.version || "unknown",
     commit: product.commit || "unknown",
     workbenchPath: workbenchPath(appRoot),
+    workbenchPaths: workbenchPaths(appRoot),
   };
 }
 
@@ -545,6 +552,7 @@ module.exports = {
   candidateCursorAppRoots,
   findCursorAppRoot,
   workbenchPath,
+  workbenchPaths,
   readCursorInfo,
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cursor-openai-byok",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Local BYOK bridge for Cursor using OpenAI-compatible providers.",
   "displayName": "Cursor OpenAI BYOK",
   "publisher": "cursor-openai-byok",