test(cli): update for new cli architecture

test(cli): update test_mcp_cli_package_management mock paths for new architecture

test(cli): update test_mcp_cli_discovery_listing mock paths for new architecture

test(cli): update test_mcp_cli_direct_management for new architecture

- Update import paths from hatch.cli_hatch to hatch.cli modules
- Fix handler calls to use args: Namespace signature instead of individual parameters
- Add env_manager attribute to test Namespace objects where required
- Fix attribute names (host_name vs host) for remove host handlers
- Update mock paths to new module locations
- All 21 tests now passing

test(cli): update test_mcp_cli_backup_management for new architecture

M1.8.1: Update backup management tests for handler-based architecture

Changes:
- Update mock paths from hatch.cli_hatch to hatch.cli.cli_mcp
- Update argument parsing tests to use assert_called_once()
- Patch MCPHostConfigBackupManager at source module level
- Patch request_confirmation at hatch.cli.cli_utils
- Import MCPHostConfigBackupManager at module level for patching

All 14 backup management tests now pass.

test(cli): update remaining test files for handler-based architecture

M1.8.1: Complete test updates for new CLI architecture

Files updated:
- tests/cli_test_utils.py: Enhanced helper functions for Namespace creation
- tests/test_mcp_cli_host_config_integration.py: Updated mock paths and Namespace calls
- tests/test_mcp_cli_partial_updates.py: Updated for new handler signatures
- tests/test_mcp_cli_all_host_specific_args.py: Updated mock paths
- tests/regression/test_mcp_kiro_cli_integration.py: Updated for cli_mcp module

All 310 CLI tests now pass.

Author: LittleCoinCoin

tests/cli_test_utils.py

@@ -5,6 +5,9 @@
 
 These utilities reduce boilerplate in test files and ensure consistent
 test patterns across the CLI test suite.
+
+IMPORTANT: The attribute names in create_mcp_configure_args MUST match
+the exact names expected by handle_mcp_configure in hatch/cli/cli_mcp.py.
 """
 
 import sys
@@ -20,98 +23,196 @@
 def create_mcp_configure_args(
     host: str = "claude-desktop",
     server_name: str = "test-server",
-    command: Optional[str] = "python",
+    server_command: Optional[str] = "python",
     args: Optional[List[str]] = None,
-    env: Optional[List[str]] = None,
+    env_var: Optional[List[str]] = None,
     url: Optional[str] = None,
     header: Optional[List[str]] = None,
-    http_url: Optional[str] = None,
-    disabled: bool = False,
     timeout: Optional[int] = None,
+    trust: bool = False,
+    cwd: Optional[str] = None,
+    env_file: Optional[str] = None,
+    http_url: Optional[str] = None,
     include_tools: Optional[List[str]] = None,
     exclude_tools: Optional[List[str]] = None,
-    inputs: Optional[List[str]] = None,
+    input: Optional[List[str]] = None,
+    disabled: Optional[bool] = None,
     auto_approve_tools: Optional[List[str]] = None,
     disable_tools: Optional[List[str]] = None,
+    env_vars: Optional[List[str]] = None,
+    startup_timeout: Optional[int] = None,
+    tool_timeout: Optional[int] = None,
     enabled: Optional[bool] = None,
-    roots: Optional[List[str]] = None,
-    transport: Optional[str] = None,
-    transport_options: Optional[List[str]] = None,
-    env_file: Optional[str] = None,
-    working_dir: Optional[str] = None,
-    shell: Optional[bool] = None,
-    type_field: Optional[str] = None,
-    scope: Optional[str] = None,
+    bearer_token_env_var: Optional[str] = None,
+    env_header: Optional[List[str]] = None,
     no_backup: bool = False,
     dry_run: bool = False,
     auto_approve: bool = False,
+    _use_default_args: bool = True,
 ) -> Namespace:
     """Create a Namespace object for handle_mcp_configure testing.
 
     This helper creates a properly structured Namespace object that matches
     the expected arguments for handle_mcp_configure, making tests more
     readable and maintainable.
 
