claude-mpm 5.4.55__py3-none-any.whl → 5.6.1__py3-none-any.whl

claude_mpm/services/monitor/daemon_manager.py

@@ -95,10 +95,10 @@ class DaemonManager:
     def _get_default_log_file(self) -> Path:
         """Get default log file path with port number to support multiple daemons."""
         project_root = Path.cwd()
-        claude_mpm_dir = project_root / ".claude-mpm"
-        claude_mpm_dir.mkdir(exist_ok=True)
+        logs_dir = project_root / ".claude-mpm" / "logs"
+        logs_dir.mkdir(parents=True, exist_ok=True)
         # Include port in filename to support multiple daemon instances
-        return claude_mpm_dir / f"monitor-daemon-{self.port}.log"
+        return logs_dir / f"monitor-daemon-{self.port}.log"
 
     def cleanup_port_conflicts(self, max_retries: int = 3) -> bool:
         """Clean up any processes using the daemon port.
@@ -649,14 +649,24 @@ class DaemonManager:
 
                 # Wait for the subprocess to write its PID file and bind to port
                 # The subprocess will write the PID file after it starts successfully
-                max_wait = 10  # seconds
+                # Allow configuration via environment variable (default 30s to account for agent/skill sync)
+                max_wait = int(os.environ.get("CLAUDE_MPM_MONITOR_TIMEOUT", "30"))
                 start_time = time.time()
                 pid_file_found = False
                 port_bound = False
+                last_progress_log = 0.0
 
                 self.logger.debug(f"Waiting up to {max_wait}s for daemon to start...")
 
                 while time.time() - start_time < max_wait:
+                    # Log progress every 5 seconds to show we're waiting
+                    elapsed = time.time() - start_time
+                    if elapsed - last_progress_log >= 5.0:
+                        self.logger.info(
+                            f"Waiting for monitor daemon... ({int(elapsed)}s elapsed, syncing agents/skills)"
+                        )
+                        last_progress_log = elapsed
+
                     # Check if process is still running
                     returncode = process.poll()
                     if returncode is not None:
@@ -976,6 +986,7 @@ class DaemonManager:
                 os.dup2(null_in.fileno(), sys.stdin.fileno())
 
             # Redirect stdout and stderr to log file
+            # Ensure logs directory exists
             self.log_file.parent.mkdir(parents=True, exist_ok=True)
             with self.log_file.open("a") as log_out:
                 os.dup2(log_out.fileno(), sys.stdout.fileno())

claude_mpm/services/monitor/management/lifecycle.py

@@ -128,12 +128,16 @@ class DaemonLifecycle:
             # Redirect stdout and stderr
             if self.log_file:
                 # Redirect to log file
+                # Ensure logs directory exists
+                self.log_file.parent.mkdir(parents=True, exist_ok=True)
                 with self.log_file.open("a") as log_out:
                     os.dup2(log_out.fileno(), sys.stdout.fileno())
                     os.dup2(log_out.fileno(), sys.stderr.fileno())
             else:
                 # Default to a daemon log file instead of /dev/null for errors
-                default_log = Path.home() / ".claude-mpm" / "monitor-daemon.log"
+                default_log = (
+                    Path.home() / ".claude-mpm" / "logs" / "monitor-daemon.log"
+                )
                 default_log.parent.mkdir(parents=True, exist_ok=True)
                 with default_log.open("a") as log_out:
                     os.dup2(log_out.fileno(), sys.stdout.fileno())
@@ -475,7 +479,9 @@ class DaemonLifecycle:
         try:
             # If no log file specified, create a default one
             if not self.log_file:
-                default_log = Path.home() / ".claude-mpm" / "monitor-daemon.log"
+                default_log = (
+                    Path.home() / ".claude-mpm" / "logs" / "monitor-daemon.log"
+                )
                 default_log.parent.mkdir(parents=True, exist_ok=True)
                 self.log_file = default_log
 

claude_mpm/services/monitor/server.py

@@ -368,6 +368,83 @@ class UnifiedMonitorServer:
         finally:
             await self._cleanup_async()
 
+    def _categorize_event(self, event_name: str) -> str:
+        """Categorize event by name to determine Socket.IO event type.
+
+        Maps specific event names to their category for frontend filtering.
+
+        Args:
+            event_name: The raw event name (e.g., "subagent_start", "todo_updated")
+
+        Returns:
+            Category name (e.g., "hook_event", "system_event")
+        """
+        # Hook events - agent lifecycle and todo updates
+        if event_name in ("subagent_start", "subagent_stop", "todo_updated"):
+            return "hook_event"
+
+        # Tool events - both hook-style and direct tool events
+        if event_name in (
+            "pre_tool",
+            "post_tool",
+            "tool.start",
+            "tool.end",
+            "tool_use",
+            "tool_result",
+        ):
+            return "tool_event"
+
+        # Session events - session lifecycle
+        if event_name in (
+            "session.started",
+            "session.ended",
+            "session_start",
+            "session_end",
+        ):
+            return "session_event"
+
+        # Response events - API response lifecycle
+        if event_name in (
+            "response.start",
+            "response.end",
+            "response_started",
+            "response_ended",
+        ):
+            return "response_event"
+
+        # Agent events - agent delegation and returns
+        if event_name in (
+            "agent.delegated",
+            "agent.returned",
+            "agent_start",
+            "agent_end",
+        ):
+            return "agent_event"
+
+        # File events - file operations
+        if event_name in (
+            "file.read",
+            "file.write",
+            "file.edit",
+            "file_read",
+            "file_write",
+        ):
+            return "file_event"
+
+        # Claude API events
+        if event_name in ("user_prompt", "assistant_message"):
+            return "claude_event"
+
+        # System events
+        if event_name in ("system_ready", "system_shutdown"):
+            return "system_event"
+
+        # Log uncategorized events for debugging
+        self.logger.debug(f"Uncategorized event: {event_name}")
+
+        # Default to claude_event for unknown events
+        return "claude_event"
+
     def _setup_event_handlers(self):
         """Setup Socket.IO event handlers."""
         try:
@@ -474,7 +551,7 @@ class UnifiedMonitorServer:
                     )
                     if version_file.exists():
                         version = version_file.read_text().strip()
-                except Exception:
+                except Exception:  # nosec B110
                     pass
 
                 return web.json_response(
@@ -499,10 +576,23 @@ class UnifiedMonitorServer:
                     event = data.get("event", "claude_event")
                     event_data = data.get("data", {})
 
-                    # Emit to Socket.IO clients via the appropriate event
+                    # Categorize event and wrap in expected format
+                    event_type = self._categorize_event(event)
+                    wrapped_event = {
+                        "type": event_type,
+                        "subtype": event,
+                        "data": event_data,
+                        "timestamp": event_data.get("timestamp")
+                        or datetime.now(timezone.utc).isoformat() + "Z",
+                        "session_id": event_data.get("session_id"),
+                    }
+
+                    # Emit to Socket.IO clients via the categorized event type
                     if self.sio:
-                        await self.sio.emit(event, event_data)
-                        self.logger.debug(f"HTTP event forwarded to Socket.IO: {event}")
+                        await self.sio.emit(event_type, wrapped_event)
+                        self.logger.debug(
+                            f"HTTP event forwarded to Socket.IO: {event} -> {event_type}"
+                        )
 
                     return web.Response(status=204)  # No content response
 
@@ -859,7 +949,7 @@ class UnifiedMonitorServer:
             # Configuration endpoint for dashboard initialization
             async def config_handler(request):
                 """Return configuration for dashboard initialization."""
-                import subprocess
+                import subprocess  # nosec B404
 
                 config = {
                     "workingDirectory": Path.cwd(),
@@ -870,7 +960,7 @@ class UnifiedMonitorServer:
 
                 # Try to get current git branch
                 try:
-                    result = subprocess.run(
+                    result = subprocess.run(  # nosec B603 B607
                         ["git", "branch", "--show-current"],
                         capture_output=True,
                         text=True,
@@ -880,7 +970,7 @@ class UnifiedMonitorServer:
                     )
                     if result.returncode == 0 and result.stdout.strip():
                         config["gitBranch"] = result.stdout.strip()
-                except Exception:
+                except Exception:  # nosec B110
                     pass  # Keep default "Unknown" value
 
                 return web.json_response(config)
@@ -910,7 +1000,7 @@ class UnifiedMonitorServer:
             # Git history handler
             async def git_history_handler(request: web.Request) -> web.Response:
                 """Get git history for a file."""
-                import subprocess
+                import subprocess  # nosec B404
 
                 try:
                     data = await request.json()
@@ -939,7 +1029,7 @@ class UnifiedMonitorServer:
                         )
 
                     # Get git log for file
-                    result = subprocess.run(
+                    result = subprocess.run(  # nosec B603 B607
                         [
                             "git",
                             "log",
@@ -978,7 +1068,7 @@ class UnifiedMonitorServer:
             # Git diff handler
             async def git_diff_handler(request: web.Request) -> web.Response:
                 """Get git diff for a file with optional commit selection."""
-                import subprocess
+                import subprocess  # nosec B404
 
                 try:
                     file_path = request.query.get("path", "")
@@ -1010,7 +1100,7 @@ class UnifiedMonitorServer:
                         )
 
                     # Find git repository root
-                    git_root_result = subprocess.run(
+                    git_root_result = subprocess.run(  # nosec B603 B607
                         ["git", "rev-parse", "--show-toplevel"],
                         check=False,
                         capture_output=True,
@@ -1034,7 +1124,7 @@ class UnifiedMonitorServer:
                     git_root = Path(git_root_result.stdout.strip())
 
                     # Check if file is tracked by git
-                    ls_files_result = subprocess.run(
+                    ls_files_result = subprocess.run(  # nosec B603 B607
                         ["git", "ls-files", "--error-unmatch", str(path)],
                         check=False,
                         capture_output=True,
@@ -1056,7 +1146,7 @@ class UnifiedMonitorServer:
                         )
 
                     # Get commit history for this file (last 5 commits)
-                    history_result = subprocess.run(
+                    history_result = subprocess.run(  # nosec B603 B607
                         [
                             "git",
                             "log",
@@ -1087,7 +1177,7 @@ class UnifiedMonitorServer:
                                     )
 
                     # Check for uncommitted changes
-                    uncommitted_result = subprocess.run(
+                    uncommitted_result = subprocess.run(  # nosec B603 B607
                         ["git", "diff", "HEAD", str(path)],
                         check=False,
                         capture_output=True,
@@ -1100,7 +1190,7 @@ class UnifiedMonitorServer:
                     # Get diff based on commit parameter
                     if commit_hash:
                         # Get diff for specific commit
-                        result = subprocess.run(
+                        result = subprocess.run(  # nosec B603 B607
                             ["git", "show", commit_hash, "--", str(path)],
                             check=False,
                             capture_output=True,
@@ -1469,7 +1559,7 @@ class UnifiedMonitorServer:
                 gather = asyncio.gather(*tasks_to_cancel, return_exceptions=True)
                 try:
                     loop.run_until_complete(gather)
-                except Exception:
+                except Exception:  # nosec B110
                     # Some tasks might fail to cancel, that's ok
                     pass