claude-mpm 5.6.23__py3-none-any.whl → 5.6.73__py3-none-any.whl

claude_mpm/cli/parsers/oauth_parser.py

@@ -0,0 +1,165 @@
+"""
+OAuth command parser for claude-mpm CLI.
+
+WHY: This module provides the oauth command with subcommands for
+managing OAuth authentication for MCP services that require OAuth2 flows.
+
+DESIGN DECISION: 'oauth' provides comprehensive OAuth management including
+listing OAuth-capable services, setup, status, token revocation, and refresh.
+"""
+
+import argparse
+
+from .base_parser import add_common_arguments
+
+
+def add_oauth_subparser(subparsers) -> argparse.ArgumentParser:
+    """
+    Add the oauth subparser with all OAuth management subcommands.
+
+    WHY: 'oauth' provides comprehensive OAuth management for MCP services
+    that require OAuth2 authentication flows.
+
+    Args:
+        subparsers: The subparsers object from the main parser
+
+    Returns:
+        The configured oauth subparser
+    """
+    # OAuth command with subcommands
+    oauth_parser = subparsers.add_parser(
+        "oauth",
+        help="Manage OAuth authentication for MCP services",
+        description="""
+Manage OAuth authentication for MCP services.
+
+Available commands:
+  list              List OAuth-capable MCP services
+  setup <service>   Set up OAuth authentication for a service
+  status <service>  Show OAuth token status for a service
+  revoke <service>  Revoke OAuth tokens for a service
+  refresh <service> Refresh OAuth tokens for a service
+
+Examples:
+  claude-mpm oauth list
+  claude-mpm oauth setup workspace-mcp
+  claude-mpm oauth status workspace-mcp
+  claude-mpm oauth revoke workspace-mcp
+  claude-mpm oauth refresh workspace-mcp
+""",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    add_common_arguments(oauth_parser)
+
+    # Add subcommands
+    oauth_subparsers = oauth_parser.add_subparsers(
+        dest="oauth_command", help="OAuth commands", metavar="SUBCOMMAND"
+    )
+
+    # List subcommand
+    list_parser = oauth_subparsers.add_parser(
+        "list",
+        help="List OAuth-capable MCP services",
+        description="List all MCP services that support OAuth authentication.",
+    )
+    add_common_arguments(list_parser)
+    list_parser.add_argument(
+        "--format",
+        choices=["table", "json"],
+        default="table",
+        help="Output format (default: table)",
+    )
+
+    # Setup subcommand
+    setup_parser = oauth_subparsers.add_parser(
+        "setup",
+        help="Set up OAuth authentication for a service",
+        description="""
+Set up OAuth authentication for an MCP service.
+
+This command initiates the OAuth2 flow by:
+1. Looking for credentials in .env.local, .env, or environment variables
+2. Prompting for credentials if not found
+3. Opening a browser for user authentication
+4. Starting a local callback server to receive the OAuth redirect
+5. Storing the tokens securely for future use
+
+Required environment variables (checked in order):
+  1. .env.local file (highest priority)
+  2. .env file
+  3. Environment variables
+
+For Google OAuth services:
+  GOOGLE_OAUTH_CLIENT_ID     - Your OAuth client ID
+  GOOGLE_OAUTH_CLIENT_SECRET - Your OAuth client secret
+
+Get credentials from: https://console.cloud.google.com/apis/credentials
+        """,
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    add_common_arguments(setup_parser)
+    setup_parser.add_argument(
+        "service_name",
+        help="Name of the MCP service to authenticate (e.g., workspace-mcp)",
+    )
+    setup_parser.add_argument(
+        "--no-browser",
+        action="store_true",
+        help="Don't open browser automatically, just print the URL",
+    )
+    setup_parser.add_argument(
+        "--port",
+        type=int,
+        default=8085,
+        help="Port for the OAuth callback server (default: 8085)",
+    )
+
+    # Status subcommand
+    status_parser = oauth_subparsers.add_parser(
+        "status",
+        help="Show OAuth token status for a service",
+        description="Display the current OAuth token status including validity and expiration.",
+    )
+    add_common_arguments(status_parser)
+    status_parser.add_argument(
+        "service_name",
+        help="Name of the MCP service to check",
+    )
+    status_parser.add_argument(
+        "--format",
+        choices=["table", "json"],
+        default="table",
+        help="Output format (default: table)",
+    )
+
+    # Revoke subcommand
+    revoke_parser = oauth_subparsers.add_parser(
+        "revoke",
+        help="Revoke OAuth tokens for a service",
+        description="Revoke and delete stored OAuth tokens for a service.",
+    )
+    add_common_arguments(revoke_parser)
+    revoke_parser.add_argument(
+        "service_name",
+        help="Name of the MCP service to revoke tokens for",
+    )
+    revoke_parser.add_argument(
+        "-y",
+        "--yes",
+        action="store_true",
+        help="Skip confirmation prompt",
+    )
+
+    # Refresh subcommand
+    refresh_parser = oauth_subparsers.add_parser(
+        "refresh",
+        help="Refresh OAuth tokens for a service",
+        description="Refresh the OAuth tokens using the stored refresh token.",
+    )
+    add_common_arguments(refresh_parser)
+    refresh_parser.add_argument(
+        "service_name",
+        help="Name of the MCP service to refresh tokens for",
+    )
+
+    return oauth_parser

claude_mpm/cli/startup.py

@@ -13,6 +13,49 @@ import sys
 from pathlib import Path
 
 
+def cleanup_user_level_hooks() -> bool:
+    """Remove stale user-level hooks directory.
+
+    WHY: claude-mpm previously deployed hooks to ~/.claude/hooks/claude-mpm/
+    (user-level). This is now deprecated in favor of project-level hooks
+    configured in .claude/settings.local.json. Stale user-level hooks can
+    cause conflicts and confusion.
+
+    DESIGN DECISION: Runs early in startup, before project hook sync.
+    Non-blocking - failures are logged at debug level but don't prevent startup.
+
+    Returns:
+        bool: True if hooks were cleaned up, False if none found or cleanup failed
+    """
+    import shutil
+
+    user_hooks_dir = Path.home() / ".claude" / "hooks" / "claude-mpm"
+
+    if not user_hooks_dir.exists():
+        return False
+
+    try:
+        from ..core.logger import get_logger
+
+        logger = get_logger("startup")
+        logger.debug(f"Removing stale user-level hooks directory: {user_hooks_dir}")
+
+        shutil.rmtree(user_hooks_dir)
+
+        logger.debug("User-level hooks cleanup complete")
+        return True
+    except Exception as e:
+        # Non-critical - log but don't fail startup
+        try:
+            from ..core.logger import get_logger
+
+            logger = get_logger("startup")
+            logger.debug(f"Failed to cleanup user-level hooks (non-fatal): {e}")
+        except Exception:  # nosec B110
+            pass  # Avoid any errors in error handling
+        return False
+
+
 def sync_hooks_on_startup(quiet: bool = False) -> bool:
     """Ensure hooks are up-to-date on startup.
 
@@ -20,7 +63,12 @@ def sync_hooks_on_startup(quiet: bool = False) -> bool:
     Reinstalling hooks ensures the hook format matches the current code.
 
     DESIGN DECISION: Shows brief status message on success for user awareness.
-    Failures are logged but don't prevent startup to ensure claude-mpm remains functional.
+    Failures are logged but don't prevent startup to ensure claude-mpm
+    remains functional.
+
+    Workflow:
+    1. Cleanup stale user-level hooks (~/.claude/hooks/claude-mpm/)
+    2. Reinstall project-level hooks to .claude/settings.local.json
 
     Args:
         quiet: If True, suppress all output (used internally)
@@ -28,28 +76,45 @@ def sync_hooks_on_startup(quiet: bool = False) -> bool:
     Returns:
         bool: True if hooks were synced successfully, False otherwise
     """
+    is_tty = not quiet and sys.stdout.isatty()
+
+    # Step 1: Cleanup stale user-level hooks first
+    if is_tty:
+        print("Cleaning user-level hooks...", end=" ", flush=True)
+
+    cleaned = cleanup_user_level_hooks()
+
+    if is_tty:
+        if cleaned:
+            print("✓")
+        else:
+            print("(none found)")
+
+    # Step 2: Install project-level hooks
     try:
         from ..hooks.claude_hooks.installer import HookInstaller
 
         installer = HookInstaller()
 
         # Show brief status (hooks sync is fast)
-        if not quiet:
-            print("Syncing Claude Code hooks...", end=" ", flush=True)
+        if is_tty:
+            print("Installing project hooks...", end=" ", flush=True)
 
         # Reinstall hooks (force=True ensures update)
         success = installer.install_hooks(force=True)
 
-        if not quiet:
+        if is_tty:
             if success:
-                print("✓")
+                # Count hooks from settings file
+                hook_count = _count_installed_hooks(installer.settings_file)
+                print(f"{hook_count} hooks configured ✓")
             else:
                 print("(skipped)")
 
         return success
 
     except Exception as e:
-        if not quiet:
+        if is_tty:
             print("(error)")
         # Log but don't fail startup
         from ..core.logger import get_logger
@@ -59,6 +124,30 @@ def sync_hooks_on_startup(quiet: bool = False) -> bool:
         return False
 
 
+def _count_installed_hooks(settings_file: Path) -> int:
+    """Count the number of hook event types configured in settings.
+
+    Args:
+        settings_file: Path to the settings.local.json file
+
+    Returns:
+        int: Number of hook event types configured (e.g., 7 for all events)
+    """
+    import json
+
+    try:
+        if not settings_file.exists():
+            return 0
+
+        with settings_file.open() as f:
+            settings = json.load(f)
+
+        hooks = settings.get("hooks", {})
+        return len(hooks)
+    except Exception:
+        return 0
+
+
 def cleanup_legacy_agent_cache() -> None:
     """Remove legacy hierarchical agent cache directories.
 
@@ -196,7 +285,7 @@ def should_skip_background_services(args, processed_argv):
     """
     Determine if background services should be skipped for this command.
 
-    WHY: Some commands (help, version, configure, doctor) don't need
+    WHY: Some commands (help, version, configure, doctor, oauth) don't need
     background services and should start faster.
 
     Args:
@@ -219,6 +308,7 @@ def should_skip_background_services(args, processed_argv):
             "hook-errors",
             "autotodos",
             "commander",
+            "oauth",
         ]
     )
 
