claude-mpm 5.4.65__py3-none-any.whl → 5.6.10__py3-none-any.whl

claude_mpm/core/interactive_session.py

@@ -12,7 +12,7 @@ of InteractiveSession without circular dependency issues.
 
 import contextlib
 import os
-import subprocess
+import subprocess  # nosec B404
 import uuid
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple
@@ -359,19 +359,19 @@ class InteractiveSession:
                 osm = self.runner.framework_loader.output_style_manager
                 if osm:
                     if osm.claude_version and osm.supports_output_styles():
-                        # Check if claude-mpm style is active
+                        # Check if Claude MPM style is active
                         settings_file = osm.settings_file
                         if settings_file.exists():
                             import json
 
                             settings = json.loads(settings_file.read_text())
                             active_style = settings.get("activeOutputStyle")
-                            if active_style == "claude-mpm":
-                                return "Output Style: claude-mpm ✅"
+                            if active_style in ("Claude MPM", "Claude MPM Teacher"):
+                                return f"Output Style: {active_style} ✅"
                             return f"Output Style: {active_style or 'none'}"
                         return "Output Style: Available"
                     return "Output Style: Injected (legacy)"
-        except Exception:
+        except Exception:  # nosec B110
             pass
         return None
 
@@ -582,7 +582,7 @@ class InteractiveSession:
             )
 
         # This will not return if successful
-        os.execvpe(cmd[0], cmd, env)
+        os.execvpe(cmd[0], cmd, env)  # nosec B606
         return False  # Only reached on failure
 
     def _launch_subprocess_mode(self, cmd: list, env: dict) -> bool:
@@ -641,7 +641,7 @@ class InteractiveSession:
             cmd = environment["command"]
             env = environment["environment"]
 
