claude-mpm 4.1.26__py3-none-any.whl → 4.24.0__py3-none-any.whl

claude_mpm/core/config.py

@@ -14,11 +14,13 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 
 import yaml
 
+from claude_mpm.core.logging_utils import get_logger
+
 from ..utils.config_manager import ConfigurationManager
 from .exceptions import ConfigurationError, FileOperationError
 from .unified_paths import get_path_manager
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 
 class Config:
@@ -54,7 +56,7 @@ class Config:
                 # Double-check locking pattern for thread safety
                 if cls._instance is None:
                     cls._instance = super().__new__(cls)
-                    logger.info("Creating new Config singleton instance")
+                    logger.debug("Creating new Config singleton instance")
                 else:
                     logger.debug(
                         "Reusing existing Config singleton instance (concurrent init)"
@@ -100,7 +102,7 @@ class Config:
                 return
 
             Config._initialized = True
-            logger.info("Initializing Config singleton for the first time")
+            logger.debug("Initializing Config singleton for the first time")
 
             # Initialize instance variables inside the lock to ensure thread safety
             self._config: Dict[str, Any] = {}
@@ -199,7 +201,7 @@ class Config:
                         # Set flag IMMEDIATELY before logging to prevent any possibility of duplicate
                         # messages. No lock needed here since we're already inside __init__ lock
                         Config._success_logged = True
-                        logger.info(
+                        logger.debug(
                             f"✓ Successfully loaded configuration from {file_path}"
                         )
                     else:
@@ -251,7 +253,7 @@ class Config:
                     "operation": "read",
                     "error_type": type(e).__name__,
                 },
-            )
+            ) from e
         except Exception as e:
             # Catch any remaining unexpected errors and wrap them as configuration errors
             raise ConfigurationError(
@@ -261,7 +263,7 @@ class Config:
                     "error_type": type(e).__name__,
                     "original_error": str(e),
                 },
-            )
+            ) from e
 
     def _load_env_vars(self) -> None:
         """Load configuration from environment variables."""
@@ -527,11 +529,36 @@ class Config:
                     },
                 },
             },
+            # Monitor server configuration (decoupled from dashboard)
+            "monitor_server": {
+                "host": "localhost",
+                "port": 8765,  # Default monitor port (shared with dashboard)
+                "enable_health_monitoring": True,
+                "auto_start": False,  # Don't auto-start with dashboard by default
+                "event_buffer_size": 2000,  # Larger buffer for monitor server
+                "client_timeout": 60,  # Timeout for inactive clients
+            },
+            # Dashboard server configuration (connects to monitor)
+            "dashboard_server": {
+                "host": "localhost",
+                "port": 8765,  # Dashboard UI port
+                "monitor_host": "localhost",  # Monitor server host to connect to
+                "monitor_port": 8765,  # Monitor server port to connect to
+                "auto_connect_monitor": True,  # Automatically connect to monitor
+                "monitor_reconnect": True,  # Auto-reconnect to monitor if disconnected
+                "fallback_standalone": True,  # Run in standalone mode if monitor unavailable
+            },
             # Agent deployment configuration
             "agent_deployment": {
                 "excluded_agents": [],  # List of agent IDs to exclude from deployment
                 "exclude_dependencies": False,  # Whether to exclude agent dependencies too
                 "case_sensitive": False,  # Whether agent name matching is case-sensitive
+                "filter_non_mpm_agents": True,  # Filter out non-MPM agents by default
+                "mpm_author_patterns": [
+                    "claude mpm",
+                    "claude-mpm",
+                    "anthropic",
+                ],  # Patterns for MPM agents
             },
             # Instruction reinforcement system configuration
             "instruction_reinforcement": {
@@ -551,6 +578,19 @@ class Config:
                     "[PM-REMINDER] Your role is coordination and management",
                 ],
             },
+            # Session management configuration
+            "session": {
+                "auto_save": True,  # Enable automatic session saving
+                "save_interval": 300,  # Auto-save interval in seconds (5 minutes)
+            },
+            # Update checking configuration
+            "updates": {
+                "check_enabled": True,  # Enable automatic update checks
+                "check_frequency": "daily",  # Options: "always", "daily", "weekly", "never"
+                "check_claude_code": True,  # Check Claude Code version compatibility
+                "auto_upgrade": False,  # Automatically upgrade without prompting (use with caution)
+                "cache_ttl": 86400,  # Cache update check results (24 hours)
+            },
         }
 
         # Apply defaults for missing keys
