Refactor EnvFormatter to eliminate code duplication (DRY)

Co-authored-by: MaestroError <46760939+MaestroError@users.noreply.github.com>

Author: Copilot

src/mci/cli/envs.py

@@ -87,7 +87,10 @@ def extract_env_vars_from_schema(schema_path: str) -> dict[str, list[str]]:
             except Exception as e:
                 # Warn but continue if toolset file is invalid
                 console = Console()
-                console.print(f"[yellow]⚠[/yellow] Warning: Could not load toolset '{toolset_name}': {e}", style="yellow")
+                console.print(
+                    f"[yellow]⚠[/yellow] Warning: Could not load toolset '{toolset_name}': {e}",
+                    style="yellow",
+                )
 
     # Scan MCP servers
     mcp_servers = main_schema.get("mcp_servers", {})

src/mci/cli/formatters/env_formatter.py

@@ -16,33 +16,26 @@ class EnvFormatter:
     """
 
     @staticmethod
-    def format_to_file(env_vars: dict[str, list[str]], output_path: str | None = None) -> str:
+    def format_to_string(env_vars: dict[str, list[str]]) -> str:
         """
-        Format environment variables and write to .env.example.mci file.
+        Format environment variables as a string in .env format.
 
         Args:
             env_vars: Dictionary mapping variable names to list of locations where used
-            output_path: Optional custom output path (default: .env.example.mci)
 
         Returns:
-            Path to the generated file
+            Formatted string in .env format
 
         Example:
-            >>> env_vars = {
-            ...     "API_KEY": ["main", "weather-toolset"],
-            ...     "DB_URL": ["database-toolset"]
-            ... }
-            >>> path = EnvFormatter.format_to_file(env_vars)
-            >>> print(path)
-            .env.example.mci
+            >>> env_vars = {"API_KEY": ["main"], "DB_URL": ["database-toolset"]}
+            >>> print(EnvFormatter.format_to_string(env_vars))
+            # .env.example.mci
+            ...
         """
-        if output_path is None:
-            output_path = ".env.example.mci"
-
         # Sort variables alphabetically
         sorted_vars = sorted(env_vars.keys())
 
-        # Generate file content
+        # Generate content
         lines: list[str] = []
         lines.append("# .env.example.mci")
         lines.append("# Environment variables used in MCI configuration")
@@ -58,46 +51,33 @@ def format_to_file(env_vars: dict[str, list[str]], output_path: str | None = Non
             lines.append(f"{var_name}=")
             lines.append("")
 
-        # Write to file
-        content = "\n".join(lines)
-        Path(output_path).write_text(content)
-
-        return output_path
+        return "\n".join(lines)
 
     @staticmethod
-    def format_to_string(env_vars: dict[str, list[str]]) -> str:
+    def format_to_file(env_vars: dict[str, list[str]], output_path: str | None = None) -> str:
         """
-        Format environment variables as a string in .env format.
+        Format environment variables and write to .env.example.mci file.
 
         Args:
             env_vars: Dictionary mapping variable names to list of locations where used
+            output_path: Optional custom output path (default: .env.example.mci)
 
         Returns:
-            Formatted string in .env format
+            Path to the generated file
 
         Example:
-            >>> env_vars = {"API_KEY": ["main"], "DB_URL": ["database-toolset"]}
-            >>> print(EnvFormatter.format_to_string(env_vars))
-            # .env.example.mci
-            ...
+            >>> env_vars = {
+            ...     "API_KEY": ["main", "weather-toolset"],
+            ...     "DB_URL": ["database-toolset"]
+            ... }
+            >>> path = EnvFormatter.format_to_file(env_vars)
+            >>> print(path)
+            .env.example.mci
         """
-        # Sort variables alphabetically
-        sorted_vars = sorted(env_vars.keys())
-
-        # Generate content
-        lines: list[str] = []
-        lines.append("# .env.example.mci")
-        lines.append("# Environment variables used in MCI configuration")
-        lines.append("#")
-        lines.append("# Copy this file to .env.mci and fill in your values")
-        lines.append("")
+        if output_path is None:
+            output_path = ".env.example.mci"
 
-        for var_name in sorted_vars:
-            locations = env_vars[var_name]
-            # Add comment showing where the variable is used
-            location_str = ", ".join(sorted(locations))
-            lines.append(f"# Used in: {location_str}")
-            lines.append(f"{var_name}=")
-            lines.append("")
+        content = EnvFormatter.format_to_string(env_vars)
+        Path(output_path).write_text(content)
 
-        return "\n".join(lines)
+        return output_path