claude-mpm 4.3.12__py3-none-any.whl → 4.3.14__py3-none-any.whl

claude_mpm/services/event_bus/relay.py

@@ -11,7 +11,7 @@ WHY separate relay component:
 import logging
 import os
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 
 # Socket.IO imports
@@ -151,7 +151,7 @@ class SocketIORelay:
                 # Verify connection is still alive
                 if self.client.connected:
                     return True
-            except:
+            except Exception:
                 pass
 
         # Need to create or reconnect
@@ -187,7 +187,9 @@ class SocketIORelay:
                     "subtype": (
                         event_type.split(".", 1)[1] if "." in event_type else "generic"
                     ),
-                    "timestamp": data.get("timestamp", datetime.now().isoformat()),
+                    "timestamp": data.get(
+                        "timestamp", datetime.now(timezone.utc).isoformat()
+                    ),
                     "data": data,
                     "source": "event_bus",
                 },
@@ -195,7 +197,7 @@ class SocketIORelay:
 
             # Update statistics
             self.stats["events_relayed"] += 1
-            self.stats["last_relay_time"] = datetime.now().isoformat()
+            self.stats["last_relay_time"] = datetime.now(timezone.utc).isoformat()
 
             if self.debug:
                 logger.debug(f"Relayed event to Socket.IO: {event_type}")

claude_mpm/services/events/consumers/dead_letter.py

@@ -6,7 +6,7 @@ Handles events that failed processing in other consumers.
 """
 
 import json
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -284,7 +284,7 @@ class DeadLetterConsumer(IEventConsumer):
 
     def _rotate_file(self) -> None:
         """Rotate to a new output file."""
-        timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+        timestamp = datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
         self._current_file = self.output_dir / f"dead-letter-{timestamp}.jsonl"
         self._current_file_size = 0
         self._metrics["files_created"] += 1
@@ -293,7 +293,9 @@ class DeadLetterConsumer(IEventConsumer):
 
     async def _cleanup_old_files(self) -> None:
         """Remove files older than retention period."""
-        cutoff_time = datetime.now().timestamp() - (self.retention_days * 86400)
+        cutoff_time = datetime.now(timezone.utc).timestamp() - (
+            self.retention_days * 86400
+        )
 
         for file_path in self.output_dir.glob("dead-letter-*.jsonl"):
             try:

claude_mpm/services/events/core.py

@@ -12,7 +12,7 @@ import time
 import uuid
 from collections import defaultdict, deque
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any, Deque, Dict, List, Optional, Set
 
@@ -225,7 +225,7 @@ class EventBus(IEventBus):
 
         # Add metadata
         if event.metadata:
-            event.metadata.published_at = datetime.now()
+            event.metadata.published_at = datetime.now(timezone.utc)
 
         # Queue event
         self._event_queues[event.priority].append(event)
@@ -353,7 +353,7 @@ class EventBus(IEventBus):
                 # Update metrics
                 if events_processed > 0:
                     self._metrics["events_processed"] += events_processed
-                    self._metrics["last_event_time"] = datetime.now()
+                    self._metrics["last_event_time"] = datetime.now(timezone.utc)
                     self._metrics["queue_size"] = sum(
                         len(q) for q in self._event_queues.values()
                     )

claude_mpm/services/events/producers/hook.py

@@ -7,7 +7,7 @@ This replaces direct Socket.IO emission in the hook handler.
 """
 
 import uuid
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 from claude_mpm.core.logging_config import get_logger
@@ -96,7 +96,7 @@ class HookEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="hook.response",
             type="AssistantResponse",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data=response_data,
             correlation_id=correlation_id,
@@ -128,7 +128,7 @@ class HookEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="hook.tool",
             type="ToolUse",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "tool": tool_name,
@@ -164,7 +164,7 @@ class HookEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="hook.error",
             type="Error",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "error_type": error_type,
@@ -200,7 +200,7 @@ class HookEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic=f"hook.subagent.{event_type.lower()}",
             type=f"Subagent{event_type}",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "subagent": subagent_name,
@@ -255,7 +255,7 @@ class HookEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic=topic,
             type=hook_type,
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data=hook_data,
             correlation_id=correlation_id,

