claude-mpm 4.21.3__py3-none-any.whl → 5.1.9__py3-none-any.whl

claude_mpm/services/diagnostics/doctor_reporter.py

@@ -246,14 +246,29 @@ class DoctorReporter:
     def _report_markdown(self, summary: DiagnosticSummary):
         """Generate comprehensive Markdown-formatted report."""
         import datetime
+        import platform
+        import sys
 
-        # Header with timestamp
+        # Header with timestamp and system info
         print("# Claude MPM Doctor Report")
+        print()
+        now = datetime.datetime.now(datetime.timezone.utc)
+        print(f"**Generated:** {now.strftime('%Y-%m-%d %H:%M:%S %Z')}")
         print(
-            f"\n**Generated:** {datetime.datetime.now(datetime.timezone.utc).strftime('%Y-%m-%d %H:%M:%S')}"
+            f"**System:** {platform.system()} {platform.release()} ({platform.machine()})"
         )
-        print(f"**Version:** {self._get_version()}\n")
-        print("---\n")
+        print(f"**Python:** {sys.version.split()[0]}")
+        print(f"**claude-mpm:** {self._get_version()}")
+
+        # Get current working directory for context
+        from pathlib import Path
+
+        cwd = Path.cwd()
+        print(f"**Working Directory:** {cwd}")
+
+        print()
+        print("---")
+        print()
 
         # System Overview
         print("## System Overview\n")
@@ -271,15 +286,17 @@ class DoctorReporter:
             + summary.skipped_count
         )
         if total > 0:
-            print(f"| ✅ OK | {summary.ok_count} | {summary.ok_count*100//total}% |")
             print(
-                f"| ⚠️  Warning | {summary.warning_count} | {summary.warning_count*100//total}% |"
+                f"| ✅ OK | {summary.ok_count} | {summary.ok_count * 100 // total}% |"
             )
             print(
-                f"| ❌ Error | {summary.error_count} | {summary.error_count*100//total}% |"
+                f"| ⚠️  Warning | {summary.warning_count} | {summary.warning_count * 100 // total}% |"
             )
             print(
-                f"| ⏭️  Skipped | {summary.skipped_count} | {summary.skipped_count*100//total}% |"
+                f"| ❌ Error | {summary.error_count} | {summary.error_count * 100 // total}% |"
+            )
+            print(
+                f"| ⏭️  Skipped | {summary.skipped_count} | {summary.skipped_count * 100 // total}% |"
             )
         print()
 
@@ -331,10 +348,23 @@ class DoctorReporter:
             print("```")
             print()
 
-        # Footer
+        # Footer with generation metadata
+        print("---")
+        print()
+        print("## Report Metadata")
+        print()
+        print("- **Tool:** `claude-mpm doctor`")
+        print(f"- **Version:** {self._get_version()}")
+        print(f"- **Generated:** {now.strftime('%Y-%m-%d %H:%M:%S %Z')}")
+        if self.verbose:
+            print("- **Verbose Mode:** Enabled")
+        print()
         print("---")
+        print()
+        print("🤖 *Generated with [Claude Code](https://claude.com/claude-code)*")
+        print()
         print(
-            "\n*For more information, run `claude-mpm doctor --verbose` or visit the [documentation](https://github.com/bobmatnyc/claude-mpm).*"
+            "*For more information, run `claude-mpm doctor --verbose` or visit the [documentation](https://github.com/bobmatnyc/claude-mpm).*"
         )
 
     def _color(self, text: str, color: str) -> str:

claude_mpm/services/event_bus/direct_relay.py

@@ -256,9 +256,9 @@ class DirectSocketIORelay:
                                         event_type, broadcast_data
                                     )
                                     self.stats["events_relayed"] += 1
-                                    self.stats[
-                                        "events_failed"
-                                    ] -= 1  # Undo the failure count
+                                    self.stats["events_failed"] -= (
+                                        1  # Undo the failure count
+                                    )
                                     logger.info(
                                         f"[DirectRelay] Retry successful for {event_type}"
                                     )

claude_mpm/services/event_bus/event_bus.py

@@ -68,6 +68,9 @@ class EventBus:
         # Track async handler tasks to prevent garbage collection
         self._handler_tasks: Set[asyncio.Task] = set()
 
+        # Track handler wrappers for removal
+        self._handler_wrappers: Dict[tuple, Callable] = {}
+
         logger.info("EventBus initialized")
 
     @classmethod
