feat: Codex account_name 透传并优化池列表 OAuth 标识与额度重置倒计时展示

(cherry picked from commit 1b9176fc4a)

tests/core/test_provider_oauth_utils_codex.py

@@ -1,10 +1,15 @@
+# pyright: reportMissingImports=false
+
 from __future__ import annotations
 
 import json
+from unittest.mock import AsyncMock
 
 import jwt
+import pytest
 
-from src.core.provider_oauth_utils import parse_codex_id_token
+from src.core import provider_oauth_utils as module
+from src.core.provider_oauth_utils import enrich_auth_config, parse_codex_id_token
 
 
 def _encode_unsigned_jwt(payload: dict[str, object]) -> str:
@@ -21,7 +26,9 @@ def test_parse_codex_id_token_extracts_auth_claim_fields() -> None:
                 "chatgpt_account_user_id": "user-1__acc-1",
                 "chatgpt_plan_type": "team",
                 "chatgpt_user_id": "user-1",
-                "organizations": [{"id": "org-1", "title": "Personal", "is_default": True}],
+                "organizations": [
+                    {"id": "org-1", "title": "Personal", "is_default": True}
+                ],
             },
         }
     )
@@ -72,3 +79,45 @@ def test_parse_codex_id_token_accepts_dict_payload() -> None:
         "plan_type": "enterprise",
         "user_id": "user-3",
     }
+
+
+@pytest.mark.asyncio
+async def test_enrich_auth_config_codex_adds_current_account_name() -> None:
+    from src.services.provider.envelope import ensure_providers_bootstrapped
+
+    access_token = _encode_unsigned_jwt(
+        {
+            "email": "u@example.com",
+            "https://api.openai.com/auth": {
+                "chatgpt_account_id": "acc-1",
+                "chatgpt_account_user_id": "user-1__acc-1",
+                "chatgpt_plan_type": "team",
+                "chatgpt_user_id": "user-1",
+            },
+        }
+    )
+
+    ensure_providers_bootstrapped()
+
+    fetch_account_name = AsyncMock(return_value="Workspace Alpha")
+    original = module.fetch_openai_account_name
+    module.fetch_openai_account_name = fetch_account_name
+    try:
+        out = await enrich_auth_config(
+            provider_type="codex",
+            auth_config={},
+            token_response={"access_token": access_token},
+            access_token=access_token,
+            proxy_config=None,
+        )
+    finally:
+        module.fetch_openai_account_name = original
+
+    fetch_account_name.assert_awaited_once_with(
+        access_token,
+        "acc-1",
+        proxy_config=None,
+        timeout_seconds=10.0,
+    )
+    assert out["account_id"] == "acc-1"
+    assert out["account_name"] == "Workspace Alpha"