@getrouter/getrouter-cli 0.1.2 → 0.1.4

package/dist/bin.mjs

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 import { Command } from "commander";
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
+import os from "node:os";
 import { execSync, spawn } from "node:child_process";
 import { randomInt } from "node:crypto";
 import prompts from "prompts";
 
 //#region package.json
-var version = "0.1.2";
+var version = "0.1.4";
 
 //#endregion
 //#region src/generated/router/dashboard/v1/index.ts
@@ -204,16 +204,47 @@ function createUsageServiceClient(handler) {
 
 //#endregion
 //#region src/core/config/fs.ts
+const getCorruptBackupPath = (filePath) => {
+	const dir = path.dirname(filePath);
+	const ext = path.extname(filePath);
+	const base = path.basename(filePath, ext);
+	const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+	const rand = Math.random().toString(16).slice(2, 8);
+	return path.join(dir, `${base}.corrupt-${stamp}-${rand}${ext}`);
+};
 const readJsonFile = (filePath) => {
 	if (!fs.existsSync(filePath)) return null;
-	const raw = fs.readFileSync(filePath, "utf8");
-	return JSON.parse(raw);
+	let raw;
+	try {
+		raw = fs.readFileSync(filePath, "utf8");
+	} catch {
+		console.warn(`⚠️ Unable to read ${filePath}. Continuing with defaults.`);
+		return null;
+	}
+	try {
+		return JSON.parse(raw);
+	} catch {
+		const backupPath = getCorruptBackupPath(filePath);
+		try {
+			fs.renameSync(filePath, backupPath);
+			console.warn(`⚠️ Invalid JSON in ${filePath}. Moved to ${backupPath} and continuing with defaults.`);
+		} catch {
+			console.warn(`⚠️ Invalid JSON in ${filePath}. Please fix or delete this file, then try again.`);
+		}
+		return null;
+	}
 };
 const writeJsonFile = (filePath, value) => {
 	fs.mkdirSync(path.dirname(filePath), { recursive: true });
 	fs.writeFileSync(filePath, JSON.stringify(value, null, 2), "utf8");
 };
 
+//#endregion
+//#region src/core/config/paths.ts
+const resolveConfigDir = () => process.env.GETROUTER_CONFIG_DIR || path.join(os.homedir(), ".getrouter");
+const getConfigPath = () => path.join(resolveConfigDir(), "config.json");
+const getAuthPath = () => path.join(resolveConfigDir(), "auth.json");
+
 //#endregion
 //#region src/core/config/types.ts
 const defaultConfig = () => ({
@@ -229,9 +260,6 @@ const defaultAuthState = () => ({
 
 //#endregion
 //#region src/core/config/index.ts
-const resolveConfigDir$1 = () => process.env.GETROUTER_CONFIG_DIR || path.join(os.homedir(), ".getrouter");
-const getConfigPath = () => path.join(resolveConfigDir$1(), "config.json");
-const getAuthPath = () => path.join(resolveConfigDir$1(), "auth.json");
 const readConfig = () => ({
 	...defaultConfig(),
 	...readJsonFile(getConfigPath()) ?? {}
@@ -649,9 +677,13 @@ const confirmDelete = async (consumer) => {
 
 //#endregion
 //#region src/core/setup/env.ts
+const quoteEnvValue = (shell, value) => {
+	if (shell === "ps1") return `'${value.replaceAll("'", "''")}'`;
+	return `'${value.replaceAll("'", "'\\''")}'`;
+};
 const renderLine = (shell, key, value) => {
-	if (shell === "ps1") return `$env:${key}="${value}"`;
-	return `export ${key}=${value}`;
+	if (shell === "ps1") return `$env:${key}=${quoteEnvValue(shell, value)}`;
+	return `export ${key}=${quoteEnvValue(shell, value)}`;
 };
 const renderEnv = (shell, vars) => {
 	const lines = [];
@@ -787,7 +819,6 @@ const appendRcIfMissing = (rcPath, line) => {
 	fs.writeFileSync(rcPath, `${content}${prefix}${line}\n`, "utf8");
 	return true;
 };
-const resolveConfigDir = () => process.env.GETROUTER_CONFIG_DIR || path.join(os.homedir(), ".getrouter");
 
 //#endregion
 //#region src/cmd/env.ts
@@ -847,6 +878,29 @@ const registerClaudeCommand = (program) => {
 	});
 };
 
+//#endregion
+//#region src/core/api/providerModels.ts
+const asTrimmedString = (value) => {
+	if (typeof value !== "string") return null;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : null;
+};
+const buildProviderModelsPath = (tag) => {
+	const query = new URLSearchParams();
+	if (tag) query.set("tag", tag);
+	const qs = query.toString();
+	return `v1/dashboard/providers/models${qs ? `?${qs}` : ""}`;
+};
+const listProviderModels = async ({ tag, fetchImpl }) => {
+	const raw = (await requestJson({
+		path: buildProviderModelsPath(tag),
+		method: "GET",
+		fetchImpl,
+		maxRetries: 0
+	}))?.models;
+	return (Array.isArray(raw) ? raw : []).map(asTrimmedString).filter(Boolean);
+};
+
 //#endregion
 //#region src/core/interactive/codex.ts
 const MODEL_CHOICES = [
@@ -875,6 +929,20 @@ const MODEL_CHOICES = [
 		keywords: ["gpt-5.2"]
 	}
 ];
+const getCodexModelChoices = async () => {
+	try {
+		const remoteChoices = (await listProviderModels({ tag: "codex" })).map((model) => ({
+			title: model,
+			value: model,
+			keywords: [model, "codex"]
+		}));
+		if (remoteChoices.length > 0) {
+			remoteChoices.sort((a, b) => a.title.localeCompare(b.title));
+			return remoteChoices;
+		}
+	} catch {}
+	return MODEL_CHOICES;
+};
 const REASONING_CHOICES = [
 	{
 		id: "low",
@@ -1019,19 +1087,21 @@ const ensureCodexDir = () => {
 const requireInteractive$1 = () => {
 	if (!process.stdin.isTTY) throw new Error("Interactive mode required for codex configuration.");
 };
-const promptModel = async () => await fuzzySelect({
-	message: "Select Model and Effort\nAccess legacy models by running codex -m <model_name> or in your config.toml",
-	choices: MODEL_CHOICES
-});
+const promptModel = async () => {
+	return await fuzzySelect({
+		message: "Select Model and Effort\nAccess legacy models by running getrouter codex -m <model_name> or in your config.toml",
+		choices: await getCodexModelChoices()
+	});
+};
 const promptReasoning = async (model) => await fuzzySelect({
 	message: `Select Reasoning Level for ${model}`,
 	choices: REASONING_FUZZY_CHOICES
 });
 const formatReasoningLabel = (id) => REASONING_CHOICES.find((choice) => choice.id === id)?.label ?? id;
 const registerCodexCommand = (program) => {
-	program.command("codex").description("Configure Codex").action(async () => {
+	program.command("codex").description("Configure Codex").option("-m, --model <model>", "Set codex model (skips model selection)").action(async (options) => {
 		requireInteractive$1();
-		const model = await promptModel();
+		const model = options.model && options.model.trim().length > 0 ? options.model.trim() : await promptModel();
 		if (!model) return;
 		const reasoningId = await promptReasoning(model);
 		if (!reasoningId) return;
@@ -1070,6 +1140,27 @@ const registerCodexCommand = (program) => {
 	});
 };
 
+//#endregion
+//#region src/core/config/redact.ts
+const SECRET_KEYS = new Set([
+	"accessToken",
+	"refreshToken",
+	"apiKey"
+]);
+const mask = (value) => {
+	if (!value) return "";
+	if (value.length <= 8) return "****";
+	return `${value.slice(0, 4)}...${value.slice(-4)}`;
+};
+const redactSecrets = (obj) => {
+	const out = { ...obj };
+	for (const key of Object.keys(out)) {
+		const value = out[key];
+		if (SECRET_KEYS.has(key) && typeof value === "string") out[key] = mask(value);
+	}
+	return out;
+};
+
 //#endregion
 //#region src/core/output/table.ts
 const truncate = (value, max) => {
@@ -1100,18 +1191,21 @@ const consumerHeaders = [
 	"CREATED_AT",
 	"API_KEY"
 ];
-const consumerRow = (consumer) => [
-	String(consumer.name ?? ""),
-	String(consumer.enabled ?? ""),
-	String(consumer.lastAccess ?? ""),
-	String(consumer.createdAt ?? ""),
-	String(consumer.apiKey ?? "")
-];
-const outputConsumerTable = (consumer) => {
-	console.log(renderTable(consumerHeaders, [consumerRow(consumer)], { maxColWidth: 64 }));
-};
-const outputConsumers = (consumers) => {
-	const rows = consumers.map(consumerRow);
+const consumerRow = (consumer, showApiKey) => {
+	const { apiKey } = showApiKey ? consumer : redactSecrets(consumer);
+	return [
+		String(consumer.name ?? ""),
+		String(consumer.enabled ?? ""),
+		String(consumer.lastAccess ?? ""),
+		String(consumer.createdAt ?? ""),
+		String(apiKey ?? "")
+	];
+};
+const outputConsumerTable = (consumer, showApiKey) => {
+	console.log(renderTable(consumerHeaders, [consumerRow(consumer, showApiKey)], { maxColWidth: 64 }));
+};
+const outputConsumers = (consumers, showApiKey) => {
+	const rows = consumers.map((consumer) => consumerRow(consumer, showApiKey));
 	console.log(renderTable(consumerHeaders, rows, { maxColWidth: 64 }));
 };
 const requireInteractive = (message) => {
@@ -1131,11 +1225,11 @@ const updateConsumer = async (consumerService, consumer, name, enabled) => {
 		updateMask
 	});
 };
-const listConsumers = async (consumerService) => {
+const listConsumers = async (consumerService, showApiKey) => {
 	outputConsumers(await fetchAllPages((pageToken) => consumerService.ListConsumers({
 		pageSize: void 0,
 		pageToken
-	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0));
+	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0), showApiKey);
 };
 const resolveConsumerForUpdate = async (consumerService, id) => {
 	if (id) return consumerService.GetConsumer({ id });
@@ -1153,14 +1247,14 @@ const createConsumer = async (consumerService) => {
 	const enabled = await promptKeyEnabled(true);
 	let consumer = await consumerService.CreateConsumer({});
 	consumer = await updateConsumer(consumerService, consumer, name, enabled);
-	outputConsumerTable(consumer);
+	outputConsumerTable(consumer, true);
 	console.log("Please store this API key securely.");
 };
 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)));
+	outputConsumerTable(await updateConsumer(consumerService, selected, await promptKeyName(selected.name), await promptKeyEnabled(selected.enabled ?? true)), false);
 };
 const deleteConsumerById = async (consumerService, id) => {
 	requireInteractiveForAction("delete");
@@ -1168,18 +1262,20 @@ const deleteConsumerById = async (consumerService, id) => {
 	if (!selected?.id) return;
 	if (!await confirmDelete(selected)) return;
 	await consumerService.DeleteConsumer({ id: selected.id });
-	outputConsumerTable(selected);
+	outputConsumerTable(selected, false);
 };
 const registerKeysCommands = (program) => {
 	const keys = program.command("keys").description("Manage API keys");
+	keys.option("--show", "Show full API keys");
 	keys.allowExcessArguments(false);
-	keys.action(async () => {
+	keys.action(async (options) => {
 		const { consumerService } = createApiClients({});
-		await listConsumers(consumerService);
+		await listConsumers(consumerService, Boolean(options.show));
 	});
-	keys.command("list").description("List API keys").action(async () => {
+	keys.command("list").description("List API keys").option("--show", "Show full API keys").action(async (options, command) => {
 		const { consumerService } = createApiClients({});
-		await listConsumers(consumerService);
+		const parentShow = Boolean(command.parent?.opts().show);
+		await listConsumers(consumerService, Boolean(options.show) || parentShow);
 	});
 	keys.command("create").description("Create an API key").action(async () => {
 		const { consumerService } = createApiClients({});

package/package.json

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

package/src/cmd/codex.ts

@@ -5,7 +5,7 @@ import type { Command } from "commander";
 import prompts from "prompts";
 import { createApiClients } from "../core/api/client";
 import {
-  MODEL_CHOICES,
+  getCodexModelChoices,
   mapReasoningValue,
   REASONING_CHOICES,
   REASONING_FUZZY_CHOICES,
@@ -42,12 +42,14 @@ const requireInteractive = () => {
   }
 };
 
-const promptModel = async () =>
-  await fuzzySelect({
+const promptModel = async () => {
+  const choices = await getCodexModelChoices();
+  return await fuzzySelect({
     message:
-      "Select Model and Effort\nAccess legacy models by running codex -m <model_name> or in your config.toml",
-    choices: MODEL_CHOICES,
+      "Select Model and Effort\nAccess legacy models by running getrouter codex -m <model_name> or in your config.toml",
+    choices,
   });
+};
 
 const promptReasoning = async (model: string) =>
   await fuzzySelect({
@@ -58,13 +60,21 @@ const promptReasoning = async (model: string) =>
 const formatReasoningLabel = (id: string) =>
   REASONING_CHOICES.find((choice) => choice.id === id)?.label ?? id;
 
+type CodexCommandOptions = {
+  model?: string;
+};
+
 export const registerCodexCommand = (program: Command) => {
   program
     .command("codex")
     .description("Configure Codex")
-    .action(async () => {
+    .option("-m, --model <model>", "Set codex model (skips model selection)")
+    .action(async (options: CodexCommandOptions) => {
       requireInteractive();
-      const model = await promptModel();
+      const model =
+        options.model && options.model.trim().length > 0
+          ? options.model.trim()
+          : await promptModel();
       if (!model) return;
       const reasoningId = await promptReasoning(model);
       if (!reasoningId) return;

package/src/cmd/env.ts

@@ -1,6 +1,7 @@
 import os from "node:os";
 import type { Command } from "commander";
 import { createApiClients } from "../core/api/client";
+import { resolveConfigDir } from "../core/config/paths";
 import { selectConsumer } from "../core/interactive/keys";
 import {
   appendRcIfMissing,
@@ -12,7 +13,6 @@ import {
   getHookFilePath,
   renderEnv,
   renderHook,
-  resolveConfigDir,
   resolveEnvShell,
   resolveShellRcPath,
   trySourceEnv,

package/src/cmd/keys.ts

@@ -1,6 +1,7 @@
 import type { Command } from "commander";
 import { createApiClients } from "../core/api/client";
 import { fetchAllPages } from "../core/api/pagination";
+import { redactSecrets } from "../core/config/redact";
 import {
   confirmDelete,
   promptKeyEnabled,
@@ -23,22 +24,32 @@ const consumerHeaders = [
   "API_KEY",
 ];
 
-const consumerRow = (consumer: ConsumerLike) => [
-  String(consumer.name ?? ""),
-  String(consumer.enabled ?? ""),
-  String(consumer.lastAccess ?? ""),
-  String(consumer.createdAt ?? ""),
-  String(consumer.apiKey ?? ""),
-];
+const consumerRow = (consumer: ConsumerLike, showApiKey: boolean) => {
+  const { apiKey } = showApiKey
+    ? consumer
+    : (redactSecrets(consumer as Record<string, unknown>) as ConsumerLike);
+  return [
+    String(consumer.name ?? ""),
+    String(consumer.enabled ?? ""),
+    String(consumer.lastAccess ?? ""),
+    String(consumer.createdAt ?? ""),
+    String(apiKey ?? ""),
+  ];
+};
 
-const outputConsumerTable = (consumer: ConsumerLike) => {
+const outputConsumerTable = (consumer: ConsumerLike, showApiKey: boolean) => {
   console.log(
-    renderTable(consumerHeaders, [consumerRow(consumer)], { maxColWidth: 64 }),
+    renderTable(consumerHeaders, [consumerRow(consumer, showApiKey)], {
+      maxColWidth: 64,
+    }),
   );
 };
 
-const outputConsumers = (consumers: routercommonv1_Consumer[]) => {
-  const rows = consumers.map(consumerRow);
+const outputConsumers = (
+  consumers: routercommonv1_Consumer[],
+  showApiKey: boolean,
+) => {
+  const rows = consumers.map((consumer) => consumerRow(consumer, showApiKey));
   console.log(renderTable(consumerHeaders, rows, { maxColWidth: 64 }));
 };
 
@@ -81,6 +92,7 @@ const updateConsumer = async (
 
 const listConsumers = async (
   consumerService: Pick<ConsumerService, "ListConsumers">,
+  showApiKey: boolean,
 ) => {
   const consumers = await fetchAllPages(
     (pageToken) =>
@@ -91,7 +103,7 @@ const listConsumers = async (
     (res) => res?.consumers ?? [],
     (res) => res?.nextPageToken || undefined,
   );
-  outputConsumers(consumers);
+  outputConsumers(consumers, showApiKey);
 };
 
 const resolveConsumerForUpdate = async (
@@ -124,7 +136,7 @@ const createConsumer = async (
   const enabled = await promptKeyEnabled(true);
   let consumer = await consumerService.CreateConsumer({});
   consumer = await updateConsumer(consumerService, consumer, name, enabled);
-  outputConsumerTable(consumer);
+  outputConsumerTable(consumer, true);
   console.log("Please store this API key securely.");
 };
 
@@ -146,7 +158,7 @@ const updateConsumerById = async (
     name,
     enabled,
   );
-  outputConsumerTable(consumer);
+  outputConsumerTable(consumer, false);
 };
 
 const deleteConsumerById = async (
@@ -162,24 +174,27 @@ const deleteConsumerById = async (
   const confirmed = await confirmDelete(selected);
   if (!confirmed) return;
   await consumerService.DeleteConsumer({ id: selected.id });
-  outputConsumerTable(selected);
+  outputConsumerTable(selected, false);
 };
 
 export const registerKeysCommands = (program: Command) => {
   const keys = program.command("keys").description("Manage API keys");
+  keys.option("--show", "Show full API keys");
   keys.allowExcessArguments(false);
 
-  keys.action(async () => {
+  keys.action(async (options: { show?: boolean }) => {
     const { consumerService } = createApiClients({});
-    await listConsumers(consumerService);
+    await listConsumers(consumerService, Boolean(options.show));
   });
 
   keys
     .command("list")
     .description("List API keys")
-    .action(async () => {
+    .option("--show", "Show full API keys")
+    .action(async (options: { show?: boolean }, command: Command) => {
       const { consumerService } = createApiClients({});
-      await listConsumers(consumerService);
+      const parentShow = Boolean(command.parent?.opts().show);
+      await listConsumers(consumerService, Boolean(options.show) || parentShow);
     });
 
   keys

package/src/core/api/providerModels.ts

@@ -0,0 +1,32 @@
+import { requestJson } from "../http/request";
+
+const asTrimmedString = (value: unknown): string | null => {
+  if (typeof value !== "string") return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+};
+
+const buildProviderModelsPath = (tag?: string) => {
+  const query = new URLSearchParams();
+  if (tag) query.set("tag", tag);
+  const qs = query.toString();
+  return `v1/dashboard/providers/models${qs ? `?${qs}` : ""}`;
+};
+
+export const listProviderModels = async ({
+  tag,
+  fetchImpl,
+}: {
+  tag?: string;
+  fetchImpl?: typeof fetch;
+}): Promise<string[]> => {
+  const res = await requestJson<{ models?: unknown }>({
+    path: buildProviderModelsPath(tag),
+    method: "GET",
+    fetchImpl,
+    maxRetries: 0,
+  });
+  const raw = res?.models;
+  const models = Array.isArray(raw) ? raw : [];
+  return models.map(asTrimmedString).filter(Boolean) as string[];
+};

package/src/core/config/fs.ts

@@ -1,10 +1,41 @@
 import fs from "node:fs";
 import path from "node:path";
 
+const getCorruptBackupPath = (filePath: string) => {
+  const dir = path.dirname(filePath);
+  const ext = path.extname(filePath);
+  const base = path.basename(filePath, ext);
+  const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+  const rand = Math.random().toString(16).slice(2, 8);
+  return path.join(dir, `${base}.corrupt-${stamp}-${rand}${ext}`);
+};
+
 export const readJsonFile = <T = unknown>(filePath: string): T | null => {
   if (!fs.existsSync(filePath)) return null;
-  const raw = fs.readFileSync(filePath, "utf8");
-  return JSON.parse(raw) as T;
+  let raw: string;
+  try {
+    raw = fs.readFileSync(filePath, "utf8");
+  } catch {
+    console.warn(`⚠️ Unable to read ${filePath}. Continuing with defaults.`);
+    return null;
+  }
+
+  try {
+    return JSON.parse(raw) as T;
+  } catch {
+    const backupPath = getCorruptBackupPath(filePath);
+    try {
+      fs.renameSync(filePath, backupPath);
+      console.warn(
+        `⚠️ Invalid JSON in ${filePath}. Moved to ${backupPath} and continuing with defaults.`,
+      );
+    } catch {
+      console.warn(
+        `⚠️ Invalid JSON in ${filePath}. Please fix or delete this file, then try again.`,
+      );
+    }
+    return null;
+  }
 };
 
 export const writeJsonFile = (filePath: string, value: unknown) => {

package/src/core/config/index.ts

@@ -1,7 +1,6 @@
 import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
 import { readJsonFile, writeJsonFile } from "./fs";
+import { getAuthPath, getConfigPath } from "./paths";
 import {
   type AuthState,
   type ConfigFile,
@@ -9,12 +8,6 @@ import {
   defaultConfig,
 } from "./types";
 
-const resolveConfigDir = () =>
-  process.env.GETROUTER_CONFIG_DIR || path.join(os.homedir(), ".getrouter");
-
-const getConfigPath = () => path.join(resolveConfigDir(), "config.json");
-const getAuthPath = () => path.join(resolveConfigDir(), "auth.json");
-
 export const readConfig = (): ConfigFile => ({
   ...defaultConfig(),
   ...(readJsonFile<ConfigFile>(getConfigPath()) ?? {}),
@@ -32,6 +25,7 @@ export const writeAuth = (auth: AuthState) => {
   const authPath = getAuthPath();
   writeJsonFile(authPath, auth);
   if (process.platform !== "win32") {
+    // Restrict token file permissions on Unix-like systems.
     fs.chmodSync(authPath, 0o600);
   }
 };

package/src/core/config/paths.ts

@@ -1,5 +1,8 @@
+import os from "node:os";
 import path from "node:path";
-import { getConfigDir } from "../paths";
 
-export const getConfigPath = () => path.join(getConfigDir(), "config.json");
-export const getAuthPath = () => path.join(getConfigDir(), "auth.json");
+export const resolveConfigDir = () =>
+  process.env.GETROUTER_CONFIG_DIR || path.join(os.homedir(), ".getrouter");
+
+export const getConfigPath = () => path.join(resolveConfigDir(), "config.json");
+export const getAuthPath = () => path.join(resolveConfigDir(), "auth.json");

package/src/core/interactive/codex.ts

@@ -1,3 +1,4 @@
+import { listProviderModels } from "../api/providerModels";
 import type { FuzzyChoice } from "./fuzzy";
 
 export type ReasoningChoice = {
@@ -35,6 +36,26 @@ export const MODEL_CHOICES: FuzzyChoice<string>[] = [
   },
 ];
 
+export const getCodexModelChoices = async (): Promise<
+  FuzzyChoice<string>[]
+> => {
+  try {
+    const remoteModels = await listProviderModels({ tag: "codex" });
+    const remoteChoices = remoteModels.map((model) => ({
+      title: model,
+      value: model,
+      keywords: [model, "codex"],
+    }));
+
+    if (remoteChoices.length > 0) {
+      remoteChoices.sort((a, b) => a.title.localeCompare(b.title));
+      return remoteChoices;
+    }
+  } catch {}
+
+  return MODEL_CHOICES;
+};
+
 export const REASONING_CHOICES: ReasoningChoice[] = [
   {
     id: "low",

package/src/core/setup/codex.ts

@@ -45,6 +45,7 @@ export const mergeCodexToml = (content: string, input: CodexConfigInput) => {
   let firstHeaderIndex: number | null = null;
   const rootFound = new Set<string>();
 
+  // Update root keys that appear before any section headers.
   for (let i = 0; i < updated.length; i += 1) {
     const headerMatch = matchHeader(updated[i] ?? "");
     if (headerMatch) {
@@ -66,6 +67,7 @@ export const mergeCodexToml = (content: string, input: CodexConfigInput) => {
     }
   }
 
+  // Insert missing root keys before the first section header (or at EOF).
   const insertIndex = firstHeaderIndex ?? updated.length;
   const missingRoot = ROOT_KEYS.filter((key) => !rootFound.has(key)).map(
     (key) => `${key} = ${rootValueMap[key]}`,
@@ -76,6 +78,7 @@ export const mergeCodexToml = (content: string, input: CodexConfigInput) => {
     updated.splice(insertIndex, 0, ...missingRoot, ...(needsBlank ? [""] : []));
   }
 
+  // Ensure the provider section exists and keep its keys in sync.
   const providerHeader = `[${PROVIDER_SECTION}]`;
   const providerHeaderIndex = updated.findIndex(
     (line) => line.trim() === providerHeader,
@@ -91,6 +94,7 @@ export const mergeCodexToml = (content: string, input: CodexConfigInput) => {
     return updated.join("\n");
   }
 
+  // Find the provider section bounds for in-place updates.
   let providerEnd = updated.length;
   for (let i = providerHeaderIndex + 1; i < updated.length; i += 1) {
     if (matchHeader(updated[i] ?? "")) {

package/src/core/setup/env.ts

@@ -1,6 +1,5 @@
 import { execSync } from "node:child_process";
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 
 export type EnvVars = {
@@ -14,11 +13,21 @@ export type EnvShell = "sh" | "ps1";
 
 export type RcShell = "zsh" | "bash" | "fish" | "pwsh";
 
+const quoteEnvValue = (shell: EnvShell, value: string) => {
+  if (shell === "ps1") {
+    // PowerShell: single quotes are literal; escape by doubling.
+    return `'${value.replaceAll("'", "''")}'`;
+  }
+
+  // POSIX shell: use single quotes; escape embedded single quotes with: '\''.
+  return `'${value.replaceAll("'", "'\\''")}'`;
+};
+
 const renderLine = (shell: EnvShell, key: string, value: string) => {
   if (shell === "ps1") {
-    return `$env:${key}="${value}"`;
+    return `$env:${key}=${quoteEnvValue(shell, value)}`;
   }
-  return `export ${key}=${value}`;
+  return `export ${key}=${quoteEnvValue(shell, value)}`;
 };
 
 export const renderEnv = (shell: EnvShell, vars: EnvVars) => {
@@ -39,6 +48,7 @@ export const renderEnv = (shell: EnvShell, vars: EnvVars) => {
   return lines.join("\n");
 };
 
+// Wrap getrouter to source env after successful codex/claude runs.
 export const renderHook = (shell: RcShell) => {
   if (shell === "pwsh") {
     return [
@@ -126,6 +136,7 @@ export const writeEnvFile = (filePath: string, content: string) => {
   fs.mkdirSync(path.dirname(filePath), { recursive: true });
   fs.writeFileSync(filePath, content, "utf8");
   if (process.platform !== "win32") {
+    // Limit env file readability since it can contain API keys.
     fs.chmodSync(filePath, 0o600);
   }
 };
@@ -215,6 +226,3 @@ export const appendRcIfMissing = (rcPath: string, line: string) => {
   fs.writeFileSync(rcPath, `${content}${prefix}${line}\n`, "utf8");
   return true;
 };
-
-export const resolveConfigDir = () =>
-  process.env.GETROUTER_CONFIG_DIR || path.join(os.homedir(), ".getrouter");

package/tests/cmd/codex.test.ts

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import prompts from "prompts";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { createProgram } from "../../src/cli";
 import { createApiClients } from "../../src/core/api/client";
 import type { ConsumerService } from "../../src/generated/router/dashboard/v1";
@@ -32,6 +32,7 @@ const originalEnv = Object.fromEntries(
 );
 
 afterEach(() => {
+  vi.unstubAllGlobals();
   setStdinTTY(originalIsTTY);
   prompts.inject([]);
   for (const key of ENV_KEYS) {
@@ -44,6 +45,57 @@ afterEach(() => {
 });
 
 describe("codex command", () => {
+  beforeEach(() => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn().mockResolvedValue({
+        ok: true,
+        status: 200,
+        json: vi.fn().mockResolvedValue({ models: [] }),
+      }),
+    );
+  });
+
+  it("fetches codex models from remote endpoint", async () => {
+    setStdinTTY(true);
+    const dir = makeDir();
+    process.env.HOME = dir;
+
+    const fetchMock = vi.fn().mockResolvedValue({
+      ok: true,
+      status: 200,
+      json: vi.fn().mockResolvedValue({
+        models: ["gpt-5.2-codex"],
+      }),
+    });
+    vi.stubGlobal("fetch", fetchMock);
+
+    prompts.inject(["gpt-5.2-codex", "extra_high", mockConsumer, true]);
+    (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(fetchMock).toHaveBeenCalled();
+    expect(String(fetchMock.mock.calls[0]?.[0] ?? "")).toContain(
+      "/v1/dashboard/providers/models?tag=codex",
+    );
+  });
+
   it("writes codex config and auth after interactive flow", async () => {
     setStdinTTY(true);
     const dir = makeDir();
@@ -144,4 +196,38 @@ describe("codex command", () => {
     expect(auth.OPENAI_API_KEY).toBe("key-123");
     expect(auth.OTHER).toBe("keep");
   });
+
+  it("supports -m to set a custom model", async () => {
+    setStdinTTY(true);
+    const dir = makeDir();
+    process.env.HOME = dir;
+    prompts.inject(["extra_high", mockConsumer, true]);
+    (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",
+      "-m",
+      "legacy-model",
+    ]);
+
+    const config = fs.readFileSync(codexConfigPath(dir), "utf8");
+    expect(config).toContain('model = "legacy-model"');
+  });
 });

package/tests/cmd/keys.test.ts

@@ -38,7 +38,7 @@ afterEach(() => {
 });
 
 describe("keys command", () => {
-  it("lists keys with full apiKey", async () => {
+  it("lists keys with redacted apiKey by default", async () => {
     setStdinTTY(false);
     (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
       consumerService: {
@@ -54,6 +54,24 @@ describe("keys command", () => {
     expect(output).toContain("API_KEY");
     expect(output).toContain("NAME");
     expect(output).not.toContain("ID");
+    expect(output).toContain("abcd...WXYZ");
+    expect(output).not.toContain("abcd1234WXYZ");
+    log.mockRestore();
+  });
+
+  it("lists keys with full apiKey when --show is provided", async () => {
+    setStdinTTY(false);
+    (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
+      consumerService: {
+        ListConsumers: vi.fn().mockResolvedValue({ consumers: [mockConsumer] }),
+      } as unknown as ConsumerService,
+      subscriptionService: emptySubscriptionService,
+      authService: emptyAuthService,
+    });
+    const log = vi.spyOn(console, "log").mockImplementation(() => {});
+    const program = createProgram();
+    await program.parseAsync(["node", "getrouter", "keys", "list", "--show"]);
+    const output = log.mock.calls.map((c) => c[0]).join("\n");
     expect(output).toContain("abcd1234WXYZ");
     log.mockRestore();
   });
@@ -73,6 +91,24 @@ describe("keys command", () => {
     const output = log.mock.calls.map((c) => c[0]).join("\n");
     expect(output).toContain("NAME");
     expect(output).not.toContain("ID");
+    expect(output).toContain("abcd...WXYZ");
+    expect(output).not.toContain("abcd1234WXYZ");
+    log.mockRestore();
+  });
+
+  it("lists keys when no subcommand and --show is provided", async () => {
+    setStdinTTY(true);
+    (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
+      consumerService: {
+        ListConsumers: vi.fn().mockResolvedValue({ consumers: [mockConsumer] }),
+      } as unknown as ConsumerService,
+      subscriptionService: emptySubscriptionService,
+      authService: emptyAuthService,
+    });
+    const log = vi.spyOn(console, "log").mockImplementation(() => {});
+    const program = createProgram();
+    await program.parseAsync(["node", "getrouter", "keys", "--show"]);
+    const output = log.mock.calls.map((c) => c[0]).join("\n");
     expect(output).toContain("abcd1234WXYZ");
     log.mockRestore();
   });
@@ -81,10 +117,15 @@ describe("keys command", () => {
     setStdinTTY(false);
     const program = createProgram();
     program.exitOverride();
-    program.configureOutput({
+    const silentOutput = {
       writeErr: () => {},
       writeOut: () => {},
-    });
+      outputError: () => {},
+    };
+    program.configureOutput(silentOutput);
+    program.commands
+      .find((command) => command.name() === "keys")
+      ?.configureOutput(silentOutput);
     await expect(
       program.parseAsync(["node", "getrouter", "keys", "get", "c1"]),
     ).rejects.toBeTruthy();

package/tests/config/fs.test.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import { readJsonFile, writeJsonFile } from "../../src/core/config/fs";
 
 describe("config fs", () => {
@@ -11,4 +11,25 @@ describe("config fs", () => {
     writeJsonFile(file, { hello: "world" });
     expect(readJsonFile(file)).toEqual({ hello: "world" });
   });
+
+  it("tolerates invalid JSON by returning null and backing up the file", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));
+    const file = path.join(dir, "config.json");
+    fs.writeFileSync(file, "{", "utf8");
+
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    try {
+      expect(readJsonFile(file)).toBeNull();
+    } finally {
+      warnSpy.mockRestore();
+    }
+
+    expect(fs.existsSync(file)).toBe(false);
+    const backups = fs
+      .readdirSync(dir)
+      .filter(
+        (name) => name.startsWith("config.corrupt-") && name.endsWith(".json"),
+      );
+    expect(backups.length).toBe(1);
+  });
 });

package/tests/config/index.test.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import {
   readAuth,
   readConfig,
@@ -34,6 +34,21 @@ describe("config read/write", () => {
     expect(auth.expiresAt).toBe("c");
   });
 
+  it("falls back to defaults when config.json is invalid JSON", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));
+    process.env.GETROUTER_CONFIG_DIR = dir;
+    fs.writeFileSync(path.join(dir, "config.json"), "{", "utf8");
+
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    try {
+      const cfg = readConfig();
+      expect(cfg.apiBase).toBe("https://getrouter.dev");
+      expect(cfg.json).toBe(false);
+    } finally {
+      warnSpy.mockRestore();
+    }
+  });
+
   it("defaults tokenType to Bearer", () => {
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));
     process.env.GETROUTER_CONFIG_DIR = dir;

package/tests/config/paths.test.ts

@@ -1,10 +1,33 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import { describe, expect, it } from "vitest";
 import { getAuthPath, getConfigPath } from "../../src/core/config/paths";
 
 describe("config paths", () => {
+  const originalConfigDir = process.env.GETROUTER_CONFIG_DIR;
+
+  const restore = () => {
+    if (originalConfigDir === undefined) {
+      delete process.env.GETROUTER_CONFIG_DIR;
+      return;
+    }
+    process.env.GETROUTER_CONFIG_DIR = originalConfigDir;
+  };
+
   it("returns ~/.getrouter paths", () => {
+    delete process.env.GETROUTER_CONFIG_DIR;
     expect(getConfigPath()).toContain(".getrouter");
     expect(getConfigPath()).toContain("config.json");
     expect(getAuthPath()).toContain("auth.json");
+    restore();
+  });
+
+  it("uses GETROUTER_CONFIG_DIR when set", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));
+    process.env.GETROUTER_CONFIG_DIR = dir;
+    expect(getConfigPath()).toBe(path.join(dir, "config.json"));
+    expect(getAuthPath()).toBe(path.join(dir, "auth.json"));
+    restore();
   });
 });

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

@@ -1,11 +1,16 @@
-import { describe, expect, it } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 import {
+  getCodexModelChoices,
   MODEL_CHOICES,
   mapReasoningValue,
   REASONING_CHOICES,
 } from "../../../src/core/interactive/codex";
 
 describe("codex interactive helpers", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
   it("maps extra high to xhigh", () => {
     expect(mapReasoningValue("extra_high")).toBe("xhigh");
   });
@@ -14,4 +19,23 @@ describe("codex interactive helpers", () => {
     expect(MODEL_CHOICES.length).toBeGreaterThan(0);
     expect(REASONING_CHOICES.length).toBeGreaterThan(0);
   });
+
+  it("fetches codex models from ListProviderModels(tag=codex)", async () => {
+    const fetchMock = vi.fn().mockResolvedValue({
+      ok: true,
+      status: 200,
+      json: vi.fn().mockResolvedValue({
+        models: ["new-codex-model-xyz"],
+      }),
+    });
+    vi.stubGlobal("fetch", fetchMock);
+
+    const choices = await getCodexModelChoices();
+    expect(
+      choices.some((choice) => choice.value === "new-codex-model-xyz"),
+    ).toBe(true);
+    expect(String(fetchMock.mock.calls[0]?.[0] ?? "")).toContain(
+      "/v1/dashboard/providers/models?tag=codex",
+    );
+  });
 });

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

@@ -23,17 +23,31 @@ describe("setup env helpers", () => {
   it("renders sh env", () => {
     const output = renderEnv("sh", vars);
     expect(output).toContain(
-      "export OPENAI_BASE_URL=https://api.getrouter.dev/codex",
+      "export OPENAI_BASE_URL='https://api.getrouter.dev/codex'",
     );
-    expect(output).toContain("export ANTHROPIC_API_KEY=key-123");
+    expect(output).toContain("export ANTHROPIC_API_KEY='key-123'");
   });
 
   it("renders ps1 env", () => {
     const output = renderEnv("ps1", vars);
     expect(output).toContain(
-      '$env:OPENAI_BASE_URL="https://api.getrouter.dev/codex"',
+      "$env:OPENAI_BASE_URL='https://api.getrouter.dev/codex'",
     );
-    expect(output).toContain('$env:ANTHROPIC_API_KEY="key-123"');
+    expect(output).toContain("$env:ANTHROPIC_API_KEY='key-123'");
+  });
+
+  it("escapes values safely", () => {
+    expect(
+      renderEnv("sh", {
+        openaiApiKey: "a'b",
+      }),
+    ).toContain("export OPENAI_API_KEY='a'\\''b'");
+
+    expect(
+      renderEnv("ps1", {
+        openaiApiKey: "a'b",
+      }),
+    ).toContain("$env:OPENAI_API_KEY='a''b'");
   });
 
   it("writes env file", () => {

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2021",
     "module": "CommonJS",
     "rootDir": ".",
     "outDir": "dist",

package/src/core/paths.ts

@@ -1,4 +0,0 @@
-import os from "node:os";
-import path from "node:path";
-
-export const getConfigDir = () => path.join(os.homedir(), ".getrouter");

package/tests/paths.test.ts

@@ -1,9 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { getConfigDir } from "../src/core/paths";
-
-describe("paths", () => {
-  it("returns ~/.getrouter path", () => {
-    const dir = getConfigDir();
-    expect(dir).toContain(".getrouter");
-  });
-});