@closedrouter/cli 1.1.1 → 1.1.3

package/README.md

@@ -125,7 +125,7 @@ cr logout
 ```
 
 ### `cr start` / `cr launch`
-Configure and start an installed coding CLI using models exposed to your platform key. The command discovers available models, keeps keys out of arguments and generated client profiles, and checks or starts the local Claude subscription bridge before launching Claude Code.
+Configure and start an installed coding CLI using models exposed to your platform key. The command discovers available tool-capable models and keeps keys out of arguments and generated client profiles. Starting Claude Code as a client uses the Anthropic-compatible platform endpoint; `cr gateway` separately contributes a local Claude Code subscription to the shared pool.
 
 ```bash
 # Interactive model and tool selection
@@ -135,6 +135,7 @@ cr start
 cr start claude --model claude-sonnet-4-6
 cr start codex --model gpt-4.1
 cr start gemini --model gemini-2.5-flash
+cr start agy --model gemini-3.8-flash
 cr start aider --model gpt-4o-mini
 cr start opencode --model gpt-4o-mini
 
@@ -142,7 +143,7 @@ cr start opencode --model gpt-4o-mini
 cr start claude --model claude-sonnet-4-6 -- --resume
 ```
 
-Claude Code sends an explicit `claude_oauth` provider choice to ClosedRouter so its requests use the local Claude subscription bridge. Codex gets a separate `~/.codex/closedrouter-launch.config.toml` profile using the Responses API. Gemini gets an app-owned authentication settings file under `~/.closedrouter/`, and OpenCode receives inline launch configuration. The launchers do not change the tools' main configuration files.
+Claude Code uses the Anthropic-compatible endpoint and can route through any eligible provider account. Codex gets a separate `~/.codex/closedrouter-launch.config.toml` profile using the Responses API. Gemini gets an app-owned authentication settings file under `~/.closedrouter/`, and OpenCode receives inline launch configuration. Antigravity CLI requires `modelProvider: "gemini"` in `~/.gemini/antigravity-cli/settings.json`; its launcher uses `GEMINI_API_KEY` and `GOOGLE_GEMINI_BASE_URL`. The launchers do not change the tools' main configuration files.
 
 Cursor SDK keys can also be connected in the web account dialog or imported from `CURSOR_API_KEY`. ClosedRouter discovers models using Cursor's SDK and sends text-only, tools-disabled SDK runs through its normal gateway and telemetry path. This credential type is separate from Cursor OAuth tokens imported from the editor.
 

package/dist/commands/start.d.ts

@@ -3,7 +3,7 @@
  * The per-tool adapters follow the launcher pattern used by Ollama: discover a
  * model, write only app-owned config, then start the installed client process.
  */
-export type StartTool = "claude" | "codex" | "gemini" | "aider" | "opencode";
+export type StartTool = "claude" | "codex" | "gemini" | "agy" | "aider" | "opencode";
 type CliTool = StartTool;
 export interface StartCommandOptions {
     tool?: string;
@@ -26,6 +26,7 @@ export interface LaunchPlan {
 }
 export declare function isGatewayModelAvailable(availableModels: string[], model: string): boolean;
 export declare function buildLaunchPlan(tool: CliTool, serverUrl: string, apiKey: string, model: string, toolArgs?: string[], homeDir?: string, executablePath?: string): LaunchPlan;
+export declare function modelSupportsHarness(model: Record<string, any>, tool: StartTool): boolean;
 export declare function startCommand(options?: StartCommandOptions): Promise<void>;
 export {};
 //# sourceMappingURL=start.d.ts.map

package/dist/commands/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,CAAC;AAC7E,KAAK,OAAO,GAAG,SAAS,CAAC;AAEzB,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAEzF;AA6BD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,MAAM,EAAO,EACvB,OAAO,SAAY,EACnB,cAAc,CAAC,EAAE,MAAM,GACtB,UAAU,CAqGZ;AA6FD,wBAAsB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCnF"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,GAAG,UAAU,CAAC;AACrF,KAAK,OAAO,GAAG,SAAS,CAAC;AAEzB,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,wBAAgB,uBAAuB,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAEzF;AA8BD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,OAAO,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,GAAE,MAAM,EAAO,EACvB,OAAO,SAAY,EACnB,cAAc,CAAC,EAAE,MAAM,GACtB,UAAU,CAgHZ;AAmBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAMzF;AAsDD,wBAAsB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwCnF"}

package/dist/index.js

@@ -8607,16 +8607,18 @@ to scan and import local subscriptions!`, "Pool Empty");
 // src/commands/start.ts
 var import_picocolors12 = __toESM(require_picocolors(), 1);
 import { spawn as spawn3 } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import { mkdirSync as mkdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync2 } from "node:fs";
 import { homedir as homedir9 } from "node:os";