-            result = subprocess.run(
+            result = subprocess.run(  # nosec B603
                 cmd, stdin=None, stdout=None, stderr=None, env=env, check=False
             )
 

claude_mpm/core/logger.py

@@ -214,19 +214,22 @@ def setup_logging(
 
     # Console handler
     if console_output:
+        # MUST use stderr to avoid corrupting hook JSON output
+        # WHY stderr: Hook handlers output JSON to stdout. Logging to stdout
+        # corrupts this JSON and causes "hook error" messages from Claude Code.
         if use_streaming:
             # Use streaming handler for single-line INFO messages
-            console_handler = StreamingHandler(sys.stdout)
+            console_handler = StreamingHandler(sys.stderr)
             console_handler.setFormatter(simple_formatter)
         elif use_rich and not json_format:
             # Rich support has been removed, use standard handler
-            console_handler = logging.StreamHandler(sys.stdout)
+            console_handler = logging.StreamHandler(sys.stderr)
             console_handler.setFormatter(simple_formatter)
         else:
-            console_handler = logging.StreamHandler(sys.stdout)
+            console_handler = logging.StreamHandler(sys.stderr)
             console_handler.setFormatter(formatter if json_format else simple_formatter)
 
-        console_handler.setLevel(logging.INFO)
+        console_handler.setLevel(log_level)  # Respect the requested log level
         logger.addHandler(console_handler)
 
     # File handler
@@ -263,7 +266,7 @@ def setup_logging(
                 if deleted_count > 0:
                     # Log to the new file handler that we're about to add
                     pass  # Deletion count will be logged when logger is ready
-            except Exception:
+            except Exception:  # nosec B110 - intentional: logging should not break app
                 pass  # Ignore cleanup errors
 
             # Also create a symlink to latest log (with thread safety)
@@ -305,7 +308,7 @@ def setup_logging(
                     # Fallback: try to create a regular file with reference to actual log
                     try:
                         latest_link.write_text(f"Latest log: {log_file.name}\n")
-                    except Exception:
+                    except Exception:  # nosec B110 - intentional: logging should not break app
                         pass  # Silently fail - logging should not break the application
                 except Exception as e:
                     # Catch any other unexpected errors to ensure logging doesn't break
@@ -381,15 +384,29 @@ def cleanup_old_mpm_logs(
             try:
                 log_file.unlink()
                 deleted_count += 1
-            except Exception:
+            except Exception:  # nosec B110 - intentional: log cleanup is best-effort
                 pass  # Ignore deletion errors
 
         return deleted_count
 
 
 def get_logger(name: str) -> logging.Logger:
-    """Get a logger instance."""
-    return logging.getLogger(f"claude_mpm.{name}")
+    """Get a logger instance.
+
+    CRITICAL: Respects startup suppression mode (CRITICAL+1) to prevent
+    early INFO logs before setup_logging() is called.
+    """
+    logger = logging.getLogger(f"claude_mpm.{name}")
+
+    # Check if root logger is suppressed (startup.py sets CRITICAL+1)
+    root_logger = logging.getLogger()
+    if root_logger.level > logging.CRITICAL:
+        # Suppression active - ensure this logger is also suppressed
+        logger.setLevel(logging.CRITICAL + 1)
+        logger.handlers = []
+        logger.propagate = False
+
+    return logger
 
 
 def setup_streaming_logger(name: str, level: str = "INFO") -> logging.Logger:

claude_mpm/core/logging_utils.py

@@ -103,21 +103,45 @@ class LoggerFactory:
 
         # Set up root logger
         root_logger = logging.getLogger()
-        root_logger.setLevel(LoggingConfig.LEVELS.get(cls._log_level, logging.INFO))
+
+        # CRITICAL FIX: Respect existing root logger suppression
+        # If root logger is already set to CRITICAL+1 (suppressed by startup.py),
+        # don't override it. This prevents logging from appearing during startup
+        # before the CLI's setup_logging() runs.
+        current_level = root_logger.level
+        desired_level = LoggingConfig.LEVELS.get(cls._log_level, logging.INFO)
+
+        # Only set level if current is unset (0) or lower than desired
+        # CRITICAL+1 is 51, so this check preserves suppression
+        should_configure_logging = current_level == 0 or (
+            current_level < desired_level and current_level <= logging.CRITICAL
+        )
+
+        if should_configure_logging:
+            root_logger.setLevel(desired_level)
+        # else: root logger is suppressed (CRITICAL+1), keep it suppressed
 
         # Remove existing handlers
         root_logger.handlers = []
 
-        # Console handler
-        console_handler = logging.StreamHandler(sys.stdout)
-        console_handler.setLevel(LoggingConfig.LEVELS.get(cls._log_level, logging.INFO))
-        console_formatter = logging.Formatter(
-            log_format or LoggingConfig.DEFAULT_FORMAT,
-            date_format or LoggingConfig.DATE_FORMAT,
-        )
-        console_handler.setFormatter(console_formatter)
-        root_logger.addHandler(console_handler)
-        cls._handlers["console"] = console_handler
+        # CRITICAL FIX: Don't add handlers if logging is suppressed
+        # If root logger is at CRITICAL+1 (startup suppression), don't add any handlers
+        # This prevents early imports from logging before CLI setup_logging() runs
+        if should_configure_logging:
+            # Console handler - MUST use stderr to avoid corrupting hook JSON output
+            # WHY stderr: Hook handlers output JSON to stdout. Logging to stdout
+            # corrupts this JSON and causes "hook error" messages from Claude Code.
+            console_handler = logging.StreamHandler(sys.stderr)
+            console_handler.setLevel(
+                LoggingConfig.LEVELS.get(cls._log_level, logging.INFO)
+            )
+            console_formatter = logging.Formatter(
+                log_format or LoggingConfig.DEFAULT_FORMAT,
+                date_format or LoggingConfig.DATE_FORMAT,
+            )
+            console_handler.setFormatter(console_formatter)
+            root_logger.addHandler(console_handler)
+            cls._handlers["console"] = console_handler
 
         # File handler (optional)
         if log_to_file and cls._log_dir:

claude_mpm/core/output_style_manager.py

@@ -13,7 +13,7 @@ Users can change it if they want, and the system will respect their choice.
 
 import json
 import re
-import subprocess
+import subprocess  # nosec B404
 from pathlib import Path
 from typing import Any, Dict, Literal, Optional, TypedDict, cast
 
@@ -27,7 +27,9 @@ _CACHED_CLAUDE_VERSION: Optional[str] = None
 _VERSION_DETECTED: bool = False
 
 # Output style types
-OutputStyleType = Literal["professional", "teaching"]
+OutputStyleType = Literal[
+    "professional", "teaching", "research", "founders"
+]  # "founders" is deprecated, use "research"
 
 
 class StyleConfig(TypedDict):
@@ -41,9 +43,10 @@ class StyleConfig(TypedDict):
 class OutputStyleManager:
     """Manages output style deployment and version-based handling.
 
-    Supports two output styles:
+    Supports three output styles:
     - professional: Default Claude MPM style (claude-mpm.md)
-    - teaching: Adaptive teaching mode (claude-mpm-teach.md)
+    - teaching: Adaptive teaching mode (claude-mpm-teacher.md)
+    - research: Codebase research mode for founders, PMs, and developers (claude-mpm-research.md)
     """
 
     def __init__(self) -> None:
@@ -51,8 +54,8 @@ class OutputStyleManager:
         self.logger = get_logger("output_style_manager")  # type: ignore[misc]
         self.claude_version = self._detect_claude_version()
 
-        # Deploy to ~/.claude/styles/ directory (NOT output-styles/)
-        self.output_style_dir = Path.home() / ".claude" / "styles"
+        # Deploy to ~/.claude/output-styles/ directory (official Claude Code location)
+        self.output_style_dir = Path.home() / ".claude" / "output-styles"
         self.settings_file = Path.home() / ".claude" / "settings.json"
 
         # Style definitions
@@ -62,14 +65,29 @@ class OutputStyleManager:
                 / "agents"
                 / "CLAUDE_MPM_OUTPUT_STYLE.md",
                 target=self.output_style_dir / "claude-mpm.md",
-                name="claude-mpm",
+                name="Claude MPM",
             ),
             "teaching": StyleConfig(
                 source=Path(__file__).parent.parent
                 / "agents"
                 / "CLAUDE_MPM_TEACHER_OUTPUT_STYLE.md",
-                target=self.output_style_dir / "claude-mpm-teach.md",
-                name="claude-mpm-teach",
+                target=self.output_style_dir / "claude-mpm-teacher.md",
+                name="Claude MPM Teacher",
+            ),
+            "research": StyleConfig(
+                source=Path(__file__).parent.parent
+                / "agents"
+                / "CLAUDE_MPM_RESEARCH_OUTPUT_STYLE.md",
+                target=self.output_style_dir / "claude-mpm-research.md",
+                name="Claude MPM Research",
+            ),
+            # Backward compatibility alias (deprecated)
+            "founders": StyleConfig(
+                source=Path(__file__).parent.parent
+                / "agents"
+                / "CLAUDE_MPM_RESEARCH_OUTPUT_STYLE.md",
+                target=self.output_style_dir / "claude-mpm-research.md",
+                name="Claude MPM Research",
             ),
         }
 
@@ -93,7 +111,7 @@ class OutputStyleManager:
 
         try:
             # Run claude --version command
-            result = subprocess.run(
+            result = subprocess.run(  # nosec B603 B607
                 ["claude", "--version"],
                 capture_output=True,
                 text=True,
@@ -300,12 +318,12 @@ class OutputStyleManager:
             self.logger.error(f"Failed to deploy {style} style: {e}")
             return False
 
-    def _activate_output_style(self, style_name: str = "claude-mpm") -> bool:
+    def _activate_output_style(self, style_name: str = "Claude MPM") -> bool:
         """
         Update Claude Code settings to activate a specific output style.
 
         Args:
-            style_name: Name of the style to activate (e.g., "claude-mpm", "claude-mpm-teach")
+            style_name: Name of the style to activate (e.g., "Claude MPM", "Claude MPM Teacher")
 
         Returns:
             True if activated successfully, False otherwise
@@ -443,7 +461,7 @@ class OutputStyleManager:
 
         # Activate the default style if requested
         if activate_default and results.get("professional", False):
-            self._activate_output_style("claude-mpm")
+            self._activate_output_style("Claude MPM")
 
         return results
 

claude_mpm/core/unified_config.py

@@ -16,7 +16,7 @@ Design Principles:
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, Field, field_validator
 from pydantic_settings import BaseSettings
 
 from .exceptions import ConfigurationError
@@ -54,8 +54,9 @@ class LoggingConfig(BaseModel):
         default=True, description="Enable console logging"
     )
 
-    @validator("level")
-    def validate_log_level(self, v):
+    @field_validator("level")
+    @classmethod
+    def validate_log_level(cls, v):
         valid_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
         if v.upper() not in valid_levels:
             raise ValueError(f"Invalid log level. Must be one of: {valid_levels}")
@@ -65,8 +66,36 @@ class LoggingConfig(BaseModel):
 class AgentConfig(BaseModel):
     """Agent system configuration."""
 
+    # Explicit deployment lists (simplified model)
+    enabled: List[str] = Field(
+        default_factory=list,
+        description="Explicit list of agent IDs to deploy (empty = use auto_discover)",
+    )
+
+    # Required agents that are always deployed
+    # Standard 7 core agents for essential PM workflow functionality
+    # These are auto-deployed when no agents are specified in configuration
+    required: List[str] = Field(
+        default_factory=lambda: [
+            "engineer",  # General-purpose implementation
+            "research",  # Codebase exploration and analysis
+            "qa",  # Testing and quality assurance
+            "web-qa",  # Browser-based testing specialist
+            "documentation",  # Documentation generation
+            "ops",  # Basic deployment operations
+            "ticketing",  # Ticket tracking (essential for PM workflow)
+        ],
+        description="Agents that are always deployed (standard 7 core agents)",
+    )
+
+    include_universal: bool = Field(
+        default=True,
+        description="Auto-include all agents with 'universal' toolchain/category",
+    )
+
     auto_discover: bool = Field(
-        default=True, description="Enable automatic agent discovery"
+        default=False,
+        description="Enable automatic agent discovery (deprecated, use enabled list)",
     )
     precedence: List[str] = Field(
         default=["project", "user", "system"], description="Agent precedence order"
@@ -239,6 +268,21 @@ class DocumentationConfig(BaseModel):
     )
 
 
+class SkillConfig(BaseModel):
+    """Skill system configuration."""
+
+    # Explicit deployment lists (simplified model)
+    enabled: List[str] = Field(
+        default_factory=list,
+        description="Explicit list of skill IDs to deploy (includes agent dependencies)",
+    )
+
+    auto_detect_dependencies: bool = Field(
+        default=True,
+        description="Automatically include skills required by enabled agents",
+    )
+
+
 class UnifiedConfig(BaseSettings):
     """
     Unified configuration model for Claude MPM.
@@ -258,6 +302,7 @@ class UnifiedConfig(BaseSettings):
     network: NetworkConfig = Field(default_factory=NetworkConfig)
     logging: LoggingConfig = Field(default_factory=LoggingConfig)
     agents: AgentConfig = Field(default_factory=AgentConfig)
+    skills: SkillConfig = Field(default_factory=SkillConfig)
     memory: MemoryConfig = Field(default_factory=MemoryConfig)
     security: SecurityConfig = Field(default_factory=SecurityConfig)
     performance: PerformanceConfig = Field(default_factory=PerformanceConfig)
@@ -287,8 +332,9 @@ class UnifiedConfig(BaseSettings):
         validate_assignment = True
         extra = "allow"  # Allow extra fields for backward compatibility
 
-    @validator("environment")
-    def validate_environment(self, v):
+    @field_validator("environment")
+    @classmethod
+    def validate_environment(cls, v):
         valid_envs = ["development", "testing", "production"]
         if v not in valid_envs:
             raise ValueError(f"Invalid environment. Must be one of: {valid_envs}")
@@ -554,12 +600,12 @@ class ConfigurationService:
                 import yaml
 
                 with file_path.open("w") as f:
-                    yaml.dump(self._config.dict(), f, default_flow_style=False)
+                    yaml.dump(self._config.model_dump(), f, default_flow_style=False)
             elif format.lower() == "json":
                 import json
 
                 with file_path.open("w") as f:
-                    json.dump(self._config.dict(), f, indent=2)
+                    json.dump(self._config.model_dump(), f, indent=2)
             else:
                 raise ConfigurationError(f"Unsupported export format: {format}")