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

claude_mpm/commander/core/response_manager.py

@@ -0,0 +1,323 @@
+"""ResponseManager for centralized response routing and validation.
+
+This module provides ResponseManager which handles response validation,
+routing, and delivery to runtime sessions.
+"""
+
+import logging
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
+from typing import Any, Dict, List, Optional, Tuple
+
+from ..events.manager import EventManager
+from ..models.events import Event, EventType
+from ..runtime.executor import RuntimeExecutor
+
+logger = logging.getLogger(__name__)
+
+
+def _utc_now() -> datetime:
+    """Return current UTC time with timezone info."""
+    return datetime.now(timezone.utc)
+
+
+@dataclass
+class ResponseRoute:
+    """Encapsulates a validated response ready for delivery.
+
+    Attributes:
+        event: Event being responded to
+        response: User's response text
+        valid: Whether validation passed
+        validation_errors: List of validation error messages
+        timestamp: When the route was created
+        delivered: Whether response has been delivered
+        delivery_timestamp: When the response was delivered
+    """
+
+    event: Event
+    response: str
+    valid: bool
+    validation_errors: List[str] = field(default_factory=list)
+    timestamp: datetime = field(default_factory=_utc_now)
+    delivered: bool = False
+    delivery_timestamp: Optional[datetime] = None
+
+
+class ResponseManager:
+    """Centralizes response validation, routing, and delivery.
+
+    Provides centralized response handling with validation and routing
+    capabilities for event responses.
+
+    Attributes:
+        event_manager: EventManager for retrieving events
+        runtime_executor: Optional RuntimeExecutor for response delivery
+        _response_history: History of all response attempts per event
+
+    Example:
+        >>> manager = ResponseManager(event_manager, runtime_executor)
+        >>> valid, errors = manager.validate_response(event, "staging")
+        >>> if valid:
+        ...     route = manager.validate_and_route(event_id, "staging")
+        ...     success = await manager.deliver_response(route)
+    """
+
+    def __init__(
+        self,
+        event_manager: EventManager,
+        runtime_executor: Optional[RuntimeExecutor] = None,
+    ) -> None:
+        """Initialize ResponseManager.
+
+        Args:
+            event_manager: EventManager instance for retrieving events
+            runtime_executor: Optional RuntimeExecutor for response delivery
+
+        Raises:
+            ValueError: If event_manager is None
+        """
+        if event_manager is None:
+            raise ValueError("EventManager cannot be None")
+
+        self.event_manager = event_manager
+        self.runtime_executor = runtime_executor
+        self._response_history: Dict[str, List[ResponseRoute]] = {}
+
+        logger.debug(
+            "ResponseManager initialized (runtime_executor: %s)",
+            "enabled" if runtime_executor else "disabled",
+        )
+
+    def validate_response(self, event: Event, response: str) -> Tuple[bool, List[str]]:
+        """Validate response against event constraints.
+
+        Validation rules:
+        1. Empty responses: Not allowed for blocking events
+        2. DECISION_NEEDED options: Response must match one of the options
+        3. Response whitespace: Stripped before validation
+
+        Args:
+            event: Event being responded to
+            response: User's response
+
+        Returns:
+            Tuple of (is_valid, list_of_error_messages)
+
+        Example:
+            >>> valid, errors = manager.validate_response(event, "staging")
+            >>> if not valid:
+            ...     for error in errors:
+            ...         print(f"Validation error: {error}")
+        """
+        errors: List[str] = []
+
+        # Strip whitespace for validation
+        response_stripped = response.strip()
+
+        # Rule 1: Empty responses not allowed for blocking events
+        if event.is_blocking and not response_stripped:
+            errors.append("Response cannot be empty for blocking events")
+
+        # Rule 2: DECISION_NEEDED events must use one of the provided options
+        if event.type == EventType.DECISION_NEEDED and event.options:
+            if response_stripped not in event.options:
+                errors.append(
+                    f"Response must be one of: {', '.join(event.options)}. "
+                    f"Got: '{response_stripped}'"
+                )
+
+        # Future validation rules can be added here:
+        # - Max length check
+        # - Format validation (e.g., regex patterns)
+        # - Custom validators per event type
+        # - Conditional validation based on event context
+
+        is_valid = len(errors) == 0
+        return is_valid, errors
+
+    def validate_and_route(
+        self, event_id: str, response: str
+    ) -> Optional[ResponseRoute]:
+        """Create a validated ResponseRoute for an event.
+
+        Retrieves the event, validates the response, and creates a ResponseRoute
+        with validation results.
+
+        Args:
+            event_id: ID of event to respond to
+            response: User's response
+
+        Returns:
+            ResponseRoute with validation results, or None if event not found
+
+        Example:
+            >>> route = manager.validate_and_route("evt_123", "staging")
+            >>> if route and route.valid:
+            ...     await manager.deliver_response(route)
+            >>> elif route:
+            ...     print(f"Validation failed: {route.validation_errors}")
+        """
+        # Get the event
+        event = self.event_manager.get(event_id)
+        if not event:
+            logger.warning("Event not found: %s", event_id)
+            return None
+
+        # Validate response
+        valid, errors = self.validate_response(event, response)
+
+        # Create route
+        route = ResponseRoute(
+            event=event,
+            response=response,
+            valid=valid,
+            validation_errors=errors,
+        )
+
+        logger.debug(
+            "Created route for event %s: valid=%s, errors=%s",
+            event_id,
+            valid,
+            errors,
+        )
+
+        return route
+
+    async def deliver_response(self, route: ResponseRoute) -> bool:
+        """Deliver a validated response to the runtime.
+
+        Records the response in event history and attempts delivery to the
+        runtime executor if available.
+
+        Args:
+            route: ResponseRoute to deliver
+
+        Returns:
+            True if delivery successful, False otherwise
+
+        Raises:
+            ValueError: If route validation failed
+
+        Example:
+            >>> route = manager.validate_and_route("evt_123", "yes")
+            >>> if route and route.valid:
+            ...     success = await manager.deliver_response(route)
+            ...     if success:
+            ...         print("Response delivered successfully")
+        """
+        if not route.valid:
+            error_msg = "; ".join(route.validation_errors)
+            raise ValueError(f"Cannot deliver invalid response: {error_msg}")
+
+        # Mark route as delivered
+        route.delivered = True
+        route.delivery_timestamp = _utc_now()
+
+        # Track in history
+        self._add_to_history(route)
+
+        # For non-blocking events, no runtime delivery needed
+        if not route.event.is_blocking:
+            logger.debug(
+                "Event %s is non-blocking, no runtime delivery needed",
+                route.event.id,
+            )
+            return True
+
+        # Deliver to runtime if executor available
+        if not self.runtime_executor:
+            logger.warning(
+                "No runtime executor available, cannot deliver response for event %s",
+                route.event.id,
+            )
+            return False
+
+        # Note: Actual delivery is handled by EventHandler which has session context
+        # ResponseManager just validates and tracks responses
+        # The EventHandler will call executor.send_message() with session's active_pane
+        logger.info(
+            "Response validated and ready for delivery (event %s): %s",
+            route.event.id,
+            route.response[:50],
+        )
+        return True
+
+    def _add_to_history(self, route: ResponseRoute) -> None:
+        """Add response route to history tracking.
+
+        Args:
+            route: ResponseRoute to record
+        """
+        event_id = route.event.id
+        if event_id not in self._response_history:
+            self._response_history[event_id] = []
+
+        self._response_history[event_id].append(route)
+        logger.debug(
+            "Added response to history for event %s (total: %d)",
+            event_id,
+            len(self._response_history[event_id]),
+        )
+
+    def get_response_history(self, event_id: str) -> List[ResponseRoute]:
+        """Get all response attempts for an event (for audit trail).
+
+        Args:
+            event_id: Event ID to query
+
+        Returns:
+            List of ResponseRoute objects for this event (chronological order)
+
+        Example:
+            >>> history = manager.get_response_history("evt_123")
+            >>> for i, route in enumerate(history, 1):
+            ...     status = "valid" if route.valid else "invalid"
+            ...     print(f"Attempt {i} ({status}): {route.response}")
+        """
+        return self._response_history.get(event_id, []).copy()
+
+    def clear_history(self, event_id: str) -> int:
+        """Clear response history for an event.
+
+        Args:
+            event_id: Event ID to clear
+
+        Returns:
+            Number of history entries removed
+
+        Example:
+            >>> removed = manager.clear_history("evt_123")
+            >>> print(f"Cleared {removed} history entries")
+        """
+        history = self._response_history.pop(event_id, [])
+        count = len(history)
+        if count > 0:
+            logger.debug("Cleared %d history entries for event %s", count, event_id)
+        return count
+
+    def get_stats(self) -> Dict[str, Any]:
+        """Get statistics about response history.
+
+        Returns:
+            Dict with statistics about tracked responses
+
+        Example:
+            >>> stats = manager.get_stats()
+            >>> print(f"Total events with history: {stats['total_events']}")
+            >>> print(f"Total response attempts: {stats['total_responses']}")
+        """
+        total_events = len(self._response_history)
+        total_responses = sum(len(routes) for routes in self._response_history.values())
+        valid_responses = sum(
+            sum(1 for route in routes if route.valid)
+            for routes in self._response_history.values()
+        )
+        invalid_responses = total_responses - valid_responses
+
+        return {
+            "total_events": total_events,
+            "total_responses": total_responses,
+            "valid_responses": valid_responses,
+            "invalid_responses": invalid_responses,
+        }