-import { dirname, join as join9, resolve } from "node:path";
+import { dirname, join as join9 } from "node:path";
 function isGatewayModelAvailable(availableModels, model) {
   return availableModels.includes(model);
 }
 var TOOL_OPTIONS = [
-  { value: "claude", label: "Claude Code", hint: "Anthropic API with the local Claude subscription gateway" },
+  { value: "claude", label: "Claude Code", hint: "Anthropic-compatible API using your ClosedRouter pool" },
   { value: "codex", label: "Codex CLI", hint: "OpenAI Responses API" },
   { value: "gemini", label: "Gemini CLI", hint: "Google Gemini API" },
+  { value: "agy", label: "Antigravity CLI", hint: "Google Gemini API via your ClosedRouter pool" },
   { value: "aider", label: "Aider", hint: "OpenAI-compatible API" },
   { value: "opencode", label: "OpenCode", hint: "OpenAI-compatible API" }
 ];
@@ -8641,11 +8643,11 @@ function buildLaunchPlan(tool, serverUrl, apiKey, model, toolArgs = [], homeDir
     env.ANTHROPIC_BASE_URL = baseUrl;
     env.ANTHROPIC_API_KEY = apiKey;
     const existingHeaders = (env.ANTHROPIC_CUSTOM_HEADERS || "").split(/\r?\n/).filter((header) => header.trim() && !/^\s*x-closedrouter-provider-only\s*:/i.test(header));
-    env.ANTHROPIC_CUSTOM_HEADERS = [
-      ...existingHeaders,
-      "X-ClosedRouter-Provider-Only: claude_oauth"
-    ].join(`
+    if (existingHeaders.length)
+      env.ANTHROPIC_CUSTOM_HEADERS = existingHeaders.join(`
 `);
+    else
+      delete env.ANTHROPIC_CUSTOM_HEADERS;
     return {
       tool,
       command,
@@ -8697,6 +8699,19 @@ function buildLaunchPlan(tool, serverUrl, apiKey, model, toolArgs = [], homeDir
       }
     };
   }
+  if (tool === "agy") {
+    env.GEMINI_API_KEY = apiKey;
+    env.GOOGLE_GEMINI_BASE_URL = baseUrl;
+    const conflicting = toolArgs.find((arg) => arg === "--model" || arg.startsWith("--model=") || arg === "--effort" || arg.startsWith("--effort="));
+    if (conflicting)
+      throw new Error(`Remove ${conflicting}; ClosedRouter manages the Antigravity model and effort.`);
+    return {
+      tool,
+      command,
+      args: ["--model", model, "--effort", "high", ...toolArgs],
+      env
+    };
+  }
   if (tool === "aider") {
     env.OPENAI_API_BASE = `${baseUrl}/v1`;
     env.OPENAI_API_KEY = apiKey;
@@ -8746,6 +8761,18 @@ function writeOwnedConfig(file) {
 function modelId(model) {
   return String(model.id || model.name || "");
 }
+function modelSupportsHarness(model, tool) {
+  const parameters = model.supported_parameters;
+  return (tool !== "agy" || modelId(model).startsWith("gemini-")) && (model.status === undefined || model.status === "available") && (model.available_tool_account_count === undefined || model.available_tool_account_count > 0) && (!Array.isArray(parameters) || parameters.includes("tools"));
+}
+function discoverAgyModels(command) {
+  try {
+    const output = execFileSync(command, ["models"], { encoding: "utf8", timeout: 1e4, stdio: ["ignore", "pipe", "ignore"] });
+    return new Set(output.split(/\r?\n/).map((line) => line.split(/\s+/)[0]).filter((id) => /^gemini-[\w.-]+-(?:high|medium|low)$/.test(id)).map((id) => id.replace(/-(?:high|medium|low)$/, "")));
+  } catch {
+    throw new Error("Could not list Antigravity CLI models. Install or update `agy`, then try `cr start agy` again.");
+  }
+}
 async function selectTool(tool) {
   const cleaned = tool?.toLowerCase();
   if (cleaned) {
@@ -8763,50 +8790,19 @@ async function selectTool(tool) {
 }
 async function ensurePlatformKey(tool, client, options) {
   const config = loadConfig();
-  const key = options.key?.trim() || (tool === "claude" ? config.bridgeApiKey || config.apiKey : config.apiKey || config.bridgeApiKey);
+  const key = options.key?.trim() || config.apiKey;
   if (key)
     return key;
   if (!config.sessionToken) {
     throw new Error("No platform API key is configured. Run `cr login` or pass `--key <cr-sk-...>`.");
   }
-  const label = tool === "claude" ? "Claude Code local gateway" : `ClosedRouter ${tool} launch`;
-  const allowedModels = tool === "claude" ? await client.listClaudeBridgeModels() : undefined;
-  if (tool === "claude" && !allowedModels?.length) {
-    throw new Error("No Claude OAuth models are enabled for this workspace.");
-  }
-  const created = await client.createApiKey(label, 1e6, allowedModels, 60);
+  const created = await client.createApiKey(`ClosedRouter ${tool} launch`, 1e6, undefined, 60);
   const rawKey = String(created.key || created.api_key || "");
   if (!rawKey.startsWith("cr-sk-"))
     throw new Error("The server did not return a platform API key.");
-  saveConfig(tool === "claude" ? { bridgeApiKey: rawKey } : { apiKey: rawKey });
+  saveConfig({ apiKey: rawKey });
   return rawKey;
 }
-async function ensureClaudeBridge(client, serverUrl, key) {
-  const hasClaudeNode = (nodes) => nodes.some((node) => node.status === "online" && Array.isArray(node.providers) && node.providers.includes("claude_oauth"));
-  if (hasClaudeNode(await client.listBridgeNodes()))
-    return;
-  const script = process.argv[1];
-  if (!script)
-    throw new Error("No Claude subscription gateway is online. Start one with `cr gateway`.");
-  const child = spawn3(process.execPath, [resolve(script), "gateway", "--server", serverUrl, "--key-stdin"], {
-    detached: true,
-    env: process.env,
-    stdio: ["pipe", "ignore", "ignore"]
-  });
-  child.stdin?.end(`${key}
-`);
-  child.unref();
-  for (let attempt = 0;attempt < 30; attempt++) {
-    if (child.exitCode !== null)
-      break;
-    await new Promise((resolveDelay) => setTimeout(resolveDelay, 400));
-    if (hasClaudeNode(await client.listBridgeNodes()))
-      return;
-  }
-  if (child.exitCode === null)
-    child.kill("SIGTERM");
-  throw new Error("Could not start the local Claude gateway. Run `cr gateway` in a terminal to see its connection status.");
-}
 async function runTool(plan) {
   return await new Promise((resolveExit, rejectExit) => {
     const child = spawn3(plan.command, plan.args, { env: plan.env, stdio: "inherit" });
@@ -8822,7 +8818,11 @@ async function startCommand(options = {}) {
   const apiKey = await ensurePlatformKey(tool, client, options);
   client.setApiKey(apiKey);
   const models = await client.listGatewayModels({ preferApiKey: true });
-  const availableModels = models.map(modelId).filter(Boolean).sort();
+  let availableModels = models.filter((item) => modelSupportsHarness(item, tool)).map(modelId).filter(Boolean).sort();
+  if (tool === "agy") {
+    const supportedModels = discoverAgyModels(options.executablePath || "agy");
+    availableModels = availableModels.filter((id) => supportedModels.has(id));
+  }
   let model = options.model?.trim();
   if (!model) {
     if (availableModels.length === 0) {
@@ -8840,10 +8840,8 @@ async function startCommand(options = {}) {
     model = String(choice);
   }
   if (!isGatewayModelAvailable(availableModels, model)) {
-    throw new Error(`Model '${model}' is not available to this platform key. Choose a model from ClosedRouter's model catalog.`);
+    throw new Error(`Model '${model}' is not available for ${tool} with this platform key. Agent clients require a provider that supports gateway function tools. Choose another model from ClosedRouter's model catalog.`);
   }
-  if (tool === "claude")
-    await ensureClaudeBridge(client, serverUrl, apiKey);
   const plan = buildLaunchPlan(tool, serverUrl, apiKey, model, options.toolArgs, homedir9(), options.executablePath);
   if (plan.configFile)
     writeOwnedConfig(plan.configFile);
@@ -8897,7 +8895,7 @@ process.on("warning", (warning) => {
   console.warn(warning.name, warning.message);
 });
 var program2 = new Command;
-program2.name("closedrouter").description("ClosedRouter CLI: Import local AI subscriptions & API keys into your shared token pool").version("1.1.1").option("-s, --server <url>", "ClosedRouter server base URL (default: http://localhost:8000)").action(async (options) => {
+program2.name("closedrouter").description("ClosedRouter CLI: Import local AI subscriptions & API keys into your shared token pool").version("1.1.3").option("-s, --server <url>", "ClosedRouter server base URL (default: http://localhost:8000)").action(async (options) => {
   await onboardCommand({ server: options.server });
 });
 program2.command("onboard").description("Run the full interactive onboarding wizard").option("-s, --server <url>", "ClosedRouter server base URL").option("-a, --all", "Automatically import all discovered accounts").option("--shared", "Contribute accounts to the shared team pool").action(async (options) => {
@@ -8954,4 +8952,7 @@ program2.command("start [tool] [tool-args...]").alias("launch").description("Con
     executablePath: options.path
   });
 });
-program2.parse(process.argv);
+program2.parseAsync(process.argv).catch((error) => {
+  console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
+  process.exitCode = 1;
+});

package/package.json

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