claude-mpm 4.7.4__py3-none-any.whl → 4.18.2__py3-none-any.whl

claude_mpm/tools/code_tree_analyzer.py

@@ -1528,10 +1528,31 @@ class CodeTreeAnalyzer:
         if not path.exists() or not path.is_file():
             return {"error": f"Invalid file: {file_path}"}
 
-        # Get language first (needed for return statement)
         language = self._get_language(path)
+        self._emit_analysis_start(path, language)
 
-        # Emit analysis start event
+        # Check cache
+        file_hash = self._get_file_hash(path)
+        cache_key = f"{file_path}:{file_hash}"
+
+        if cache_key in self.cache:
+            nodes = self.cache[cache_key]
+            self._emit_cache_hit(path)
+            filtered_nodes = self._filter_nodes(nodes)
+        else:
+            nodes, filtered_nodes, duration = self._analyze_and_cache_file(
+                path, language, cache_key
+            )
+            self._emit_analysis_complete(path, filtered_nodes, duration)
+
+        # Prepare final data structures
+        final_nodes = self._prepare_final_nodes(nodes, filtered_nodes)
+        elements = self._convert_nodes_to_elements(final_nodes)
+
+        return self._build_result(file_path, language, final_nodes, elements)
+
+    def _emit_analysis_start(self, path: Path, language: str) -> None:
+        """Emit analysis start event."""
         if self.emitter:
             from datetime import datetime
 
@@ -1546,179 +1567,194 @@ class CodeTreeAnalyzer:
                 },
             )
 
-        # Check cache
-        file_hash = self._get_file_hash(path)
-        cache_key = f"{file_path}:{file_hash}"
+    def _emit_cache_hit(self, path: Path) -> None:
+        """Emit cache hit event."""
+        if self.emitter:
+            from datetime import datetime
 
-        if cache_key in self.cache:
-            nodes = self.cache[cache_key]
-            if self.emitter:
-                from datetime import datetime
+            self.emitter.emit(
+                "info",
+                {
+                    "type": "cache.hit",
+                    "file": str(path),
+                    "message": f"Using cached analysis for {path.name}",
+                    "timestamp": datetime.now(timezone.utc).isoformat(),
+                },
+            )
 
-                self.emitter.emit(
-                    "info",
-                    {
-                        "type": "cache.hit",
-                        "file": str(path),
-                        "message": f"Using cached analysis for {path.name}",
-                        "timestamp": datetime.now(timezone.utc).isoformat(),
-                    },
-                )
-        else:
-            # Analyze file
-            if self.emitter:
-                from datetime import datetime
+    def _emit_cache_miss(self, path: Path) -> None:
+        """Emit cache miss event."""
+        if self.emitter:
+            from datetime import datetime
 
-                self.emitter.emit(
-                    "info",
-                    {
-                        "type": "cache.miss",
-                        "file": str(path),
-                        "message": f"Cache miss, analyzing fresh: {path.name}",
-                        "timestamp": datetime.now(timezone.utc).isoformat(),
-                    },
-                )
+            self.emitter.emit(
+                "info",
+                {
+                    "type": "cache.miss",
+                    "file": str(path),
+                    "message": f"Cache miss, analyzing fresh: {path.name}",
+                    "timestamp": datetime.now(timezone.utc).isoformat(),
+                },
+            )
 
-            if language == "python":
-                analyzer = self.python_analyzer
-            elif language in {"javascript", "typescript"}:
-                analyzer = self.javascript_analyzer
-            else:
-                analyzer = self.generic_analyzer
+    def _emit_parsing_start(self, path: Path) -> None:
+        """Emit parsing start event."""
+        if self.emitter:
+            from datetime import datetime
+
+            self.emitter.emit(
+                "info",
+                {
+                    "type": "analysis.parse",
+                    "file": str(path),
+                    "message": f"Parsing file content: {path.name}",
+                    "timestamp": datetime.now(timezone.utc).isoformat(),
+                },
+            )
 
-            start_time = time.time()
+    def _emit_node_found(self, node: CodeNode, path: Path) -> None:
+        """Emit node found event."""
+        if self.emitter:
+            from datetime import datetime
 
-            # Emit parsing event
-            if self.emitter:
-                from datetime import datetime
+            self.emitter.emit(
+                "info",
+                {
+                    "type": f"analysis.{node.node_type}",
+                    "name": node.name,
+                    "file": str(path),
+                    "line_start": node.line_start,
+                    "complexity": node.complexity,
+                    "message": f"Found {node.node_type}: {node.name}",
+                    "timestamp": datetime.now(timezone.utc).isoformat(),
+                },
+            )
 
