claude-mpm 4.2.23__py3-none-any.whl → 4.2.24__py3-none-any.whl

claude_mpm/VERSION

@@ -1 +1 @@
-4.2.23
+4.2.24

claude_mpm/services/monitor/daemon.py

@@ -112,9 +112,11 @@ class UnifiedMonitorDaemon:
             
             if force_restart:
                 # Check if it's our service
-                is_ours, pid = self.lifecycle.is_our_service(self.host)
+                self.logger.debug(f"Checking if existing daemon (PID: {existing_pid}) is our service...")
+                is_ours, detected_pid = self.lifecycle.is_our_service(self.host)
+                
                 if is_ours:
-                    self.logger.info(f"Force restarting our existing daemon (PID: {pid or existing_pid})")
+                    self.logger.info(f"Force restarting our existing claude-mpm monitor daemon (PID: {detected_pid or existing_pid})")
                     # Stop the existing daemon
                     if self.lifecycle.stop_daemon():
                         # Wait a moment for port to be released
@@ -123,7 +125,8 @@ class UnifiedMonitorDaemon:
                         self.logger.error("Failed to stop existing daemon for restart")
                         return False
                 else:
-                    self.logger.warning(f"Daemon already running with PID {existing_pid}, but it's not our service")
+                    self.logger.warning(f"Port {self.port} is in use by another service (PID: {existing_pid}). Cannot force restart.")
+                    self.logger.info("To restart the claude-mpm monitor, first stop the other service or use a different port.")
                     return False
             else:
                 self.logger.warning(f"Daemon already running with PID {existing_pid}")
@@ -131,9 +134,10 @@ class UnifiedMonitorDaemon:
         
         # Check for orphaned processes (service running but no PID file)
         elif force_restart:
+            self.logger.debug("No PID file found, checking for orphaned claude-mpm service...")
             is_ours, pid = self.lifecycle.is_our_service(self.host)
             if is_ours and pid:
-                self.logger.info(f"Found orphaned claude-mpm service (PID: {pid}), force restarting")
+                self.logger.info(f"Found orphaned claude-mpm monitor service (PID: {pid}), force restarting")
                 # Try to kill the orphaned process
                 try:
                     os.kill(pid, signal.SIGTERM)
@@ -194,9 +198,11 @@ class UnifiedMonitorDaemon:
             
             if force_restart:
                 # Check if it's our service
-                is_ours, pid = self.lifecycle.is_our_service(self.host)
+                self.logger.debug(f"Checking if existing daemon (PID: {existing_pid}) is our service...")
+                is_ours, detected_pid = self.lifecycle.is_our_service(self.host)
+                
                 if is_ours:
-                    self.logger.info(f"Force restarting our existing daemon (PID: {pid or existing_pid})")
+                    self.logger.info(f"Force restarting our existing claude-mpm monitor daemon (PID: {detected_pid or existing_pid})")
                     # Stop the existing daemon
                     if self.lifecycle.stop_daemon():
                         # Wait a moment for port to be released
@@ -205,7 +211,8 @@ class UnifiedMonitorDaemon:
                         self.logger.error("Failed to stop existing daemon for restart")
                         return False
                 else:
