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

claude_mpm/services/session_manager.py

@@ -6,12 +6,19 @@ Ensures a single session ID is generated and used across all components.
 
 This service addresses race conditions and duplicate session ID generation
 by providing a single source of truth for session identifiers.
+
+Extended with:
+- Token usage tracking and monitoring
+- Resume log generation on session end
+- Context metrics persistence
+- Automatic resume log injection on session startup
 """
 
 import os
 from datetime import datetime, timezone
+from pathlib import Path
 from threading import Lock
-from typing import Optional
+from typing import Any, Dict, Optional
 
 from claude_mpm.core.logging_utils import get_logger
 
@@ -64,6 +71,24 @@ class SessionManager:
             self._session_id = self._generate_session_id()
             self._session_start_time = datetime.now(timezone.utc)
 
+            # Token usage tracking
+            self._cumulative_tokens = 0
+            self._total_budget = 200000  # Default Claude Code budget
+            self._last_stop_reason: Optional[str] = None
+
+            # Context metrics storage
+            self._context_metrics: Dict[str, Any] = {
+                "total_budget": self._total_budget,
+                "used_tokens": 0,
+                "remaining_tokens": self._total_budget,
+                "percentage_used": 0.0,
+                "stop_reason": None,
+                "model": "claude-sonnet-4.5",
+            }
+
+            # Resume log reference (loaded on startup if exists)
+            self._resume_log_content: Optional[str] = None
+
             # Mark as initialized
             self.__class__._initialized = True
 
@@ -71,6 +96,9 @@ class SessionManager:
                 f"SessionManager initialized with session ID: {self._session_id}"
             )
 
+            # Check for resume log from previous session
+            self._load_resume_log()
+
     def _generate_session_id(self) -> str:
         """
         Generate or retrieve a session ID.
@@ -134,6 +162,182 @@ class SessionManager:
                     f"Session ID already set to {session_id}, no change needed"
                 )
 