claude_mpm/commander/daemon.py

@@ -15,12 +15,23 @@ from .api.app import (
     app,
 )
 from .config import DaemonConfig
+from .core.block_manager import BlockManager
+from .env_loader import load_env
 from .events.manager import EventManager
 from .inbox import Inbox
+from .models.events import EventStatus
+from .parsing.output_parser import OutputParser
 from .persistence import EventStore, StateStore
 from .project_session import ProjectSession, SessionState
 from .registry import ProjectRegistry
+from .runtime.monitor import RuntimeMonitor
 from .tmux_orchestrator import TmuxOrchestrator
+from .work.executor import WorkExecutor
+from .work.queue import WorkQueue
+from .workflow.event_handler import EventHandler
+
+# Load environment variables at module import
+load_env()
 
 logger = logging.getLogger(__name__)
 
@@ -38,6 +49,11 @@ class CommanderDaemon:
         event_manager: Event manager
         inbox: Event inbox
         sessions: Active project sessions by project_id
+        work_queues: Work queues by project_id
+        work_executors: Work executors by project_id
+        block_manager: Block manager for automatic work blocking
+        runtime_monitor: Runtime monitor for output monitoring
+        event_handler: Event handler for blocking event workflow
         state_store: StateStore for project/session persistence
         event_store: EventStore for event queue persistence
         running: Whether daemon is currently running