@@ -266,8 +269,20 @@ class EventBus:
 
             logger.debug(f"Registered wildcard handler for: {event_type}")
         else:
-            # Regular event registration
-            self._emitter.on(event_type, handler)
+            # Wrap handler to catch exceptions and prevent them from stopping other handlers
+            def safe_handler(data):
+                try:
+                    handler(data)
+                except Exception as e:
+                    if self._debug:
+                        logger.debug(f"Handler error for {event_type}: {e}")
+
+            # Store mapping for later removal
+            wrapper_key = (event_type, handler)
+            self._handler_wrappers[wrapper_key] = safe_handler
+
+            # Regular event registration with wrapped handler
+            self._emitter.on(event_type, safe_handler)
             logger.debug(f"Registered handler for: {event_type}")
 
     def once(self, event_type: str, handler: Callable) -> None:
@@ -287,7 +302,17 @@ class EventBus:
             event_type: The event type
             handler: The handler to remove
         """
-        self._emitter.remove_listener(event_type, handler)
+        # Check if we have a wrapped version of this handler
+        wrapper_key = (event_type, handler)
+        if wrapper_key in self._handler_wrappers:
+            # Remove the wrapped handler from pyee
+            wrapped_handler = self._handler_wrappers[wrapper_key]
+            self._emitter.remove_listener(event_type, wrapped_handler)
+            # Remove from our tracking dict
+            del self._handler_wrappers[wrapper_key]
+        else:
+            # No wrapper, remove directly (e.g., for wildcard handlers or direct registrations)
+            self._emitter.remove_listener(event_type, handler)
         logger.debug(f"Removed handler for: {event_type}")
 
     def remove_all_listeners(self, event_type: Optional[str] = None) -> None:
@@ -298,9 +323,17 @@ class EventBus:
         """
         if event_type:
             self._emitter.remove_all_listeners(event_type)
+            # Clean up wrappers for this event type
+            wrappers_to_remove = [
+                key for key in self._handler_wrappers if key[0] == event_type
+            ]
+            for key in wrappers_to_remove:
+                del self._handler_wrappers[key]
             logger.debug(f"Removed all handlers for: {event_type}")
         else:
             self._emitter.remove_all_listeners()
+            # Clean up all wrappers
+            self._handler_wrappers.clear()
             logger.debug("Removed all event handlers")
 
     def _record_event(self, event_type: str, data: Any) -> None:

claude_mpm/services/events/consumers/logging.py

@@ -133,8 +133,7 @@ class LoggingConsumer(IEventConsumer):
         """Format an event for logging."""
         # Build base message
         message = (
-            f"[{event.topic}] {event.type} "
-            f"(id={event.id[:8]}, source={event.source})"
+            f"[{event.topic}] {event.type} (id={event.id[:8]}, source={event.source})"
         )
 
         # Add data if configured

claude_mpm/services/git/__init__.py

@@ -0,0 +1,21 @@
+"""
+Git Operations Service Package
+================================
+
+Provides Git operations abstraction for PR workflow automation.
+Used by agent-improver and skills-manager agents.
+"""
+
+from .git_operations_service import (
+    GitAuthenticationError,
+    GitConflictError,
+    GitOperationError,
+    GitOperationsService,
+)
+
+__all__ = [
+    "GitAuthenticationError",
+    "GitConflictError",
+    "GitOperationError",
+    "GitOperationsService",
+]

claude_mpm/services/git/git_operations_service.py

