Avoid extra footer storage reads during loader init

Author: ndycode

index.ts

@@ -1158,7 +1158,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 		const updatePersistedAccountCountHint = (
 			count: number | null | undefined,
 		): void => {
-			if (!Number.isFinite(count) || count === undefined || count === null) {
+			if (typeof count !== "number" || !Number.isFinite(count)) {
 				return;
 			}
 			persistedAccountCountHint = Math.max(0, Math.trunc(count));
@@ -1993,9 +1993,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 					}
 					let accountManager = await accountManagerPromise;
 					cachedAccountManager = accountManager;
-					updatePersistedAccountCountHint(
-						(await loadAccounts())?.accounts.length ?? accountManager.getAccountCount(),
-					);
+					updatePersistedAccountCountHint(accountManager.getAccountCount());
 					const refreshToken = authFallback?.refresh ?? "";
 					const needsPersist =
 						refreshToken &&

test/index.test.ts

@@ -2201,6 +2201,33 @@ describe("OpenAIOAuthPlugin fetch handler", () => {
 		expect(storageModule.loadAccounts).not.toHaveBeenCalled();
 	});
 
+	it("does not add storage reads during loader init when footer counts are enabled", async () => {
+		const storageModule = await import("../lib/storage.js");
+		const getAuth = async () => ({
+			type: "oauth" as const,
+			access: "access-token",
+			refresh: "refresh-token",
+			expires: Date.now() + 60_000,
+			multiAccount: true,
+		});
+		const runLoaderAndCountStorageReads = async (): Promise<number> => {
+			const mockClient = createMockClient();
+			const { OpenAIOAuthPlugin } = await import("../index.js");
+			const plugin = await OpenAIOAuthPlugin({ client: mockClient } as never) as unknown as PluginType;
+			vi.mocked(storageModule.loadAccounts).mockClear();
+			await plugin.auth.loader(getAuth, { options: {}, models: {} });
+			return vi.mocked(storageModule.loadAccounts).mock.calls.length;
+		};
+
+		await disablePersistedFooter();
+		const baselineReadCount = await runLoaderAndCountStorageReads();
+
+		await enablePersistedFooter("full-email");
+		const footerReadCount = await runLoaderAndCountStorageReads();
+
+		expect(footerReadCount).toBe(baselineReadCount);
+	});
+
 	it("uses the live account count when the cached footer hint is stale", async () => {
 		await enablePersistedFooter("full-email");
 		mockStorage.accounts = [