@@ -280,11 +370,13 @@ def deploy_bundled_skills():
         if deployment_result.get("deployed"):
             # Show simple feedback for deployed skills
             deployed_count = len(deployment_result["deployed"])
-            print(f"✓ Bundled skills ready ({deployed_count} deployed)", flush=True)
+            if sys.stdout.isatty():
+                print(f"✓ Bundled skills ready ({deployed_count} deployed)", flush=True)
             logger.info(f"Skills: Deployed {deployed_count} skill(s)")
         elif not deployment_result.get("errors"):
             # No deployment needed, skills already present
-            print("✓ Bundled skills ready", flush=True)
+            if sys.stdout.isatty():
+                print("✓ Bundled skills ready", flush=True)
 
         if deployment_result.get("errors"):
             logger.warning(
@@ -318,7 +410,8 @@ def discover_and_link_runtime_skills():
 
         discover_skills()
         # Show simple success feedback
-        print("✓ Runtime skills linked", flush=True)
+        if sys.stdout.isatty():
+            print("✓ Runtime skills linked", flush=True)
     except Exception as e:
         # Import logger here to avoid circular imports
         from ..core.logger import get_logger
@@ -373,7 +466,8 @@ def deploy_output_style_on_startup():
 
         if all_up_to_date:
             # Show feedback that output styles are ready
-            print("✓ Output styles ready", flush=True)
+            if sys.stdout.isatty():
+                print("✓ Output styles ready", flush=True)
             return
 
         # Deploy all styles using the manager
@@ -383,7 +477,8 @@ def deploy_output_style_on_startup():
         deployed_count = sum(1 for success in results.values() if success)
 
         if deployed_count > 0:
-            print(f"✓ Output styles deployed ({deployed_count} styles)", flush=True)
+            if sys.stdout.isatty():
+                print(f"✓ Output styles deployed ({deployed_count} styles)", flush=True)
         else:
             # Deployment failed - log but don't fail startup
             from ..core.logger import get_logger
@@ -1290,9 +1385,11 @@ def verify_and_show_pm_skills():
         if result.verified:
             # Show verified status with count
             total_required = len(REQUIRED_PM_SKILLS)
-            print(
-                f"✓ PM skills: {total_required}/{total_required} verified", flush=True
-            )
+            if sys.stdout.isatty():
+                print(
+                    f"✓ PM skills: {total_required}/{total_required} verified",
+                    flush=True,
+                )
         else:
             # Show warning with details
             missing_count = len(result.missing_skills)
@@ -1311,13 +1408,15 @@ def verify_and_show_pm_skills():
             if "Auto-repaired" in result.message:
                 # Auto-repair succeeded
                 total_required = len(REQUIRED_PM_SKILLS)
-                print(
-                    f"✓ PM skills: {total_required}/{total_required} verified (auto-repaired)",
-                    flush=True,
-                )
+                if sys.stdout.isatty():
+                    print(
+                        f"✓ PM skills: {total_required}/{total_required} verified (auto-repaired)",
+                        flush=True,
+                    )
             else:
                 # Auto-repair failed or not attempted
-                print(f"⚠ PM skills: {status}", flush=True)
+                if sys.stdout.isatty():
+                    print(f"⚠ PM skills: {status}", flush=True)
 
                 # Log warnings for debugging
                 from ..core.logger import get_logger
@@ -1377,6 +1476,28 @@ def auto_install_chrome_devtools_on_startup():
         # Continue execution - chrome-devtools installation failure shouldn't block startup
 
 
+def sync_deployment_on_startup(force_sync: bool = False) -> None:
+    """Consolidated deployment block: hooks + agents.
+
+    WHY: Groups all deployment tasks into a single logical block for clarity.
+    This ensures hooks and agents are deployed together before other services.
+
+    Order:
+    1. Hook cleanup (remove ~/.claude/hooks/claude-mpm/)
+    2. Hook reinstall (update .claude/settings.local.json)
+    3. Agent sync from remote Git sources
+
+    Args:
+        force_sync: Force download even if cache is fresh (bypasses ETag).
+    """
+    # Step 1-2: Hooks (cleanup + reinstall handled by sync_hooks_on_startup)
+    sync_hooks_on_startup()  # Shows "Syncing Claude Code hooks... ✓"
+
+    # Step 3: Agents from remote sources
+    sync_remote_agents_on_startup(force_sync=force_sync)
+    show_agent_summary()  # Display agent counts after deployment
+
+
 def run_background_services(force_sync: bool = False):
     """
     Initialize all background services on startup.
@@ -1392,19 +1513,15 @@ def run_background_services(force_sync: bool = False):
     Args:
         force_sync: Force download even if cache is fresh (bypasses ETag).
     """
-    # Sync hooks early to ensure up-to-date configuration
-    # RATIONALE: Hooks should be synced before other services to fix stale configs
-    # This is fast (<100ms) and non-blocking, so it doesn't delay startup
-    sync_hooks_on_startup()  # Shows "Syncing Claude Code hooks... ✓"
+    # Consolidated deployment block: hooks + agents
+    # RATIONALE: Hooks and agents are deployed together before other services
+    # This ensures the deployment phase is complete before configuration checks
+    sync_deployment_on_startup(force_sync=force_sync)
 
     initialize_project_registry()
     check_mcp_auto_configuration()
     verify_mcp_gateway_startup()
     check_for_updates_async()
-    sync_remote_agents_on_startup(
-        force_sync=force_sync
-    )  # Sync agents from remote sources
-    show_agent_summary()  # Display agent counts after deployment
 
     # Skills deployment order (precedence: remote > bundled)
     # 1. Deploy bundled skills first (base layer from package)
@@ -1516,7 +1633,9 @@ def check_mcp_auto_configuration():
         from ..services.mcp_gateway.auto_configure import check_and_configure_mcp
 
         # Show progress feedback - this operation can take 10+ seconds
-        print("Checking MCP configuration...", end="", flush=True)
+        # Only show progress message in TTY mode to avoid interfering with Claude Code's status display
+        if sys.stdout.isatty():
+            print("Checking MCP configuration...", end="", flush=True)
 
         # This function handles all the logic:
         # - Checks if already configured
@@ -1530,16 +1649,14 @@ def check_mcp_auto_configuration():
         # Only use carriage return clearing if stdout is a real TTY
         if sys.stdout.isatty():
             print("\r" + " " * 30 + "\r", end="", flush=True)
-        else:
-            print()  # Simple newline for non-TTY (like Claude Code REPL)
+        # In non-TTY mode, don't print anything - the "Checking..." message will just remain on its line
 
     except Exception as e:
         # Clear progress message on error
         # Only use carriage return clearing if stdout is a real TTY
         if sys.stdout.isatty():
             print("\r" + " " * 30 + "\r", end="", flush=True)
-        else:
-            print()  # Simple newline for non-TTY (like Claude Code REPL)
+        # In non-TTY mode, don't print anything - the "Checking..." message will just remain on its line
 
         # Non-critical - log but don't fail
         from ..core.logger import get_logger

claude_mpm/cli/startup_display.py

@@ -531,7 +531,7 @@ def should_show_banner(args) -> bool:
     """
     Determine if startup banner should be displayed.
 
-    Skip banner for: --help, --version, info, doctor, config, configure commands
+    Skip banner for: --help, --version, info, doctor, config, configure, oauth commands
     """
     # Check for help/version flags
     if hasattr(args, "help") and args.help:
@@ -541,7 +541,8 @@ def should_show_banner(args) -> bool:
 
     # Check for commands that should skip banner
     # Commander has its own banner, so skip the main MPM banner
-    skip_commands = {"info", "doctor", "config", "configure", "commander"}
+    # OAuth commands are lightweight utilities that should run immediately
+    skip_commands = {"info", "doctor", "config", "configure", "commander", "oauth"}
     if hasattr(args, "command") and args.command in skip_commands:
         return False
 

claude_mpm/commander/chat/cli.py

@@ -68,11 +68,14 @@ async def run_commander(
     if config is None:
         config = CommanderCLIConfig(port=port, state_dir=state_dir)
 
-    # Setup logging
+    # Setup logging - suppress noisy libraries
     logging.basicConfig(
         level=logging.INFO,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+        format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
     )
+    # Suppress httpx request logging (very verbose)
+    logging.getLogger("httpx").setLevel(logging.WARNING)
+    logging.getLogger("httpcore").setLevel(logging.WARNING)
 
     # Initialize components
     logger.info("Initializing Commander...")

claude_mpm/commander/chat/commands.py

@@ -11,12 +11,18 @@ class CommandType(Enum):
     LIST = "list"
     START = "start"
     STOP = "stop"
+    CLOSE = "close"
+    REGISTER = "register"
     CONNECT = "connect"
     DISCONNECT = "disconnect"
+    SAVED = "saved"
+    FORGET = "forget"
     STATUS = "status"
     HELP = "help"
     EXIT = "exit"
     INSTANCES = "instances"  # alias for list
+    MPM_OAUTH = "mpm-oauth"
+    CLEANUP = "cleanup"
 
 
 @dataclass
@@ -31,27 +37,43 @@ class Command:
 class CommandParser:
     """Parses user input into commands."""
 
-    ALIASES = {
+    # Map slash command names to CommandType
+    SLASH_COMMANDS = {
+        "register": CommandType.REGISTER,
+        "start": CommandType.START,
+        "stop": CommandType.STOP,
+        "close": CommandType.CLOSE,
+        "connect": CommandType.CONNECT,
+        "disconnect": CommandType.DISCONNECT,
+        "switch": CommandType.CONNECT,  # alias for connect
+        "list": CommandType.LIST,
         "ls": CommandType.LIST,
-        "instances": CommandType.LIST,
+        "saved": CommandType.SAVED,
+        "forget": CommandType.FORGET,
+        "status": CommandType.STATUS,
+        "help": CommandType.HELP,
+        "exit": CommandType.EXIT,
         "quit": CommandType.EXIT,
         "q": CommandType.EXIT,
+        "mpm-oauth": CommandType.MPM_OAUTH,
+        "cleanup": CommandType.CLEANUP,
     }
 
     def parse(self, input_text: str) -> Optional[Command]:
         """Parse input into a Command.
 
-        Returns None if input is not a built-in command (natural language).
+        Returns None if input is not a slash command (natural language).
+        System commands must start with '/'.
 
         Args:
             input_text: Raw user input.
 
         Returns:
-            Command if input is a built-in command, None otherwise.
+            Command if input is a slash command, None otherwise.
 
         Example:
             >>> parser = CommandParser()
-            >>> cmd = parser.parse("list")
+            >>> cmd = parser.parse("/list")
             >>> cmd.type
             <CommandType.LIST: 'list'>
             >>> parser.parse("tell me about the code")
@@ -60,22 +82,26 @@ class CommandParser:
         if not input_text:
             return None
 
-        parts = input_text.split()
+        # System commands must start with /
+        if not input_text.startswith("/"):
+            return None
+
+        # Remove the leading / and parse
+        cmd_line = input_text[1:]
+        parts = cmd_line.split()
+        if not parts:
+            return None
+
         command_str = parts[0].lower()
         args = parts[1:] if len(parts) > 1 else []
 
-        # Check if it's an alias
-        if command_str in self.ALIASES:
-            cmd_type = self.ALIASES[command_str]
+        # Check if it's a valid slash command
+        if command_str in self.SLASH_COMMANDS:
+            cmd_type = self.SLASH_COMMANDS[command_str]
             return Command(type=cmd_type, args=args, raw=input_text)
 
-        # Check if it's a direct command
-        try:
-            cmd_type = CommandType(command_str)
-            return Command(type=cmd_type, args=args, raw=input_text)
-        except ValueError:
-            # Not a built-in command
-            return None
+        # Unknown slash command
+        return None
 
     def is_command(self, input_text: str) -> bool:
         """Check if input is a built-in command.