@@ -561,6 +601,9 @@ class Config:
         # Validate health and recovery configuration
         self._validate_health_recovery_config()
 
+        # Validate session configuration
+        self._validate_session_config()
+
     def get(self, key: str, default: Any = None) -> Any:
         """Get configuration value."""
         # Support nested keys with dot notation
@@ -624,7 +667,7 @@ class Config:
                     "format": format,
                     "error_type": type(e).__name__,
                 },
-            )
+            ) from e
         except Exception as e:
             # Re-raise ConfigurationError as-is, wrap others
             if isinstance(e, ConfigurationError):
@@ -636,7 +679,7 @@ class Config:
                     "format": format,
                     "error_type": type(e).__name__,
                 },
-            )
+            ) from e
 
     def validate(self, schema: Dict[str, Any]) -> bool:
         """
@@ -737,6 +780,40 @@ class Config:
         except Exception as e:
             logger.error(f"Error validating health/recovery configuration: {e}")
 
+    def _validate_session_config(self) -> None:
+        """Validate session management configuration."""
+        try:
+            session_config = self.get("session", {})
+
+            # Validate save_interval range (60-1800 seconds)
+            save_interval = session_config.get("save_interval", 300)
+            if not isinstance(save_interval, int):
+                logger.warning(
+                    f"Session save_interval must be integer, got {type(save_interval).__name__}, using default 300"
+                )
+                self.set("session.save_interval", 300)
+            elif save_interval < 60:
+                logger.warning(
+                    f"Session save_interval must be at least 60 seconds, got {save_interval}, using 60"
+                )
+                self.set("session.save_interval", 60)
+            elif save_interval > 1800:
+                logger.warning(
+                    f"Session save_interval must be at most 1800 seconds (30 min), got {save_interval}, using 1800"
+                )
+                self.set("session.save_interval", 1800)
+
+            # Validate auto_save is boolean
+            auto_save = session_config.get("auto_save", True)
+            if not isinstance(auto_save, bool):
+                logger.warning(
+                    f"Session auto_save must be boolean, got {type(auto_save).__name__}, using True"
+                )
+                self.set("session.auto_save", True)
+
+        except Exception as e:
+            logger.error(f"Error validating session configuration: {e}")
+
     def get_health_monitoring_config(self) -> Dict[str, Any]:
         """Get health monitoring configuration with defaults."""
         base_config = {

claude_mpm/core/config_aliases.py

@@ -14,13 +14,14 @@ Aliases are stored in ~/.claude-mpm/config_aliases.json
 """
 
 import json
-import logging
 from typing import Dict, List, Optional, Tuple
 
+from claude_mpm.core.logging_utils import get_logger
+
 from ..utils.config_manager import ConfigurationManager
 from .unified_paths import get_path_manager
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 
 class ConfigAliasError(Exception):
@@ -87,7 +88,7 @@ class ConfigAliasManager:
             self.config_mgr.save_json(aliases, self.aliases_file, sort_keys=True)
         except Exception as e:
             logger.error(f"Failed to save aliases: {e}")
-            raise ConfigAliasError(f"Failed to save aliases: {e}")
+            raise ConfigAliasError(f"Failed to save aliases: {e}") from e
 
     def create_alias(self, alias_name: str, directory_path: str) -> None:
         """
@@ -210,7 +211,7 @@ class ConfigAliasManager:
                 except Exception as e:
                     raise InvalidDirectoryError(
                         f"Cannot create directory '{directory_path}': {e}"
-                    )
+                    ) from e
 
             # Verify we can write to the directory
             test_file = directory_path / ".claude_pm_test"
@@ -220,14 +221,14 @@ class ConfigAliasManager:
             except Exception as e:
                 raise InvalidDirectoryError(
                     f"Directory '{directory_path}' is not writable: {e}"
-                )
+                ) from e
 
             return directory_path
 
         except InvalidDirectoryError:
             raise
         except Exception as e:
-            raise InvalidDirectoryError(f"Invalid directory path '{path}': {e}")
+            raise InvalidDirectoryError(f"Invalid directory path '{path}': {e}") from e
 
     def get_alias(self, alias_name: str) -> Optional[str]:
         """