+    IMPORTANT: Attribute names MUST match those in handle_mcp_configure:
+    - server_command (not command)
+    - env_var (not env)
+    - input (not inputs)
+
     Args:
         host: Target MCP host (e.g., 'claude-desktop', 'cursor', 'vscode')
         server_name: Name of the MCP server to configure
-        command: Command to run for local servers
-        args: Arguments for the command
-        env: Environment variables in KEY=VALUE format
+        server_command: Command to run for local servers
+        args: Arguments for the command (defaults to ['server.py'] for local servers)
+        env_var: Environment variables in KEY=VALUE format
         url: URL for SSE remote servers
         header: HTTP headers in KEY=VALUE format
-        http_url: URL for HTTP remote servers (Gemini only)
-        disabled: Whether the server should be disabled
         timeout: Server timeout in seconds
+        trust: Trust the server (Cursor)
+        cwd: Working directory
+        env_file: Environment file path
+        http_url: URL for HTTP remote servers (Gemini only)
         include_tools: Tools to include (Gemini)
         exclude_tools: Tools to exclude (Gemini)
-        inputs: VSCode input configurations
+        input: VSCode input configurations
+        disabled: Whether the server should be disabled
         auto_approve_tools: Tools to auto-approve (Kiro)
         disable_tools: Tools to disable (Kiro)
-        enabled: Whether server is enabled (Codex)
-        roots: Root directories (Codex)
-        transport: Transport type (Codex)
-        transport_options: Transport options (Codex)
-        env_file: Environment file path (Codex)
-        working_dir: Working directory (Codex)
-        shell: Use shell execution (Codex)
-        type_field: Server type field
-        scope: Configuration scope
+        env_vars: Additional environment variables
+        startup_timeout: Startup timeout
+        tool_timeout: Tool execution timeout
+        enabled: Whether server is enabled
+        bearer_token_env_var: Bearer token environment variable
+        env_header: Environment headers
         no_backup: Disable backup creation
         dry_run: Preview changes without applying
         auto_approve: Skip confirmation prompts