+    def update_token_usage(
+        self,
+        input_tokens: int = 0,
+        output_tokens: int = 0,
+        stop_reason: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        """
+        Update cumulative token usage for the session.
+
+        Args:
+            input_tokens: Input tokens from latest API call
+            output_tokens: Output tokens from latest API call
+            stop_reason: Stop reason from Claude API
+
+        Returns:
+            Updated context metrics
+        """
+        with self.__class__._lock:
+            # Update cumulative usage
+            tokens_used = input_tokens + output_tokens
+            self._cumulative_tokens += tokens_used
+
+            # Update stop reason if provided
+            if stop_reason:
+                self._last_stop_reason = stop_reason
+
+            # Calculate metrics
+            remaining = max(0, self._total_budget - self._cumulative_tokens)
+            percentage = (self._cumulative_tokens / self._total_budget) * 100
+
+            # Update context metrics
+            self._context_metrics = {
+                "total_budget": self._total_budget,
+                "used_tokens": self._cumulative_tokens,
+                "remaining_tokens": remaining,
+                "percentage_used": percentage,
+                "stop_reason": self._last_stop_reason,
+                "model": "claude-sonnet-4.5",
+            }
+
+            logger.debug(
+                f"Token usage updated: {self._cumulative_tokens}/{self._total_budget} "
+                f"({percentage:.1f}%) - Stop reason: {stop_reason}"
+            )
+
+            return self._context_metrics.copy()
+
+    def get_context_metrics(self) -> Dict[str, Any]:
+        """
+        Get current context metrics.
+
+        Returns:
+            Dictionary containing token usage and context metrics
+        """
+        with self.__class__._lock:
+            return self._context_metrics.copy()
+
+    def get_token_usage_percentage(self) -> float:
+        """
+        Get current token usage as a percentage (0.0 to 1.0).
+
+        Returns:
+            Token usage percentage
+        """
+        with self.__class__._lock:
+            return self._context_metrics["percentage_used"] / 100.0
+
+    def should_warn_context_limit(self, threshold: float = 0.70) -> bool:
+        """
+        Check if context usage has reached warning threshold.
+
+        Args:
+            threshold: Warning threshold (0.0 to 1.0)
+
+        Returns:
+            True if threshold reached
+        """
+        return self.get_token_usage_percentage() >= threshold
+
+    def _load_resume_log(self) -> None:
+        """
+        Load resume log from previous session if it exists.
+
+        This is called during initialization to check for session continuity.
+        """
+        try:
+            # Lazy import to avoid circular dependencies
+            from claude_mpm.services.infrastructure.resume_log_generator import (
+                ResumeLogGenerator,
+            )
+
+            generator = ResumeLogGenerator()
+
+            # Check if there's a resume log for this session
+            # (Could be from a previous interrupted session with same ID)
+            resume_content = generator.load_resume_log(self._session_id)
+
+            if resume_content:
+                self._resume_log_content = resume_content
+                logger.info(f"Loaded resume log for session {self._session_id}")
+            else:
+                logger.debug("No resume log found for current session")
+
+        except Exception as e:
+            logger.warning(f"Failed to load resume log: {e}")
+            # Non-critical error, continue without resume log
+
+    def get_resume_log_content(self) -> Optional[str]:
+        """
+        Get resume log content if loaded.
+
+        Returns:
+            Resume log markdown content or None
+        """
+        with self.__class__._lock:
+            return self._resume_log_content
+
+    def generate_resume_log(
+        self,
+        session_state: Optional[Dict[str, Any]] = None,
+    ) -> Optional[Path]:
+        """
+        Generate and save resume log for current session.
+
+        Args:
+            session_state: Optional session state data to include
+
+        Returns:
+            Path to saved resume log or None if generation failed
+        """
+        try:
+            # Lazy import to avoid circular dependencies
+            from claude_mpm.models.resume_log import ContextMetrics, ResumeLog
+            from claude_mpm.services.infrastructure.resume_log_generator import (
+                ResumeLogGenerator,
+            )
+
+            generator = ResumeLogGenerator()
+
+            # Create context metrics from current state
+            context_metrics = ContextMetrics(
+                total_budget=self._total_budget,
+                used_tokens=self._cumulative_tokens,
+                remaining_tokens=self._context_metrics["remaining_tokens"],
+                percentage_used=self._context_metrics["percentage_used"],
+                stop_reason=self._last_stop_reason,
+                model=self._context_metrics["model"],
+                session_id=self._session_id,
+            )
+
+            if session_state:
+                # Generate from provided session state
+                resume_log = generator.generate_from_session_state(
+                    session_id=self._session_id,
+                    session_state=session_state,
+                    stop_reason=self._last_stop_reason,
+                )
+            else:
+                # Create minimal resume log
+                resume_log = ResumeLog(
+                    session_id=self._session_id,
+                    context_metrics=context_metrics,
+                    mission_summary="Session ended - resume log auto-generated.",
+                )
+
+            if resume_log:
+                file_path = generator.save_resume_log(resume_log)
+                logger.info(f"Resume log generated and saved: {file_path}")
+                return file_path
+            logger.warning("Resume log generation returned None")
+            return None
+
+        except Exception as e:
+            logger.error(f"Failed to generate resume log: {e}", exc_info=True)
+            return None
+
     @classmethod
     def reset(cls) -> None:
         """

claude_mpm/services/shared/async_service_base.py

@@ -4,23 +4,12 @@ Base class for asynchronous services to reduce duplication.
 
 import asyncio
 from abc import ABC, abstractmethod
-from enum import Enum
 from typing import Any, Dict, Optional
 
+from ...core.enums import ServiceState
 from ...core.mixins import LoggerMixin
 
 
-class AsyncServiceState(Enum):
-    """Standard states for async services."""
-
-    UNINITIALIZED = "uninitialized"
-    INITIALIZING = "initializing"
-    RUNNING = "running"
-    STOPPING = "stopping"
-    STOPPED = "stopped"
-    ERROR = "error"
-
-
 class AsyncServiceBase(LoggerMixin, ABC):
     """
     Base class for asynchronous services.
@@ -45,7 +34,7 @@ class AsyncServiceBase(LoggerMixin, ABC):
         self.config = config or {}
 
         # State management
-        self._state = AsyncServiceState.UNINITIALIZED
+        self._state = ServiceState.UNINITIALIZED
         self._state_lock = asyncio.Lock()
 
         # Background tasks
@@ -57,19 +46,19 @@ class AsyncServiceBase(LoggerMixin, ABC):
         self._error_count = 0
 
     @property
-    def state(self) -> AsyncServiceState:
+    def state(self) -> ServiceState:
         """Get current service state."""
         return self._state
 
     @property
     def is_running(self) -> bool:
         """Check if service is running."""
-        return self._state == AsyncServiceState.RUNNING
+        return self._state == ServiceState.RUNNING
 
     @property
     def is_healthy(self) -> bool:
         """Check if service is healthy."""
-        return self._state == AsyncServiceState.RUNNING and self._last_error is None
+        return self._state == ServiceState.RUNNING and self._last_error is None
 
     async def initialize(self) -> bool:
         """
@@ -79,22 +68,22 @@ class AsyncServiceBase(LoggerMixin, ABC):
             True if initialization successful
         """
         async with self._state_lock:
-            if self._state != AsyncServiceState.UNINITIALIZED:
+            if self._state != ServiceState.UNINITIALIZED:
                 self.logger.warning(f"Service {self.service_name} already initialized")
-                return self._state == AsyncServiceState.RUNNING
+                return self._state == ServiceState.RUNNING
 
-            self._state = AsyncServiceState.INITIALIZING
+            self._state = ServiceState.INITIALIZING
             self.logger.info(f"Initializing service: {self.service_name}")
 
             try:
                 success = await self._do_initialize()
                 if success:
-                    self._state = AsyncServiceState.RUNNING
+                    self._state = ServiceState.RUNNING
                     self.logger.info(
                         f"Service {self.service_name} initialized successfully"
                     )
                 else:
-                    self._state = AsyncServiceState.ERROR
+                    self._state = ServiceState.ERROR
                     self.logger.error(
                         f"Service {self.service_name} initialization failed"
                     )
@@ -102,7 +91,7 @@ class AsyncServiceBase(LoggerMixin, ABC):
                 return success
 
             except Exception as e:
-                self._state = AsyncServiceState.ERROR
+                self._state = ServiceState.ERROR
                 self._last_error = e
                 self._error_count += 1
                 self.logger.error(
@@ -114,10 +103,10 @@ class AsyncServiceBase(LoggerMixin, ABC):
     async def shutdown(self) -> None:
         """Shutdown the service gracefully."""
         async with self._state_lock:
-            if self._state in (AsyncServiceState.STOPPED, AsyncServiceState.STOPPING):
+            if self._state in (ServiceState.STOPPED, ServiceState.STOPPING):
                 return
 
-            self._state = AsyncServiceState.STOPPING
+            self._state = ServiceState.STOPPING
             self.logger.info(f"Shutting down service: {self.service_name}")
 
             try:
@@ -130,11 +119,11 @@ class AsyncServiceBase(LoggerMixin, ABC):
                 # Service-specific shutdown
                 await self._do_shutdown()
 
-                self._state = AsyncServiceState.STOPPED
+                self._state = ServiceState.STOPPED
                 self.logger.info(f"Service {self.service_name} shut down successfully")
 
             except Exception as e:
-                self._state = AsyncServiceState.ERROR
+                self._state = ServiceState.ERROR
                 self._last_error = e
                 self.logger.error(
                     f"Service {self.service_name} shutdown error: {e}", exc_info=True
@@ -146,7 +135,7 @@ class AsyncServiceBase(LoggerMixin, ABC):
         await self.shutdown()
 
         # Reset state for restart
-        self._state = AsyncServiceState.UNINITIALIZED
+        self._state = ServiceState.UNINITIALIZED
         self._shutdown_event.clear()
         self._last_error = None
 

claude_mpm/services/shared/lifecycle_service_base.py

@@ -4,25 +4,12 @@ Base class for services with complex lifecycle management.
 
 import time
 from abc import ABC, abstractmethod
-from enum import Enum
 from typing import Any, Dict, List, Optional
 
+from ...core.enums import ServiceState
 from ...core.mixins import LoggerMixin
 
 
-class ServiceState(Enum):
-    """Standard service states."""
-
-    UNINITIALIZED = "uninitialized"
-    INITIALIZING = "initializing"
-    INITIALIZED = "initialized"
-    STARTING = "starting"
-    RUNNING = "running"
-    STOPPING = "stopping"
-    STOPPED = "stopped"
-    ERROR = "error"
-
-
 class LifecycleServiceBase(LoggerMixin, ABC):
     """
     Base class for services with complex lifecycle management.

claude_mpm/services/socketio/handlers/__init__.py

@@ -7,7 +7,9 @@ and maintainability.
 """
 
 from .base import BaseEventHandler
-from .code_analysis import CodeAnalysisEventHandler
+
+# DISABLED: File Tree interface removed from dashboard
+# from .code_analysis import CodeAnalysisEventHandler
 from .connection import ConnectionEventHandler
 from .file import FileEventHandler
 from .git import GitEventHandler
@@ -17,7 +19,8 @@ from .registry import EventHandlerRegistry
 
 __all__ = [
     "BaseEventHandler",
-    "CodeAnalysisEventHandler",
+    # DISABLED: File Tree interface removed from dashboard
+    # "CodeAnalysisEventHandler",
     "ConnectionEventHandler",
     "EventHandlerRegistry",
     "FileEventHandler",

claude_mpm/services/socketio/handlers/hook.py

@@ -7,6 +7,7 @@ agent delegations, and other hook-based activity for the system heartbeat.
 from datetime import datetime, timezone
 from typing import Any, Dict
 
+from ....core.enums import ServiceState
 from .base import BaseEventHandler
 
 
@@ -60,6 +61,10 @@ class HookEventHandler(BaseEventHandler):
 
         hook_data = data.get("data", {})
 
+        # Log hook event processing
+        tool_name = hook_data.get("tool_name", "N/A")
+        self.logger.info(f"Processing hook event: {hook_event} - tool: {tool_name}")
+
         # Create properly formatted event for history
         # Note: add_to_history expects the event data directly, not wrapped
         history_event = {
@@ -76,6 +81,12 @@ class HookEventHandler(BaseEventHandler):
 
         # Broadcast the original event to all connected clients
         # (preserves all original fields)
+        connected_clients = (
+            len(self.server.clients) if hasattr(self.server, "clients") else 0
+        )
+        self.logger.info(
+            f"Broadcasting claude_event to {connected_clients} clients: {hook_event}"
+        )
         await self.broadcast_event("claude_event", data)
 
         # Track sessions based on hook events
@@ -108,7 +119,7 @@ class HookEventHandler(BaseEventHandler):
                 "session_id": session_id,
                 "start_time": datetime.now(timezone.utc).isoformat(),
                 "agent": agent_type,
-                "status": "active",
+                "status": ServiceState.RUNNING,
                 "prompt": data.get("prompt", "")[:100],  # First 100 chars
                 "last_activity": datetime.now(timezone.utc).isoformat(),
             }
@@ -159,7 +170,7 @@ class HookEventHandler(BaseEventHandler):
                     "session_id": session_id,
                     "start_time": datetime.now(timezone.utc).isoformat(),
                     "agent": "pm",  # Default to PM
-                    "status": "active",
+                    "status": ServiceState.RUNNING,
                     "prompt": data.get("prompt_text", "")[:100],
                     "working_directory": data.get("working_directory", ""),
                     "last_activity": datetime.now(timezone.utc).isoformat(),

claude_mpm/services/socketio/handlers/registry.py

@@ -15,7 +15,8 @@ if TYPE_CHECKING:
 
     from ..server import SocketIOServer
 
-from .code_analysis import CodeAnalysisEventHandler
+# DISABLED: File Tree interface removed from dashboard
+# from .code_analysis import CodeAnalysisEventHandler
 from .connection import ConnectionEventHandler
 from .file import FileEventHandler
 from .git import GitEventHandler
@@ -38,7 +39,8 @@ class EventHandlerRegistry:
         HookEventHandler,  # Hook events for session tracking
         GitEventHandler,  # Git operations
         FileEventHandler,  # File operations
-        CodeAnalysisEventHandler,  # Code analysis for dashboard
+        # DISABLED: File Tree interface removed from dashboard
+        # CodeAnalysisEventHandler,  # Code analysis for dashboard
         ProjectEventHandler,  # Project management (future)
         MemoryEventHandler,  # Memory management (future)
     ]

claude_mpm/services/socketio/server/main.py

@@ -16,6 +16,8 @@ from collections import deque
 from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional, Set
 
+from ....core.enums import ServiceState
+
 try:
     import aiohttp
     import socketio
@@ -265,15 +267,15 @@ class SocketIOServer(SocketIOServiceInterface):
             except Exception as e:
                 self.logger.error(f"Error during EventBus teardown: {e}")
 
-        # Stop code analysis handler
+        # Stop event handlers
         if self.event_registry:
-            from ..handlers import CodeAnalysisEventHandler, ConnectionEventHandler
-
-            # Stop analysis runner
-            analysis_handler = self.event_registry.get_handler(CodeAnalysisEventHandler)
-            if analysis_handler and hasattr(analysis_handler, "cleanup"):
-                analysis_handler.cleanup()
+            from ..handlers import ConnectionEventHandler
 
+            # DISABLED: File Tree interface removed from dashboard
+            # Stop analysis runner (code analysis handler is disabled)
+            # analysis_handler = self.event_registry.get_handler(CodeAnalysisEventHandler)
+            # if analysis_handler and hasattr(analysis_handler, "cleanup"):
+            #     analysis_handler.cleanup()
             # Stop health monitoring in connection handler
             conn_handler = self.event_registry.get_handler(ConnectionEventHandler)
             if conn_handler and hasattr(conn_handler, "stop_health_monitoring"):
@@ -384,7 +386,7 @@ class SocketIOServer(SocketIOServiceInterface):
             "session_id": session_id,
             "start_time": datetime.now(timezone.utc).isoformat(),
             "agent": "pm",  # Default to PM, will be updated if delegated
-            "status": "active",
+            "status": ServiceState.RUNNING,
             "launch_method": launch_method,
             "working_dir": working_dir,
         }

claude_mpm/services/subprocess_launcher_service.py

@@ -22,6 +22,7 @@ import tty
 from typing import Any, Dict, List, Optional
 
 from claude_mpm.core.base_service import BaseService
+from claude_mpm.core.enums import OperationResult, ServiceState
 from claude_mpm.services.core.interfaces import SubprocessLauncherInterface
 
 
@@ -62,9 +63,17 @@ class SubprocessLauncherService(BaseService, SubprocessLauncherInterface):
         try:
             env = kwargs.get("env", self.prepare_subprocess_environment())
             self.launch_subprocess_interactive(command, env)
-            return {"status": "launched", "command": command, "method": "interactive"}
+            return {
+                "status": OperationResult.SUCCESS,
+                "command": command,
+                "method": "interactive",
+            }
         except Exception as e:
-            return {"status": "failed", "error": str(e), "command": command}
+            return {
+                "status": OperationResult.FAILED,
+                "error": str(e),
+                "command": command,
+            }
 
     async def launch_subprocess_async(
         self, command: List[str], **kwargs
@@ -109,7 +118,7 @@ class SubprocessLauncherService(BaseService, SubprocessLauncherInterface):
         # For now, return unknown status
         return {
             "process_id": process_id,
-            "status": "unknown",
+            "status": OperationResult.UNKNOWN,
             "message": "Process tracking not implemented",
         }
 
@@ -160,7 +169,7 @@ class SubprocessLauncherService(BaseService, SubprocessLauncherInterface):
             # Notify WebSocket clients
             if self.websocket_server:
                 self.websocket_server.claude_status_changed(
-                    status="running",
+                    status=ServiceState.RUNNING,
                     pid=process.pid,
                     message="Claude subprocess started",
                 )
@@ -195,7 +204,7 @@ class SubprocessLauncherService(BaseService, SubprocessLauncherInterface):
             # Notify WebSocket clients
             if self.websocket_server:
                 self.websocket_server.claude_status_changed(
-                    status="stopped",
+                    status=ServiceState.STOPPED,
                     message=f"Claude subprocess exited with code {process.returncode}",
                 )
 

claude_mpm/services/unified/analyzer_strategies/code_analyzer.py

@@ -14,6 +14,7 @@ import re
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
+from claude_mpm.core.enums import OperationResult
 from claude_mpm.core.logging_utils import get_logger
 
 from ..strategies import (
@@ -120,7 +121,7 @@ class CodeAnalyzerStrategy(AnalyzerStrategy):
             return self._analyze_ast(target, options)
 
         return {
-            "status": "error",
+            "status": OperationResult.ERROR,
             "message": f"Unsupported target type: {type(target).__name__}",
         }
 
@@ -159,7 +160,7 @@ class CodeAnalyzerStrategy(AnalyzerStrategy):
             metrics["maintainability_index"] = self._calculate_maintainability(metrics)
 
             return {
-                "status": "success",
+                "status": OperationResult.SUCCESS,
                 "type": "file",
                 "path": str(file_path),
                 "metrics": metrics,
@@ -168,7 +169,7 @@ class CodeAnalyzerStrategy(AnalyzerStrategy):
         except Exception as e:
             logger.error(f"Error analyzing file {file_path}: {e}")
             return {
-                "status": "error",
+                "status": OperationResult.ERROR,
                 "path": str(file_path),
                 "error": str(e),
             }
@@ -178,7 +179,7 @@ class CodeAnalyzerStrategy(AnalyzerStrategy):
     ) -> Dict[str, Any]:
         """Analyze all code files in a directory."""
         results = {
-            "status": "success",
+            "status": OperationResult.SUCCESS,
             "type": "directory",
             "path": str(dir_path),
             "files": [],
@@ -195,7 +196,7 @@ class CodeAnalyzerStrategy(AnalyzerStrategy):
         total_metrics = {}
         for file_path in code_files:
             file_result = self._analyze_file(file_path, options)
-            if file_result["status"] == "success":
+            if file_result["status"] == OperationResult.SUCCESS:
                 results["files"].append(file_result)
 
                 # Aggregate metrics
@@ -285,7 +286,7 @@ class CodeAnalyzerStrategy(AnalyzerStrategy):
             )
 
         return {
-            "status": "success",
+            "status": OperationResult.SUCCESS,
             "type": "ast",
             "metrics": metrics,
         }
@@ -426,7 +427,7 @@ class CodeAnalyzerStrategy(AnalyzerStrategy):
         """Extract key metrics from analysis results."""
         metrics = {}
 
-        if analysis_result.get("status") != "success":
+        if analysis_result.get("status") != OperationResult.SUCCESS:
             return metrics
 
         # Extract relevant metrics