Merge pull request #19 from zhujian0805/main

Fix profile selection to include all profiles from toml config

Author: zhujian0805

code_assistant_manager/tools/codex.py

@@ -49,6 +49,28 @@ def _write_profile(
 
         return config_path
 
+    def _read_existing_profiles(self, config_path: Path) -> list[str]:
+        """Read existing profiles from Codex config.toml."""
+        try:
+            import tomllib
+        except ImportError:
+            try:
+                import tomli as tomllib
+            except ImportError:
+                return []
+
+        if not config_path.exists():
+            return []
+
+        try:
+            with open(config_path, "rb") as f:
+                config = tomllib.load(f)
+            profiles = list(config.get("profiles", {}).keys())
+            return profiles
+        except Exception as e:
+            logger.debug(f"Failed to read existing profiles from {config_path}: {e}")
+            return []
+
     def run(self, args: List[str] = None) -> int:
         args = args or []
 
@@ -86,6 +108,9 @@ def run(self, args: List[str] = None) -> int:
         if not endpoints:
             return self._handle_error("No endpoints configured for codex")
 
+        config_path = Path.home() / ".codex" / "config.toml"
+        existing_profiles = self._read_existing_profiles(config_path)
+
         configured_profiles: list[str] = []
         profile_env: dict[str, tuple[str, str]] = {}
 
@@ -140,10 +165,12 @@ def run(self, args: List[str] = None) -> int:
             if endpoint_config.get("actual_api_key"):
                 profile_env[profile_name] = (env_key, endpoint_config.get("actual_api_key"))
 
-        if not configured_profiles:
+        all_profiles = sorted(set(existing_profiles + configured_profiles))
+        
+        if not all_profiles:
             return 0
 
-        profiles = sorted(set(configured_profiles))
+        profiles = all_profiles
         if len(profiles) == 1:
             selected_profile = profiles[0]
         elif os.environ.get("CODE_ASSISTANT_MANAGER_NONINTERACTIVE") == "1":

tests/unit/test_codex_tool_multi_provider.py

@@ -49,27 +49,88 @@ def _fetch_models(name: str, endpoint_config, use_cache_if_available=False):
         },
     ):
         with patch.object(tool, "_ensure_tool_installed", return_value=True):
-            # 1) pick model for ep1 (idx 0)
-            # 2) pick model for ep2 (idx 0)
-            # 3) pick profile to run => select second (idx 1) => m2
-            menu_returns = [(True, 0), (True, 0), (True, 1)]
+            with patch.object(tool, "_read_existing_profiles", return_value=[]):
+                # 1) pick model for ep1 (idx 0)
+                # 2) pick model for ep2 (idx 0)
+                # 3) pick profile to run => select second (idx 1) => m2
+                menu_returns = [(True, 0), (True, 0), (True, 1)]
 
-            with patch(
-                "code_assistant_manager.menu.menus.display_centered_menu",
-                side_effect=menu_returns,
-            ):
+                with patch(
+                    "code_assistant_manager.menu.menus.display_centered_menu",
+                    side_effect=menu_returns,
+                ):
 
-                captured = {}
+                    captured = {}
 
-                def _run(cmd, env, *_args, **_kwargs):
-                    captured["cmd"] = cmd
-                    captured["env"] = env
-                    return 0
+                    def _run(cmd, env, *_args, **_kwargs):
+                        captured["cmd"] = cmd
+                        captured["env"] = env
+                        return 0
 
-                with patch.object(tool, "_run_tool_with_env", side_effect=_run):
-                    rc = tool.run([])
+                    with patch.object(tool, "_run_tool_with_env", side_effect=_run):
+                        rc = tool.run([])
 
     assert rc == 0
     assert captured["cmd"][:3] == ["codex", "-p", "m2"]
     assert captured["env"].get("KEY2") == "k2"
     assert "NODE_TLS_REJECT_UNAUTHORIZED" in captured["env"]
+
+
+def test_codex_tool_includes_existing_profiles_from_toml(monkeypatch):
+    """Test that profile selection menu includes both existing and newly configured profiles."""
+    monkeypatch.delenv("KEY1", raising=False)
+
+    cfg = MagicMock()
+    cfg.get_sections.return_value = ["ep1"]
+
+    def _get_ep_cfg(name: str):
+        return {"api_key_env": "KEY1"}
+
+    cfg.get_endpoint_config.side_effect = _get_ep_cfg
+
+    tool = CodexTool(cfg)
+    tool.endpoint_manager = MagicMock()
+    tool.endpoint_manager._is_client_supported.return_value = True
+    tool.endpoint_manager.get_endpoint_config.return_value = (
+        True,
+        {"endpoint": "https://e1", "actual_api_key": "k1"},
+    )
+    tool.endpoint_manager.fetch_models.return_value = (True, ["new-model"])
+
+    with patch(
+        "code_assistant_manager.tools.codex.upsert_codex_profile",
+        return_value={"changed": True, "provider_existed": False, "profile_existed": False, "project_existed": False},
+    ):
+        with patch.object(tool, "_ensure_tool_installed", return_value=True):
+            with patch.object(tool, "_read_existing_profiles", return_value=["old-profile-1", "old-profile-2"]):
+                # 1) pick model for ep1 (idx 0) -> new-model
+                # 2) pick profile to run => old profiles + new profile should be shown
+                #    profiles should be: ["new-model", "old-profile-1", "old-profile-2"] (sorted)
+                #    select index 1 -> "old-profile-1"
+                menu_calls = []
+
+                def _mock_menu(prompt, options, cancel_text=None):
+                    menu_calls.append({"prompt": prompt, "options": options, "cancel_text": cancel_text})
+                    if len(menu_calls) == 1:
+                        return (True, 0)  # Select new-model
+                    else:
+                        return (True, 1)  # Select old-profile-1
+
+                with patch("code_assistant_manager.menu.menus.display_centered_menu", side_effect=_mock_menu):
+                    captured = {}
+
+                    def _run(cmd, env, *_args, **_kwargs):
+                        captured["cmd"] = cmd
+                        return 0
+
+                    with patch.object(tool, "_run_tool_with_env", side_effect=_run):
+                        rc = tool.run([])
+
+    assert rc == 0
+    assert len(menu_calls) == 2
+    # Check that profile selection includes all profiles
+    profile_menu = menu_calls[1]
+    assert profile_menu["prompt"] == "Select Codex profile to run:"
+    assert sorted(profile_menu["options"]) == ["new-model", "old-profile-1", "old-profile-2"]
+    # Verify the selected profile
+    assert captured["cmd"][:3] == ["codex", "-p", "old-profile-1"]