+        _use_default_args: If True and args is None and server_command is set, use default args
 
     Returns:
         Namespace object with all arguments set
     """
-    if args is None:
+    # Only use default args for local servers (when command is set)
+    if args is None and server_command is not None and _use_default_args:
         args = ["server.py"]
 
     return Namespace(
         host=host,
         server_name=server_name,
-        command=command,
+        server_command=server_command,
         args=args,
-        env=env,
+        env_var=env_var,
         url=url,
         header=header,
-        http_url=http_url,
-        disabled=disabled,
         timeout=timeout,
+        trust=trust,
+        cwd=cwd,
+        env_file=env_file,
+        http_url=http_url,
         include_tools=include_tools,
         exclude_tools=exclude_tools,
-        inputs=inputs,
+        input=input,
+        disabled=disabled,
         auto_approve_tools=auto_approve_tools,
         disable_tools=disable_tools,
+        env_vars=env_vars,
+        startup_timeout=startup_timeout,
+        tool_timeout=tool_timeout,
         enabled=enabled,
-        roots=roots,
-        transport=transport,
-        transport_options=transport_options,
-        env_file=env_file,
-        working_dir=working_dir,
-        shell=shell,
-        type_field=type_field,
-        scope=scope,
+        bearer_token_env_var=bearer_token_env_var,
+        env_header=env_header,
+        no_backup=no_backup,
+        dry_run=dry_run,
+        auto_approve=auto_approve,
+    )
+
+
+def create_mcp_remove_args(
+    host: str = "claude-desktop",
+    server_name: str = "test-server",
+    no_backup: bool = False,
+    dry_run: bool = False,
+    auto_approve: bool = False,
+) -> Namespace:
+    """Create a Namespace object for handle_mcp_remove testing.
+
+    Args:
+        host: Target MCP host
+        server_name: Name of the MCP server to remove
+        no_backup: Disable backup creation
+        dry_run: Preview changes without applying
+        auto_approve: Skip confirmation prompts
+
+    Returns:
+        Namespace object with all arguments set
+    """
+    return Namespace(
+        host=host,
+        server_name=server_name,
+        no_backup=no_backup,
+        dry_run=dry_run,
+        auto_approve=auto_approve,
+    )
+
+
+def create_mcp_remove_server_args(
+    env_manager: Any = None,
+    server_name: str = "test-server",
+    host: Optional[str] = None,
+    env: Optional[str] = None,
+    no_backup: bool = False,
+    dry_run: bool = False,
+    auto_approve: bool = False,
+) -> Namespace:
+    """Create a Namespace object for handle_mcp_remove_server testing.
+
+    Args:
+        env_manager: Environment manager instance
+        server_name: Name of the MCP server to remove
+        host: Comma-separated list of target hosts
+        env: Environment name
+        no_backup: Disable backup creation
+        dry_run: Preview changes without applying
+        auto_approve: Skip confirmation prompts
+
+    Returns:
+        Namespace object with all arguments set
+    """
+    return Namespace(
+        env_manager=env_manager,
+        server_name=server_name,
+        host=host,
+        env=env,
+        no_backup=no_backup,
+        dry_run=dry_run,
+        auto_approve=auto_approve,
+    )
+
+
+def create_mcp_remove_host_args(
+    env_manager: Any = None,
+    host_name: str = "claude-desktop",
+    no_backup: bool = False,
+    dry_run: bool = False,
+    auto_approve: bool = False,
+) -> Namespace:
+    """Create a Namespace object for handle_mcp_remove_host testing.
+
+    Args:
+        env_manager: Environment manager instance
+        host_name: Name of the host to remove configuration from
+        no_backup: Disable backup creation
+        dry_run: Preview changes without applying
+        auto_approve: Skip confirmation prompts
+
+    Returns:
+        Namespace object with all arguments set
+    """
+    return Namespace(
+        env_manager=env_manager,
+        host_name=host_name,
         no_backup=no_backup,
         dry_run=dry_run,
         auto_approve=auto_approve,

tests/regression/test_mcp_kiro_cli_integration.py

@@ -2,14 +2,17 @@
 Kiro MCP CLI Integration Tests
 
 Tests for CLI argument parsing and integration with Kiro-specific arguments.
+
+Updated for M1.8: Uses Namespace-based handler calls via create_mcp_configure_args.
 """
 
 import unittest
 from unittest.mock import patch, MagicMock
 
 from wobble.decorators import regression_test
 
-from hatch.cli_hatch import handle_mcp_configure
+from hatch.cli.cli_mcp import handle_mcp_configure
+from tests.cli_test_utils import create_mcp_configure_args
 
 
 class TestKiroCLIIntegration(unittest.TestCase):
@@ -27,23 +30,21 @@ def test_kiro_cli_with_disabled_flag(self, mock_manager_class):
         mock_result.backup_path = None
         mock_manager.configure_server.return_value = mock_result
 
