fix(identity): use distinct org account ids in ambiguity check

Author: ndycode

index.ts

@@ -645,7 +645,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 						let newestNoAccountId: number | undefined;
 						let newestExactAccountId: number | undefined;
 						let newestAnyNonEmptyAccountId: number | undefined;
-						let nonEmptyAccountIdCount = 0;
+						const distinctNonEmptyAccountIds = new Set<string>();
 
 						for (const index of matches) {
 							const existing = accounts[index];
@@ -658,7 +658,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 										: index;
 								continue;
 							}
-							nonEmptyAccountIdCount += 1;
+							distinctNonEmptyAccountIds.add(existingAccountId);
 							newestAnyNonEmptyAccountId =
 								typeof newestAnyNonEmptyAccountId === "number"
 									? pickNewestAccountIndex(newestAnyNonEmptyAccountId, index)
@@ -677,7 +677,7 @@ export const OpenAIOAuthPlugin: Plugin = async ({ client }: PluginInput) => {
 						if (typeof newestNoAccountId === "number") {
 							return newestNoAccountId;
 						}
-						if (nonEmptyAccountIdCount === 1) {
+						if (distinctNonEmptyAccountIds.size === 1) {
 							return newestAnyNonEmptyAccountId;
 						}
 						return undefined;

test/index.test.ts

@@ -1965,7 +1965,7 @@ describe("OpenAIOAuthPlugin persistAccountPool", () => {
 		expect(mockStorage.accounts.some((account) => account.accountId === "token-personal")).toBe(true);
 	});
 
-	it("preserves org/no-org shared-refresh entries with different accountId values in pre-populated storage", async () => {
+	it("preserves org/no-org shared-refresh entries with different accountId values from a single login", async () => {
 		const accountsModule = await import("../lib/accounts.js");
 		const authModule = await import("../lib/auth/auth.js");