@getrouter/getrouter-cli 0.1.11 → 0.1.12

package/dist/bin.mjs

@@ -8,7 +8,7 @@ import { randomInt } from "node:crypto";
 import prompts from "prompts";
 
 //#region package.json
-var version = "0.1.10";
+var version = "0.1.12";
 
 //#endregion
 //#region src/generated/router/dashboard/v1/index.ts
@@ -662,7 +662,10 @@ const selectConsumer = async (consumerService) => {
 		pageSize: void 0,
 		pageToken
 	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0);
-	if (consumers.length === 0) throw new Error("No available API keys");
+	if (consumers.length === 0) {
+		console.log("No available API keys. Create one at https://getrouter.dev/dashboard/keys");
+		return null;
+	}
 	const sorted = sortConsumersByUpdatedAtDesc(consumers);
 	const nameCounts = buildNameCounts(sorted);
 	return await fuzzySelect({
@@ -683,7 +686,10 @@ const selectConsumerList = async (consumerService, message) => {
 		pageSize: void 0,
 		pageToken
 	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0);
-	if (consumers.length === 0) throw new Error("No available API keys");
+	if (consumers.length === 0) {
+		console.log("No available API keys. Create one at https://getrouter.dev/dashboard/keys");
+		return null;
+	}
 	const sorted = sortConsumersByUpdatedAtDesc(consumers);
 	const nameCounts = buildNameCounts(sorted);
 	const response = await prompts({
@@ -1188,16 +1194,21 @@ const setOrDeleteRootKey = (rootLines, key, value) => {
 const deleteRootKey = (rootLines, key) => {
 	setOrDeleteRootKey(rootLines, key, void 0);
 };
+const hasLegacyRootMarkers = (lines) => lines.some((line) => {
+	const key = matchKey(line)?.[1];
+	return !!(key && LEGACY_TOML_ROOT_MARKERS.includes(key));
+});
 const removeCodexConfig = (content, options) => {
-	const { restoreRoot } = options ?? {};
+	const { restoreRoot, allowRootRemoval = true } = options ?? {};
 	const lines = content.length ? content.split(/\r?\n/) : [];
 	const providerIsGetrouter = normalizeTomlString(readRootValue(lines, "model_provider")) === CODEX_PROVIDER;
+	const canRemoveRoot = allowRootRemoval || hasLegacyRootMarkers(lines);
 	const stripped = stripGetrouterProviderSection(lines);
 	const firstHeaderIndex = stripped.findIndex((line) => matchHeader(line));
 	const rootEnd = firstHeaderIndex === -1 ? stripped.length : firstHeaderIndex;
 	const rootLines = stripLegacyMarkersFromRoot(stripped.slice(0, rootEnd));
 	const restLines = stripped.slice(rootEnd);
-	if (providerIsGetrouter) if (restoreRoot) {
+	if (providerIsGetrouter && canRemoveRoot) if (restoreRoot) {
 		setOrDeleteRootKey(rootLines, "model", restoreRoot.model);
 		setOrDeleteRootKey(rootLines, "model_reasoning_effort", restoreRoot.reasoning);
 		setOrDeleteRootKey(rootLines, "model_provider", restoreRoot.provider);
@@ -1216,16 +1227,20 @@ const removeCodexConfig = (content, options) => {
 	};
 };
 const removeAuthJson = (data, options) => {
-	const { force = false, installed, restore } = options ?? {};
+	const { installed, restore } = options ?? {};
 	const next = { ...data };
 	let changed = false;
+	const legacyInstalled = typeof next._getrouter_codex_installed_openai_api_key === "string" ? next._getrouter_codex_installed_openai_api_key : void 0;
+	const legacyRestore = typeof next._getrouter_codex_backup_openai_api_key === "string" ? next._getrouter_codex_backup_openai_api_key : void 0;
+	const effectiveInstalled = installed ?? legacyInstalled;
+	const effectiveRestore = restore ?? legacyRestore;
 	for (const key of LEGACY_AUTH_MARKERS) if (key in next) {
 		delete next[key];
 		changed = true;
 	}
 	const current = typeof next.OPENAI_API_KEY === "string" ? next.OPENAI_API_KEY : void 0;
-	const restoreValue = typeof restore === "string" && restore.trim().length > 0 ? restore : void 0;
-	if (installed && current && current === installed) {
+	const restoreValue = typeof effectiveRestore === "string" && effectiveRestore.trim().length > 0 ? effectiveRestore : void 0;
+	if (effectiveInstalled && current && current === effectiveInstalled) {
 		if (restoreValue) next.OPENAI_API_KEY = restoreValue;
 		else delete next.OPENAI_API_KEY;
 		changed = true;
@@ -1234,10 +1249,6 @@ const removeAuthJson = (data, options) => {
 			changed
 		};
 	}
-	if (force && current) {
-		delete next.OPENAI_API_KEY;
-		changed = true;
-	}
 	return {
 		data: next,
 		changed
@@ -1358,12 +1369,15 @@ const registerCodexCommand = (program) => {
 		const restoreRoot = backup?.config?.previous;
 		const restoreOpenaiKey = backup?.auth?.previousOpenaiKey;
 		const installedOpenaiKey = backup?.auth?.installedOpenaiKey;
+		const hasBackup = Boolean(backup);
 		const configContent = configExists ? readFileIfExists(configPath) : "";
-		const configResult = configExists ? removeCodexConfig(configContent, { restoreRoot }) : null;
+		const configResult = configExists ? removeCodexConfig(configContent, {
+			restoreRoot,
+			allowRootRemoval: hasBackup
+		}) : null;
 		const authContent = authExists ? fs.readFileSync(authPath, "utf8").trim() : "";
 		const authData = authExists ? authContent ? JSON.parse(authContent) : {} : null;
 		const authResult = authData ? removeAuthJson(authData, {
-			force: true,
 			installed: installedOpenaiKey,
 			restore: restoreOpenaiKey
 		}) : null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getrouter/getrouter-cli",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "type": "module",
   "description": "CLI for getrouter.dev",
   "bin": {

package/src/cmd/codex.ts

@@ -235,10 +235,14 @@ export const registerCodexCommand = (program: Command) => {
       const restoreRoot = backup?.config?.previous;
       const restoreOpenaiKey = backup?.auth?.previousOpenaiKey;
       const installedOpenaiKey = backup?.auth?.installedOpenaiKey;
+      const hasBackup = Boolean(backup);
 
       const configContent = configExists ? readFileIfExists(configPath) : "";
       const configResult = configExists
-        ? removeCodexConfig(configContent, { restoreRoot })
+        ? removeCodexConfig(configContent, {
+            restoreRoot,
+            allowRootRemoval: hasBackup,
+          })
         : null;
 
       const authContent = authExists
@@ -251,7 +255,6 @@ export const registerCodexCommand = (program: Command) => {
         : null;
       const authResult = authData
         ? removeAuthJson(authData, {
-            force: true,
             installed: installedOpenaiKey,
             restore: restoreOpenaiKey,
           })

package/src/core/interactive/keys.ts

@@ -139,7 +139,10 @@ export const selectConsumer = async (
     (res) => res?.nextPageToken || undefined,
   );
   if (consumers.length === 0) {
-    throw new Error("No available API keys");
+    console.log(
+      "No available API keys. Create one at https://getrouter.dev/dashboard/keys",
+    );
+    return null;
   }
   const sorted = sortConsumersByUpdatedAtDesc(consumers);
   const nameCounts = buildNameCounts(sorted);
@@ -172,7 +175,10 @@ export const selectConsumerList = async (
     (res) => res?.nextPageToken || undefined,
   );
   if (consumers.length === 0) {
-    throw new Error("No available API keys");
+    console.log(
+      "No available API keys. Create one at https://getrouter.dev/dashboard/keys",
+    );
+    return null;
   }
   const sorted = sortConsumersByUpdatedAtDesc(consumers);
   const nameCounts = buildNameCounts(sorted);

package/src/core/setup/codex.ts

@@ -277,15 +277,26 @@ const deleteRootKey = (rootLines: string[], key: string) => {
   setOrDeleteRootKey(rootLines, key, undefined);
 };
 
+const hasLegacyRootMarkers = (lines: string[]) =>
+  lines.some((line) => {
+    const keyMatch = matchKey(line);
+    const key = keyMatch?.[1];
+    return !!(key && LEGACY_TOML_ROOT_MARKERS.includes(key as never));
+  });
+
 export const removeCodexConfig = (
   content: string,
-  options?: { restoreRoot?: CodexTomlRootValues },
+  options?: {
+    restoreRoot?: CodexTomlRootValues;
+    allowRootRemoval?: boolean;
+  },
 ) => {
-  const { restoreRoot } = options ?? {};
+  const { restoreRoot, allowRootRemoval = true } = options ?? {};
   const lines = content.length ? content.split(/\r?\n/) : [];
   const providerIsGetrouter =
     normalizeTomlString(readRootValue(lines, "model_provider")) ===
     CODEX_PROVIDER;
+  const canRemoveRoot = allowRootRemoval || hasLegacyRootMarkers(lines);
 
   const stripped = stripGetrouterProviderSection(lines);
   const firstHeaderIndex = stripped.findIndex((line) => matchHeader(line));
@@ -293,7 +304,7 @@ export const removeCodexConfig = (
   const rootLines = stripLegacyMarkersFromRoot(stripped.slice(0, rootEnd));
   const restLines = stripped.slice(rootEnd);
 
-  if (providerIsGetrouter) {
+  if (providerIsGetrouter && canRemoveRoot) {
     if (restoreRoot) {
       setOrDeleteRootKey(rootLines, "model", restoreRoot.model);
       setOrDeleteRootKey(
@@ -326,15 +337,26 @@ export const removeCodexConfig = (
 export const removeAuthJson = (
   data: Record<string, unknown>,
   options?: {
-    force?: boolean;
     installed?: string;
     restore?: string;
   },
 ) => {
-  const { force = false, installed, restore } = options ?? {};
+  const { installed, restore } = options ?? {};
   const next: Record<string, unknown> = { ...data };
   let changed = false;
 
+  const legacyInstalled =
+    typeof next._getrouter_codex_installed_openai_api_key === "string"
+      ? (next._getrouter_codex_installed_openai_api_key as string)
+      : undefined;
+  const legacyRestore =
+    typeof next._getrouter_codex_backup_openai_api_key === "string"
+      ? (next._getrouter_codex_backup_openai_api_key as string)
+      : undefined;
+
+  const effectiveInstalled = installed ?? legacyInstalled;
+  const effectiveRestore = restore ?? legacyRestore;
+
   for (const key of LEGACY_AUTH_MARKERS) {
     if (key in next) {
       delete next[key];
@@ -347,11 +369,11 @@ export const removeAuthJson = (
       ? (next.OPENAI_API_KEY as string)
       : undefined;
   const restoreValue =
-    typeof restore === "string" && restore.trim().length > 0
-      ? restore
+    typeof effectiveRestore === "string" && effectiveRestore.trim().length > 0
+      ? effectiveRestore
       : undefined;
 
-  if (installed && current && current === installed) {
+  if (effectiveInstalled && current && current === effectiveInstalled) {
     if (restoreValue) {
       next.OPENAI_API_KEY = restoreValue;
     } else {
@@ -361,10 +383,5 @@ export const removeAuthJson = (
     return { data: next, changed };
   }
 
-  if (force && current) {
-    delete next.OPENAI_API_KEY;
-    changed = true;
-  }
-
   return { data: next, changed };
 };

package/tests/cmd/codex.test.ts

@@ -239,6 +239,7 @@ describe("codex command", () => {
     process.env.HOME = dir;
     const codexDir = path.join(dir, ".codex");
     fs.mkdirSync(codexDir, { recursive: true });
+    fs.mkdirSync(path.join(dir, ".getrouter"), { recursive: true });
     fs.writeFileSync(
       codexConfigPath(dir),
       [
@@ -259,6 +260,21 @@ describe("codex command", () => {
       codexAuthPath(dir),
       JSON.stringify({ OTHER: "keep", OPENAI_API_KEY: "old" }, null, 2),
     );
+    fs.writeFileSync(
+      codexBackupPath(dir),
+      JSON.stringify(
+        {
+          version: 1,
+          createdAt: "2026-01-01T00:00:00Z",
+          updatedAt: "2026-01-01T00:00:00Z",
+          auth: {
+            installedOpenaiKey: "old",
+          },
+        },
+        null,
+        2,
+      ),
+    );
 
     const program = createProgram();
     await program.parseAsync(["node", "getrouter", "codex", "uninstall"]);
@@ -276,6 +292,46 @@ describe("codex command", () => {
     expect(auth.OPENAI_API_KEY).toBeUndefined();
   });
 
+  it("uninstall preserves existing keys when backup is missing", async () => {
+    const dir = makeDir();
+    process.env.HOME = dir;
+    const codexDir = path.join(dir, ".codex");
+    fs.mkdirSync(codexDir, { recursive: true });
+    fs.writeFileSync(
+      codexConfigPath(dir),
+      [
+        'theme = "dark"',
+        'model = "keep"',
+        'model_reasoning_effort = "low"',
+        'model_provider = "getrouter"',
+        "",
+        "[model_providers.getrouter]",
+        'name = "getrouter"',
+        'base_url = "https://api.getrouter.dev/codex"',
+        "",
+        "[model_providers.other]",
+        'name = "other"',
+      ].join("\n"),
+    );
+    fs.writeFileSync(
+      codexAuthPath(dir),
+      JSON.stringify({ OTHER: "keep", OPENAI_API_KEY: "old" }, null, 2),
+    );
+
+    const program = createProgram();
+    await program.parseAsync(["node", "getrouter", "codex", "uninstall"]);
+
+    const config = fs.readFileSync(codexConfigPath(dir), "utf8");
+    expect(config).toContain('theme = "dark"');
+    expect(config).toContain('model = "keep"');
+    expect(config).toContain('model_provider = "getrouter"');
+    expect(config).toContain('model_reasoning_effort = "low"');
+
+    const auth = JSON.parse(fs.readFileSync(codexAuthPath(dir), "utf8"));
+    expect(auth.OTHER).toBe("keep");
+    expect(auth.OPENAI_API_KEY).toBe("old");
+  });
+
   it("uninstall restores previous OPENAI_API_KEY when backup exists", async () => {
     const dir = makeDir();
     process.env.HOME = dir;

package/tests/core/setup/codex.test.ts

@@ -100,12 +100,12 @@ describe("codex setup helpers", () => {
     expect(data.OTHER).toBe("keep");
   });
 
-  it("removes OPENAI_API_KEY when forced and no restore is available", () => {
+  it("removes OPENAI_API_KEY when installed key matches and no restore is available", () => {
     const input = {
       OPENAI_API_KEY: "new-key",
       OTHER: "keep",
     } as Record<string, unknown>;
-    const { data, changed } = removeAuthJson(input, { force: true });
+    const { data, changed } = removeAuthJson(input, { installed: "new-key" });
     expect(changed).toBe(true);
     expect(data.OPENAI_API_KEY).toBeUndefined();
     expect(data.OTHER).toBe("keep");