refactor: extract account select event handler

Author: ndycode

index.ts

@@ -162,6 +162,7 @@ import { withStreamingFailover } from "./lib/request/stream-failover.js";
 import { addJitter } from "./lib/rotation.js";
 import { persistAccountPool } from "./lib/runtime/account-pool.js";
 import { applyAccountStorageScope } from "./lib/runtime/account-scope.js";
+import { handleAccountSelectEvent } from "./lib/runtime/account-select-event.js";
 import {
 	resolveAccountSelection,
 	type TokenSuccessWithAccount,
@@ -538,63 +539,22 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 		event: { type: string; properties?: unknown };
 	}) => {
 		try {
-			const { event } = input;
-			// Handle TUI account selection events
-			// Accepts generic selection events with an index property
-			if (
-				event.type === "account.select" ||
-				event.type === "openai.account.select"
-			) {
-				const props = event.properties as {
-					index?: number;
-					accountIndex?: number;
-					provider?: string;
-				};
-				// Filter by provider if specified
-				if (
-					props.provider &&
-					props.provider !== "openai" &&
-					props.provider !== PROVIDER_ID
-				) {
-					return;
-				}
-
-				const index = props.index ?? props.accountIndex;
-				if (typeof index === "number") {
-					const storage = await loadAccounts();
-					if (!storage || index < 0 || index >= storage.accounts.length) {
-						return;
-					}
-
-					const now = Date.now();
-					const account = storage.accounts[index];
-					if (account) {
-						account.lastUsed = now;
-						account.lastSwitchReason = "rotation";
-					}
-					storage.activeIndex = index;
-					storage.activeIndexByFamily = storage.activeIndexByFamily ?? {};
-					for (const family of MODEL_FAMILIES) {
-						storage.activeIndexByFamily[family] = index;
-					}
-
-					await saveAccounts(storage);
-					if (cachedAccountManager) {
-						await cachedAccountManager.syncCodexCliActiveSelectionForIndex(
-							index,
-						);
-					}
+			const handled = await handleAccountSelectEvent({
+				event: input.event,
+				providerId: PROVIDER_ID,
+				loadAccounts,
+				saveAccounts,
+				modelFamilies: MODEL_FAMILIES,
+				cachedAccountManager,
+				reloadAccountManagerFromDisk: async () => {
+					await reloadAccountManagerFromDisk();
+				},
+				setLastCodexCliActiveSyncIndex: (index) => {
 					lastCodexCliActiveSyncIndex = index;
-
-					// Reload manager from disk so we don't overwrite newer rotated
-					// refresh tokens with stale in-memory state.
-					if (cachedAccountManager) {
-						await reloadAccountManagerFromDisk();
-					}
-
-					await showToast(`Switched to account ${index + 1}`, "info");
-				}
-			}
+				},
+				showToast,
+			});
+			if (handled) return;
 		} catch (error) {
 			logDebug(
 				`[${PLUGIN_NAME}] Event handler error: ${error instanceof Error ? error.message : String(error)}`,

lib/runtime/account-select-event.ts

@@ -0,0 +1,73 @@
+import type { ModelFamily } from "../prompts/codex.js";
+import type { AccountStorageV3 } from "../storage.js";
+
+export async function handleAccountSelectEvent(input: {
+	event: { type: string; properties?: unknown };
+	providerId: string;
+	loadAccounts: () => Promise<AccountStorageV3 | null>;
+	saveAccounts: (storage: AccountStorageV3) => Promise<void>;
+	modelFamilies: readonly ModelFamily[];
+	cachedAccountManager: {
+		syncCodexCliActiveSelectionForIndex(index: number): Promise<void>;
+	} | null;
+	reloadAccountManagerFromDisk: () => Promise<unknown>;
+	setLastCodexCliActiveSyncIndex: (index: number) => void;
+	showToast: (
+		message: string,
+		variant?: "info" | "success" | "warning" | "error",
+	) => Promise<void>;
+}): Promise<boolean> {
+	const { event } = input;
+	if (
+		event.type !== "account.select" &&
+		event.type !== "openai.account.select"
+	) {
+		return false;
+	}
+
+	const props = event.properties as {
+		index?: number;
+		accountIndex?: number;
+		provider?: string;
+	};
+	if (
+		props.provider &&
+		props.provider !== "openai" &&
+		props.provider !== input.providerId
+	) {
+		return true;
+	}
+
+	const index = props.index ?? props.accountIndex;
+	if (typeof index !== "number") return true;
+
+	const storage = await input.loadAccounts();
+	if (!storage || index < 0 || index >= storage.accounts.length) {
+		return true;
+	}
+
+	const now = Date.now();
+	const account = storage.accounts[index];
+	if (account) {
+		account.lastUsed = now;
+		account.lastSwitchReason = "rotation";
+	}
+	storage.activeIndex = index;
+	storage.activeIndexByFamily = storage.activeIndexByFamily ?? {};
+	for (const family of input.modelFamilies) {
+		storage.activeIndexByFamily[family] = index;
+	}
+
+	await input.saveAccounts(storage);
+	if (input.cachedAccountManager) {
+		await input.cachedAccountManager.syncCodexCliActiveSelectionForIndex(index);
+	}
+	input.setLastCodexCliActiveSyncIndex(index);
+
+	if (input.cachedAccountManager) {
+		await input.reloadAccountManagerFromDisk();
+	}
+
+	await input.showToast(`Switched to account ${index + 1}`, "info");
+	return true;
+}