-                self.emitter.emit(
-                    "info",
-                    {
-                        "type": "analysis.parse",
-                        "file": str(path),
-                        "message": f"Parsing file content: {path.name}",
-                        "timestamp": datetime.now(timezone.utc).isoformat(),
-                    },
-                )
+    def _emit_analysis_complete(
+        self, path: Path, filtered_nodes: list, duration: float
+    ) -> None:
+        """Emit analysis complete event."""
+        if not self.emitter:
+            return
 
-            nodes = analyzer.analyze_file(path) if analyzer else []
-            duration = time.time() - start_time
+        from datetime import datetime
+
+        stats = self._calculate_node_stats(filtered_nodes)
+        self.emitter.emit(
+            "info",
+            {
+                "type": "analysis.complete",
+                "file": str(path),
+                "stats": stats,
+                "duration": duration,
+                "message": f"Analysis complete: {stats['classes']} classes, {stats['functions']} functions, {stats['methods']} methods",
+                "timestamp": datetime.now(timezone.utc).isoformat(),
+            },
+        )
+        self.emitter.emit_file_analyzed(str(path), filtered_nodes, duration)
 
-            # Cache results
-            self.cache[cache_key] = nodes
+    def _analyze_and_cache_file(
+        self, path: Path, language: str, cache_key: str
+    ) -> tuple:
+        """Analyze file content and cache results."""
+        self._emit_cache_miss(path)
+        self._emit_parsing_start(path)
 
-            # Filter internal functions before emitting
-            filtered_nodes = []
-            classes_count = 0
-            functions_count = 0
-            methods_count = 0
+        # Select analyzer based on language
+        analyzer = self._select_analyzer(language)
 
-            for node in nodes:
-                # Only include main structural elements
-                if not self._is_internal_node(node):
-                    # Emit found element event
-                    if self.emitter:
-                        from datetime import datetime
+        # Perform analysis
+        start_time = time.time()
+        nodes = analyzer.analyze_file(path) if analyzer else []
+        duration = time.time() - start_time
 
-                        self.emitter.emit(
-                            "info",
-                            {
-                                "type": f"analysis.{node.node_type}",
-                                "name": node.name,
-                                "file": str(path),
-                                "line_start": node.line_start,
-                                "complexity": node.complexity,
-                                "message": f"Found {node.node_type}: {node.name}",
-                                "timestamp": datetime.now(timezone.utc).isoformat(),
-                            },
-                        )
+        # Cache results
+        self.cache[cache_key] = nodes
 
-                        # Count node types
-                        if node.node_type == "class":
-                            classes_count += 1
-                        elif node.node_type == "function":
-                            functions_count += 1
-                        elif node.node_type == "method":
-                            methods_count += 1
-
-                    filtered_nodes.append(
-                        {
-                            "name": node.name,
-                            "type": node.node_type,
-                            "line_start": node.line_start,
-                            "line_end": node.line_end,
-                            "complexity": node.complexity,
-                            "has_docstring": node.has_docstring,
-                            "signature": node.signature,
-                        }
-                    )
+        # Filter and process nodes
+        filtered_nodes = self._filter_and_emit_nodes(nodes, path)
 
-            # Emit analysis complete event with stats
-            if self.emitter:
-                from datetime import datetime
+        return nodes, filtered_nodes, duration
 
-                self.emitter.emit(
-                    "info",
-                    {
-                        "type": "analysis.complete",
-                        "file": str(path),
-                        "stats": {
-                            "classes": classes_count,
-                            "functions": functions_count,
-                            "methods": methods_count,
-                            "total_nodes": len(filtered_nodes),
-                        },
-                        "duration": duration,
-                        "message": f"Analysis complete: {classes_count} classes, {functions_count} functions, {methods_count} methods",
-                        "timestamp": datetime.now(timezone.utc).isoformat(),
-                    },
-                )
+    def _select_analyzer(self, language: str):
+        """Select appropriate analyzer for language."""
+        if language == "python":
+            return self.python_analyzer
+        if language in {"javascript", "typescript"}:
+            return self.javascript_analyzer
+        return self.generic_analyzer
 
-                self.emitter.emit_file_analyzed(file_path, filtered_nodes, duration)
+    def _filter_nodes(self, nodes: list) -> list:
+        """Filter nodes without emitting events."""
+        return [self._node_to_dict(n) for n in nodes if not self._is_internal_node(n)]
 
