hatch-xclam 0.7.1.dev3__py3-none-any.whl → 0.8.0.dev1__py3-none-any.whl

hatch/mcp_host_config/reporting.py

@@ -6,10 +6,11 @@ user-friendly reports about MCP configuration changes, including field-level
 operations and conversion summaries.
 """
 
-from typing import Literal, Optional, Any, List
+from typing import Literal, Optional, Any, List, Union
 from pydantic import BaseModel, ConfigDict
 
-from .models import MCPServerConfigOmni, MCPHostType, HOST_MODEL_REGISTRY
+from .models import MCPServerConfig, MCPHostType
+from .adapters import get_adapter
 
 
 class FieldOperation(BaseModel):
@@ -57,41 +58,70 @@ class ConversionReport(BaseModel):
     dry_run: bool = False
 
 
+def _get_adapter_host_name(host_type: MCPHostType) -> str:
+    """Map MCPHostType to adapter host name.
+
+    Claude has two variants (desktop/code) sharing the same adapter,
+    so we need explicit mapping.
+    """
+    mapping = {
+        MCPHostType.CLAUDE_DESKTOP: "claude-desktop",
+        MCPHostType.CLAUDE_CODE: "claude-code",
+        MCPHostType.VSCODE: "vscode",
+        MCPHostType.CURSOR: "cursor",
+        MCPHostType.LMSTUDIO: "lmstudio",
+        MCPHostType.GEMINI: "gemini",
+        MCPHostType.KIRO: "kiro",
+        MCPHostType.CODEX: "codex",
+    }
+    return mapping.get(host_type, host_type.value)
+
+
 def generate_conversion_report(
     operation: Literal["create", "update", "delete", "migrate"],
     server_name: str,
     target_host: MCPHostType,
-    omni: MCPServerConfigOmni,
+    config: MCPServerConfig,
     source_host: Optional[MCPHostType] = None,
-    old_config: Optional[MCPServerConfigOmni] = None,
+    old_config: Optional[MCPServerConfig] = None,
     dry_run: bool = False
 ) -> ConversionReport:
     """Generate conversion report for a configuration operation.
-    
-    Analyzes the conversion from Omni model to host-specific configuration,
+
+    Analyzes the configuration against the target host's adapter,
     identifying which fields were updated, which are unsupported, and which
     remained unchanged.
-    
+
+    Fields in the adapter's excluded set (e.g., 'name' from EXCLUDED_ALWAYS)
+    are internal metadata and are completely omitted from field operations.
+    They will not appear as UPDATED, UNCHANGED, or UNSUPPORTED.
+
     Args:
         operation: Type of operation being performed
         server_name: Name of the server being configured
         target_host: Target host for the configuration (MCPHostType enum)
-        omni: New/updated configuration (Omni model)
+        config: New/updated configuration (unified MCPServerConfig)
         source_host: Source host (for migrate operation, MCPHostType enum)
         old_config: Existing configuration (for update operation)
         dry_run: Whether this is a dry-run preview
-    
+
     Returns:
         ConversionReport with field-level operations
     """
-    # Derive supported fields dynamically from model class
-    model_class = HOST_MODEL_REGISTRY[target_host]
-    supported_fields = set(model_class.model_fields.keys())
-    
+    # Get supported and excluded fields from adapter
+    adapter_host_name = _get_adapter_host_name(target_host)
+    adapter = get_adapter(adapter_host_name)
+    supported_fields = adapter.get_supported_fields()
+    excluded_fields = adapter.get_excluded_fields()
+
     field_operations = []
-    set_fields = omni.model_dump(exclude_unset=True)
-    
+    set_fields = config.model_dump(exclude_unset=True)
+
     for field_name, new_value in set_fields.items():
+        # Skip metadata fields (e.g., 'name') - they should never appear in reports
+        if field_name in excluded_fields:
+            continue
+
         if field_name in supported_fields:
             # Field is supported by target host
             if old_config:
@@ -137,7 +167,7 @@ def generate_conversion_report(
                 operation="UNSUPPORTED",
                 new_value=new_value
             ))
-    
+
     return ConversionReport(
         operation=operation,
         server_name=server_name,
@@ -151,6 +181,10 @@ def generate_conversion_report(
 def display_report(report: ConversionReport) -> None:
     """Display conversion report to console.
     
+    .. deprecated::
+        Use ``ResultReporter.add_from_conversion_report()`` instead.
+        This function will be removed in a future version.
+    
     Prints a formatted report showing the operation performed and all
     field-level changes. Uses FieldOperation.__str__() for consistent
     formatting.
@@ -158,6 +192,13 @@ def display_report(report: ConversionReport) -> None:
     Args:
         report: ConversionReport to display
     """
+    import warnings
+    warnings.warn(
+        "display_report() is deprecated. Use ResultReporter.add_from_conversion_report() instead.",
+        DeprecationWarning,
+        stacklevel=2
+    )
+    
     # Header
     if report.dry_run:
         print(f"[DRY RUN] Preview of changes for server '{report.server_name}':")