refactor: extract runtime account state helpers

Author: ndycode

index.ts

@@ -165,6 +165,11 @@ import {
 	resolveAccountSelection,
 	type TokenSuccessWithAccount,
 } from "./lib/runtime/account-selection.js";
+import {
+	formatRateLimitEntry,
+	getRateLimitResetTimeForFamily,
+	resolveActiveIndex,
+} from "./lib/runtime/account-state.js";
 import { buildManualOAuthFlow } from "./lib/runtime/manual-oauth-flow.js";
 import {
 	createRuntimeMetrics,
@@ -483,22 +488,6 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 		}
 	};
 
-	const resolveActiveIndex = (
-		storage: {
-			activeIndex: number;
-			activeIndexByFamily?: Partial<Record<ModelFamily, number>>;
-			accounts: unknown[];
-		},
-		family: ModelFamily = "codex",
-	): number => {
-		const total = storage.accounts.length;
-		if (total === 0) return 0;
-		const rawCandidate =
-			storage.activeIndexByFamily?.[family] ?? storage.activeIndex;
-		const raw = Number.isFinite(rawCandidate) ? rawCandidate : 0;
-		return Math.max(0, Math.min(raw, total - 1));
-	};
-
 	const hydrateEmails = async (
 		storage: AccountStorageV3 | null,
 	): Promise<AccountStorageV3 | null> => {
@@ -571,40 +560,6 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 		return storage;
 	};
 
-	const getRateLimitResetTimeForFamily = (
-		account: { rateLimitResetTimes?: Record<string, number | undefined> },
-		now: number,
-		family: ModelFamily,
-	): number | null => {
-		const times = account.rateLimitResetTimes;
-		if (!times) return null;
-
-		let minReset: number | null = null;
-		const prefix = `${family}:`;
-		for (const [key, value] of Object.entries(times)) {
-			if (typeof value !== "number") continue;
-			if (value <= now) continue;
-			if (key !== family && !key.startsWith(prefix)) continue;
-			if (minReset === null || value < minReset) {
-				minReset = value;
-			}
-		}
-
-		return minReset;
-	};
-
-	const formatRateLimitEntry = (
-		account: { rateLimitResetTimes?: Record<string, number | undefined> },
-		now: number,
-		family: ModelFamily = "codex",
-	): string | null => {
-		const resetAt = getRateLimitResetTimeForFamily(account, now, family);
-		if (typeof resetAt !== "number") return null;
-		const remaining = resetAt - now;
-		if (remaining <= 0) return null;
-		return `resets in ${formatWaitTime(remaining)}`;
-	};
-
 	const applyUiRuntimeFromConfig = (
 		pluginConfig: ReturnType<typeof loadPluginConfig>,
 	): UiRuntimeOptions => {

lib/runtime/account-state.ts

@@ -0,0 +1,52 @@
+import { formatWaitTime } from "../accounts.js";
+import type { ModelFamily } from "../prompts/codex.js";
+
+export function resolveActiveIndex(
+	storage: {
+		activeIndex: number;
+		activeIndexByFamily?: Partial<Record<ModelFamily, number>>;
+		accounts: unknown[];
+	},
+	family: ModelFamily = "codex",
+): number {
+	const total = storage.accounts.length;
+	if (total === 0) return 0;
+	const rawCandidate =
+		storage.activeIndexByFamily?.[family] ?? storage.activeIndex;
+	const raw = Number.isFinite(rawCandidate) ? rawCandidate : 0;
+	return Math.max(0, Math.min(raw, total - 1));
+}
+
+export function getRateLimitResetTimeForFamily(
+	account: { rateLimitResetTimes?: Record<string, number | undefined> },
+	now: number,
+	family: ModelFamily,
+): number | null {
+	const times = account.rateLimitResetTimes;
+	if (!times) return null;
+
+	let minReset: number | null = null;
+	const prefix = `${family}:`;
+	for (const [key, value] of Object.entries(times)) {
+		if (typeof value !== "number") continue;
+		if (value <= now) continue;
+		if (key !== family && !key.startsWith(prefix)) continue;
+		if (minReset === null || value < minReset) {
+			minReset = value;
+		}
+	}
+
+	return minReset;
+}
+
+export function formatRateLimitEntry(
+	account: { rateLimitResetTimes?: Record<string, number | undefined> },
+	now: number,
+	family: ModelFamily = "codex",
+): string | null {
+	const resetAt = getRateLimitResetTimeForFamily(account, now, family);
+	if (typeof resetAt !== "number") return null;
+	const remaining = resetAt - now;
+	if (remaining <= 0) return null;
+	return `resets in ${formatWaitTime(remaining)}`;
+}