claude-mpm 4.2.25__py3-none-any.whl → 4.2.26__py3-none-any.whl

claude_mpm/VERSION

@@ -1 +1 @@
-4.2.25
+4.2.26

claude_mpm/cli/commands/monitor.py

@@ -151,7 +151,7 @@ class MonitorCommand(BaseCommand):
 
     def _stop_monitor(self, args) -> CommandResult:
         """Stop the unified monitor daemon."""
-        self.logger.info("Stopping unified monitor daemon")
+        # Don't log here - the daemon will log when it stops
 
         # Get parameters from args or use defaults
         port = getattr(args, "port", None)

claude_mpm/scripts/claude-hook-handler.sh

@@ -61,9 +61,20 @@ set -e
 # Get the directory where this script is located
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-# Determine the claude-mpm root
-# The script is at src/claude_mpm/scripts/, so we go up 3 levels
-CLAUDE_MPM_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+# Determine the claude-mpm root based on installation type
+# Check if we're in a pipx installation
+if [[ "$SCRIPT_DIR" == *"/.local/pipx/venvs/claude-mpm/"* ]]; then
+    # pipx installation - script is at lib/python*/site-packages/claude_mpm/scripts/
+    # The venv root is what we need for Python detection
+    CLAUDE_MPM_ROOT="$(echo "$SCRIPT_DIR" | sed 's|/lib/python.*/site-packages/.*||')"
+elif [[ "$SCRIPT_DIR" == *"/site-packages/claude_mpm/scripts"* ]]; then
+    # Regular pip installation - script is in site-packages
+    # Use the Python environment root
+    CLAUDE_MPM_ROOT="$(python3 -c 'import sys; print(sys.prefix)')"
+else
+    # Development installation - script is at src/claude_mpm/scripts/, so we go up 3 levels
+    CLAUDE_MPM_ROOT="$(cd "$SCRIPT_DIR/../../.." 2>/dev/null && pwd || echo "$SCRIPT_DIR")"
+fi
 
 # Debug logging (can be enabled via environment variable)
 if [ "${CLAUDE_MPM_HOOK_DEBUG}" = "true" ]; then