-        result = handle_mcp_configure(
+        args = create_mcp_configure_args(
             host='kiro',
             server_name='test-server',
-            command='auggie',
+            server_command='auggie',
             args=['--mcp'],
-            disabled=True,  # Kiro-specific argument
-            auto_approve=True
+            disabled=True,
+            auto_approve=True,
         )
 
+        result = handle_mcp_configure(args)
         self.assertEqual(result, 0)
 
-        # Verify configure_server was called with Kiro model
         mock_manager.configure_server.assert_called_once()
         call_args = mock_manager.configure_server.call_args
         server_config = call_args.kwargs['server_config']
-        
-        # Verify Kiro-specific field was set
         self.assertTrue(server_config.disabled)
 
     @patch('hatch.cli.cli_mcp.MCPHostConfigurationManager')
@@ -57,18 +58,18 @@ def test_kiro_cli_with_auto_approve_tools(self, mock_manager_class):
         mock_result.success = True
         mock_manager.configure_server.return_value = mock_result
 
-        result = handle_mcp_configure(
+        args = create_mcp_configure_args(
             host='kiro',
             server_name='test-server',
-            command='auggie',
-            args=['--mcp'],  # Required parameter
+            server_command='auggie',
+            args=['--mcp'],
             auto_approve_tools=['codebase-retrieval', 'fetch'],
-            auto_approve=True
+            auto_approve=True,
         )
 
+        result = handle_mcp_configure(args)
         self.assertEqual(result, 0)
 
-        # Verify autoApprove field was set correctly
         call_args = mock_manager.configure_server.call_args
         server_config = call_args.kwargs['server_config']
         self.assertEqual(len(server_config.autoApprove), 2)
@@ -85,18 +86,18 @@ def test_kiro_cli_with_disable_tools(self, mock_manager_class):
         mock_result.success = True
         mock_manager.configure_server.return_value = mock_result
 
-        result = handle_mcp_configure(
+        args = create_mcp_configure_args(
             host='kiro',
             server_name='test-server',
-            command='python',
-            args=['server.py'],  # Required parameter
+            server_command='python',
+            args=['server.py'],
             disable_tools=['dangerous-tool', 'risky-tool'],
-            auto_approve=True
+            auto_approve=True,
         )
 
+        result = handle_mcp_configure(args)
         self.assertEqual(result, 0)
 
-        # Verify disabledTools field was set correctly
         call_args = mock_manager.configure_server.call_args
         server_config = call_args.kwargs['server_config']
         self.assertEqual(len(server_config.disabledTools), 2)
@@ -113,20 +114,20 @@ def test_kiro_cli_combined_arguments(self, mock_manager_class):
         mock_result.success = True
         mock_manager.configure_server.return_value = mock_result
 
-        result = handle_mcp_configure(
+        args = create_mcp_configure_args(
             host='kiro',
             server_name='comprehensive-server',
-            command='auggie',
+            server_command='auggie',
             args=['--mcp', '-m', 'default'],
             disabled=False,
             auto_approve_tools=['codebase-retrieval'],
             disable_tools=['dangerous-tool'],
-            auto_approve=True
+            auto_approve=True,
         )
 
+        result = handle_mcp_configure(args)
         self.assertEqual(result, 0)
 
-        # Verify all Kiro fields were set correctly
         call_args = mock_manager.configure_server.call_args
         server_config = call_args.kwargs['server_config']
 
@@ -138,4 +139,4 @@ def test_kiro_cli_combined_arguments(self, mock_manager_class):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

tests/test_cli_version.py

@@ -64,8 +64,8 @@ def test_version_command_displays_correct_format(self):
         test_args = ['hatch', '--version']
 
         with patch('sys.argv', test_args):
-            # Patch at point of use in cli_hatch (imported from cli_utils)
-            with patch('hatch.cli_hatch.get_hatch_version', return_value='0.7.0-dev.3'):
+            # Patch at point of use in __main__ (imported from cli_utils)
+            with patch('hatch.cli.__main__.get_hatch_version', return_value='0.7.0-dev.3'):
                 with patch('sys.stdout', new_callable=StringIO) as mock_stdout:
                     with self.assertRaises(SystemExit) as cm:
                         main()
@@ -100,7 +100,7 @@ def test_no_conflict_with_package_version_flag(self):
         test_args = ['hatch', 'package', 'add', 'test-package', '-v', '1.0.0']
 
         with patch('sys.argv', test_args):
-            with patch('hatch.cli_hatch.HatchEnvironmentManager') as mock_env:
+            with patch('hatch.environment_manager.HatchEnvironmentManager') as mock_env:
                 mock_env_instance = MagicMock()
                 mock_env.return_value = mock_env_instance
                 mock_env_instance.add_package_to_environment.return_value = True