test: add comprehensive non-interactive tests for AI-agent CLI commands

- Add non-interactive test coverage for mcpm edit, profile edit, profile inspect, client edit, and config set commands
- Fix exit code handling in commands to properly use sys.exit() for non-interactive mode
- Fix remote server environment variable validation in non_interactive.py
- Update existing tests to match corrected command behavior
- Ensure all AI-agent friendly CLI commands have proper test coverage

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: niechen

llm.txt

@@ -1,6 +1,6 @@
 # MCPM (Model Context Protocol Manager) - AI Agent Guide
 
-Generated: 2025-07-21 19:18:51 UTC
+Generated: 2025-07-22 11:32:59 UTC
 Version: 2.5.0
 
 ## Overview
@@ -151,14 +151,21 @@ mcpm config <arguments>
 
 Set MCPM configuration.
 
-Example:
+Interactive by default, or use CLI parameters for automation.
+Use --key and --value to set configuration non-interactively.
+
+Examples:
 
 
-    mcpm config set
+    mcpm config set                                    # Interactive mode
+    mcpm config set --key node_executable --value npx # Non-interactive mode
 
 
 **Parameters:**
 
+- `--key`: Configuration key to set
+- `--value`: Configuration value to set
+- `--force`: Skip confirmation prompts (flag)
 - `-h`, `--help`: Show this message and exit. (flag)
 
 **Examples:**

src/mcpm/commands/client.py

@@ -5,6 +5,7 @@
 import json
 import os
 import subprocess
+import sys
 
 from InquirerPy import inquirer
 from InquirerPy.base.control import Choice