-                    self.logger.warning(f"Monitor daemon already running with PID {existing_pid}, but it's not our service")
+                    self.logger.warning(f"Port {self.port} is in use by another service (PID: {existing_pid}). Cannot force restart.")
+                    self.logger.info("To restart the claude-mpm monitor, first stop the other service or use a different port.")
                     return False
             else:
                 self.logger.warning(
@@ -215,9 +222,10 @@ class UnifiedMonitorDaemon:
         
         # Check for orphaned processes (service running but no PID file)
         elif force_restart:
+            self.logger.debug("No PID file found, checking for orphaned claude-mpm service...")
             is_ours, pid = self.lifecycle.is_our_service(self.host)
             if is_ours and pid:
-                self.logger.info(f"Found orphaned claude-mpm service (PID: {pid}), force restarting")
+                self.logger.info(f"Found orphaned claude-mpm monitor service (PID: {pid}), force restarting")
                 # Try to kill the orphaned process
                 try:
                     os.kill(pid, signal.SIGTERM)

claude_mpm/services/monitor/management/lifecycle.py

@@ -513,60 +513,101 @@ class DaemonLifecycle:
         Returns:
             Tuple of (is_ours, pid_if_found)
         """
+        self.logger.debug(f"Checking if service on {host}:{self.port} is ours")
+        
         try:
             # Method 1: Check health endpoint
             import urllib.request
             import urllib.error
             
             health_url = f"http://{host}:{self.port}/health"
+            self.logger.debug(f"Checking health endpoint: {health_url}")
+            
             try:
-                with urllib.request.urlopen(health_url, timeout=2) as response:
+                req = urllib.request.Request(health_url)
+                req.add_header('User-Agent', 'claude-mpm-monitor')
+                
+                with urllib.request.urlopen(req, timeout=3) as response:
                     if response.status == 200:
                         data = json.loads(response.read().decode())
+                        self.logger.debug(f"Health endpoint response: {data}")
+                        
                         # Check for our service signature
-                        if data.get("service") == "claude-mpm-monitor":
+                        service_name = data.get("service")
+                        if service_name == "claude-mpm-monitor":
                             # Try to get PID from response
                             pid = data.get("pid")
                             if pid:
-                                self.logger.debug(f"Found our service via health endpoint, PID: {pid}")
+                                self.logger.info(f"Found our claude-mpm-monitor service via health endpoint, PID: {pid}")
                                 return True, pid
                             else:
                                 # Service is ours but no PID in response
                                 # Try to get from PID file
                                 file_pid = self.get_pid()
-                                self.logger.debug(f"Found our service via health endpoint, PID from file: {file_pid}")
+                                self.logger.info(f"Found our claude-mpm-monitor service via health endpoint, PID from file: {file_pid}")
                                 return True, file_pid
-            except (urllib.error.URLError, urllib.error.HTTPError, json.JSONDecodeError):
-                # Health endpoint not accessible or invalid response
-                pass
+                        else:
+                            self.logger.debug(f"Service name '{service_name}' does not match 'claude-mpm-monitor'")
+                            
+            except urllib.error.URLError as e:
+                self.logger.debug(f"Health endpoint not accessible: {e}")
+            except urllib.error.HTTPError as e:
+                self.logger.debug(f"Health endpoint HTTP error: {e}")
+            except json.JSONDecodeError as e:
+                self.logger.debug(f"Health endpoint invalid JSON: {e}")
+            except Exception as e:
+                self.logger.debug(f"Health endpoint check failed: {e}")
             
             # Method 2: Check if PID file exists and process matches
             pid = self.get_pid()
             if pid:
+                self.logger.debug(f"Checking PID from file: {pid}")
                 try:
                     # Check if process exists
                     os.kill(pid, 0)
+                    self.logger.debug(f"Process {pid} exists")
                     
                     # Process exists, check if it's using our port
                     # This requires psutil for accurate port checking
                     try:
                         import psutil
                         process = psutil.Process(pid)
+                        
+                        # Check process command line for our service
+                        cmdline = ' '.join(process.cmdline())
+                        if 'claude_mpm' in cmdline or 'claude-mpm' in cmdline:
+                            if 'monitor' in cmdline:
+                                self.logger.info(f"Found our claude-mpm monitor process via PID file, PID: {pid}")
+                                return True, pid
+                        
+                        # Also check if it's listening on our port
                         connections = process.connections()
                         for conn in connections:
-                            if conn.laddr.port == self.port:
-                                self.logger.debug(f"Found our service via PID file, PID: {pid}")
-                                return True, pid
+                            if conn.laddr.port == self.port and conn.status == 'LISTEN':
+                                self.logger.info(f"Found process {pid} listening on our port {self.port}")
+                                # Double-check it's a Python process (likely ours)
+                                if 'python' in process.name().lower():
+                                    self.logger.info(f"Confirmed as Python process, assuming it's our service")
+                                    return True, pid
+                                    
                     except ImportError:
-                        # psutil not available, assume it's ours if PID matches
-                        self.logger.debug(f"Found process with our PID file: {pid}, assuming it's ours")
+                        # psutil not available, but we have a PID file and process exists
+                        # Assume it's ours since we manage the PID file
+                        self.logger.info(f"Found process with our PID file: {pid}, assuming it's ours (psutil not available)")
                         return True, pid
-                    except Exception:
-                        pass
+                    except psutil.NoSuchProcess:
+                        self.logger.debug(f"Process {pid} no longer exists")
+                    except psutil.AccessDenied:
+                        # Can't access process info, but it exists - likely ours
+                        self.logger.info(f"Process {pid} exists but access denied, assuming it's ours")
+                        return True, pid
+                    except Exception as e:
+                        self.logger.debug(f"Error checking process {pid}: {e}")
                         
                 except (OSError, ProcessLookupError):
                     # Process doesn't exist
-                    pass
+                    self.logger.debug(f"Process {pid} does not exist")
+                    self._cleanup_stale_pid_file()
             
             # Method 3: Try Socket.IO connection to check namespace
             try:
@@ -620,9 +661,21 @@ class DaemonLifecycle:
             except Exception as e:
                 self.logger.debug(f"Error checking Socket.IO connection: {e}")
             
+            # Method 4: Final fallback - if we have a PID file and can't definitively say it's NOT ours
+            # This handles edge cases where the health endpoint might be temporarily unavailable
+            if pid and self.pid_file.exists():
+                try:
+                    # One more check - see if process exists
+                    os.kill(pid, 0)
+                    self.logger.info(f"PID file exists with valid process {pid}, assuming it's our stale service")
+                    return True, pid
+                except (OSError, ProcessLookupError):
+                    pass
+            
             # No service detected or not ours
+            self.logger.debug("Service not detected as ours")
             return False, None
             
         except Exception as e:
-            self.logger.error(f"Error checking if service is ours: {e}")
+            self.logger.error(f"Error checking if service is ours: {e}", exc_info=True)
             return False, None

{claude_mpm-4.2.23.dist-info → claude_mpm-4.2.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: claude-mpm
-Version: 4.2.23
+Version: 4.2.24
 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.23.dist-info → claude_mpm-4.2.24.dist-info}/RECORD

@@ -1,5 +1,5 @@
 claude_mpm/BUILD_NUMBER,sha256=toytnNjkIKPgQaGwDqQdC1rpNTAdSEc6Vja50d7Ovug,4
-claude_mpm/VERSION,sha256=bLmVrJAUXnac417S8JQgDFhX08Y4MIxjz0i-TIhW9zA,7
+claude_mpm/VERSION,sha256=U4vIe-sZ-5Iumq-KW3abswP9PknmnEd-RswDftmED1g,7
 claude_mpm/__init__.py,sha256=lyTZAYGH4DTaFGLRNWJKk5Q5oTjzN5I6AXmfVX-Jff0,1512
 claude_mpm/__main__.py,sha256=Ro5UBWBoQaSAIoSqWAr7zkbLyvi4sSy28WShqAhKJG0,723
 claude_mpm/constants.py,sha256=I946iCQzIIPRZVVJ8aO7lA4euiyDnNw2IX7EelAOkIE,5915
@@ -548,7 +548,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=g7g7g7kZTzCowM5iNJHhkE2UYDRms_7C34Net2CpdjQ,21015
+claude_mpm/services/monitor/daemon.py,sha256=9Cllm-jtVA85_qX1Z3TF-OwB5QZDzSfIvAcKhVQ65G8,21829
 claude_mpm/services/monitor/event_emitter.py,sha256=JzRLNg8PUJ5s3ulNnq_D4yqCPItvidJzu8DmFxriieQ,12224
 claude_mpm/services/monitor/server.py,sha256=2-xLo14qFBZf5MDYwBxBhTrFCNnbu3tOS3eEu8vyddc,28476
 claude_mpm/services/monitor/handlers/__init__.py,sha256=jgPIf4IJVERm_tAeD9834tfx9IcxtlHj5r9rhEWpkfM,701
@@ -558,7 +558,7 @@ claude_mpm/services/monitor/handlers/file.py,sha256=p3C4wffl0GIcN00b-KkrmZ8F-Amd
 claude_mpm/services/monitor/handlers/hooks.py,sha256=dlrmyFu8WChlvn6-sND9DLjSbm5nrMfNZrAgoWN-2No,17582
 claude_mpm/services/monitor/management/__init__.py,sha256=mxaEFRgvvgV85gUpXu_DsnHtywihdP14EisvISAVZuQ,525
 claude_mpm/services/monitor/management/health.py,sha256=Wm92Cli_4cWD6B89KX_CdpAvvevuEaGB8Ah59ILhFww,3772
-claude_mpm/services/monitor/management/lifecycle.py,sha256=DO3UYLWN2tW1P72--kTbWCpWZBNxK1Ok2GeI_PdOgHc,23713
+claude_mpm/services/monitor/management/lifecycle.py,sha256=EClf8CK-kCLVb2iRo9uiGI2CAHFrii1Qe1i8xuWnhG4,27037
 claude_mpm/services/project/__init__.py,sha256=IUclN1L7ChHCNya7PJiVxu4nttxsrj3WRIpwyA1A_hw,512
 claude_mpm/services/project/analyzer.py,sha256=VHlLrP8-S5gr12w4Yzs7-6d7LWdJKISHPCFSG7SDiQU,38434
 claude_mpm/services/project/analyzer_refactored.py,sha256=USYEdPAhSoGPqZCpaT89Dw6ElFW_L1yXSURheQjAhLA,18243
@@ -639,9 +639,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.23.dist-info/licenses/LICENSE,sha256=lpaivOlPuBZW1ds05uQLJJswy8Rp_HMNieJEbFlqvLk,1072
-claude_mpm-4.2.23.dist-info/METADATA,sha256=5lkYIMEIiPKrYRkOrljAj3wfsRqrBzIip_Vh9sb4eZE,14451
-claude_mpm-4.2.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-claude_mpm-4.2.23.dist-info/entry_points.txt,sha256=FDPZgz8JOvD-6iuXY2l9Zbo9zYVRuE4uz4Qr0vLeGOk,471
-claude_mpm-4.2.23.dist-info/top_level.txt,sha256=1nUg3FEaBySgm8t-s54jK5zoPnu3_eY6EP6IOlekyHA,11
-claude_mpm-4.2.23.dist-info/RECORD,,
+claude_mpm-4.2.24.dist-info/licenses/LICENSE,sha256=lpaivOlPuBZW1ds05uQLJJswy8Rp_HMNieJEbFlqvLk,1072
+claude_mpm-4.2.24.dist-info/METADATA,sha256=gBePVzfdnH07tGtxu8dnaQwimTu90EqPI0hcpdIZnjM,14451
+claude_mpm-4.2.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+claude_mpm-4.2.24.dist-info/entry_points.txt,sha256=FDPZgz8JOvD-6iuXY2l9Zbo9zYVRuE4uz4Qr0vLeGOk,471
+claude_mpm-4.2.24.dist-info/top_level.txt,sha256=1nUg3FEaBySgm8t-s54jK5zoPnu3_eY6EP6IOlekyHA,11
+claude_mpm-4.2.24.dist-info/RECORD,,