claude_mpm/services/events/producers/system.py

@@ -6,7 +6,7 @@ Publishes system-level events to the event bus.
 """
 
 import uuid
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 from claude_mpm.core.logging_config import get_logger
@@ -100,7 +100,7 @@ class SystemEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="system.lifecycle.startup",
             type="ServiceStartup",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "service": service_name,
@@ -133,7 +133,7 @@ class SystemEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="system.lifecycle.shutdown",
             type="ServiceShutdown",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "service": service_name,
@@ -168,7 +168,7 @@ class SystemEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="system.health",
             type="HealthStatus",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "service": service_name,
@@ -206,7 +206,7 @@ class SystemEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="system.config",
             type="ConfigChange",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "service": service_name,
@@ -238,7 +238,7 @@ class SystemEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="system.performance",
             type="PerformanceMetrics",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "service": service_name,
@@ -274,7 +274,7 @@ class SystemEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="system.error",
             type="SystemError",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "service": service_name,
@@ -311,7 +311,7 @@ class SystemEventProducer(IEventProducer):
             id=str(uuid.uuid4()),
             topic="system.warning",
             type="SystemWarning",
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
             source=self.source_name,
             data={
                 "service": service_name,

claude_mpm/services/exceptions.py

@@ -15,7 +15,7 @@ Design Principles:
 
 import platform
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 
@@ -43,7 +43,7 @@ class SocketIOServerError(Exception):
         self.message = message
         self.error_code = error_code or self.__class__.__name__.lower()
         self.context = context or {}
-        self.timestamp = datetime.utcnow().isoformat() + "Z"
+        self.timestamp = datetime.now(timezone.utc).isoformat() + "Z"
 
     def to_dict(self) -> Dict[str, Any]:
         """Convert error to dictionary format for structured logging/handling."""
@@ -125,9 +125,9 @@ class DaemonConflictError(SocketIOServerError):
             )
 
             if create_time:
-                start_time = datetime.fromtimestamp(create_time).strftime(
-                    "%Y-%m-%d %H:%M:%S"
-                )
+                start_time = datetime.fromtimestamp(
+                    create_time, tz=timezone.utc
+                ).strftime("%Y-%m-%d %H:%M:%S")
                 uptime = time.time() - create_time
                 lines.append(f"  • Started: {start_time} (uptime: {uptime:.0f}s)")
 

claude_mpm/services/framework_claude_md_generator/content_assembler.py

@@ -7,7 +7,7 @@ Assembles sections and applies template variable substitution.
 import hashlib
 import logging
 from collections import OrderedDict
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 
 from claude_mpm.services.agents.management import AgentCapabilitiesGenerator
@@ -35,7 +35,7 @@ class ContentAssembler:
         Returns:
             str: 16-character hash of content
         """
-        timestamp = datetime.utcnow().isoformat()
+        timestamp = datetime.now(timezone.utc).isoformat()
         hash_obj = hashlib.sha256(timestamp.encode())
         return hash_obj.hexdigest()[:16]
 
@@ -176,7 +176,7 @@ class ContentAssembler:
         Returns:
             Dict: Metadata for header
         """
-        timestamp = datetime.utcnow().isoformat()
+        timestamp = datetime.now(timezone.utc).isoformat()
 
         return {
             "version": version,

claude_mpm/services/framework_claude_md_generator/section_generators/__init__.py

@@ -5,7 +5,7 @@ This module provides base classes and registry for section generators.
 """
 
 from abc import ABC, abstractmethod
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 
 
@@ -35,7 +35,7 @@ class BaseSectionGenerator(ABC):
 
     def get_timestamp(self) -> str:
         """Get current UTC timestamp."""
-        return datetime.utcnow().isoformat()
+        return datetime.now(timezone.utc).isoformat()
 
 
 class SectionGeneratorRegistry:

claude_mpm/services/hook_installer_service.py

@@ -24,7 +24,7 @@ class HookInstallerService:
         self.claude_dir = Path.home() / ".claude"
         self.settings_file = self.claude_dir / "settings.json"
 
