@closedrouter/cli 1.1.15 → 1.1.17

package/README.md

@@ -149,7 +149,7 @@ Desktop launches follow the isolation and gateway configuration in `reference_re
 
 Desktop clients use a streaming loopback relay with a per-launch local credential. The platform key stays in the launcher process. Cursor's local engine uses the relay directly, so the gateway does not need to be publicly reachable from Cursor's servers. Generated files and profile directories start with private permissions. Keep `cr` running and close the launched app instance to end the session. Interrupting `cr` stops local routing; macOS may leave the app open. Start a new session with `cr start` to reconnect.
 
-Cursor's startup hook enables local provider mode in memory and serves app-owned scripts for both desktop views. The installed app files and signature are preserved. Its picker lists all tool-capable pool models, and changing the selection changes the routed model. Native model and login controllers are checked before injection; unsupported app builds fail with an update instruction. A valid existing login retains its normal authentication policy checks. Set `CLOSEDROUTER_CURSOR_AUTH_DB` to a different SQLite source, or a nonexistent path to test the no-login case.
+Cursor's startup hook enables local provider mode in memory and serves app-owned scripts for both desktop views. The installed app files and signature are preserved. Its picker lists all tool-capable pool models, and changing the selection changes the routed model. Native model and login controllers are checked before injection; unsupported app builds fail with an update instruction. A valid existing login retains its normal authentication policy checks and account UI. Without a native login, the account area shows the ClosedRouter name and colored logo; its menu shows the email and a link to the ClosedRouter account. Set `CLOSEDROUTER_CURSOR_AUTH_DB` to a different SQLite source, or a nonexistent path to test the no-login case.
 
 On macOS, Claude uses a compatible Electron runtime installed by Cockpit, or the executable supplied through `CLOSEDROUTER_CLAUDE_ELECTRON`, when one is available. The launcher shares its immutable framework files by hard link and creates private copies of the small executable stubs before signing them with the virtualization entitlement Cowork requires. This added about 860 KB in the tested runtime. The installed Claude app and original Electron runtime are not modified. LaunchServices starts the owned runtime with Claude's original archive and resources. The startup inspector binds to loopback and closes after injection. The runtime and ClosedRouter config directory must be on the same filesystem. Without a compatible runtime, Claude uses its native gateway configuration and text model labels; `--desktop-inspector` requires a compatible runtime.
 

package/dist/commands/cursor-desktop-account.d.ts

@@ -0,0 +1,6 @@
+import type { DesktopAccountIdentity } from "./desktop-account";
+/** Provider identity belongs to this isolated launch, not to Cursor's OAuth
+ * store. Use the native account area without manufacturing a vendor login. */
+export declare function installCursorProviderAccountUi(account: DesktopAccountIdentity, artwork: string): void;
+export declare function cursorProviderAccountHook(account: DesktopAccountIdentity): string;
+//# sourceMappingURL=cursor-desktop-account.d.ts.map

package/dist/commands/cursor-desktop-account.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor-desktop-account.d.ts","sourceRoot":"","sources":["../../src/commands/cursor-desktop-account.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAGhE;8EAC8E;AAC9E,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAuDrG;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,CAKjF"}

package/dist/commands/cursor-desktop-hook.d.ts

@@ -1,4 +1,5 @@
 import type { DesktopLaunchPlan } from "./desktop-launch";
 import type { LaunchCatalog } from "./launch-catalog";
-export declare function addCursorDesktopLocalHook(plan: DesktopLaunchPlan, app: string, catalog?: LaunchCatalog): void;
+import type { DesktopAccountIdentity } from "./desktop-account";
+export declare function addCursorDesktopLocalHook(plan: DesktopLaunchPlan, app: string, catalog?: LaunchCatalog, account?: DesktopAccountIdentity): void;
 //# sourceMappingURL=cursor-desktop-hook.d.ts.map

package/dist/commands/cursor-desktop-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor-desktop-hook.d.ts","sourceRoot":"","sources":["../../src/commands/cursor-desktop-hook.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAKtD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,IAAI,CA2E7G"}
+{"version":3,"file":"cursor-desktop-hook.d.ts","sourceRoot":"","sources":["../../src/commands/cursor-desktop-hook.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAKhE,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,IAAI,CA2E/I"}

package/dist/commands/cursor-desktop.d.ts

@@ -1,3 +1,4 @@
 export declare const CURSOR_APPLICATION_STORAGE = "src.vs.platform.reactivestorage.browser.reactiveStorageServiceImpl.persistentStorage.applicationUser";
+export declare function cursorNativeAccountExists(sourceDb?: string): Promise<boolean>;
 export declare function configureCursorDesktop(profileDir: string, baseUrl: string, apiKey: string, model: string, sourceDb?: string, models?: string[]): Promise<string>;
 //# sourceMappingURL=cursor-desktop.d.ts.map

package/dist/commands/cursor-desktop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor-desktop.d.ts","sourceRoot":"","sources":["../../src/commands/cursor-desktop.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,0BAA0B,yGAAyG,CAAC;AAyCjJ,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAClE,QAAQ,SAAqE,EAC7E,MAAM,GAAE,MAAM,EAAY,GACzB,OAAO,CAAC,MAAM,CAAC,CA2CjB"}
+{"version":3,"file":"cursor-desktop.d.ts","sourceRoot":"","sources":["../../src/commands/cursor-desktop.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,0BAA0B,yGAAyG,CAAC;AAyCjJ,wBAAsB,yBAAyB,CAAC,QAAQ,SAAqE,GAAG,OAAO,CAAC,OAAO,CAAC,CAI/I;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAClE,QAAQ,SAAqE,EAC7E,MAAM,GAAE,MAAM,EAAY,GACzB,OAAO,CAAC,MAAM,CAAC,CA2CjB"}

package/dist/commands/model-branding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-branding.d.ts","sourceRoot":"","sources":["../../src/commands/model-branding.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,mUAAqS,CAAC;AACpU,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,eAAO,MAAM,yBAAyB,wqBAOrC,CAAC;AAEF;8EAC8E;AAC9E,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,CAiBhG;AAED;oEACoE;AACpE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,uBAAuB,GAAG,IAAI,CAkFjJ;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAmC/F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAS5F"}
+{"version":3,"file":"model-branding.d.ts","sourceRoot":"","sources":["../../src/commands/model-branding.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,mUAAqS,CAAC;AACpU,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,eAAO,MAAM,yBAAyB,wqBAOrC,CAAC;AAEF;8EAC8E;AAC9E,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,CAiBhG;AAED;oEACoE;AACpE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,uBAAuB,GAAG,IAAI,CAsFjJ;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAoC/F;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,MAAM,CAS5F"}

package/dist/index.js

@@ -3920,7 +3920,7 @@ var require_websocket = __commonJS(function(exports, module) {
     NOOP
   } = require_constants();
   var {
-    EventTarget: { addEventListener, removeEventListener }
+    EventTarget: { addEventListener: addEventListener2, removeEventListener }
   } = require_event_target();
   var { format, parse } = require_extension();
   var { toBuffer } = require_buffer_util();
@@ -4262,7 +4262,7 @@ var require_websocket = __commonJS(function(exports, module) {
       }
     });
   });
-  WebSocket.prototype.addEventListener = addEventListener;
+  WebSocket.prototype.addEventListener = addEventListener2;
   WebSocket.prototype.removeEventListener = removeEventListener;
   module.exports = WebSocket;
   function initAsClient(websocket, address, protocols, options) {
@@ -10121,6 +10121,12 @@ function defaultCursorDatabase() {
   const root = process.platform === "darwin" ? join12(homedir11(), "Library", "Application Support") : process.platform === "win32" ? process.env.APPDATA || join12(homedir11(), "AppData", "Roaming") : join12(homedir11(), ".config");
   return join12(root, "Cursor", "User", "globalStorage", "state.vscdb");
 }
+async function cursorNativeAccountExists(sourceDb = process.env.CLOSEDROUTER_CURSOR_AUTH_DB ?? defaultCursorDatabase()) {
+  if (!existsSync12(sourceDb))
+    return false;
+  const auth = await querySqliteKeyValue(sourceDb, "cursorAuth/");
+  return Boolean(auth.get("cursorAuth/accessToken") && auth.get("cursorAuth/refreshToken"));
+}
 async function configureCursorDesktop(profileDir, baseUrl, apiKey, model, sourceDb = process.env.CLOSEDROUTER_CURSOR_AUTH_DB ?? defaultCursorDatabase(), models = [model]) {
   const cursorModel = model;
   const catalog = [...new Set([model, ...models])];
@@ -10361,7 +10367,16 @@ function installModelBranding(models, artwork, electricCss, orbitKeyframes) {
           bolt.setAttribute("viewBox", "0 0 30 44");
           bolt.setAttribute("data-cr-lightning-bolt", position);
           const path = "M23 2 11 13 19 15 5 30 13 29 7 42 M11 13 3 11 M19 15 27 23";
-          bolt.innerHTML = `<path d="${path}" fill="none" stroke="#42bdff" stroke-width="4.2" stroke-linecap="round" stroke-linejoin="round"/><path d="${path}" fill="none" stroke="#f5fcff" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>`;
+          for (const [color, width] of [["#42bdff", "4.2"], ["#f5fcff", "1.7"]]) {
+            const line = document.createElementNS("http://www.w3.org/2000/svg", "path");
+            line.setAttribute("d", path);
+            line.setAttribute("fill", "none");
+            line.setAttribute("stroke", color);
+            line.setAttribute("stroke-width", width);
+            line.setAttribute("stroke-linecap", "round");
+            line.setAttribute("stroke-linejoin", "round");
+            bolt.append(line);
+          }
           orbit.append(bolt);
         }
         layer.append(orbit);
@@ -10413,7 +10428,8 @@ function installProviderAccountUi(account, artwork) {
   const paint = () => {
     let providerSession = document.documentElement.dataset.closedrouterAccount === "true";
     for (const button of document.querySelectorAll("button")) {
-      if (!button.innerText.includes(account.name) || !button.innerText.includes("Gateway"))
+      const text = button.innerText;
+      if (!text.includes(account.name) || !(text.includes("Gateway") || providerSession && account.email && text.includes(account.email)))
         continue;
       providerSession = true;
       document.documentElement.dataset.closedrouterAccount = "true";
@@ -10840,8 +10856,152 @@ if (typeof moduleHooks.registerHooks === 'function') moduleHooks.registerHooks({
 // src/commands/cursor-desktop-hook.ts
 import { existsSync as existsSync15, readFileSync as readFileSync13 } from "node:fs";
 import { dirname as dirname4, join as join15 } from "node:path";
+
+// src/commands/cursor-desktop-account.ts
+function installCursorProviderAccountUi(account, artwork) {
+  if (document.querySelector("[data-closedrouter-cursor-account-hook]"))
+    return;
+  const marker = document.createElement("meta");
+  marker.dataset.closedrouterCursorAccountHook = "true";
+  document.head.append(marker);
+  document.documentElement.dataset.closedrouterAccount = "true";
+  const style = document.createElement("style");
+  style.textContent = "[data-closedrouter-replaced-account]{display:none!important}";
+  document.head.append(style);
+  const image = (size) => {
+    const logo = document.createElement("img");
+    logo.src = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(artwork)}`;
+    logo.alt = "ClosedRouter";
+    logo.width = size;
+    logo.height = size;
+    logo.style.flex = `0 0 ${size}px`;
+    return logo;
+  };
+  const button = document.createElement("button");
+  button.type = "button";
+  button.dataset.closedrouterCursorAccount = "true";
+  button.setAttribute("aria-label", `ClosedRouter account: ${account.name}`);
+  button.setAttribute("aria-haspopup", "menu");
+  button.setAttribute("aria-expanded", "false");
+  button.style.cssText = "display:flex;align-items:center;gap:8px;width:100%;padding:8px;border:0;border-radius:6px;background:transparent;color:inherit;font:inherit;text-align:left;cursor:pointer";
+  const mark = image(24);
+  mark.dataset.closedrouterAccountLogo = "true";
+  const label = document.createElement("span");
+  label.style.cssText = "flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap";
+  label.textContent = account.name;
+  const provider = document.createElement("span");
+  provider.textContent = "ClosedRouter";
+  provider.style.cssText = "font-size:11px;opacity:.7";
+  button.append(mark, label, provider);
+  let menu;
+  const close = (focus = false) => {
+    menu?.remove();
+    menu = undefined;
+    button.setAttribute("aria-expanded", "false");
+    button.removeAttribute("aria-controls");
+    if (focus)
+      button.focus();
+  };
+  const open = () => {
+    if (menu) {
+      close();
+      return;
+    }
+    const bounds = button.getBoundingClientRect();
+    menu = document.createElement("div");
+    menu.id = "closedrouter-cursor-account-menu";
+    menu.setAttribute("role", "menu");
+    menu.setAttribute("aria-label", "ClosedRouter account");
+    menu.style.cssText = `position:fixed;z-index:10000;left:${Math.max(8, Math.min(bounds.left, innerWidth - 300))}px;bottom:${Math.max(8, innerHeight - bounds.top + 6)}px;width:280px;max-width:calc(100vw - 16px);padding:8px;border:1px solid var(--vscode-menu-border,rgba(128,128,128,.25));border-radius:8px;background:var(--vscode-menu-background,var(--vscode-sideBar-background,#202020));color:var(--vscode-menu-foreground,var(--vscode-foreground,inherit));box-shadow:0 6px 20px #0004;font:inherit`;
+    const card = document.createElement("section");
+    card.id = "closedrouter-provider-account";
+    card.setAttribute("aria-label", "ClosedRouter account");
+    card.style.cssText = "display:flex;gap:12px;align-items:center;padding:12px 8px;margin:4px 0;border-bottom:1px solid color-mix(in srgb,currentColor 15%,transparent)";
+    const details = document.createElement("div");
+    details.style.cssText = "min-width:0;overflow-wrap:anywhere";
+    for (const text of [account.name, account.email, "Connected through ClosedRouter"])
+      if (text) {
+        const line = document.createElement("div");
+        line.textContent = text;
+        details.append(line);
+      }
+    card.append(image(28), details);
+    const link = document.createElement("a");
+    link.href = `${account.serverOrigin}/settings`;
+    link.target = "_blank";
+    link.rel = "noopener noreferrer";
+    link.setAttribute("role", "menuitem");
+    link.textContent = "Open ClosedRouter account";
+    link.style.cssText = "display:block;padding:8px;color:inherit;text-decoration:none;border-radius:4px";
+    menu.append(card, link);
+    document.body.append(menu);
+    button.setAttribute("aria-controls", menu.id);
+    button.setAttribute("aria-expanded", "true");
+    link.focus();
+  };
+  button.addEventListener("click", (event) => {
+    event.preventDefault();
+    event.stopPropagation();
+    open();
+  });
+  button.addEventListener("keydown", (event) => {
+    if (event.key === "ArrowDown") {
+      event.preventDefault();
+      event.stopPropagation();
+      if (!menu)
+        open();
+    }
+  });
+  document.addEventListener("pointerdown", (event) => {
+    if (menu && !menu.contains(event.target) && !button.contains(event.target))
+      close();
+  });
+  document.addEventListener("keydown", (event) => {
+    if (menu && event.key === "Escape") {
+      event.preventDefault();
+      event.stopPropagation();
+      close(true);
+    }
+  });
+  addEventListener("resize", () => close());
+  const paint = () => {
+    const upgrade = document.querySelector('[aria-label="Upgrade to a Pro account"]');
+    if (upgrade)
+      upgrade.dataset.closedrouterReplacedAccount = "true";
+    const target = document.querySelector('[aria-label="Loading account information"],[aria-label="Accounts"]') || upgrade || [...document.querySelectorAll("button,[role=button]")].find((node) => /^(Sign in|Sign In|Accounts)$/.test(node.innerText.trim()));
+    if (!target?.parentElement)
+      return;
+    if (button.isConnected && button.nextElementSibling === target)
+      return;
+    close();
+    const compact = target.parentElement.getBoundingClientRect().width < 70;
+    label.style.display = provider.style.display = compact ? "none" : "";
+    button.style.padding = compact ? "4px" : "8px";
+    target.dataset.closedrouterReplacedAccount = "true";
+    target.parentElement.insertBefore(button, target);
+  };
+  let queued = false;
+  new MutationObserver(() => {
+    if (!queued) {
+      queued = true;
+      queueMicrotask(() => {
+        queued = false;
+        paint();
+      });
+    }
+  }).observe(document.documentElement, { subtree: true, childList: true });
+  paint();
+}
+function cursorProviderAccountHook(account) {
+  const script = `(${installCursorProviderAccountUi.toString()})(${JSON.stringify(account)},${JSON.stringify(CLOSEDROUTER_LOGO)});`;
+  return `require('electron').app.on('web-contents-created',(_event,contents)=>{
+    contents.on('did-finish-load',()=>contents.executeJavaScript(${JSON.stringify(script)}).catch(()=>{}));
+  });`;
+}
+
+// src/commands/cursor-desktop-hook.ts
 var FLAGS = /([\w$]+)=\{extensionIsDev:[^{}]{1,1000}localMode:(?:!1|false)\}/;
