refactor: consolidate force logic and improve error handling based on review

Author: JRedeker

src/mcpm/commands/install.py

@@ -94,7 +94,9 @@ def prompt_with_default(prompt_text, default="", hide_input=False, required=Fals
             return default
         if required:
             # Cannot fulfill required argument without default in non-interactive mode
-            raise click.Abort()
+            raise click.UsageError(
+                "A required value has no default and cannot be prompted in non-interactive mode."
+            )
         return ""
 
     # if default:
@@ -174,7 +176,7 @@ def install(server_name, force=False, alias=None):
 
     # Confirm addition
     alias_text = f" as '{alias}'" if alias else ""
-    if not force and not should_force_operation() and not Confirm.ask(f"Install this server to global configuration{alias_text}?"):
+    if not should_force_operation(force) and not Confirm.ask(f"Install this server to global configuration{alias_text}?"):
         console.print("[yellow]Operation cancelled.[/]")
         return
 
@@ -219,7 +221,7 @@ def install(server_name, force=False, alias=None):
             selected_method = installations[method_id]
 
         # If multiple methods are available and not forced, offer selection
-        if len(installations) > 1 and not force and not should_force_operation():
+        if len(installations) > 1 and not should_force_operation(force):
             console.print("\n[bold]Available installation methods:[/]")
             methods_list = []
 
@@ -439,7 +441,7 @@ def install(server_name, force=False, alias=None):
     )
 
     # Add server to global configuration
-    success = global_add_server(full_server_config.to_server_config(), force or should_force_operation())
+    success = global_add_server(full_server_config.to_server_config(), should_force_operation(force))
 
     if success:
         # Server has been successfully added to the global configuration

src/mcpm/commands/uninstall.py

@@ -60,7 +60,7 @@ def uninstall(server_name, force):
     print_server_config(server_info)
 
     # Get confirmation if --force is not used
-    if not force and not should_force_operation():
+    if not should_force_operation(force):
         console.print(f"\n[bold yellow]Are you sure you want to remove:[/] {server_name}")
         console.print("[italic]To bypass this confirmation, use --force[/]")
         # Use Rich's Confirm for a better user experience

src/mcpm/utils/non_interactive.py

@@ -32,13 +32,17 @@ def is_non_interactive() -> bool:
     return False
 
 
-def should_force_operation() -> bool:
+def should_force_operation(cli_force_flag: bool = False) -> bool:
     """
     Check if operations should be forced (skip confirmations).
 
-    Returns True if MCPM_FORCE environment variable is set to 'true'.
+    Args:
+        cli_force_flag: Boolean flag from CLI args (e.g. --force)
+
+    Returns:
+        True if cli_force_flag is True OR MCPM_FORCE environment variable is set to 'true'.
     """
-    return os.getenv("MCPM_FORCE", "").lower() == "true"
+    return cli_force_flag or os.getenv("MCPM_FORCE", "").lower() == "true"
 
 
 def should_output_json() -> bool: