LEDMatrix/src/display_controller.py

"""
Display Controller — top-level orchestration for the LEDMatrix application.

This module owns the main run loop that drives the LED display.  It ties
together every major subsystem:

  - ConfigManager / ConfigService  — loads config.json, hot-reloads on change
  - DisplayManager                 — hardware (or emulator) output interface
  - FontManager                    — TTF/BDF font loading and caching
  - CacheManager                   — multi-tier API response cache
  - PluginManager                  — plugin lifecycle (load, update, display)
  - DisplaySyncManager             — optional leader/follower multi-Pi sync
  - VegasModeCoordinator           — optional continuous Vegas scroll mode

The main loop inside :meth:`DisplayController.run` rotates through enabled
plugin display modes, respecting schedule windows, brightness dim schedules,
on-demand overrides, and live-priority interrupts.

Entry point: :func:`main` — instantiates :class:`DisplayController` and calls
:meth:`~DisplayController.run`.
"""

import time
import os
import json
import threading
import types
from contextlib import contextmanager
from pathlib import Path
from typing import Dict, Any, List, Optional, Callable
from datetime import datetime
from concurrent.futures import ThreadPoolExecutor, as_completed  # pylint: disable=no-name-in-module
import pytz

# Core system imports only - all functionality now handled via plugins
from src.display_manager import DisplayManager
from src.config_manager import ConfigManager
from src.config_service import ConfigService
from src.cache_manager import CacheManager
from src.font_manager import FontManager
from src.logging_config import get_logger
from src.common.sync_manager import DisplaySyncManager, SyncRole

# Get logger with consistent configuration
logger = get_logger(__name__)

# Vegas mode import (lazy loaded to avoid circular imports)
_vegas_mode_imported = False
VegasModeCoordinator = None
DEFAULT_DYNAMIC_DURATION_CAP = 180.0

# WiFi status message file path (same as used in wifi_manager.py)
WIFI_STATUS_FILE = None  # Will be initialized in __init__

