fix footer review findings

Author: ndycode

index.ts

@@ -1148,16 +1148,26 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 
 		const persistedAccountIndicators = new Map<string, PersistedAccountIndicatorEntry>();
 		let persistedAccountIndicatorRevision = 0;
+		let persistedAccountCountHint = 0;
 
 		const nextPersistedAccountIndicatorRevision = (): number => {
 			persistedAccountIndicatorRevision += 1;
 			return persistedAccountIndicatorRevision;
 		};
 
+		const updatePersistedAccountCountHint = (
+			count: number | null | undefined,
+		): void => {
+			if (!Number.isFinite(count) || count === undefined || count === null) {
+				return;
+			}
+			persistedAccountCountHint = Math.max(0, Math.trunc(count));
+		};
+
 		const resolvePersistedAccountSessionID = (
 			...candidates: Array<string | null | undefined>
 		): string | undefined => {
-			for (const candidate of [process.env.CODEX_THREAD_ID, ...candidates]) {
+			for (const candidate of [...candidates, process.env.CODEX_THREAD_ID]) {
 				const sessionID = candidate?.toString().trim();
 				if (sessionID) {
 					return sessionID;
@@ -1841,6 +1851,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
                                 }
 
                                 await saveAccounts(storage);
+								updatePersistedAccountCountHint(storage.accounts.length);
 
                                 // Reload manager from disk so we don't overwrite newer rotated
                                 // refresh tokens with stale in-memory state.
@@ -1916,10 +1927,11 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 			}
 			if (!lastUserMessage) return Promise.resolve();
 
-			const sessionID =
+			const sessionID = resolvePersistedAccountSessionID(
 				typeof lastUserMessage.info.sessionID === "string"
 					? lastUserMessage.info.sessionID
-					: undefined;
+					: undefined,
+			);
 			const indicator = getPersistedAccountIndicatorLabel(sessionID);
 			if (!indicator) return Promise.resolve();
 
@@ -1981,6 +1993,9 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 					}
 					let accountManager = await accountManagerPromise;
 					cachedAccountManager = accountManager;
+					updatePersistedAccountCountHint(
+						(await loadAccounts())?.accounts.length ?? accountManager.getAccountCount(),
+					);
 					const refreshToken = authFallback?.refresh ?? "";
 					const needsPersist =
 						refreshToken &&
@@ -2854,9 +2869,10 @@ while (attempted.size < Math.max(1, accountCount)) {
 
 					accountManager.recordSuccess(account, modelFamily, model);
 					if (persistAccountFooter) {
-						const persistedStorage = await loadAccounts();
-						const persistedAccountCount = persistedStorage?.accounts.length ??
-							accountManager.getAccountCount();
+						const persistedAccountCount =
+							persistedAccountCountHint > 0
+								? persistedAccountCountHint
+								: accountManager.getAccountCount();
 						setPersistedAccountIndicator(
 							threadIdCandidate,
 							account,

test/index.test.ts

@@ -415,7 +415,7 @@ type PluginType = {
 			messages: Array<{
 				info: {
 					role: string;
-					sessionID: string;
+					sessionID?: string;
 					model?: { providerID: string; modelID: string };
 					variant?: string;
 					thinking?: string;
@@ -2184,6 +2184,23 @@ describe("OpenAIOAuthPlugin fetch handler", () => {
 		);
 	});
 
+	it("does not reload account storage on the successful footer hot path", async () => {
+		await enablePersistedFooter("full-email");
+		mockStorage.accounts = [
+			{ accountId: "acc-1", email: "user@example.com", refreshToken: "refresh-token" },
+			{ accountId: "acc-2", email: "user2@example.com", refreshToken: "refresh-2" },
+		];
+		const storageModule = await import("../lib/storage.js");
+		const { sdk } = await setupPlugin();
+
+		await sendPersistedAccountRequest(sdk, "session-warmup");
+		vi.mocked(storageModule.loadAccounts).mockClear();
+
+		await sendPersistedAccountRequest(sdk, "session-no-read");
+
+		expect(storageModule.loadAccounts).not.toHaveBeenCalled();
+	});
+
 	it("decorates the last user message with a label-only indicator when configured", async () => {
 		await enablePersistedFooter("label-only");
 		const { plugin, sdk } = await setupPlugin();
@@ -2239,6 +2256,44 @@ describe("OpenAIOAuthPlugin fetch handler", () => {
 		expect((await readPersistedAccountIndicator(plugin, "session-chat-message")).thinking).toBeUndefined();
 	});
 
+	it("prefers the explicit request session key over CODEX_THREAD_ID", async () => {
+		await enablePersistedFooter("full-email");
+		process.env.CODEX_THREAD_ID = "env-session";
+		const { plugin, sdk } = await setupPlugin();
+
+		await sendPersistedAccountRequest(sdk, "session-explicit");
+
+		expect((await readPersistedAccountIndicator(plugin, "session-explicit")).variant).toBe(
+			expectedFullIndicator,
+		);
+		expect((await readPersistedAccountIndicator(plugin, "env-session")).variant).toBeUndefined();
+	});
+
+	it("falls back to CODEX_THREAD_ID in the transform hook when the message session is missing", async () => {
+		await enablePersistedFooter("full-email");
+		process.env.CODEX_THREAD_ID = "env-fallback";
+		const { plugin, sdk } = await setupPlugin();
+
+		await sendPersistedAccountRequest(sdk);
+
+		const output: Parameters<PluginType["experimental.chat.messages.transform"]>[1] = {
+			messages: [
+				{
+					info: {
+						role: "user",
+						model: { providerID: "openai", modelID: "gpt-5.1" },
+					},
+					parts: [],
+				},
+			],
+		};
+		await plugin["experimental.chat.messages.transform"]({}, output);
+
+		expect(
+			output.messages[0]?.info.model?.variant ?? output.messages[0]?.info.variant,
+		).toBe(expectedFullIndicator);
+	});
+
 	it("suppresses account-switch info toasts when the footer is enabled and refreshes the visible indicator", async () => {
 		await enablePersistedFooter("full-email");
 		mockStorage.accounts = [