claude-mpm 3.1.3__py3-none-any.whl → 3.2.1__py3-none-any.whl

claude_mpm/cli/commands/run.py

@@ -5,20 +5,91 @@ WHY: This module handles the main 'run' command which starts Claude sessions.
 It's the most commonly used command and handles both interactive and non-interactive modes.
 """
 
+import os
 import subprocess
 import sys
+import time
+import webbrowser
 from pathlib import Path
 
-from claude_mpm.utils.imports import safe_import
+from ...core.logger import get_logger
+from ...constants import LogLevel
+from ..utils import get_user_input, list_agent_versions_at_startup
+from ...utils.dependency_manager import ensure_socketio_dependencies
+from ...deployment_paths import get_monitor_html_path, get_scripts_dir, get_package_root
 
-# Import with safe_import pattern for better error handling
-get_logger = safe_import('claude_mpm.core.logger', None, ['get_logger'])
-LogLevel = safe_import('claude_mpm.constants', None, ['LogLevel'])
-get_user_input, list_agent_versions_at_startup = safe_import(
-    'claude_mpm.cli.utils', 
-    None, 
-    ['get_user_input', 'list_agent_versions_at_startup']
-)
+
+def filter_claude_mpm_args(claude_args):
+    """
+    Filter out claude-mpm specific arguments from claude_args before passing to Claude CLI.
+    
+    WHY: The argparse.REMAINDER captures ALL remaining arguments, including claude-mpm
+    specific flags like --monitor, etc. Claude CLI doesn't understand these
+    flags and will error if they're passed through.
+    
+    DESIGN DECISION: We maintain a list of known claude-mpm flags to filter out,
+    ensuring only genuine Claude CLI arguments are passed through.
+    
+    Args:
+        claude_args: List of arguments captured by argparse.REMAINDER
+        
+    Returns:
+        Filtered list of arguments safe to pass to Claude CLI
+    """
+    if not claude_args:
+        return []
+    
+    # Known claude-mpm specific flags that should NOT be passed to Claude CLI
+    # This includes all MPM-specific arguments from the parser
+    mpm_flags = {
+        # Run-specific flags
+        '--monitor',
+        '--websocket-port',
+        '--no-hooks',
+        '--no-tickets',
+        '--intercept-commands',
+        '--no-native-agents',
+        '--launch-method',
+        '--resume',
+        # Input/output flags (these are MPM-specific, not Claude CLI flags)
+        '--input',
+        '--non-interactive',
+        # Common logging flags (these are MPM-specific, not Claude CLI flags)
+        '--debug',
+        '--logging',
+        '--log-dir',
+        # Framework flags (these are MPM-specific)
+        '--framework-path',
+        '--agents-dir',
+        # Version flag (handled by MPM)
+        '--version',
+        # Short flags (MPM-specific equivalents)
+        '-i',  # --input (MPM-specific, not Claude CLI)
+        '-d'   # --debug (MPM-specific, not Claude CLI)
+    }
+    
+    filtered_args = []
+    i = 0
+    while i < len(claude_args):
+        arg = claude_args[i]
+        
+        # Check if this is a claude-mpm flag
+        if arg in mpm_flags:
+            # Skip this flag
+            i += 1
+            # Also skip the next argument if this flag expects a value
+            value_expecting_flags = {
+                '--websocket-port', '--launch-method', '--logging', '--log-dir', 
+                '--framework-path', '--agents-dir', '-i', '--input', '--resume'
+            }
+            if arg in value_expecting_flags and i < len(claude_args):
+                i += 1  # Skip the value too
+        else:
+            # This is not a claude-mpm flag, keep it
+            filtered_args.append(arg)
+            i += 1
+    
+    return filtered_args
 
 
 def run_session(args):
@@ -28,29 +99,21 @@ def run_session(args):
     WHY: This is the primary command that users interact with. It sets up the
     environment, optionally deploys agents, and launches Claude with the MPM framework.
     
-    DESIGN DECISION: We use SimpleClaudeRunner to handle the complexity of
+    DESIGN DECISION: We use ClaudeRunner to handle the complexity of
     subprocess management and hook integration, keeping this function focused
     on high-level orchestration.
     
     Args:
         args: Parsed command line arguments
     """
