feat: integrate Pydantic model hierarchy into CLI handlers

- Update handle_mcp_configure() to use MCPServerConfigOmni and HOST_MODEL_REGISTRY
- Fix bug: change 'args or []' to 'args' to properly handle None for remote servers
- Integrate from_omni() conversion for host-specific model creation
- Add conversion report generation and display for user feedback
- Add URL validation to MCPServerConfigOmni model
- Update test expectations to use host-specific models (MCPServerConfigClaude, etc.)
- Maintain backward compatibility with dry-run output format

All tests passing (248/248, 100% success rate)

Author: LittleCoinCoin

hatch/cli_hatch.py

@@ -20,6 +20,8 @@
 from hatch_validator.package.package_service import PackageService
 from hatch.template_generator import create_package_template
 from hatch.mcp_host_config import MCPHostConfigurationManager, MCPHostType, MCPHostRegistry, MCPServerConfig
+from hatch.mcp_host_config.models import MCPServerConfigOmni, HOST_MODEL_REGISTRY
+from hatch.mcp_host_config.reporting import generate_conversion_report, display_report
 
 
 def get_hatch_version() -> str:
@@ -606,21 +608,41 @@ def handle_mcp_configure(host: str, server_name: str, command: str, args: list,
         env_dict = parse_env_vars(env)
         headers_dict = parse_headers(headers)
 
-        # Create server configuration (only include headers if URL is provided)
-        config_data = {
+        # Create Omni configuration (universal model)
+        omni_config_data = {
             'name': server_name,
             'command': command,
-            'args': args or [],
+            'args': args,  # Fixed: Don't convert None to [] - let Pydantic handle it
             'env': env_dict,
             'url': url
         }
 
-        # Only add headers if URL is provided (per MCPServerConfig validation)
+        # Only add headers if URL is provided
         if url and headers_dict:
-            config_data['headers'] = headers_dict
+            omni_config_data['headers'] = headers_dict
 
-        server_config = MCPServerConfig(**config_data)
+        # Create Omni model
+        omni_config = MCPServerConfigOmni(**omni_config_data)
 
+        # Convert to host-specific model using HOST_MODEL_REGISTRY
+        host_model_class = HOST_MODEL_REGISTRY.get(host_type)
+        if not host_model_class:
+            print(f"Error: No model registered for host '{host}'")
+            return 1
+
+        # Convert Omni to host-specific model
+        server_config = host_model_class.from_omni(omni_config)
+
+        # Generate conversion report
+        report = generate_conversion_report(
+            operation='create',
+            server_name=server_name,
+            target_host=host_type,
+            omni=omni_config,
+            dry_run=dry_run
+        )
+
+        # Display conversion report
         if dry_run:
             print(f"[DRY RUN] Would configure MCP server '{server_name}' on host '{host}':")
             print(f"[DRY RUN] Command: {command}")
@@ -633,8 +655,13 @@ def handle_mcp_configure(host: str, server_name: str, command: str, args: list,
             if headers_dict:
                 print(f"[DRY RUN] Headers: {headers_dict}")
             print(f"[DRY RUN] Backup: {'Disabled' if no_backup else 'Enabled'}")
+            # Display report in dry-run mode
+            display_report(report)
             return 0
 
+        # Display report before confirmation
+        display_report(report)
+
         # Confirm operation unless auto-approved
         if not request_confirmation(
             f"Configure MCP server '{server_name}' on host '{host}'?",

hatch/mcp_host_config/models.py

@@ -535,6 +535,15 @@ class MCPServerConfigOmni(BaseModel):
     envFile: Optional[str] = None
     inputs: Optional[List[Dict]] = None
 
+    @field_validator('url')
+    @classmethod
+    def validate_url_format(cls, v):
+        """Validate URL format when provided."""
+        if v is not None:
+            if not v.startswith(('http://', 'https://')):
+                raise ValueError("URL must start with http:// or https://")
+        return v
+
 
 # HOST_MODEL_REGISTRY: Dictionary dispatch for host-specific models
 HOST_MODEL_REGISTRY: Dict[MCPHostType, type[MCPServerConfigBase]] = {

tests/test_mcp_cli_host_config_integration.py

@@ -102,50 +102,44 @@ def test_configure_creates_omni_with_env_vars(self):
     @regression_test
     def test_configure_creates_omni_with_headers(self):
         """Test that headers are parsed correctly into Omni model."""
-        # NOTE: This test currently fails due to bug in handle_mcp_configure (line 613)
-        # The implementation uses `args or []` which converts None to empty list,
-        # causing validation error. This will be fixed in Phase 4.
-        # For now, test that the error is caught properly.
-        result = handle_mcp_configure(
-            host='claude-desktop',
-            server_name='test-server',
-            command=None,
-            args=None,  # Will be converted to [] by current implementation (bug)
-            env=None,
-            url='https://api.example.com',
-            headers=['Authorization=Bearer token', 'Content-Type=application/json'],
-            no_backup=True,
-            dry_run=False,
-            auto_approve=False
-        )
+        with patch('hatch.cli_hatch.MCPHostConfigurationManager') as mock_manager:
+            with patch('hatch.cli_hatch.request_confirmation', return_value=False):
+                result = handle_mcp_configure(
+                    host='claude-desktop',
+                    server_name='test-server',
+                    command=None,
+                    args=None,
+                    env=None,
+                    url='https://api.example.com',
+                    headers=['Authorization=Bearer token', 'Content-Type=application/json'],
+                    no_backup=True,
+                    dry_run=False,
+                    auto_approve=False
+                )
 
-        # Current implementation returns error due to args validation bug
-        # This will be fixed in Phase 4 to return 0
-        self.assertEqual(result, 1)
+                # Verify the function executed without errors (bug fixed in Phase 4)
+                self.assertEqual(result, 0)
 
     @regression_test
     def test_configure_creates_omni_remote_server(self):
         """Test that remote server arguments create correct Omni model."""
-        # NOTE: This test currently fails due to bug in handle_mcp_configure (line 613)
-        # The implementation uses `args or []` which converts None to empty list,
-        # causing validation error. This will be fixed in Phase 4.
-        # For now, test that the error is caught properly.
-        result = handle_mcp_configure(
-            host='claude-desktop',
-            server_name='remote-server',
-            command=None,
-            args=None,  # Will be converted to [] by current implementation (bug)
-            env=None,
-            url='https://api.example.com',
-            headers=['Auth=token'],
-            no_backup=True,
-            dry_run=False,
-            auto_approve=False
-        )
+        with patch('hatch.cli_hatch.MCPHostConfigurationManager') as mock_manager:
+            with patch('hatch.cli_hatch.request_confirmation', return_value=False):
+                result = handle_mcp_configure(
+                    host='claude-desktop',
+                    server_name='remote-server',
+                    command=None,
+                    args=None,
+                    env=None,
+                    url='https://api.example.com',
+                    headers=['Auth=token'],
+                    no_backup=True,
+                    dry_run=False,
+                    auto_approve=False
+                )
 
-        # Current implementation returns error due to args validation bug
-        # This will be fixed in Phase 4 to return 0
-        self.assertEqual(result, 1)
+                # Verify the function executed without errors (bug fixed in Phase 4)
+                self.assertEqual(result, 0)
 
     @regression_test
     def test_configure_omni_with_all_universal_fields(self):
@@ -246,7 +240,7 @@ def test_configure_passes_host_specific_model_to_manager(self):
             mock_manager = MagicMock()
             mock_manager_class.return_value = mock_manager
             mock_manager.configure_server.return_value = MagicMock(success=True, backup_path=None)
-            
+
             with patch('hatch.cli_hatch.request_confirmation', return_value=True):
                 # Call configure command
                 result = handle_mcp_configure(
@@ -261,15 +255,16 @@ def test_configure_passes_host_specific_model_to_manager(self):
                     dry_run=False,
                     auto_approve=False
                 )
-                
+
                 # Verify configure_server was called
                 self.assertEqual(result, 0)
                 mock_manager.configure_server.assert_called_once()
-                
-                # Verify the server_config argument is an MCPServerConfig instance
+
+                # Verify the server_config argument is a host-specific model instance
+                # (MCPServerConfigClaude for claude-desktop host)
                 call_args = mock_manager.configure_server.call_args
                 server_config = call_args.kwargs['server_config']
-                self.assertIsInstance(server_config, MCPServerConfig)
+                self.assertIsInstance(server_config, MCPServerConfigClaude)
 
 
 class TestReportingIntegration(unittest.TestCase):