test(cli): update remaining MCP tests for cli_mcp module

Author: LittleCoinCoin

tests/integration/test_mcp_kiro_integration.py

@@ -21,7 +21,7 @@ class TestKiroIntegration(unittest.TestCase):
     """Test suite for end-to-end Kiro integration."""
 
     @integration_test(scope="component")
-    @patch('hatch.cli_hatch.MCPHostConfigurationManager')
+    @patch('hatch.cli.cli_mcp.MCPHostConfigurationManager')
     def test_kiro_end_to_end_configuration(self, mock_manager_class):
         """Test complete Kiro configuration workflow."""
         # Setup mocks
@@ -107,7 +107,7 @@ def test_kiro_model_to_strategy_workflow(self):
         self.assertIn("codebase-retrieval", kiro_model.autoApprove)
 
     @integration_test(scope="end_to_end")
-    @patch('hatch.cli_hatch.MCPHostConfigurationManager')
+    @patch('hatch.cli.cli_mcp.MCPHostConfigurationManager')
     def test_kiro_complete_lifecycle(self, mock_manager_class):
         """Test complete Kiro server lifecycle: create, configure, validate."""
         # Setup mocks

tests/regression/test_mcp_kiro_cli_integration.py

@@ -15,7 +15,7 @@
 class TestKiroCLIIntegration(unittest.TestCase):
     """Test suite for Kiro CLI argument integration."""
 
-    @patch('hatch.cli_hatch.MCPHostConfigurationManager')
+    @patch('hatch.cli.cli_mcp.MCPHostConfigurationManager')
     @regression_test
     def test_kiro_cli_with_disabled_flag(self, mock_manager_class):
         """Test CLI with --disabled flag for Kiro."""
@@ -46,7 +46,7 @@ def test_kiro_cli_with_disabled_flag(self, mock_manager_class):
         # Verify Kiro-specific field was set
         self.assertTrue(server_config.disabled)
 
-    @patch('hatch.cli_hatch.MCPHostConfigurationManager')
+    @patch('hatch.cli.cli_mcp.MCPHostConfigurationManager')
     @regression_test
     def test_kiro_cli_with_auto_approve_tools(self, mock_manager_class):
         """Test CLI with --auto-approve-tools for Kiro."""
@@ -74,7 +74,7 @@ def test_kiro_cli_with_auto_approve_tools(self, mock_manager_class):
         self.assertEqual(len(server_config.autoApprove), 2)
         self.assertIn('codebase-retrieval', server_config.autoApprove)
 
-    @patch('hatch.cli_hatch.MCPHostConfigurationManager')
+    @patch('hatch.cli.cli_mcp.MCPHostConfigurationManager')
     @regression_test
     def test_kiro_cli_with_disable_tools(self, mock_manager_class):
         """Test CLI with --disable-tools for Kiro."""
@@ -102,7 +102,7 @@ def test_kiro_cli_with_disable_tools(self, mock_manager_class):
         self.assertEqual(len(server_config.disabledTools), 2)
         self.assertIn('dangerous-tool', server_config.disabledTools)
 
-    @patch('hatch.cli_hatch.MCPHostConfigurationManager')
+    @patch('hatch.cli.cli_mcp.MCPHostConfigurationManager')
     @regression_test
     def test_kiro_cli_combined_arguments(self, mock_manager_class):
         """Test CLI with multiple Kiro-specific arguments combined."""

tests/test_mcp_environment_integration.py

@@ -458,7 +458,7 @@ def test_remove_server_updates_environment(self):
             mock_result.backup_path = None
             mock_remove.return_value = mock_result
 
-            with patch('hatch.cli_hatch.request_confirmation', return_value=True):
+            with patch('hatch.cli.cli_utils.request_confirmation', return_value=True):
                 with patch('builtins.print'):
                     # Action: hatch mcp remove server <server> --host <host>
                     result = handle_mcp_remove_server(
@@ -497,7 +497,7 @@ def test_remove_host_updates_all_environments(self):
 
             self.mock_env_manager.clear_host_from_all_packages_all_envs.return_value = 3
 
-            with patch('hatch.cli_hatch.request_confirmation', return_value=True):
+            with patch('hatch.cli.cli_utils.request_confirmation', return_value=True):
                 with patch('builtins.print') as mock_print:
                     # Action: hatch mcp remove host <host>
                     result = handle_mcp_remove_host(