Harden shared-account regression coverage

Author: ndycode

lib/accounts.ts

@@ -194,7 +194,7 @@ export class AccountManager {
 	}
 
 	constructor(authFallback?: OAuthAuthDetails, stored?: AccountStorageV3 | null) {
-		const fallbackAccountId = extractAccountId(authFallback?.access);
+		const fallbackAccountId = extractAccountId(authFallback?.access)?.trim() || undefined;
 		const fallbackAccountEmail = sanitizeEmail(extractAccountEmail(authFallback?.access));
 
 		if (stored && stored.accounts.length > 0) {

test/accounts.test.ts

@@ -1229,6 +1229,42 @@ describe("AccountManager", () => {
       expect(account?.access).toBe(accessToken);
     });
 
+    it("trims fallback accountId before matching and persisting it", () => {
+      const now = Date.now();
+      const payload = {
+        "https://api.openai.com/auth": {
+          chatgpt_account_id: "  matching-account-id  ",
+        },
+      };
+      const accessToken = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
+
+      const stored = {
+        version: 3 as const,
+        activeIndex: 0,
+        accounts: [
+          {
+            refreshToken: "stored-token",
+            accountId: "matching-account-id",
+            addedAt: now,
+            lastUsed: now,
+          },
+        ],
+      };
+
+      const auth: OAuthAuthDetails = {
+        type: "oauth",
+        access: accessToken,
+        refresh: "new-refresh-token",
+        expires: now + 60_000,
+      };
+
+      const manager = new AccountManager(auth, stored);
+      expect(manager.getAccountCount()).toBe(1);
+      const account = manager.getCurrentAccount();
+      expect(account?.refreshToken).toBe("new-refresh-token");
+      expect(account?.accountId).toBe("matching-account-id");
+    });
+
     it("ignores malformed stored rows when checking shared accountId uniqueness for fallback matching", () => {
       const now = Date.now();
       const payload = {

test/index.test.ts

@@ -2067,6 +2067,11 @@ describe("OpenAIOAuthPlugin persistAccountPool", () => {
 		expect(
 			mockStorage.accounts.map((account) => account.refreshToken),
 		).toEqual(["refresh-a", "refresh-b", "refresh-c"]);
+		expect(mockStorage.accounts.map((account) => account.accountId)).toEqual([
+			"shared-workspace",
+			"shared-workspace",
+			"shared-workspace",
+		]);
 	});
 
 	it("serializes concurrent manual logins through the storage transaction queue", async () => {

test/oc-chatgpt-import-adapter.test.ts

@@ -401,6 +401,61 @@ describe("oc-chatgpt import adapter", () => {
 		);
 	});
 
+	it("keeps reversed-order shared-account imports distinct when only one destination email exists", () => {
+		const destination: AccountStorageV3 = {
+			version: 3,
+			activeIndex: 0,
+			accounts: [
+				{
+					accountId: "shared-account",
+					email: "alice@example.com",
+					refreshToken: "dest-alice",
+					addedAt: 10,
+					lastUsed: 10,
+				},
+			],
+		};
+
+		const source: AccountStorageV3 = {
+			version: 3,
+			activeIndex: 1,
+			accounts: [
+				{
+					accountId: "shared-account",
+					email: "bob@example.com",
+					refreshToken: "source-bob",
+					addedAt: 2,
+					lastUsed: 2,
+				},
+				{
+					accountId: "shared-account",
+					email: "alice@example.com",
+					refreshToken: "source-alice-older",
+					addedAt: 1,
+					lastUsed: 1,
+				},
+			],
+		};
+
+		const preview = previewOcChatgptImportMerge({ source, destination });
+
+		expect(preview.toUpdate).toHaveLength(0);
+		expect(preview.toAdd).toEqual([
+			{
+				accountId: "shared-account",
+				email: "bob@example.com",
+				refreshTokenLast4: "-bob",
+			},
+		]);
+		expect(preview.merged.accounts).toHaveLength(2);
+		expect(preview.merged.accounts.map((account) => account.email)).toEqual(
+			expect.arrayContaining(["alice@example.com", "bob@example.com"]),
+		);
+		expect(preview.merged.accounts.map((account) => account.refreshToken)).toEqual(
+			expect.arrayContaining(["dest-alice", "source-bob"]),
+		);
+	});
+
 	it("keeps newer destination metadata when a refresh-token fallback match is older than destination", () => {
 		const destination: AccountStorageV3 = {
 			version: 3,