-        # Prepare the nodes data
-        final_nodes = (
-            filtered_nodes
-            if "filtered_nodes" in locals()
-            else [
-                {
-                    "name": n.name,
-                    "type": n.node_type,
-                    "line_start": n.line_start,
-                    "line_end": n.line_end,
-                    "complexity": n.complexity,
-                    "has_docstring": n.has_docstring,
-                    "signature": n.signature,
-                }
-                for n in nodes
-                if not self._is_internal_node(n)
-            ]
-        )
+    def _filter_and_emit_nodes(self, nodes: list, path: Path) -> list:
+        """Filter nodes and emit events for each."""
+        filtered_nodes = []
+        for node in nodes:
+            if not self._is_internal_node(node):
+                self._emit_node_found(node, path)
+                filtered_nodes.append(self._node_to_dict(node))
+        return filtered_nodes
+
+    def _node_to_dict(self, node: CodeNode) -> dict:
+        """Convert CodeNode to dictionary."""
+        return {
+            "name": node.name,
+            "type": node.node_type,
+            "line_start": node.line_start,
+            "line_end": node.line_end,
+            "complexity": node.complexity,
+            "has_docstring": node.has_docstring,
+            "signature": node.signature,
+        }
+
+    def _calculate_node_stats(self, filtered_nodes: list) -> dict:
+        """Calculate statistics from filtered nodes."""
+        classes_count = sum(1 for n in filtered_nodes if n["type"] == "class")
+        functions_count = sum(1 for n in filtered_nodes if n["type"] == "function")
+        methods_count = sum(1 for n in filtered_nodes if n["type"] == "method")
+        return {
+            "classes": classes_count,
+            "functions": functions_count,
+            "methods": methods_count,
+            "total_nodes": len(filtered_nodes),
+        }
+
+    def _prepare_final_nodes(self, nodes: list, filtered_nodes: list) -> list:
+        """Prepare final nodes data structure."""
+        if filtered_nodes:
+            return filtered_nodes
+        return [self._node_to_dict(n) for n in nodes if not self._is_internal_node(n)]
 
-        # Convert nodes to elements format for dashboard compatibility
+    def _convert_nodes_to_elements(self, final_nodes: list) -> list:
+        """Convert nodes to elements format for dashboard."""
         elements = []
         for node in final_nodes:
             element = {
                 "name": node["name"],
                 "type": node["type"],
-                "line": node["line_start"],  # Dashboard expects 'line' not 'line_start'
+                "line": node["line_start"],
                 "complexity": node["complexity"],
                 "signature": node.get("signature", ""),
                 "has_docstring": node.get("has_docstring", False),
             }
-            # Add methods if it's a class (for expandable tree)
             if node["type"] == "class":
-                element["methods"] = []  # Could be populated with class methods
+                element["methods"] = []
             elements.append(element)
+        return elements
 
+    def _build_result(
+        self, file_path: str, language: str, final_nodes: list, elements: list
+    ) -> dict:
+        """Build final result dictionary."""
         return {
             "path": file_path,
             "language": language,
-            "nodes": final_nodes,  # Keep for backward compatibility
-            "elements": elements,  # Add for dashboard compatibility
+            "nodes": final_nodes,
+            "elements": elements,
             "complexity": sum(e["complexity"] for e in elements),
-            "lines": len(elements),  # Simple line count approximation
+            "lines": len(elements),
             "stats": {
                 "classes": len([e for e in elements if e["type"] == "class"]),
                 "functions": len([e for e in elements if e["type"] == "function"]),

claude_mpm/tools/code_tree_events.py

@@ -22,6 +22,8 @@ from dataclasses import asdict, dataclass
 from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
+from ..core.enums import OperationResult
+
 try:
     import socketio
 
@@ -268,7 +270,7 @@ class CodeTreeEventEmitter:
                 "name": Path(file_path).name,
                 "language": language or "unknown",
                 "type": "file",
-                "status": "analyzing",
+                "status": OperationResult.PENDING,
             },
         )
 
@@ -287,7 +289,7 @@ class CodeTreeEventEmitter:
                 "nodes_count": nodes_count,
                 "duration": duration,
                 "type": "file",
-                "status": "complete",
+                "status": OperationResult.COMPLETED,
             },
         )
 

claude_mpm/utils/agent_dependency_loader.py

@@ -14,7 +14,7 @@ import logging
 import subprocess
 import sys
 import time
-from typing import Dict, List, Optional, Set, Tuple
+from typing import Any, Dict, List, Optional, Set, Tuple
 
 from packaging.requirements import InvalidRequirement, Requirement
 
