From 0bab33294d5606e643ca0edfb89db6035f25fd74 Mon Sep 17 00:00:00 2001
From: ThWink <112550363+ThWink@users.noreply.github.com>
Date: Thu, 4 Jun 2026 10:49:50 +0800
Subject: [PATCH] fix: distinguish accounts by email and plan

---
 codex_switcher.py        | 56 +++++++++++++++++++++++++++++++++-------
 test_account_identity.py | 37 ++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100644 test_account_identity.py

diff --git a/codex_switcher.py b/codex_switcher.py
index e39ab69..3cb29b6 100755
--- a/codex_switcher.py
+++ b/codex_switcher.py
@@ -1166,14 +1166,47 @@ def restore_auth_file(auth_path: Path, backup_bytes: Optional[bytes]) -> bool:
     except Exception:
         return False
 
-def find_saved_account_path(record_key: str = '', email: str = '') -> Optional[Path]:
-    """按账号身份或邮箱查找已存档文件"""
+def normalize_identity_value(value: str) -> str:
+    """Normalize an account identity component for comparisons."""
+    normalized = str(value or '').strip().lower()
+    if normalized in ('', 'unknown', 'n/a', 'none', '?'):
+        return ''
+    return normalized
+
+def email_plan_identity(info: dict) -> Tuple[str, str]:
+    """Return the email+plan identity tuple, or empty values if incomplete."""
+    return (
+        normalize_identity_value(info.get('email', '')),
+        normalize_identity_value(info.get('plan_type', '')),
+    )
+
+def same_account_identity(existing: dict, candidate: dict) -> bool:
+    """Compare account identity using record_key first, then email+plan."""
+    existing_record_key = normalize_identity_value(existing.get('record_key', ''))
+    candidate_record_key = normalize_identity_value(candidate.get('record_key', ''))
+    if existing_record_key and candidate_record_key and existing_record_key == candidate_record_key:
+        return True
+
+    existing_email, existing_plan = email_plan_identity(existing)
+    candidate_email, candidate_plan = email_plan_identity(candidate)
+    return bool(
+        existing_email and existing_plan and
+        candidate_email and candidate_plan and
+        existing_email == candidate_email and
+        existing_plan == candidate_plan
+    )
+
+def find_saved_account_path(record_key: str = '', email: str = '', plan_type: str = '') -> Optional[Path]:
+    """按账号身份查找已存档文件"""
     accounts_dir = get_accounts_dir()
     if not accounts_dir.exists():
         return None
 
-    email_lower = email.lower() if email else ''
-    fallback_path = None
+    candidate = {
+        'record_key': record_key,
+        'email': email,
+        'plan_type': plan_type,
+    }
     for auth_file in sorted(accounts_dir.glob('auth_*.json')):
         auth_data = load_auth_data_from_path(auth_file)
         if not auth_data:
@@ -1181,21 +1214,24 @@ def find_saved_account_path(record_key: str = '', email: str = '') -> Optional[P
         info = get_account_info(auth_data, str(auth_file))
         if not info:
             continue
-        if record_key and info.get('record_key') == record_key:
+        if same_account_identity(info, candidate):
             return auth_file
-        if email_lower and info.get('email', '').lower() == email_lower and fallback_path is None:
-            fallback_path = auth_file
 
-    return fallback_path
+    return None
 
 def upsert_current_auth_archive(account_info: dict) -> Tuple[bool, Optional[Path], str]:
     """按账号身份更新或创建当前 auth 存档"""
     record_key = account_info.get('record_key', '')
     email = account_info.get('email', '')
-    existing_path = find_saved_account_path(record_key, email)
+    plan_type = account_info.get('plan_type', '')
+    existing_path = find_saved_account_path(record_key, email, plan_type)
+    save_name = email or 'account'
+    normalized_plan = normalize_identity_value(plan_type)
+    if normalized_plan:
+        save_name = f"{save_name}_{normalized_plan}"
     archive_path = save_auth_file_snapshot(
         get_auth_file(),
-        email or 'account',
+        save_name,
         replace_path=existing_path,
         allow_timestamp_suffix=existing_path is None,
     )
diff --git a/test_account_identity.py b/test_account_identity.py
new file mode 100644
index 0000000..06841bf
--- /dev/null
+++ b/test_account_identity.py
@@ -0,0 +1,37 @@
+import unittest
+
+import codex_switcher
+
+
+class AccountIdentityTests(unittest.TestCase):
+    def test_same_email_different_plan_is_not_same_identity(self):
+        existing = {
+            "record_key": "",
+            "email": "user@example.com",
+            "plan_type": "plus",
+        }
+        candidate = {
+            "record_key": "",
+            "email": "USER@example.com",
+            "plan_type": "team",
+        }
+
+        self.assertFalse(codex_switcher.same_account_identity(existing, candidate))
+
+    def test_same_email_same_plan_is_same_identity(self):
+        existing = {
+            "record_key": "",
+            "email": "user@example.com",
+            "plan_type": "plus",
+        }
+        candidate = {
+            "record_key": "",
+            "email": "USER@example.com",
+            "plan_type": "PLUS",
+        }
+
+        self.assertTrue(codex_switcher.same_account_identity(existing, candidate))
+
+
+if __name__ == "__main__":
+    unittest.main()