cursor-openai-byok 1.0.2 → 1.1.3

package/lib/cli.js

@@ -109,16 +109,18 @@ function importCcursorConfig() {
 function install(options) {
   writeDefaultConfig();
   const patch = patcher.installPatch(options);
-  const extension = service.installExtension();
+  const extension = service.installExtension(options);
+  const lifecycle = service.installLifecycle(options);
   const storage = syncCursorStorage(listModels(loadConfig()));
-  print({ config: configPath(), patch, extension, storage });
+  print({ config: configPath(), patch, extension, lifecycle, storage });
 }
 
 function uninstall(options) {
   const stopped = service.stopBackground();
-  const extension = service.uninstallExtension();
+  const lifecycle = service.uninstallLifecycle();
+  const extension = service.uninstallExtension(options);
   const patch = patcher.uninstallPatch(options);
-  print({ stopped, extension, patch });
+  print({ stopped, lifecycle, extension, patch });
 }
 
 async function doctor(options) {
@@ -147,14 +149,17 @@ async function doctor(options) {
     checks.push({ name: "cursor", ok: false, error: err.message });
   }
 
-  checks.push({ name: "extension", ok: service.extensionStatus().installed, ...service.extensionStatus() });
+  const extension = service.extensionStatus(options);
+  checks.push({ name: "extension", ok: extension.installed, ...extension });
+  const lifecycle = service.lifecycleStatus(options);
+  checks.push({ name: "lifecycle", ok: lifecycle.installed, ...lifecycle });
   const runningPid = service.isRunning();
   checks.push({
     name: "daemon-process",
     ok: true,
     running: !!runningPid,
     pid: runningPid || undefined,
-    note: runningPid ? "server is running" : "server is expected to run only while Cursor extension is active",
+    note: runningPid ? "server is running" : "server is expected to run only while Cursor lifecycle is active",
   });
 
   try {
@@ -170,7 +175,7 @@ async function doctor(options) {
       ok: !runningPid,
       running: false,
       error: err.message,
-      note: runningPid ? "server pid exists but health check failed" : "health is skipped when Cursor is not running",
+      note: runningPid ? "server pid exists but health check failed" : "health is skipped when Cursor lifecycle is inactive",
     });
   }
 
@@ -214,6 +219,10 @@ function pidPath() {
   return path.join(configDir(), "daemon.pid");
 }
 
+function watcherPidPath() {
+  return path.join(configDir(), "watcher.pid");
+}
+
 function runtimePath(name) {
   return path.join(configDir(), name);
 }
@@ -245,6 +254,7 @@ module.exports = {
   configPath,
   logPath,
   pidPath,
+  watcherPidPath,
   runtimePath,
   platformName,
   cursorExtensionsDir,
@@ -256,16 +266,15 @@ module.exports = {
 "package.json": function(module, exports, require, __filename, __dirname) {
 module.exports = {
   "name": "cursor-openai-byok",
-  "version": "1.0.2",
+  "version": "1.1.3",
   "description": "Local BYOK bridge for Cursor using OpenAI-compatible providers.",
   "displayName": "Cursor OpenAI BYOK",
   "publisher": "cursor-openai-byok",
   "type": "commonjs",
+  "extensionKind": [
+    "ui"
+  ],
   "main": "./lib/extension.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://git.3weijia.com/base/ai/cursor-openai-byok.git"
-  },
   "keywords": [
     "cursor",
     "byok",
@@ -289,7 +298,7 @@ module.exports = {
     "registry": "https://registry.npmjs.org/"
   },
   "activationEvents": [
-    "*"
+    "onStartupFinished"
   ],
   "contributes": {
     "commands": [
@@ -458,12 +467,17 @@ function listModels(config) {
   return models;
 }
 
-function resolveModel(config, requestedModel) {
+function resolveModel(config, requestedModel, options = {}) {
   const models = listModels(config);
   const fallback = config.defaults && config.defaults.model;
   const target = requestedModel || fallback || (models[0] && models[0].displayName);
   const found = models.find((m) => m.displayName === target || m.apiModel === target);
   if (!found) {
+    if (options.allowUnconfigured && typeof target === "string" && target) {
+      const base = models.find((m) => m.displayName === fallback || m.apiModel === fallback) || models[0];
+      const provider = base && config.providers.find((p) => p.id === base.providerId);
+      if (provider) return { provider, model: { ...base, displayName: target, apiModel: target } };
+    }
     throw new Error(`Model ${target || "<empty>"} is not configured`);
   }
   const provider = config.providers.find((p) => p.id === found.providerId);
@@ -560,7 +574,7 @@ function toCursorModel(model) {
     vendorName: providerName,
     vendor: { id: 9000, displayName: providerName },
     tagline: "OpenAI-compatible BYOK",
-    visibleInRoutedModelView: true,
+    visibleInRoutedModelView: false,
     isUserAdded: true,
     byokModel: true,
   };
@@ -698,10 +712,13 @@ module.exports = { log, tailLog, redactText };
 "use strict";
 
 const fs = require("fs");
+const os = require("os");
 const path = require("path");
 const childProcess = require("child_process");
+const { findCursorAppRoot, readCursorInfo } = require("../patcher/cursor-paths");
 const {
   pidPath,
+  watcherPidPath,
   logPath,
   installedExtensionDir,
   cursorExtensionsDir,
@@ -759,7 +776,7 @@ function stopBackground() {
   return { stopped: true, pid };
 }
 
-function installExtension() {
+function installExtension(options = {}) {
   const sourceRoot = path.resolve(__dirname, "..", "..");
   const target = installedExtensionDir();
   ensureDir(cursorExtensionsDir());
@@ -773,7 +790,7 @@ function installExtension() {
   return { installed: true, extensionDir: target };
 }
 
-function uninstallExtension() {
+function uninstallExtension(options = {}) {
   const target = installedExtensionDir();
   removeInstalledExtensionVersions();
   removeFromCursorExtensionIndex();
@@ -781,9 +798,97 @@ function uninstallExtension() {
   return { uninstalled: true, extensionDir: target };
 }
 
-function extensionStatus() {
+function extensionStatus(options = {}) {
   const target = installedExtensionDir();
-  return { installed: fs.existsSync(path.join(target, "extension", "extension.js")), extensionDir: target };
+  return { installed: fs.existsSync(path.join(target, "lib", "extension.js")) || fs.existsSync(path.join(target, "extension", "extension.js")), extensionDir: target };
+}
+
+function installLifecycle(options = {}) {
+  const appRoot = findCursorAppRoot(options.appRoot);
+  if (!/^3\.11\./.test(readCursorInfo(appRoot).version)) return { installed: false, required: false };
+  if (process.platform === "darwin") return installLaunchAgent();
+  if (process.platform === "win32") return installWindowsWatcher();
+  return { installed: false, required: true, error: `Unsupported platform ${process.platform}` };
+}
+
+function uninstallLifecycle() {
+  if (process.platform === "darwin") {
+    const plist = launchAgentPath();
+    childProcess.spawnSync("launchctl", ["bootout", `gui/${process.getuid()}`, plist], { encoding: "utf8" });
+    fs.rmSync(plist, { force: true });
+  } else if (process.platform === "win32") {
+    childProcess.spawnSync("reg.exe", ["delete", "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", "/v", "CursorOpenAIByok", "/f"], { encoding: "utf8" });
+  }
+  stopWatcherProcess();
+  return { uninstalled: true };
+}
+
+function lifecycleStatus(options = {}) {
+  try {
+    const appRoot = findCursorAppRoot(options.appRoot);
+    if (!/^3\.11\./.test(readCursorInfo(appRoot).version)) return { installed: true, required: false, mode: "extension" };
+  } catch {}
+  if (process.platform === "darwin") return { installed: fs.existsSync(launchAgentPath()), required: true, mode: "launch-agent" };
+  if (process.platform === "win32") return { installed: !!watcherProcess(), required: true, mode: "startup-watcher" };
+  return { installed: false, required: true, mode: "unsupported" };
+}
+
+function installLaunchAgent() {
+  ensureConfigDir();
+  const plist = launchAgentPath();
+  const watcher = path.join(installedExtensionDir(), "lib", "watcher-entry.js");
+  fs.mkdirSync(path.dirname(plist), { recursive: true });
+  fs.writeFileSync(plist, launchAgentPlist(watcher));
+  childProcess.spawnSync("launchctl", ["bootout", `gui/${process.getuid()}`, plist], { encoding: "utf8" });
+  const result = childProcess.spawnSync("launchctl", ["bootstrap", `gui/${process.getuid()}`, plist], { encoding: "utf8" });
+  if (result.status !== 0) throw new Error(result.stderr || result.stdout || "Failed to install lifecycle LaunchAgent");
+  return { installed: true, required: true, mode: "launch-agent", file: plist };
+}
+
+function installWindowsWatcher() {
+  const watcher = path.join(installedExtensionDir(), "lib", "watcher-entry.js");
+  const command = `\"${nodeBin()}\" \"${watcher}\"`;
+  const result = childProcess.spawnSync("reg.exe", ["add", "HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", "/v", "CursorOpenAIByok", "/t", "REG_SZ", "/d", command, "/f"], { encoding: "utf8" });
+  if (result.status !== 0) throw new Error(result.stderr || result.stdout || "Failed to install lifecycle startup entry");
+  childProcess.spawn(nodeBin(), [watcher], { detached: true, stdio: "ignore" }).unref();
+  return { installed: true, required: true, mode: "startup-watcher" };
+}
+
+function launchAgentPath() {
+  return path.join(os.homedir(), "Library", "LaunchAgents", "cursor-openai-byok.lifecycle.plist");
+}
+
+function launchAgentPlist(watcher) {
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0"><dict>
+<key>Label</key><string>cursor-openai-byok.lifecycle</string>
+<key>ProgramArguments</key><array><string>${escapeXml(nodeBin())}</string><string>${escapeXml(watcher)}</string></array>
+<key>RunAtLoad</key><true/><key>KeepAlive</key><true/>
+<key>StandardOutPath</key><string>${escapeXml(logPath())}</string>
+<key>StandardErrorPath</key><string>${escapeXml(logPath())}</string>
+</dict></plist>
+`;
+}
+
+function escapeXml(value) {
+  return String(value).replace(/[&<>"']/g, (ch) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&apos;" })[ch]);
+}
+
+function watcherProcess() {
+  try {
+    const pid = Number(fs.readFileSync(watcherPidPath(), "utf8"));
+    process.kill(pid, 0);
+    return pid;
+  } catch {
+    return false;
+  }
+}
+
+function stopWatcherProcess() {
+  const pid = watcherProcess();
+  if (pid) try { process.kill(pid, "SIGTERM"); } catch {}
+  try { fs.unlinkSync(watcherPidPath()); } catch {}
 }
 
 function copyTree(src, dst, options = {}) {
@@ -830,6 +935,16 @@ function writeCursorExtensionIndex(target) {
       scheme: "file",
     },
     relativeLocation: path.basename(target),
+    metadata: {
+      isApplicationScoped: true,
+      installedTimestamp: Date.now(),
+      source: "vsix",
+      targetPlatform: "undefined",
+      updated: false,
+      private: false,
+      isPreReleaseVersion: false,
+      hasPreReleaseVersion: false,
+    },
   });
   fs.writeFileSync(file, JSON.stringify(entries, null, 2));
 }
@@ -879,6 +994,76 @@ module.exports = {
   installExtension,
   uninstallExtension,
   extensionStatus,
+  installLifecycle,
+  uninstallLifecycle,
+  lifecycleStatus,
+  watcherProcess,
+};
+
+},
+"src/patcher/cursor-paths.js": function(module, exports, require, __filename, __dirname) {
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+
+function candidateCursorAppRoots() {
+  if (process.platform === "darwin") {
+    return [
+      "/Applications/Cursor.app/Contents/Resources/app",
+      path.join(os.homedir(), "Applications/Cursor.app/Contents/Resources/app"),
+    ];
+  }
+  if (process.platform === "win32") {
+    const local = process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
+    return [
+      path.join(local, "Programs", "Cursor", "resources", "app"),
+      path.join(local, "Cursor", "resources", "app"),
+    ];
+  }
+  return [];
+}
+
+function findCursorAppRoot(explicitRoot) {
+  const roots = explicitRoot ? [explicitRoot] : candidateCursorAppRoots();
+  for (const root of roots) {
+    const workbench = workbenchPath(root);
+    if (fs.existsSync(workbench)) return root;
+  }
+  throw new Error(`Cursor app root not found. Checked: ${roots.join(", ")}`);
+}
+
+function workbenchPath(appRoot) {
+  return path.join(appRoot, "out", "vs", "workbench", "workbench.desktop.main.js");
+}
+
+function productJsonPath(appRoot) {
+  return path.join(appRoot, "product.json");
+}
+
+function packageJsonPath(appRoot) {
+  return path.join(appRoot, "package.json");
+}
+
+function readCursorInfo(appRoot) {
+  const productPath = productJsonPath(appRoot);
+  const packagePath = packageJsonPath(appRoot);
+  const product = fs.existsSync(productPath) ? JSON.parse(fs.readFileSync(productPath, "utf8")) : {};
+  const pkg = fs.existsSync(packagePath) ? JSON.parse(fs.readFileSync(packagePath, "utf8")) : {};
+  return {
+    appRoot,
+    version: product.version || pkg.version || "unknown",
+    commit: product.commit || "unknown",
+    workbenchPath: workbenchPath(appRoot),
+  };
+}
+
+module.exports = {
+  candidateCursorAppRoots,
+  findCursorAppRoot,
+  workbenchPath,
+  readCursorInfo,
 };
 
 },
@@ -983,9 +1168,9 @@ async function sendNdjson(res, iterator) {
   res.end();
 }
 
-async function* runCursorAgentLoop(config, payload) {
+async function* runCursorAgentLoop(config, payload, customModels = new Set()) {
   const requestedModel = payload.model || payload.modelName || payload?.runRequest?.requestedModel?.modelId;
-  const route = resolveModel(config, requestedModel);
+  const route = resolveModel(config, requestedModel, { allowUnconfigured: customModels.has(requestedModel) });
   const openaiBody = cursorPayloadToOpenAI(payload, route);
   log("cursor-run", {
     model: route.model.displayName,
@@ -1026,6 +1211,7 @@ async function* runCursorAgentLoop(config, payload) {
 }
 
 function createServer() {
+  const customModels = new Set();
   return http.createServer(async (req, res) => {
     try {
       if (req.method === "OPTIONS") return sendJson(res, 204, {});
@@ -1047,16 +1233,25 @@ function createServer() {
       if (req.method === "GET" && url.pathname === "/cursor/v1/should-handle") {
         const model = url.searchParams.get("model");
         try {
-          const route = resolveModel(config, model);
+          const route = resolveModel(config, model, { allowUnconfigured: customModels.has(model) });
           return sendJson(res, 200, { ok: true, handle: true, model: route.model });
         } catch {
           return sendJson(res, 200, { ok: true, handle: false });
         }
       }
 
+      if (req.method === "POST" && url.pathname === "/cursor/v1/custom-models") {
+        const payload = await readJson(req);
+        customModels.clear();
+        for (const model of payload.models || []) {
+          if (typeof model === "string" && model.length <= 128 && !/[\x00-\x1f\x7f]/.test(model)) customModels.add(model);
+        }
+        return sendJson(res, 200, { ok: true, models: [...customModels] });
+      }
+
       if (req.method === "POST" && url.pathname === "/cursor/v1/run-agent-loop") {
         const payload = await readJson(req);
-        return sendNdjson(res, runCursorAgentLoop(config, payload));
+        return sendNdjson(res, runCursorAgentLoop(config, payload, customModels));
       }
 
       if (req.method === "POST" && url.pathname === "/cursor/v1/tool-result") {
@@ -1631,13 +1826,13 @@ const { MARKER, LEGACY_MARKER, helperSnippet, agentLoopSnippet } = require("./te
 
 const RUN_LOOP_NEEDLE = `_e=SC(n.withName("AgentCompatService.agentClientService.run")),oe=new Q$t(this.instantiationService,z,re,f,ue);`;
 const CONNECT_HELPER_NEEDLE = `function E5_(n,e){return vp1(n,t=>{switch(t.kind){case rn.Unary:return wp1(e,n,t);case rn.ServerStreaming:return Sp1(e,n,t);case rn.ClientStreaming:return kp1(e,n,t);case rn.BiDiStreaming:return Cp1(e,n,t);default:return null}})}`;
-const UNARY_NEEDLE = `const s=await n.unary(e,t,r?.signal,r?.timeoutMs,r?.headers,i,r?.contextValues);return r?.onHeader?.(s.header),r?.onTrailer?.(s.trailer),s.message`;
 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);
   return {
     ...info,
     supportedVersion: isSupportedVersion(info.version),
@@ -1645,6 +1840,7 @@ function status(options = {}) {
     legacyPatched: source.includes(LEGACY_MARKER),
     hasRunLoopNeedle: !!findRunLoopPatchPoint(source),
     hasConnectNeedle: !!findConnectHelperNeedle(source),
+    hasUnaryNeedle: !!unary || source.includes(`await ${MARKER}().patchAvailableModels(`),
     hasModelEnrichNeedle: source.includes(MODEL_ENRICH_NEEDLE),
   };
 }
@@ -1661,19 +1857,18 @@ function installPatch(options = {}) {
     throw new Error("Legacy local BYOK patch is already present. Restore Cursor from backup or use --force after manual review.");
   }
   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 (!source.includes(UNARY_NEEDLE)) throw new Error("Unary transport needle not found");
-  if (!source.includes(MODEL_ENRICH_NEEDLE)) throw new Error("Model enrichment needle not found");
+  if (!unary) throw new Error("Unary transport needle not found");
 
   const backupPath = backupWorkbench(info.workbenchPath);
   source = source.replace(connectNeedle, helperSnippet() + connectNeedle);
-  source = source.replace(
-    UNARY_NEEDLE,
-    `const s=await n.unary(e,t,r?.signal,r?.timeoutMs,r?.headers,i,r?.contextValues);try{if(e?.typeName==="aiserver.v1.AiService"&&t?.name==="AvailableModels")await ${MARKER}().patchAvailableModels(s.message)}catch{}return r?.onHeader?.(s.header),r?.onTrailer?.(s.trailer),s.message`
-  );
-  source = source.replace(MODEL_ENRICH_NEEDLE, `s=XI_(s,a.models);s=await ${MARKER}().enrichModels(s);`);
+  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 };
@@ -1710,15 +1905,31 @@ function findBackups(workbenchPath) {
 }
 
 function isSupportedVersion(version) {
-  return /^3\.8\./.test(version);
+  return /^(?:3\.8|3\.11)\./.test(version);
 }
 
 function findConnectHelperNeedle(source) {
   if (source.includes(CONNECT_HELPER_NEEDLE)) return CONNECT_HELPER_NEEDLE;
-  const match = source.match(/function\s+\w+\(n,e\)\{return\s+\w+\(n,t=>\{switch\(t\.kind\)\{case\s+\w+\.Unary:return\s+\w+\(e,n,t\);case\s+\w+\.ServerStreaming:return\s+\w+\(e,n,t\);case\s+\w+\.ClientStreaming:return\s+\w+\(e,n,t\);case\s+\w+\.BiDiStreaming:return\s+\w+\(e,n,t\);default:return null\}\}\)\}/);
+  const match = source.match(/function\s+\w+\((\w+),(\w+)\)\{return\s+\w+\(\1,(\w+)=>\{switch\(\3\.kind\)\{case\s+\w+\.Unary:return\s+\w+\(\2,\1,\3\);case\s+\w+\.ServerStreaming:return\s+\w+\(\2,\1,\3\);case\s+\w+\.ClientStreaming:return\s+\w+\(\2,\1,\3\);case\s+\w+\.BiDiStreaming:return\s+\w+\(\2,\1,\3\);default:return null\}\}\)\}/);
   return match ? match[0] : null;
 }
 
+function findUnaryPatchPoint(source) {
+  const re = /const\s+(\w+)=await\s+\w+\.unary\((\w+),(\w+),(\w+)\?\.signal,\4\?\.timeoutMs,\4\?\.headers,(\w+),\4\?\.contextValues\);return\s+\4\?\.onHeader\?\.\(\1\.header\),\4\?\.onTrailer\?\.\(\1\.trailer\),\1\.message/;
+  const match = source.match(re);
+  if (!match) return null;
+  const split = match[0].indexOf(";return");
+  return {
+    needle: match[0],
+    call: match[0].slice(0, split),
+    returnStatement: match[0].slice(split + 1),
+    response: match[1],
+    service: match[2],
+    method: match[3],
+    request: match[5],
+  };
+}
+
 function findRunLoopPatchPoint(source) {
   if (source.includes(RUN_LOOP_NEEDLE)) {
     return {
@@ -1728,94 +1939,65 @@ function findRunLoopPatchPoint(source) {
   }
   const re = /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+),[\s\S]{0,1600}?(\w+)=_b\(n\.withName\("AgentCompatService\.agentClientService\.run"\)\),(\w+)=new\s+\w+\(this\.instantiationService,[^;]+?\);/;
   const match = source.match(re);
-  if (!match) return null;
+  if (match) {
+    return {
+      needle: match[0],
+      vars: {
+        userText: match[1],
+        richText: match[2],
+        mode: match[3],
+        selectedContext: match[4],
+        requestContext: match[5],
+        model: match[6],
+        generationUUID: match[7],
+        conversationId: match[8],
+        messageId: match[9],
+        conversationState: match[10],
+        ctx: match[11],
+        adapter: match[12],
+        event: "e",
+      },
+    };
+  }
+  const anchor = source.indexOf('"AgentCompatService.agentClientService.run"');
+  if (anchor < 0) return null;
+  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 eventFactory = findInteractionUpdateFactory(source);
+  if (!eventFactory) return null;
+  const needleStart = segment.indexOf(args[0]);
+  const needleEnd = adapter.index + adapter[0].length;
   return {
-    needle: match[0],
+    needle: segment.slice(needleStart, needleEnd),
     vars: {
-      userText: match[1],
-      richText: match[2],
-      mode: match[3],
-      selectedContext: match[4],
-      requestContext: match[5],
-      model: match[6],
-      generationUUID: match[7],
-      conversationId: match[8],
-      messageId: match[9],
-      conversationState: match[10],
-      ctx: match[11],
-      adapter: match[12],
-      event: "e",
+      userText: args[1],
+      richText: args[2],
+      mode: args[3],
+      selectedContext: args[4],
+      requestContext: args[5],
+      model: args[6],
+      generationUUID: args[7],
+      conversationId: args[8],
+      messageId: args[9],
+      conversationState: args[10],
+      contextExpression: context[1],
+      adapter: adapter[1],
+      event: "t",
+      eventFactory,
     },
   };
 }
 
-module.exports = { status, installPatch, uninstallPatch };
-
-},
-"src/patcher/cursor-paths.js": function(module, exports, require, __filename, __dirname) {
-"use strict";
-
-const fs = require("fs");
-const path = require("path");
-const os = require("os");
-
-function candidateCursorAppRoots() {
-  if (process.platform === "darwin") {
-    return [
-      "/Applications/Cursor.app/Contents/Resources/app",
-      path.join(os.homedir(), "Applications/Cursor.app/Contents/Resources/app"),
-    ];
-  }
-  if (process.platform === "win32") {
-    const local = process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
-    return [
-      path.join(local, "Programs", "Cursor", "resources", "app"),
-      path.join(local, "Cursor", "resources", "app"),
-    ];
-  }
-  return [];
-}
-
-function findCursorAppRoot(explicitRoot) {
-  const roots = explicitRoot ? [explicitRoot] : candidateCursorAppRoots();
-  for (const root of roots) {
-    const workbench = workbenchPath(root);
-    if (fs.existsSync(workbench)) return root;
-  }
-  throw new Error(`Cursor app root not found. Checked: ${roots.join(", ")}`);
-}
-
-function workbenchPath(appRoot) {
-  return path.join(appRoot, "out", "vs", "workbench", "workbench.desktop.main.js");
-}
-
-function productJsonPath(appRoot) {
-  return path.join(appRoot, "product.json");
-}
-
-function packageJsonPath(appRoot) {
-  return path.join(appRoot, "package.json");
-}
-
-function readCursorInfo(appRoot) {
-  const productPath = productJsonPath(appRoot);
-  const packagePath = packageJsonPath(appRoot);
-  const product = fs.existsSync(productPath) ? JSON.parse(fs.readFileSync(productPath, "utf8")) : {};
-  const pkg = fs.existsSync(packagePath) ? JSON.parse(fs.readFileSync(packagePath, "utf8")) : {};
-  return {
-    appRoot,
-    version: product.version || pkg.version || "unknown",
-    commit: product.commit || "unknown",
-    workbenchPath: workbenchPath(appRoot),
-  };
+function findInteractionUpdateFactory(source) {
+  const match = source.match(/(\w+)=\{textDelta\(\w+\)\{return new\s+\w+\(\{message:\{case:"textDelta",[\s\S]{0,2500}?turnEnded\(/);
+  return match ? match[1] : null;
 }
 
-module.exports = {
-  candidateCursorAppRoots,
-  findCursorAppRoot,
-  workbenchPath,
-  readCursorInfo,
-};
+module.exports = { status, installPatch, uninstallPatch, isSupportedVersion, findConnectHelperNeedle, findUnaryPatchPoint, findRunLoopPatchPoint };
 
 },
 "src/patcher/templates.js": function(module, exports, require, __filename, __dirname) {
@@ -1826,7 +2008,7 @@ const LEGACY_MARKER = "__LOCAL_CURSOR_BYOK_V0";
 const ENDPOINT = "http://127.0.0.1:39832";
 
 function helperSnippet() {
-  return `function ${MARKER}(){if(globalThis.${MARKER})return globalThis.${MARKER};const endpoint="${ENDPOINT}";const sleep=ms=>new Promise(r=>setTimeout(r,ms));const tip=t=>({primaryText:"",secondaryText:"",secondaryWarningText:false,icon:"",tertiaryText:"",tertiaryTextUrl:"",markdownContent:t});const esc=v=>String(v??"").replace(/[\\\\*_\\[\\]\`]/g,"\\\\$&");const byok={async models(){const started=Date.now();for(;;){try{const r=await fetch(endpoint+"/cursor/v1/models");const j=await r.json();return j&&j.ok?j.models||[]:[]}catch(e){if(Date.now()-started>2e3)return[];await sleep(120)}}},toCursorModel(m){const name=m.displayName,provider=m.providerName||m.providerId||"BYOK",ctx=m.contextTokenLimit||128000,md="**"+esc(name)+"**<br />OpenAI-compatible BYOK model via "+esc(provider)+".<br /><br />"+ctx.toLocaleString()+" context window";return{name,defaultOn:true,parameterDefinitions:[],variants:[{parameterValues:[],displayName:name,isMaxMode:false,isDefaultMaxConfig:true,isDefaultNonMaxConfig:true,tooltipData:tip(md),displayNameOutsidePicker:name,variantStringRepresentation:name+"[]",legacySlug:name}],legacySlugs:[name],idAliases:[name],cloudAgentEffortModes:[],supportsAgent:true,degradationStatus:0,tooltipData:tip(md),supportsThinking:false,supportsImages:m.supportsImages!==false,supportsMaxMode:true,clientDisplayName:name,serverModelName:name,supportsNonMaxMode:true,tooltipDataForMaxMode:tip(md),isRecommendedForBackgroundComposer:false,supportsPlanMode:true,inputboxShortModelName:name,supportsSandboxing:true,supportsCmdK:true,contextTokenLimit:ctx,contextTokenLimitForMaxMode:ctx,maxOutputTokens:m.maxOutputTokens||8192,namedModelSectionIndex:1,vendorName:provider,vendor:{id:9000,displayName:provider},tagline:"OpenAI-compatible BYOK",visibleInRoutedModelView:true,isUserAdded:true,byokModel:true}},async shouldHandle(model){try{if(!model)return false;const r=await fetch(endpoint+"/cursor/v1/should-handle?model="+encodeURIComponent(model));const j=await r.json();return !!(j&&j.ok&&j.handle)}catch{return false}},async enrichModels(list){try{const models=await this.models();if(!models.length)return list;const out=Array.isArray(list)?list:[];for(const m of models){const cm=this.toCursorModel(m),i=out.findIndex(x=>x&&(x.name===m.displayName||x.clientDisplayName===m.displayName||x.serverModelName===m.displayName));i>=0?out[i]={...out[i],...cm}:out.push(cm)}return out}catch(e){console.warn("cursor-openai-byok model enrich failed",e);return list}},async patchAvailableModels(msg){try{const models=await this.models();if(!models.length||!msg)return;msg.modelNames=msg.modelNames||[];msg.models=await this.enrichModels(msg.models||[]);for(const m of models)if(!msg.modelNames.includes(m.displayName))msg.modelNames.push(m.displayName)}catch(e){console.warn("cursor-openai-byok model patch failed",e)}},async runAgent(payload,onEvent){const res=await fetch(endpoint+"/cursor/v1/run-agent-loop",{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify(payload)});if(!res.ok)throw new Error("BYOK HTTP "+res.status);const reader=res.body.getReader();const decoder=new TextDecoder();let buf="";for(;;){const item=await reader.read();if(item.done)break;buf+=decoder.decode(item.value,{stream:true});let idx;while((idx=buf.indexOf("\\n"))>=0){const line=buf.slice(0,idx).trim();buf=buf.slice(idx+1);if(line){try{await onEvent(JSON.parse(line))}catch(e){console.warn("cursor-openai-byok event failed",e)}}}}}};globalThis.${MARKER}=byok;return byok}`;
+  return `function ${MARKER}(){if(globalThis.${MARKER})return globalThis.${MARKER};const endpoint="${ENDPOINT}";const sleep=ms=>new Promise(r=>setTimeout(r,ms));const tip=t=>({primaryText:"",secondaryText:"",secondaryWarningText:false,icon:"",tertiaryText:"",tertiaryTextUrl:"",markdownContent:t});const esc=v=>String(v??"").replace(/[\\\\*_\\[\\]\`]/g,"\\\\$&");const byok={async models(){const started=Date.now();for(;;){try{const r=await fetch(endpoint+"/cursor/v1/models");const j=await r.json();return j&&j.ok?j.models||[]:[]}catch(e){if(Date.now()-started>2e3)return[];await sleep(120)}}},toCursorModel(m){const name=m.displayName,provider=m.providerName||m.providerId||"BYOK",ctx=m.contextTokenLimit||128000,md="**"+esc(name)+"**<br />OpenAI-compatible BYOK model via "+esc(provider)+".<br /><br />"+ctx.toLocaleString()+" context window";return{name,defaultOn:true,parameterDefinitions:[],variants:[{parameterValues:[],displayName:name,isMaxMode:false,isDefaultMaxConfig:true,isDefaultNonMaxConfig:true,tooltipData:tip(md),displayNameOutsidePicker:name,variantStringRepresentation:name+"[]",legacySlug:name}],legacySlugs:[name],idAliases:[name],cloudAgentEffortModes:[],supportsAgent:true,degradationStatus:0,tooltipData:tip(md),supportsThinking:false,supportsImages:m.supportsImages!==false,supportsMaxMode:true,clientDisplayName:name,serverModelName:name,supportsNonMaxMode:true,tooltipDataForMaxMode:tip(md),isRecommendedForBackgroundComposer:false,supportsPlanMode:true,inputboxShortModelName:name,supportsSandboxing:true,supportsCmdK:true,contextTokenLimit:ctx,contextTokenLimitForMaxMode:ctx,maxOutputTokens:m.maxOutputTokens||8192,namedModelSectionIndex:1,vendorName:provider,vendor:{id:9000,displayName:provider},tagline:"OpenAI-compatible BYOK",visibleInRoutedModelView:false,isUserAdded:true,byokModel:true}},async shouldHandle(model){try{if(!model)return false;const r=await fetch(endpoint+"/cursor/v1/should-handle?model="+encodeURIComponent(model));const j=await r.json();return !!(j&&j.ok&&j.handle)}catch{return false}},async enrichModels(list,models){try{models=models||await this.models();if(!models.length)return list;const out=Array.isArray(list)?list:[];for(const m of models){const cm=this.toCursorModel(m),i=out.findIndex(x=>x&&(x.name===m.displayName||x.clientDisplayName===m.displayName||x.serverModelName===m.displayName));i>=0?out[i]={...out[i],...cm}:out.push(cm)}return out}catch(e){console.warn("cursor-openai-byok model enrich failed",e);return list}},async registerCustomModels(models){try{await fetch(endpoint+"/cursor/v1/custom-models",{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify({models})})}catch{}},async patchAvailableModels(msg,req){try{if(!msg)return;const models=await this.models(),known=new Set((msg.models||[]).flatMap(m=>[m?.name,m?.clientDisplayName,m?.serverModelName]).filter(Boolean)),names=Array.isArray(req?.additionalModelNames)?req.additionalModelNames:[],custom=[...new Set(names.filter(n=>typeof n==="string"&&n&&!known.has(n)&&!models.some(m=>m.displayName===n)))];await this.registerCustomModels(custom);const all=[...models,...custom.map(displayName=>({displayName,providerName:"BYOK"}))];if(!all.length)return;msg.modelNames=msg.modelNames||[];msg.models=await this.enrichModels(msg.models||[],all);for(const m of all)if(!msg.modelNames.includes(m.displayName))msg.modelNames.push(m.displayName)}catch(e){console.warn("cursor-openai-byok model patch failed",e)}},async runAgent(payload,onEvent){const res=await fetch(endpoint+"/cursor/v1/run-agent-loop",{method:"POST",headers:{"content-type":"application/json"},body:JSON.stringify(payload)});if(!res.ok)throw new Error("BYOK HTTP "+res.status);const reader=res.body.getReader();const decoder=new TextDecoder();let buf="";for(;;){const item=await reader.read();if(item.done)break;buf+=decoder.decode(item.value,{stream:true});let idx;while((idx=buf.indexOf("\\n"))>=0){const line=buf.slice(0,idx).trim();buf=buf.slice(idx+1);if(line){try{await onEvent(JSON.parse(line))}catch(e){console.warn("cursor-openai-byok event failed",e)}}}}}};globalThis.${MARKER}=byok;return byok}`;
 }
 
 function agentLoopSnippet(vars) {
@@ -1845,7 +2027,9 @@ function agentLoopSnippet(vars) {
     messageId: "b",
     conversationState: "W",
   };
-  return `if(!${v.event}.subagentTypeName&&await ${MARKER}().shouldHandle(${v.model}?.modelName)){const sendText=async text=>{if(text)await ${v.adapter}.sendUpdate(${v.ctx}.ctx,E0c.textDelta(text))};const sendDone=async()=>{await ${v.adapter}.sendUpdate(${v.ctx}.ctx,E0c.turnEnded())};try{await ${MARKER}().runAgent({model:${v.model}?.modelName,userText:${v.userText},richText:${v.richText},mode:${v.mode},selectedContext:${v.selectedContext},requestContext:${v.requestContext},generationUUID:${v.generationUUID},conversationId:${v.conversationId},messageId:${v.messageId},conversationState:${v.conversationState},event:${v.event},tools:${v.event}.tools},async ev=>{if(ev.type==="text_delta")await sendText(ev.text||"");else if(ev.type==="tool_calls_ready")await sendText("\\n[BYOK tool calls requested: "+(ev.toolCalls||[]).map(t=>t.name||t.id).join(", ")+"]\\n");else if(ev.type==="error")await sendText("Local BYOK error: "+(ev.error||"unknown"));});await sendDone();return}catch(err){await sendText("Local BYOK error: "+(err&&err.message?err.message:String(err)));await sendDone();return}}`;
+  const context = v.contextExpression || `${v.ctx}.ctx`;
+  const events = v.eventFactory || "E0c";
+  return `if(!${v.event}.subagentTypeName&&await ${MARKER}().shouldHandle(${v.model}?.modelName)){const sendText=async text=>{if(text)await ${v.adapter}.sendUpdate(${context},${events}.textDelta(text))};const sendDone=async()=>{await ${v.adapter}.sendUpdate(${context},${events}.turnEnded())};try{await ${MARKER}().runAgent({model:${v.model}?.modelName,userText:${v.userText},richText:${v.richText},mode:${v.mode},selectedContext:${v.selectedContext},requestContext:${v.requestContext},generationUUID:${v.generationUUID},conversationId:${v.conversationId},messageId:${v.messageId},conversationState:${v.conversationState},event:${v.event},tools:${v.event}.tools},async ev=>{if(ev.type==="text_delta")await sendText(ev.text||"");else if(ev.type==="tool_calls_ready")await sendText("\\n[BYOK tool calls requested: "+(ev.toolCalls||[]).map(t=>t.name||t.id).join(", ")+"]\\n");else if(ev.type==="error")await sendText("Local BYOK error: "+(ev.error||"unknown"));});await sendDone();return}catch(err){await sendText("Local BYOK error: "+(err&&err.message?err.message:String(err)));await sendDone();return}}`;
 }
 
 module.exports = { MARKER, LEGACY_MARKER, helperSnippet, agentLoopSnippet };