fix: reorganize UI helper imports and maintain backward compatibility

Author: jzhu

code_assistant_manager/tools/__init__.py

@@ -2,7 +2,7 @@
 
 import subprocess
 from pathlib import Path
-from typing import Dict, Type
+from typing import Dict, Optional, Tuple, Type
 
 from ..config import ConfigManager
 from ..endpoints import EndpointManager
@@ -36,6 +36,26 @@
 # Backwards-compat: expose UI helpers that used to be available from code_assistant_manager.tools
 
 # Expose model selector functions
+from ..menu.menus import display_centered_menu, select_two_models  # noqa: F401
+
+
+def select_model(
+    models: list[str], prompt: str = "Select a model:"
+) -> Tuple[bool, Optional[str]]:
+    """Backward-compatible wrapper for model selection.
+
+    Args:
+        models: List of available models
+        prompt: Display prompt for selection
+
+    Returns:
+        Tuple of (success, selected_model)
+    """
+    success, idx = display_centered_menu(prompt, models, "Cancel")
+    if success and idx is not None:
+        return True, models[idx]
+    return False, None
+
 
 # Backwards-compatible exports: expose tool classes at package level
 from .claude import ClaudeTool  # noqa: F401
@@ -45,18 +65,18 @@
 from .crush import CrushTool  # noqa: F401
 from .cursor import CursorTool  # noqa: F401
 from .droid import DroidTool  # noqa: F401
-from .gemini import GeminiTool  # noqa: F401
-from .iflow import IfLowTool  # noqa: F401
-from .neovate import NeovateTool  # noqa: F401
-from .qodercli import QoderCLITool  # noqa: F401
-from .qwen import QwenTool  # noqa: F401
-from .zed import ZedTool  # noqa: F401
 
 # Expose endpoint display functions
 from .endpoint_display import (  # noqa: F401
     display_all_tool_endpoints,
     display_tool_endpoints,
 )
+from .gemini import GeminiTool  # noqa: F401
+from .iflow import IfLowTool  # noqa: F401
+from .neovate import NeovateTool  # noqa: F401
+from .qodercli import QoderCLITool  # noqa: F401
+from .qwen import QwenTool  # noqa: F401
+from .zed import ZedTool  # noqa: F401
 
 # Backwards-compat: expose commonly patched names used in tests
 # so tests that patch code_assistant_manager.tools.<name> continue to work.

code_assistant_manager/ui.py

@@ -5,6 +5,10 @@
 import subprocess
 from typing import Tuple
 
+from .menu.base import Colors
+from .menu.menus import display_centered_menu, select_two_models
+from .tools import select_model
+
 
 def get_terminal_size() -> Tuple[int, int]:
     """Get terminal width and height."""

tests/test_ui.py

@@ -153,7 +153,7 @@ def test_display_centered_menu_many_items(self, mock_clear, mock_input):
 class TestSelectModel:
     """Test select_model function."""
 
-    @patch("code_assistant_manager.menu.menus.display_centered_menu")
+    @patch("code_assistant_manager.tools.display_centered_menu")
     def test_select_model_success(self, mock_menu):
         """Test successful model selection."""
         mock_menu.return_value = (True, 1)
@@ -162,7 +162,7 @@ def test_select_model_success(self, mock_menu):
         assert success is True
         assert model == "gpt-3.5"
 
-    @patch("code_assistant_manager.menu.menus.display_centered_menu")
+    @patch("code_assistant_manager.tools.display_centered_menu")
     def test_select_model_cancelled(self, mock_menu):
         """Test cancelled model selection."""
         mock_menu.return_value = (False, None)
@@ -171,7 +171,7 @@ def test_select_model_cancelled(self, mock_menu):
         assert success is False
         assert model is None
 
-    @patch("code_assistant_manager.menu.menus.display_centered_menu")
+    @patch("code_assistant_manager.tools.display_centered_menu")
     def test_select_model_custom_prompt(self, mock_menu):
         """Test model selection with custom prompt."""
         mock_menu.return_value = (True, 0)