@@ -68,6 +84,8 @@ class CommanderDaemon:
         self.event_manager = EventManager()
         self.inbox = Inbox(self.event_manager, self.registry)
         self.sessions: Dict[str, ProjectSession] = {}
+        self.work_queues: Dict[str, WorkQueue] = {}
+        self.work_executors: Dict[str, WorkExecutor] = {}
         self._running = False
         self._server_task: Optional[asyncio.Task] = None
         self._main_loop_task: Optional[asyncio.Task] = None
@@ -76,6 +94,30 @@ class CommanderDaemon:
         self.state_store = StateStore(config.state_dir)
         self.event_store = EventStore(config.state_dir)
 
+        # Initialize BlockManager with work queues and executors
+        self.block_manager = BlockManager(
+            event_manager=self.event_manager,
+            work_queues=self.work_queues,
+            work_executors=self.work_executors,
+        )
+
+        # Initialize RuntimeMonitor with BlockManager
+        parser = OutputParser(self.event_manager)
+        self.runtime_monitor = RuntimeMonitor(
+            orchestrator=self.orchestrator,
+            parser=parser,
+            event_manager=self.event_manager,
+            poll_interval=config.poll_interval,
+            block_manager=self.block_manager,
+        )
+
+        # Initialize EventHandler with BlockManager
+        self.event_handler = EventHandler(
+            inbox=self.inbox,
+            session_manager=self.sessions,
+            block_manager=self.block_manager,
+        )
+
         # Configure logging
         logging.basicConfig(
             level=getattr(logging, config.log_level.upper()),
@@ -122,12 +164,16 @@ class CommanderDaemon:
         # Set up signal handlers
         self._setup_signal_handlers()
 
-        # Inject global instances into API app
-        global api_registry, api_tmux, api_event_manager, api_inbox
-        api_registry = self.registry
-        api_tmux = self.orchestrator
-        api_event_manager = self.event_manager
-        api_inbox = self.inbox
+        # Inject daemon instances into API app.state (BEFORE lifespan runs)
+        app.state.registry = self.registry
+        app.state.tmux = self.orchestrator
+        app.state.event_manager = self.event_manager
+        app.state.inbox = self.inbox
+        app.state.work_queues = self.work_queues
+        app.state.daemon_instance = self
+        app.state.session_manager = self.sessions
+        app.state.event_handler = self.event_handler
+        logger.info(f"Injected work_queues dict id: {id(self.work_queues)}")
 
         # Start API server in background
         logger.info(f"Starting API server on {self.config.host}:{self.config.port}")
@@ -171,6 +217,16 @@ class CommanderDaemon:
             except Exception as e:
                 logger.error(f"Error stopping session {project_id}: {e}")
 
+        # Clear BlockManager project mappings
+        for project_id in list(self.work_queues.keys()):
+            try:
+                removed = self.block_manager.clear_project_mappings(project_id)
+                logger.debug(
+                    f"Cleared {removed} work mappings for project {project_id}"
+                )
+            except Exception as e:
+                logger.error(f"Error clearing mappings for {project_id}: {e}")
+
         # Cancel main loop task
         if self._main_loop_task and not self._main_loop_task.done():
             self._main_loop_task.cancel()
@@ -210,9 +266,19 @@ class CommanderDaemon:
 
         while self._running:
             try:
-                # TODO: Check for resolved events and resume sessions (Phase 2 Sprint 3)
-                # TODO: Check each ProjectSession for runnable work (Phase 2 Sprint 2)
-                # TODO: Spawn RuntimeExecutors for new work items (Phase 2 Sprint 1)
+                logger.info(f"🔄 Main loop iteration (running={self._running})")
+                logger.info(
+                    f"work_queues dict id: {id(self.work_queues)}, keys: {list(self.work_queues.keys())}"
+                )
+
+                # Check for resolved events and resume sessions
+                await self._check_and_resume_sessions()
+
+                # Check each ProjectSession for runnable work
+                logger.info(
+                    f"Checking for pending work across {len(self.work_queues)} queues"
+                )
+                await self._execute_pending_work()
 
                 # Periodic state persistence
                 current_time = asyncio.get_event_loop().time()
@@ -282,7 +348,26 @@ class CommanderDaemon:
         if project is None:
             raise ValueError(f"Project not found: {project_id}")
 
-        session = ProjectSession(project, self.orchestrator)
+        # Create work queue for project if not exists
+        if project_id not in self.work_queues:
+            self.work_queues[project_id] = WorkQueue(project_id)
+            logger.debug(f"Created work queue for project {project_id}")
+
+        # Create work executor for project if not exists
+        if project_id not in self.work_executors:
+            from .runtime.executor import RuntimeExecutor
+
+            runtime_executor = RuntimeExecutor(self.orchestrator)
+            self.work_executors[project_id] = WorkExecutor(
+                runtime=runtime_executor, queue=self.work_queues[project_id]
+            )
+            logger.debug(f"Created work executor for project {project_id}")
+
+        session = ProjectSession(
+            project=project,
+            orchestrator=self.orchestrator,
+            monitor=self.runtime_monitor,
+        )
         self.sessions[project_id] = session
 
         logger.info(f"Created new session for project {project_id}")
@@ -363,6 +448,117 @@ class CommanderDaemon:
         except Exception as e:
             logger.error(f"Failed to save state: {e}", exc_info=True)
 
+    async def _check_and_resume_sessions(self) -> None:
+        """Check for resolved events and resume paused sessions.
+
+        Iterates through all paused sessions, checks if their blocking events
+        have been resolved, and resumes execution if ready.
+        """
+        for project_id, session in list(self.sessions.items()):
+            # Skip non-paused sessions
+            if session.state != SessionState.PAUSED:
+                continue
+
+            # Check if pause reason (event ID) is resolved
+            if not session.pause_reason:
+                logger.warning(f"Session {project_id} paused with no reason, resuming")
+                await session.resume()
+                continue
+
+            # Check if event is resolved
+            event = self.event_manager.get(session.pause_reason)
+            if event and event.status == EventStatus.RESOLVED:
+                logger.info(
+                    f"Event {event.id} resolved, resuming session for {project_id}"
+                )
+                await session.resume()
+
+                # Unblock any work items that were blocked by this event
+                if project_id in self.work_executors:
+                    executor = self.work_executors[project_id]
+                    queue = self.work_queues[project_id]
+
+                    # Find work items blocked by this event
+                    blocked_items = [
+                        item
+                        for item in queue.list()
+                        if item.state.value == "blocked"
+                        and item.metadata.get("block_reason") == event.id
+                    ]
+
+                    for item in blocked_items:
+                        await executor.handle_unblock(item.id)
+                        logger.info(f"Unblocked work item {item.id}")
+
+    async def _execute_pending_work(self) -> None:
+        """Execute pending work for all ready sessions.
+
+        Scans all work queues for pending work. For projects with work but no session,
+        auto-creates a session. Then executes the next available work item via WorkExecutor.
+        """
+        # First pass: Auto-create and start sessions for projects with pending work
+        for project_id, queue in list(self.work_queues.items()):
+            logger.info(
+                f"Checking queue for {project_id}: pending={queue.pending_count}"
+            )
+            # Skip if no pending work
+            if queue.pending_count == 0:
+                continue
+
+            # Auto-create session if needed
+            if project_id not in self.sessions:
+                try:
+                    logger.info(
+                        f"Auto-creating session for project {project_id} with pending work"
+                    )
+                    session = self.get_or_create_session(project_id)
+
+                    # Start the session so it's ready for work
+                    if session.state.value == "idle":
+                        logger.info(f"Auto-starting session for {project_id}")
+                        await session.start()
+                except Exception as e:
+                    logger.error(
+                        f"Failed to auto-create/start session for {project_id}: {e}",
+                        exc_info=True,
+                    )
+                    continue
+
+        # Second pass: Execute work for ready sessions
+        for project_id, session in list(self.sessions.items()):
+            # Skip sessions that aren't ready for work
+            if not session.is_ready():
+                continue
+
+            # Skip if no work queue exists
+            if project_id not in self.work_queues:
+                continue
+
+            # Get work executor for project
+            executor = self.work_executors.get(project_id)
+            if not executor:
+                logger.warning(
+                    f"No work executor found for project {project_id}, skipping"
+                )
+                continue
+
+            # Check if there's work available
+            queue = self.work_queues[project_id]
+            if queue.pending_count == 0:
+                continue
+
+            # Try to execute next work item
+            try:
+                # Pass the session's active pane for execution
+                executed = await executor.execute_next(pane_target=session.active_pane)
+                if executed:
+                    logger.info(f"Started work execution for project {project_id}")
+            except Exception as e:
+                logger.error(
+                    f"Error executing work for project {project_id}: {e}",
+                    exc_info=True,
+                )
+
 
 async def main(config: Optional[DaemonConfig] = None) -> None:
     """Main entry point for running the daemon.

claude_mpm/commander/env_loader.py

@@ -0,0 +1,59 @@
+"""Environment variable loader for Commander.
+
+This module handles automatic loading of .env and .env.local files
+at Commander startup. Environment files are loaded with the following precedence:
+1. Existing environment variables (not overridden)
+2. .env.local (local overrides)
+3. .env (defaults)
+
+Example:
+    >>> from claude_mpm.commander.env_loader import load_env
+    >>> load_env()
+    # Automatically loads .env.local and .env from project root
+"""
+
+import logging
+from pathlib import Path
+
+from dotenv import load_dotenv
+
+logger = logging.getLogger(__name__)
+
+
+def load_env() -> None:
+    """Load environment variables from .env and .env.local files.
+
+    Searches for .env and .env.local in the project root directory
+    (parent of src/claude_mpm). Files are loaded with override=False,
+    meaning existing environment variables take precedence.
+
+    Precedence (highest to lowest):
+    1. Existing environment variables
+    2. .env.local
+    3. .env
+
+    Example:
+        >>> load_env()
+        # Loads .env.local and .env if they exist
+    """
+    # Find project root (parent of src/claude_mpm)
+    # Current file: src/claude_mpm/commander/env_loader.py
+    # Project root: ../../../ (3 levels up)
+    current_file = Path(__file__)
+    project_root = current_file.parent.parent.parent.parent
+
+    # Try loading .env.local first (higher priority)
+    env_local = project_root / ".env.local"
+    if env_local.exists():
+        load_dotenv(env_local, override=False)
+        logger.debug(f"Loaded environment from {env_local}")
+
+    # Then load .env (lower priority)
+    env_file = project_root / ".env"
+    if env_file.exists():
+        load_dotenv(env_file, override=False)
+        logger.debug(f"Loaded environment from {env_file}")
+
+    # Log if neither file exists
+    if not env_local.exists() and not env_file.exists():
+        logger.debug("No .env or .env.local files found in project root")