@@ -72,7 +72,7 @@ class AgentDependencyLoader:
         Returns:
             Dictionary mapping agent IDs to their file paths
         """
-        deployed_agents = {}
+        deployed_agents: Dict[str, Path] = {}
         claude_agents_dir = Path.cwd() / ".claude" / "agents"
 
         if not claude_agents_dir.exists():
@@ -85,7 +85,7 @@ class AgentDependencyLoader:
             deployed_agents[agent_id] = agent_file
             logger.debug(f"Found deployed agent: {agent_id}")
 
-        logger.info(f"Discovered {len(deployed_agents)} deployed agents")
+        logger.debug(f"Discovered {len(deployed_agents)} deployed agents")
         self.deployed_agents = deployed_agents
         return deployed_agents
 
@@ -121,7 +121,7 @@ class AgentDependencyLoader:
                         logger.warning(f"Failed to load config for {agent_id}: {e}")
 
         self.agent_dependencies = agent_dependencies
-        logger.info(f"Loaded dependencies for {len(agent_dependencies)} agents")
+        logger.debug(f"Loaded dependencies for {len(agent_dependencies)} agents")
         return agent_dependencies
 
     def check_python_dependency(self, package_spec: str) -> Tuple[bool, Optional[str]]:
@@ -409,7 +409,7 @@ class AgentDependencyLoader:
         Returns:
             Analysis results including missing and satisfied dependencies
         """
-        results = {
+        results: Dict[str, Any] = {
             "agents": {},
             "summary": {
                 "total_agents": len(self.deployed_agents),
@@ -422,7 +422,7 @@ class AgentDependencyLoader:
         }
 
         for agent_id, deps in self.agent_dependencies.items():
-            agent_result = {
+            agent_result: Dict[str, Dict[str, List[str]]] = {
                 "python": {"satisfied": [], "missing": [], "outdated": []},
                 "system": {"satisfied": [], "missing": []},
             }
@@ -476,8 +476,8 @@ class AgentDependencyLoader:
         """
         import sys
 
-        compatible = []
-        incompatible = []
+        compatible: List[str] = []
+        incompatible: List[str] = []
 
         for dep in dependencies:
             try:
@@ -593,20 +593,37 @@ class AgentDependencyLoader:
             try:
                 cmd = [sys.executable, "-m", "pip", "install"]
 
-                # Check for PEP 668 managed environment
+                # Check environment and add appropriate flags
+                import os
                 import sysconfig
 
-                stdlib_path = sysconfig.get_path("stdlib")
-                marker_file = Path(stdlib_path) / "EXTERNALLY-MANAGED"
-                parent_marker = marker_file.parent.parent / "EXTERNALLY-MANAGED"
+                # Check if in virtualenv
+                in_virtualenv = (
+                    (hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix)
+                    or (hasattr(sys, "real_prefix"))
+                    or (os.environ.get("VIRTUAL_ENV") is not None)
+                )
 
-                if marker_file.exists() or parent_marker.exists():
-                    logger.warning(
-                        "PEP 668 managed environment detected. "
-                        "Installing with --break-system-packages --user flags. "
-                        "Consider using a virtual environment instead."
-                    )
-                    cmd.extend(["--break-system-packages", "--user"])
+                if in_virtualenv:
+                    # In virtualenv - no special flags needed
+                    logger.debug("Installing in virtualenv (no special flags)")
+                else:
+                    # Check for PEP 668 managed environment
+                    stdlib_path = sysconfig.get_path("stdlib")
+                    marker_file = Path(stdlib_path) / "EXTERNALLY-MANAGED"
+                    parent_marker = marker_file.parent.parent / "EXTERNALLY-MANAGED"
+
+                    if marker_file.exists() or parent_marker.exists():
+                        logger.warning(
+                            "PEP 668 managed environment detected. "
+                            "Installing with --break-system-packages flag. "
+                            "Consider using a virtual environment instead."
+                        )
+                        cmd.append("--break-system-packages")
+                    else:
+                        # Normal system Python - use --user
+                        cmd.append("--user")
+                        logger.debug("Installing with --user flag")
 
                 cmd.extend(compatible)
 
@@ -946,13 +963,16 @@ class AgentDependencyLoader:
 
 def check_deployed_agent_dependencies(
     auto_install: bool = False, verbose: bool = False
-) -> None:
+) -> int:
     """
     Check dependencies for currently deployed agents.
 
     Args:
         auto_install: If True, automatically install missing Python dependencies
         verbose: If True, enable verbose logging
+
+    Returns:
+        Status code: 0 if all dependencies satisfied, 1 if missing dependencies
     """
     if verbose:
         logging.getLogger().setLevel(logging.DEBUG)