claude_mpm/core/constants.py

@@ -4,6 +4,7 @@ This module consolidates all magic numbers and configuration constants
 that were previously scattered throughout the codebase.
 """
 
+from pathlib import Path
 from typing import Tuple
 
 
@@ -294,3 +295,67 @@ SOCKETIO_PORT_RANGE = NetworkConfig.SOCKETIO_PORT_RANGE
 QUERY_TIMEOUT = TimeoutConfig.QUERY_TIMEOUT
 MAX_RETRIES = RetryConfig.MAX_RETRIES
 DEFAULT_TIMEOUT = TimeoutConfig.DEFAULT_TIMEOUT
+
+
+# ==============================================================================
+# NEW ORGANIZED CONSTANTS (Phase 1 Refactoring)
+# ==============================================================================
+
+
+class NetworkPorts:
+    """Network port configuration."""
+
+    # Use existing values from NetworkConfig
+    DEFAULT_SOCKETIO = NetworkConfig.DEFAULT_SOCKETIO_PORT
+    DEFAULT_DASHBOARD = NetworkConfig.DEFAULT_DASHBOARD_PORT
+    PORT_RANGE_START = NetworkConfig.SOCKETIO_PORT_RANGE[0]
+    PORT_RANGE_END = NetworkConfig.SOCKETIO_PORT_RANGE[1]
+
+    @classmethod
+    def get_port_range(cls) -> range:
+        """Get the valid port range."""
+        return range(cls.PORT_RANGE_START, cls.PORT_RANGE_END + 1)
+
+
+class ProjectPaths:
+    """Project-specific paths and directories."""
+
+    # Claude directories
+    CLAUDE_DIR = ".claude"
+    CLAUDE_AGENTS_DIR = ".claude/agents"
+    CLAUDE_CONFIG_FILE = ".claude/config.yaml"
+
+    # MPM directories
+    MPM_DIR = ".claude-mpm"
+    MPM_SESSION_DIR = ".claude-mpm/session"
+    MPM_PROMPTS_DIR = ".claude-mpm/prompts"
+    MPM_LOGS_DIR = ".claude-mpm/logs"
+    MPM_CONFIG_DIR = ".claude-mpm/config"
+    MPM_MEMORY_DIR = ".claude-mpm/memory"
+    MPM_CACHE_DIR = ".claude-mpm/cache"
+
+    # Config files
+    MPM_CONFIG_FILE = "config.yaml"
+    AGENT_CONFIG_FILE = "agent_config.yaml"
+    EXPERIMENTAL_CONFIG = "experimental.json"
+    SOCKETIO_CONFIG = "socketio_config.yaml"
+
+    # Special files
+    EXPERIMENTAL_ACCEPTED = ".experimental_accepted"
+    VERSION_FILE = "VERSION"
+    BUILD_NUMBER_FILE = "BUILD_NUMBER"
+
+    @classmethod
+    def get_mpm_home(cls) -> Path:
+        """Get the MPM home directory."""
+        return Path.home() / cls.MPM_DIR
+
+    @classmethod
+    def get_project_mpm_dir(cls) -> Path:
+        """Get the project-specific MPM directory."""
+        return Path.cwd() / cls.MPM_DIR
+
+    @classmethod
+    def get_claude_dir(cls) -> Path:
+        """Get the Claude directory."""
+        return Path.cwd() / cls.CLAUDE_DIR

claude_mpm/core/container.py

@@ -538,10 +538,16 @@ class DIContainer(IServiceContainer):
 
             elif registration.lifetime == ServiceLifetime.SCOPED:
                 # Check current scope
-                if self._current_scope:
-                    instance = self._current_scope.get_scoped_instance(service_type)
-                    if instance is not None:
-                        return instance
+                if (
+                    self._current_scope
+                    and (
+                        instance := self._current_scope.get_scoped_instance(
+                            service_type
+                        )
+                    )
+                    is not None
+                ):
+                    return instance
 
             # Mark as resolving
             self._resolving.add(service_type)
@@ -636,7 +642,7 @@ class DIContainer(IServiceContainer):
                                 if reg_type.__name__ == param_type:
                                     param_type = reg_type
                                     break
-                    except:
+                    except Exception:
                         # If we can't resolve, skip this parameter
                         if param.default != param.empty:
                             kwargs[param_name] = param.default