@@ -102,7 +113,16 @@ fi
 # Absolute path to Python executable with claude-mpm dependencies
 #
 find_python_command() {
-    # 1. Check for project-local virtual environment (common in development)
+    # 1. Check if we're in a pipx installation first
+    if [[ "$SCRIPT_DIR" == *"/.local/pipx/venvs/claude-mpm/"* ]]; then
+        # pipx installation - use the pipx venv's Python directly
+        if [ -f "$CLAUDE_MPM_ROOT/bin/python" ]; then
+            echo "$CLAUDE_MPM_ROOT/bin/python"
+            return
+        fi
+    fi
+    
+    # 2. Check for project-local virtual environment (common in development)
     if [ -f "$CLAUDE_MPM_ROOT/venv/bin/activate" ]; then
         source "$CLAUDE_MPM_ROOT/venv/bin/activate"
         echo "$CLAUDE_MPM_ROOT/venv/bin/python"
@@ -122,8 +142,14 @@ find_python_command() {
 # Set up Python command
 PYTHON_CMD=$(find_python_command)
 
-# Check if we're in a development environment (has src directory)
-if [ -d "$CLAUDE_MPM_ROOT/src" ]; then
+# Check installation type and set PYTHONPATH accordingly
+if [[ "$SCRIPT_DIR" == *"/.local/pipx/venvs/claude-mpm/"* ]]; then
+    # pipx installation - claude_mpm is already in the venv's site-packages
+    # No need to modify PYTHONPATH
+    if [ "${CLAUDE_MPM_HOOK_DEBUG}" = "true" ]; then
+        echo "[$(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)] pipx installation detected" >> /tmp/claude-mpm-hook.log
+    fi
+elif [ -d "$CLAUDE_MPM_ROOT/src" ]; then
     # Development install - add src to PYTHONPATH
     export PYTHONPATH="$CLAUDE_MPM_ROOT/src:$PYTHONPATH"
     
@@ -131,7 +157,7 @@ if [ -d "$CLAUDE_MPM_ROOT/src" ]; then
         echo "[$(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)] Development environment detected" >> /tmp/claude-mpm-hook.log
     fi
 else
-    # Pip install - claude_mpm should be in site-packages
+    # Regular pip install - claude_mpm should be in site-packages
     # No need to modify PYTHONPATH
     if [ "${CLAUDE_MPM_HOOK_DEBUG}" = "true" ]; then
         echo "[$(date -u +%Y-%m-%dT%H:%M:%S.%3NZ)] Pip installation detected" >> /tmp/claude-mpm-hook.log

claude_mpm/services/monitor/daemon.py

@@ -102,6 +102,87 @@ class UnifiedMonitorDaemon:
             self.logger.error(f"Failed to start unified monitor daemon: {e}")
             return False
 
+    def _cleanup_port_conflicts(self) -> bool:
+        """Try to clean up any processes using our port.
+        
+        Returns:
+            True if cleanup was successful, False otherwise
+        """
+        try:
+            # Find process using the port
+            import subprocess
+            result = subprocess.run(
+                ["lsof", "-ti", f":{self.port}"],
+                capture_output=True,
+                text=True
+            )
+            
+            if result.returncode == 0 and result.stdout.strip():
+                pids = result.stdout.strip().split('\n')
+                for pid_str in pids:
+                    try:
+                        pid = int(pid_str.strip())
+                        self.logger.info(f"Found process {pid} using port {self.port}")
+                        
+                        # Check if it's a claude-mpm process
+                        process_info = subprocess.run(
+                            ["ps", "-p", str(pid), "-o", "comm="],
+                            capture_output=True,
+                            text=True
+                        )
+                        
+                        if "python" in process_info.stdout.lower() or "claude" in process_info.stdout.lower():
+                            self.logger.info(f"Killing process {pid} (appears to be Python/Claude related)")
+                            os.kill(pid, signal.SIGTERM)
+                            time.sleep(1)
+                            
+                            # Check if still alive
+                            try:
+                                os.kill(pid, 0)
+                                # Still alive, force kill
+                                self.logger.warning(f"Process {pid} didn't terminate, force killing")
+                                os.kill(pid, signal.SIGKILL)
+                                time.sleep(1)
+                            except ProcessLookupError:
+                                pass
+                        else:
+                            self.logger.warning(f"Process {pid} is not a Claude MPM process: {process_info.stdout}")
+                            return False
+                    except (ValueError, ProcessLookupError) as e:
+                        self.logger.debug(f"Error handling PID {pid_str}: {e}")
+                        continue
+                
+                return True
+                
+        except FileNotFoundError:
+            # lsof not available, try alternative method
+            self.logger.debug("lsof not available, using alternative cleanup")
+            
+            # Check if there's an orphaned service we can identify
+            is_ours, pid = self.lifecycle.is_our_service(self.host)
+            if is_ours and pid:
+                try:
+                    self.logger.info(f"Killing orphaned Claude MPM service (PID: {pid})")
+                    os.kill(pid, signal.SIGTERM)
+                    time.sleep(1)
+                    
+                    # Check if still alive
+                    try:
+                        os.kill(pid, 0)
+                        os.kill(pid, signal.SIGKILL)
+                        time.sleep(1)
+                    except ProcessLookupError:
+                        pass
+                    
+                    return True
+                except Exception as e:
+                    self.logger.error(f"Failed to kill process: {e}")
+                    
+        except Exception as e:
+            self.logger.error(f"Error during port cleanup: {e}")
+            
+        return False
+
     def _start_daemon(self, force_restart: bool = False) -> bool:
         """Start as background daemon process.
 
@@ -172,12 +253,26 @@ class UnifiedMonitorDaemon:
                     self.logger.error(f"Failed to kill orphaned process: {e}")
                     return False
 
-        # Verify port is available before forking
+        # Check port availability and clean up if needed
         port_available, error_msg = self.lifecycle.verify_port_available(self.host)
         if not port_available:
-            self.logger.error(error_msg)
-            print(f"Error: {error_msg}", file=sys.stderr)
-            return False
+            self.logger.warning(f"Port {self.port} is not available: {error_msg}")
+            
+            # Try to identify and kill any process using the port
+            self.logger.info("Attempting to clean up processes on port...")
+            cleaned = self._cleanup_port_conflicts()
+            
+            if cleaned:
+                # Wait a moment for port to be released
+                time.sleep(2)
+                # Check again
+                port_available, error_msg = self.lifecycle.verify_port_available(self.host)
+                
+            if not port_available:
+                self.logger.error(f"Port {self.port} is still not available after cleanup: {error_msg}")
+                print(f"Error: {error_msg}", file=sys.stderr)
+                print(f"Try 'claude-mpm monitor stop' or use --force flag", file=sys.stderr)
+                return False
 
         # Wait for any pre-warming threads to complete before forking
         self._wait_for_prewarm_completion()
@@ -374,7 +469,7 @@ class UnifiedMonitorDaemon:
                 pid = self.lifecycle.get_pid()
                 if pid and pid != os.getpid():
                     # We're not the daemon process, so stop it via signal
-                    self.logger.info(f"Stopping daemon process with PID {pid}")
+                    # Don't log here - lifecycle.stop_daemon will log
                     success = self.lifecycle.stop_daemon()
                     if success:
                         # Clean up our local state

{claude_mpm-4.2.25.dist-info → claude_mpm-4.2.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-mpm
-Version: 4.2.25
+Version: 4.2.26
 Summary: Claude Multi-Agent Project Manager - Orchestrate Claude with agent delegation and ticket tracking
 Author-email: Bob Matsuoka <bob@matsuoka.com>
 Maintainer: Claude MPM Team

{claude_mpm-4.2.25.dist-info → claude_mpm-4.2.26.dist-info}/RECORD

@@ -1,5 +1,5 @@
 claude_mpm/BUILD_NUMBER,sha256=toytnNjkIKPgQaGwDqQdC1rpNTAdSEc6Vja50d7Ovug,4
-claude_mpm/VERSION,sha256=F3kdy3vpJ9R8KozaXUZLvXVrxx_9agbYiGj68dHh6gA,7
+claude_mpm/VERSION,sha256=SQgB6WkCfQ-PDwm6SAsbMLZRb40PTP081FhoVTi1sfg,7
 claude_mpm/__init__.py,sha256=lyTZAYGH4DTaFGLRNWJKk5Q5oTjzN5I6AXmfVX-Jff0,1512
 claude_mpm/__main__.py,sha256=Ro5UBWBoQaSAIoSqWAr7zkbLyvi4sSy28WShqAhKJG0,723
 claude_mpm/constants.py,sha256=I946iCQzIIPRZVVJ8aO7lA4euiyDnNw2IX7EelAOkIE,5915
@@ -83,7 +83,7 @@ claude_mpm/cli/commands/mcp_pipx_config.py,sha256=sE62VD6Q1CcO2k1nlbIhHMfAJFQTZf
 claude_mpm/cli/commands/mcp_server_commands.py,sha256=-1G_2Y5ScTvzDd-kY8fTAao2H6FH7DnsLimleF1rVqQ,6197
 claude_mpm/cli/commands/mcp_tool_commands.py,sha256=q17GzlFT3JiLTrDqwPO2tz1-fKmPO5QU449syTnKTz4,1283
 claude_mpm/cli/commands/memory.py,sha256=Yzfs3_oiKciv3sfOoDm2lJL4M9idG7ARV3-sNw1ge_g,26186
-claude_mpm/cli/commands/monitor.py,sha256=Is1b8l-hmMoGVwWyFHWrNztYf1Hsk5LVkaf3xHVazRc,9555
+claude_mpm/cli/commands/monitor.py,sha256=Y4on91KW6Ye5NIglHnMVG8hhzw8ZRslBm1oMm6KC48s,9556
 claude_mpm/cli/commands/mpm_init.py,sha256=lO7N91ZHn_n18XbchUUcYoyme7L5NLcXVnhWm5F_Gq8,22367
 claude_mpm/cli/commands/mpm_init_handler.py,sha256=-pCB0XL3KipqGtnta8CC7Lg5TPMwstEhMFBcgF4aaa4,2919
 claude_mpm/cli/commands/run.py,sha256=qS3eolLiDrE8EXLQJioB6kL1ONr_l0c3OE3qMUJCqbA,43489
@@ -299,7 +299,7 @@ claude_mpm/models/agent_definition.py,sha256=LC7EwihixF2Gw4QqOxiCNchsEzzyQJPR6Ag
 claude_mpm/models/agent_session.py,sha256=7YU9oklwqEDyH3PTKUQ52yh6N9C9eJX8GJKhxDCpDj0,19988
 claude_mpm/schemas/__init__.py,sha256=2SLpkojJq34KnwPkVxrsVmw_cEI66872i75QBT1C2To,446
 claude_mpm/scripts/__init__.py,sha256=IffMdVD99Pxyw85yluRa0VDPi4dRQecIWce764pcfZE,553
-claude_mpm/scripts/claude-hook-handler.sh,sha256=86Ywf4lHpF9wTXmxo3lhFmcFS0wk1G3cSyHA71N8imI,6552
+claude_mpm/scripts/claude-hook-handler.sh,sha256=xe6dKubrjK1JDO0SJdc1-tA6C7YSb5YazhwKhOYBQvw,7905
 claude_mpm/scripts/launch_monitor.py,sha256=Q7hN4Wurw45veLWPSXk0WfvkKxQ1Snz7TjZsV_pNWQc,2418
 claude_mpm/scripts/mcp_server.py,sha256=_i9ydtI7AcO-Eb7gzbIDbcJY4PKRQRYNobB8eMailI4,2259
 claude_mpm/scripts/mcp_wrapper.py,sha256=PvfHJShcsQHGJZD-RN3RnwLOzemAKYZ2kW_QfTkGzkk,1105
@@ -550,7 +550,7 @@ claude_mpm/services/memory/cache/__init__.py,sha256=6M6-P8ParyxX8vOgp_IxHgLMvacr
 claude_mpm/services/memory/cache/shared_prompt_cache.py,sha256=crnYPUT8zcS7TvoE1vW7pyaf4T77N5rJ1wUf_YQ2vvo,28704
 claude_mpm/services/memory/cache/simple_cache.py,sha256=qsTjbcsPxj-kNfaod9VN_uE5NioIwpfkUin_mMVUJCg,10218
 claude_mpm/services/monitor/__init__.py,sha256=X7gxSLUm9Fg_zEsX6LtCHP2ipF0qj6Emkun20h2So7g,745
-claude_mpm/services/monitor/daemon.py,sha256=R3w19ZLOFOO4PzRSZtP_ssM5LtNIzU8t5VpsvmBa7HA,23426
+claude_mpm/services/monitor/daemon.py,sha256=pZqn_-1PBMf9gfIq8Zo55gXoXInB0gKNyOZpWGkdrxw,27731
 claude_mpm/services/monitor/event_emitter.py,sha256=JzRLNg8PUJ5s3ulNnq_D4yqCPItvidJzu8DmFxriieQ,12224
 claude_mpm/services/monitor/server.py,sha256=m98Eyv9caxRywJ4JtAdOuv5EB__z7vd2hYRZPwcqFLg,28498
 claude_mpm/services/monitor/handlers/__init__.py,sha256=jgPIf4IJVERm_tAeD9834tfx9IcxtlHj5r9rhEWpkfM,701
@@ -641,9 +641,9 @@ claude_mpm/utils/subprocess_utils.py,sha256=zgiwLqh_17WxHpySvUPH65pb4bzIeUGOAYUJ
 claude_mpm/validation/__init__.py,sha256=YZhwE3mhit-lslvRLuwfX82xJ_k4haZeKmh4IWaVwtk,156
 claude_mpm/validation/agent_validator.py,sha256=3Lo6LK-Mw9IdnL_bd3zl_R6FkgSVDYKUUM7EeVVD3jc,20865
 claude_mpm/validation/frontmatter_validator.py,sha256=u8g4Eyd_9O6ugj7Un47oSGh3kqv4wMkuks2i_CtWRvM,7028
-claude_mpm-4.2.25.dist-info/licenses/LICENSE,sha256=lpaivOlPuBZW1ds05uQLJJswy8Rp_HMNieJEbFlqvLk,1072
-claude_mpm-4.2.25.dist-info/METADATA,sha256=pzcy651WgJLxqn8_pksv0ToWQXFCI8tLUqaCXw0h6dg,14451
-claude_mpm-4.2.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-claude_mpm-4.2.25.dist-info/entry_points.txt,sha256=FDPZgz8JOvD-6iuXY2l9Zbo9zYVRuE4uz4Qr0vLeGOk,471
-claude_mpm-4.2.25.dist-info/top_level.txt,sha256=1nUg3FEaBySgm8t-s54jK5zoPnu3_eY6EP6IOlekyHA,11
-claude_mpm-4.2.25.dist-info/RECORD,,
+claude_mpm-4.2.26.dist-info/licenses/LICENSE,sha256=lpaivOlPuBZW1ds05uQLJJswy8Rp_HMNieJEbFlqvLk,1072
+claude_mpm-4.2.26.dist-info/METADATA,sha256=_oxZGDtNFYz4VX0vwQhEKz5cQFyw1bl3gcpiYXohypI,14451
+claude_mpm-4.2.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+claude_mpm-4.2.26.dist-info/entry_points.txt,sha256=FDPZgz8JOvD-6iuXY2l9Zbo9zYVRuE4uz4Qr0vLeGOk,471
+claude_mpm-4.2.26.dist-info/top_level.txt,sha256=1nUg3FEaBySgm8t-s54jK5zoPnu3_eY6EP6IOlekyHA,11
+claude_mpm-4.2.26.dist-info/RECORD,,