-    def is_hooks_configured(self) -> bool:
+    def is_hooks_configured(self) -> bool:  # noqa: PLR0911
         """Check if hooks are configured in Claude settings.
 
         Returns:

claude_mpm/services/infrastructure/context_preservation.py

@@ -16,7 +16,7 @@ import gzip
 import json
 import shutil
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 import ijson  # For streaming JSON parsing
@@ -203,7 +203,9 @@ class ContextPreservationService(BaseService):
             await self._create_backup()
 
             # Load and filter conversations
-            cutoff_time = datetime.now().timestamp() - (keep_recent_days * 86400)
+            cutoff_time = datetime.now(timezone.utc).timestamp() - (
+                keep_recent_days * 86400
+            )
 
             with open(self.claude_json_path) as f:
                 data = json.load(f)
@@ -292,7 +294,7 @@ class ContextPreservationService(BaseService):
                 try:
                     if Path(file_path).exists():
                         valid_files.append(file_path)
-                except:
+                except Exception:
                     pass  # Invalid path
 
             return valid_files
@@ -516,7 +518,7 @@ class ContextPreservationService(BaseService):
     async def _create_backup(self) -> Path:
         """Create backup of Claude configuration."""
         try:
-            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
             backup_name = f"claude_backup_{timestamp}.json"
 
             # Compress if large

claude_mpm/services/infrastructure/daemon_manager.py

@@ -107,7 +107,7 @@ class SocketIODaemonManager:
             )
             if response.status_code == 200:
                 return response.json()
-        except:
+        except Exception:
             pass
         return None
 
@@ -265,7 +265,7 @@ class SocketIODaemonManager:
                 result = sock.connect_ex((self.host, self.port))
                 sock.close()
                 status_info["port_accessible"] = result == 0
-            except:
+            except Exception:
                 status_info["port_accessible"] = False
 
             # Check for conflicts

claude_mpm/services/infrastructure/logging.py

@@ -11,7 +11,7 @@ Part of TSK-0046: Service Layer Architecture Reorganization
 
 import json
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 from claude_mpm.core.logger import get_logger
@@ -92,7 +92,7 @@ class LoggingService(SyncBaseService, IStructuredLogger):
 
         if self.structured_logging:
             log_entry = {
-                "timestamp": datetime.utcnow().isoformat(),
+                "timestamp": datetime.now(timezone.utc).isoformat(),
                 "level": level,
                 "message": message,
                 "context": context,

claude_mpm/services/mcp_config_manager.py

@@ -10,14 +10,25 @@ MCP service installations.
 """
 
 import json
-import os
 import subprocess
+from datetime import datetime, timezone
+from enum import Enum
 from pathlib import Path
 from typing import Dict, Optional, Tuple
 
 from ..core.logger import get_logger
 
 
+class ConfigLocation(Enum):
+    """Enumeration of Claude configuration file locations."""
+
+    CLAUDE_JSON = Path.home() / ".claude.json"  # Primary Claude config
+    CLAUDE_DESKTOP = (
+        Path.home() / ".claude" / "claude_desktop_config.json"
+    )  # Not used by Claude Code
+    PROJECT_MCP = ".mcp.json"  # Project-level MCP config (deprecated)
+
+
 class MCPConfigManager:
     """Manages MCP service configurations with pipx preference."""
 
@@ -34,6 +45,9 @@ class MCPConfigManager:
         self.pipx_base = Path.home() / ".local" / "pipx" / "venvs"
         self.project_root = Path.cwd()
 
