test(accounts): reconcile behavioral expectations with canonical dedupe rules

Author: sdip15fa

CHANGELOG.md

@@ -21,6 +21,9 @@ all notable changes to this project. dates are ISO format (YYYY-MM-DD).
 
 ### fixed
 
+- **organization-scoped account preservation**: org-different variants sharing a refresh token now preserve distinct identity entries during storage collision resolution.
+- **no-org duplicate collapse alignment**: fallback no-org duplicates now collapse consistently across storage, authorize, and prune operations.
+- **active-index remap stability**: index remapping during collision pruning/dedupe maintains stable active-index selection after account deduplication.
 - **non-interactive command guidance**: optional-index commands provide explicit usage guidance when interactive menus are unavailable.
 - **doctor safe-fix edge path**: `codex-doctor fix` now reports a clear non-crashing message when no eligible account is available for auto-switch.
 - **first-time import flow**: `codex-import` no longer fails with `No accounts to export` when storage is empty; pre-import backup is skipped cleanly in zero-account setups.

test/accounts.test.ts

@@ -432,6 +432,8 @@ describe("AccountManager", () => {
   });
 
   describe("removeAccount", () => {
+    // Note: Tests in this block cover in-memory manager behavior.
+    // Canonical persistence dedupes no-org entries; org-different entries are preserved.
     it("removes an account and updates indices", () => {
       const now = Date.now();
       const stored = {
@@ -506,7 +508,8 @@ describe("AccountManager", () => {
       expect(manager.getCurrentAccount()).toBe(null);
     });
 
-    it("removes only targeted workspace when email/token are shared", () => {
+    it("removes only targeted workspace when email/token are shared (manager-level, no orgId)", () => {
+      // Note: In-memory manager can hold multiple entries; canonical dedupe would collapse no-org duplicates
       const now = Date.now();
       const stored = {
         version: 3 as const,
@@ -932,6 +935,8 @@ describe("AccountManager", () => {
   });
 
   describe("setActiveIndex", () => {
+    // Note: Tests in this block cover in-memory manager behavior.
+    // Canonical persistence dedupes no-org entries; org-different entries are preserved.
     it("sets active index and returns account", () => {
       const now = Date.now();
       const stored = {
@@ -967,7 +972,8 @@ describe("AccountManager", () => {
       expect(manager.setActiveIndex(Infinity)).toBeNull();
     });
 
-    it("switches between distinct workspace accounts sharing email and token", () => {
+    it("switches between distinct workspace accounts sharing email and token (manager-level, no orgId)", () => {
+      // Note: In-memory manager can hold multiple entries; canonical dedupe would collapse no-org duplicates
       const now = Date.now();
       const stored = {
         version: 3 as const,