@@ -265,7 +266,7 @@ def edit_client(client_name, external, config_path_override, add_server, remove_
     force_non_interactive = is_non_interactive() or should_force_operation() or force
 
     if has_cli_params or force_non_interactive:
-        return _edit_client_non_interactive(
+        exit_code = _edit_client_non_interactive(
             client_manager=client_manager,
             client_name=client_name,
             display_name=display_name,
@@ -278,6 +279,7 @@ def edit_client(client_name, external, config_path_override, add_server, remove_
             set_profiles=set_profiles,
             force=force,
         )
+        sys.exit(exit_code)
 
     # If external editor requested, handle that directly
     if external:

src/mcpm/commands/config.py

@@ -1,11 +1,13 @@
 """Config command for MCPM - Manage MCPM configuration"""
 
 import os
+import sys
 
 from rich.console import Console
 from rich.prompt import Prompt
 
 from mcpm.utils.config import NODE_EXECUTABLES, ConfigManager
+from mcpm.utils.non_interactive import is_non_interactive, should_force_operation
 from mcpm.utils.repository import RepositoryManager
 from mcpm.utils.rich_click_config import click
 
@@ -24,23 +26,102 @@ def config():
 
 
 @config.command()
+@click.option("--key", help="Configuration key to set")
+@click.option("--value", help="Configuration value to set")
+@click.option("--force", is_flag=True, help="Skip confirmation prompts")
 @click.help_option("-h", "--help")
-def set():
+def set(key, value, force):
     """Set MCPM configuration.
 
-    Example:
+    Interactive by default, or use CLI parameters for automation.
+    Use --key and --value to set configuration non-interactively.
+
+    Examples:
 
     \b
-        mcpm config set
+        mcpm config set                                    # Interactive mode
+        mcpm config set --key node_executable --value npx # Non-interactive mode
     """
-    set_key = Prompt.ask("Configuration key to set", choices=["node_executable"], default="node_executable")
-    node_executable = Prompt.ask(
-        "Select default node executable, it will be automatically applied when adding npx server with mcpm add",
-        choices=NODE_EXECUTABLES,
-    )
     config_manager = ConfigManager()
-    config_manager.set_config(set_key, node_executable)
-    console.print(f"[green]Default node executable set to:[/] {node_executable}")
+
+    # Check if we have CLI parameters for non-interactive mode
+    has_cli_params = key is not None and value is not None
+    force_non_interactive = is_non_interactive() or should_force_operation() or force
+
+    if has_cli_params or force_non_interactive:
+        exit_code = _set_config_non_interactive(
+            config_manager=config_manager,
+            key=key,
+            value=value,
+            force=force
+        )
+        sys.exit(exit_code)
+
+    # Interactive mode
+    set_key = Prompt.ask("Configuration key to set", choices=["node_executable"], default="node_executable")
+
+    if set_key == "node_executable":
+        node_executable = Prompt.ask(
+            "Select default node executable, it will be automatically applied when adding npx server with mcpm add",
+            choices=NODE_EXECUTABLES,
+        )
+        config_manager.set_config(set_key, node_executable)
+        console.print(f"[green]Default node executable set to:[/] {node_executable}")
+    else:
+        console.print(f"[red]Error: Unknown configuration key '{set_key}'[/]")
+
+
+def _set_config_non_interactive(config_manager, key=None, value=None, force=False):
+    """Set configuration non-interactively."""
+    try:
+        # Define supported configuration keys and their valid values
+        SUPPORTED_KEYS = {
+            "node_executable": {
+                "valid_values": NODE_EXECUTABLES,
+                "description": "Default node executable for npx servers"
+            }
+        }
+
+        # Validate that both key and value are provided in non-interactive mode
+        if not key or not value:
+            console.print("[red]Error: Both --key and --value are required in non-interactive mode[/]")
+            console.print("[dim]Use 'mcpm config set' for interactive mode[/]")
+            return 1
+
+        # Validate the configuration key
+        if key not in SUPPORTED_KEYS:
+            console.print(f"[red]Error: Unknown configuration key '{key}'[/]")
+            console.print("[yellow]Supported keys:[/]")
+            for supported_key, info in SUPPORTED_KEYS.items():
+                console.print(f"  • [cyan]{supported_key}[/] - {info['description']}")
+            return 1
+
+        # Validate the value for the specific key
+        key_info = SUPPORTED_KEYS[key]
+        if "valid_values" in key_info and value not in key_info["valid_values"]:
+            console.print(f"[red]Error: Invalid value '{value}' for key '{key}'[/]")
+            console.print(f"[yellow]Valid values for '{key}':[/]")
+            for valid_value in key_info["valid_values"]:
+                console.print(f"  • [cyan]{valid_value}[/]")
+            return 1
+
+        # Display what will be set
+        console.print("[bold green]Setting configuration:[/]")
+        console.print(f"Key: [cyan]{key}[/]")
+        console.print(f"Value: [cyan]{value}[/]")
+
+        # Set the configuration
+        success = config_manager.set_config(key, value)
+        if success:
+            console.print(f"[green]✅ Configuration '{key}' set to '{value}'[/]")
+            return 0
+        else:
+            console.print(f"[red]Error: Failed to set configuration '{key}'[/]")
+            return 1
+
+    except Exception as e:
+        console.print(f"[red]Error setting configuration: {e}[/]")
+        return 1
 
 
 @config.command()

src/mcpm/commands/new.py

@@ -2,6 +2,7 @@
 New command - Create new server configurations with interactive and non-interactive modes
 """
 
+import sys
 from typing import Optional
 
 from rich.console import Console
@@ -50,7 +51,7 @@ def new(
     force_non_interactive = is_non_interactive() or should_force_operation() or force
 
     if has_cli_params or force_non_interactive:
-        return _create_new_server_non_interactive(
+        exit_code = _create_new_server_non_interactive(
             server_name=server_name,
             server_type=server_type,
             command=command,
@@ -60,6 +61,7 @@ def new(
             headers=headers,
             force=force,
         )
+        sys.exit(exit_code)
     else:
         # Fall back to interactive mode
         return _create_new_server()
@@ -120,7 +122,6 @@ def _create_new_server_non_interactive(
                 name=config_dict["name"],
                 url=config_dict["url"],
                 headers=config_dict.get("headers", {}),
-                env=config_dict.get("env", {}),
             )
 
         # Display configuration summary
@@ -137,7 +138,7 @@ def _create_new_server_non_interactive(
                 headers_str = ", ".join(f"{k}={v}" for k, v in server_config.headers.items())
                 console.print(f"Headers: [cyan]{headers_str}[/]")
 
-        if server_config.env:
+        if hasattr(server_config, "env") and server_config.env:
             env_str = ", ".join(f"{k}={v}" for k, v in server_config.env.items())
             console.print(f"Environment: [cyan]{env_str}[/]")
 

src/mcpm/commands/profile/edit.py

@@ -1,5 +1,7 @@
 """Profile edit command."""
 
+import sys
+
 from rich.console import Console
 
 from mcpm.global_config import GlobalConfigManager
@@ -37,14 +39,14 @@ def edit_profile(profile_name, name, servers, add_server, remove_server, set_ser
         console.print("[yellow]Available options:[/]")
         console.print("  • Run 'mcpm profile ls' to see available profiles")
         console.print("  • Run 'mcpm profile create {name}' to create a profile")
-        return 1
+        sys.exit(1)
 
     # Detect if this is non-interactive mode
     has_cli_params = any([name, servers, add_server, remove_server, set_servers])
     force_non_interactive = is_non_interactive() or should_force_operation() or force
 
     if has_cli_params or force_non_interactive:
-        return _edit_profile_non_interactive(
+        exit_code = _edit_profile_non_interactive(
             profile_name=profile_name,
             new_name=name,
             servers=servers,
@@ -53,6 +55,7 @@ def edit_profile(profile_name, name, servers, add_server, remove_server, set_ser
             set_servers=set_servers,
             force=force,
         )
+        sys.exit(exit_code)
 
     else:
         # Interactive mode using InquirerPy

src/mcpm/utils/non_interactive.py

@@ -238,14 +238,16 @@ def create_server_config_from_params(
         config["command"] = command
         if args:
             config["args"] = args.split()
+        # Add environment variables if provided (stdio servers only)
+        if env:
+            config["env"] = parse_key_value_pairs(env)
     elif server_type == "remote":
         config["url"] = url
         if headers:
             config["headers"] = parse_header_pairs(headers)
-
-    # Add environment variables if provided
-    if env:
-        config["env"] = parse_key_value_pairs(env)
+        # Remote servers don't support environment variables
+        if env:
+            raise ValueError("Environment variables are not supported for remote servers")
 
     return config