test(storage,index): codify org-preserve and no-org collapse identity rules

Author: sdip15fa

test/index.test.ts

@@ -2064,7 +2064,7 @@ describe("OpenAIOAuthPlugin persistAccountPool", () => {
 		expect(mockStorage.accounts[0]?.accessToken).toBe("access-no-org-update");
 	});
 
-	it("does not merge ambiguous org-scoped matches when organization metadata is missing", async () => {
+	it("preserves org-scoped variants when organizationId differs despite shared account/refresh context", async () => {
 		const accountsModule = await import("../lib/accounts.js");
 		const authModule = await import("../lib/auth/auth.js");
 
@@ -2113,10 +2113,16 @@ describe("OpenAIOAuthPlugin persistAccountPool", () => {
 		expect(mockStorage.accounts).toHaveLength(2);
 		const orgScopedEntries = mockStorage.accounts.filter((account) => account.organizationId);
 		expect(orgScopedEntries).toHaveLength(2);
+		expect(orgScopedEntries.map((account) => account.organizationId).sort()).toEqual([
+			"org-a",
+			"org-b",
+		]);
 		expect(orgScopedEntries.some((account) => account.accessToken === "access-ambiguous")).toBe(true);
+		expect(mockStorage.activeIndex).toBe(0);
+		expect(mockStorage.activeIndexByFamily).toEqual({});
 	});
 
-	it("remaps active indices to merged org account when fallback variant is pruned", async () => {
+	it("allows no-org fallback collision collapse and safely remaps active indices", async () => {
 		const accountsModule = await import("../lib/accounts.js");
 		const authModule = await import("../lib/auth/auth.js");
 
@@ -2180,9 +2186,9 @@ describe("OpenAIOAuthPlugin persistAccountPool", () => {
 		expect(mockStorage.accounts).toHaveLength(3);
 		expect(mockStorage.accounts.some((account) => account.accountId === "token-shared")).toBe(false);
 		expect(mockStorage.accounts[1]?.accountId).toBe("org-shared");
+		expect(mockStorage.accounts[1]?.organizationId).toBe("org-keep");
 		expect(mockStorage.activeIndex).toBe(1);
-		expect(mockStorage.activeIndexByFamily.codex).toBe(1);
-		expect(mockStorage.activeIndexByFamily["gpt-5.1"]).toBe(1);
+		expect(mockStorage.activeIndexByFamily).toEqual({ codex: 1, "gpt-5.1": 1 });
 	});
 
 	it("keeps latest rate-limit reset windows when collapsing refresh-token duplicates", async () => {

test/storage.test.ts

@@ -202,10 +202,11 @@ describe("storage", () => {
       expect(basename(path)).toMatch(/^unsafe-name-\d{8}-\d{9}-[a-f0-9]{6}\.json$/);
     });
 
-    it("collapses same-refresh imports when accountId differs", async () => {
+    it("collapses same-refresh no-organization imports when accountId differs (legacy fallback)", async () => {
       await saveAccounts({
         version: 3,
         activeIndex: 0,
+        activeIndexByFamily: { codex: 0, "gpt-5.1": 0 },
         accounts: [
           {
             accountId: "workspace-a",
@@ -239,6 +240,8 @@ describe("storage", () => {
       const loaded = await loadAccounts();
       expect(loaded?.accounts).toHaveLength(1);
       expect(loaded?.accounts[0]?.accountId).toBe("workspace-b");
+      expect(loaded?.activeIndex).toBe(0);
+      expect(loaded?.activeIndexByFamily?.codex).toBe(0);
     });
 
     it("collapses same-organization records to newest during import and remaps active keys", async () => {
@@ -294,9 +297,10 @@ describe("storage", () => {
       expect(org1?.refreshToken).toBe("refresh-new");
       expect(loaded?.activeIndex).toBe(1);
       expect(loaded?.activeIndexByFamily?.codex).toBe(1);
+      expect(loaded?.activeIndexByFamily?.["gpt-5.1"]).toBe(1);
     });
 
-    it("preserves same refresh token across different organizations during import", async () => {
+    it("preserves same refresh token across different organizationId values during import", async () => {
       await fs.writeFile(
         exportPath,
         JSON.stringify({
@@ -325,6 +329,7 @@ describe("storage", () => {
 
       const loaded = await loadAccounts();
       expect(loaded?.accounts).toHaveLength(2);
+      expect(loaded?.accounts.every((account) => account.refreshToken === "shared-refresh")).toBe(true);
       const organizationIds = loaded?.accounts
         .map((account) => account.organizationId)
         .filter((organizationId): organizationId is string => typeof organizationId === "string");