@getrouter/getrouter-cli 0.1.8 → 0.1.10

package/README.ja.md

@@ -51,6 +51,7 @@ getrouter login
 ```
 
 表示された URL をブラウザで開くと、CLI はトークンを受け取るまでポーリングします。
+すでにログイン済みでも `getrouter login` を再実行すると、ローカルの auth.json は新しいトークンで上書きされます。
 
 ## よく使うコマンド
 
@@ -75,6 +76,12 @@ getrouter login
 getrouter codex
 ```
 
+Codex の設定/認証から GetRouter の項目を削除する場合:
+
+```bash
+getrouter codex uninstall
+```
+
 書き込まれるファイル（codex）:
 
 - `~/.codex/config.toml`（model + reasoning + provider 設定）

package/README.md

@@ -51,6 +51,7 @@ getrouter login
 ```
 
 Follow the printed URL in your browser, then the CLI will poll until it receives tokens.
+Re-running `getrouter login` will overwrite the local auth state with new tokens.
 
 ## Common Commands
 
@@ -75,6 +76,12 @@ Notes:
 getrouter codex
 ```
 
+To remove GetRouter entries from Codex config/auth:
+
+```bash
+getrouter codex uninstall
+```
+
 Files written (codex):
 
 - `~/.codex/config.toml` (model + reasoning + provider settings)

package/README.zh-cn.md

@@ -51,6 +51,7 @@ getrouter login
 ```
 
 按提示打开浏览器完成确认，CLI 会轮询直到拿到 token。
+即使已登录，也可再次执行 `getrouter login`，会用新 token 覆盖本地 auth.json。
 
 ## 常用命令
 
@@ -75,6 +76,12 @@ getrouter login
 getrouter codex
 ```
 
+如需移除 Codex 配置/认证中的 GetRouter 条目：
+
+```bash
+getrouter codex uninstall
+```
+
 写入文件（codex）：
 
 - `~/.codex/config.toml`（model + reasoning + provider 设置）

package/dist/bin.mjs

@@ -8,7 +8,7 @@ import { randomInt } from "node:crypto";
 import prompts from "prompts";
 
 //#region package.json
-var version = "0.1.8";
+var version = "0.1.10";
 
 //#endregion
 //#region src/generated/router/dashboard/v1/index.ts