@@ -0,0 +1,494 @@
+"""
+Git Operations Service
+======================
+
+Abstraction layer for Git operations used in PR workflow automation.
+
+Design Decisions:
+- Uses subprocess for git commands (not gitpython) for simplicity and reliability
+- Provides rollback mechanism on failures
+- Validates repo state before operations
+- Clear error messages for debugging
+
+Example:
+    >>> service = GitOperationsService()
+    >>> success = service.create_branch(Path("~/.claude-mpm/cache/remote-agents"), "improve/research-memory")
+    >>> if success:
+    ...     service.stage_files(Path("~/.claude-mpm/cache/remote-agents"), ["agents/research.md"])
+    ...     service.commit(Path("~/.claude-mpm/cache/remote-agents"), "feat: improve research agent memory handling")
+"""
+
+import subprocess
+from pathlib import Path
+from typing import List, Optional, Tuple
+
+
+# Custom Exceptions
+class GitOperationError(Exception):
+    """Base exception for git operation failures."""
+
+
+class GitConflictError(GitOperationError):
+    """Raised when git detects merge conflicts."""
+
+
+class GitAuthenticationError(GitOperationError):
+    """Raised when git authentication fails."""
+
+
+class GitOperationsService:
+    """
+    Service for Git repository operations.
+
+    Provides abstraction over git commands for PR workflow automation.
+    All operations validate repository state and provide clear error messages.
+    """
+
+    def __init__(self, timeout: int = 30):
+        """
+        Initialize git operations service.
+
+        Args:
+            timeout: Command timeout in seconds (default: 30)
+        """
+        self.timeout = timeout
+
+    def is_git_repo(self, repo_path: Path) -> bool:
+        """
+        Check if directory is a git repository.
+
+        Args:
+            repo_path: Path to check
+
+        Returns:
+            True if directory is a git repo, False otherwise
+
+        Example:
+            >>> service = GitOperationsService()
+            >>> service.is_git_repo(Path("~/.claude-mpm/cache/remote-agents"))
+            True
+        """
+        try:
+            result = self._run_git_command(
+                ["git", "rev-parse", "--git-dir"], cwd=repo_path
+            )
+            return result[0] == 0
+        except Exception:
+            return False
+
+    def get_current_branch(self, repo_path: Path) -> str:
+        """
+        Get current branch name.
+
+        Args:
+            repo_path: Repository path
+
+        Returns:
+            Current branch name
+
+        Raises:
+            GitOperationError: If not in a git repo or command fails
+        """
+        self._validate_repo(repo_path)
+
+        returncode, stdout, stderr = self._run_git_command(
+            ["git", "branch", "--show-current"], cwd=repo_path
+        )
+
+        if returncode != 0:
+            raise GitOperationError(f"Failed to get current branch: {stderr}")
+
+        return stdout.strip()
+
+    def has_uncommitted_changes(self, repo_path: Path) -> bool:
+        """
+        Check if repository has uncommitted changes.
+
+        Args:
+            repo_path: Repository path
+
+        Returns:
+            True if there are uncommitted changes
+
+        Raises:
+            GitOperationError: If command fails
+        """
+        self._validate_repo(repo_path)
+
+        returncode, stdout, stderr = self._run_git_command(
+            ["git", "status", "--porcelain"], cwd=repo_path
+        )
+
+        if returncode != 0:
+            raise GitOperationError(f"Failed to check git status: {stderr}")
+
+        return bool(stdout.strip())
+
+    def create_and_checkout_branch(
+        self, repo_path: Path, branch_name: str, base_branch: str = "main"
+    ) -> bool:
+        """
+        Create and checkout a new branch from base branch.
+
+        Pulls latest from remote before creating branch to avoid conflicts.
+
+        Args:
+            repo_path: Repository path
+            branch_name: New branch name (e.g., "improve/research-memory")
+            base_branch: Base branch to branch from (default: "main")
+
+        Returns:
+            True if successful
+
+        Raises:
+            GitOperationError: If operation fails
+            GitConflictError: If merge conflicts detected
+
+        Example:
+            >>> service = GitOperationsService()
+            >>> service.create_and_checkout_branch(
+            ...     Path("~/.claude-mpm/cache/remote-agents"),
+            ...     "improve/research-memory",
+            ...     "main"
+            ... )
+            True
+        """
+        self._validate_repo(repo_path)
+
+        # Store current branch for rollback
+        original_branch = self.get_current_branch(repo_path)
+
+        try:
+            # Checkout base branch
+            returncode, _stdout, stderr = self._run_git_command(
+                ["git", "checkout", base_branch], cwd=repo_path
+            )
+            if returncode != 0:
+                raise GitOperationError(f"Failed to checkout {base_branch}: {stderr}")
+
+            # Pull latest from remote
+            returncode, _stdout, stderr = self._run_git_command(
+                ["git", "pull", "origin", base_branch], cwd=repo_path
+            )
+            if returncode != 0:
+                # Non-blocking if pull fails (might not have remote configured)
+                pass
+
+            # Create and checkout new branch
+            returncode, _stdout, stderr = self._run_git_command(
+                ["git", "checkout", "-b", branch_name], cwd=repo_path
+            )
+            if returncode != 0:
+                raise GitOperationError(
+                    f"Failed to create branch {branch_name}: {stderr}"
+                )
+
+            return True
+
+        except Exception as e:
+            # Rollback to original branch on failure
+            try:
+                self._run_git_command(
+                    ["git", "checkout", original_branch], cwd=repo_path
+                )
+            except Exception:
+                pass  # Best effort rollback
+
+            raise GitOperationError(f"Failed to create branch: {e}") from e
+
+    def stage_files(self, repo_path: Path, files: List[str]) -> bool:
+        """
+        Stage files for commit.
+
+        Args:
+            repo_path: Repository path
+            files: List of file paths relative to repo root
+
+        Returns:
+            True if successful
+
+        Raises:
+            GitOperationError: If staging fails
+        """
+        self._validate_repo(repo_path)
+
+        if not files:
+            raise GitOperationError("No files specified for staging")
+
+        returncode, _stdout, stderr = self._run_git_command(
+            ["git", "add"] + files, cwd=repo_path
+        )
+
+        if returncode != 0:
+            raise GitOperationError(f"Failed to stage files: {stderr}")
+
+        return True
+
+    def commit(self, repo_path: Path, message: str, allow_empty: bool = False) -> bool:
+        """
+        Commit staged changes.
+
+        Args:
+            repo_path: Repository path
+            message: Commit message (should follow conventional commits format)
+            allow_empty: Allow empty commits
+
+        Returns:
+            True if successful
+
+        Raises:
+            GitOperationError: If commit fails
+
+        Example:
+            >>> service = GitOperationsService()
+            >>> service.commit(
+            ...     Path("~/.claude-mpm/cache/remote-agents"),
+            ...     "feat(agent): improve research agent memory handling\\n\\n- Add hard limit of 5 files"
+            ... )
+            True
+        """
+        self._validate_repo(repo_path)
+
+        if not message:
+            raise GitOperationError("Commit message cannot be empty")
+
+        cmd = ["git", "commit", "-m", message]
+        if allow_empty:
+            cmd.append("--allow-empty")
+
+        returncode, _stdout, stderr = self._run_git_command(cmd, cwd=repo_path)
+
+        if returncode != 0:
+            # Check if it's just "nothing to commit"
+            if "nothing to commit" in stderr.lower() and not allow_empty:
+                raise GitOperationError("No changes to commit")
+            raise GitOperationError(f"Failed to commit: {stderr}")
+
+        return True
+
+    def push(
+        self, repo_path: Path, branch_name: str, set_upstream: bool = True
+    ) -> bool:
+        """
+        Push branch to remote.
+
+        Args:
+            repo_path: Repository path
+            branch_name: Branch name to push
+            set_upstream: Set upstream tracking (default: True)
+
+        Returns:
+            True if successful
+
+        Raises:
+            GitOperationError: If push fails
+            GitAuthenticationError: If authentication fails
+
+        Example:
+            >>> service = GitOperationsService()
+            >>> service.push(Path("~/.claude-mpm/cache/remote-agents"), "improve/research-memory")
+            True
+        """
+        self._validate_repo(repo_path)
+
+        cmd = ["git", "push"]
+        if set_upstream:
+            cmd.extend(["-u", "origin", branch_name])
+        else:
+            cmd.extend(["origin", branch_name])
+
+        returncode, _stdout, stderr = self._run_git_command(cmd, cwd=repo_path)
+
+        if returncode != 0:
+            # Check for authentication errors
+            if any(
+                keyword in stderr.lower()
+                for keyword in ["authentication", "permission denied", "403"]
+            ):
+                raise GitAuthenticationError(
+                    f"Git authentication failed. Please configure SSH keys or credentials: {stderr}"
+                )
+            raise GitOperationError(f"Failed to push branch: {stderr}")
+
+        return True
+
+    def pull(self, repo_path: Path, branch: str = "main") -> bool:
+        """
+        Pull latest changes from remote.
+
+        Args:
+            repo_path: Repository path
+            branch: Branch name to pull
+
+        Returns:
+            True if successful
+
+        Raises:
+            GitOperationError: If pull fails
+            GitConflictError: If merge conflicts detected
+        """
+        self._validate_repo(repo_path)
+
+        returncode, _stdout, stderr = self._run_git_command(
+            ["git", "pull", "origin", branch], cwd=repo_path
+        )
+
+        if returncode != 0:
+            # Check for merge conflicts
+            if "conflict" in stderr.lower():
+                raise GitConflictError(
+                    f"Merge conflicts detected when pulling {branch}: {stderr}"
+                )
+            raise GitOperationError(f"Failed to pull {branch}: {stderr}")
+
+        return True
+
+    def checkout_branch(self, repo_path: Path, branch_name: str) -> bool:
+        """
+        Checkout existing branch.
+
+        Args:
+            repo_path: Repository path
+            branch_name: Branch name to checkout
+
+        Returns:
+            True if successful
+
+        Raises:
+            GitOperationError: If checkout fails
+        """
+        self._validate_repo(repo_path)
+
+        returncode, _stdout, stderr = self._run_git_command(
+            ["git", "checkout", branch_name], cwd=repo_path
+        )
+
+        if returncode != 0:
+            raise GitOperationError(f"Failed to checkout {branch_name}: {stderr}")
+
+        return True
+
+    def get_remote_url(self, repo_path: Path) -> Optional[str]:
+        """
+        Get remote origin URL.
+
+        Args:
+            repo_path: Repository path
+
+        Returns:
+            Remote URL or None if not configured
+
+        Raises:
+            GitOperationError: If command fails
+        """
+        self._validate_repo(repo_path)
+
+        returncode, stdout, _stderr = self._run_git_command(
+            ["git", "config", "--get", "remote.origin.url"], cwd=repo_path
+        )
+
+        if returncode != 0:
+            return None
+
+        return stdout.strip()
+
+    def validate_repo(self, repo_path: Path) -> Tuple[bool, str]:
+        """
+        Validate repository configuration.
+
+        Args:
+            repo_path: Repository path
+
+        Returns:
+            Tuple of (is_valid, message)
+
+        Example:
+            >>> service = GitOperationsService()
+            >>> valid, msg = service.validate_repo(Path("~/.claude-mpm/cache/remote-agents"))
+            >>> if not valid:
+            ...     print(f"Repository invalid: {msg}")
+        """
+        try:
+            if not repo_path.exists():
+                return False, f"Path does not exist: {repo_path}"
+
+            if not self.is_git_repo(repo_path):
+                return False, f"Not a git repository: {repo_path}"
+
+            remote_url = self.get_remote_url(repo_path)
+            if not remote_url:
+                return False, "No remote origin configured"
+
+            return True, "Repository is valid"
+
+        except Exception as e:
+            return False, f"Validation failed: {e}"
+
+    def rollback_changes(self, repo_path: Path, original_branch: str) -> bool:
+        """
+        Rollback uncommitted changes and return to original branch.
+
+        Args:
+            repo_path: Repository path
+            original_branch: Branch to return to
+
+        Returns:
+            True if successful (best effort)
+        """
+        try:
+            # Discard uncommitted changes
+            self._run_git_command(["git", "reset", "--hard"], cwd=repo_path)
+
+            # Checkout original branch
+            self._run_git_command(["git", "checkout", original_branch], cwd=repo_path)
+
+            return True
+
+        except Exception:
+            return False
+
+    def _validate_repo(self, repo_path: Path) -> None:
+        """
+        Validate repository exists and is a git repo.
+
+        Args:
+            repo_path: Repository path
+
+        Raises:
+            GitOperationError: If validation fails
+        """
+        if not repo_path.exists():
+            raise GitOperationError(f"Repository path does not exist: {repo_path}")
+
+        if not self.is_git_repo(repo_path):
+            raise GitOperationError(f"Not a git repository: {repo_path}")
+
+    def _run_git_command(self, command: List[str], cwd: Path) -> Tuple[int, str, str]:
+        """
+        Run git command and return result.
+
+        Args:
+            command: Command and arguments
+            cwd: Working directory
+
+        Returns:
+            Tuple of (returncode, stdout, stderr)
+        """
+        try:
+            result = subprocess.run(
+                command,
+                check=False,
+                cwd=cwd,
+                capture_output=True,
+                text=True,
+                timeout=self.timeout,
+            )
+
+            return result.returncode, result.stdout, result.stderr
+
+        except subprocess.TimeoutExpired as e:
+            raise GitOperationError(
+                f"Git command timed out after {self.timeout} seconds: {' '.join(command)}"
+            ) from e
+        except Exception as e:
+            raise GitOperationError(f"Failed to run git command: {e}") from e