class DisplayController:
    """
    Top-level controller that owns the LED display run loop.

    Responsibilities
    ----------------
    * Initialise and wire together all subsystems at startup.
    * Rotate through plugin display modes in :meth:`run`.
    * Honour schedule windows (active/inactive hours) and dim schedules.
    * Handle on-demand override requests (external callers can pin a
      specific plugin/mode for a fixed duration via the cache bus).
    * Coordinate with a follower Pi when multi-display sync is configured.
    * Delegate all actual content to the plugin system — this class contains
      no display logic of its own.

    There is exactly one instance per process; call :func:`main` to create
    it and start the run loop.
    """

    def __init__(self):
        start_time = time.time()
        logger.info("Starting DisplayController initialization")
        
        # Initialize ConfigManager and wrap with ConfigService for hot-reload
        config_manager = ConfigManager()
        enable_hot_reload = os.environ.get('LEDMATRIX_HOT_RELOAD', 'true').lower() == 'true'
        self.config_service = ConfigService(
            config_manager=config_manager,
            enable_hot_reload=enable_hot_reload
        )
        self.config_manager = config_manager  # Keep for backward compatibility
        self.config = self.config_service.get_config()
        self.cache_manager = CacheManager()
        logger.info("Config loaded in %.3f seconds (hot-reload: %s)", time.time() - start_time, enable_hot_reload)
        
        # Validate startup configuration
        try:
            from src.startup_validator import StartupValidator
            validator = StartupValidator(self.config_manager)
            is_valid, errors, warnings = validator.validate_all()
            
            if warnings:
                for warning in warnings:
                    logger.warning(f"Startup validation warning: {warning}")
            
            if not is_valid:
                error_msg = "Startup validation failed:\n" + "\n".join(f"  - {e}" for e in errors)
                logger.error(error_msg)
                # For now, log errors but continue - can be made stricter later
                # validator.raise_on_errors()  # Uncomment to fail fast on errors
        except Exception as e:
            logger.warning(f"Startup validation could not be completed: {e}")
        
        config_time = time.time()
        self.display_manager = DisplayManager(self.config)
        logger.info("DisplayManager initialized in %.3f seconds", time.time() - config_time)

        # Initialize multi-display sync (standalone by default — no-op unless configured)
        sync_cfg = self.config.get("sync", {})
        hw_cfg = self.config.get("display", {}).get("hardware", {})
        self.sync_manager = DisplaySyncManager(
            role_str=sync_cfg.get("role", "standalone"),
            cfg=sync_cfg,
            hw_config=hw_cfg,
            logger=logger,
        )
        # Tell the leader its own physical display width so it can include it in hello_ack
        if self.sync_manager.role == SyncRole.LEADER:
            self.sync_manager.set_leader_width(self.display_manager.width)

        # Follower mode setup
        if self.sync_manager.role == SyncRole.FOLLOWER:
            # Gate update_display() so background plugin threads cannot write to
            # hardware — only our render loop is permitted.
            _real_update = self.display_manager.update_display
            _dm = self.display_manager
            def _follower_gated_update():
                # Allow through when the sync render loop has the token, or when
                # the leader has gone offline and we've fallen back to standalone.
                if getattr(_dm, '_sync_render_allowed', False) or not self.sync_manager.is_follower_active():
                    _real_update()
            self.display_manager.update_display = _follower_gated_update

            # Note: _on_new_cycle is NOT registered here. The leader now sends
            # its actual scroll image via TCP at each new_cycle, so the follower
            # adopts that image directly via set_on_scroll_image(). Registering
            # _on_new_cycle would trigger a local rebuild that overwrites the
            # leader's just-received image with a different locally-built one.

        # Initialize Font Manager
        font_time = time.time()
        self.font_manager = FontManager(self.config)
        logger.info("FontManager initialized in %.3f seconds", time.time() - font_time)
        
        # Initialize display modes - all functionality now handled via plugins
        init_time = time.time()
        
        # All other functionality handled via plugins
        logger.info("Display modes initialized in %.3f seconds", time.time() - init_time)
        
        self.force_change = False
        
        # All sports and content managers now handled via plugins
        logger.info("All sports and content managers now handled via plugin system")
        
        # List of available display modes - now handled entirely by plugins
        self.available_modes = []
        
        # Initialize Plugin System
        plugin_time = time.time()
        self.plugin_manager = None
        self.plugin_modes = {}  # mode -> plugin_instance mapping for plugin-first dispatch
        self.mode_to_plugin_id: Dict[str, str] = {}
        self.plugin_display_modes: Dict[str, List[str]] = {}
        # Per-plugin config-change callbacks, kept so we can unsubscribe a
        # plugin when it is disabled live.
        self._plugin_config_callbacks: Dict[str, Callable] = {}
        # Set by the config-watcher thread when the enabled-plugin set changes;
        # the main run loop reconciles (loads/unloads) on its own thread so
        # mutating available_modes never races with rendering.
        self._pending_plugin_reconcile = False
        self.on_demand_active = False
        self.on_demand_mode: Optional[str] = None
        self.on_demand_modes: List[str] = []  # All modes for the on-demand plugin
        self.on_demand_mode_index: int = 0  # Current index in on-demand modes rotation
        self.on_demand_plugin_id: Optional[str] = None
        self.on_demand_duration: Optional[float] = None
        self.on_demand_requested_at: Optional[float] = None
        self.on_demand_expires_at: Optional[float] = None
        self.on_demand_pinned = False
        self.on_demand_request_id: Optional[str] = None
        self.on_demand_status: str = 'idle'
        self.on_demand_last_error: Optional[str] = None
        self.on_demand_last_event: Optional[str] = None
        self.on_demand_schedule_override = False
        self.rotation_resume_index: Optional[int] = None
        # Saved rotation position when a live-priority plugin preempts the
        # rotation, so it resumes where it left off (not after the live plugin)
        # once live priority ends.
        self._live_resume_index: Optional[int] = None

        # WiFi status message tracking
        global WIFI_STATUS_FILE
        if WIFI_STATUS_FILE is None:
            # Resolve project root (same logic as wifi_manager.py)
            project_root = Path(__file__).parent.parent.parent.resolve()
            WIFI_STATUS_FILE = project_root / "config" / "wifi_status.json"
        self.wifi_status_file = WIFI_STATUS_FILE
        self.wifi_status_active = False
        self.wifi_status_expires_at: Optional[float] = None
        # _check_wifi_status_message throttle state (checked at frame rate,
        # stat'd at most once per second)
        self._wifi_status_check_ts = 0.0
        self._wifi_status_last_result: Optional[Dict[str, Any]] = None

        # Plugin display() signature cache — must be initialised before the plugin
        # loading loop below so the .pop() invalidation at load time is always safe.
        self._plugin_accepts_display_mode: Dict[str, bool] = {}

        try:
            logger.info("Attempting to import plugin system...")
            from src.plugin_system import PluginManager
            logger.info("Plugin system imported successfully")
            
            # Get plugin directory from config, default to plugin-repos for production
            plugin_system_config = self.config.get('plugin_system', {})
            plugins_dir_name = plugin_system_config.get('plugins_directory', 'plugin-repos')
            
            # Resolve plugin directory - handle both absolute and relative paths
            if os.path.isabs(plugins_dir_name):
                plugins_dir = plugins_dir_name
            else:
                # If relative, resolve relative to the project root (LEDMatrix directory)
                project_root = os.getcwd()
                plugins_dir = os.path.join(project_root, plugins_dir_name)
            
            logger.info("Plugin Manager initialized with plugins directory: %s", plugins_dir)
            
            self.plugin_manager = PluginManager(
                plugins_dir=plugins_dir,
                config_manager=self.config_manager,
                display_manager=self.display_manager,
                cache_manager=self.cache_manager,
                font_manager=self.font_manager
            )

            # Activate the plugin health/metrics subsystem. PluginManager leaves
            # health_tracker/resource_monitor as None by default; wiring real
            # instances here turns on the circuit breaker (a repeatedly-failing
            # plugin's update() is skipped after consecutive failures, then
            # retried after a cooldown) and per-plugin execution-time metrics.
            # Both persist to the shared cache so the web UI can surface them.
            # Done before discovery/loading so load-time schema warnings have a
            # tracker to record against.
            try:
                from src.plugin_system.plugin_health import PluginHealthTracker
                from src.plugin_system.resource_monitor import PluginResourceMonitor
                self.plugin_manager.health_tracker = PluginHealthTracker(self.cache_manager)
                self.plugin_manager.resource_monitor = PluginResourceMonitor(self.cache_manager)
                logger.info("Plugin health tracking and resource monitoring enabled")
            except Exception as e:
                logger.warning("Could not enable plugin health/resource monitoring: %s", e)

            # Validate plugins after plugin manager is created
            try:
                from src.startup_validator import StartupValidator
                validator = StartupValidator(self.config_manager, self.plugin_manager)
                is_valid, errors, warnings = validator.validate_all()
                
                if warnings:
                    for warning in warnings:
                        logger.warning(f"Plugin validation warning: {warning}")
                
                if not is_valid:
                    error_msg = "Plugin validation failed:\n" + "\n".join(f"  - {e}" for e in errors)
                    logger.error(error_msg)
            except Exception as e:
                logger.warning(f"Plugin validation could not be completed: {e}")

            # Discover plugins
            discovered_plugins = self.plugin_manager.discover_plugins()
            logger.info("Discovered %d plugin(s)", len(discovered_plugins))

            # Check for on-demand plugin filter from cache
            on_demand_config = self.cache_manager.get('display_on_demand_config', max_age=3600)
            on_demand_plugin_id = on_demand_config.get('plugin_id') if on_demand_config else None

            if on_demand_plugin_id:
                logger.info("On-demand mode detected during initialization: filtering to plugin '%s' only", on_demand_plugin_id)
                # Only load the on-demand plugin, but ensure it's enabled
                if on_demand_plugin_id not in discovered_plugins:
                    error_msg = f"On-demand plugin '{on_demand_plugin_id}' not found in discovered plugins"
                    logger.error(error_msg)
                    logger.warning("Falling back to normal mode (all enabled plugins)")
                    on_demand_plugin_id = None
                    enabled_plugins = [p for p in discovered_plugins if self.config.get(p, {}).get('enabled', False)]
                else:
                    plugin_config = self.config.get(on_demand_plugin_id, {})
                    was_disabled = not plugin_config.get('enabled', False)
                    if was_disabled:
                        logger.info("Temporarily enabling plugin '%s' for on-demand mode", on_demand_plugin_id)
                        if on_demand_plugin_id not in self.config:
                            self.config[on_demand_plugin_id] = {}
                        self.config[on_demand_plugin_id]['enabled'] = True
                    enabled_plugins = [on_demand_plugin_id]
                    # Set on-demand state from cached config
                    self.on_demand_active = True
                    self.on_demand_plugin_id = on_demand_plugin_id
                    self.on_demand_mode = on_demand_config.get('mode')
                    self.on_demand_duration = on_demand_config.get('duration')
                    self.on_demand_pinned = on_demand_config.get('pinned', False)
                    self.on_demand_requested_at = on_demand_config.get('requested_at')
                    self.on_demand_expires_at = on_demand_config.get('expires_at')
                    self.on_demand_status = 'active'
                    self.on_demand_schedule_override = True
                    logger.info("On-demand mode: loading only plugin '%s'", on_demand_plugin_id)
            else:
                enabled_plugins = [p for p in discovered_plugins if self.config.get(p, {}).get('enabled', False)]
            
            # Count enabled plugins for progress tracking
            enabled_count = len(enabled_plugins)
            logger.info("Loading %d enabled plugin(s) in parallel (max 4 concurrent)...", enabled_count)
            
            # Helper function for parallel loading
            def load_single_plugin(plugin_id):
                """Load a single plugin and return result."""
                plugin_load_start = time.time()
                try:
                    if self.plugin_manager.load_plugin(plugin_id):
                        plugin_load_time = time.time() - plugin_load_start
                        return {
                            'success': True,
                            'plugin_id': plugin_id,
                            'load_time': plugin_load_time,
                            'error': None
                        }
                    else:
                        return {
                            'success': False,
                            'plugin_id': plugin_id,
                            'load_time': time.time() - plugin_load_start,
                            'error': 'Load returned False'
                        }
                except Exception as e:
                    return {
                        'success': False,
                        'plugin_id': plugin_id,
                        'load_time': time.time() - plugin_load_start,
                        'error': str(e)
                    }
            
            # Load enabled plugins in parallel with up to 4 concurrent workers
            loaded_count = 0
            with ThreadPoolExecutor(max_workers=4) as executor:
                # Submit all enabled plugins for loading
                future_to_plugin = {
                    executor.submit(load_single_plugin, plugin_id): plugin_id
                    for plugin_id in enabled_plugins
                }
                
                # Process results as they complete
                for future in as_completed(future_to_plugin):
                    result = future.result()
                    loaded_count += 1
                    
                    if result['success']:
                        plugin_id = result['plugin_id']
                        logger.info("✓ Loaded plugin %s in %.3f seconds (%d/%d)", 
                                  plugin_id, result['load_time'], loaded_count, enabled_count)
                        
                        # Register the loaded plugin's modes, config subscription
                        # and dispatch maps (shared with live enable hot-reload).
                        self._register_loaded_plugin(plugin_id)

                        # Show progress
                        progress_pct = int((loaded_count / enabled_count) * 100)
                        elapsed = time.time() - plugin_time
                        logger.info("Progress: %d%% (%d/%d plugins, %.1fs elapsed)", 
                                  progress_pct, loaded_count, enabled_count, elapsed)
                    else:
                        logger.warning("✗ Failed to load plugin %s: %s", 
                                     result['plugin_id'], result['error'])
            
            # Log disabled plugins
            disabled_count = len(discovered_plugins) - enabled_count
            if disabled_count > 0:
                logger.debug("%d plugin(s) disabled in config", disabled_count)

            logger.info("Plugin system initialized in %.3f seconds", time.time() - plugin_time)
            logger.info("Total available modes: %d", len(self.available_modes))
            logger.info("Available modes: %s", self.available_modes)
            
            # If on-demand mode was restored from cache, populate on_demand_modes now that plugins are loaded
            if self.on_demand_active and self.on_demand_plugin_id:
                self._populate_on_demand_modes_from_plugin()

        except Exception:  # pylint: disable=broad-except
            logger.exception("Plugin system initialization failed")
            self.plugin_manager = None

        # Display rotation state
        self.current_mode_index = 0
        self.current_display_mode = None
        self.last_mode_change = time.time()
        self.mode_duration = 30  # Default duration
        self.global_dynamic_config = (
            self.config.get("display", {}).get("dynamic_duration", {}) or {}
        )
        self._active_dynamic_mode: Optional[str] = None
        
        # Memory monitoring
        self._memory_log_interval = 3600.0  # Log memory stats every hour
        self._last_memory_log = time.time()
        self._enable_memory_logging = self.config.get("display", {}).get("memory_logging", False)
        
        # Schedule management
        self.is_display_active = True
        self._was_display_active = True  # Track previous state for schedule change detection

        # --- Opt #2: cached config values ---
        # Avoids chained dict.get() with temporary {} defaults on every hot path call.
        # Refreshed via _refresh_config_cache() on every hot-reload.
        self._normal_brightness: int = (
            self.config.get('display', {}).get('hardware', {}).get('brightness', 90)
        )
        self._scroll_speed: float = (
            self.config.get('display', {}).get('vegas_scroll', {}).get('scroll_speed', 75)
        )

        # Brightness state tracking for dim schedule
        self.current_brightness = self._normal_brightness
        self.is_dimmed = False
        self._was_dimmed = False

        # --- Opt #3: schedule minute-gate ---
        # Both _check_schedule and _check_dim_schedule re-evaluated at most once per
        # clock minute.  Storing the (hour, minute) tuple that was last evaluated lets
        # the methods skip all timezone / strptime work within the same minute.
        # Reset to None on config change so the next call re-evaluates immediately.
        self._tz = None                              # pytz timezone, lazily built from config
        self._schedule_checked_minute: Optional[tuple] = None
        self._dim_checked_minute: Optional[tuple] = None
        self._cached_target_brightness: int = self._normal_brightness

        # Register controller-level hot-reload callback so cached config values
        # (_normal_brightness, _scroll_speed, _tz, minute-gates) stay in sync
        # when the user saves settings via the web UI.
        def _controller_config_change(old_config: Dict[str, Any], new_config: Dict[str, Any]) -> None:
            self._refresh_config_cache(new_config)
            # If a plugin was enabled/disabled, flag a reconcile for the main
            # loop to apply (loading/unloading off the watcher thread is unsafe).
            if self._enabled_set_changed(old_config, new_config):
                self._pending_plugin_reconcile = True

        self.config_service.subscribe(_controller_config_change)

        # Publish initial on-demand state
        try:
            self._publish_on_demand_state()
        except (OSError, ValueError, RuntimeError) as err:
            logger.debug("Initial on-demand state publish failed: %s", err, exc_info=True)

        # Initial data update for plugins (ensures data available on first display)
        logger.info("Performing initial plugin data update...")
        update_start = time.time()
        self._update_modules()
        logger.info("Initial plugin update completed in %.3f seconds", time.time() - update_start)

        # Initialize Vegas mode coordinator
        self.vegas_coordinator = None
        self._initialize_vegas_mode()

        logger.info("DisplayController initialization completed in %.3f seconds", time.time() - start_time)

    def _initialize_vegas_mode(self):
        """Initialize Vegas mode coordinator if enabled."""
        global _vegas_mode_imported, VegasModeCoordinator

        vegas_config = self.config.get('display', {}).get('vegas_scroll', {})
        if not vegas_config.get('enabled', False):
            logger.debug("Vegas mode disabled in config")
            return

        if self.plugin_manager is None:
            logger.warning("Vegas mode skipped: plugin_manager is None")
            return

        try:
            # Lazy import to avoid circular imports
            if not _vegas_mode_imported:
                try:
                    from src.vegas_mode import VegasModeCoordinator as VMC
                    VegasModeCoordinator = VMC
                    _vegas_mode_imported = True
                except ImportError:
                    logger.exception("Failed to import Vegas mode module")
                    return

            self.vegas_coordinator = VegasModeCoordinator(
                config=self.config,
                display_manager=self.display_manager,
                plugin_manager=self.plugin_manager
            )

            # Set up live priority checker
            self.vegas_coordinator.set_live_priority_checker(self._check_live_priority)

            # Set up interrupt checker for on-demand/wifi status and follower mode
            def _vegas_interrupt():
                return self._check_vegas_interrupt() or self.sync_manager.is_follower_active()
            self.vegas_coordinator.set_interrupt_checker(
                _vegas_interrupt,
                check_interval=10  # Check every 10 frames (~80ms at 125 FPS)
            )

            # Run plugin updates inside the Vegas loop so the inter-iteration
            # gap is <1 ms (nothing left for _tick_plugin_updates() to do).
            # Use the Vegas-aware variant so plugins that got fresh data are
            # hot-swapped into the scroll promptly instead of waiting for the
            # next full cycle.
            self.vegas_coordinator.set_update_callback(self._tick_plugin_updates_for_vegas)

            # Wire multi-display sync into Vegas render pipeline
            follower_pos = self.config.get("sync", {}).get("follower_position", "left")
            self.vegas_coordinator.set_sync_manager(self.sync_manager, follower_pos)

            logger.info("Vegas mode coordinator initialized")

            # Follower does NOT build its own initial scroll image — the leader
            # pushes its image via TCP as soon as set_on_follower_connected fires.
            # A local build would create a different (wrong) image that could
            # temporarily replace the leader's correct one.

            # When the leader sends its scroll image (TCP), update our
            # cached_array so both Pis have pixel-identical images.
            import numpy as _np
            def _on_leader_scroll_image(image):
                vc = getattr(self, 'vegas_coordinator', None)
                if vc and vc.render_pipeline:
                    rp = vc.render_pipeline
                    arr = _np.asarray(image.convert("RGB"), dtype=_np.uint8)
                    rp.scroll_helper.cached_image = image
                    rp.scroll_helper.cached_array = arr
                    rp.scroll_helper.total_scroll_width = image.width
                    self._follower_pending_new_image = False
                    logger.info(
                        "Sync: follower adopted leader scroll image %dx%d",
                        image.width, image.height,
                    )
            self.sync_manager.set_on_scroll_image(_on_leader_scroll_image)

            if self.sync_manager.role == SyncRole.LEADER:
                # When a follower first connects, push the current scroll image so
                # the follower doesn't have to wait for the next new_cycle event.
                # Polls until the image is ready (Vegas may still be composing on startup).
                def _on_follower_connected():
                    import time as _t
                    for _ in range(300):  # up to 30s
                        vc = getattr(self, 'vegas_coordinator', None)
                        if vc and vc.render_pipeline:
                            img = vc.render_pipeline.scroll_helper.cached_image
                            if img is not None:
                                self.sync_manager.send_scroll_image(img)
                                return
                        _t.sleep(0.1)
                    logger.warning("Sync: no scroll image available to push to new follower")
                self.sync_manager.set_on_follower_connected(_on_follower_connected)

        except Exception as e:
            logger.error("Failed to initialize Vegas mode: %s", e, exc_info=True)
            self.vegas_coordinator = None

    def _is_vegas_mode_active(self) -> bool:
        """Check if Vegas mode should be running."""
        if not self.vegas_coordinator:
            return False
        if not self.vegas_coordinator.is_enabled:
            return False
        if self.on_demand_active:
            return False  # On-demand takes priority
        return True

    def _check_vegas_interrupt(self) -> bool:
        """
        Check if Vegas should yield control for higher priority events.

        Called periodically by Vegas coordinator to allow responsive
        handling of on-demand requests, wifi status, etc.

        Returns:
            True if Vegas should yield control, False to continue
        """
        # Check for pending on-demand request
        if self.on_demand_active:
            return True

        # Check for wifi status that needs display
        if self._check_wifi_status_message():
            return True

        return False

    def _check_schedule(self):
        """Check if display should be active based on schedule."""
        schedule_config = self.config.get('schedule', {})
        
        # If schedule config doesn't exist or is empty, default to always active
        if not schedule_config:
            self.is_display_active = True
            self._was_display_active = True  # Track previous state for schedule change detection
            return
        
        # Check if schedule is explicitly disabled
        # Default to True (schedule enabled) if 'enabled' key is missing for backward compatibility
        if 'enabled' in schedule_config and not schedule_config.get('enabled', True):
            self.is_display_active = True
            self._was_display_active = True  # Track previous state for schedule change detection
            logger.debug("Schedule is disabled - display always active")
            return

        # Lazily build the timezone object once; reuse on every subsequent call.
        if self._tz is None:
            timezone_str = self.config.get('timezone', 'UTC')
            try:
                self._tz = pytz.timezone(timezone_str)
            except pytz.UnknownTimeZoneError:
                logger.warning("Unknown timezone '%s', using UTC", timezone_str)
                self._tz = pytz.UTC

        current_time = datetime.now(self._tz)
        # Gate: schedule state can only change on a minute boundary, so skip
        # all the strptime / comparison work if we already evaluated this minute.
        current_minute_key = (current_time.hour, current_time.minute)
        if current_minute_key == self._schedule_checked_minute:
            return
        self._schedule_checked_minute = current_minute_key

        current_day = current_time.strftime('%A').lower()  # e.g. 'monday'
        current_time_only = current_time.time()

        # Check if per-day schedule is configured
        days_config = schedule_config.get('days')

        # Determine which schedule to use. Respect an explicit 'mode' field
        # (like the dim schedule does) so a stray/legacy 'days' dict left over
        # from config migration or a prior per-day setup can't silently
        # override a user's Global schedule selection.
        mode = schedule_config.get('mode')
        mode_normalized = mode.replace('_', '-') if mode else None

        use_per_day = False
        if mode_normalized == 'global':
            use_per_day = False
        elif mode_normalized == 'per-day':
            use_per_day = bool(days_config and current_day in days_config)
        elif days_config:
            # No explicit mode recorded (legacy config) - fall back to
            # inferring from presence of a 'days' dict for the current day.
            if current_day in days_config:
                use_per_day = True
            else:
                logger.debug("Per-day schedule exists but %s not configured, using global schedule", current_day)
        
        if use_per_day:
            # Use per-day schedule
            day_config = days_config[current_day]
            
            # Check if this day is enabled
            if not day_config.get('enabled', True):
                was_active = getattr(self, '_was_display_active', True)
                self.is_display_active = False
                if was_active:
                    logger.info("Schedule activated: Display is now INACTIVE (%s is disabled in schedule). Display will be blanked.", current_day)
                else:
                    logger.debug("Display inactive - %s is disabled in schedule", current_day)
                self._was_display_active = self.is_display_active
                return
            
            start_time_str = day_config.get('start_time', '07:00')
            end_time_str = day_config.get('end_time', '23:00')
            schedule_type = f"per-day ({current_day})"
        else:
            # Use global schedule
            start_time_str = schedule_config.get('start_time', '07:00')
            end_time_str = schedule_config.get('end_time', '23:00')
            schedule_type = "global"
        
        try:
            start_time = datetime.strptime(start_time_str, '%H:%M').time()
            end_time = datetime.strptime(end_time_str, '%H:%M').time()
            
            if start_time <= end_time:
                # Normal case: start and end on same day
                self.is_display_active = start_time <= current_time_only <= end_time
            else:
                # Overnight case: start and end on different days
                self.is_display_active = current_time_only >= start_time or current_time_only <= end_time
            
            # Track previous state to detect changes
            was_active = getattr(self, '_was_display_active', True)
            
            # Log schedule state changes
            if not self.is_display_active:
                if was_active:
                    # State changed from active to inactive - schedule kicked in
                    logger.info("Schedule activated: Display is now INACTIVE (outside %s schedule window %s - %s). Display will be blanked.", 
                               schedule_type, start_time_str, end_time_str)
                else:
                    logger.debug("Display inactive - outside %s schedule window (%s - %s)", 
                               schedule_type, start_time_str, end_time_str)
            else:
                if not was_active:
                    # State changed from inactive to active
                    logger.info("Schedule activated: Display is now ACTIVE (within %s schedule window %s - %s)", 
                               schedule_type, start_time_str, end_time_str)
                else:
                    logger.debug("Display active - within %s schedule window (%s - %s)", 
                               schedule_type, start_time_str, end_time_str)
            
            # Store current state for next check
            self._was_display_active = self.is_display_active
                
        except ValueError as e:
            logger.warning("Invalid schedule format for %s schedule: %s (start: %s, end: %s). Defaulting to active.",
                         schedule_type, e, start_time_str, end_time_str)
            self.is_display_active = True
            self._was_display_active = True  # Track previous state for schedule change detection

    def _check_dim_schedule(self) -> int:
        """
        Check if display should be dimmed based on dim schedule.

        Returns:
            Target brightness level (dim_brightness if in dim period,
            normal brightness otherwise)
        """
        # Opt #2: use cached brightness rather than re-traversing config dict
        normal_brightness = self._normal_brightness

        # If display is OFF via schedule, don't process dim schedule
        if not self.is_display_active:
            self.is_dimmed = False
            return normal_brightness

        dim_config = self.config.get('dim_schedule', {})

        # If dim schedule doesn't exist or is disabled, use normal brightness
        if not dim_config or not dim_config.get('enabled', False):
            self.is_dimmed = False
            return normal_brightness

        # Opt #3: lazily build timezone; gate full re-parse to once per clock minute
        if self._tz is None:
            timezone_str = self.config.get('timezone', 'UTC')
            try:
                self._tz = pytz.timezone(timezone_str)
            except pytz.UnknownTimeZoneError:
                logger.warning("Unknown timezone '%s' in dim schedule, using UTC", timezone_str)
                self._tz = pytz.UTC

        current_time = datetime.now(self._tz)
        current_minute_key = (current_time.hour, current_time.minute)
        if current_minute_key == self._dim_checked_minute:
            return self._cached_target_brightness
        self._dim_checked_minute = current_minute_key

        current_day = current_time.strftime('%A').lower()
        current_time_only = current_time.time()

        # Determine if using per-day or global dim schedule
        # Normalize mode to handle both "per-day" and "per_day" variants
        mode = dim_config.get('mode', 'global')
        mode_normalized = mode.replace('_', '-') if mode else 'global'
        days_config = dim_config.get('days')
        use_per_day = mode_normalized == 'per-day' and days_config and current_day in days_config

        if use_per_day:
            day_config = days_config[current_day]
            if not day_config.get('enabled', True):
                self.is_dimmed = False
                return normal_brightness
            start_time_str = day_config.get('start_time', '20:00')
            end_time_str = day_config.get('end_time', '07:00')
        else:
            start_time_str = dim_config.get('start_time', '20:00')
            end_time_str = dim_config.get('end_time', '07:00')

        try:
            start_time = datetime.strptime(start_time_str, '%H:%M').time()
            end_time = datetime.strptime(end_time_str, '%H:%M').time()

            # Determine if currently in dim period
            if start_time <= end_time:
                # Same-day schedule (e.g., 10:00 to 18:00)
                in_dim_period = start_time <= current_time_only <= end_time
            else:
                # Overnight schedule (e.g., 20:00 to 07:00)
                in_dim_period = current_time_only >= start_time or current_time_only <= end_time

            if in_dim_period:
                self.is_dimmed = True
                target_brightness = dim_config.get('dim_brightness', 30)
            else:
                self.is_dimmed = False
                target_brightness = normal_brightness

            # Log state changes
            if self.is_dimmed and not self._was_dimmed:
                logger.info(f"Dim schedule activated: brightness set to {target_brightness}%")
            elif not self.is_dimmed and self._was_dimmed:
                logger.info(f"Dim schedule deactivated: brightness restored to {target_brightness}%")

            self._was_dimmed = self.is_dimmed
            self._cached_target_brightness = target_brightness  # persist for minute-gate
            return target_brightness

        except ValueError as e:
            logger.warning("Invalid dim schedule time format: %s", e)
            self._cached_target_brightness = normal_brightness  # persist for minute-gate
            return normal_brightness

    def _update_modules(self):
        """Update all plugin modules."""
        if not self.plugin_manager:
            return
            
        # Update all loaded plugins
        plugins_dict = getattr(self.plugin_manager, 'loaded_plugins', None) or getattr(self.plugin_manager, 'plugins', {})
        for plugin_id, plugin_instance in plugins_dict.items():
            # Check circuit breaker before attempting update
            if hasattr(self.plugin_manager, 'health_tracker') and self.plugin_manager.health_tracker:
                if self.plugin_manager.health_tracker.should_skip_plugin(plugin_id):
                    logger.debug(f"Skipping update for plugin {plugin_id} due to circuit breaker")
                    continue
            
            # Use PluginExecutor if available for safe execution
            if hasattr(self.plugin_manager, 'plugin_executor'):
                success = self.plugin_manager.plugin_executor.execute_update(plugin_instance, plugin_id)
                if success and hasattr(self.plugin_manager, 'plugin_last_update'):
                    self.plugin_manager.plugin_last_update[plugin_id] = time.time()
            else:
                # Fallback to direct call
                try:
                    if hasattr(plugin_instance, 'update'):
                        plugin_instance.update()
                        if hasattr(self.plugin_manager, 'plugin_last_update'):
                            self.plugin_manager.plugin_last_update[plugin_id] = time.time()
                        # Record success
                        if hasattr(self.plugin_manager, 'health_tracker') and self.plugin_manager.health_tracker:
                            self.plugin_manager.health_tracker.record_success(plugin_id)
                except Exception as exc:  # pylint: disable=broad-except
                    logger.exception("Error updating plugin %s", plugin_id)
                    # Record failure
                    if hasattr(self.plugin_manager, 'health_tracker') and self.plugin_manager.health_tracker:
                        self.plugin_manager.health_tracker.record_failure(plugin_id, exc)

    def _tick_plugin_updates_for_vegas(self) -> None:
        """Run scheduled plugin updates and tell Vegas mode which plugins
        actually got fresh data, so it can hot-swap them into the scroll
        without waiting for a full cycle to complete.

        Used as the Vegas coordinator's update callback instead of the plain
        _tick_plugin_updates() so that a live score change is reflected in
        the ticker within a few seconds rather than at the next cycle
        boundary (which, depending on min/max_cycle_duration, can be
        minutes away). Restores wiring that PR #299 added and PR #330's
        sync-mode refactor inadvertently dropped: coordinator.mark_plugin_updated()
        has been unreachable dead code since.

        Delegates the before/after plugin_last_update snapshot to
        PluginManager.run_scheduled_updates_with_changes() so the snapshot,
        update pass, and diff are lock-protected against this callback's own
        background update-tick thread racing the main render loop.
        """
        if not self.plugin_manager or not hasattr(self.plugin_manager, "run_scheduled_updates_with_changes"):
            self._tick_plugin_updates()
            return

        updated = self.plugin_manager.run_scheduled_updates_with_changes()

        vc = getattr(self, "vegas_coordinator", None)
        if vc is None:
            return

        if updated:
            logger.info("Vegas update tick: %d plugin(s) updated: %s", len(updated), updated)
            for plugin_id in updated:
                try:
                    vc.mark_plugin_updated(plugin_id)
                except Exception:  # pylint: disable=broad-except
                    logger.exception("Error marking plugin %s updated for Vegas", plugin_id)

    def _tick_plugin_updates(self):
        """Run scheduled plugin updates if the plugin manager supports them."""
        if not self.plugin_manager:
            return

        if hasattr(self.plugin_manager, "run_scheduled_updates"):
            try:
                self.plugin_manager.run_scheduled_updates()
            except Exception:  # pylint: disable=broad-except
                logger.exception("Error running scheduled plugin updates")

    @contextmanager
    def _display_lock_or_skip(self, plugin_id):
        """Try-lock guard keeping a plugin's display() off its in-flight update().

        Yields True when display may run (lock held, released on exit) or
        when no lock support exists (older plugin manager). Yields False when
        the plugin's update() is currently executing on the background
        worker — the caller should treat the frame as displayed (the panel
        holds the last pushed frame) rather than as a plugin failure, so a
        mid-update skip never advances the rotation.
        """
        pm = self.plugin_manager
        if not pm or not hasattr(pm, 'get_plugin_lock') or not plugin_id:
            yield True
            return
        lock = pm.get_plugin_lock(plugin_id)
        if not lock.acquire(blocking=False):
            yield False
            return
        try:
            yield True
        finally:
            lock.release()

    _FOLLOWER_SEND_INTERVAL = 1.0 / 90  # raw bytes are cheap; 90fps > follower render rate

    def _follower_rebuild_scroll_image(self) -> None:
        """Follower: rebuild the local Vegas scroll image so both Pis render from
        the same fresh plugin data. Called at startup (after Vegas initializes)
        and each time the leader broadcasts a new-cycle signal. Runs in a daemon
        thread so it never blocks the 60fps render loop.
        """
        try:
            vc = getattr(self, 'vegas_coordinator', None)
            if not vc:
                logger.warning("Sync: follower has no vegas_coordinator — cannot build scroll image")
                return
            rp = vc.render_pipeline
            if not rp:
                logger.warning("Sync: follower vegas_coordinator has no render_pipeline")
                return
            logger.info("Sync: follower starting scroll image rebuild")
            ok = rp.start_new_cycle()
            if ok and rp.scroll_helper.cached_image is not None:
                logger.info(
                    "Sync: follower scroll image ready — %dx%d",
                    rp.scroll_helper.cached_image.width,
                    rp.scroll_helper.cached_image.height,
                )
            else:
                logger.warning(
                    "Sync: follower scroll image rebuild FAILED (ok=%s, cached=%s)",
                    ok, rp.scroll_helper.cached_image is not None,
                )
        except Exception as exc:
            logger.warning("Sync: follower scroll image rebuild error: %s", exc, exc_info=True)

    def _send_follower_frame(self, plugin_instance) -> None:
        """Leader: generate and send the follower's portion of the current frame.

        The follower is physically to the LEFT of the leader in a right-to-left
        scrolling ticker, so it shows content at scroll_position - display_width
        (content that already scrolled off the leader's left edge).
        Set sync.follower_position = "right" in config to invert this.
        """
        if not (self.sync_manager and self.sync_manager.role == SyncRole.LEADER):
            return
        # Throttle to ~90fps via _FOLLOWER_SEND_INTERVAL — raw RGB bytes, no encode/decode
        now = time.time()
        if now - getattr(self, '_last_follower_send', 0) < self._FOLLOWER_SEND_INTERVAL:
            return
        self._last_follower_send = now

        follower_frame = None
        width = self.display_manager.width
        sync_cfg = self.config.get("sync", {})
        sign = -1 if sync_cfg.get("follower_position", "left") == "left" else 1
        offset = sign * width

        # 1. Explicit hook — plugin opted in with get_offset_frame()
        try:
            follower_frame = plugin_instance.get_offset_frame(offset)
        except AttributeError:
            pass  # Most plugins don't implement get_offset_frame; that's expected

        # 2. Auto-detect — plugin has a scroll_helper (standard pattern for all
        #    scroll plugins). Works with zero plugin code changes.
        if follower_frame is None:
            try:
                scroll_h = getattr(plugin_instance, 'scroll_helper', None)
                if scroll_h is not None:
                    follower_frame = scroll_h.get_portion_at(scroll_h.scroll_position + offset)
            except Exception:  # nosec B110 - scroll_helper.get_portion_at is optional; skip on error
                pass

        # 3. Mirror fallback — static plugins (clock, weather) show same frame
        if follower_frame is None:
            follower_frame = self.display_manager.image

        if follower_frame is not None:
            self.sync_manager.send_frame(follower_frame)

    def _sleep_with_plugin_updates(self, duration: float, tick_interval: float = 1.0):
        """Sleep while continuing to service plugin update schedules."""
        if duration <= 0:
            return

        end_time = time.time() + duration
        tick_interval = max(0.001, tick_interval)

        while True:
            remaining = end_time - time.time()
            if remaining <= 0:
                break

            sleep_time = min(tick_interval, remaining)
            time.sleep(sleep_time)
            self._tick_plugin_updates()

    def _get_display_duration(self, mode_key):
        """Get display duration for a mode."""
        # Check plugin-specific duration first
        if mode_key in self.plugin_modes:
            plugin_instance = self.plugin_modes[mode_key]
            if hasattr(plugin_instance, 'get_display_duration'):
                return plugin_instance.get_display_duration()
        
        # Fall back to config
        display_durations = self.config.get('display', {}).get('display_durations', {})
        return display_durations.get(mode_key, 30)

    def _get_global_dynamic_cap(self) -> Optional[float]:
        """Return global fallback dynamic duration cap."""
        cap_value = self.global_dynamic_config.get("max_duration_seconds")
        if cap_value is None:
            return DEFAULT_DYNAMIC_DURATION_CAP
        try:
            cap = float(cap_value)
            if cap <= 0:
                return None
            return cap
        except (TypeError, ValueError):
            logger.warning("Invalid global dynamic duration cap: %s", cap_value)
            return None

    def _plugin_supports_dynamic(self, plugin_instance) -> bool:
        """Safely determine whether plugin supports dynamic duration."""
        supports_fn = getattr(plugin_instance, "supports_dynamic_duration", None)
        if not callable(supports_fn):
            return False
        try:
            return bool(supports_fn())
        except Exception as exc:  # pylint: disable=broad-except
            plugin_id = getattr(plugin_instance, "plugin_id", "unknown")
            logger.warning(
                "Failed to query dynamic duration support for %s: %s", plugin_id, exc
            )
            return False

    def _plugin_dynamic_cap(self, plugin_instance) -> Optional[float]:
        """Fetch plugin-specific dynamic duration cap."""
        cap_fn = getattr(plugin_instance, "get_dynamic_duration_cap", None)
        if not callable(cap_fn):
            return None
        try:
            return cap_fn()
        except Exception as exc:  # pylint: disable=broad-except
            plugin_id = getattr(plugin_instance, "plugin_id", "unknown")
            logger.warning(
                "Failed to read dynamic duration cap for %s: %s", plugin_id, exc
            )
            return None

    def _plugin_cycle_duration(self, plugin_instance, display_mode: str = None) -> Optional[float]:
        """Fetch plugin-calculated cycle duration for a specific mode.
        
        This allows plugins to calculate the total time needed to show all content
        for a mode (e.g., number_of_games × per_game_duration).
        
        Args:
            plugin_instance: The plugin to query
            display_mode: The mode to get duration for (e.g., 'football_recent')
        
        Returns:
            Calculated duration in seconds, or None if not available
        """
        duration_fn = getattr(plugin_instance, "get_cycle_duration", None)
        if not callable(duration_fn):
            return None
        try:
            return duration_fn(display_mode=display_mode)
        except Exception as exc:  # pylint: disable=broad-except
            plugin_id = getattr(plugin_instance, "plugin_id", "unknown")
            logger.debug(
                "Failed to read cycle duration for %s mode %s: %s", 
                plugin_id, 
                display_mode,
                exc
            )
            return None

    def _plugin_reset_cycle(self, plugin_instance) -> None:
        """Reset plugin cycle tracking if supported."""
        reset_fn = getattr(plugin_instance, "reset_cycle_state", None)
        if not callable(reset_fn):
            return
        try:
            reset_fn()
        except Exception as exc:  # pylint: disable=broad-except
            plugin_id = getattr(plugin_instance, "plugin_id", "unknown")
            logger.warning("Failed to reset cycle state for %s: %s", plugin_id, exc)

    def _plugin_cycle_complete(self, plugin_instance) -> bool:
        """Determine if plugin reports cycle completion."""
        complete_fn = getattr(plugin_instance, "is_cycle_complete", None)
        if not callable(complete_fn):
            return True
        try:
            return bool(complete_fn())
        except Exception as exc:  # pylint: disable=broad-except
            plugin_id = getattr(plugin_instance, "plugin_id", "unknown")
            logger.warning(
                "Failed to read cycle completion for %s: %s (keeping display active)",
                plugin_id,
                exc,
                exc_info=True,
            )
            # Return False on error to keep displaying rather than cutting short
            # This is safer - better to show content longer than to exit prematurely
            return False

    def _get_on_demand_remaining(self) -> Optional[float]:
        """Calculate remaining time for an active on-demand session."""
        if not self.on_demand_active or self.on_demand_expires_at is None:
            return None
        remaining = self.on_demand_expires_at - time.time()
        return max(0.0, remaining)

    def _publish_on_demand_state(self) -> None:
        """Publish current on-demand state to cache for external consumers."""
        try:
            state = {
                'active': self.on_demand_active,
                'mode': self.on_demand_mode,
                'plugin_id': self.on_demand_plugin_id,
                'requested_at': self.on_demand_requested_at,
                'expires_at': self.on_demand_expires_at,
                'duration': self.on_demand_duration,
                'pinned': self.on_demand_pinned,
                'status': self.on_demand_status,
                'error': self.on_demand_last_error,
                'last_event': self.on_demand_last_event,
                'remaining': self._get_on_demand_remaining(),
                'last_updated': time.time()
            }
            self.cache_manager.set('display_on_demand_state', state)
        except (OSError, RuntimeError, ValueError, TypeError) as err:
            logger.error("Failed to publish on-demand state: %s", err, exc_info=True)

    def _set_on_demand_error(self, message: str) -> None:
        """Set on-demand state to error and publish."""
        self.on_demand_status = 'error'
        self.on_demand_last_error = message
        self.on_demand_last_event = None
        self.on_demand_active = False
        self.on_demand_mode = None
        self.on_demand_modes = []
        self.on_demand_mode_index = 0
        self.on_demand_plugin_id = None
        self.on_demand_duration = None
        self.on_demand_requested_at = None
        self.on_demand_expires_at = None
        self.on_demand_pinned = False
        self.rotation_resume_index = None
        self.on_demand_schedule_override = False
        self._publish_on_demand_state()

    def _poll_on_demand_requests(self) -> None:
        """Poll cache for new on-demand requests from external controllers."""
        try:
            # Use a long max_age (1 hour) to ensure requests aren't expired before processing
            # The request_id check prevents duplicate processing
            request = self.cache_manager.get('display_on_demand_request', max_age=3600)
        except (OSError, RuntimeError, ValueError, TypeError) as err:
            logger.error("Failed to read on-demand request: %s", err, exc_info=True)
            return

        if not request:
            return

        request_id = request.get('request_id')
        if not request_id:
            return

        action = request.get('action')
        
        # For stop requests, always process them (don't check processed_id)
        # This allows stopping even if the same stop request was sent before
        if action == 'stop':
            logger.info("Received on-demand stop request %s", request_id)
            # Always process stop requests, even if same request_id (user might click multiple times)
            if self.on_demand_active:
                self.on_demand_request_id = request_id
                self._clear_on_demand(reason='requested-stop')
                logger.info("On-demand mode cleared, resuming normal rotation")
            else:
                logger.debug("Stop request %s received but on-demand is not active", request_id)
                # Still update request_id to acknowledge the request
                self.on_demand_request_id = request_id
            return
        
        # For start requests, check if already processed
        if request_id == self.on_demand_request_id:
            logger.debug("On-demand start request %s already processed (instance check)", request_id)
            return
        
        # Also check persistent processed_id (for restart scenarios)
        processed_request_id = self.cache_manager.get('display_on_demand_processed_id', max_age=3600)
        if request_id == processed_request_id:
            logger.debug("On-demand start request %s already processed (persisted check)", request_id)
            return
        
        logger.info("Received on-demand request %s: %s (plugin_id=%s, mode=%s)", 
                   request_id, action, request.get('plugin_id'), request.get('mode'))
        
        # Mark as processed BEFORE processing (to prevent duplicate processing)
        self.cache_manager.set('display_on_demand_processed_id', request_id, ttl=3600)
        self.on_demand_request_id = request_id
        
        if action == 'start':
            logger.info("Processing on-demand start request for plugin: %s", request.get('plugin_id'))
            self._activate_on_demand(request)
        else:
            logger.warning("Unknown on-demand action: %s", action)

    def _resolve_mode_for_plugin(self, plugin_id: Optional[str], mode: Optional[str]) -> Optional[str]:
        """Resolve the display mode to use for on-demand activation."""
        # If mode is provided, check if it's actually a valid mode or just the plugin_id
        if mode:
            # If mode matches plugin_id, it's likely the plugin_id was sent as mode
            # Try to resolve it to an actual display mode
            if plugin_id and mode == plugin_id:
                # Mode is the plugin_id, resolve to first available display mode
                if plugin_id in self.plugin_display_modes:
                    modes = self.plugin_display_modes.get(plugin_id, [])
                    if modes:
                        logger.debug("Resolving mode '%s' (plugin_id) to first display mode: %s", mode, modes[0])
                        return modes[0]
            # Check if mode is a valid display mode
            elif mode in self.plugin_modes:
                return mode
            # Mode provided but not valid - might be plugin_id, try to resolve
            elif plugin_id and plugin_id in self.plugin_display_modes:
                modes = self.plugin_display_modes.get(plugin_id, [])
                if modes and mode in modes:
                    return mode
                elif modes:
                    logger.warning("Mode '%s' not found for plugin '%s', using first available: %s", 
                                 mode, plugin_id, modes[0])
                    return modes[0]
            # Mode doesn't match anything, return as-is (will fail validation later)
            return mode

        # No mode provided, resolve from plugin_id
        if plugin_id and plugin_id in self.plugin_display_modes:
            modes = self.plugin_display_modes.get(plugin_id, [])
            if modes:
                return modes[0]
        return plugin_id

    def _populate_on_demand_modes_from_plugin(self) -> None:
        """
        Populate on_demand_modes from the on-demand plugin's display modes.
        Called after plugin loading completes when on-demand state is restored from cache.
        """
        if not self.on_demand_active or not self.on_demand_plugin_id:
            return
        
        plugin_id = self.on_demand_plugin_id
        
        # Get all modes for this plugin
        plugin_modes = self.plugin_display_modes.get(plugin_id, [])
        if not plugin_modes:
            # Fallback: find all modes that belong to this plugin
            plugin_modes = [mode for mode, pid in self.mode_to_plugin_id.items() if pid == plugin_id]
        
        # Filter to only include modes that exist in plugin_modes
        available_plugin_modes = [m for m in plugin_modes if m in self.plugin_modes]
        
        if not available_plugin_modes:
            logger.warning("No valid display modes found for on-demand plugin '%s' after restoration", plugin_id)
            self.on_demand_modes = []
            return
        
        # Prioritize live modes if they exist and have content
        live_modes = [m for m in available_plugin_modes if m.endswith('_live')]
        other_modes = [m for m in available_plugin_modes if not m.endswith('_live')]
        
        # Check if live modes have content
        live_with_content = []
        for live_mode in live_modes:
            plugin_instance = self.plugin_modes.get(live_mode)
            if plugin_instance and hasattr(plugin_instance, 'has_live_content'):
                try:
                    if plugin_instance.has_live_content():
                        live_with_content.append(live_mode)
                except Exception:
                    pass
        
        # Build mode list: live modes with content first, then other modes, then live modes without content
        if live_with_content:
            ordered_modes = live_with_content + other_modes + [m for m in live_modes if m not in live_with_content]
        else:
            # No live content, skip live modes
            ordered_modes = other_modes
        
        if not ordered_modes:
            # Only live modes available but no content - use them anyway
            ordered_modes = live_modes
        
        self.on_demand_modes = ordered_modes
        # Set index to match the restored mode if available, otherwise start at 0
        if self.on_demand_mode and self.on_demand_mode in ordered_modes:
            self.on_demand_mode_index = ordered_modes.index(self.on_demand_mode)
        else:
            self.on_demand_mode_index = 0
        
        logger.info("Populated on-demand modes for plugin '%s': %s (starting at index %d: %s)", 
                   plugin_id, ordered_modes, self.on_demand_mode_index, 
                   ordered_modes[self.on_demand_mode_index] if ordered_modes else 'N/A')

    def _activate_on_demand(self, request: Dict[str, Any]) -> None:
        """Activate on-demand mode for a specific plugin display."""
        plugin_id = request.get('plugin_id')
        mode = request.get('mode')
        resolved_mode = self._resolve_mode_for_plugin(plugin_id, mode)

        if not resolved_mode:
            logger.error("On-demand request missing mode and plugin_id")
            self._set_on_demand_error("missing-mode")
            return

        if resolved_mode not in self.plugin_modes:
            logger.error("Requested on-demand mode '%s' is not available", resolved_mode)
            self._set_on_demand_error("invalid-mode")
            return

        resolved_plugin_id = self.mode_to_plugin_id.get(resolved_mode)
        if not resolved_plugin_id:
            logger.error("Could not resolve plugin for mode '%s'", resolved_mode)
            self._set_on_demand_error("unknown-plugin")
            return

        duration = request.get('duration')
        if duration is not None:
            try:
                duration = float(duration)
                if duration <= 0:
                    duration = None
            except (TypeError, ValueError):
                logger.warning("Invalid duration '%s' in on-demand request", duration)
                duration = None

        pinned = bool(request.get('pinned', False))
        now = time.time()

        if self.available_modes:
            self.rotation_resume_index = self.current_mode_index
        else:
            self.rotation_resume_index = None

        if resolved_mode in self.available_modes:
            self.current_mode_index = self.available_modes.index(resolved_mode)

        # Get all modes for this plugin
        plugin_modes = self.plugin_display_modes.get(resolved_plugin_id, [])
        if not plugin_modes:
            # Fallback: find all modes that belong to this plugin
            plugin_modes = [mode for mode, pid in self.mode_to_plugin_id.items() if pid == resolved_plugin_id]
        
        # Filter to only include modes that exist in plugin_modes
        available_plugin_modes = [m for m in plugin_modes if m in self.plugin_modes]
        
        if not available_plugin_modes:
            logger.error("No valid display modes found for plugin '%s'", resolved_plugin_id)
            self._set_on_demand_error("no-modes")
            return
        
        # Prioritize live modes if they exist and have content
        live_modes = [m for m in available_plugin_modes if m.endswith('_live')]
        other_modes = [m for m in available_plugin_modes if not m.endswith('_live')]
        
        # Check if live modes have content
        live_with_content = []
        for live_mode in live_modes:
            plugin_instance = self.plugin_modes.get(live_mode)
            if plugin_instance and hasattr(plugin_instance, 'has_live_content'):
                try:
                    if plugin_instance.has_live_content():
                        live_with_content.append(live_mode)
                except Exception:
                    pass
        
        # Build mode list: live modes with content first, then other modes, then live modes without content
        if live_with_content:
            ordered_modes = live_with_content + other_modes + [m for m in live_modes if m not in live_with_content]
        else:
            # No live content, skip live modes
            ordered_modes = other_modes
        
        if not ordered_modes:
            # Only live modes available but no content - use them anyway
            ordered_modes = live_modes
        
        self.on_demand_active = True
        self.on_demand_mode = resolved_mode  # Keep for backward compatibility
        self.on_demand_modes = ordered_modes
        self.on_demand_mode_index = 0
        self.on_demand_plugin_id = resolved_plugin_id
        self.on_demand_duration = duration
        self.on_demand_requested_at = now
        self.on_demand_expires_at = (now + duration) if duration else None
        self.on_demand_pinned = pinned
        self.on_demand_status = 'active'
        self.on_demand_last_error = None
        self.on_demand_last_event = 'started'
        self.on_demand_schedule_override = True
        self.force_change = True
        
        # Clear display before switching to on-demand mode
        try:
            self.display_manager.clear()
            self.display_manager.update_display()
        except Exception as e:
            logger.warning("Failed to clear display during on-demand activation: %s", e)
        
        # Start with first mode (or resolved_mode if it's in the list)
        if resolved_mode in ordered_modes:
            self.on_demand_mode_index = ordered_modes.index(resolved_mode)
        self.current_display_mode = ordered_modes[self.on_demand_mode_index]
        logger.info("Activated on-demand for plugin '%s' with %d modes: %s (starting at index %d: %s)", 
                   resolved_plugin_id, len(ordered_modes), ordered_modes, 
                   self.on_demand_mode_index, self.current_display_mode)
        self._publish_on_demand_state()
        
        # Store config for initialization filtering (allows plugin filtering on restart)
        config_data = {
            'plugin_id': resolved_plugin_id,
            'mode': resolved_mode,
            'duration': duration,
            'pinned': pinned,
            'requested_at': now,
            'expires_at': self.on_demand_expires_at
        }
        # Use expiration time as TTL, but cap at 1 hour
        ttl = min(3600, int(duration)) if duration else 3600
        self.cache_manager.set('display_on_demand_config', config_data, ttl=ttl)
        logger.debug("Stored on-demand config for plugin filtering: %s", resolved_plugin_id)

    def _clear_on_demand(self, reason: Optional[str] = None) -> None:
        """Clear on-demand mode and resume normal rotation."""
        if not self.on_demand_active and self.on_demand_status == 'idle':
            if reason == 'requested-stop':
                self.on_demand_last_event = 'stop-request-ignored'  # Already idle
                self._publish_on_demand_state()
            return

        self.on_demand_active = False
        self.on_demand_mode = None
        self.on_demand_modes = []
        self.on_demand_mode_index = 0
        self.on_demand_plugin_id = None
        self.on_demand_duration = None
        self.on_demand_requested_at = None
        self.on_demand_expires_at = None
        self.on_demand_pinned = False
        self.on_demand_status = 'idle'
        self.on_demand_last_error = None
        self.on_demand_last_event = reason or 'cleared'
        self.on_demand_schedule_override = False
        
        # Clear on-demand configuration from cache
        self.cache_manager.clear_cache('display_on_demand_config')

        if self.rotation_resume_index is not None and self.available_modes:
            self.current_mode_index = self.rotation_resume_index % len(self.available_modes)
            self.current_display_mode = self.available_modes[self.current_mode_index]
            logger.info("Resuming rotation from saved index %d: mode '%s'", 
                       self.rotation_resume_index, self.current_display_mode)
        elif self.available_modes:
            # Default to first mode if no resume index
            self.current_mode_index = self.current_mode_index % len(self.available_modes)
            self.current_display_mode = self.available_modes[self.current_mode_index]
            logger.info("Resuming rotation to mode '%s' (index %d)", 
                       self.current_display_mode, self.current_mode_index)
        else:
            logger.warning("No available modes to resume rotation to")

        self.rotation_resume_index = None
        self.force_change = True
        logger.info("✓ ON-DEMAND MODE CLEARED (reason=%s), resuming normal rotation to mode: %s", 
                   reason, self.current_display_mode)
        self._publish_on_demand_state()

    def _check_on_demand_expiration(self) -> None:
        """Expire on-demand mode if duration has elapsed."""
        if not self.on_demand_active:
            return
        
        if self.on_demand_expires_at is None:
            return

        if time.time() >= self.on_demand_expires_at:
            logger.info("On-demand mode '%s' expired (duration: %s seconds)", 
                       self.on_demand_mode, self.on_demand_duration)
            self._clear_on_demand(reason='expired')
    
    def _log_memory_stats_if_due(self) -> None:
        """Log memory statistics if logging is enabled and interval has elapsed."""
        if not self._enable_memory_logging:
            return
        
        current_time = time.time()
        if (current_time - self._last_memory_log) < self._memory_log_interval:
            return
        
        self._last_memory_log = current_time
        
        try:
            # Log cache manager memory stats
            if hasattr(self.cache_manager, 'log_memory_cache_stats'):
                self.cache_manager.log_memory_cache_stats()
            
            # Log background service memory stats if available
            try:
                from src.background_data_service import get_background_service
                bg_service = get_background_service()
                if bg_service and hasattr(bg_service, 'log_memory_stats'):
                    bg_service.log_memory_stats()
            except Exception:
                pass  # Background service may not be initialized
            
            # Log deferred updates stats
            if hasattr(self.display_manager, '_scrolling_state'):
                deferred_count = len(self.display_manager._scrolling_state.get('deferred_updates', []))
                if deferred_count > 0:
                    logger.info(f"Deferred Updates Queue: {deferred_count} pending updates")
            
        except Exception as e:
            logger.debug(f"Error logging memory stats: {e}")

    def _apply_live_priority(self, live_priority_mode):
        """Switch to a live-priority mode, or resume rotation when it ends.

        When a live-priority plugin preempts the rotation, the position the
        rotation had reached is saved so that, once live priority ends, the
        rotation resumes from there instead of continuing after the live
        plugin's mode (which would skip every mode between the two). The save
        happens only on the initial switch, not on each re-check while the
        live hold continues.
        """
        if live_priority_mode:
            if self.current_display_mode != live_priority_mode:
                logger.info("Live content detected - switching immediately to %s", live_priority_mode)
                if self._live_resume_index is None:
                    self._live_resume_index = self.current_mode_index
                self.current_display_mode = live_priority_mode
                self.force_change = True
                # Update mode index to match the new mode
                try:
                    self.current_mode_index = self.available_modes.index(live_priority_mode)
                except ValueError:
                    pass
        elif self._live_resume_index is not None and self.available_modes:
            # Live priority ended — resume rotation where it was interrupted.
            self.current_mode_index = self._live_resume_index % len(self.available_modes)
            self.current_display_mode = self.available_modes[self.current_mode_index]
            self.force_change = True
            logger.info("Live priority ended - resuming rotation at %s", self.current_display_mode)
            self._live_resume_index = None

    def _collect_live_modes(self):
        """Return every currently live-priority mode, in registration order.

        Scans all registered plugin modes; for each plugin that has live
        priority *and* live content, collects the specific live mode(s) it
        reports via get_live_modes() (only those actually registered), falling
        back to the scanned mode name when it ends in '_live'. Deduplicated,
        preserving order. A plugin registered under several mode keys (the
        sports plugins register one per league) contributes each live mode once.
        """
        live = []
        seen = set()
        for mode_name, plugin_instance in self.plugin_modes.items():
            if not (hasattr(plugin_instance, 'has_live_priority')
                    and hasattr(plugin_instance, 'has_live_content')):
                continue
            try:
                if not (plugin_instance.has_live_priority()
                        and plugin_instance.has_live_content()):
                    continue
                resolved = []
                if hasattr(plugin_instance, 'get_live_modes'):
                    for suggested_mode in (plugin_instance.get_live_modes() or []):
                        if suggested_mode in self.plugin_modes:
                            resolved.append(suggested_mode)
                if not resolved and mode_name.endswith('_live'):
                    resolved.append(mode_name)
                for m in resolved:
                    if m not in seen:
                        seen.add(m)
                        live.append(m)
            except Exception as e:
                logger.warning("Error checking live priority for %s: %s", mode_name, e)
        return live

    def _check_live_priority(self, advance=False):
        """Return the live-priority mode to display, or None if nothing is live.

        When several plugins report live content at once (e.g. a baseball game
        and a soccer match), this round-robins between them so the display
        alternates each dwell instead of pinning to whichever plugin is first in
        registration order.

        advance=False (default): a non-advancing peek — returns the live mode
        already on screen if it is still live, otherwise the first live mode.
        Used by the Vegas coordinator and the vegas-active check, which only
        need to know whether *any* game is live (and must not spin the cursor).

        advance=True: the rotation pick — returns the live mode *after* the one
        currently shown, so each dwell advances to the next live game. The
        currently-displayed mode is the cursor, so this stays correct as games
        start and end (no separate index to keep in sync).
        """
        live_modes = self._collect_live_modes()
        if not live_modes:
            return None
        if self.current_display_mode in live_modes:
            if advance:
                idx = live_modes.index(self.current_display_mode)
                return live_modes[(idx + 1) % len(live_modes)]
            return self.current_display_mode
        return live_modes[0]

    def run(self):
        """Run the display controller, switching between displays."""
        if not self.available_modes:
            logger.warning(
                "No display modes are enabled at startup; idling until a "
                "plugin is enabled via the web UI."
            )

        try:
            # Initialize with cached data for fast startup - let background updates refresh naturally
            logger.info("Starting display with cached data (fast startup mode)")
            self.current_display_mode = self.available_modes[self.current_mode_index] if self.available_modes else 'none'
            logger.info(f"Initial mode set to: {self.current_display_mode} (index: {self.current_mode_index}, total modes: {len(self.available_modes)})")
            
            while True:
                # Apply plugin enable/disable edits saved via the web UI. The
                # config-watcher thread only sets the flag; loading/unloading and
                # rebuilding available_modes happens here on the render thread so
                # it can't race with rendering. Deferred while on-demand is active
                # (the flag stays set) so we don't fight its temporary-enable.
                if self._pending_plugin_reconcile and not self.on_demand_active:
                    # Only clear the flag on success -- a retryable failure
                    # (e.g. discovery) leaves it set so the request isn't lost.
                    if self._reconcile_enabled_plugins():
                        self._pending_plugin_reconcile = False

                if not self.available_modes:
                    # Nothing to render yet. Re-check _pending_plugin_reconcile
                    # every ~1s (rather than a long sleep) so enabling a plugin
                    # via the web UI is picked up about as promptly as it would
                    # be once modes exist and the loop is iterating per-frame.
                    self._sleep_with_plugin_updates(1)
                    continue

                # Handle on-demand commands before rendering
                self._poll_on_demand_requests()
                self._check_on_demand_expiration()
                self._tick_plugin_updates()
                
                # Clean up expired WiFi status messages
                self._cleanup_expired_wifi_status()
                
                # Periodic memory monitoring (if enabled)
                if self._enable_memory_logging:
                    self._log_memory_stats_if_due()

                # Check the schedule
                self._check_schedule()
                if self.on_demand_active and not self.is_display_active:
                    if not self.on_demand_schedule_override:
                        logger.info("On-demand override keeping display active during scheduled downtime")
                    self.on_demand_schedule_override = True
                    self.is_display_active = True
                elif not self.on_demand_active and self.on_demand_schedule_override:
                    self.on_demand_schedule_override = False

                # Check dim schedule and apply brightness (only when display is active)
                if self.is_display_active:
                    target_brightness = self._check_dim_schedule()
                    if target_brightness != self.current_brightness:
                        if self.display_manager.set_brightness(target_brightness):
                            self.current_brightness = target_brightness

                if not self.is_display_active:
                    # Clear display when schedule makes it inactive to ensure blank screen
                    # (not showing initialization screen)
                    try:
                        self.display_manager.clear()
                        self.display_manager.update_display()
                    except Exception as e:
                        logger.debug(f"Error clearing display when inactive: {e}")
                    
                    logger.info(f"Display not active (is_display_active={self.is_display_active}), sleeping...")
                    self._sleep_with_plugin_updates(60)
                    continue
                
                logger.debug("Display active, processing mode: %s", self.current_display_mode)
                
                # Plugins update on their own schedules - no forced sync updates needed
                # Each plugin has its own update_interval and background services
                
                # Multi-display sync: follower mode — render frames received from leader.
                # Plugin update() threads still run (via _tick_plugin_updates above) so
                # data is fresh when we return to standalone if the leader goes offline.
                if self.sync_manager.is_follower_active():
                    # Dead-reckoning follower render:
                    # Advance local position at configured speed each tick; snap or
                    # gently correct toward received scroll_x to absorb UDP jitter.
                    _now_dr = time.perf_counter()
                    _dt = _now_dr - getattr(self, '_follower_dr_last_t', _now_dr)
                    self._follower_dr_last_t = _now_dr

                    vc = getattr(self, 'vegas_coordinator', None)
                    rp = vc.render_pipeline if (vc and vc.render_pipeline) else None
                    width = self.display_manager.width

                    # Opt #2: use pre-cached scroll speed (constant for the run)
                    vegas_speed = self._scroll_speed
                    local_x = getattr(self, '_follower_local_x', None)
                    if local_x is None:
                        local_x = float(width)  # safe start (past pre-roll guard)
                    local_x += vegas_speed * _dt

                    # Pull latest position from leader (may be None if no packet yet)
                    scroll_x = self.sync_manager.get_latest_scroll_x()
                    if scroll_x is not None:
                        diff = scroll_x - local_x
                        total_w = (
                            rp.scroll_helper.total_scroll_width
                            if rp and rp.scroll_helper.total_scroll_width
                            else width * 4
                        )
                        if abs(diff) > total_w * 0.5:
                            # Large jump → cycle reset, snap immediately
                            local_x = float(scroll_x)
                            self._follower_pending_new_image = True
                        elif abs(diff) > 10:
                            # Moderate drift → 20% correction per tick
                            local_x += diff * 0.20
                        else:
                            # Near → gentle 5% correction
                            local_x += diff * 0.05

                    self._follower_local_x = local_x

                    if rp and rp.scroll_helper.cached_image is not None:
                        sync_cfg = self.config.get("sync", {})
                        sign = -1 if sync_cfg.get("follower_position", "left") == "left" else 1
                        # Hold last frame until TCP image arrives after cycle reset
                        if not getattr(self, "_follower_pending_new_image", False):
                            if local_x >= width:
                                rp.scroll_helper.scroll_position = local_x + sign * width
                                frame = rp.scroll_helper.get_visible_portion()
                                if frame is not None:
                                    self._follower_last_frame = frame
                    elif scroll_x is None:
                        # Fallback: pixel frame before first scroll_x arrives
                        frame = self.sync_manager.get_latest_frame()
                        if frame is not None:
                            self._follower_last_frame = frame

                    display_frame = getattr(self, '_follower_last_frame', None)
                    if display_frame is not None:
                        self.display_manager.image = display_frame
                        self.display_manager._sync_render_allowed = True
                        self.display_manager.update_display()
                        self.display_manager._sync_render_allowed = False
                    # Precision deadline timer — keeps render at exactly 60fps
                    _deadline = getattr(self, '_follower_deadline', None)
                    _now = time.perf_counter()
                    if _deadline is None or _now > _deadline + 0.1:
                        _deadline = _now
                    _deadline += 1.0 / 60
                    self._follower_deadline = _deadline
                    _sleep = _deadline - time.perf_counter()
                    if _sleep > 0:
                        time.sleep(_sleep)
                    continue

                # Process any deferred updates that may have accumulated
                # This also cleans up expired updates to prevent memory leaks
                self.display_manager.process_deferred_updates()

                # Check for WiFi status message (interrupts normal rotation, but respects on-demand)
                # Priority: on-demand > wifi-status > live-priority > normal rotation
                wifi_status_data = None
                if not self.on_demand_active:
                    wifi_status_data = self._check_wifi_status_message()
                    if wifi_status_data:
                        # Display WiFi status message and skip normal rotation
                        if self._display_wifi_status_message(wifi_status_data):
                            # Sleep for a short time to show the message
                            # Use a short sleep to allow for quick updates
                            self._sleep_with_plugin_updates(0.5)
                            continue  # Skip to next iteration, don't rotate
                        else:
                            # Display failed, clear the status and continue normally
                            wifi_status_data = None

                # Check for live priority content and switch to it immediately.
                # advance=True so multiple simultaneously-live games take turns
                # (round-robin) instead of pinning to the first plugin.
                if not self.on_demand_active and not wifi_status_data:
                    live_priority_mode = self._check_live_priority(advance=True)
                    self._apply_live_priority(live_priority_mode)

                # Vegas scroll mode - continuous ticker across all plugins
                # Priority: on-demand > wifi-status > live-priority > vegas > normal rotation
                if self._is_vegas_mode_active() and not wifi_status_data:
                    live_mode = self._check_live_priority()
                    if not live_mode:
                        try:
                            # Run Vegas mode iteration
                            if self.vegas_coordinator.run_iteration():
                                # Vegas completed an iteration, continue to next loop
                                continue
                            else:
                                # Vegas was interrupted (live priority), fall through to normal handling
                                logger.debug("Vegas mode interrupted, falling back to normal rotation")
                        except Exception:
                            logger.exception("Vegas mode error")
                            # Fall through to normal rotation on error

                if self.on_demand_active:
                    # Guard against empty on_demand_modes
                    if not self.on_demand_modes:
                        logger.warning("On-demand active but no modes available, clearing on-demand mode")
                        self._clear_on_demand(reason='no-modes-available')
                        active_mode = self.current_display_mode
                    else:
                        # Rotate through on-demand plugin modes
                        if self.on_demand_mode_index < len(self.on_demand_modes):
                            active_mode = self.on_demand_modes[self.on_demand_mode_index]
                            if self.current_display_mode != active_mode:
                                self.current_display_mode = active_mode
                                self.force_change = True
                        else:
                            # Reset to first mode if index is out of bounds
                            self.on_demand_mode_index = 0
                            active_mode = self.on_demand_modes[0]
                            if self.current_display_mode != active_mode:
                                self.current_display_mode = active_mode
                                self.force_change = True
                else:
                    active_mode = self.current_display_mode

                if self._active_dynamic_mode and self._active_dynamic_mode != active_mode:
                    self._active_dynamic_mode = None

                manager_to_display = None
                
                logger.info("Processing mode: %s (%d available)", active_mode, len(self.available_modes))
                logger.debug("Loaded plugin modes: %s", list(self.plugin_modes.keys()))
                
                # Handle plugin-based display modes
                if active_mode in self.plugin_modes:
                    plugin_instance = self.plugin_modes[active_mode]
                    if hasattr(plugin_instance, 'display'):
                        # Check plugin health before attempting to display
                        plugin_id = getattr(plugin_instance, 'plugin_id', active_mode)
                        should_skip = False
                        if self.plugin_manager and hasattr(self.plugin_manager, 'health_tracker') and self.plugin_manager.health_tracker:
                            should_skip = self.plugin_manager.health_tracker.should_skip_plugin(plugin_id)
                            if should_skip:
                                logger.info("Skipping plugin %s due to circuit breaker (mode: %s)", plugin_id, active_mode)
                                display_result = False
                                # Skip to next mode - let existing logic handle it
                                manager_to_display = None
                        
                        if not should_skip:
                            manager_to_display = plugin_instance
                            logger.debug(f"Found plugin manager for mode {active_mode}: {type(plugin_instance).__name__}")
                    else:
                        logger.warning(f"Plugin {active_mode} found but has no display() method")
                else:
                    logger.warning(f"Mode {active_mode} not found in plugin_modes (available: {list(self.plugin_modes.keys())})")
                
                # Display the current mode
                display_result = True  # Default to True for backward compatibility
                display_failed_due_to_exception = False  # Track if False was due to exception vs no content
                if not manager_to_display:
                    logger.warning(f"No plugin manager found for mode {active_mode} - skipping display and rotating to next mode")
                    display_result = False
                elif manager_to_display:
                    plugin_id = getattr(manager_to_display, 'plugin_id', active_mode)
                    try:
                        logger.debug(f"Calling display() for {active_mode} with force_clear={self.force_change}")
                        can_display = False
                        if hasattr(manager_to_display, 'display'):
                            # Opt #1: look up (or compute once) whether display() accepts display_mode
                            _cache_key = plugin_id
                            if _cache_key not in self._plugin_accepts_display_mode:
                                import inspect as _inspect
                                self._plugin_accepts_display_mode[_cache_key] = (
                                    'display_mode' in _inspect.signature(manager_to_display.display).parameters
                                )
                            _accepts_display_mode = self._plugin_accepts_display_mode[_cache_key]

                            pm = self.plugin_manager
                            display_lock = None
                            can_display = True
                            if pm and hasattr(pm, 'get_plugin_lock'):
                                display_lock = pm.get_plugin_lock(plugin_id)
                                can_display = display_lock.acquire(blocking=False)

                            if not can_display:
                                # update() in flight on the worker — hold
                                # the last frame; not a plugin failure
                                result = True
                            elif pm and hasattr(pm, 'plugin_executor'):
                                # PluginExecutor's own thread.join(timeout) can
                                # return before the real display() call
                                # finishes (a lingering daemon thread keeps
                                # running it) -- so the lock is released from
                                # inside the wrapped call itself, whichever
                                # thread actually finishes it, rather than
                                # here when this dispatch merely returns.
                                release_guard = threading.Lock()
                                released = {'done': False}

                                def _release_display_lock():
                                    with release_guard:
                                        if released['done']:
                                            return
                                        released['done'] = True
                                    if display_lock is not None:
                                        display_lock.release()

                                if _accepts_display_mode:
                                    def _display_target(display_mode=None, force_clear=False):
                                        try:
                                            return manager_to_display.display(
                                                display_mode=display_mode, force_clear=force_clear)
                                        finally:
                                            _release_display_lock()
                                else:
                                    def _display_target(force_clear=False):
                                        try:
                                            return manager_to_display.display(force_clear=force_clear)
                                        finally:
                                            _release_display_lock()

                                try:
                                    result = self.plugin_manager.plugin_executor.execute_display(
                                        types.SimpleNamespace(display=_display_target),
                                        plugin_id,
                                        force_clear=self.force_change,
                                        display_mode=active_mode if _accepts_display_mode else None
                                    )
                                except Exception:  # pragma: no cover - defensive;
                                    # execute_display catches everything
                                    # internally, but guarantee the lock is
                                    # never leaked if something unexpected
                                    # slips through.
                                    _release_display_lock()
                                    raise
                                # execute_display returns bool, convert to expected format
                                if result:
                                    result = True  # Success
                                else:
                                    result = False  # Failed
                            else:
                                # Fallback to direct call if executor not available
                                try:
                                    if _accepts_display_mode:
                                        result = manager_to_display.display(display_mode=active_mode, force_clear=self.force_change)
                                    else:
                                        result = manager_to_display.display(force_clear=self.force_change)
                                finally:
                                    if display_lock is not None:
                                        display_lock.release()
                            
                            logger.debug(f"display() returned: {result} (type: {type(result)})")
                            # Check if display() returned a boolean (new behavior)
                            if isinstance(result, bool):
                                display_result = result
                                if not display_result:
                                    logger.info("Plugin %s display() returned False for mode %s", plugin_id, active_mode)
                        
                        # Record success only when display() actually ran this
                        # frame -- a skipped frame (lock busy) held the last
                        # frame, not a real success, and must not clear
                        # force_change or the pending mode-switch clear will
                        # be lost when display() finally does run.
                        if can_display:
                            if self.plugin_manager and hasattr(self.plugin_manager, 'health_tracker') and self.plugin_manager.health_tracker:
                                self.plugin_manager.health_tracker.record_success(plugin_id)
                            self.force_change = False
                    except Exception as exc:  # pylint: disable=broad-except
                        logger.exception("Error displaying %s", self.current_display_mode)
                        # Record failure
                        if self.plugin_manager and hasattr(self.plugin_manager, 'health_tracker') and self.plugin_manager.health_tracker:
                            self.plugin_manager.health_tracker.record_failure(plugin_id, exc)
                        self.force_change = True
                        display_result = False
                        display_failed_due_to_exception = True  # Mark that this was an exception, not just no content
                
                # If display() returned False, skip to next mode immediately
                if not display_result:
                    if self.on_demand_active:
                        # Skip to next on-demand mode if no content
                        logger.info("No content for on-demand mode %s, skipping to next mode", active_mode)
                        
                        # Guard against empty on_demand_modes to prevent ZeroDivisionError
                        if not self.on_demand_modes or len(self.on_demand_modes) == 0:
                            logger.warning("On-demand active but no modes configured, skipping rotation")
                            logger.debug("on_demand_modes is empty, cannot rotate to next mode")
                            # Skip rotation and continue to next iteration
                            continue
                        
                        # Move to next mode in rotation (only if on_demand_modes is non-empty)
                        self.on_demand_mode_index = (self.on_demand_mode_index + 1) % len(self.on_demand_modes)
                        next_mode = self.on_demand_modes[self.on_demand_mode_index]
                        
                        # Only log when next_mode is valid
                        if next_mode:
                            logger.info("Rotating to next on-demand mode: %s (index %d/%d)", 
                                       next_mode, self.on_demand_mode_index, len(self.on_demand_modes))
                            self.current_display_mode = next_mode
                            self.force_change = True
                            self._publish_on_demand_state()
                            continue
                        else:
                            logger.warning("Next on-demand mode is invalid, skipping rotation")
                            continue
                    else:
                        logger.info("No content to display for %s, skipping to next mode", active_mode)
                        # Don't clear display when immediately moving to next mode - this causes black flashes
                        # The next mode will render immediately with force_clear=True, which is sufficient
                        
                        # Only skip all modes for this plugin if there was an exception (broken plugin)
                        # If it's just "no content", we should still try other modes (recent, upcoming)
                        if display_failed_due_to_exception:
                            current_plugin_id = self.mode_to_plugin_id.get(active_mode)
                            if current_plugin_id and current_plugin_id in self.plugin_display_modes:
                                plugin_modes = self.plugin_display_modes[current_plugin_id]
                                logger.warning("Skipping all %d mode(s) for plugin %s due to exception: %s", 
                                              len(plugin_modes), current_plugin_id, plugin_modes)
                                # Find the next mode that's not from this plugin
                                next_index = self.current_mode_index
                                attempts = 0
                                max_attempts = len(self.available_modes)
                                found_next = False
                                while attempts < max_attempts:
                                    next_index = (next_index + 1) % len(self.available_modes)
                                    next_mode = self.available_modes[next_index]
                                    next_plugin_id = self.mode_to_plugin_id.get(next_mode)
                                    if next_plugin_id != current_plugin_id:
                                        self.current_mode_index = next_index
                                        self.current_display_mode = next_mode
                                        self.last_mode_change = time.time()
                                        self.force_change = True
                                        logger.info("Switching to mode: %s (skipped plugin %s due to exception)", 
                                                  self.current_display_mode, current_plugin_id)
                                        found_next = True
                                        break
                                    attempts += 1
                                # If we couldn't find a different plugin, just advance normally
                                if not found_next:
                                    logger.warning("All remaining modes are from plugin %s, advancing normally", current_plugin_id)
                                    # Will fall through to normal rotation logic below
                                else:
                                    # Already set next mode, skip to next iteration
                                    continue
                        # If no exception (just no content), fall through to normal rotation logic
                        # This allows trying other modes (recent, upcoming) from the same plugin
                else:
                    # Get base duration for current mode
                    base_duration = self._get_display_duration(active_mode)
                    dynamic_enabled = (
                        manager_to_display and self._plugin_supports_dynamic(manager_to_display)
                    )
                    
                    # Log dynamic duration status
                    if dynamic_enabled:
                        logger.debug(
                            "Dynamic duration enabled for mode %s (plugin: %s)",
                            active_mode,
                            getattr(manager_to_display, "plugin_id", "unknown"),
                        )

                    # Only reset cycle when actually switching to a different dynamic mode.
                    # This prevents resetting the cycle when staying on the same live priority mode
                    # with force_change=True (which is used for display clearing, not cycle resets).
                    if dynamic_enabled and self._active_dynamic_mode != active_mode:
                        if self._active_dynamic_mode is not None:
                            logger.debug(
                                "Switching dynamic duration mode from %s to %s - resetting cycle",
                                self._active_dynamic_mode,
                                active_mode,
                            )
                        else:
                            logger.debug(
                                "Starting dynamic duration mode %s - resetting cycle",
                                active_mode,
                            )
                        self._plugin_reset_cycle(manager_to_display)
                        self._active_dynamic_mode = active_mode
                    elif not dynamic_enabled and self._active_dynamic_mode == active_mode:
                        logger.debug(
                            "Dynamic duration disabled for mode %s - clearing active dynamic mode",
                            active_mode,
                        )
                        self._active_dynamic_mode = None

                    min_duration = base_duration
                    if dynamic_enabled:
                        # Try to get plugin-calculated cycle duration first
                        logger.debug("Attempting to get cycle duration for mode %s", active_mode)
                        plugin_cycle_duration = self._plugin_cycle_duration(manager_to_display, active_mode)
                        logger.debug("Got cycle duration: %s", plugin_cycle_duration)
                        
                        # Get caps for validation
                        plugin_cap = self._plugin_dynamic_cap(manager_to_display)
                        global_cap = self._get_global_dynamic_cap()
                        cap_candidates = [
                            cap
                            for cap in (plugin_cap, global_cap)
                            if cap is not None and cap > 0
                        ]
                        if cap_candidates:
                            chosen_cap = min(cap_candidates)
                        else:
                            chosen_cap = DEFAULT_DYNAMIC_DURATION_CAP
                        
                        # Validate and sanitize durations
                        if min_duration <= 0:
                            logger.warning(
                                "Invalid min_duration %s for mode %s, using default 15s",
                                min_duration,
                                active_mode,
                            )
                            min_duration = 15.0
                        
                        if chosen_cap <= 0:
                            logger.warning(
                                "Invalid dynamic duration cap %s for mode %s, using default %ds",
                                chosen_cap,
                                active_mode,
                                DEFAULT_DYNAMIC_DURATION_CAP,
                            )
                            chosen_cap = DEFAULT_DYNAMIC_DURATION_CAP
                        
                        # Use plugin-calculated duration if available, capped by max
                        if plugin_cycle_duration is not None and plugin_cycle_duration > 0:
                            # Plugin provided a calculated duration - use it but respect cap
                            target_duration = min(plugin_cycle_duration, chosen_cap)
                            max_duration = target_duration
                            logger.info(
                                "Using plugin-calculated cycle duration for %s: %.1fs (capped at %.1fs)",
                                active_mode,
                                plugin_cycle_duration,
                                chosen_cap,
                            )
                        else:
                            # No calculated duration - use cap as max
                            max_duration = chosen_cap
                        
                        # Ensure max_duration >= min_duration
                        max_duration = max(min_duration, max_duration)
                        
                        if max_duration < min_duration:
                            logger.warning(
                                "max_duration (%s) < min_duration (%s) for mode %s, adjusting max to min",
                                max_duration,
                                min_duration,
                                active_mode,
                            )
                            max_duration = min_duration
                    else:
                        max_duration = base_duration
                        
                        # Validate base duration even when not dynamic
                        if max_duration <= 0:
                            logger.warning(
                                "Invalid base_duration %s for mode %s, using default 15s",
                                max_duration,
                                active_mode,
                            )
                            max_duration = 15.0

                    if self.on_demand_active:
                        remaining = self._get_on_demand_remaining()
                        if remaining is not None:
                            min_duration = min(min_duration, remaining)
                            max_duration = min(max_duration, remaining)
                            if max_duration <= 0:
                                self._check_on_demand_expiration()
                                continue

                    # For plugins, call display multiple times to allow game rotation
                    if manager_to_display and hasattr(manager_to_display, 'display'):
                        # High-FPS decision, in precedence order:
                        # 1. A plugin that declares needs_high_fps knows best
                        #    (e.g. static-image sets it False for still PNGs,
                        #    True for animated GIFs).
                        # 2. Back-compat: older static-image versions without
                        #    the attribute keep the historical forced high-FPS
                        #    (GIF support).
                        # 3. Otherwise scrolling plugins get high FPS.
                        plugin_id = getattr(manager_to_display, 'plugin_id', None)
                        declared = getattr(manager_to_display, 'needs_high_fps', None)
                        if declared is not None:
                            needs_high_fps = bool(declared)
                            logger.debug(
                                "[DisplayController] FPS check for %s (plugin=%s) - "
                                "plugin declares needs_high_fps=%s",
                                active_mode, plugin_id, needs_high_fps)
                        elif plugin_id == 'static-image':
                            needs_high_fps = True
                            logger.debug("FPS check - static-image plugin: forcing high-FPS mode for GIF support")
                        else:
                            has_enable_scrolling = hasattr(manager_to_display, 'enable_scrolling')
                            enable_scrolling_value = getattr(manager_to_display, 'enable_scrolling', False)
                            needs_high_fps = has_enable_scrolling and enable_scrolling_value
                            logger.info(
                                "FPS check for %s - has_enable_scrolling: %s, enable_scrolling_value: %s, needs_high_fps: %s",
                                active_mode,
                                has_enable_scrolling,
                                enable_scrolling_value,
                                needs_high_fps,
                            )

                        target_duration = max_duration
                        start_time = time.time()

                        def _should_exit_dynamic(elapsed_time: float) -> bool:
                            if not dynamic_enabled:
                                return False
                            # Add small grace period (0.5s) after min_duration to prevent
                            # premature exits due to timing issues
                            grace_period = 0.5
                            if elapsed_time < min_duration + grace_period:
                                logger.debug(
                                    "_should_exit_dynamic: elapsed %.2fs < min_duration %.2fs + grace %.2fs, returning False",
                                    elapsed_time,
                                    min_duration,
                                    grace_period,
                                )
                                return False
                            cycle_complete = self._plugin_cycle_complete(manager_to_display)
                            logger.debug(
                                "_should_exit_dynamic: elapsed %.2fs >= min %.2fs, cycle_complete=%s, returning %s",
                                elapsed_time,
                                min_duration + grace_period,
                                cycle_complete,
                                cycle_complete,
                            )
                            if cycle_complete:
                                logger.debug(
                                    "Cycle complete detected for %s after %.2fs (min: %.2fs, grace: %.2fs)",
                                    active_mode,
                                    elapsed_time,
                                    min_duration,
                                    grace_period,
                                )
                            return cycle_complete

                        loop_completed = False

                        if needs_high_fps:
                            # Ultra-smooth FPS for scrolling plugins (8ms = 125 FPS)
                            display_interval = 0.008
                            logger.debug(
                                "Entering high-FPS loop for %s with display_interval=%.3fs (%.1f FPS)",
                                active_mode,
                                display_interval,
                                1.0 / display_interval
                            )

                            while True:
                                try:
                                    with self._display_lock_or_skip(plugin_id) as can_display:
                                        if can_display:
                                            # Pass display_mode to maintain sticky manager state
                                            if _accepts_display_mode:
                                                result = manager_to_display.display(display_mode=active_mode, force_clear=False)
                                            else:
                                                result = manager_to_display.display(force_clear=False)
                                        else:
                                            # update() in flight — hold the last frame
                                            result = True
                                    if isinstance(result, bool) and not result:
                                        logger.debug("Display returned False, breaking early")
                                        break
                                except Exception:  # pylint: disable=broad-except
                                    logger.exception("Error during display update")

                                # Multi-display sync: send follower frame after each render
                                self._send_follower_frame(manager_to_display)

                                time.sleep(display_interval)
                                self._tick_plugin_updates()
                                self._poll_on_demand_requests()
                                self._check_on_demand_expiration()

                                if self.current_display_mode != active_mode:
                                    logger.debug("Mode changed during high-FPS loop, breaking early")
                                    break

                                elapsed = time.time() - start_time
                                if elapsed >= target_duration:
                                    logger.debug(
                                        "Reached high-FPS target duration %.2fs for mode %s",
                                        target_duration,
                                        active_mode,
                                    )
                                    loop_completed = True
                                    break
                                if _should_exit_dynamic(elapsed):
                                    logger.debug(
                                        "Dynamic duration cycle complete for %s after %.2fs",
                                        active_mode,
                                        elapsed,
                                    )
                                    loop_completed = True
                                    break
                        else:
                            # Normal FPS for other plugins (1 second)
                            display_interval = 1.0
                            logger.debug(
                                "Entering normal FPS loop for %s with display_interval=%.3fs",
                                active_mode,
                                display_interval
                            )

                            while True:
                                time.sleep(display_interval)
                                self._tick_plugin_updates()

                                elapsed = time.time() - start_time
                                if elapsed >= target_duration:
                                    logger.debug(
                                        "Reached standard target duration %.2fs for mode %s",
                                        target_duration,
                                        active_mode,
                                    )
                                    loop_completed = True
                                    break

                                try:
                                    with self._display_lock_or_skip(plugin_id) as can_display:
                                        if can_display:
                                            # Pass display_mode to maintain sticky manager state
                                            if _accepts_display_mode:
                                                result = manager_to_display.display(display_mode=active_mode, force_clear=False)
                                            else:
                                                result = manager_to_display.display(force_clear=False)
                                        else:
                                            # update() in flight — hold the last frame
                                            result = True
                                    if isinstance(result, bool) and not result:
                                        # For dynamic duration plugins, don't exit on False - keep looping
                                        # until cycle is complete or max duration is reached
                                        if not dynamic_enabled:
                                            logger.info("Display returned False for %s (no dynamic duration), breaking early", active_mode)
                                            break
                                        else:
                                            logger.debug("Display returned False for %s (dynamic duration enabled), continuing loop", active_mode)
                                except Exception:  # pylint: disable=broad-except
                                    logger.exception("Error during display update")

                                # Multi-display sync: send follower frame after each render
                                self._send_follower_frame(manager_to_display)

                                self._poll_on_demand_requests()
                                self._check_on_demand_expiration()
                                if self.current_display_mode != active_mode:
                                    logger.info("Mode changed during display loop from %s to %s, breaking early", active_mode, self.current_display_mode)
                                    break

                                if _should_exit_dynamic(elapsed):
                                    logger.info(
                                        "Dynamic duration cycle complete for %s after %.2fs",
                                        active_mode,
                                        elapsed,
                                    )
                                    loop_completed = True
                                    break

                        # LOAD-BEARING: if current_display_mode changed mid-loop (on-demand
                        # activation, live priority, etc.), restart the main loop now instead
                        # of falling into the "honour minimum duration" sleep below. That sleep
                        # can run for up to the *previous* mode's full display_duration (default
                        # 30s) and doesn't poll on-demand requests or re-check the mode, so a
                        # freshly-requested mode switch would sit invisible for up to 30s — or
                        # get clobbered by a queued stop request — before ever rendering.
                        #
                        # This guard was added in #298 (live priority interrupting long display
                        # durations) and was accidentally dropped in #330 as collateral damage of
                        # an unrelated time.monotonic() -> time.time() cleanup in the same hunk.
                        # Removing it again will silently reintroduce both issues. _activate_on_demand
                        # already sets force_change=True and clears the display, so the next loop
                        # iteration renders the new mode immediately.
                        if self.current_display_mode != active_mode:
                            continue

                        # Ensure we honour minimum duration when not dynamic and loop ended early
                        if (
                            not dynamic_enabled
                            and not loop_completed
                            and not needs_high_fps
                        ):
                            elapsed = time.time() - start_time
                            remaining_sleep = max(0.0, max_duration - elapsed)
                            if remaining_sleep > 0:
                                self._sleep_with_plugin_updates(remaining_sleep)

                        if dynamic_enabled:
                            elapsed_total = time.time() - start_time
                            cycle_done = self._plugin_cycle_complete(manager_to_display)
                            
                            # Log cycle completion status and metrics
                            if cycle_done:
                                logger.info(
                                    "Dynamic duration cycle completed for %s after %.2fs (target: %.2fs, min: %.2fs, max: %.2fs)",
                                    active_mode,
                                    elapsed_total,
                                    target_duration,
                                    min_duration,
                                    max_duration,
                                )
                            elif elapsed_total >= max_duration:
                                logger.info(
                                    "Dynamic duration cap reached before cycle completion for %s (%.2fs/%ds, min: %.2fs)",
                                    active_mode,
                                    elapsed_total,
                                    int(max_duration),
                                    min_duration,
                                )
                            else:
                                logger.debug(
                                    "Dynamic duration cycle in progress for %s: %.2fs elapsed (target: %.2fs, min: %.2fs, max: %.2fs)",
                                    active_mode,
                                    elapsed_total,
                                    target_duration,
                                    min_duration,
                                    max_duration,
                                )
                    else:
                        # For non-plugin modes, use the original behavior
                        self._sleep_with_plugin_updates(max_duration)
                
                # Move to next mode
                if self.on_demand_active:
                    # Guard against empty on_demand_modes to prevent ZeroDivisionError
                    if not self.on_demand_modes:
                        logger.warning("On-demand active but no modes available, clearing on-demand mode")
                        self._clear_on_demand(reason='no-modes-available')
                        # Fall through to normal rotation
                    else:
                        # Rotate to next on-demand mode
                        self.on_demand_mode_index = (self.on_demand_mode_index + 1) % len(self.on_demand_modes)
                        next_mode = self.on_demand_modes[self.on_demand_mode_index]
                        logger.info("Rotating to next on-demand mode: %s (index %d/%d)", 
                                   next_mode, self.on_demand_mode_index, len(self.on_demand_modes))
                        self.current_display_mode = next_mode
                        self.force_change = True
                        self._publish_on_demand_state()
                        continue

                # Check for live priority - don't rotate if current plugin has live content
                should_rotate = True
                if active_mode in self.plugin_modes:
                    plugin_instance = self.plugin_modes[active_mode]
                    if hasattr(plugin_instance, 'has_live_priority') and hasattr(plugin_instance, 'has_live_content'):
                        try:
                            if plugin_instance.has_live_priority() and plugin_instance.has_live_content():
                                logger.info("Live priority active for %s - staying on current mode", active_mode)
                                should_rotate = False
                        except Exception as e:
                            logger.warning("Error checking live priority for %s: %s", active_mode, e)
                
                if should_rotate and self.available_modes:
                    self.current_mode_index = (self.current_mode_index + 1) % len(self.available_modes)
                    self.current_display_mode = self.available_modes[self.current_mode_index]
                    self.last_mode_change = time.time()
                    self.force_change = True
                    
                    logger.info("Switching to mode: %s", self.current_display_mode)

        except KeyboardInterrupt:
            logger.info("Received interrupt signal, shutting down...")
        except Exception:  # pylint: disable=broad-except
            logger.exception("Unexpected error in display controller")
        finally:
            self.cleanup()

    def _check_wifi_status_message(self) -> Optional[Dict[str, Any]]:
        """
        Safely check for WiFi status message file.
        
        Returns:
            Dict with 'message', 'timestamp', 'duration' if valid message exists, None otherwise.
            Returns None on any error or if message is expired/invalid.
        """
        try:
            # Throttle the existence stat to ~1 Hz: this runs on every render
            # iteration (60+ fps), and the file usually doesn't exist — the
            # status message's lifetime is measured in seconds anyway.
            # Both attributes are initialised in __init__.
            now = time.time()
            if (now - self._wifi_status_check_ts) < 1.0:
                return self._wifi_status_last_result
            self._wifi_status_check_ts = now
            self._wifi_status_last_result = None

            # Check if file exists
            if not self.wifi_status_file or not self.wifi_status_file.exists():
                return None
            
            # Read and parse JSON file
            try:
                with open(self.wifi_status_file, 'r', encoding='utf-8') as f:
                    data = json.load(f)
            except (json.JSONDecodeError, IOError, OSError) as e:
                logger.debug(f"Error reading WiFi status file (will be cleaned up): {e}")
                # Clean up corrupted file
                try:
                    self.wifi_status_file.unlink()
                except Exception:
                    pass
                return None
            
            # Validate required fields
            if not isinstance(data, dict):
                logger.debug("WiFi status file contains invalid data (not a dict)")
                return None
            
            message = data.get('message')
            timestamp = data.get('timestamp')
            duration = data.get('duration', 5)
            
            if not message or not isinstance(message, str):
                logger.debug("WiFi status file missing or invalid message field")
                return None
            
            if not isinstance(timestamp, (int, float)) or timestamp <= 0:
                logger.debug("WiFi status file missing or invalid timestamp field")
                return None
            
            if not isinstance(duration, (int, float)) or duration < 0:
                duration = 5  # Default to 5 seconds if invalid
            
            # Check if message has expired
            current_time = time.time()
            expires_at = timestamp + duration
            
            if current_time >= expires_at:
                logger.debug(f"WiFi status message expired (age: {current_time - timestamp:.1f}s, duration: {duration}s)")
                # Clean up expired file
                try:
                    self.wifi_status_file.unlink()
                except Exception:
                    pass
                return None
            
            # Message is valid and not expired — cache for the throttle window
            self._wifi_status_last_result = {
                'message': message,
                'timestamp': timestamp,
                'duration': duration,
                'expires_at': expires_at
            }
            return self._wifi_status_last_result
            
        except Exception as e:
            # Catch-all for any unexpected errors - log but don't break the display
            logger.debug(f"Unexpected error checking WiFi status message: {e}")
            return None
    
    def _display_wifi_status_message(self, status_data: Dict[str, Any]) -> bool:
        """
        Safely display a WiFi status message on the LED matrix.
        
        Args:
            status_data: Dict with 'message', 'expires_at' from _check_wifi_status_message()
        
        Returns:
            True if message was displayed successfully, False otherwise.
        """
        try:
            message = status_data.get('message', '')
            if not message:
                return False
            
            # Clear display
            self.display_manager.clear()
            
            # Get display dimensions for centering
            width = self.display_manager.width
            height = self.display_manager.height
            
            # Split long messages into multiple lines if needed
            # Simple word wrapping for messages longer than ~20 characters
            max_chars_per_line = min(20, width // 6)  # Rough estimate based on font width
            words = message.split()
            lines = []
            current_line = []
            current_length = 0
            
            for word in words:
                word_length = len(word) + 1  # +1 for space
                if current_length + word_length > max_chars_per_line and current_line:
                    lines.append(' '.join(current_line))
                    current_line = [word]
                    current_length = len(word)
                else:
                    current_line.append(word)
                    current_length += word_length
            
            if current_line:
                lines.append(' '.join(current_line))
            
            # Limit to 2 lines max (for small displays)
            lines = lines[:2]
            
            # Calculate vertical spacing
            font_height = self.display_manager.get_font_height(self.display_manager.small_font)
            total_height = len(lines) * font_height
            start_y = max(0, (height - total_height) // 2)
            
            # Draw each line
            for i, line in enumerate(lines):
                y_pos = start_y + (i * font_height)
                # Use small font and center horizontally
                self.display_manager.draw_text(
                    line,
                    y=y_pos,
                    color=(255, 255, 255),  # White text
                    small_font=True
                )
            
            # Update display
            self.display_manager.update_display()
            
            # Track that WiFi status is active
            self.wifi_status_active = True
            self.wifi_status_expires_at = status_data.get('expires_at')
            
            logger.debug(f"Displayed WiFi status message: {message[:50]}")
            return True
            
        except Exception as e:
            # Catch-all for any display errors - log but don't break
            logger.warning(f"Error displaying WiFi status message: {e}")
            self.wifi_status_active = False
            self.wifi_status_expires_at = None
            return False
    
    def _cleanup_expired_wifi_status(self):
        """Safely clean up expired WiFi status message file."""
        try:
            if self.wifi_status_active and self.wifi_status_expires_at:
                current_time = time.time()
                if current_time >= self.wifi_status_expires_at:
                    # Message has expired, clean up
                    if self.wifi_status_file and self.wifi_status_file.exists():
                        try:
                            self.wifi_status_file.unlink()
                            logger.debug("Cleaned up expired WiFi status message file")
                        except Exception as e:
                            logger.debug(f"Could not delete WiFi status file: {e}")
                    
                    self.wifi_status_active = False
                    self.wifi_status_expires_at = None
        except Exception as e:
            logger.debug(f"Error cleaning up WiFi status: {e}")
            # Reset state on any error
            self.wifi_status_active = False
            self.wifi_status_expires_at = None

    def _register_loaded_plugin(self, plugin_id: str) -> List[str]:
        """Register an already-loaded plugin's display modes, config-change
        subscription and dispatch maps with the controller.

        Shared by startup loading and live enable hot-reload so both paths
        build identical controller state. Returns the registered modes.
        """
        plugin_instance = self.plugin_manager.get_plugin(plugin_id)
        manifest = self.plugin_manager.plugin_manifests.get(plugin_id, {})

        # Prefer the plugin's dynamic modes attribute (e.g. based on enabled
        # leagues), else fall back to manifest display_modes, else the id.
        if plugin_instance is not None and getattr(plugin_instance, 'modes', None):
            display_modes = list(plugin_instance.modes)
            logger.debug("Using plugin.modes for %s: %s", plugin_id, display_modes)
        else:
            display_modes = manifest.get('display_modes', [plugin_id])
            logger.debug("Using manifest display_modes for %s: %s", plugin_id, display_modes)
        if not (isinstance(display_modes, list) and display_modes):
            display_modes = [plugin_id]
        self.plugin_display_modes[plugin_id] = list(display_modes)

        # Subscribe to config changes for per-plugin hot-reload. Bind plugin_id
        # and instance as defaults so each plugin's callback targets its own
        # instance (avoids late-binding when registering many plugins), and
        # remember the callback so we can unsubscribe on disable.
        if hasattr(self, 'config_service') and hasattr(plugin_instance, 'on_config_change'):
            def config_change_callback(old_config: Dict[str, Any], new_config: Dict[str, Any],
                                       _pid: str = plugin_id, _plugin: Any = plugin_instance) -> None:
                """Callback for plugin config changes."""
                try:
                    _plugin.on_config_change(new_config)
                    logger.debug("Plugin %s notified of config change", _pid)
                except Exception as e:
                    logger.error("Error in plugin %s config change handler: %s", _pid, e, exc_info=True)

            self.config_service.subscribe(config_change_callback, plugin_id=plugin_id)
            self._plugin_config_callbacks[plugin_id] = config_change_callback
            logger.debug("Subscribed plugin %s to config changes", plugin_id)

        # Add modes to the dispatch maps.
        for mode in display_modes:
            if mode not in self.available_modes:
                self.available_modes.append(mode)
            self.plugin_modes[mode] = plugin_instance
            self.mode_to_plugin_id[mode] = plugin_id
            logger.debug("  Added mode: %s", mode)
        # Invalidate signature cache so the new instance is re-inspected.
        self._plugin_accepts_display_mode.pop(plugin_id, None)
        return display_modes

    def _unregister_plugin(self, plugin_id: str) -> None:
        """Remove a plugin's modes, config subscription and instance, then
        unload it. Used by live disable hot-reload."""
        modes = self.plugin_display_modes.pop(plugin_id, [])
        for mode in modes:
            if mode in self.available_modes:
                self.available_modes.remove(mode)
            self.plugin_modes.pop(mode, None)
            self.mode_to_plugin_id.pop(mode, None)

        # Unsubscribe the plugin's config-change callback. Pop only on a
        # successful unsubscribe -- if it raises, keep our reference so a
        # later retry (or at least cleanup) still has the real callback
        # instead of a lost one.
        callback = self._plugin_config_callbacks.get(plugin_id)
        if callback is not None and hasattr(self, 'config_service'):
            try:
                self.config_service.unsubscribe(callback, plugin_id=plugin_id)
            except Exception as e:
                logger.debug("Error unsubscribing plugin %s from config changes: %s", plugin_id, e)
            else:
                self._plugin_config_callbacks.pop(plugin_id, None)
        else:
            self._plugin_config_callbacks.pop(plugin_id, None)

        self._plugin_accepts_display_mode.pop(plugin_id, None)

        # Tear down the instance (cleanup + on_disable + module unload).
        try:
            self.plugin_manager.unload_plugin(plugin_id)
        except Exception as e:
            logger.error("Error unloading plugin %s: %s", plugin_id, e, exc_info=True)

        logger.info("Disabled plugin %s live (removed modes: %s)", plugin_id, modes)

    def _enabled_set_changed(self, old_config: Dict[str, Any], new_config: Dict[str, Any]) -> bool:
        """True if any top-level section's ``enabled`` flag differs between two
        configs. A cheap watcher-thread check that gates the full reconcile.
        Non-plugin sections (e.g. schedule) may match too; the reconcile
        no-ops for anything that isn't a discovered plugin."""
        def enabled_map(cfg: Dict[str, Any]) -> Dict[str, bool]:
            return {
                key: bool(value.get('enabled', False))
                for key, value in cfg.items()
                if isinstance(value, dict)
            }
        return enabled_map(old_config) != enabled_map(new_config)

    def _reconcile_enabled_plugins(self) -> bool:
        """Load/unload plugins so the running set matches the enabled set in
        config. Runs on the main display thread (never the config-watcher
        thread) so mutating available_modes is race-free against rendering.

        Returns True if reconciliation completed (including a no-op), or
        False on a retryable failure -- the caller keeps the pending-reconcile
        flag set in that case so the request isn't silently dropped."""
        if self.plugin_manager is None:
            return True
        try:
            config = self.config_service.get_config()
        except Exception as e:
            logger.warning("Plugin reconcile: falling back to cached config: %s", e)
            config = self.config
        try:
            discovered = set(self.plugin_manager.discover_plugins())
        except Exception as e:
            logger.error("Plugin reconcile: discovery failed: %s", e, exc_info=True)
            return False

        for p in discovered:
            if p in config and not isinstance(config.get(p), dict):
                logger.warning(
                    "Plugin reconcile: config for %s is a %s, not a dict; treating as disabled",
                    p, type(config.get(p)).__name__
                )

        desired = {
            p for p in discovered
            if isinstance(config.get(p), dict) and config.get(p, {}).get('enabled', False)
        }
        current = set(self.plugin_display_modes.keys())
        to_add = desired - current
        to_remove = current - desired
        if not to_add and not to_remove:
            return True

        previous_mode = self.current_display_mode

        for plugin_id in to_remove:
            self._unregister_plugin(plugin_id)

        for plugin_id in to_add:
            try:
                if self.plugin_manager.load_plugin(plugin_id):
                    modes = self._register_loaded_plugin(plugin_id)
                    logger.info("Enabled plugin %s live (modes: %s)", plugin_id, modes)
                else:
                    logger.warning("Plugin reconcile: failed to load %s", plugin_id)
            except Exception as e:
                logger.error("Plugin reconcile: error enabling %s: %s", plugin_id, e, exc_info=True)

        self._resync_mode_index_after_change(previous_mode)
        logger.info("Plugin reconcile complete: +%s -%s (%d modes)",
                    sorted(to_add), sorted(to_remove), len(self.available_modes))
        return True

    def _resync_mode_index_after_change(self, previous_mode: Optional[str]) -> None:
        """Clamp rotation state after available_modes changed. Stays on the
        previous mode if it survived, otherwise restarts cleanly within range."""
        if not self.available_modes:
            self.current_mode_index = 0
            self.current_display_mode = None
            return
        if previous_mode in self.available_modes:
            self.current_mode_index = self.available_modes.index(previous_mode)
        else:
            self.current_mode_index %= len(self.available_modes)
            self.current_display_mode = self.available_modes[self.current_mode_index]

    def _refresh_config_cache(self, new_config: Dict[str, Any]) -> None:
        """Refresh all config-derived caches when a hot-reload fires.

        Called by the controller-level ConfigService subscriber.  Keeps
        ``_normal_brightness``, ``_scroll_speed``, the cached timezone, and the
        schedule minute-gates consistent with the live config so callers never
        read stale values after the user saves settings via the web UI.
        """
        self.config = new_config
        self._normal_brightness = (
            self.config.get('display', {}).get('hardware', {}).get('brightness', 90)
        )
        self._scroll_speed = (
            self.config.get('display', {}).get('vegas_scroll', {}).get('scroll_speed', 75)
        )
        # Force the timezone to be re-derived from the new config on next schedule check
        self._tz = None
        # Invalidate minute-gates so the new schedule/dim times take effect immediately
        self._schedule_checked_minute = None
        self._dim_checked_minute = None
        self._cached_target_brightness = self._normal_brightness
        logger.debug("Config cache refreshed (brightness=%s, scroll_speed=%s)",
                     self._normal_brightness, self._scroll_speed)

    def cleanup(self):
        """Clean up resources."""
        # Stop the async update worker first so no in-flight update() call
        # is still touching display/cache-backed resources while they're
        # torn down below.
        if self.plugin_manager and hasattr(self.plugin_manager, 'stop_update_worker'):
            try:
                self.plugin_manager.stop_update_worker()
            except Exception as e:
                logger.warning("Error stopping plugin update worker: %s", e)
        # Shutdown config service if it exists
        if hasattr(self, 'config_service'):
            try:
                self.config_service.shutdown()
            except Exception as e:
                logger.warning("Error shutting down config service: %s", e)
        logger.info("Cleaning up display controller...")
        if hasattr(self, 'display_manager'):
            self.display_manager.cleanup()
        logger.info("Cleanup complete.")

def main():
    """Application entry point — create a DisplayController and run until interrupted."""
    controller = DisplayController()
    controller.run()

if __name__ == "__main__":
    main()