@@ -369,12 +369,15 @@ 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 }) => {
+const requestJson = async ({ path: path$1, method, body, fetchImpl, maxRetries = 3, includeAuth = true, _retrySleep }) => {
 	return withRetry(async () => {
-		const auth = readAuth();
+		const auth = includeAuth ? readAuth() : {
+			accessToken: void 0,
+			refreshToken: void 0
+		};
 		const url = buildApiUrl(path$1);
-		let res = await doFetch(url, method, buildHeaders(auth.accessToken), body, fetchImpl);
-		if (res.status === 401 && auth.refreshToken) {
+		let res = await doFetch(url, method, includeAuth ? buildHeaders(auth.accessToken) : buildHeaders(), body, fetchImpl);
+		if (includeAuth && res.status === 401 && auth.refreshToken) {
 			const refreshed = await refreshAccessToken({ fetchImpl });
 			if (refreshed?.accessToken) res = await doFetch(url, method, buildHeaders(refreshed.accessToken), body, fetchImpl);
 		}
@@ -389,7 +392,7 @@ const requestJson = async ({ path: path$1, method, body, fetchImpl, maxRetries =
 
 //#endregion
 //#region src/core/api/client.ts
-const createApiClients = ({ fetchImpl, clients }) => {
+const createApiClients = ({ fetchImpl, clients, includeAuth = true }) => {
 	const factories = clients ?? {
 		createConsumerServiceClient,
 		createAuthServiceClient,
@@ -402,7 +405,8 @@ const createApiClients = ({ fetchImpl, clients }) => {
 			path: path$1,
 			method,
 			body: body ? JSON.parse(body) : void 0,
-			fetchImpl
+			fetchImpl,
+			includeAuth
 		});
 	};
 	return {
@@ -505,7 +509,7 @@ const pollAuthorize = async ({ authorize, code, timeoutMs = 300 * 1e3, initialDe
 //#region src/cmd/auth.ts
 const registerAuthCommands = (program) => {
 	program.command("login").description("Login with device flow").action(async () => {
-		const { authService } = createApiClients({});
+		const { authService } = createApiClients({ includeAuth: false });
 		const authCode = generateAuthCode();
 		const url = buildLoginUrl(authCode);
 		console.log("🔐 To authenticate, visit:");
@@ -595,9 +599,19 @@ const fuzzySelect = async ({ message, choices }) => {
 
 //#endregion
 //#region src/core/interactive/keys.ts
-const sortByCreatedAtDesc = (consumers) => consumers.slice().sort((a, b) => {
-	const aTime = Date.parse(a.createdAt ?? "") || 0;
-	return (Date.parse(b.createdAt ?? "") || 0) - aTime;
+const parseTimestamp = (value) => {
+	const parsed = Date.parse(value ?? "");
+	return Number.isNaN(parsed) ? 0 : parsed;
+};
+const getUpdatedAtTime = (consumer) => {
+	const updatedAt = parseTimestamp(consumer.updatedAt);
+	if (updatedAt) return updatedAt;
+	return parseTimestamp(consumer.createdAt);
+};
+const getDisplayTimestamp = (consumer) => consumer.updatedAt ?? consumer.createdAt ?? "-";
+const sortConsumersByUpdatedAtDesc = (consumers) => consumers.slice().sort((a, b) => {
+	const aTime = getUpdatedAtTime(a);
+	return getUpdatedAtTime(b) - aTime;
 });
 const normalizeName = (consumer) => {
 	const name = consumer.name?.trim();
@@ -613,8 +627,8 @@ const buildNameCounts = (consumers) => {
 };
 const formatChoice = (consumer, nameCounts) => {
 	const name = normalizeName(consumer);
-	const createdAt = consumer.createdAt ?? "-";
-	return (nameCounts.get(name) ?? 0) > 1 || name === "(unnamed)" ? `${name} (${createdAt})` : name;
+	const displayTimestamp = getDisplayTimestamp(consumer);
+	return (nameCounts.get(name) ?? 0) > 1 || name === "(unnamed)" ? `${name} (${displayTimestamp})` : name;
 };
 const promptKeyName = async (initial) => {
 	const response = await prompts({
@@ -649,14 +663,18 @@ const selectConsumer = async (consumerService) => {
 		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 sorted = sortConsumersByUpdatedAtDesc(consumers);
 	const nameCounts = buildNameCounts(sorted);
 	return await fuzzySelect({
 		message: "🔎 Search keys",
 		choices: sorted.map((consumer) => ({
 			title: formatChoice(consumer, nameCounts),
 			value: consumer,
-			keywords: [normalizeName(consumer), consumer.createdAt ?? ""].filter(Boolean)
+			keywords: [
+				normalizeName(consumer),
+				consumer.updatedAt ?? "",
+				consumer.createdAt ?? ""
+			].filter(Boolean)
 		}))
 	}) ?? null;
 };
@@ -666,7 +684,7 @@ const selectConsumerList = async (consumerService, message) => {
 		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 sorted = sortConsumersByUpdatedAtDesc(consumers);
 	const nameCounts = buildNameCounts(sorted);
 	const response = await prompts({
 		type: "select",
@@ -951,25 +969,16 @@ const getCodexModelChoices = async () => {
 			value: model,
 			keywords: [model, "codex"]
 		}));
-		if (remoteChoices.length > 0) {
-			remoteChoices.sort((a, b) => a.title.localeCompare(b.title));
-			return remoteChoices;
-		}
+		if (remoteChoices.length > 0) return remoteChoices.reverse();
 	} catch {}
 	return MODEL_CHOICES;
 };
 const REASONING_CHOICES = [
 	{
-		id: "low",
-		label: "Low",
-		value: "low",
-		description: "Fast responses with lighter reasoning"
-	},
-	{
-		id: "medium",
-		label: "Medium (default)",
-		value: "medium",
-		description: "Balances speed and reasoning depth for everyday tasks"
+		id: "extra_high",
+		label: "Extra high",
+		value: "xhigh",
+		description: "Extra high reasoning depth for complex problems. Warning: Extra high reasoning effort can quickly consume Plus plan rate limits."
 	},
 	{
 		id: "high",
@@ -978,10 +987,16 @@ const REASONING_CHOICES = [
 		description: "Greater reasoning depth for complex problems"
 	},
 	{
-		id: "extra_high",
-		label: "Extra high",
-		value: "xhigh",
-		description: "Extra high reasoning depth for complex problems. Warning: Extra high reasoning effort can quickly consume Plus plan rate limits."
+		id: "medium",
+		label: "Medium (default)",
+		value: "medium",
+		description: "Balances speed and reasoning depth for everyday tasks"
+	},
+	{
+		id: "low",
+		label: "Low",
+		value: "low",
+		description: "Fast responses with lighter reasoning"
 	}
 ];
 const REASONING_FUZZY_CHOICES = REASONING_CHOICES.map((choice) => ({
@@ -1326,10 +1341,10 @@ const updateConsumer = async (consumerService, consumer, name, enabled) => {
 	});
 };
 const listConsumers = async (consumerService, showApiKey) => {
-	outputConsumers(await fetchAllPages((pageToken) => consumerService.ListConsumers({
+	outputConsumers(sortConsumersByUpdatedAtDesc(await fetchAllPages((pageToken) => consumerService.ListConsumers({
 		pageSize: void 0,
 		pageToken
-	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0), showApiKey);
+	}), (res) => res?.consumers ?? [], (res) => res?.nextPageToken || void 0)), showApiKey);
 };
 const resolveConsumerForUpdate = async (consumerService, id) => {
 	if (id) return consumerService.GetConsumer({ id });

package/package.json

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

package/src/cmd/auth.ts

@@ -14,7 +14,7 @@ export const registerAuthCommands = (program: Command) => {
     .command("login")
     .description("Login with device flow")
     .action(async () => {
-      const { authService } = createApiClients({});
+      const { authService } = createApiClients({ includeAuth: false });
       const authCode = generateAuthCode();
       const url = buildLoginUrl(authCode);
       console.log("🔐 To authenticate, visit:");

package/src/cmd/keys.ts

@@ -7,6 +7,7 @@ import {
   promptKeyEnabled,
   promptKeyName,
   selectConsumerList,
+  sortConsumersByUpdatedAtDesc,
 } from "../core/interactive/keys";
 import { renderTable } from "../core/output/table";
 import type {
@@ -103,7 +104,8 @@ const listConsumers = async (
     (res) => res?.consumers ?? [],
     (res) => res?.nextPageToken || undefined,
   );
-  outputConsumers(consumers, showApiKey);
+  const sorted = sortConsumersByUpdatedAtDesc(consumers);
+  outputConsumers(sorted, showApiKey);
 };
 
 const resolveConsumerForUpdate = async (

package/src/core/api/client.ts

@@ -46,9 +46,11 @@ export type ApiClients = {
 export const createApiClients = ({
   fetchImpl,
   clients,
+  includeAuth = true,
 }: {
   fetchImpl?: typeof fetch;
   clients?: ClientFactories;
+  includeAuth?: boolean;
 }): ApiClients => {
   const factories =
     clients ??
@@ -66,6 +68,7 @@ export const createApiClients = ({
       method,
       body: body ? JSON.parse(body) : undefined,
       fetchImpl,
+      includeAuth,
     });
   };
 

package/src/core/http/request.ts

@@ -10,6 +10,7 @@ type RequestInput = {
   body?: unknown;
   fetchImpl?: typeof fetch;
   maxRetries?: number;
+  includeAuth?: boolean;
   /** For testing: override the sleep function used for retry delays */
   _retrySleep?: (ms: number) => Promise<void>;
 };
@@ -63,18 +64,23 @@ export const requestJson = async <T = unknown>({
   body,
   fetchImpl,
   maxRetries = 3,
+  includeAuth = true,
   _retrySleep,
 }: RequestInput): Promise<T> => {
   return withRetry(
     async () => {
-      const auth = readAuth();
+      const auth = includeAuth
+        ? readAuth()
+        : { accessToken: undefined, refreshToken: undefined };
       const url = buildApiUrl(path);
-      const headers = buildHeaders(auth.accessToken);
+      const headers = includeAuth
+        ? buildHeaders(auth.accessToken)
+        : buildHeaders();
 
       let res = await doFetch(url, method, headers, body, fetchImpl);
 
       // On 401, attempt token refresh and retry once
-      if (res.status === 401 && auth.refreshToken) {
+      if (includeAuth && res.status === 401 && auth.refreshToken) {
         const refreshed = await refreshAccessToken({ fetchImpl });
         if (refreshed?.accessToken) {
           const newHeaders = buildHeaders(refreshed.accessToken);

package/src/core/interactive/codex.ts

@@ -48,8 +48,7 @@ export const getCodexModelChoices = async (): Promise<
     }));
 
     if (remoteChoices.length > 0) {
-      remoteChoices.sort((a, b) => a.title.localeCompare(b.title));
-      return remoteChoices;
+      return remoteChoices.reverse();
     }
   } catch {}
 
@@ -58,16 +57,11 @@ export const getCodexModelChoices = async (): Promise<
 
 export const REASONING_CHOICES: ReasoningChoice[] = [
   {
-    id: "low",
-    label: "Low",
-    value: "low",
-    description: "Fast responses with lighter reasoning",
-  },
-  {
-    id: "medium",
-    label: "Medium (default)",
-    value: "medium",
-    description: "Balances speed and reasoning depth for everyday tasks",
+    id: "extra_high",
+    label: "Extra high",
+    value: "xhigh",
+    description:
+      "Extra high reasoning depth for complex problems. Warning: Extra high reasoning effort can quickly consume Plus plan rate limits.",
   },
   {
     id: "high",
@@ -76,11 +70,16 @@ export const REASONING_CHOICES: ReasoningChoice[] = [
     description: "Greater reasoning depth for complex problems",
   },
   {
-    id: "extra_high",
-    label: "Extra high",
-    value: "xhigh",
-    description:
-      "Extra high reasoning depth for complex problems. Warning: Extra high reasoning effort can quickly consume Plus plan rate limits.",
+    id: "medium",
+    label: "Medium (default)",
+    value: "medium",
+    description: "Balances speed and reasoning depth for everyday tasks",
+  },
+  {
+    id: "low",
+    label: "Low",
+    value: "low",
+    description: "Fast responses with lighter reasoning",
   },
 ];
 

package/src/core/interactive/keys.ts

@@ -17,10 +17,24 @@ export type KeyMenuAction =
   | "delete"
   | "exit";
 
-const sortByCreatedAtDesc = (consumers: Consumer[]) =>
+const parseTimestamp = (value?: string) => {
+  const parsed = Date.parse(value ?? "");
+  return Number.isNaN(parsed) ? 0 : parsed;
+};
+
+const getUpdatedAtTime = (consumer: Consumer) => {
+  const updatedAt = parseTimestamp(consumer.updatedAt);
+  if (updatedAt) return updatedAt;
+  return parseTimestamp(consumer.createdAt);
+};
+
+const getDisplayTimestamp = (consumer: Consumer) =>
+  consumer.updatedAt ?? consumer.createdAt ?? "-";
+
+export const sortConsumersByUpdatedAtDesc = (consumers: Consumer[]) =>
   consumers.slice().sort((a, b) => {
-    const aTime = Date.parse(a.createdAt ?? "") || 0;
-    const bTime = Date.parse(b.createdAt ?? "") || 0;
+    const aTime = getUpdatedAtTime(a);
+    const bTime = getUpdatedAtTime(b);
     return bTime - aTime;
   });
 
@@ -40,9 +54,9 @@ const buildNameCounts = (consumers: Consumer[]) => {
 
 const formatChoice = (consumer: Consumer, nameCounts: Map<string, number>) => {
   const name = normalizeName(consumer);
-  const createdAt = consumer.createdAt ?? "-";
+  const displayTimestamp = getDisplayTimestamp(consumer);
   const needsDetail = (nameCounts.get(name) ?? 0) > 1 || name === "(unnamed)";
-  return needsDetail ? `${name} (${createdAt})` : name;
+  return needsDetail ? `${name} (${displayTimestamp})` : name;
 };
 
 export const selectKeyAction = async (): Promise<KeyMenuAction> => {
@@ -127,16 +141,18 @@ export const selectConsumer = async (
   if (consumers.length === 0) {
     throw new Error("No available API keys");
   }
-  const sorted = sortByCreatedAtDesc(consumers);
+  const sorted = sortConsumersByUpdatedAtDesc(consumers);
   const nameCounts = buildNameCounts(sorted);
   const selected = await fuzzySelect({
     message: "🔎 Search keys",
     choices: sorted.map((consumer) => ({
       title: formatChoice(consumer, nameCounts),
       value: consumer,
-      keywords: [normalizeName(consumer), consumer.createdAt ?? ""].filter(
-        Boolean,
-      ),
+      keywords: [
+        normalizeName(consumer),
+        consumer.updatedAt ?? "",
+        consumer.createdAt ?? "",
+      ].filter(Boolean),
     })),
   });
   return selected ?? null;
@@ -158,7 +174,7 @@ export const selectConsumerList = async (
   if (consumers.length === 0) {
     throw new Error("No available API keys");
   }
-  const sorted = sortByCreatedAtDesc(consumers);
+  const sorted = sortConsumersByUpdatedAtDesc(consumers);
   const nameCounts = buildNameCounts(sorted);
   const response = await prompts({
     type: "select",

package/tests/cmd/keys.test.ts

@@ -19,6 +19,7 @@ const mockConsumer = {
   apiKey: "abcd1234WXYZ",
   lastAccess: "2026-01-02T00:00:00Z",
   createdAt: "2026-01-01T00:00:00Z",
+  updatedAt: "2026-01-02T00:00:00Z",
 };
 
 const emptyAuthService = {} as AuthService;
@@ -113,6 +114,39 @@ describe("keys command", () => {
     log.mockRestore();
   });
 
+  it("sorts keys by updatedAt desc in list output", async () => {
+    setStdinTTY(false);
+    const consumers = [
+      {
+        ...mockConsumer,
+        id: "c1",
+        name: "older-key",
+        updatedAt: "2026-01-02T00:00:00Z",
+      },
+      {
+        ...mockConsumer,
+        id: "c2",
+        name: "newer-key",
+        updatedAt: "2026-01-03T00:00:00Z",
+      },
+    ];
+    (createApiClients as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
+      consumerService: {
+        ListConsumers: vi.fn().mockResolvedValue({ consumers }),
+      } 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"]);
+    const output = log.mock.calls.map((c) => c[0]).join("\n");
+    expect(output.indexOf("newer-key")).toBeLessThan(
+      output.indexOf("older-key"),
+    );
+    log.mockRestore();
+  });
+
   it("rejects removed get subcommand", async () => {
     setStdinTTY(false);
     const program = createProgram();

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

@@ -25,15 +25,14 @@ describe("codex interactive helpers", () => {
       ok: true,
       status: 200,
       json: vi.fn().mockResolvedValue({
-        models: ["new-codex-model-xyz"],
+        models: ["older-codex-model", "newer-codex-model"],
       }),
     });
     vi.stubGlobal("fetch", fetchMock);
 
     const choices = await getCodexModelChoices();
-    expect(
-      choices.some((choice) => choice.value === "new-codex-model-xyz"),
-    ).toBe(true);
+    expect(choices[0]?.value).toBe("newer-codex-model");
+    expect(choices[1]?.value).toBe("older-codex-model");
     expect(String(fetchMock.mock.calls[0]?.[0] ?? "")).toContain(
       "/v1/dashboard/providers/models?tag=codex",
     );

package/tests/http/request.test.ts

@@ -51,6 +51,36 @@ describe("requestJson", () => {
     expect(headers.Cookie).toBe("access_token=t");
   });
 
+  it("skips auth headers when includeAuth is false", async () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));
+    process.env.GETROUTER_CONFIG_DIR = dir;
+    fs.writeFileSync(
+      path.join(dir, "auth.json"),
+      JSON.stringify({ accessToken: "t" }),
+    );
+
+    const fetchSpy = vi.fn(
+      async (_input: RequestInfo | URL, _init?: RequestInit) =>
+        ({
+          ok: true,
+          json: async () => ({ ok: true }),
+        }) as Response,
+    );
+
+    await requestJson({
+      path: "/v1/test",
+      method: "GET",
+      fetchImpl: fetchSpy as unknown as typeof fetch,
+      includeAuth: false,
+    });
+
+    const call = fetchSpy.mock.calls[0] as Parameters<typeof fetch> | undefined;
+    const init = call?.[1];
+    const headers = (init?.headers ?? {}) as Record<string, string>;
+    expect(headers.Authorization).toBeUndefined();
+    expect(headers.Cookie).toBeUndefined();
+  });
+
   it("uses GETROUTER_AUTH_COOKIE when set", async () => {
     process.env.GETROUTER_AUTH_COOKIE = "router_auth";
     const dir = fs.mkdtempSync(path.join(os.tmpdir(), "getrouter-"));