hatch-xclam 0.7.0.dev12__tar.gz → 0.7.1__tar.gz

{hatch_xclam-0.7.0.dev12/hatch_xclam.egg-info → hatch_xclam-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hatch-xclam
-Version: 0.7.0.dev12
+Version: 0.7.1
 Summary: Package manager for the Cracking Shells ecosystem
 Author: Cracking Shells Team
 Project-URL: Homepage, https://github.com/CrackingShells/Hatch
@@ -17,6 +17,7 @@ Requires-Dist: packaging>=20.0
 Requires-Dist: docker>=7.1.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: hatch-validator>=0.8.0
+Requires-Dist: tomli-w>=1.0.0
 Provides-Extra: docs
 Requires-Dist: mkdocs>=1.4.0; extra == "docs"
 Requires-Dist: mkdocstrings[python]>=0.20.0; extra == "docs"
@@ -26,13 +27,36 @@ Dynamic: license-file
 
 # Hatch
 
-![Hatch Logo](./docs/resources/images/Logo/hatch_wide_dark_bg_transparent.png)
+![Hatch Logo](https://raw.githubusercontent.com/CrackingShells/Hatch/refs/heads/main/docs/resources/images/Logo/hatch_wide_dark_bg_transparent.png)
 
-Hatch is the package manager for the Cracking Shells ecosystem, designed specifically for managing Model Context Protocol (MCP) servers. It handles complex dependency resolution across system packages, Python packages, Docker containers, and other Hatch packages — all in isolated environments.
+## Introduction
+
+Hatch is the package manager for managing Model Context Protocol (MCP) servers with environment isolation, multi-type dependency resolution, and multi-host deployment. Deploy MCP servers to Claude Desktop, VS Code, Cursor, Kiro, Codex, and other platforms with automatic dependency management.
 
 The canonical documentation is at `docs/index.md` and published at <https://hatch.readthedocs.io/en/latest/>.
 
-## Quick start
+## Key Features
+
+- **Environment Isolation** — Create separate, isolated workspaces for different projects without conflicts
+- **Multi-Type Dependency Resolution** — Automatically resolve and install system packages, Python packages, Docker containers, and Hatch packages
+- **Multi-Host Deployment** — Configure MCP servers on multiple host platforms
+- **Package Validation** — Ensure packages meet schema requirements before distribution
+- **Development-Focused** — Optimized for rapid development and testing of MCP server ecosystems
+
+## Supported MCP Hosts
+
+Hatch supports deployment to the following MCP host platforms:
+
+- **Claude Desktop** — Anthropic's desktop application for Claude with native MCP support
+- **Claude Code** — Claude integration for VS Code with MCP capabilities
+- **VS Code** — Visual Studio Code with the MCP extension for tool integration
+- **Cursor** — AI-first code editor with built-in MCP server support
+- **Kiro** — Kiro IDE with MCP support
+- **Codex** — OpenAI Codex with MCP server configuration support
+- **LM Studio** — Local LLM inference platform with MCP server integration
+- **Google Gemini CLI** — Command-line interface for Google's Gemini model with MCP support
+
+## Quick Start
 
 ### Install from PyPI
 
@@ -72,41 +96,26 @@ hatch validate ./my_mcp_server
 
 ### Deploy MCP servers to your tools
 
-Add a Hatch package and automatically configure it on Claude Desktop and Cursor:
+**Package-First Deployment (Recommended)** — Add a Hatch package and automatically configure it on Claude Desktop and Cursor:
 
 ```bash
 hatch package add ./my_mcp_server --host claude-desktop,cursor
 ```
 
-Configure an arbitrary MCP server (non-Hatch package) on Claude Desktop:
+**Direct Configuration (Advanced)** — Configure arbitrary MCP servers on your hosts:
 
 ```bash
-# Local server with command and arguments
-hatch mcp configure my-weather-server --host claude-desktop \
-  --command python --args weather_server.py \
-  --env-var API_KEY=your_key
-
-# Remote server with URL
-hatch mcp configure api-server --host gemini \
-  --httpUrl https://api.example.com \
-  --header Authorization="Bearer token"
+# Remote server example: GitHub MCP Server with authentication
+export GIT_PAT_TOKEN=your_github_personal_access_token
+hatch mcp configure github-mcp --host gemini \
+  --httpUrl https://api.github.com/mcp \
+  --header Authorization="Bearer $GIT_PAT_TOKEN"
+
+# Local server example: Context7 via npx
+hatch mcp configure context7 --host vscode \
+  --command npx --args "-y @upstash/context7-mcp"
 ```
 
-List configured servers and hosts:
-
-```bash
-hatch mcp list servers
-hatch mcp list hosts --detailed
-```
-
-## Key features
-
-- **Environment isolation**: Create separate workspaces for different projects
-- **Multi-type dependencies**: Automatically resolve and install system packages, Python packages, Docker containers, and Hatch packages
-- **MCP host configuration**: Deploy MCP servers to Claude Desktop, Cursor, VSCode, and other platforms
-- **Package validation**: Ensure packages meet schema requirements before distribution
-- **Development-focused**: Optimized for rapid development and testing of MCP server ecosystems
-
 ## Documentation
 
 - **[Full Documentation](https://hatch.readthedocs.io/en/latest/)** — Complete reference and guides
@@ -128,12 +137,12 @@ We welcome contributions! See the [How to Contribute](./docs/articles/devs/contr
 3. **Create a feature branch**: `git checkout -b feat/your-feature`
 4. **Make changes** and add tests
 5. **Use conventional commits**: `npm run commit` for guided commits
-6. **Run tests**: `python -m pytest tests/`
+6. **Run tests**: `wobble`
 7. **Create a pull request**
 
 We use [Conventional Commits](https://www.conventionalcommits.org/) for automated versioning. Use `npm run commit` for guided commit messages.
 
-## Getting help
+## Getting Help
 
 - Search existing [GitHub Issues](https://github.com/CrackingShells/Hatch/issues)
 - Read [Troubleshooting](./docs/articles/users/Troubleshooting/ReportIssues.md) for common problems

{hatch_xclam-0.7.0.dev12 → hatch_xclam-0.7.1}/README.md

@@ -1,12 +1,35 @@
 # Hatch
 
-![Hatch Logo](./docs/resources/images/Logo/hatch_wide_dark_bg_transparent.png)
+![Hatch Logo](https://raw.githubusercontent.com/CrackingShells/Hatch/refs/heads/main/docs/resources/images/Logo/hatch_wide_dark_bg_transparent.png)
 
-Hatch is the package manager for the Cracking Shells ecosystem, designed specifically for managing Model Context Protocol (MCP) servers. It handles complex dependency resolution across system packages, Python packages, Docker containers, and other Hatch packages — all in isolated environments.
+## Introduction
+
+Hatch is the package manager for managing Model Context Protocol (MCP) servers with environment isolation, multi-type dependency resolution, and multi-host deployment. Deploy MCP servers to Claude Desktop, VS Code, Cursor, Kiro, Codex, and other platforms with automatic dependency management.
 
 The canonical documentation is at `docs/index.md` and published at <https://hatch.readthedocs.io/en/latest/>.
 
-## Quick start
+## Key Features
+
+- **Environment Isolation** — Create separate, isolated workspaces for different projects without conflicts
+- **Multi-Type Dependency Resolution** — Automatically resolve and install system packages, Python packages, Docker containers, and Hatch packages
+- **Multi-Host Deployment** — Configure MCP servers on multiple host platforms
+- **Package Validation** — Ensure packages meet schema requirements before distribution
+- **Development-Focused** — Optimized for rapid development and testing of MCP server ecosystems
+
+## Supported MCP Hosts
+
+Hatch supports deployment to the following MCP host platforms:
+
+- **Claude Desktop** — Anthropic's desktop application for Claude with native MCP support
+- **Claude Code** — Claude integration for VS Code with MCP capabilities
+- **VS Code** — Visual Studio Code with the MCP extension for tool integration
+- **Cursor** — AI-first code editor with built-in MCP server support
+- **Kiro** — Kiro IDE with MCP support
+- **Codex** — OpenAI Codex with MCP server configuration support
+- **LM Studio** — Local LLM inference platform with MCP server integration
+- **Google Gemini CLI** — Command-line interface for Google's Gemini model with MCP support
+
+## Quick Start
 
 ### Install from PyPI
 
@@ -46,41 +69,26 @@ hatch validate ./my_mcp_server
 
 ### Deploy MCP servers to your tools
 
-Add a Hatch package and automatically configure it on Claude Desktop and Cursor:
+**Package-First Deployment (Recommended)** — Add a Hatch package and automatically configure it on Claude Desktop and Cursor:
 
 ```bash
 hatch package add ./my_mcp_server --host claude-desktop,cursor
 ```
 
-Configure an arbitrary MCP server (non-Hatch package) on Claude Desktop:
+**Direct Configuration (Advanced)** — Configure arbitrary MCP servers on your hosts:
 
 ```bash
-# Local server with command and arguments
-hatch mcp configure my-weather-server --host claude-desktop \
-  --command python --args weather_server.py \
-  --env-var API_KEY=your_key
-
-# Remote server with URL
-hatch mcp configure api-server --host gemini \
-  --httpUrl https://api.example.com \
-  --header Authorization="Bearer token"
+# Remote server example: GitHub MCP Server with authentication
+export GIT_PAT_TOKEN=your_github_personal_access_token
+hatch mcp configure github-mcp --host gemini \
+  --httpUrl https://api.github.com/mcp \
+  --header Authorization="Bearer $GIT_PAT_TOKEN"
+
+# Local server example: Context7 via npx
+hatch mcp configure context7 --host vscode \
+  --command npx --args "-y @upstash/context7-mcp"
 ```
 
-List configured servers and hosts:
-
-```bash
-hatch mcp list servers
-hatch mcp list hosts --detailed
-```
-
-## Key features
-
-- **Environment isolation**: Create separate workspaces for different projects
-- **Multi-type dependencies**: Automatically resolve and install system packages, Python packages, Docker containers, and Hatch packages
-- **MCP host configuration**: Deploy MCP servers to Claude Desktop, Cursor, VSCode, and other platforms
-- **Package validation**: Ensure packages meet schema requirements before distribution
-- **Development-focused**: Optimized for rapid development and testing of MCP server ecosystems
-
 ## Documentation
 
 - **[Full Documentation](https://hatch.readthedocs.io/en/latest/)** — Complete reference and guides
@@ -102,12 +110,12 @@ We welcome contributions! See the [How to Contribute](./docs/articles/devs/contr
 3. **Create a feature branch**: `git checkout -b feat/your-feature`
 4. **Make changes** and add tests
 5. **Use conventional commits**: `npm run commit` for guided commits
-6. **Run tests**: `python -m pytest tests/`
+6. **Run tests**: `wobble`
 7. **Create a pull request**
 
 We use [Conventional Commits](https://www.conventionalcommits.org/) for automated versioning. Use `npm run commit` for guided commit messages.
 
-## Getting help
+## Getting Help
 
 - Search existing [GitHub Issues](https://github.com/CrackingShells/Hatch/issues)
 - Read [Troubleshooting](./docs/articles/users/Troubleshooting/ReportIssues.md) for common problems

{hatch_xclam-0.7.0.dev12 → hatch_xclam-0.7.1}/hatch/cli_hatch.py

@@ -713,6 +713,15 @@ def handle_mcp_configure(
     include_tools: Optional[list] = None,
     exclude_tools: Optional[list] = None,
     input: Optional[list] = None,
+    disabled: Optional[bool] = None,
+    auto_approve_tools: Optional[list] = None,
+    disable_tools: Optional[list] = None,
+    env_vars: Optional[list] = None,
+    startup_timeout: Optional[int] = None,
+    tool_timeout: Optional[int] = None,
+    enabled: Optional[bool] = None,
+    bearer_token_env_var: Optional[str] = None,
+    env_header: Optional[list] = None,
     no_backup: bool = False,
     dry_run: bool = False,
     auto_approve: bool = False,
@@ -826,6 +835,35 @@ def handle_mcp_configure(
         if inputs_list is not None:
             omni_config_data["inputs"] = inputs_list
 
+        # Host-specific fields (Kiro)
+        if disabled is not None:
+            omni_config_data["disabled"] = disabled
+        if auto_approve_tools is not None:
+            omni_config_data["autoApprove"] = auto_approve_tools
+        if disable_tools is not None:
+            omni_config_data["disabledTools"] = disable_tools
+
+        # Host-specific fields (Codex)
+        if env_vars is not None:
+            omni_config_data["env_vars"] = env_vars
+        if startup_timeout is not None:
+            omni_config_data["startup_timeout_sec"] = startup_timeout
+        if tool_timeout is not None:
+            omni_config_data["tool_timeout_sec"] = tool_timeout
+        if enabled is not None:
+            omni_config_data["enabled"] = enabled
+        if bearer_token_env_var is not None:
+            omni_config_data["bearer_token_env_var"] = bearer_token_env_var
+        if env_header is not None:
+            # Parse KEY=ENV_VAR_NAME format into dict
+            env_http_headers = {}
+            for header_spec in env_header:
+                if '=' in header_spec:
+                    key, env_var_name = header_spec.split('=', 1)
+                    env_http_headers[key] = env_var_name
+            if env_http_headers:
+                omni_config_data["env_http_headers"] = env_http_headers
+
         # Partial update merge logic
         if is_update:
             # Merge with existing configuration
@@ -1557,11 +1595,13 @@ def main():
     mcp_configure_parser = mcp_subparsers.add_parser(
         "configure", help="Configure MCP server directly on host"
     )
-    mcp_configure_parser.add_argument("server_name", help="Name for the MCP server")
+    mcp_configure_parser.add_argument(
+        "server_name", help="Name for the MCP server [hosts: all]"
+    )
     mcp_configure_parser.add_argument(
         "--host",
         required=True,
-        help="Host platform to configure (e.g., claude-desktop, cursor)",
+        help="Host platform to configure (e.g., claude-desktop, cursor) [hosts: all]",
     )
 
     # Create mutually exclusive group for server type
@@ -1569,72 +1609,125 @@ def main():
     server_type_group.add_argument(
         "--command",
         dest="server_command",
-        help="Command to execute the MCP server (for local servers)",
+        help="Command to execute the MCP server (for local servers) [hosts: all]",
     )
     server_type_group.add_argument(
-        "--url", help="Server URL for remote MCP servers (SSE transport)"
+        "--url", help="Server URL for remote MCP servers (SSE transport) [hosts: all except claude-desktop, claude-code]"
     )
     server_type_group.add_argument(
-        "--http-url", help="HTTP streaming endpoint URL (Gemini only)"
+        "--http-url", help="HTTP streaming endpoint URL [hosts: gemini]"
     )
 
     mcp_configure_parser.add_argument(
         "--args",
         nargs="*",
-        help="Arguments for the MCP server command (only with --command)",
+        help="Arguments for the MCP server command (only with --command) [hosts: all]",
     )
     mcp_configure_parser.add_argument(
-        "--env-var", action="append", help="Environment variables (format: KEY=VALUE)"
+        "--env-var",
+        action="append",
+        help="Environment variables (format: KEY=VALUE) [hosts: all]",
     )
     mcp_configure_parser.add_argument(
         "--header",
         action="append",
-        help="HTTP headers for remote servers (format: KEY=VALUE, only with --url)",
+        help="HTTP headers for remote servers (format: KEY=VALUE, only with --url) [hosts: all except claude-desktop, claude-code]",
     )
 
     # Host-specific arguments (Gemini)
     mcp_configure_parser.add_argument(
-        "--timeout", type=int, help="Request timeout in milliseconds (Gemini)"
+        "--timeout", type=int, help="Request timeout in milliseconds [hosts: gemini]"
     )
     mcp_configure_parser.add_argument(
-        "--trust", action="store_true", help="Bypass tool call confirmations (Gemini)"
+        "--trust", action="store_true", help="Bypass tool call confirmations [hosts: gemini]"
     )
     mcp_configure_parser.add_argument(
-        "--cwd", help="Working directory for stdio transport (Gemini)"
+        "--cwd", help="Working directory for stdio transport [hosts: gemini, codex]"
     )
     mcp_configure_parser.add_argument(
         "--include-tools",
         nargs="*",
-        help="Tool allowlist - only these tools will be available (Gemini)",
+        help="Tool allowlist / enabled tools [hosts: gemini, codex]",
     )
     mcp_configure_parser.add_argument(
         "--exclude-tools",
         nargs="*",
-        help="Tool blocklist - these tools will be excluded (Gemini)",
+        help="Tool blocklist / disabled tools [hosts: gemini, codex]",
     )
 
     # Host-specific arguments (Cursor/VS Code/LM Studio)
     mcp_configure_parser.add_argument(
-        "--env-file", help="Path to environment file (Cursor, VS Code, LM Studio)"
+        "--env-file", help="Path to environment file [hosts: cursor, vscode, lmstudio]"
     )
 
     # Host-specific arguments (VS Code)
     mcp_configure_parser.add_argument(
         "--input",
         action="append",
-        help="Input variable definitions in format: type,id,description[,password=true] (VS Code)",
+        help="Input variable definitions in format: type,id,description[,password=true] [hosts: vscode]",
+    )
+
+    # Host-specific arguments (Kiro)
+    mcp_configure_parser.add_argument(
+        "--disabled",
+        action="store_true",
+        default=None,
+        help="Disable the MCP server [hosts: kiro]"
+    )
+    mcp_configure_parser.add_argument(
+        "--auto-approve-tools",
+        action="append",
+        help="Tool names to auto-approve without prompting [hosts: kiro]"
+    )
+    mcp_configure_parser.add_argument(
+        "--disable-tools",
+        action="append",
+        help="Tool names to disable [hosts: kiro]"
+    )
+
+    # Codex-specific arguments
+    mcp_configure_parser.add_argument(
+        "--env-vars",
+        action="append",
+        help="Environment variable names to whitelist/forward [hosts: codex]"
+    )
+    mcp_configure_parser.add_argument(
+        "--startup-timeout",
+        type=int,
+        help="Server startup timeout in seconds (default: 10) [hosts: codex]"
+    )
+    mcp_configure_parser.add_argument(
+        "--tool-timeout",
+        type=int,
+        help="Tool execution timeout in seconds (default: 60) [hosts: codex]"
+    )
+    mcp_configure_parser.add_argument(
+        "--enabled",
+        action="store_true",
+        default=None,
+        help="Enable the MCP server [hosts: codex]"
+    )
+    mcp_configure_parser.add_argument(
+        "--bearer-token-env-var",
+        type=str,
+        help="Name of environment variable containing bearer token for Authorization header [hosts: codex]"
+    )
+    mcp_configure_parser.add_argument(
+        "--env-header",
+        action="append",
+        help="HTTP header from environment variable in KEY=ENV_VAR_NAME format [hosts: codex]"
     )
 
     mcp_configure_parser.add_argument(
         "--no-backup",
         action="store_true",
-        help="Skip backup creation before configuration",
+        help="Skip backup creation before configuration [hosts: all]",
     )
     mcp_configure_parser.add_argument(
-        "--dry-run", action="store_true", help="Preview configuration without execution"
+        "--dry-run", action="store_true", help="Preview configuration without execution [hosts: all]"
     )
     mcp_configure_parser.add_argument(
-        "--auto-approve", action="store_true", help="Skip confirmation prompts"
+        "--auto-approve", action="store_true", help="Skip confirmation prompts [hosts: all]"
     )
 
     # Remove MCP commands (object-action pattern)
@@ -2693,6 +2786,15 @@ def main():
                 getattr(args, "include_tools", None),
                 getattr(args, "exclude_tools", None),
                 getattr(args, "input", None),
+                getattr(args, "disabled", None),
+                getattr(args, "auto_approve_tools", None),
+                getattr(args, "disable_tools", None),
+                getattr(args, "env_vars", None),
+                getattr(args, "startup_timeout", None),
+                getattr(args, "tool_timeout", None),
+                getattr(args, "enabled", None),
+                getattr(args, "bearer_token_env_var", None),
+                getattr(args, "env_header", None),
                 args.no_backup,
                 args.dry_run,
                 args.auto_approve,

{hatch_xclam-0.7.0.dev12 → hatch_xclam-0.7.1}/hatch/mcp_host_config/__init__.py

@@ -11,7 +11,8 @@ from .models import (
     PackageHostConfiguration, EnvironmentPackageEntry, ConfigurationResult, SyncResult,
     # Host-specific configuration models
     MCPServerConfigBase, MCPServerConfigGemini, MCPServerConfigVSCode,
-    MCPServerConfigCursor, MCPServerConfigClaude, MCPServerConfigOmni,
+    MCPServerConfigCursor, MCPServerConfigClaude, MCPServerConfigKiro,
+    MCPServerConfigCodex, MCPServerConfigOmni,
     HOST_MODEL_REGISTRY
 )
 from .host_management import (
@@ -30,7 +31,8 @@ __all__ = [
     'PackageHostConfiguration', 'EnvironmentPackageEntry', 'ConfigurationResult', 'SyncResult',
     # Host-specific configuration models
     'MCPServerConfigBase', 'MCPServerConfigGemini', 'MCPServerConfigVSCode',
-    'MCPServerConfigCursor', 'MCPServerConfigClaude', 'MCPServerConfigOmni',
+    'MCPServerConfigCursor', 'MCPServerConfigClaude', 'MCPServerConfigKiro',
+    'MCPServerConfigCodex', 'MCPServerConfigOmni',
     'HOST_MODEL_REGISTRY',
     # User feedback reporting
     'FieldOperation', 'ConversionReport', 'generate_conversion_report', 'display_report',

{hatch_xclam-0.7.0.dev12 → hatch_xclam-0.7.1}/hatch/mcp_host_config/backup.py

@@ -9,7 +9,7 @@ import shutil
 import tempfile
 from datetime import datetime
 from pathlib import Path
-from typing import Dict, List, Optional, Any
+from typing import Dict, List, Optional, Any, Callable, TextIO
 
 from pydantic import BaseModel, Field, validator
 
@@ -36,8 +36,8 @@ class BackupInfo(BaseModel):
     def validate_hostname(cls, v):
         """Validate hostname is supported."""
         supported_hosts = {
-            'claude-desktop', 'claude-code', 'vscode', 
-            'cursor', 'lmstudio', 'gemini'
+            'claude-desktop', 'claude-code', 'vscode',
+            'cursor', 'lmstudio', 'gemini', 'kiro', 'codex'
         }
         if v not in supported_hosts:
             raise ValueError(f"Unsupported hostname: {v}. Supported: {supported_hosts}")
@@ -53,7 +53,9 @@ class BackupInfo(BaseModel):
     @property
     def backup_name(self) -> str:
         """Get backup filename."""
-        return f"mcp.json.{self.hostname}.{self.timestamp.strftime('%Y%m%d_%H%M%S_%f')}"
+        # Extract original filename from backup path if available
+        # Backup filename format: {original_name}.{hostname}.{timestamp}
+        return self.file_path.name
     
     @property
     def age_days(self) -> int:
@@ -101,22 +103,29 @@ class BackupResult(BaseModel):
 
 class AtomicFileOperations:
     """Atomic file operations for safe configuration updates."""
-    
-    def atomic_write_with_backup(self, file_path: Path, data: Dict[str, Any], 
-                                backup_manager: "MCPHostConfigBackupManager", 
-                                hostname: str, skip_backup: bool = False) -> bool:
-        """Atomic write with automatic backup creation.
-        
+
+    def atomic_write_with_serializer(
+        self,
+        file_path: Path,
+        data: Any,
+        serializer: Callable[[Any, TextIO], None],
+        backup_manager: "MCPHostConfigBackupManager",
+        hostname: str,
+        skip_backup: bool = False
+    ) -> bool:
+        """Atomic write with custom serializer and automatic backup creation.
+
         Args:
-            file_path (Path): Target file path for writing
-            data (Dict[str, Any]): Data to write as JSON
-            backup_manager (MCPHostConfigBackupManager): Backup manager instance
-            hostname (str): Host identifier for backup
-            skip_backup (bool, optional): Skip backup creation. Defaults to False.
-            
+            file_path: Target file path for writing
+            data: Data to serialize and write
+            serializer: Function that writes data to file handle
+            backup_manager: Backup manager instance
+            hostname: Host identifier for backup
+            skip_backup: Skip backup creation
+
         Returns:
-            bool: True if operation successful, False otherwise
-            
+            bool: True if operation successful
+
         Raises:
             BackupError: If backup creation fails and skip_backup is False
         """
@@ -126,32 +135,52 @@ class AtomicFileOperations:
             backup_result = backup_manager.create_backup(file_path, hostname)
             if not backup_result.success:
                 raise BackupError(f"Required backup failed: {backup_result.error_message}")
-        
-        # Create temporary file for atomic write
+
         temp_file = None
         try:
-            # Write to temporary file first
             temp_file = file_path.with_suffix(f"{file_path.suffix}.tmp")
             with open(temp_file, 'w', encoding='utf-8') as f:
-                json.dump(data, f, indent=2, ensure_ascii=False)
-            
-            # Atomic move to target location
+                serializer(data, f)
+
             temp_file.replace(file_path)
             return True
-            
+
         except Exception as e:
-            # Clean up temporary file on failure
             if temp_file and temp_file.exists():
                 temp_file.unlink()
-            
-            # Restore from backup if available
+
             if backup_result and backup_result.backup_path:
                 try:
                     backup_manager.restore_backup(hostname, backup_result.backup_path.name)
                 except Exception:
-                    pass  # Log but don't raise - original error is more important
-            
+                    pass
+
             raise BackupError(f"Atomic write failed: {str(e)}")
+
+    def atomic_write_with_backup(self, file_path: Path, data: Dict[str, Any],
+                                backup_manager: "MCPHostConfigBackupManager",
+                                hostname: str, skip_backup: bool = False) -> bool:
+        """Atomic write with JSON serialization (backward compatible).
+
+        Args:
+            file_path (Path): Target file path for writing
+            data (Dict[str, Any]): Data to write as JSON
+            backup_manager (MCPHostConfigBackupManager): Backup manager instance
+            hostname (str): Host identifier for backup
+            skip_backup (bool, optional): Skip backup creation. Defaults to False.
+
+        Returns:
+            bool: True if operation successful, False otherwise
+
+        Raises:
+            BackupError: If backup creation fails and skip_backup is False
+        """
+        def json_serializer(data: Any, f: TextIO) -> None:
+            json.dump(data, f, indent=2, ensure_ascii=False)
+
+        return self.atomic_write_with_serializer(
+            file_path, data, json_serializer, backup_manager, hostname, skip_backup
+        )
     
     def atomic_copy(self, source: Path, target: Path) -> bool:
         """Atomic file copy operation.
@@ -228,8 +257,10 @@ class MCPHostConfigBackupManager:
             host_backup_dir.mkdir(exist_ok=True)
             
             # Generate timestamped backup filename with microseconds for uniqueness
+            # Preserve original filename instead of hardcoding 'mcp.json'
             timestamp = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
-            backup_name = f"mcp.json.{hostname}.{timestamp}"
+            original_filename = config_path.name
+            backup_name = f"{original_filename}.{hostname}.{timestamp}"
             backup_path = host_backup_dir / backup_name
             
             # Get original file size