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

claude_mpm/services/event_bus/event_bus.py

@@ -11,13 +11,15 @@ WHY pyee over alternatives:
 import asyncio
 import logging
 import threading
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Callable, Dict, List, Optional, Set
 
 from pyee.asyncio import AsyncIOEventEmitter
 
 # Configure logger
-logger = logging.getLogger(__name__)
+from claude_mpm.core.logging_utils import get_logger
+
+logger = get_logger(__name__)
 
 
 class EventBus:
@@ -63,6 +65,12 @@ class EventBus:
         self._event_history: List[Dict[str, Any]] = []
         self._max_history_size = 100
 
+        # 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
@@ -188,13 +196,17 @@ class EventBus:
                             try:
                                 # Call with event_type and data for wildcard handlers
                                 if asyncio.iscoroutinefunction(handler):
-                                    # Schedule async handlers
+                                    # Schedule async handlers with tracking
                                     try:
                                         loop = asyncio.get_event_loop()
                                         if loop.is_running():
-                                            asyncio.create_task(
+                                            task = asyncio.create_task(
                                                 handler(event_type, data)
                                             )
+                                            self._handler_tasks.add(task)
+                                            task.add_done_callback(
+                                                self._handler_tasks.discard
+                                            )
                                         else:
                                             loop.run_until_complete(
                                                 handler(event_type, data)
@@ -210,7 +222,7 @@ class EventBus:
 
             # Update stats
             self._stats["events_published"] += 1
-            self._stats["last_event_time"] = datetime.now().isoformat()
+            self._stats["last_event_time"] = datetime.now(timezone.utc).isoformat()
 
             if self._debug:
                 logger.debug(f"Published event: {event_type}")
@@ -257,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:
@@ -278,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:
@@ -289,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:
@@ -302,7 +344,7 @@ class EventBus:
             data: The event data
         """
         event_record = {
-            "timestamp": datetime.now().isoformat(),
+            "timestamp": datetime.now(timezone.utc).isoformat(),
             "type": event_type,
             "data": data,
         }

claude_mpm/services/event_bus/relay.py

@@ -8,10 +8,10 @@ WHY separate relay component:
 - Supports batching and retry logic in one place
 """
 
-import logging
 import os
+import threading
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 
 # Socket.IO imports
@@ -25,10 +25,12 @@ except ImportError:
 
 import contextlib
 
+# Configure logger
+from claude_mpm.core.logging_utils import get_logger
+
 from .event_bus import EventBus
 
-# Configure logger
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 
 class SocketIORelay:
@@ -151,7 +153,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 +189,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 +199,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}")
@@ -268,11 +272,15 @@ class SocketIORelay:
 
 # Global relay instance
 _relay_instance: Optional[SocketIORelay] = None
+_relay_lock = threading.Lock()
 
 
 def get_relay(port: Optional[int] = None) -> SocketIORelay:
     """Get or create the global SocketIO relay instance.
 
+    Thread-safe implementation using double-checked locking pattern to
+    prevent race conditions during concurrent initialization.
+
     Args:
         port: Optional port number
 
@@ -280,9 +288,16 @@ def get_relay(port: Optional[int] = None) -> SocketIORelay:
         SocketIORelay: The relay instance
     """
     global _relay_instance
-    if _relay_instance is None:
-        _relay_instance = SocketIORelay(port)
-    return _relay_instance
+
+    # Fast path - check without lock
+    if _relay_instance is not None:
+        return _relay_instance
+
+    # Slow path - acquire lock and double-check
+    with _relay_lock:
+        if _relay_instance is None:
+            _relay_instance = SocketIORelay(port)
+        return _relay_instance
 
 
 def start_relay(port: Optional[int] = None) -> SocketIORelay:
@@ -300,8 +315,12 @@ def start_relay(port: Optional[int] = None) -> SocketIORelay:
 
 
 def stop_relay() -> None:
-    """Stop the global SocketIO relay."""
+    """Stop the global SocketIO relay.
+
+    Thread-safe implementation ensures proper cleanup.
+    """
     global _relay_instance
-    if _relay_instance:
-        _relay_instance.stop()
-        _relay_instance = None
+    with _relay_lock:
+        if _relay_instance:
+            _relay_instance.stop()
+            _relay_instance = None

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
 
@@ -109,7 +109,7 @@ class DeadLetterConsumer(IEventConsumer):
                 self._rotate_file()
 
             # Write to file
-            with open(self._current_file, "a") as f:
+            with self._current_file.open("a") as f:
                 f.write(event_json)
 
             # Update metrics
@@ -165,7 +165,7 @@ class DeadLetterConsumer(IEventConsumer):
         # Find files in time range
         for file_path in sorted(self.output_dir.glob("dead-letter-*.jsonl")):
             try:
-                with open(file_path) as f:
+                with file_path.open() as f:
                     for line in f:
                         event_data = json.loads(line)
 
@@ -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()
                     )