-function addCursorDesktopLocalHook(plan, app, catalog) {
+function addCursorDesktopLocalHook(plan, app, catalog, account) {
   const resources = app.endsWith(".app") ? join15(app, "Contents/Resources/app") : join15(dirname4(app), "resources/app");
   const source = join15(resources, "out/main.js");
   const mainSource = readFileSync13(source, "utf8");
@@ -10920,7 +11080,7 @@ function installProtocolHook() {
 }
 if (app.isReady()) installProtocolHook(); else app.once('ready', installProtocolHook);
 require('node:fs').writeFileSync(${JSON.stringify(join15(plan.profileDir, "hook-loaded"))}, 'ready', {mode: 0o600});
-` + (catalog ? modelBrandingHook(catalog.models) : "") });
+` + (catalog ? modelBrandingHook(catalog.models) : "") + (account ? cursorProviderAccountHook(account) : "") });
   const point = mainSource.slice(0, mainMatch.index + mainMatch[0].length).split(`
 `);
   const logPath = join15(plan.profileDir, "inspector.log");
@@ -11291,9 +11451,9 @@ async function startCommand(options = {}) {
     const relay = await startLaunchProxy(serverUrl, apiKey, "cursor-desktop", localKey, catalog);
     try {
       const plan = buildDesktopLaunchPlan("cursor", executablePath, createDesktopProfile("cursor"), undefined, undefined, undefined, options.toolArgs);
-      addCursorDesktopLocalHook(plan, executablePath, catalog);
+      const cursorDb = await configureCursorDesktop(plan.profileDir, relay.baseUrl, localKey, model, undefined, catalog.models);
+      addCursorDesktopLocalHook(plan, executablePath, catalog, await cursorNativeAccountExists(cursorDb) ? undefined : account);
       writeDesktopLaunchPlan(plan);
-      await configureCursorDesktop(plan.profileDir, relay.baseUrl, localKey, model, undefined, catalog.models);
       M2.info(`Starting Cursor desktop local provider mode with ${model}. Model requests use ClosedRouter, without a paid Cursor subscription. Profile: ${plan.profileDir}. Keep cr running until you close this app instance.`);
       process.exitCode = await runDesktopLaunch(plan);
     } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@closedrouter/cli",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "ClosedRouter CLI: Onboard and import local AI subscriptions and API keys into your shared token pool",
   "author": "ClosedRouter Contributors",
   "repository": {