-    import os
     logger = get_logger("cli")
     if args.logging != LogLevel.OFF.value:
         logger.info("Starting Claude MPM session")
-        # Log working directory context
-        logger.info(f"Working directory: {os.getcwd()}")
-        if args.debug:
-            logger.debug(f"User PWD (from env): {os.environ.get('CLAUDE_MPM_USER_PWD', 'Not set')}")
-            logger.debug(f"Framework path: {os.environ.get('CLAUDE_MPM_FRAMEWORK_PATH', 'Not set')}")
-    
-    # Import SimpleClaudeRunner using safe_import pattern
-    SimpleClaudeRunner, create_simple_context = safe_import(
-        'claude_mpm.core.simple_runner',
-        None,
-        ['SimpleClaudeRunner', 'create_simple_context']
-    )
+    
+    try:
+        from ...core.claude_runner import ClaudeRunner, create_simple_context
+    except ImportError:
+        from claude_mpm.core.claude_runner import ClaudeRunner, create_simple_context
     
     # Skip native agents if disabled
     if getattr(args, 'no_native_agents', False):
@@ -61,16 +124,81 @@ def run_session(args):
     
     # Create simple runner
     enable_tickets = not args.no_tickets
-    claude_args = getattr(args, 'claude_args', []) or []
-    runner = SimpleClaudeRunner(
+    raw_claude_args = getattr(args, 'claude_args', []) or []
+    # Filter out claude-mpm specific flags before passing to Claude CLI
+    claude_args = filter_claude_mpm_args(raw_claude_args)
+    monitor_mode = getattr(args, 'monitor', False)
+    
+    # Debug logging for argument filtering
+    if raw_claude_args != claude_args:
+        logger.debug(f"Filtered claude-mpm args: {set(raw_claude_args) - set(claude_args)}")
+        logger.debug(f"Passing to Claude CLI: {claude_args}")
+    
+    # Use the specified launch method (default: exec)
+    launch_method = getattr(args, 'launch_method', 'exec')
+    
+    enable_websocket = getattr(args, 'monitor', False) or monitor_mode
+    websocket_port = getattr(args, 'websocket_port', 8765)
+    
+    # Display Socket.IO server info if enabled
+    if enable_websocket:
+        # Auto-install Socket.IO dependencies if needed
+        print("🔧 Checking Socket.IO dependencies...")
+        dependencies_ok, error_msg = ensure_socketio_dependencies(logger)
+        
+        if not dependencies_ok:
+            print(f"❌ Failed to install Socket.IO dependencies: {error_msg}")
+            print("  Please install manually: pip install python-socketio aiohttp python-engineio")
+            print("  Or install with extras: pip install claude-mpm[monitor]")
+            # Continue anyway - some functionality might still work
+        else:
+            print("✓ Socket.IO dependencies ready")
+        
+        try:
+            import socketio
+            print(f"✓ Socket.IO server enabled at http://localhost:{websocket_port}")
+            if launch_method == "exec":
+                print("  Note: Socket.IO monitoring using exec mode with Claude Code hooks")
+            
+            # Launch Socket.IO dashboard if in monitor mode
+            if monitor_mode:
+                success, browser_opened = launch_socketio_monitor(websocket_port, logger)
+                if not success:
+                    print(f"⚠️  Failed to launch Socket.IO monitor")
+                    print(f"  You can manually run: python scripts/launch_socketio_dashboard.py --port {websocket_port}")
+                # Store whether browser was opened by CLI for coordination with ClaudeRunner
+                args._browser_opened_by_cli = browser_opened
+        except ImportError as e:
+            print(f"⚠️  Socket.IO still not available after installation attempt: {e}")
+            print("  This might be a virtual environment issue.")
+            print("  Try: pip install python-socketio aiohttp python-engineio")
+            print("  Or: pip install claude-mpm[monitor]")
+    
+    runner = ClaudeRunner(
         enable_tickets=enable_tickets,
         log_level=args.logging,
-        claude_args=claude_args
+        claude_args=claude_args,
+        launch_method=launch_method,
+        enable_websocket=enable_websocket,
+        websocket_port=websocket_port
     )
     
+    # Set browser opening flag for monitor mode
+    if monitor_mode:
+        runner._should_open_monitor_browser = True
+        # Pass information about whether we already opened the browser in run.py
+        runner._browser_opened_by_cli = getattr(args, '_browser_opened_by_cli', False)
+    
     # Create basic context
     context = create_simple_context()
     
+    # For monitor mode, we handled everything in launch_socketio_monitor
+    # No need for ClaudeRunner browser delegation
+    if monitor_mode:
+        # Clear any browser opening flags since we handled it completely
+        runner._should_open_monitor_browser = False
+        runner._browser_opened_by_cli = True  # Prevent duplicate opening
+    
     # Run session based on mode
     if args.non_interactive or args.input:
         # Non-interactive mode
@@ -84,7 +212,7 @@ def run_session(args):
             # Use the interactive wrapper for command interception
             # WHY: Command interception requires special handling of stdin/stdout
             # which is better done in a separate Python script
-            wrapper_path = Path(__file__).parent.parent.parent.parent.parent / "scripts" / "interactive_wrapper.py"
+            wrapper_path = get_scripts_dir() / "interactive_wrapper.py"
             if wrapper_path.exists():
                 print("Starting interactive session with command interception...")
                 subprocess.run([sys.executable, str(wrapper_path)])
@@ -92,4 +220,349 @@ def run_session(args):
                 logger.warning("Interactive wrapper not found, falling back to normal mode")
                 runner.run_interactive(context)
         else:
-            runner.run_interactive(context)
+            runner.run_interactive(context)
+
+
+def launch_socketio_monitor(port, logger):
+    """
+    Launch the Socket.IO monitoring dashboard using static HTML file.
+    
+    WHY: This function opens a static HTML file that connects to the Socket.IO server.
+    This approach is simpler and more reliable than serving the dashboard from the server.
+    The HTML file connects to whatever Socket.IO server is running on the specified port.
+    
+    DESIGN DECISION: Use file:// protocol to open static HTML file directly from filesystem.
+    Pass the server port as a URL parameter so the dashboard knows which port to connect to.
+    This decouples the dashboard from the server serving and makes it more robust.
+    
+    Args:
+        port: Port number for the Socket.IO server
+        logger: Logger instance for output
+        
+    Returns:
+        tuple: (success: bool, browser_opened: bool) - success status and whether browser was opened
+    """
+    try:
+        # Verify Socket.IO dependencies are available
+        try:
+            import socketio
+            import aiohttp
+            import engineio
+            logger.debug("Socket.IO dependencies verified")
+        except ImportError as e:
+            logger.error(f"Socket.IO dependencies not available: {e}")
+            print(f"❌ Socket.IO dependencies missing: {e}")
+            print("  This is unexpected - dependency installation may have failed.")
+            return False, False
+        
+        print(f"🚀 Setting up Socket.IO monitor on port {port}...")
+        logger.info(f"Launching Socket.IO monitor on port {port}")
+        
+        socketio_port = port
+        
+        # Get path to monitor HTML using deployment paths
+        html_file_path = get_monitor_html_path()
+        
+        if not html_file_path.exists():
+            logger.error(f"Monitor HTML file not found: {html_file_path}")
+            print(f"❌ Monitor HTML file not found: {html_file_path}")
+            return False, False
+        
+        # Create file:// URL with port parameter
+        dashboard_url = f'file://{html_file_path.absolute()}?port={socketio_port}'
+        
+        # Check if Socket.IO server is already running
+        server_running = _check_socketio_server_running(socketio_port, logger)
+        
+        if server_running:
+            print(f"✅ Socket.IO server already running on port {socketio_port}")
+            
+            # Check if it's managed by our daemon
+            daemon_script = get_package_root() / "scripts" / "socketio_daemon.py"
+            if daemon_script.exists():
+                status_result = subprocess.run(
+                    [sys.executable, str(daemon_script), "status"],
+                    capture_output=True,
+                    text=True
+                )
+                if "is running" in status_result.stdout:
+                    print(f"   (Managed by Python daemon)")
+            
+            print(f"📊 Dashboard: {dashboard_url}")
+            
+            # Open browser with static HTML file
+            try:
+                # Check if we should suppress browser opening (for tests)
+                if os.environ.get('CLAUDE_MPM_NO_BROWSER') != '1':
+                    print(f"🌐 Opening dashboard in browser...")
+                    open_in_browser_tab(dashboard_url, logger)
+                    logger.info(f"Socket.IO dashboard opened: {dashboard_url}")
+                else:
+                    print(f"🌐 Browser opening suppressed (CLAUDE_MPM_NO_BROWSER=1)")
+                    logger.info(f"Browser opening suppressed by environment variable")
+                return True, True
+            except Exception as e:
+                logger.warning(f"Failed to open browser: {e}")
+                print(f"⚠️  Could not open browser automatically")
+                print(f"📊 Please open manually: {dashboard_url}")
+                return True, False
+        else:
+            # Start standalone Socket.IO server
+            print(f"🔧 Starting Socket.IO server on port {socketio_port}...")
+            server_started = _start_standalone_socketio_server(socketio_port, logger)
+            
+            if server_started:
+                print(f"✅ Socket.IO server started successfully")
+                print(f"📊 Dashboard: {dashboard_url}")
+                
+                # Final verification that server is responsive
+                final_check_passed = False
+                for i in range(3):
+                    if _check_socketio_server_running(socketio_port, logger):
+                        final_check_passed = True
+                        break
+                    time.sleep(1)
+                
+                if not final_check_passed:
+                    logger.warning("Server started but final connectivity check failed")
+                    print(f"⚠️  Server may still be initializing. Dashboard should work once fully ready.")
+                
+                # Open browser with static HTML file
+                try:
+                    # Check if we should suppress browser opening (for tests)
+                    if os.environ.get('CLAUDE_MPM_NO_BROWSER') != '1':
+                        print(f"🌐 Opening dashboard in browser...")
+                        open_in_browser_tab(dashboard_url, logger)
+                        logger.info(f"Socket.IO dashboard opened: {dashboard_url}")
+                    else:
+                        print(f"🌐 Browser opening suppressed (CLAUDE_MPM_NO_BROWSER=1)")
+                        logger.info(f"Browser opening suppressed by environment variable")
+                    return True, True
+                except Exception as e:
+                    logger.warning(f"Failed to open browser: {e}")
+                    print(f"⚠️  Could not open browser automatically")
+                    print(f"📊 Please open manually: {dashboard_url}")
+                    return True, False
+            else:
+                print(f"❌ Failed to start Socket.IO server")
+                print(f"💡 Troubleshooting tips:")
+                print(f"   - Check if port {socketio_port} is already in use")
+                print(f"   - Verify Socket.IO dependencies: pip install python-socketio aiohttp")
+                print(f"   - Try a different port with --websocket-port")
+                return False, False
+        
+    except Exception as e:
+        logger.error(f"Failed to launch Socket.IO monitor: {e}")
+        print(f"❌ Failed to launch Socket.IO monitor: {e}")
+        return False, False
+
+
+def _check_socketio_server_running(port, logger):
+    """
+    Check if a Socket.IO server is running on the specified port.
+    
+    WHY: We need to detect existing servers to avoid conflicts and provide
+    seamless experience regardless of whether server is already running.
+    
+    DESIGN DECISION: We try multiple endpoints and connection methods to ensure
+    robust detection. Some servers may be starting up and only partially ready.
+    
+    Args:
+        port: Port number to check
+        logger: Logger instance for output
+        
+    Returns:
+        bool: True if server is running and responding, False otherwise
+    """
+    try:
+        import urllib.request
+        import urllib.error
+        import socket
+        
+        # First, do a basic TCP connection check
+        try:
+            with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+                s.settimeout(1.0)
+                result = s.connect_ex(('127.0.0.1', port))
+                if result != 0:
+                    logger.debug(f"TCP connection to port {port} failed (not listening)")
+                    return False
+        except Exception as e:
+            logger.debug(f"TCP socket check failed for port {port}: {e}")
+            return False
+        
+        # If TCP connection succeeds, try HTTP health check
+        try:
+            response = urllib.request.urlopen(f'http://localhost:{port}/status', timeout=5)
+            
+            if response.getcode() == 200:
+                content = response.read().decode()
+                logger.debug(f"✅ Socket.IO server health check passed on port {port}")
+                logger.debug(f"📄 Server response: {content[:100]}...")
+                return True
+            else:
+                logger.debug(f"⚠️ HTTP response code {response.getcode()} from port {port}")
+                return False
+                
+        except urllib.error.HTTPError as e:
+            logger.debug(f"⚠️ HTTP error {e.code} from server on port {port}")
+            return False
+        except urllib.error.URLError as e:
+            logger.debug(f"⚠️ URL error connecting to port {port}: {e.reason}")
+            return False
+            
+    except (ConnectionError, OSError) as e:
+        logger.debug(f"🔌 Connection error checking port {port}: {e}")
+    except Exception as e:
+        logger.debug(f"❌ Unexpected error checking Socket.IO server on port {port}: {e}")
+    
+    return False
+
+
+def _start_standalone_socketio_server(port, logger):
+    """
+    Start a standalone Socket.IO server using the Python daemon.
+    
+    WHY: For monitor mode, we want a persistent server that runs independently
+    of the Claude session. This allows users to monitor multiple sessions and
+    keeps the dashboard available even when Claude isn't running.
+    
+    DESIGN DECISION: We use a pure Python daemon script to manage the server
+    process. This avoids Node.js dependencies (like PM2) and provides proper
+    process management with PID tracking.
+    
+    Args:
+        port: Port number for the server
+        logger: Logger instance for output
+        
+    Returns:
+        bool: True if server started successfully, False otherwise
+    """
+    try:
+        from ...deployment_paths import get_scripts_dir
+        import subprocess
+        
+        # Get path to daemon script in package
+        daemon_script = get_package_root() / "scripts" / "socketio_daemon.py"
+        
+        if not daemon_script.exists():
+            logger.error(f"Socket.IO daemon script not found: {daemon_script}")
+            return False
+        
+        logger.info(f"Starting Socket.IO server daemon on port {port}")
+        
+        # Start the daemon
+        result = subprocess.run(
+            [sys.executable, str(daemon_script), "start"],
+            capture_output=True,
+            text=True
+        )
+        
+        if result.returncode != 0:
+            logger.error(f"Failed to start Socket.IO daemon: {result.stderr}")
+            return False
+        
+        # Wait for server to be ready with longer timeouts and progressive delays
+        # WHY: Socket.IO server startup involves complex async initialization:
+        # 1. Thread creation (~0.1s)
+        # 2. Event loop setup (~1s) 
+        # 3. aiohttp server binding (~2-5s)
+        # 4. Socket.IO service initialization (~1-3s)
+        # Total: up to 10 seconds for full readiness
+        max_attempts = 20  # Increased from 10
+        initial_delay = 0.5  # seconds
+        max_delay = 2.0  # seconds
+        
+        logger.info(f"Waiting up to {max_attempts * max_delay} seconds for server to be fully ready...")
+        
+        for attempt in range(max_attempts):
+            # Progressive delay - start fast, then slow down for socket binding
+            if attempt < 5:
+                delay = initial_delay
+            else:
+                delay = min(max_delay, initial_delay + (attempt - 5) * 0.2)
+            
+            logger.debug(f"Checking server readiness (attempt {attempt + 1}/{max_attempts}, waiting {delay}s)")
+            
+            # Check if thread is alive first
+            if hasattr(server, 'thread') and server.thread and server.thread.is_alive():
+                logger.debug("Server thread is alive, checking connectivity...")
+                
+                # Give it time for socket binding (progressive delay)
+                time.sleep(delay)
+                
+                # Verify it's actually accepting connections
+                if _check_socketio_server_running(port, logger):
+                    logger.info(f"✅ Standalone Socket.IO server started successfully on port {port}")
+                    logger.info(f"🕐 Server ready after {attempt + 1} attempts ({(attempt + 1) * delay:.1f}s)")
+                    return True
+                else:
+                    logger.debug(f"Server not yet accepting connections on attempt {attempt + 1}")
+            else:
+                logger.warning(f"Server thread not alive or not created on attempt {attempt + 1}")
+                # Give thread more time to start
+                time.sleep(delay)
+        
+        logger.error(f"❌ Socket.IO server failed to start properly on port {port} after {max_attempts} attempts")
+        logger.error(f"💡 This may indicate a port conflict or dependency issue")
+        logger.error(f"🔧 Try a different port with --websocket-port or check for conflicts")
+        return False
+            
+    except Exception as e:
+        logger.error(f"❌ Failed to start standalone Socket.IO server: {e}")
+        import traceback
+        logger.error(f"📋 Stack trace: {traceback.format_exc()}")
+        logger.error(f"💡 This may be a dependency issue - try: pip install python-socketio aiohttp")
+        return False
+
+
+
+def open_in_browser_tab(url, logger):
+    """
+    Open URL in browser, attempting to reuse existing tabs when possible.
+    
+    WHY: Users prefer reusing browser tabs instead of opening new ones constantly.
+    This function attempts platform-specific solutions for tab reuse.
+    
+    DESIGN DECISION: We try different methods based on platform capabilities,
+    falling back to standard webbrowser.open() if needed.
+    
+    Args:
+        url: URL to open
+        logger: Logger instance for output
+    """
+    try:
+        # Platform-specific optimizations for tab reuse
+        import platform
+        system = platform.system().lower()
+        
+        if system == "darwin":  # macOS
+            # Just use the standard webbrowser module on macOS
+            # The AppleScript approach is too unreliable
+            webbrowser.open(url, new=0, autoraise=True)  # new=0 tries to reuse window
+            logger.info("Opened browser on macOS")
+                
+        elif system == "linux":
+            # On Linux, try to use existing browser session
+            try:
+                # This is a best-effort approach for common browsers
+                webbrowser.get().open(url, new=0)  # new=0 tries to reuse existing window
+                logger.info("Attempted Linux browser tab reuse")
+            except Exception:
+                webbrowser.open(url, autoraise=True)
+                
+        elif system == "windows":
+            # On Windows, try to use existing browser
+            try:
+                webbrowser.get().open(url, new=0)  # new=0 tries to reuse existing window
+                logger.info("Attempted Windows browser tab reuse")
+            except Exception:
+                webbrowser.open(url, autoraise=True)
+        else:
+            # Unknown platform, use standard opening
+            webbrowser.open(url, autoraise=True)
+            
+    except Exception as e:
+        logger.warning(f"Browser opening failed: {e}")
+        # Final fallback
+        webbrowser.open(url)

claude_mpm/cli/commands/tickets.py

@@ -5,10 +5,7 @@ WHY: This module handles ticket listing functionality, allowing users to view
 recent tickets created during Claude sessions.
 """
 
-from claude_mpm.utils.imports import safe_import
-
-# Import logger using safe_import pattern
-get_logger = safe_import('claude_mpm.core.logger', None, ['get_logger'])
+from ...core.logger import get_logger
 
 
 def list_tickets(args):
@@ -27,20 +24,12 @@ def list_tickets(args):
     """
     logger = get_logger("cli")
     
-    # Import TicketManager using safe_import pattern
-    TicketManager = safe_import(
-        '...services.ticket_manager',
-        'claude_mpm.services.ticket_manager',
-        ['TicketManager']
-    )
-    
-    if not TicketManager:
-        logger.error("ai-trackdown-pytools not installed")
-        print("Error: ai-trackdown-pytools not installed")
-        print("Install with: pip install ai-trackdown-pytools")
-        return
-    
     try:
+        try:
+            from ...services.ticket_manager import TicketManager
+        except ImportError:
+            from claude_mpm.services.ticket_manager import TicketManager
+        
         ticket_manager = TicketManager()
         tickets = ticket_manager.list_recent_tickets(limit=args.limit)
         
@@ -65,6 +54,10 @@ def list_tickets(args):
             print(f"   Created: {ticket['created_at']}")
             print()
             
+    except ImportError:
+        logger.error("ai-trackdown-pytools not installed")
+        print("Error: ai-trackdown-pytools not installed")
+        print("Install with: pip install ai-trackdown-pytools")
     except Exception as e:
         logger.error(f"Error listing tickets: {e}")
         print(f"Error: {e}")