+        # Use the proper Claude config file location
+        self.claude_config_path = ConfigLocation.CLAUDE_JSON.value
+
     def detect_service_path(self, service_name: str) -> Optional[str]:
         """
         Detect the best path for an MCP service.
@@ -161,9 +175,7 @@ class MCPConfigManager:
             config["env"] = {}
         elif service_name == "mcp-browser":
             config["args"] = ["mcp"]
-            config["env"] = {
-                "MCP_BROWSER_HOME": str(Path.home() / ".mcp-browser")
-            }
+            config["env"] = {"MCP_BROWSER_HOME": str(Path.home() / ".mcp-browser")}
         elif service_name == "mcp-ticketer":
             config["args"] = ["mcp"]
         else:
@@ -172,9 +184,109 @@ class MCPConfigManager:
 
         return config
 
+    def ensure_mcp_services_configured(self) -> Tuple[bool, str]:
+        """
+        Ensure MCP services are configured in ~/.claude.json on startup.
+
+        This method checks if the core MCP services are configured in the
+        current project's mcpServers section and automatically adds them if missing.
+
+        Returns:
+            Tuple of (success, message)
+        """
+        updated = False
+        added_services = []
+        project_key = str(self.project_root)
+
+        # Load existing Claude config or create minimal structure
+        claude_config = {}
+        if self.claude_config_path.exists():
+            try:
+                with open(self.claude_config_path) as f:
+                    claude_config = json.load(f)
+            except Exception as e:
+                self.logger.error(f"Error reading {self.claude_config_path}: {e}")
+                return False, f"Failed to read Claude config: {e}"
+
+        # Ensure projects structure exists
+        if "projects" not in claude_config:
+            claude_config["projects"] = {}
+
+        if project_key not in claude_config["projects"]:
+            claude_config["projects"][project_key] = {
+                "allowedTools": [],
+                "history": [],
+                "mcpContextUris": [],
+                "mcpServers": {},
+                "enabledMcpjsonServers": [],
+                "disabledMcpjsonServers": [],
+                "hasTrustDialogAccepted": False,
+                "projectOnboardingSeenCount": 0,
+                "hasClaudeMdExternalIncludesApproved": False,
+                "hasClaudeMdExternalIncludesWarningShown": False,
+            }
+            updated = True
+
+        # Get the project's mcpServers section
+        project_config = claude_config["projects"][project_key]
+        if "mcpServers" not in project_config:
+            project_config["mcpServers"] = {}
+            updated = True
+
+        # Check each service and add if missing
+        for service_name in self.PIPX_SERVICES:
+            if service_name not in project_config["mcpServers"]:
+                # Try to detect and configure the service
+                service_path = self.detect_service_path(service_name)
+                if service_path:
+                    config = self.generate_service_config(service_name)
+                    if config:
+                        project_config["mcpServers"][service_name] = config
+                        added_services.append(service_name)
+                        updated = True
+                        self.logger.debug(
+                            f"Added MCP service to config: {service_name}"
+                        )
+                else:
+                    self.logger.debug(
+                        f"MCP service {service_name} not found for auto-configuration"
+                    )
+
+        # Write updated config if changes were made
+        if updated:
+            try:
+                # Create backup if file exists and is large (> 100KB)
+                if self.claude_config_path.exists():
+                    file_size = self.claude_config_path.stat().st_size
+                    if file_size > 100000:  # 100KB
+                        backup_path = self.claude_config_path.with_suffix(
+                            f".backup.{datetime.now(timezone.utc).strftime('%Y%m%d_%H%M%S')}.json"
+                        )
+                        import shutil
+
+                        shutil.copy2(self.claude_config_path, backup_path)
+                        self.logger.debug(f"Created backup: {backup_path}")
+
+                # Write updated config
+                with open(self.claude_config_path, "w") as f:
+                    json.dump(claude_config, f, indent=2)
+
+                if added_services:
+                    message = (
+                        f"Auto-configured MCP services: {', '.join(added_services)}"
+                    )
+                    # Don't log here - let the caller handle logging to avoid duplicates
+                    return True, message
+                return True, "All MCP services already configured"
+            except Exception as e:
+                self.logger.error(f"Failed to write Claude config: {e}")
+                return False, f"Failed to write configuration: {e}"
+
+        return True, "All MCP services already configured"
+
     def update_mcp_config(self, force_pipx: bool = True) -> Tuple[bool, str]:
         """
-        Update the .mcp.json configuration file.
+        Update the MCP configuration in ~/.claude.json.
 
         Args:
             force_pipx: If True, only use pipx installations
