@getrouter/getrouter-cli 0.1.10 → 0.1.12

package/README.ja.md

@@ -86,6 +86,7 @@ getrouter codex uninstall
 
 - `~/.codex/config.toml`（model + reasoning + provider 設定）
 - `~/.codex/auth.json`（OPENAI_API_KEY）
+- `~/.getrouter/codex-backup.json`（`getrouter codex uninstall` 用のバックアップ。uninstall で削除）
 
 `getrouter claude` は Anthropic 互換の環境変数を `~/.getrouter/env.sh`（または `env.ps1`）へ書き込みます。
 

package/README.md

@@ -1,5 +1,11 @@
 # GetRouter CLI
 
+[![CI](https://github.com/getrouter/getrouter-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/getrouter/getrouter-cli/actions/workflows/ci.yml)
+[![npm version](https://img.shields.io/npm/v/@getrouter/getrouter-cli)](https://www.npmjs.com/package/@getrouter/getrouter-cli)
+[![npm downloads](https://img.shields.io/npm/dm/@getrouter/getrouter-cli)](https://www.npmjs.com/package/@getrouter/getrouter-cli)
+[![node](https://img.shields.io/node/v/@getrouter/getrouter-cli)](https://www.npmjs.com/package/@getrouter/getrouter-cli)
+[![bun](https://img.shields.io/badge/bun-1.3.5-000?logo=bun&logoColor=white)](https://bun.sh)
+
 CLI for getrouter.dev — manage API keys, subscriptions, and configure vibecoding tools.
 
 English | [简体中文](README.zh-cn.md) | [日本語](README.ja.md)
@@ -86,6 +92,7 @@ Files written (codex):
 
 - `~/.codex/config.toml` (model + reasoning + provider settings)
 - `~/.codex/auth.json` (OPENAI_API_KEY)
+- `~/.getrouter/codex-backup.json` (backup for `getrouter codex uninstall`; deleted on uninstall)
 
 `getrouter claude` writes Anthropic-compatible env vars to `~/.getrouter/env.sh` (or `env.ps1`).
 
@@ -121,3 +128,5 @@ Edit `~/.getrouter/config.json` directly to update CLI settings.
 - `bun run format` — format and lint code with Biome
 - `bun run test` — run the test suite
 - `bun run typecheck` — run TypeScript type checks
+
+[![Download History (last 30 days)](https://quickchart.io/chart/render/zf-3cc45f8d-a7de-4553-bdfa-877c4592ce59)](https://www.npmjs.com/package/@getrouter/getrouter-cli)

package/README.zh-cn.md

@@ -86,6 +86,7 @@ getrouter codex uninstall
 
 - `~/.codex/config.toml`（model + reasoning + provider 设置）
 - `~/.codex/auth.json`（OPENAI_API_KEY）
+- `~/.getrouter/codex-backup.json`（用于 `getrouter codex uninstall` 的备份；卸载后会删除）
 
 `getrouter claude` 写入 Anthropic 兼容环境变量到 `~/.getrouter/env.sh`（或 `env.ps1`）。
 

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({
@@ -1011,6 +1017,15 @@ const mapReasoningValue = (id) => REASONING_CHOICES.find((choice) => choice.id =
 //#region src/core/setup/codex.ts
 const CODEX_PROVIDER = "getrouter";
 const CODEX_BASE_URL = "https://api.getrouter.dev/codex";
+const LEGACY_TOML_ROOT_MARKERS = [
+	"_getrouter_codex_backup_model",
+	"_getrouter_codex_backup_model_reasoning_effort",
+	"_getrouter_codex_backup_model_provider",
+	"_getrouter_codex_installed_model",
+	"_getrouter_codex_installed_model_reasoning_effort",
+	"_getrouter_codex_installed_model_provider"
+];
+const LEGACY_AUTH_MARKERS = ["_getrouter_codex_backup_openai_api_key", "_getrouter_codex_installed_openai_api_key"];
 const ROOT_KEYS = [
 	"model",
 	"model_reasoning_effort",
@@ -1036,9 +1051,56 @@ const providerValues = () => ({
 });
 const matchHeader = (line) => line.match(/^\s*\[([^\]]+)\]\s*$/);
 const matchKey = (line) => line.match(/^\s*([A-Za-z0-9_.-]+)\s*=/);
-const matchProviderValue = (line) => line.match(/^\s*model_provider\s*=\s*(['"]?)([^'"]+)\1\s*(?:#.*)?$/);
+const parseTomlRhsValue = (rhs) => {
+	const trimmed = rhs.trim();
+	if (!trimmed) return "";
+	const first = trimmed[0];
+	if (first === "\"" || first === "'") {
+		const end = trimmed.indexOf(first, 1);
+		return end === -1 ? trimmed : trimmed.slice(0, end + 1);
+	}
+	const hashIndex = trimmed.indexOf("#");
+	return (hashIndex === -1 ? trimmed : trimmed.slice(0, hashIndex)).trim();
+};
+const readRootValue = (lines, key) => {
+	for (const line of lines) {
+		if (matchHeader(line)) break;
+		if (matchKey(line)?.[1] === key) {
+			const parts = line.split("=");
+			parts.shift();
+			return parseTomlRhsValue(parts.join("="));
+		}
+	}
+};
+const readCodexTomlRootValues = (content) => {
+	const lines = content.length ? content.split(/\r?\n/) : [];
+	return {
+		model: readRootValue(lines, "model"),
+		reasoning: readRootValue(lines, "model_reasoning_effort"),
+		provider: readRootValue(lines, "model_provider")
+	};
+};
+const normalizeTomlString = (value) => {
+	if (!value) return "";
+	const trimmed = value.trim();
+	if (trimmed.startsWith("\"") && trimmed.endsWith("\"") || trimmed.startsWith("'") && trimmed.endsWith("'")) return trimmed.slice(1, -1).trim().toLowerCase();
+	return trimmed.replace(/['"]/g, "").trim().toLowerCase();
+};
+const stripLegacyRootMarkers = (lines) => {
+	const updated = [];
+	let inRoot = true;
+	for (const line of lines) {
+		if (matchHeader(line)) inRoot = false;
+		if (inRoot) {
+			const key = matchKey(line)?.[1];
+			if (key && LEGACY_TOML_ROOT_MARKERS.includes(key)) continue;
+		}
+		updated.push(line);
+	}
+	return updated;
+};
 const mergeCodexToml = (content, input) => {
-	const updated = [...content.length ? content.split(/\r?\n/) : []];
+	const updated = [...stripLegacyRootMarkers(content.length ? content.split(/\r?\n/) : [])];
 	const rootValueMap = rootValues(input);
 	const providerValueMap = providerValues();
 	let currentSection = null;
@@ -1093,10 +1155,12 @@ const mergeCodexToml = (content, input) => {
 	if (missingProvider.length > 0) updated.splice(providerEnd, 0, ...missingProvider);
 	return updated.join("\n");
 };
-const mergeAuthJson = (data, apiKey) => ({
-	...data,
-	OPENAI_API_KEY: apiKey
-});
+const mergeAuthJson = (data, apiKey) => {
+	const next = { ...data };
+	for (const key of LEGACY_AUTH_MARKERS) if (key in next) delete next[key];
+	next.OPENAI_API_KEY = apiKey;
+	return next;
+};
 const stripGetrouterProviderSection = (lines) => {
 	const updated = [];
 	let skipSection = false;
@@ -1114,61 +1178,87 @@ const stripGetrouterProviderSection = (lines) => {
 	}
 	return updated;
 };
-const stripRootKeys = (lines) => {
-	const updated = [];
-	let currentSection = null;
-	for (const line of lines) {
-		const headerMatch = matchHeader(line);
-		if (headerMatch) {
-			currentSection = headerMatch[1]?.trim() ?? null;
-			updated.push(line);
-			continue;
-		}
-		if (currentSection === null) {
-			if (/^\s*model\s*=/.test(line)) continue;
-			if (/^\s*model_reasoning_effort\s*=/.test(line)) continue;
-			if (/^\s*model_provider\s*=/.test(line)) continue;
-		}
-		updated.push(line);
+const stripLegacyMarkersFromRoot = (rootLines) => rootLines.filter((line) => {
+	const key = matchKey(line)?.[1];
+	return !(key && LEGACY_TOML_ROOT_MARKERS.includes(key));
+});
+const setOrDeleteRootKey = (rootLines, key, value) => {
+	const idx = rootLines.findIndex((line) => matchKey(line)?.[1] === key);
+	if (value === void 0) {
+		if (idx !== -1) rootLines.splice(idx, 1);
+		return;
 	}
-	return updated;
+	if (idx !== -1) rootLines[idx] = `${key} = ${value}`;
+	else rootLines.push(`${key} = ${value}`);
+};
+const deleteRootKey = (rootLines, key) => {
+	setOrDeleteRootKey(rootLines, key, void 0);
 };
-const removeCodexConfig = (content) => {
+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, allowRootRemoval = true } = options ?? {};
 	const lines = content.length ? content.split(/\r?\n/) : [];
-	let providerIsGetrouter = false;
-	let currentSection = null;
-	for (const line of lines) {
-		const headerMatch = matchHeader(line);
-		if (headerMatch) {
-			currentSection = headerMatch[1]?.trim() ?? null;
-			continue;
-		}
-		if (currentSection !== null) continue;
-		if ((matchProviderValue(line)?.[2]?.trim())?.toLowerCase() === CODEX_PROVIDER) providerIsGetrouter = true;
+	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 && canRemoveRoot) if (restoreRoot) {
+		setOrDeleteRootKey(rootLines, "model", restoreRoot.model);
+		setOrDeleteRootKey(rootLines, "model_reasoning_effort", restoreRoot.reasoning);
+		setOrDeleteRootKey(rootLines, "model_provider", restoreRoot.provider);
+	} else {
+		deleteRootKey(rootLines, "model");
+		deleteRootKey(rootLines, "model_reasoning_effort");
+		deleteRootKey(rootLines, "model_provider");
 	}
-	let updated = stripGetrouterProviderSection(lines);
-	if (providerIsGetrouter) updated = stripRootKeys(updated);
-	const nextContent = updated.join("\n");
+	const recombined = [...rootLines];
+	if (recombined.length > 0 && restLines.length > 0 && recombined[recombined.length - 1]?.trim() !== "") recombined.push("");
+	recombined.push(...restLines);
+	const nextContent = recombined.join("\n");
 	return {
 		content: nextContent,
 		changed: nextContent !== content
 	};
 };
-const removeAuthJson = (data) => {
-	if (!("OPENAI_API_KEY" in data)) return {
-		data,
-		changed: false
-	};
-	const { OPENAI_API_KEY: _ignored, ...rest } = data;
+const removeAuthJson = (data, 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 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;
+		return {
+			data: next,
+			changed
+		};
+	}
 	return {
-		data: rest,
-		changed: true
+		data: next,
+		changed
 	};
 };
 
 //#endregion
 //#region src/cmd/codex.ts
 const CODEX_DIR = ".codex";
+const CODEX_BACKUP_FILE = "codex-backup.json";
 const readFileIfExists = (filePath) => fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf8") : "";
 const readAuthJson = (filePath) => {
 	if (!fs.existsSync(filePath)) return {};
@@ -1184,6 +1274,18 @@ const ensureCodexDir = () => {
 	return dir;
 };
 const resolveCodexDir = () => path.join(os.homedir(), CODEX_DIR);
+const resolveCodexBackupPath = () => path.join(resolveConfigDir(), CODEX_BACKUP_FILE);
+const readCodexBackup = () => {
+	const raw = readJsonFile(resolveCodexBackupPath());
+	if (!raw || typeof raw !== "object") return null;
+	if (raw.version !== 1) return null;
+	return raw;
+};
+const writeCodexBackup = (backup) => {
+	const backupPath = resolveCodexBackupPath();
+	writeJsonFile(backupPath, backup);
+	if (process.platform !== "win32") fs.chmodSync(backupPath, 384);
+};
 const requireInteractive$1 = () => {
 	if (!process.stdin.isTTY) throw new Error("Interactive mode required for codex configuration.");
 };
@@ -1220,12 +1322,38 @@ const registerCodexCommand = (program) => {
 		const codexDir = ensureCodexDir();
 		const configPath = path.join(codexDir, "config.toml");
 		const authPath = path.join(codexDir, "auth.json");
-		const mergedConfig = mergeCodexToml(readFileIfExists(configPath), {
+		const existingConfig = readFileIfExists(configPath);
+		const existingRoot = readCodexTomlRootValues(existingConfig);
+		const existingAuth = readAuthJson(authPath);
+		const existingOpenaiKey = typeof existingAuth.OPENAI_API_KEY === "string" ? existingAuth.OPENAI_API_KEY : void 0;
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const installedRoot = {
+			model: `"${model}"`,
+			reasoning: `"${reasoningValue}"`,
+			provider: `"getrouter"`
+		};
+		const backup = readCodexBackup() ?? {
+			version: 1,
+			createdAt: now,
+			updatedAt: now
+		};
+		backup.updatedAt = now;
+		backup.config ??= {};
+		backup.config.previous ??= {};
+		if (backup.config.previous.model === void 0 && existingRoot.model && existingRoot.model !== installedRoot.model) backup.config.previous.model = existingRoot.model;
+		if (backup.config.previous.reasoning === void 0 && existingRoot.reasoning && existingRoot.reasoning !== installedRoot.reasoning) backup.config.previous.reasoning = existingRoot.reasoning;
+		if (backup.config.previous.provider === void 0 && existingRoot.provider && existingRoot.provider !== installedRoot.provider) backup.config.previous.provider = existingRoot.provider;
+		backup.config.installed = installedRoot;
+		backup.auth ??= {};
+		if (backup.auth.previousOpenaiKey === void 0 && existingOpenaiKey && existingOpenaiKey !== apiKey) backup.auth.previousOpenaiKey = existingOpenaiKey;
+		backup.auth.installedOpenaiKey = apiKey;
+		writeCodexBackup(backup);
+		const mergedConfig = mergeCodexToml(existingConfig, {
 			model,
 			reasoning: reasoningValue
 		});
 		fs.writeFileSync(configPath, mergedConfig, "utf8");
-		const mergedAuth = mergeAuthJson(readAuthJson(authPath), apiKey);
+		const mergedAuth = mergeAuthJson(existingAuth, apiKey);
 		fs.writeFileSync(authPath, JSON.stringify(mergedAuth, null, 2));
 		if (process.platform !== "win32") fs.chmodSync(authPath, 384);
 		console.log("✅ Updated ~/.codex/config.toml");
@@ -1237,11 +1365,22 @@ const registerCodexCommand = (program) => {
 		const authPath = path.join(codexDir, "auth.json");
 		const configExists = fs.existsSync(configPath);
 		const authExists = fs.existsSync(authPath);
+		const backup = readCodexBackup();
+		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) : 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) : null;
+		const authResult = authData ? removeAuthJson(authData, {
+			installed: installedOpenaiKey,
+			restore: restoreOpenaiKey
+		}) : null;
 		if (!configExists) console.log(`ℹ️ ${configPath} not found`);
 		else if (configResult?.changed) {
 			fs.writeFileSync(configPath, configResult.content, "utf8");
@@ -1252,6 +1391,8 @@ const registerCodexCommand = (program) => {
 			fs.writeFileSync(authPath, JSON.stringify(authResult.data, null, 2));
 			console.log(`✅ Removed getrouter entries from ${authPath}`);
 		} else console.log(`ℹ️ No getrouter entries in ${authPath}`);
+		const backupPath = resolveCodexBackupPath();
+		if (fs.existsSync(backupPath)) fs.unlinkSync(backupPath);
 	});
 };
 

package/package.json

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

package/src/cmd/codex.ts

@@ -3,6 +3,8 @@ import os from "node:os";
 import path from "node:path";
 import type { Command } from "commander";
 import { createApiClients } from "../core/api/client";
+import { readJsonFile, writeJsonFile } from "../core/config/fs";
+import { resolveConfigDir } from "../core/config/paths";
 import {
   getCodexModelChoices,
   mapReasoningValue,
@@ -12,13 +14,30 @@ import {
 import { fuzzySelect } from "../core/interactive/fuzzy";
 import { selectConsumer } from "../core/interactive/keys";
 import {
+  type CodexTomlRootValues,
   mergeAuthJson,
   mergeCodexToml,
+  readCodexTomlRootValues,
   removeAuthJson,
   removeCodexConfig,
 } from "../core/setup/codex";
 
 const CODEX_DIR = ".codex";
+const CODEX_BACKUP_FILE = "codex-backup.json";
+
+type CodexBackupFile = {
+  version: 1;
+  createdAt: string;
+  updatedAt: string;
+  config?: {
+    previous?: CodexTomlRootValues;
+    installed?: Required<CodexTomlRootValues>;
+  };
+  auth?: {
+    previousOpenaiKey?: string;
+    installedOpenaiKey?: string;
+  };
+};
 
 const readFileIfExists = (filePath: string) =>
   fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf8") : "";
@@ -41,6 +60,24 @@ const ensureCodexDir = () => {
 };
 
 const resolveCodexDir = () => path.join(os.homedir(), CODEX_DIR);
+const resolveCodexBackupPath = () =>
+  path.join(resolveConfigDir(), CODEX_BACKUP_FILE);
+
+const readCodexBackup = (): CodexBackupFile | null => {
+  const backupPath = resolveCodexBackupPath();
+  const raw = readJsonFile<CodexBackupFile>(backupPath);
+  if (!raw || typeof raw !== "object") return null;
+  if ((raw as CodexBackupFile).version !== 1) return null;
+  return raw;
+};
+
+const writeCodexBackup = (backup: CodexBackupFile) => {
+  const backupPath = resolveCodexBackupPath();
+  writeJsonFile(backupPath, backup);
+  if (process.platform !== "win32") {
+    fs.chmodSync(backupPath, 0o600);
+  }
+};
 
 const requireInteractive = () => {
   if (!process.stdin.isTTY) {
@@ -110,13 +147,69 @@ export const registerCodexCommand = (program: Command) => {
       const authPath = path.join(codexDir, "auth.json");
 
       const existingConfig = readFileIfExists(configPath);
+      const existingRoot = readCodexTomlRootValues(existingConfig);
+
+      const existingAuth = readAuthJson(authPath);
+      const existingOpenaiKey =
+        typeof existingAuth.OPENAI_API_KEY === "string"
+          ? existingAuth.OPENAI_API_KEY
+          : undefined;
+
+      const now = new Date().toISOString();
+      const installedRoot = {
+        model: `"${model}"`,
+        reasoning: `"${reasoningValue}"`,
+        provider: `"getrouter"`,
+      };
+
+      const backup = readCodexBackup() ?? {
+        version: 1 as const,
+        createdAt: now,
+        updatedAt: now,
+      };
+      backup.updatedAt = now;
+      backup.config ??= {};
+      backup.config.previous ??= {};
+      if (
+        backup.config.previous.model === undefined &&
+        existingRoot.model &&
+        existingRoot.model !== installedRoot.model
+      ) {
+        backup.config.previous.model = existingRoot.model;
+      }
+      if (
+        backup.config.previous.reasoning === undefined &&
+        existingRoot.reasoning &&
+        existingRoot.reasoning !== installedRoot.reasoning
+      ) {
+        backup.config.previous.reasoning = existingRoot.reasoning;
+      }
+      if (
+        backup.config.previous.provider === undefined &&
+        existingRoot.provider &&
+        existingRoot.provider !== installedRoot.provider
+      ) {
+        backup.config.previous.provider = existingRoot.provider;
+      }
+      backup.config.installed = installedRoot;
+
+      backup.auth ??= {};
+      if (
+        backup.auth.previousOpenaiKey === undefined &&
+        existingOpenaiKey &&
+        existingOpenaiKey !== apiKey
+      ) {
+        backup.auth.previousOpenaiKey = existingOpenaiKey;
+      }
+      backup.auth.installedOpenaiKey = apiKey;
+      writeCodexBackup(backup);
+
       const mergedConfig = mergeCodexToml(existingConfig, {
         model,
         reasoning: reasoningValue,
       });
       fs.writeFileSync(configPath, mergedConfig, "utf8");
 
-      const existingAuth = readAuthJson(authPath);
       const mergedAuth = mergeAuthJson(existingAuth, apiKey);
       fs.writeFileSync(authPath, JSON.stringify(mergedAuth, null, 2));
       if (process.platform !== "win32") {
@@ -138,9 +231,18 @@ export const registerCodexCommand = (program: Command) => {
       const configExists = fs.existsSync(configPath);
       const authExists = fs.existsSync(authPath);
 
+      const backup = readCodexBackup();
+      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)
+        ? removeCodexConfig(configContent, {
+            restoreRoot,
+            allowRootRemoval: hasBackup,
+          })
         : null;
 
       const authContent = authExists
@@ -151,7 +253,12 @@ export const registerCodexCommand = (program: Command) => {
           ? (JSON.parse(authContent) as Record<string, unknown>)
           : {}
         : null;
-      const authResult = authData ? removeAuthJson(authData) : null;
+      const authResult = authData
+        ? removeAuthJson(authData, {
+            installed: installedOpenaiKey,
+            restore: restoreOpenaiKey,
+          })
+        : null;
 
       if (!configExists) {
         console.log(`ℹ️ ${configPath} not found`);
@@ -170,5 +277,10 @@ export const registerCodexCommand = (program: Command) => {
       } else {
         console.log(`ℹ️ No getrouter entries in ${authPath}`);
       }
+
+      const backupPath = resolveCodexBackupPath();
+      if (fs.existsSync(backupPath)) {
+        fs.unlinkSync(backupPath);
+      }
     });
 };

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

@@ -3,9 +3,29 @@ type CodexConfigInput = {
   reasoning: string;
 };
 
+export type CodexTomlRootValues = {
+  model?: string;
+  reasoning?: string;
+  provider?: string;
+};
+
 const CODEX_PROVIDER = "getrouter";
 const CODEX_BASE_URL = "https://api.getrouter.dev/codex";
 
+const LEGACY_TOML_ROOT_MARKERS = [
+  "_getrouter_codex_backup_model",
+  "_getrouter_codex_backup_model_reasoning_effort",
+  "_getrouter_codex_backup_model_provider",
+  "_getrouter_codex_installed_model",
+  "_getrouter_codex_installed_model_reasoning_effort",
+  "_getrouter_codex_installed_model_provider",
+] as const;
+
+const LEGACY_AUTH_MARKERS = [
+  "_getrouter_codex_backup_openai_api_key",
+  "_getrouter_codex_installed_openai_api_key",
+] as const;
+
 const ROOT_KEYS = [
   "model",
   "model_reasoning_effort",
@@ -34,12 +54,77 @@ const providerValues = () => ({
 
 const matchHeader = (line: string) => line.match(/^\s*\[([^\]]+)\]\s*$/);
 const matchKey = (line: string) => line.match(/^\s*([A-Za-z0-9_.-]+)\s*=/);
-const matchProviderValue = (line: string) =>
-  line.match(/^\s*model_provider\s*=\s*(['"]?)([^'"]+)\1\s*(?:#.*)?$/);
+
+const parseTomlRhsValue = (rhs: string) => {
+  const trimmed = rhs.trim();
+  if (!trimmed) return "";
+  const first = trimmed[0];
+  if (first === '"' || first === "'") {
+    const end = trimmed.indexOf(first, 1);
+    return end === -1 ? trimmed : trimmed.slice(0, end + 1);
+  }
+  const hashIndex = trimmed.indexOf("#");
+  return (hashIndex === -1 ? trimmed : trimmed.slice(0, hashIndex)).trim();
+};
+
+const readRootValue = (lines: string[], key: string) => {
+  for (const line of lines) {
+    if (matchHeader(line)) break;
+    const keyMatch = matchKey(line);
+    if (keyMatch?.[1] === key) {
+      const parts = line.split("=");
+      parts.shift();
+      return parseTomlRhsValue(parts.join("="));
+    }
+  }
+  return undefined;
+};
+
+export const readCodexTomlRootValues = (
+  content: string,
+): CodexTomlRootValues => {
+  const lines = content.length ? content.split(/\r?\n/) : [];
+  return {
+    model: readRootValue(lines, "model"),
+    reasoning: readRootValue(lines, "model_reasoning_effort"),
+    provider: readRootValue(lines, "model_provider"),
+  };
+};
+
+const normalizeTomlString = (value?: string) => {
+  if (!value) return "";
+  const trimmed = value.trim();
+  if (
+    (trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+    (trimmed.startsWith("'") && trimmed.endsWith("'"))
+  ) {
+    return trimmed.slice(1, -1).trim().toLowerCase();
+  }
+  return trimmed.replace(/['"]/g, "").trim().toLowerCase();
+};
+
+const stripLegacyRootMarkers = (lines: string[]) => {
+  const updated: string[] = [];
+  let inRoot = true;
+
+  for (const line of lines) {
+    if (matchHeader(line)) {
+      inRoot = false;
+    }
+    if (inRoot) {
+      const keyMatch = matchKey(line);
+      const key = keyMatch?.[1];
+      if (key && LEGACY_TOML_ROOT_MARKERS.includes(key as never)) continue;
+    }
+    updated.push(line);
+  }
+
+  return updated;
+};
 
 export const mergeCodexToml = (content: string, input: CodexConfigInput) => {
   const lines = content.length ? content.split(/\r?\n/) : [];
-  const updated = [...lines];
+  const updated = [...stripLegacyRootMarkers(lines)];
   const rootValueMap = rootValues(input);
   const providerValueMap = providerValues();
 
@@ -129,10 +214,16 @@ export const mergeCodexToml = (content: string, input: CodexConfigInput) => {
 export const mergeAuthJson = (
   data: Record<string, unknown>,
   apiKey: string,
-): Record<string, unknown> => ({
-  ...data,
-  OPENAI_API_KEY: apiKey,
-});
+): Record<string, unknown> => {
+  const next: Record<string, unknown> = { ...data };
+  for (const key of LEGACY_AUTH_MARKERS) {
+    if (key in next) {
+      delete next[key];
+    }
+  }
+  next.OPENAI_API_KEY = apiKey;
+  return next;
+};
 
 const stripGetrouterProviderSection = (lines: string[]) => {
   const updated: string[] = [];
@@ -156,62 +247,141 @@ const stripGetrouterProviderSection = (lines: string[]) => {
   return updated;
 };
 
-const stripRootKeys = (lines: string[]) => {
-  const updated: string[] = [];
-  let currentSection: string | null = null;
-
-  for (const line of lines) {
-    const headerMatch = matchHeader(line);
-    if (headerMatch) {
-      currentSection = headerMatch[1]?.trim() ?? null;
-      updated.push(line);
-      continue;
-    }
+const stripLegacyMarkersFromRoot = (rootLines: string[]) =>
+  rootLines.filter((line) => {
+    const keyMatch = matchKey(line);
+    const key = keyMatch?.[1];
+    return !(key && LEGACY_TOML_ROOT_MARKERS.includes(key as never));
+  });
 
-    if (currentSection === null) {
-      if (/^\s*model\s*=/.test(line)) continue;
-      if (/^\s*model_reasoning_effort\s*=/.test(line)) continue;
-      if (/^\s*model_provider\s*=/.test(line)) continue;
+const setOrDeleteRootKey = (
+  rootLines: string[],
+  key: string,
+  value: string | undefined,
+) => {
+  const idx = rootLines.findIndex((line) => matchKey(line)?.[1] === key);
+  if (value === undefined) {
+    if (idx !== -1) {
+      rootLines.splice(idx, 1);
     }
-
-    updated.push(line);
+    return;
   }
+  if (idx !== -1) {
+    rootLines[idx] = `${key} = ${value}`;
+  } else {
+    rootLines.push(`${key} = ${value}`);
+  }
+};
 
-  return updated;
+const deleteRootKey = (rootLines: string[], key: string) => {
+  setOrDeleteRootKey(rootLines, key, undefined);
 };
 
-export const removeCodexConfig = (content: string) => {
-  const lines = content.length ? content.split(/\r?\n/) : [];
-  let providerIsGetrouter = false;
-  let currentSection: string | null = null;
+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));
+  });
 
-  for (const line of lines) {
-    const headerMatch = matchHeader(line);
-    if (headerMatch) {
-      currentSection = headerMatch[1]?.trim() ?? null;
-      continue;
-    }
+export const removeCodexConfig = (
+  content: string,
+  options?: {
+    restoreRoot?: CodexTomlRootValues;
+    allowRootRemoval?: boolean;
+  },
+) => {
+  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);
 
-    if (currentSection !== null) continue;
+  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);
 
-    const providerMatch = matchProviderValue(line);
-    const providerValue = providerMatch?.[2]?.trim();
-    if (providerValue?.toLowerCase() === CODEX_PROVIDER) {
-      providerIsGetrouter = true;
+  if (providerIsGetrouter && canRemoveRoot) {
+    if (restoreRoot) {
+      setOrDeleteRootKey(rootLines, "model", restoreRoot.model);
+      setOrDeleteRootKey(
+        rootLines,
+        "model_reasoning_effort",
+        restoreRoot.reasoning,
+      );
+      setOrDeleteRootKey(rootLines, "model_provider", restoreRoot.provider);
+    } else {
+      deleteRootKey(rootLines, "model");
+      deleteRootKey(rootLines, "model_reasoning_effort");
+      deleteRootKey(rootLines, "model_provider");
     }
   }
 
-  let updated = stripGetrouterProviderSection(lines);
-  if (providerIsGetrouter) {
-    updated = stripRootKeys(updated);
+  const recombined: string[] = [...rootLines];
+  if (
+    recombined.length > 0 &&
+    restLines.length > 0 &&
+    recombined[recombined.length - 1]?.trim() !== ""
+  ) {
+    recombined.push("");
   }
+  recombined.push(...restLines);
 
-  const nextContent = updated.join("\n");
+  const nextContent = recombined.join("\n");
   return { content: nextContent, changed: nextContent !== content };
 };
 
-export const removeAuthJson = (data: Record<string, unknown>) => {
-  if (!("OPENAI_API_KEY" in data)) return { data, changed: false };
-  const { OPENAI_API_KEY: _ignored, ...rest } = data;
-  return { data: rest, changed: true };
+export const removeAuthJson = (
+  data: Record<string, unknown>,
+  options?: {
+    installed?: string;
+    restore?: string;
+  },
+) => {
+  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];
+      changed = true;
+    }
+  }
+
+  const current =
+    typeof next.OPENAI_API_KEY === "string"
+      ? (next.OPENAI_API_KEY as string)
+      : undefined;
+  const restoreValue =
+    typeof effectiveRestore === "string" && effectiveRestore.trim().length > 0
+      ? effectiveRestore
+      : undefined;
+
+  if (effectiveInstalled && current && current === effectiveInstalled) {
+    if (restoreValue) {
+      next.OPENAI_API_KEY = restoreValue;
+    } else {
+      delete next.OPENAI_API_KEY;
+    }
+    changed = true;
+    return { data: next, changed };
+  }
+
+  return { data: next, changed };
 };

package/tests/cmd/codex.test.ts

@@ -15,6 +15,8 @@ const makeDir = () => fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));
 const codexConfigPath = (dir: string) =>
   path.join(dir, ".codex", "config.toml");
 const codexAuthPath = (dir: string) => path.join(dir, ".codex", "auth.json");
+const codexBackupPath = (dir: string) =>
+  path.join(dir, ".getrouter", "codex-backup.json");
 
 const mockConsumer = { id: "c1", apiKey: "key-123" };
 
@@ -237,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),
       [
@@ -257,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"]);
@@ -274,6 +292,144 @@ 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;
+    const codexDir = path.join(dir, ".codex");
+    fs.mkdirSync(codexDir, { recursive: true });
+    fs.mkdirSync(path.join(dir, ".getrouter"), { recursive: true });
+    fs.writeFileSync(
+      codexAuthPath(dir),
+      JSON.stringify(
+        {
+          OPENAI_API_KEY: "new-key",
+          _getrouter_codex_backup_openai_api_key: "legacy-backup",
+          _getrouter_codex_installed_openai_api_key: "legacy-installed",
+          OTHER: "keep",
+        },
+        null,
+        2,
+      ),
+    );
+    fs.writeFileSync(
+      codexBackupPath(dir),
+      JSON.stringify(
+        {
+          version: 1,
+          createdAt: "2026-01-01T00:00:00Z",
+          updatedAt: "2026-01-01T00:00:00Z",
+          auth: {
+            previousOpenaiKey: "old-key",
+            installedOpenaiKey: "new-key",
+          },
+        },
+        null,
+        2,
+      ),
+    );
+
+    const program = createProgram();
+    await program.parseAsync(["node", "getrouter", "codex", "uninstall"]);
+
+    const auth = JSON.parse(fs.readFileSync(codexAuthPath(dir), "utf8"));
+    expect(auth.OPENAI_API_KEY).toBe("old-key");
+    expect(auth._getrouter_codex_backup_openai_api_key).toBeUndefined();
+    expect(auth._getrouter_codex_installed_openai_api_key).toBeUndefined();
+    expect(auth.OTHER).toBe("keep");
+    expect(fs.existsSync(codexBackupPath(dir))).toBe(false);
+  });
+
+  it("uninstall restores previous model_provider and model", async () => {
+    setStdinTTY(true);
+    const dir = makeDir();
+    process.env.HOME = dir;
+    const codexDir = path.join(dir, ".codex");
+    fs.mkdirSync(codexDir, { recursive: true });
+    fs.writeFileSync(
+      codexConfigPath(dir),
+      [
+        'model = "user-model"',
+        'model_reasoning_effort = "low"',
+        'model_provider = "openai"',
+        "",
+        "[model_providers.openai]",
+        'name = "openai"',
+      ].join("\n"),
+    );
+
+    prompts.inject(["gpt-5.2-codex", "extra_high", mockConsumer]);
+    (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
+      consumerService: {
+        ListConsumers: vi.fn().mockResolvedValue({
+          consumers: [
+            {
+              id: "c1",
+              name: "dev",
+              enabled: true,
+              createdAt: "2026-01-01T00:00:00Z",
+            },
+          ],
+        }),
+        GetConsumer: vi.fn().mockResolvedValue(mockConsumer),
+      } as unknown as ConsumerService,
+    });
+
+    const program = createProgram();
+    await program.parseAsync(["node", "getrouter", "codex"]);
+    expect(fs.existsSync(codexBackupPath(dir))).toBe(true);
+    await program.parseAsync(["node", "getrouter", "codex", "uninstall"]);
+    expect(fs.existsSync(codexBackupPath(dir))).toBe(false);
+
+    const config = fs.readFileSync(codexConfigPath(dir), "utf8");
+    expect(config).toContain('model = "user-model"');
+    expect(config).toContain('model_reasoning_effort = "low"');
+    expect(config).toContain('model_provider = "openai"');
+    expect(config).toContain("[model_providers.openai]");
+    expect(config).not.toContain("[model_providers.getrouter]");
+    expect(config).not.toContain("_getrouter_codex_backup");
+    expect(config).not.toContain("_getrouter_codex_installed");
+  });
+
   it("uninstall leaves root keys when provider is not getrouter", async () => {
     const dir = makeDir();
     process.env.HOME = dir;

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

@@ -1,5 +1,10 @@
 import { describe, expect, it } from "vitest";
-import { mergeAuthJson, mergeCodexToml } from "../../../src/core/setup/codex";
+import {
+  mergeAuthJson,
+  mergeCodexToml,
+  removeAuthJson,
+  removeCodexConfig,
+} from "../../../src/core/setup/codex";
 
 describe("codex setup helpers", () => {
   it("merges codex toml at root and provider table", () => {
@@ -35,4 +40,85 @@ describe("codex setup helpers", () => {
     expect(output.OPENAI_API_KEY).toBe("key-123");
     expect(output.existing).toBe("keep");
   });
+
+  it("removes getrouter provider section and restores root keys when provided", () => {
+    const input = [
+      'model = "gpt-5.2-codex"',
+      'model_reasoning_effort = "xhigh"',
+      'model_provider = "getrouter"',
+      "",
+      "[model_providers.getrouter]",
+      'name = "getrouter"',
+      "",
+      "[model_providers.openai]",
+      'name = "openai"',
+    ].join("\n");
+
+    const { content, changed } = removeCodexConfig(input, {
+      restoreRoot: {
+        model: '"user-model"',
+        reasoning: '"medium"',
+        provider: '"openai"',
+      },
+    });
+    expect(changed).toBe(true);
+    expect(content).toContain('model = "user-model"');
+    expect(content).toContain('model_reasoning_effort = "medium"');
+    expect(content).toContain('model_provider = "openai"');
+    expect(content).toContain("[model_providers.openai]");
+    expect(content).not.toContain("[model_providers.getrouter]");
+  });
+
+  it("removes root keys when provider is getrouter and no restore is provided", () => {
+    const input = [
+      'model = "gpt-5.2-codex"',
+      'model_reasoning_effort = "xhigh"',
+      'model_provider = "getrouter"',
+      "",
+      "[model_providers.getrouter]",
+      'name = "getrouter"',
+    ].join("\n");
+
+    const { content } = removeCodexConfig(input);
+    expect(content).not.toContain('model = "gpt-5.2-codex"');
+    expect(content).not.toContain('model_reasoning_effort = "xhigh"');
+    expect(content).not.toContain('model_provider = "getrouter"');
+    expect(content).not.toContain("[model_providers.getrouter]");
+  });
+
+  it("restores OPENAI_API_KEY when installed key matches current", () => {
+    const input = {
+      OPENAI_API_KEY: "new-key",
+      OTHER: "keep",
+    } as Record<string, unknown>;
+    const { data, changed } = removeAuthJson(input, {
+      installed: "new-key",
+      restore: "old-key",
+    });
+    expect(changed).toBe(true);
+    expect(data.OPENAI_API_KEY).toBe("old-key");
+    expect(data.OTHER).toBe("keep");
+  });
+
+  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, { installed: "new-key" });
+    expect(changed).toBe(true);
+    expect(data.OPENAI_API_KEY).toBeUndefined();
+    expect(data.OTHER).toBe("keep");
+  });
+
+  it("leaves OPENAI_API_KEY when not forced and not installed", () => {
+    const input = {
+      OPENAI_API_KEY: "user-key",
+      OTHER: "keep",
+    } as Record<string, unknown>;
+    const { data, changed } = removeAuthJson(input);
+    expect(changed).toBe(false);
+    expect(data.OPENAI_API_KEY).toBe("user-key");
+    expect(data.OTHER).toBe("keep");
+  });
 });