@getrouter/getrouter-cli 0.1.4 → 0.1.6

package/dist/bin.mjs

@@ -8,7 +8,7 @@ import { randomInt } from "node:crypto";
 import prompts from "prompts";
 
 //#region package.json
-var version = "0.1.4";
+var version = "0.1.5";
 
 //#endregion
 //#region src/generated/router/dashboard/v1/index.ts
@@ -616,8 +616,12 @@ const promptKeyName = async (initial) => {
 		message: "Key name",
 		initial: initial ?? ""
 	});
+	if (!("name" in response)) return { cancelled: true };
 	const value = typeof response.name === "string" ? response.name.trim() : "";
-	return value.length > 0 ? value : void 0;
+	return {
+		cancelled: false,
+		name: value.length > 0 ? value : void 0
+	};
 };
 const promptKeyEnabled = async (initial) => {
 	const response = await prompts({
@@ -626,7 +630,11 @@ const promptKeyEnabled = async (initial) => {
 		message: "Enable this key?",
 		initial
 	});
-	return typeof response.enabled === "boolean" ? response.enabled : initial;
+	if (!("enabled" in response)) return { cancelled: true };
+	return {
+		cancelled: false,
+		enabled: typeof response.enabled === "boolean" ? response.enabled : initial
+	};
 };
 const selectConsumer = async (consumerService) => {
 	const consumers = await fetchAllPages((pageToken) => consumerService.ListConsumers({
@@ -1006,6 +1014,7 @@ 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 mergeCodexToml = (content, input) => {
 	const updated = [...content.length ? content.split(/\r?\n/) : []];
 	const rootValueMap = rootValues(input);
@@ -1066,6 +1075,74 @@ const mergeAuthJson = (data, apiKey) => ({
 	...data,
 	OPENAI_API_KEY: apiKey
 });
+const stripGetrouterProviderSection = (lines) => {
+	const updated = [];
+	let skipSection = false;
+	for (const line of lines) {
+		const headerMatch = matchHeader(line);
+		if (headerMatch) {
+			if ((headerMatch[1]?.trim() ?? "") === PROVIDER_SECTION) {
+				skipSection = true;
+				continue;
+			}
+			skipSection = false;
+		}
+		if (skipSection) continue;
+		updated.push(line);
+	}
+	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);
+	}
+	return updated;
+};
+const removeCodexConfig = (content) => {
+	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;
+	}
+	let updated = stripGetrouterProviderSection(lines);
+	if (providerIsGetrouter) updated = stripRootKeys(updated);
+	const nextContent = updated.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;
+	return {
+		data: rest,
+		changed: true
+	};
+};
 
 //#endregion
 //#region src/cmd/codex.ts
@@ -1084,6 +1161,7 @@ const ensureCodexDir = () => {
 	fs.mkdirSync(dir, { recursive: true });
 	return dir;
 };
+const resolveCodexDir = () => path.join(os.homedir(), CODEX_DIR);
 const requireInteractive$1 = () => {
 	if (!process.stdin.isTTY) throw new Error("Interactive mode required for codex configuration.");
 };
@@ -1099,7 +1177,8 @@ const promptReasoning = async (model) => await fuzzySelect({
 });
 const formatReasoningLabel = (id) => REASONING_CHOICES.find((choice) => choice.id === id)?.label ?? id;
 const registerCodexCommand = (program) => {
-	program.command("codex").description("Configure Codex").option("-m, --model <model>", "Set codex model (skips model selection)").action(async (options) => {
+	const codex = program.command("codex").description("Configure Codex");
+	codex.option("-m, --model <model>", "Set codex model (skips model selection)").action(async (options) => {
 		requireInteractive$1();
 		const model = options.model && options.model.trim().length > 0 ? options.model.trim() : await promptModel();
 		if (!model) return;
@@ -1112,18 +1191,10 @@ const registerCodexCommand = (program) => {
 		if (!apiKey) throw new Error("API key not found. Please create one or choose another.");
 		const reasoningValue = mapReasoningValue(reasoningId);
 		const keyName = selected.name?.trim() || "(unnamed)";
-		if (!(await prompts({
-			type: "confirm",
-			name: "confirm",
-			message: [
-				"Apply Codex configuration?",
-				`Model: ${model}`,
-				`Reasoning: ${formatReasoningLabel(reasoningId)} (${reasoningValue})`,
-				"Provider: getrouter",
-				`Key: ${keyName}`
-			].join("\n"),
-			initial: true
-		})).confirm) return;
+		console.log(`Model: ${model}`);
+		console.log(`Reasoning: ${formatReasoningLabel(reasoningId)} (${reasoningValue})`);
+		console.log("Provider: getrouter");
+		console.log(`Key: ${keyName}`);
 		const codexDir = ensureCodexDir();
 		const configPath = path.join(codexDir, "config.toml");
 		const authPath = path.join(codexDir, "auth.json");
@@ -1138,6 +1209,28 @@ const registerCodexCommand = (program) => {
 		console.log("✅ Updated ~/.codex/config.toml");
 		console.log("✅ Updated ~/.codex/auth.json");
 	});
+	codex.command("uninstall").description("Remove getrouter Codex configuration").action(() => {
+		const codexDir = resolveCodexDir();
+		const configPath = path.join(codexDir, "config.toml");
+		const authPath = path.join(codexDir, "auth.json");
+		const configExists = fs.existsSync(configPath);
+		const authExists = fs.existsSync(authPath);
+		const configContent = configExists ? readFileIfExists(configPath) : "";
+		const configResult = configExists ? removeCodexConfig(configContent) : null;
+		const authContent = authExists ? fs.readFileSync(authPath, "utf8").trim() : "";
+		const authData = authExists ? authContent ? JSON.parse(authContent) : {} : null;
+		const authResult = authData ? removeAuthJson(authData) : null;
+		if (!configExists) console.log(`ℹ️ ${configPath} not found`);
+		else if (configResult?.changed) {
+			fs.writeFileSync(configPath, configResult.content, "utf8");
+			console.log(`✅ Removed getrouter entries from ${configPath}`);
+		} else console.log(`ℹ️ No getrouter entries in ${configPath}`);
+		if (!authExists) console.log(`ℹ️ ${authPath} not found`);
+		else if (authResult?.changed) {
+			fs.writeFileSync(authPath, JSON.stringify(authResult.data, null, 2));
+			console.log(`✅ Removed getrouter entries from ${authPath}`);
+		} else console.log(`ℹ️ No getrouter entries in ${authPath}`);
+	});
 };
 
 //#endregion
@@ -1243,10 +1336,12 @@ const resolveConsumerForDelete = async (consumerService, id) => {
 };
 const createConsumer = async (consumerService) => {
 	requireInteractiveForAction("create");
-	const name = await promptKeyName();
-	const enabled = await promptKeyEnabled(true);
+	const nameResult = await promptKeyName();
+	if (nameResult.cancelled) return;
+	const enabledResult = await promptKeyEnabled(true);
+	if (enabledResult.cancelled) return;
 	let consumer = await consumerService.CreateConsumer({});
-	consumer = await updateConsumer(consumerService, consumer, name, enabled);
+	consumer = await updateConsumer(consumerService, consumer, nameResult.name, enabledResult.enabled);
 	outputConsumerTable(consumer, true);
 	console.log("Please store this API key securely.");
 };
@@ -1254,7 +1349,11 @@ const updateConsumerById = async (consumerService, id) => {
 	requireInteractiveForAction("update");
 	const selected = await resolveConsumerForUpdate(consumerService, id);
 	if (!selected?.id) return;
-	outputConsumerTable(await updateConsumer(consumerService, selected, await promptKeyName(selected.name), await promptKeyEnabled(selected.enabled ?? true)), false);
+	const nameResult = await promptKeyName(selected.name);
+	if (nameResult.cancelled) return;
+	const enabledResult = await promptKeyEnabled(selected.enabled ?? true);
+	if (enabledResult.cancelled) return;
+	outputConsumerTable(await updateConsumer(consumerService, selected, nameResult.name, enabledResult.enabled), false);
 };
 const deleteConsumerById = async (consumerService, id) => {
 	requireInteractiveForAction("delete");

package/docs/plans/2026-01-06-codex-uninstall-design.md

@@ -0,0 +1,34 @@
+# Codex Uninstall Design
+
+## Goal
+Add a `getrouter codex uninstall` subcommand that removes only getrouter-managed Codex configuration, without touching unrelated user settings.
+
+## Scope
+- Remove the `[model_providers.getrouter]` section from `~/.codex/config.toml`.
+- Remove `model`, `model_reasoning_effort`, and `model_provider` only when `model_provider` is set to `"getrouter"`.
+- Remove `OPENAI_API_KEY` from `~/.codex/auth.json`.
+- Preserve all other keys, providers, comments, and formatting as much as possible.
+
+## CLI Shape
+- Keep the existing `getrouter codex` interactive flow unchanged.
+- Add `getrouter codex uninstall` as a non-interactive subcommand.
+- The uninstall action reports per-file status: removed, no-op, or missing.
+
+## Data Flow
+1. Resolve `~/.codex` via `os.homedir()`.
+2. For each file:
+   - If missing, log and continue.
+   - Read content, apply a removal helper, and write back only if changed.
+3. Abort with a clear error if parsing fails; avoid partial writes.
+
+## Implementation Notes
+- Extend `src/core/setup/codex.ts` with:
+  - `removeCodexConfig(content)` for TOML line removal.
+  - `removeAuthJson(data)` for JSON key removal.
+- Update `src/cmd/codex.ts` to register the uninstall subcommand.
+
+## Testing
+- Add command tests for uninstall in `tests/cmd/codex.test.ts`:
+  - Removes getrouter entries but keeps other providers/keys.
+  - No-op when getrouter entries do not exist.
+  - Root keys only removed when `model_provider == "getrouter"`.

package/docs/plans/2026-01-06-codex-uninstall-plan.md

@@ -0,0 +1,252 @@
+# Codex Uninstall Implementation Plan
+
+> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.
+
+**Goal:** Add `getrouter codex uninstall` to remove getrouter-managed Codex config entries while preserving user data.
+
+**Architecture:** Extend `src/core/setup/codex.ts` with removal helpers for TOML and JSON. Wire a new `uninstall` subcommand in `src/cmd/codex.ts` that reads, cleans, and conditionally writes the files with clear status output.
+
+**Tech Stack:** TypeScript, Commander.js, Vitest, Node fs/path/os.
+
+### Task 1: Add uninstall command tests
+
+**Files:**
+- Modify: `tests/cmd/codex.test.ts`
+
+**Step 1: Write the failing tests**
+
+```ts
+it("uninstall removes getrouter entries but keeps others", 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_providers.other]');
+  expect(config).not.toContain('[model_providers.getrouter]');
+  expect(config).not.toContain('model_provider = "getrouter"');
+
+  const auth = JSON.parse(fs.readFileSync(codexAuthPath(dir), "utf8"));
+  expect(auth.OTHER).toBe("keep");
+  expect(auth.OPENAI_API_KEY).toBeUndefined();
+});
+
+it("uninstall leaves root keys when provider is not getrouter", async () => {
+  const dir = makeDir();
+  process.env.HOME = dir;
+  const codexDir = path.join(dir, ".codex");
+  fs.mkdirSync(codexDir, { recursive: true });
+  fs.writeFileSync(
+    codexConfigPath(dir),
+    [
+      'model = "keep"',
+      'model_reasoning_effort = "low"',
+      'model_provider = "other"',
+      "",
+      "[model_providers.getrouter]",
+      'name = "getrouter"',
+    ].join("\n"),
+  );
+
+  const program = createProgram();
+  await program.parseAsync(["node", "getrouter", "codex", "uninstall"]);
+
+  const config = fs.readFileSync(codexConfigPath(dir), "utf8");
+  expect(config).toContain('model = "keep"');
+  expect(config).toContain('model_provider = "other"');
+  expect(config).not.toContain('[model_providers.getrouter]');
+});
+```
+
+**Step 2: Run test to verify it fails**
+
+Run: `bun run test -- tests/cmd/codex.test.ts`
+Expected: FAIL with an error like "unknown command 'uninstall'" or missing behavior.
+
+**Step 3: Commit**
+
+```bash
+git add tests/cmd/codex.test.ts
+git commit -m "test: cover codex uninstall"
+```
+
+### Task 2: Implement removal helpers
+
+**Files:**
+- Modify: `src/core/setup/codex.ts`
+
+**Step 1: Write the minimal implementation**
+
+```ts
+export const removeCodexConfig = (content: string) => {
+  const lines = content.length ? content.split(/\r?\n/) : [];
+  const updated: string[] = [];
+  let inGetrouterSection = false;
+  let providerIsGetrouter = false;
+
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i] ?? "";
+    const headerMatch = matchHeader(line);
+    if (headerMatch) {
+      const section = headerMatch[1]?.trim() ?? "";
+      inGetrouterSection = section === PROVIDER_SECTION;
+      if (inGetrouterSection) continue;
+    }
+    if (inGetrouterSection) continue;
+
+    const keyMatch = matchKey(line);
+    if (keyMatch && keyMatch[1] === "model_provider") {
+      providerIsGetrouter = /getrouter/i.test(line);
+    }
+
+    updated.push(line);
+  }
+
+  if (providerIsGetrouter) {
+    return {
+      content: updated
+        .filter(
+          (line) =>
+            !/^\s*model\s*=/.test(line) &&
+            !/^\s*model_reasoning_effort\s*=/.test(line) &&
+            !/^\s*model_provider\s*=/.test(line),
+        )
+        .join("\n"),
+      changed: true,
+    };
+  }
+
+  return { content: updated.join("\n"), changed: updated.join("\n") !== 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 };
+};
+```
+
+**Step 2: Run test to verify it still fails**
+
+Run: `bun run test -- tests/cmd/codex.test.ts`
+Expected: FAIL until CLI wiring is added.
+
+**Step 3: Commit**
+
+```bash
+git add src/core/setup/codex.ts
+git commit -m "feat: add codex uninstall helpers"
+```
+
+### Task 3: Wire the uninstall subcommand
+
+**Files:**
+- Modify: `src/cmd/codex.ts`
+
+**Step 1: Add the uninstall command**
+
+```ts
+import { removeAuthJson, removeCodexConfig } from "../core/setup/codex";
+
+const logMissing = (filePath: string) =>
+  console.log(`ℹ️ ${filePath} not found`);
+
+const logNoop = (filePath: string) =>
+  console.log(`ℹ️ No getrouter entries in ${filePath}`);
+
+const logRemoved = (filePath: string) =>
+  console.log(`✅ Removed getrouter entries from ${filePath}`);
+
+// in registerCodexCommand
+const codex = program.command("codex").description("Configure Codex");
+
+codex
+  .command("uninstall")
+  .description("Remove getrouter Codex configuration")
+  .action(() => {
+    const codexDir = ensureCodexDir();
+    const configPath = path.join(codexDir, "config.toml");
+    const authPath = path.join(codexDir, "auth.json");
+
+    if (!fs.existsSync(configPath)) {
+      logMissing(configPath);
+    } else {
+      const content = readFileIfExists(configPath);
+      const removed = removeCodexConfig(content);
+      if (removed.changed) {
+        fs.writeFileSync(configPath, removed.content, "utf8");
+        logRemoved(configPath);
+      } else {
+        logNoop(configPath);
+      }
+    }
+
+    if (!fs.existsSync(authPath)) {
+      logMissing(authPath);
+    } else {
+      const raw = fs.readFileSync(authPath, "utf8").trim();
+      const data = raw ? (JSON.parse(raw) as Record<string, unknown>) : {};
+      const removed = removeAuthJson(data);
+      if (removed.changed) {
+        fs.writeFileSync(authPath, JSON.stringify(removed.data, null, 2));
+        logRemoved(authPath);
+      } else {
+        logNoop(authPath);
+      }
+    }
+  });
+```
+
+**Step 2: Run tests to verify they pass**
+
+Run: `bun run test -- tests/cmd/codex.test.ts`
+Expected: PASS
+
+**Step 3: Commit**
+
+```bash
+git add src/cmd/codex.ts tests/cmd/codex.test.ts
+git commit -m "feat: add codex uninstall command"
+```
+
+### Task 4: Final verification
+
+**Files:**
+- Verify: `src/cmd/codex.ts`, `src/core/setup/codex.ts`, `tests/cmd/codex.test.ts`
+
+**Step 1: Run full checks**
+
+Run: `bun run test && bun run lint && bun run format`
+Expected: PASS
+
+**Step 2: Commit formatting (if needed)**
+
+```bash
+git add src/cmd/codex.ts src/core/setup/codex.ts tests/cmd/codex.test.ts
+git commit -m "chore: format codex uninstall"
+```

package/package.json

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

package/src/cmd/codex.ts

@@ -2,7 +2,6 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import type { Command } from "commander";
-import prompts from "prompts";
 import { createApiClients } from "../core/api/client";
 import {
   getCodexModelChoices,
@@ -12,7 +11,12 @@ import {
 } from "../core/interactive/codex";
 import { fuzzySelect } from "../core/interactive/fuzzy";
 import { selectConsumer } from "../core/interactive/keys";
-import { mergeAuthJson, mergeCodexToml } from "../core/setup/codex";
+import {
+  mergeAuthJson,
+  mergeCodexToml,
+  removeAuthJson,
+  removeCodexConfig,
+} from "../core/setup/codex";
 
 const CODEX_DIR = ".codex";
 
@@ -36,6 +40,8 @@ const ensureCodexDir = () => {
   return dir;
 };
 
+const resolveCodexDir = () => path.join(os.homedir(), CODEX_DIR);
+
 const requireInteractive = () => {
   if (!process.stdin.isTTY) {
     throw new Error("Interactive mode required for codex configuration.");
@@ -65,9 +71,9 @@ type CodexCommandOptions = {
 };
 
 export const registerCodexCommand = (program: Command) => {
-  program
-    .command("codex")
-    .description("Configure Codex")
+  const codex = program.command("codex").description("Configure Codex");
+
+  codex
     .option("-m, --model <model>", "Set codex model (skips model selection)")
     .action(async (options: CodexCommandOptions) => {
       requireInteractive();
@@ -91,19 +97,13 @@ export const registerCodexCommand = (program: Command) => {
 
       const reasoningValue = mapReasoningValue(reasoningId);
       const keyName = selected.name?.trim() || "(unnamed)";
-      const confirm = await prompts({
-        type: "confirm",
-        name: "confirm",
-        message: [
-          "Apply Codex configuration?",
-          `Model: ${model}`,
-          `Reasoning: ${formatReasoningLabel(reasoningId)} (${reasoningValue})`,
-          "Provider: getrouter",
-          `Key: ${keyName}`,
-        ].join("\n"),
-        initial: true,
-      });
-      if (!confirm.confirm) return;
+
+      console.log(`Model: ${model}`);
+      console.log(
+        `Reasoning: ${formatReasoningLabel(reasoningId)} (${reasoningValue})`,
+      );
+      console.log("Provider: getrouter");
+      console.log(`Key: ${keyName}`);
 
       const codexDir = ensureCodexDir();
       const configPath = path.join(codexDir, "config.toml");
@@ -126,4 +126,49 @@ export const registerCodexCommand = (program: Command) => {
       console.log("✅ Updated ~/.codex/config.toml");
       console.log("✅ Updated ~/.codex/auth.json");
     });
+
+  codex
+    .command("uninstall")
+    .description("Remove getrouter Codex configuration")
+    .action(() => {
+      const codexDir = resolveCodexDir();
+      const configPath = path.join(codexDir, "config.toml");
+      const authPath = path.join(codexDir, "auth.json");
+
+      const configExists = fs.existsSync(configPath);
+      const authExists = fs.existsSync(authPath);
+
+      const configContent = configExists ? readFileIfExists(configPath) : "";
+      const configResult = configExists
+        ? removeCodexConfig(configContent)
+        : null;
+
+      const authContent = authExists
+        ? fs.readFileSync(authPath, "utf8").trim()
+        : "";
+      const authData = authExists
+        ? authContent
+          ? (JSON.parse(authContent) as Record<string, unknown>)
+          : {}
+        : null;
+      const authResult = authData ? removeAuthJson(authData) : null;
+
+      if (!configExists) {
+        console.log(`ℹ️ ${configPath} not found`);
+      } else if (configResult?.changed) {
+        fs.writeFileSync(configPath, configResult.content, "utf8");
+        console.log(`✅ Removed getrouter entries from ${configPath}`);
+      } else {
+        console.log(`ℹ️ No getrouter entries in ${configPath}`);
+      }
+
+      if (!authExists) {
+        console.log(`ℹ️ ${authPath} not found`);
+      } else if (authResult?.changed) {
+        fs.writeFileSync(authPath, JSON.stringify(authResult.data, null, 2));
+        console.log(`✅ Removed getrouter entries from ${authPath}`);
+      } else {
+        console.log(`ℹ️ No getrouter entries in ${authPath}`);
+      }
+    });
 };

package/src/cmd/keys.ts

@@ -132,10 +132,17 @@ const createConsumer = async (
   consumerService: Pick<ConsumerService, "CreateConsumer" | "UpdateConsumer">,
 ) => {
   requireInteractiveForAction("create");
-  const name = await promptKeyName();
-  const enabled = await promptKeyEnabled(true);
+  const nameResult = await promptKeyName();
+  if (nameResult.cancelled) return;
+  const enabledResult = await promptKeyEnabled(true);
+  if (enabledResult.cancelled) return;
   let consumer = await consumerService.CreateConsumer({});
-  consumer = await updateConsumer(consumerService, consumer, name, enabled);
+  consumer = await updateConsumer(
+    consumerService,
+    consumer,
+    nameResult.name,
+    enabledResult.enabled,
+  );
   outputConsumerTable(consumer, true);
   console.log("Please store this API key securely.");
 };
@@ -150,13 +157,15 @@ const updateConsumerById = async (
   requireInteractiveForAction("update");
   const selected = await resolveConsumerForUpdate(consumerService, id);
   if (!selected?.id) return;
-  const name = await promptKeyName(selected.name);
-  const enabled = await promptKeyEnabled(selected.enabled ?? true);
+  const nameResult = await promptKeyName(selected.name);
+  if (nameResult.cancelled) return;
+  const enabledResult = await promptKeyEnabled(selected.enabled ?? true);
+  if (enabledResult.cancelled) return;
   const consumer = await updateConsumer(
     consumerService,
     selected,
-    name,
-    enabled,
+    nameResult.name,
+    enabledResult.enabled,
   );
   outputConsumerTable(consumer, false);
 };

package/src/core/interactive/keys.ts

@@ -78,25 +78,38 @@ export const selectKeyAction = async (): Promise<KeyMenuAction> => {
 
 export const promptKeyName = async (
   initial?: string,
-): Promise<string | undefined> => {
+): Promise<
+  { cancelled: true } | { cancelled: false; name: string | undefined }
+> => {
   const response = await prompts({
     type: "text",
     name: "name",
     message: "Key name",
     initial: initial ?? "",
   });
+  if (!("name" in response)) {
+    return { cancelled: true };
+  }
   const value = typeof response.name === "string" ? response.name.trim() : "";
-  return value.length > 0 ? value : undefined;
+  return { cancelled: false, name: value.length > 0 ? value : undefined };
 };
 
-export const promptKeyEnabled = async (initial: boolean): Promise<boolean> => {
+export const promptKeyEnabled = async (
+  initial: boolean,
+): Promise<{ cancelled: true } | { cancelled: false; enabled: boolean }> => {
   const response = await prompts({
     type: "confirm",
     name: "enabled",
     message: "Enable this key?",
     initial,
   });
-  return typeof response.enabled === "boolean" ? response.enabled : initial;
+  if (!("enabled" in response)) {
+    return { cancelled: true };
+  }
+  return {
+    cancelled: false,
+    enabled: typeof response.enabled === "boolean" ? response.enabled : initial,
+  };
 };
 
 export const selectConsumer = async (

package/src/core/setup/codex.ts

@@ -34,6 +34,8 @@ 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*(?:#.*)?$/);
 
 export const mergeCodexToml = (content: string, input: CodexConfigInput) => {
   const lines = content.length ? content.split(/\r?\n/) : [];
@@ -131,3 +133,85 @@ export const mergeAuthJson = (
   ...data,
   OPENAI_API_KEY: apiKey,
 });
+
+const stripGetrouterProviderSection = (lines: string[]) => {
+  const updated: string[] = [];
+  let skipSection = false;
+
+  for (const line of lines) {
+    const headerMatch = matchHeader(line);
+    if (headerMatch) {
+      const section = headerMatch[1]?.trim() ?? "";
+      if (section === PROVIDER_SECTION) {
+        skipSection = true;
+        continue;
+      }
+      skipSection = false;
+    }
+
+    if (skipSection) continue;
+    updated.push(line);
+  }
+
+  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;
+    }
+
+    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);
+  }
+
+  return updated;
+};
+
+export const removeCodexConfig = (content: string) => {
+  const lines = content.length ? content.split(/\r?\n/) : [];
+  let providerIsGetrouter = false;
+  let currentSection: string | null = null;
+
+  for (const line of lines) {
+    const headerMatch = matchHeader(line);
+    if (headerMatch) {
+      currentSection = headerMatch[1]?.trim() ?? null;
+      continue;
+    }
+
+    if (currentSection !== null) continue;
+
+    const providerMatch = matchProviderValue(line);
+    const providerValue = providerMatch?.[2]?.trim();
+    if (providerValue?.toLowerCase() === CODEX_PROVIDER) {
+      providerIsGetrouter = true;
+    }
+  }
+
+  let updated = stripGetrouterProviderSection(lines);
+  if (providerIsGetrouter) {
+    updated = stripRootKeys(updated);
+  }
+
+  const nextContent = updated.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 };
+};

package/tests/cmd/codex.test.ts

@@ -33,6 +33,7 @@ const originalEnv = Object.fromEntries(
 
 afterEach(() => {
   vi.unstubAllGlobals();
+  vi.clearAllMocks();
   setStdinTTY(originalIsTTY);
   prompts.inject([]);
   for (const key of ENV_KEYS) {
@@ -70,7 +71,7 @@ describe("codex command", () => {
     });
     vi.stubGlobal("fetch", fetchMock);
 
-    prompts.inject(["gpt-5.2-codex", "extra_high", mockConsumer, true]);
+    prompts.inject(["gpt-5.2-codex", "extra_high", mockConsumer]);
     (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       consumerService: {
         ListConsumers: vi.fn().mockResolvedValue({
@@ -100,7 +101,7 @@ describe("codex command", () => {
     setStdinTTY(true);
     const dir = makeDir();
     process.env.HOME = dir;
-    prompts.inject(["gpt-5.2-codex", "extra_high", mockConsumer, true]);
+    prompts.inject(["gpt-5.2-codex", "extra_high", mockConsumer]);
     (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       consumerService: {
         ListConsumers: vi.fn().mockResolvedValue({
@@ -162,7 +163,7 @@ describe("codex command", () => {
       codexAuthPath(dir),
       JSON.stringify({ OTHER: "keep", OPENAI_API_KEY: "old" }, null, 2),
     );
-    prompts.inject(["gpt-5.2", "low", mockConsumer, true]);
+    prompts.inject(["gpt-5.2", "low", mockConsumer]);
     (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       consumerService: {
         ListConsumers: vi.fn().mockResolvedValue({
@@ -201,7 +202,7 @@ describe("codex command", () => {
     setStdinTTY(true);
     const dir = makeDir();
     process.env.HOME = dir;
-    prompts.inject(["extra_high", mockConsumer, true]);
+    prompts.inject(["extra_high", mockConsumer]);
     (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       consumerService: {
         ListConsumers: vi.fn().mockResolvedValue({
@@ -230,4 +231,73 @@ describe("codex command", () => {
     const config = fs.readFileSync(codexConfigPath(dir), "utf8");
     expect(config).toContain('model = "legacy-model"');
   });
+
+  it("uninstall removes getrouter entries but keeps others", 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_providers.other]");
+    expect(config).not.toContain("[model_providers.getrouter]");
+    expect(config).not.toContain('model_provider = "getrouter"');
+    expect(config).not.toContain('model_reasoning_effort = "low"');
+    expect(config).not.toContain('model = "keep"');
+
+    const auth = JSON.parse(fs.readFileSync(codexAuthPath(dir), "utf8"));
+    expect(auth.OTHER).toBe("keep");
+    expect(auth.OPENAI_API_KEY).toBeUndefined();
+  });
+
+  it("uninstall leaves root keys when provider is not getrouter", async () => {
+    const dir = makeDir();
+    process.env.HOME = dir;
+    const codexDir = path.join(dir, ".codex");
+    fs.mkdirSync(codexDir, { recursive: true });
+    fs.writeFileSync(
+      codexConfigPath(dir),
+      [
+        'model = "keep"',
+        'model_reasoning_effort = "low"',
+        'model_provider = "other"',
+        "",
+        "[model_providers.getrouter]",
+        'name = "getrouter"',
+      ].join("\n"),
+    );
+
+    const program = createProgram();
+    await program.parseAsync(["node", "getrouter", "codex", "uninstall"]);
+
+    const config = fs.readFileSync(codexConfigPath(dir), "utf8");
+    expect(config).toContain('model = "keep"');
+    expect(config).toContain('model_provider = "other"');
+    expect(config).toContain('model_reasoning_effort = "low"');
+    expect(config).not.toContain("[model_providers.getrouter]");
+  });
 });