fix: address PR review comments

- Remove unused CERTIFICATE_PATH and DEFAULT_CONFIG_DIR import in tunnel.py
- Fix initialization order in GlobalConfigManager (ensure_dirs before loading)
- Move Path import to top-level in config.py
- Add documentation for architectural decisions in platform.py
- Clean up test imports in test_profile.py and test_qwen_cli.py
- Remove unnecessary mock in test_qwen_cli_manager_is_client_installed_windows

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: Kirill Turanskiy

src/mcpm/core/tunnel.py

@@ -10,7 +10,6 @@
 
 import httpx
 
-from mcpm.utils.config import DEFAULT_CONFIG_DIR
 from mcpm.utils.platform import get_frpc_directory
 
 VERSION = "0.3"
@@ -53,8 +52,6 @@
 TUNNEL_TIMEOUT_SECONDS = 30
 TUNNEL_ERROR_MESSAGE = "Could not create share URL. Please check the appended log from frpc for more information:"
 
-CERTIFICATE_PATH = DEFAULT_CONFIG_DIR / "certificate.pem"
-
 
 class Tunnel:
     def __init__(

src/mcpm/global_config.py

@@ -34,9 +34,9 @@ def __init__(
         self.config_path = Path(config_path)
         self.metadata_path = Path(metadata_path)
         self.config_dir = self.config_path.parent
+        self._ensure_dirs()
         self._servers: Dict[str, ServerConfig] = self._load_servers()
         self._profile_metadata: Dict[str, ProfileMetadata] = self._load_profile_metadata()
-        self._ensure_dirs()
 
     def _ensure_dirs(self) -> None:
         """Ensure all configuration directories exist"""

src/mcpm/utils/config.py

@@ -4,6 +4,7 @@
 
 import json
 import logging
+from pathlib import Path
 from typing import Any, Dict
 
 from mcpm.utils.platform import get_config_directory
@@ -30,8 +31,6 @@ class ConfigManager:
     """
 
     def __init__(self, config_path=DEFAULT_CONFIG_FILE, auth_path=DEFAULT_AUTH_FILE):
-        from pathlib import Path
-
         # Normalize paths to Path objects for consistent handling
         self.config_path = Path(config_path)
         self.auth_path = Path(auth_path)

src/mcpm/utils/platform.py

@@ -80,6 +80,10 @@ def get_config_directory(app_name: str = "mcpm") -> Path:
     Uses ~/.config/mcpm on all platforms for consistency.
     Path is returned as a Path object with correct separators for the current OS.
 
+    Note: This intentionally differs from get_pid_directory() and get_frpc_directory()
+    which use platform-specific paths. The config directory uses a unified location
+    to simplify user configuration and documentation across all platforms.
+
     Args:
         app_name: The name of the application, used in the path
 
@@ -96,6 +100,10 @@ def get_data_directory(app_name: str = "mcpm") -> Path:
     Uses ~/.mcpm on all platforms for consistency (stores server metadata, etc.).
     Path is returned as a Path object with correct separators for the current OS.
 
+    Note: This intentionally differs from get_pid_directory() and get_frpc_directory()
+    which use platform-specific paths. The data directory uses a unified location
+    to simplify user configuration and documentation across all platforms.
+
     Args:
         app_name: The name of the application, used in the path
 

tests/test_clients/test_qwen_cli.py

@@ -50,23 +50,23 @@ def test_qwen_cli_manager_is_client_installed():
 
 
 def test_qwen_cli_manager_is_client_installed_windows():
-    """Test QwenCliManager is_client_installed method on Windows
+    """Test QwenCliManager is_client_installed method
 
     Note: shutil.which() handles Windows PATHEXT automatically, so we always
     search for "qwen" without extension. This finds qwen.cmd, qwen.ps1, qwen.exe, etc.
+    The test is OS-agnostic as shutil.which handles platform differences.
     """
     manager = QwenCliManager()
 
-    with patch.object(manager, "_system", "Windows"):
-        # Mock shutil.which to return a path (simulating installed client via npm .cmd)
-        with patch("shutil.which", return_value="C:\\Users\\user\\AppData\\Roaming\\npm\\qwen.cmd") as mock_which:
-            assert manager.is_client_installed() is True
-            mock_which.assert_called_with("qwen")  # No .exe - shutil.which handles PATHEXT
+    # Mock shutil.which to return a path (simulating installed client via npm .cmd)
+    with patch("shutil.which", return_value="C:\\Users\\user\\AppData\\Roaming\\npm\\qwen.cmd") as mock_which:
+        assert manager.is_client_installed() is True
+        mock_which.assert_called_with("qwen")  # No .exe - shutil.which handles PATHEXT
 
-        # Mock shutil.which to return None (simulating uninstalled client)
-        with patch("shutil.which", return_value=None) as mock_which:
-            assert manager.is_client_installed() is False
-            mock_which.assert_called_with("qwen")
+    # Mock shutil.which to return None (simulating uninstalled client)
+    with patch("shutil.which", return_value=None) as mock_which:
+        assert manager.is_client_installed() is False
+        mock_which.assert_called_with("qwen")
 
 
 def test_qwen_cli_manager_get_empty_config_structure():

tests/test_profile.py

@@ -5,12 +5,14 @@
 import json
 import os
 import tempfile
+from pathlib import Path
 
 import pytest
 
-from mcpm.core.schema import STDIOServerConfig
+from mcpm.core.schema import ProfileMetadata, STDIOServerConfig
 from mcpm.global_config import GlobalConfigManager
 from mcpm.profile.profile_config import ProfileConfigManager
+from mcpm.utils.platform import get_config_directory
 
 
 @pytest.fixture
@@ -57,17 +59,13 @@ def profile_manager_with_legacy(temp_dirs):
 
 def test_profile_manager_init_default_path():
     """Test that the profile manager initializes with default path"""
-    from mcpm.utils.platform import get_config_directory
-
     manager = ProfileConfigManager()
     expected_path = get_config_directory() / "profiles.json"
     assert manager.profile_path == expected_path
 
 
 def test_profile_manager_init_custom_path(profile_manager_clean, temp_dirs):
     """Test that the profile manager initializes with a custom path"""
-    from pathlib import Path
-
     temp_dir, servers_path, metadata_path, legacy_path = temp_dirs
     manager = profile_manager_clean
     assert manager.profile_path == Path(legacy_path)
@@ -341,8 +339,6 @@ def test_profile_metadata(profile_manager_clean):
     assert metadata.api_key is None
 
     # Update metadata
-    from mcpm.core.schema import ProfileMetadata
-
     new_metadata = ProfileMetadata(name="api_profile", api_key="sk-test-123", description="Test profile")
     manager.update_profile_metadata(new_metadata)