@@ -182,13 +294,27 @@ class MCPConfigManager:
         Returns:
             Tuple of (success, message)
         """
-        mcp_config_path = self.project_root / ".mcp.json"
+        # This method now delegates to ensure_mcp_services_configured
+        # since we're updating the Claude config directly
+        return self.ensure_mcp_services_configured()
+
+    def update_project_mcp_config(self, force_pipx: bool = True) -> Tuple[bool, str]:
+        """
+        Update the .mcp.json configuration file (legacy method).
+
+        Args:
+            force_pipx: If True, only use pipx installations
+
+        Returns:
+            Tuple of (success, message)
+        """
+        mcp_config_path = self.project_root / ConfigLocation.PROJECT_MCP.value
 
         # Load existing config if it exists
         existing_config = {}
         if mcp_config_path.exists():
             try:
-                with open(mcp_config_path, "r") as f:
+                with open(mcp_config_path) as f:
                     existing_config = json.load(f)
             except Exception as e:
                 self.logger.error(f"Error reading existing config: {e}")
@@ -203,12 +329,11 @@ class MCPConfigManager:
                 new_config["mcpServers"][service_name] = config
             elif force_pipx:
                 missing_services.append(service_name)
-            else:
-                # Keep existing config if not forcing pipx
-                if service_name in existing_config.get("mcpServers", {}):
-                    new_config["mcpServers"][service_name] = existing_config[
-                        "mcpServers"
-                    ][service_name]
+            # Keep existing config if not forcing pipx
+            elif service_name in existing_config.get("mcpServers", {}):
+                new_config["mcpServers"][service_name] = existing_config["mcpServers"][
+                    service_name
+                ]
 
         # Add any additional services from existing config
         for service_name, config in existing_config.get("mcpServers", {}).items():
@@ -223,8 +348,7 @@ class MCPConfigManager:
             if missing_services:
                 message = f"Updated .mcp.json. Missing services (install via pipx): {', '.join(missing_services)}"
                 return True, message
-            else:
-                return True, "Successfully updated .mcp.json with pipx paths"
+            return True, "Successfully updated .mcp.json with pipx paths"
         except Exception as e:
             return False, f"Failed to update .mcp.json: {e}"
 
@@ -235,23 +359,45 @@ class MCPConfigManager:
         Returns:
             Dict mapping service names to availability status
         """
-        mcp_config_path = self.project_root / ".mcp.json"
-        if not mcp_config_path.exists():
+        project_key = str(self.project_root)
+
+        # Check Claude config
+        if not self.claude_config_path.exists():
+            # Also check legacy .mcp.json
+            mcp_config_path = self.project_root / ConfigLocation.PROJECT_MCP.value
+            if mcp_config_path.exists():
+                try:
+                    with open(mcp_config_path) as f:
+                        config = json.load(f)
+                        results = {}
+                        for service_name, service_config in config.get(
+                            "mcpServers", {}
+                        ).items():
+                            command_path = service_config.get("command", "")
+                            results[service_name] = Path(command_path).exists()
+                        return results
+                except Exception:
+                    pass
             return {}
 
         try:
-            with open(mcp_config_path, "r") as f:
-                config = json.load(f)
+            with open(self.claude_config_path) as f:
+                claude_config = json.load(f)
+
+            # Get project's MCP servers
+            if "projects" in claude_config and project_key in claude_config["projects"]:
+                mcp_servers = claude_config["projects"][project_key].get(
+                    "mcpServers", {}
+                )
+                results = {}
+                for service_name, service_config in mcp_servers.items():
+                    command_path = service_config.get("command", "")
+                    results[service_name] = Path(command_path).exists()
+                return results
         except Exception as e:
             self.logger.error(f"Error reading config: {e}")
-            return {}
 
-        results = {}
-        for service_name, service_config in config.get("mcpServers", {}).items():
-            command_path = service_config.get("command", "")
-            results[service_name] = Path(command_path).exists()
-
-        return results
+        return {}
 
     def install_missing_services(self) -> Tuple[bool, str]:
         """
@@ -274,7 +420,7 @@ class MCPConfigManager:
         for service_name in missing:
             try:
                 self.logger.info(f"Installing {service_name} via pipx...")
-                result = subprocess.run(
+                subprocess.run(
                     ["pipx", "install", service_name],
                     capture_output=True,
                     text=True,
@@ -288,7 +434,6 @@ class MCPConfigManager:
 
         if failed:
             return False, f"Failed to install: {', '.join(failed)}"
-        elif installed:
+        if installed:
             return True, f"Successfully installed: {', '.join(installed)}"
-        else:
-            return True, "No services needed installation"
+        return True, "No services needed installation"