claude-mpm 4.2.25__tar.gz → 4.2.26__tar.gz

claude_mpm-4.2.26/BUILD_NUMBER

@@ -0,0 +1 @@
+350

{claude_mpm-4.2.25 → claude_mpm-4.2.26}/PKG-INFO

@@ -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.26/VERSION

@@ -0,0 +1 @@
+4.2.26

{claude_mpm-4.2.25 → claude_mpm-4.2.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "claude-mpm"
-version = "4.2.25"
+version = "4.2.26"
 description = "Claude Multi-Agent Project Manager - Orchestrate Claude with agent delegation and ticket tracking"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -78,7 +78,7 @@ ignore-imports = false
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "4.2.25"
+version = "4.2.26"
 version_files = [ "VERSION", "src/claude_mpm/VERSION", "package.json:version",]
 tag_format = "v$version"
 update_changelog_on_bump = true

claude_mpm-4.2.26/src/claude_mpm/VERSION

@@ -0,0 +1 @@
+4.2.26

{claude_mpm-4.2.25 → claude_mpm-4.2.26}/src/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-4.2.25 → claude_mpm-4.2.26}/src/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-4.2.25 → claude_mpm-4.2.26}/src/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 → claude_mpm-4.2.26}/src/claude_mpm.egg-info/PKG-INFO

@@ -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/BUILD_NUMBER

@@ -1 +0,0 @@
-349

claude_mpm-4.2.25/VERSION

@@ -1 +0,0 @@
-4.2.25

claude_mpm-4.2.25/src/claude_mpm/VERSION

@@ -1 +0,0 @@
-4.2.25