@getrouter/getrouter-cli 0.1.1 → 0.1.3

package/dist/bin.mjs

@@ -1,12 +1,16 @@
 #!/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";
+
+//#endregion
 //#region src/generated/router/dashboard/v1/index.ts
 function createSubscriptionServiceClient(handler) {
 	return { CurrentSubscription(request) {
@@ -200,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 = () => ({
@@ -225,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()) ?? {}
@@ -242,6 +274,39 @@ const writeAuth = (auth) => {
 	if (process.platform !== "win32") fs.chmodSync(authPath, 384);
 };
 
+//#endregion
+//#region src/core/http/url.ts
+const getApiBase = () => {
+	return (readConfig().apiBase || "").replace(/\/+$/, "");
+};
+const buildApiUrl = (path$1) => {
+	const base = getApiBase();
+	const normalized = path$1.replace(/^\/+/, "");
+	return base ? `${base}/${normalized}` : `/${normalized}`;
+};
+
+//#endregion
+//#region src/core/auth/refresh.ts
+const EXPIRY_BUFFER_MS = 60 * 1e3;
+const refreshAccessToken = async ({ fetchImpl }) => {
+	const auth = readAuth();
+	if (!auth.refreshToken) return null;
+	const res = await (fetchImpl ?? fetch)(buildApiUrl("v1/dashboard/auth/token"), {
+		method: "POST",
+		headers: { "Content-Type": "application/json" },
+		body: JSON.stringify({ refreshToken: auth.refreshToken })
+	});
+	if (!res.ok) return null;
+	const token = await res.json();
+	if (token.accessToken && token.refreshToken) writeAuth({
+		accessToken: token.accessToken,
+		refreshToken: token.refreshToken,
+		expiresAt: token.expiresAt ?? "",
+		tokenType: "Bearer"
+	});
+	return token;
+};
+
 //#endregion
 //#region src/core/http/errors.ts
 const createApiError = (payload, fallbackMessage, status) => {
@@ -255,33 +320,71 @@ const createApiError = (payload, fallbackMessage, status) => {
 };
 
 //#endregion
-//#region src/core/http/url.ts
-const getApiBase = () => {
-	return (readConfig().apiBase || "").replace(/\/+$/, "");
+//#region src/core/http/retry.ts
+const defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+const isRetryableError = (error) => {
+	if (error instanceof TypeError) return true;
+	if (typeof error === "object" && error !== null && "status" in error && typeof error.status === "number") {
+		const status = error.status;
+		return status >= 500 || status === 408 || status === 429;
+	}
+	return false;
 };
-const buildApiUrl = (path$1) => {
-	const base = getApiBase();
-	const normalized = path$1.replace(/^\/+/, "");
-	return base ? `${base}/${normalized}` : `/${normalized}`;
+const withRetry = async (fn, options = {}) => {
+	const { maxRetries = 3, initialDelayMs = 1e3, maxDelayMs = 1e4, shouldRetry = isRetryableError, onRetry, sleep = defaultSleep } = options;
+	let lastError;
+	let delay = initialDelayMs;
+	for (let attempt = 0; attempt <= maxRetries; attempt++) try {
+		return await fn();
+	} catch (error) {
+		lastError = error;
+		if (attempt >= maxRetries || !shouldRetry(error, attempt)) throw error;
+		onRetry?.(error, attempt + 1, delay);
+		await sleep(delay);
+		delay = Math.min(delay * 2, maxDelayMs);
+	}
+	throw lastError;
 };
+const isServerError = (status) => status >= 500 || status === 408 || status === 429;
 
 //#endregion
 //#region src/core/http/request.ts
 const getAuthCookieName = () => process.env.GETROUTER_AUTH_COOKIE || process.env.KRATOS_AUTH_COOKIE || "access_token";
-const requestJson = async ({ path: path$1, method, body, fetchImpl }) => {
+const buildHeaders = (accessToken) => {
 	const headers = { "Content-Type": "application/json" };
-	const auth = readAuth();
-	if (auth.accessToken) {
-		headers.Authorization = `Bearer ${auth.accessToken}`;
-		headers.Cookie = `${getAuthCookieName()}=${auth.accessToken}`;
+	if (accessToken) {
+		headers.Authorization = `Bearer ${accessToken}`;
+		headers.Cookie = `${getAuthCookieName()}=${accessToken}`;
 	}
-	const res = await (fetchImpl ?? fetch)(buildApiUrl(path$1), {
+	return headers;
+};
+const doFetch = async (url, method, headers, body, fetchImpl) => {
+	return (fetchImpl ?? fetch)(url, {
 		method,
 		headers,
 		body: body == null ? void 0 : JSON.stringify(body)
 	});
-	if (!res.ok) throw createApiError(await res.json().catch(() => null), res.statusText, res.status);
-	return await res.json();
+};
+const shouldRetryResponse = (error) => {
+	if (typeof error === "object" && error !== null && "status" in error && typeof error.status === "number") return isServerError(error.status);
+	return error instanceof TypeError;
+};
+const requestJson = async ({ path: path$1, method, body, fetchImpl, maxRetries = 3, _retrySleep }) => {
+	return withRetry(async () => {
+		const auth = readAuth();
+		const url = buildApiUrl(path$1);
+		let res = await doFetch(url, method, buildHeaders(auth.accessToken), body, fetchImpl);
+		if (res.status === 401 && auth.refreshToken) {
+			const refreshed = await refreshAccessToken({ fetchImpl });
+			if (refreshed?.accessToken) res = await doFetch(url, method, buildHeaders(refreshed.accessToken), body, fetchImpl);
+		}
+		if (!res.ok) throw createApiError(await res.json().catch(() => null), res.statusText, res.status);
+		return await res.json();
+	}, {
+		maxRetries,
+		shouldRetry: shouldRetryResponse,
+		sleep: _retrySleep
+	});
 };
 
 //#endregion
@@ -420,6 +523,28 @@ const registerAuthCommands = (program) => {
 	});
 };
 
+//#endregion
+//#region src/core/api/pagination.ts
+/**
+* Fetches all pages from a paginated API endpoint.
+*
+* @param fetchPage - Function that fetches a single page given a pageToken
+* @param getItems - Function that extracts items from the response
+* @param getNextToken - Function that extracts the next page token from the response
+* @returns Array of all items across all pages
+*/
+const fetchAllPages = async (fetchPage, getItems, getNextToken) => {
+	const allItems = [];
+	let pageToken;
+	do {
+		const response = await fetchPage(pageToken);
+		const items = getItems(response);
+		allItems.push(...items);
+		pageToken = getNextToken(response);
+	} while (pageToken);
+	return allItems;
+};
+
 //#endregion
 //#region src/core/interactive/fuzzy.ts
 const normalize = (value) => value.toLowerCase();
@@ -504,10 +629,10 @@ const promptKeyEnabled = async (initial) => {
 	return typeof response.enabled === "boolean" ? response.enabled : initial;
 };
 const selectConsumer = async (consumerService) => {
-	const consumers = (await consumerService.ListConsumers({
+	const consumers = await fetchAllPages((pageToken) => consumerService.ListConsumers({
 		pageSize: void 0,
-		pageToken: void 0
-	}))?.consumers ?? [];
+		pageToken
+	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0);
 	if (consumers.length === 0) throw new Error("No available API keys");
 	const sorted = sortByCreatedAtDesc(consumers);
 	const nameCounts = buildNameCounts(sorted);
@@ -521,10 +646,10 @@ const selectConsumer = async (consumerService) => {
 	}) ?? null;
 };
 const selectConsumerList = async (consumerService, message) => {
-	const consumers = (await consumerService.ListConsumers({
+	const consumers = await fetchAllPages((pageToken) => consumerService.ListConsumers({
 		pageSize: void 0,
-		pageToken: void 0
-	}))?.consumers ?? [];
+		pageToken
+	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0);
 	if (consumers.length === 0) throw new Error("No available API keys");
 	const sorted = sortByCreatedAtDesc(consumers);
 	const nameCounts = buildNameCounts(sorted);
@@ -552,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 = [];
@@ -690,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
@@ -750,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 = [
@@ -778,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",
@@ -922,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;
@@ -1024,21 +1191,23 @@ 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)]));
+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 outputConsumers = (consumers) => {
-	const rows = consumers.map(consumerRow);
-	console.log(renderTable(consumerHeaders, rows));
+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 redactConsumer = (consumer) => redactSecrets(consumer);
 const requireInteractive = (message) => {
 	if (!process.stdin.isTTY) throw new Error(message);
 };
@@ -1056,11 +1225,11 @@ const updateConsumer = async (consumerService, consumer, name, enabled) => {
 		updateMask
 	});
 };
-const listConsumers = async (consumerService) => {
-	outputConsumers(((await consumerService.ListConsumers({
+const listConsumers = async (consumerService, showApiKey) => {
+	outputConsumers(await fetchAllPages((pageToken) => consumerService.ListConsumers({
 		pageSize: void 0,
-		pageToken: void 0
-	}))?.consumers ?? []).map(redactConsumer));
+		pageToken
+	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0), showApiKey);
 };
 const resolveConsumerForUpdate = async (consumerService, id) => {
 	if (id) return consumerService.GetConsumer({ id });
@@ -1078,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(redactConsumer(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");
@@ -1093,18 +1262,20 @@ const deleteConsumerById = async (consumerService, id) => {
 	if (!selected?.id) return;
 	if (!await confirmDelete(selected)) return;
 	await consumerService.DeleteConsumer({ id: selected.id });
-	outputConsumerTable(redactConsumer(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({});
@@ -1123,12 +1294,14 @@ const registerKeysCommands = (program) => {
 //#endregion
 //#region src/cmd/models.ts
 const modelHeaders = [
+	"ID",
 	"NAME",
 	"AUTHOR",
 	"ENABLED",
 	"UPDATED_AT"
 ];
 const modelRow = (model) => [
+	String(model.id ?? ""),
 	String(model.name ?? ""),
 	String(model.author ?? ""),
 	String(model.enabled ?? ""),
@@ -1221,8 +1394,7 @@ const registerStatusCommand = (program) => {
 
 //#endregion
 //#region src/core/output/usages.ts
-const INPUT_BLOCK = "█";
-const OUTPUT_BLOCK = "▒";
+const TOTAL_BLOCK = "█";
 const DEFAULT_WIDTH = 24;
 const formatTokens = (value) => {
 	const abs = Math.abs(value);
@@ -1253,46 +1425,25 @@ const renderUsageChart = (rows, width = DEFAULT_WIDTH) => {
 	const header = "📊 Usage (last 7 days) · Tokens";
 	if (rows.length === 0) return `${header}\n\nNo usage data available.`;
 	const normalized = rows.map((row) => {
-		const input = Number(row.inputTokens);
-		const output = Number(row.outputTokens);
-		const safeInput = Number.isFinite(input) ? input : 0;
-		const safeOutput = Number.isFinite(output) ? output : 0;
+		const total = Number(row.totalTokens);
+		const safeTotal = Number.isFinite(total) ? total : 0;
 		return {
 			day: row.day,
-			input: safeInput,
-			output: safeOutput,
-			total: safeInput + safeOutput
+			total: safeTotal
 		};
 	});
 	const totals = normalized.map((row) => row.total);
 	const maxTotal = Math.max(0, ...totals);
-	const lines = normalized.map((row) => {
-		const total = row.total;
-		if (maxTotal === 0 || total === 0) return `${row.day} ${"".padEnd(width, " ")} I:0 O:0`;
-		const scaled = Math.max(1, Math.round(total / maxTotal * width));
-		let inputBars = Math.round(row.input / total * scaled);
-		let outputBars = Math.max(0, scaled - inputBars);
-		if (row.input > 0 && row.output > 0) {
-			if (inputBars === 0) {
-				inputBars = 1;
-				outputBars = Math.max(0, scaled - 1);
-			} else if (outputBars === 0) {
-				outputBars = 1;
-				inputBars = Math.max(0, scaled - 1);
-			}
-		}
-		const bar = `${INPUT_BLOCK.repeat(inputBars)}${OUTPUT_BLOCK.repeat(outputBars)}`;
-		const inputLabel = formatTokens(row.input);
-		const outputLabel = formatTokens(row.output);
-		return `${row.day} ${bar.padEnd(width, " ")} I:${inputLabel} O:${outputLabel}`;
-	});
-	const legend = `Legend: ${INPUT_BLOCK} input    ${OUTPUT_BLOCK} output`;
 	return [
 		header,
 		"",
-		...lines,
-		"",
-		legend
+		...normalized.map((row) => {
+			if (maxTotal === 0 || row.total === 0) return `${row.day} ${"".padEnd(width, " ")} 0`;
+			const scaled = Math.max(1, Math.round(row.total / maxTotal * width));
+			const bar = TOTAL_BLOCK.repeat(scaled);
+			const totalLabel = formatTokens(row.total);
+			return `${row.day} ${bar.padEnd(width, " ")} ${totalLabel}`;
+		})
 	].join("\n");
 };
 
@@ -1368,7 +1519,7 @@ const registerCommands = (program) => {
 //#region src/cli.ts
 const createProgram = () => {
 	const program = new Command();
-	program.name("getrouter").description("CLI for getrouter.dev").version("0.1.0");
+	program.name("getrouter").description("CLI for getrouter.dev").version(version);
 	registerCommands(program);
 	return program;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getrouter/getrouter-cli",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "description": "CLI for getrouter.dev",
   "bin": {
@@ -26,7 +26,7 @@
     "prompts": "^2.4.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.10",
+    "@biomejs/biome": "^2.3.11",
     "@types/node": "^25.0.3",
     "@types/prompts": "^2.4.9",
     "tsdown": "^0.18.4",

package/src/cli.ts

@@ -1,4 +1,5 @@
 import { Command } from "commander";
+import { version } from "../package.json";
 import { registerCommands } from "./cmd";
 
 export const createProgram = () => {
@@ -6,7 +7,7 @@ export const createProgram = () => {
   program
     .name("getrouter")
     .description("CLI for getrouter.dev")
-    .version("0.1.0");
+    .version(version);
   registerCommands(program);
   return program;
 };

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,