@@ -412,9 +412,8 @@ class EventBus(IEventBus):
         """
         try:
             # Apply filter if configured
-            if consumer.config.filter_func:
-                if not consumer.config.filter_func(event):
-                    return
+            if consumer.config.filter_func and not consumer.config.filter_func(event):
+                return
 
             # Apply transformation if configured
             if consumer.config.transform_func:

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/__init__.py

@@ -141,7 +141,7 @@ class FrameworkClaudeMdGenerator:
         current_content = None
 
         if target_file.exists():
-            with open(target_file) as f:
+            with target_file.open() as f:
                 current_content = f.read()
 
         # Generate new content

claude_mpm/services/framework_claude_md_generator/content_assembler.py

@@ -5,15 +5,15 @@ 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.core.logging_utils import get_logger
 from claude_mpm.services.agents.management import AgentCapabilitiesGenerator
 from claude_mpm.services.agents.registry import DeployedAgentDiscovery
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 
 class ContentAssembler:
@@ -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/content_validator.py

@@ -5,14 +5,14 @@ Validates generated content structure and completeness.
 """
 
 import re
-from typing import List, Tuple
+from typing import ClassVar, List, Tuple
 
 
 class ContentValidator:
     """Validates framework CLAUDE.md content for completeness and correctness."""
 
     # Required sections that must be present
-    REQUIRED_SECTIONS = [
+    REQUIRED_SECTIONS: ClassVar[list[str]] = [
         (r"CLAUDE_MD_VERSION:", "Version metadata"),
         (r"## 🤖 AI ASSISTANT ROLE DESIGNATION", "Role designation section"),
         (r"## A\) AGENTS", "Agents section"),

claude_mpm/services/framework_claude_md_generator/deployment_manager.py

@@ -95,7 +95,7 @@ class DeploymentManager:
 
         # Check if file exists and compare versions
         if target_file.exists() and not force:
-            with open(target_file) as f:
+            with target_file.open() as f:
                 existing_content = f.read()
                 existing_fw_ver = self.version_manager.parse_current_version(
                     existing_content
@@ -110,7 +110,7 @@ class DeploymentManager:
             parent_path.mkdir(parents=True, exist_ok=True)
 
             # Write content
-            with open(target_file, "w") as f:
+            with target_file.open("w") as f:
                 f.write(content)
 
             # Get version info for success message
@@ -137,7 +137,7 @@ class DeploymentManager:
             return True, f"{self.target_filename} does not exist"
 
         try:
-            with open(target_file) as f:
+            with target_file.open() as f:
                 existing_content = f.read()
                 existing_fw_ver = self.version_manager.parse_current_version(
                     existing_content

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/framework_claude_md_generator/version_manager.py

@@ -38,7 +38,7 @@ class VersionManager:
             version_path = package_path.parent / "framework" / "VERSION"
 
         if version_path.exists():
-            with open(version_path) as f:
+            with version_path.open() as f:
                 version_content = f.read().strip()
                 # Framework VERSION file contains just the framework version number
                 try: