fix(plugins): stop core updates from resurrecting uninstalled built-in plugins (#368)

* fix(plugins): stop core updates from resurrecting uninstalled built-in plugins

Built-in plugins (e.g. web-ui-info, starlark-apps) are committed into the
repo under plugin-repos/. When a user uninstalls one, a subsequent core
`git pull` update restores the committed files, so the plugin reappears on
every update. The update endpoint stashes the deletion and never pops it,
and `git pull` faithfully restores any committed file whose deletion was
never committed — so excluding plugin-repos/ from the stash can't fix this
(it would only make `git pull --rebase` fail on a dirty tree).

Add a persistent uninstall registry (config/uninstalled_plugins.json,
gitignored) that survives restarts, unlike the existing in-memory tombstone:

- Uninstall records the plugin id; install clears it.
- purge_uninstalled_plugins() re-removes any recorded plugin whose directory
  reappears on disk; called after a successful git-pull update and at web
  startup (covers manual `git pull` on the Pi too).
- The state reconciler also refuses to auto-repair a persistently
  uninstalled plugin.

Wires up mark_recently_uninstalled in the uninstall flow (previously only
referenced by tests) via the new persistent record.

Adds regression tests covering record/forget/purge lifecycle, persistence
across manager instances, and corrupt-registry tolerance.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* fix(plugins): validate uninstall-registry ids and lock registry writes

Address review feedback on the persistent uninstall registry:

- Critical: validate plugin ids on read/record and add a containment guard
  in purge_uninstalled_plugins. A corrupt or hand-edited registry entry of
  "" resolves to the plugins root, so purge could have deleted every plugin;
  traversal ids ("..", "../x") could target paths outside the root. Invalid
  ids are now dropped on read, refused on record, and never removed unless
  the path is a direct child of the plugins directory.
- Major: guard record/forget read-modify-write with a lock so concurrent
  install/uninstall requests can't lose updates.
- Minor: narrow the startup and post-update purge exception handlers from
  bare Exception to (OSError, RuntimeError).

Adds regression tests for empty-id, traversal-id, and invalid-record cases.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

.codacy.yml

@@ -0,0 +1,7 @@
+---
+exclude_paths:
+  - "plugin-repos/**"
+  - "plugins/**"
+  - "assets/**"
+  - "test/**"
+  - "scripts/debug/**"

.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  plugin-safety:
+    name: Plugin safety harness + unit tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        with:
+          python-version: "3.12"
+          cache: pip
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt -r requirements-test.txt
+          pip install RGBMatrixEmulator
+
+      - name: Run harness + visual rendering tests
+        run: |
+          pytest --no-cov \
+            test/plugins/test_harness.py \
+            test/plugins/test_visual_rendering.py \
+            test/plugins/test_plugin_matrix.py

.gitignore

@@ -8,6 +8,7 @@ config/config_secrets.json
 config/config.json
 config/config.json.backup
 config/wifi_config.json
+config/uninstalled_plugins.json
 credentials.json
 token.pickle
 

README.md

@@ -1,5 +1,10 @@
 # LEDMatrix
+[![License](https://img.shields.io/badge/license-GPL--3.0-green)](LICENSE)
+[![Discord](https://img.shields.io/badge/Discord-community-5865F2?logo=discord&logoColor=white)](https://discord.gg/RdrC37rEag)
+[![GitHub Stars](https://img.shields.io/github/stars/ChuckBuilds/ledmatrix?style=flat&color=yellow)](https://github.com/ChuckBuilds/ledmatrix)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/77fc9b446a5948e5b0aed7a7aaeb1bab)](https://app.codacy.com/gh/ChuckBuilds/LEDMatrix/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
+
+
 ## Welcome to LEDMatrix! 
 Welcome to the LEDMatrix Project! This open-source project enables you to run an information-rich display on a Raspberry Pi connected to an LED RGB Matrix panel. Whether you want to see your calendar, weather forecasts, sports scores, stock prices, or any other information at a glance, LEDMatrix brings it all together.
 
@@ -127,10 +132,15 @@ The system supports live, recent, and upcoming game information for multiple spo
 | This project can be finnicky! RGB LED Matrix displays are not built the same or to a high-quality standard. We have seen many displays arrive dead or partially working in our discord. Please purchase from a reputable vendor. |
 
 ### Raspberry Pi
-- Raspberry Pi Zero's don't have enough processing power for this project and the Pi 5 is unsupported due to new GPIO output.
+- Raspberry Pi Zero's don't have enough processing power for this project.
-- **Raspberry Pi 3B or 4 (NOT RPi 5!)**  
+- **Raspberry Pi 3B, 4, or 5**
   [Amazon Affiliate Link – Raspberry Pi 4 4GB RAM](https://amzn.to/4dJixuX)
   [Amazon Affiliate Link – Raspberry Pi 4 8GB RAM](https://amzn.to/4qbqY7F)
+  - **Pi 5 users**: the installer automatically detects Pi 5 and builds the `rpi-rgb-led-matrix` library with RP1 support. If you previously installed on a Pi 4 and migrated the SD card, or if you see `mmap` errors in the logs, force a fresh library build:
+    ```bash
+    sudo RPI_RGB_FORCE_REBUILD=1 ./first_time_install.sh
+    ```
+  - Pi 5 config: leave `rp1_rio` at `0` (PIO mode, default) and set `gpio_slowdown` to `1` or `2`.
 
 
 ### RGB Matrix Bonnet / HAT
@@ -582,7 +592,7 @@ These settings control runtime behavior and GPIO timing:
   - **Critical setting**: Must match your Raspberry Pi model for stability
   - **Raspberry Pi 3**: Use 3
   - **Raspberry Pi 4**: Use 4
-  - **Raspberry Pi 5**: Use 5 (or higher if needed)
+  - **Raspberry Pi 5**: Use 1–2 in PIO mode (`rp1_rio: 0`, the default); start with `1` and increase if you see flickering
   - **Raspberry Pi Zero/1**: Use 1-2
   - Incorrect values can cause display corruption, flickering, or system instability
   - If you experience issues, try adjusting this value up or down by 1

config/config.template.json

@@ -1,43 +1,43 @@
 {
     "web_display_autostart": true,
     "schedule": {
-        "enabled": true,
+        "enabled": false,
         "mode": "per-day",
         "start_time": "07:00",
         "end_time": "23:00",
         "days": {
             "monday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "07:00",
                 "end_time": "23:00"
             },
             "tuesday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "07:00",
                 "end_time": "23:00"
             },
             "wednesday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "07:00",
                 "end_time": "23:00"
             },
             "thursday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "07:00",
                 "end_time": "23:00"
             },
             "friday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "07:00",
                 "end_time": "23:00"
             },
             "saturday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "07:00",
                 "end_time": "23:00"
             },
             "sunday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "07:00",
                 "end_time": "23:00"
             }
@@ -51,46 +51,46 @@
         "end_time": "07:00",
         "days": {
             "monday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "20:00",
                 "end_time": "07:00"
             },
             "tuesday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "20:00",
                 "end_time": "07:00"
             },
             "wednesday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "20:00",
                 "end_time": "07:00"
             },
             "thursday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "20:00",
                 "end_time": "07:00"
             },
             "friday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "20:00",
                 "end_time": "07:00"
             },
             "saturday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "20:00",
                 "end_time": "07:00"
             },
             "sunday": {
-                "enabled": true,
+                "enabled": false,
                 "start_time": "20:00",
                 "end_time": "07:00"
             }
         }
     },
-    "timezone": "America/Chicago",
+    "timezone": "America/New_York",
     "location": {
-        "city": "Dallas",
+        "city": "Tampa",
-        "state": "Texas",
+        "state": "Florida",
         "country": "US"
     },
     "display": {

docs/plugin-safety-harness.md

@@ -0,0 +1,136 @@
+# Plugin Safety Harness
+
+Renders a plugin across **every declared screen (mode)** and **a spread of
+matrix sizes**, and fails if any combination crashes, draws past the panel edge,
+or — for plugins that ship golden images — drifts visually. The goal: change a
+plugin without breaking a size or screen you didn't think to test.
+
+## Sizes: a sample, not a fixed list
+
+There is **no fixed set of supported panel sizes** — an RGB matrix build can be
+any width/height and configuration (square, rectangle, 2×2, 4×4, 8×2, long
+strips, tall stacks). Plugins are expected to read dimensions dynamically
+(`self.display_manager.matrix.width/height`) and lay themselves out
+accordingly, so a hardcoded coordinate or unscaled font shows up as a failure
+here.
+
+The harness therefore renders against a **representative sample** that spans the
+axes of variation (`DEFAULT_TEST_SIZES` in `src/plugin_system/testing/sizes.py`),
+not an authoritative list:
+
+Each module is 64×32; entries are real panel-grid arrangements (cols × rows):
+
+| Size    | Grid | Why it's in the sample                     |
+|---------|------|--------------------------------------------|
+| 64×32   | 1×1  | single panel — tightest common rectangle   |
+| 128×32  | 2×1  | the baseline most plugins are tuned for    |
+| 64×64   | 1×2  | stacked — tall-narrow centering            |
+| 128×64  | 2×2  | block — icon scaling / vertical centering  |
+| 256×32  | 4×1  | long strip — wide horizontal layout        |
+| 128×96  | 2×3  | tall — vertical overflow                   |
+| 256×128 | 4×4  | large block — both dimensions big at once  |
+
+**Override the sizes entirely** to test your actual hardware (or any shape):
+
+```bash
+# CLI — one-off:
+python scripts/check_plugin.py --plugin clock-simple --sizes 8x16,64x64,256x32
+
+# pytest — force every plugin onto your panel(s):
+LEDMATRIX_TEST_SIZES="8x16,128x128" pytest test/plugins/test_plugin_matrix.py
+
+# Per-plugin — declare the shapes a plugin targets in its test/harness.json:
+#   { "sizes": [[8, 16], [64, 64]] }
+```
+
+Precedence: `LEDMATRIX_TEST_SIZES` env (global) → per-plugin `harness.json`
+`sizes` → the default sample. Bounds checking adapts to whatever sizes a run
+uses — the backing canvas is padded out to the **largest** panel in the run, so
+a coordinate meant for a big build is still caught when rendering a small one.
+
+## Quick start
+
+```bash
+# Functional + bounds check across all sizes/screens:
+python scripts/check_plugin.py --plugin clock-simple
+
+# Every discovered plugin:
+python scripts/check_plugin.py --all
+
+# Dump PNGs to eyeball each size/screen:
+python scripts/check_plugin.py --plugin ledmatrix-weather --out-dir /tmp/preview
+```
+
+Exit code is non-zero if any `(plugin, size, screen)` fails. Plugins are
+discovered in `plugin-repos/` and `plugins/` (override with `--plugin-dir`).
+
+## What it checks (Phase 1 — always on)
+
+1. **Loads** and builds its mode list.
+2. **Renders every screen** at every size without raising. `update()` may fail
+   (no network in CI) and is tolerated; a crash in `display()` is a failure —
+   `display()` must handle the no-data state.
+3. **Bounds**: nothing is drawn past the right/bottom edge. Implemented by
+   `BoundsCheckingDisplayManager`, which backs the declared panel with an
+   oversized canvas and flags any pixels that land in the margin. (Left/top
+   overflow at negative coordinates and BDF text are not flagged — golden images
+   cover those.)
+
+## Golden images (Phase 2 — opt-in per plugin)
+
+A plugin opts in by committing reference PNGs and (usually) a small harness spec:
+
+```
+plugins/<id>/test/harness.json          # how to render deterministically
+plugins/<id>/test/fixtures/mock.json     # optional cached data
+plugins/<id>/test/golden/<WxH>/<mode>.png
+```
+
+`test/harness.json` keys (all optional):
+
+```json
+{
+  "config":      { "timezone": "UTC" },
+  "mock_data":   "fixtures/mock.json",
+  "freeze_time": "2025-08-01 15:25:00",
+  "skip_update": false,
+  "sizes":       [[128, 32], [128, 64]]
+}
+```
+
+Generate / refresh goldens after an intentional visual change, then review the
+diff before committing:
+
+```bash
+python scripts/check_plugin.py --plugin clock-simple --update-golden \
+  --config '{"timezone":"UTC"}' --freeze-time "2025-08-01 15:25:00"
+```
+
+Comparison is exact by default (`compare_images` in `harness.py` accepts a
+tolerance for known anti-aliasing noise). Determinism requires a pinned Pillow
+and the bundled fonts — keep both stable when regenerating goldens.
+
+## Tests & CI
+
+- `test/plugins/test_harness.py` — unit tests for bounds detection, image
+  comparison, and mode enumeration (run anywhere).
+- `test/plugins/test_plugin_matrix.py` — parametrized over discovered plugins ×
+  sizes × screens; honors each plugin's `test/harness.json` and goldens. Skips
+  when no plugins are present (e.g. a fresh core checkout); set
+  `LEDMATRIX_REQUIRE_PLUGINS=1` in a pipeline where plugins must be present to
+  turn an empty discovery into a hard failure instead. Point it at the monorepo
+  with `LEDMATRIX_PLUGINS_DIR=/path/to/ledmatrix-plugins/plugins`.
+- `.github/workflows/test.yml` — runs the harness + visual tests on every PR.
+
+The plugin monorepo has its own `Plugin Safety` workflow that runs this harness
+against changed plugins on every PR.
+
+## Developer workflow
+
+1. Change the plugin on a branch.
+2. `python scripts/check_plugin.py --plugin <id> --out-dir /tmp/preview` and
+   eyeball the PNGs.
+3. Intentional visual change? `--update-golden`, review diffs, commit goldens.
+4. (Monorepo) bump `manifest.json` version and let the pre-commit hook sync
+   `plugins.json`.
+5. Push — CI re-runs the harness across all sizes and gates the PR.

docs/widget-guide.md

@@ -10,6 +10,98 @@ The LEDMatrix Widget Registry system allows plugins to use reusable UI component
 
 ## Available Core Widgets
 
+### Plugin File Manager Widget (`plugin-file-manager`)
+
+Full inline file management UI for plugins that manage files via the `web_ui_actions` system. Renders a card grid, upload zone, create/delete modals, and an entry table editor — entirely inline, no iframe.
+
+`plugin_id` is **automatically injected** from template context. File operations call `/api/v3/plugins/action` immediately on user action; no Save Configuration needed.
+
+**Schema Configuration:**
+```json
+{
+  "file_manager": {
+    "type": "null",
+    "title": "Data Files",
+    "x-widget": "plugin-file-manager",
+    "x-widget-config": {
+      "actions": {
+        "list":   "list-files",
+        "get":    "get-file",
+        "save":   "save-file",
+        "upload": "upload-file",
+        "delete": "delete-file",
+        "create": "create-file",
+        "toggle": "toggle-category"
+      },
+      "upload_hint":      "JSON files with day numbers 1–365 as keys",
+      "directory_label":  "my_data/",
+      "create_fields": [
+        { "key": "category_name", "label": "Category Name",
+          "placeholder": "e.g., my_words", "pattern": "^[a-z0-9_]+$",
+          "hint": "Lowercase letters, numbers, underscores" },
+        { "key": "display_name", "label": "Display Name",
+          "placeholder": "e.g., My Words", "hint": "Optional" }
+      ]
+    }
+  }
+}
+```
+
+**`list` is required** — the widget calls it on render to populate the file grid; omitting it leaves the widget stuck in a loading state. All other actions are optional — omit any key to hide its UI element (e.g., no `create` = no New File button, no `toggle` = no enable/disable switch).
+
+The edit view auto-detects whether file content is tabular (object-of-objects with uniform keys) and shows a paginated table editor with inline cells. Otherwise falls back to a JSON textarea.
+
+**Used by:** of-the-day
+
+---
+
+### Time Picker Widget (`time-picker`)
+
+Single time selection using the browser's native time input. Returns a string in `HH:MM` (24-hour) format. Generic — works in any plugin without configuration.
+
+**Schema Configuration:**
+```json
+{
+  "target_time": {
+    "type": "string",
+    "x-widget": "time-picker",
+    "default": "00:00",
+    "x-options": {
+      "placeholder": "Select time",
+      "clearable": true
+    }
+  }
+}
+```
+
+**Used by:** countdown
+
+---
+
+### File Upload Single Widget (`file-upload-single`)
+
+Single-image upload for string fields. Uploads to the plugin's asset folder (`assets/plugins/<plugin_id>/uploads/`) and sets the string field value to the returned relative path. Shows a thumbnail preview and a clear button. The `plugin_id` is **automatically injected** from the template context — no need to specify it in the schema.
+
+**Schema Configuration:**
+```json
+{
+  "image_path": {
+    "type": "string",
+    "x-widget": "file-upload-single",
+    "x-upload-config": {
+      "allowed_types": ["image/png", "image/jpeg", "image/bmp", "image/gif"],
+      "max_size_mb": 5
+    }
+  }
+}
+```
+
+Note: Unlike `file-upload` (array-level), this widget is for a single `string` field. It is ideal for per-item images inside `array-table` rows.
+
+**Used by:** countdown
+
+---
+
 ### File Upload Widget (`file-upload`)
 
 Upload and manage image files with drag-and-drop support, preview, delete, and scheduling.

first_time_install.sh

@@ -15,8 +15,8 @@ on_error() {
     echo "✗ An error occurred during: $CURRENT_STEP (line $line_no, exit $exit_code)" >&2
     if [ -n "${LOG_FILE:-}" ]; then
         echo "See the log for details: $LOG_FILE" >&2
-        echo "-- Last 50 lines from log --" >&2
+        echo "-- Last 100 lines from log --" >&2
-        tail -n 50 "$LOG_FILE" >&2 || true
+        tail -n 100 "$LOG_FILE" >&2 || true
     fi
     echo "\nCommon fixes:" >&2
     echo "- Ensure the Pi is online (try: ping -c1 8.8.8.8)." >&2
@@ -36,9 +36,17 @@ if [ -r /proc/device-tree/model ]; then
     DEVICE_MODEL=$(tr -d '\0' </proc/device-tree/model)
     echo "Detected device: $DEVICE_MODEL"
 else
+    DEVICE_MODEL=""
     echo "⚠ Could not detect Raspberry Pi model (continuing anyway)"
 fi
 
+# Detect Pi 5 for hardware-specific install decisions (RP1 library verification)
+IS_PI5=0
+if echo "${DEVICE_MODEL:-}" | grep -qi "Raspberry Pi 5"; then
+    IS_PI5=1
+    echo "Raspberry Pi 5 detected — will verify RP1 library support."
+fi
+
 # Check OS version - must be Raspberry Pi OS Lite (Trixie)
 echo ""
 echo "Checking operating system requirements..."
@@ -194,8 +202,33 @@ retry() {
     done
 }
 
-apt_update() { retry apt update; }
+# Wait for another apt/dpkg process (commonly unattended-upgrades running
-apt_install() { retry apt install -y "$@"; }
+# shortly after first boot) to release its lock before we try apt ourselves.
+# Without this, apt_update/apt_install can fail outright in the first couple
+# minutes after a fresh Pi OS boot with a generic "Command failed after 3
+# attempts" error.
+wait_for_apt_lock() {
+    command -v flock >/dev/null 2>&1 || return 0
+    local lock_file="/var/lib/dpkg/lock-frontend"
+    local max_wait=180
+    local waited=0
+    local printed=0
+    while ! flock -n "$lock_file" -c true 2>/dev/null; do
+        if [ "$printed" -eq 0 ]; then
+            echo "⚠ Waiting for another apt/dpkg process to finish (e.g. unattended-upgrades on first boot)..."
+            printed=1
+        fi
+        if [ "$waited" -ge "$max_wait" ]; then
+            echo "⚠ Still waiting after ${max_wait}s; proceeding anyway."
+            break
+        fi
+        sleep 5
+        waited=$((waited+5))
+    done
+}
+
+apt_update() { wait_for_apt_lock; retry apt update; }
+apt_install() { wait_for_apt_lock; retry apt install -y "$@"; }
 apt_remove() { apt-get remove -y "$@" || true; }
 
 check_network() {
@@ -214,6 +247,22 @@ check_network() {
     exit 1
 }
 
+check_disk_space() {
+    command -v df >/dev/null 2>&1 || return 0
+    local available_mb
+    available_mb=$(df -m "$PROJECT_ROOT_DIR" | awk 'NR==2{print $4}')
+    available_mb=${available_mb:-0}
+    if [ "$available_mb" -lt 500 ]; then
+        echo "✗ ERROR: Insufficient disk space: ${available_mb}MB available (need at least 500MB)"
+        echo "  Free up space first, e.g.: sudo apt clean && sudo apt autoremove"
+        exit 1
+    elif [ "$available_mb" -lt 1024 ]; then
+        echo "⚠ Limited disk space: ${available_mb}MB available (recommend at least 1GB for the rpi-rgb-led-matrix build in Step 6)"
+    else
+        echo "✓ Disk space sufficient: ${available_mb}MB available"
+    fi
+}
+
 echo ""
 echo "This script will perform the following steps:"
 echo "1. Install system dependencies"
@@ -263,8 +312,9 @@ CURRENT_STEP="Install system dependencies"
 echo "Step 1: Installing system dependencies..."
 echo "----------------------------------------"
 
-# Ensure network is available before APT operations
+# Pre-flight checks before APT operations
 check_network
+check_disk_space
 
 # Update package list
 apt_update
@@ -783,9 +833,28 @@ CURRENT_STEP="Build and install rpi-rgb-led-matrix"
 echo "Step 6: Building and installing rpi-rgb-led-matrix..."
 echo "-----------------------------------------------------"
 
-# If already installed and not forcing rebuild, skip expensive build
+# On Pi 5, also check that the installed library has rp1_rio support.
+# A library built before Pi 5 support was added imports fine but maps to the
+# Pi 3 peripheral bus address (0x3f000000) instead of the RP1 chip at runtime.
+_HAS_RP1=0
+if python3 -c 'from rgbmatrix import RGBMatrixOptions; assert hasattr(RGBMatrixOptions(), "rp1_rio")' >/dev/null 2>&1; then
+    _HAS_RP1=1
+fi
+
+_SKIP_BUILD=0
 if python3 -c 'from rgbmatrix import RGBMatrix, RGBMatrixOptions' >/dev/null 2>&1 && [ "${RPI_RGB_FORCE_REBUILD:-0}" != "1" ]; then
-    echo "rgbmatrix Python package already available; skipping build (set RPI_RGB_FORCE_REBUILD=1 to force rebuild)."
+    if [ "$IS_PI5" = "1" ] && [ "$_HAS_RP1" = "0" ]; then
+        echo "⚠ Pi 5 detected: installed rgbmatrix lacks rp1_rio support (older build)."
+        echo "  Forcing rebuild to get Pi 5 RP1 support..."
+    else
+        _SKIP_BUILD=1
+    fi
+fi
+
+if [ "$_SKIP_BUILD" = "1" ]; then
+    _skip_suffix=""
+    if [ "$IS_PI5" = "1" ]; then _skip_suffix=" with Pi 5 RP1 support"; fi
+    echo "rgbmatrix already installed${_skip_suffix}; skipping build (set RPI_RGB_FORCE_REBUILD=1 to force rebuild)."
 else
     # Ensure rpi-rgb-led-matrix submodule is initialized
     if [ ! -d "$PROJECT_ROOT_DIR/rpi-rgb-led-matrix-master" ]; then
@@ -795,14 +864,14 @@ else
         # Try to initialize submodule if .gitmodules exists
         if [ -f "$PROJECT_ROOT_DIR/.gitmodules" ] && grep -q "rpi-rgb-led-matrix" "$PROJECT_ROOT_DIR/.gitmodules"; then
             echo "Initializing rpi-rgb-led-matrix submodule..."
-            if ! git submodule update --init --recursive rpi-rgb-led-matrix-master 2>&1; then
+            if ! retry git submodule update --init --recursive rpi-rgb-led-matrix-master; then
                 echo "⚠ Submodule init failed, cloning directly from GitHub..."
-                git clone https://github.com/hzeller/rpi-rgb-led-matrix.git rpi-rgb-led-matrix-master
+                retry git clone https://github.com/hzeller/rpi-rgb-led-matrix.git rpi-rgb-led-matrix-master
             fi
         else
             # Fallback: clone directly if submodule not configured
             echo "Submodule not configured, cloning directly from GitHub..."
-            git clone https://github.com/hzeller/rpi-rgb-led-matrix.git rpi-rgb-led-matrix-master
+            retry git clone https://github.com/hzeller/rpi-rgb-led-matrix.git rpi-rgb-led-matrix-master
         fi
     fi
     
@@ -814,9 +883,9 @@ else
             cd "$PROJECT_ROOT_DIR"
             rm -rf rpi-rgb-led-matrix-master
             if [ -f "$PROJECT_ROOT_DIR/.gitmodules" ] && grep -q "rpi-rgb-led-matrix" "$PROJECT_ROOT_DIR/.gitmodules"; then
-                git submodule update --init --recursive rpi-rgb-led-matrix-master
+                retry git submodule update --init --recursive rpi-rgb-led-matrix-master
             else
-                git clone https://github.com/hzeller/rpi-rgb-led-matrix.git rpi-rgb-led-matrix-master
+                retry git clone https://github.com/hzeller/rpi-rgb-led-matrix.git rpi-rgb-led-matrix-master
             fi
         fi
 
@@ -824,13 +893,24 @@ else
         echo "Installing rpi-rgb-led-matrix Python package (scikit-build-core + cmake)..."
         echo "  Build deps required: python-dev-is-python3 cmake"
         echo "  This compiles C++ — may take 2-5 minutes on Pi 4/5..."
-        if ! python3 -m pip install --break-system-packages .; then
+        BUILD_OUTPUT=$(mktemp)
+        BUILD_SUCCESS=false
+        if python3 -m pip install --break-system-packages . > "$BUILD_OUTPUT" 2>&1; then
+            BUILD_SUCCESS=true
+        fi
+        cat "$BUILD_OUTPUT" >> "$LOG_FILE"
+        if [ "$BUILD_SUCCESS" != true ]; then
             echo "✗ Failed to install rpi-rgb-led-matrix Python package"
             echo "  Ensure build tools are installed:"
             echo "  sudo apt install -y python-dev-is-python3 cmake build-essential"
+            echo ""
+            echo "-- Last 50 lines of build output --"
+            tail -n 50 "$BUILD_OUTPUT"
+            rm -f "$BUILD_OUTPUT"
             popd >/dev/null
             exit 1
         fi
+        rm -f "$BUILD_OUTPUT"
         popd >/dev/null
     else
         echo "✗ rpi-rgb-led-matrix-master directory not found at $PROJECT_ROOT_DIR"
@@ -852,6 +932,17 @@ except Exception as e:
 PY
     then
         echo "✓ rpi-rgb-led-matrix installed and verified"
+        # Pi 5: confirm the freshly-built library has rp1_rio support
+        if [ "$IS_PI5" = "1" ]; then
+            if python3 -c 'from rgbmatrix import RGBMatrixOptions; assert hasattr(RGBMatrixOptions(), "rp1_rio")' >/dev/null 2>&1; then
+                echo "✓ Pi 5 RP1 (rp1_rio) support confirmed"
+            else
+                echo "⚠ rp1_rio not found after rebuild — the submodule may be an older version."
+                echo "  Try updating the submodule and rebuilding:"
+                echo "    git submodule update --remote rpi-rgb-led-matrix-master"
+                echo "    sudo RPI_RGB_FORCE_REBUILD=1 ./first_time_install.sh"
+            fi
+        fi
     else
         echo "✗ rpi-rgb-led-matrix import test failed"
         exit 1
@@ -874,7 +965,9 @@ else
     # Try to install dependencies using the smart installer if available
     if [ -f "$PROJECT_ROOT_DIR/scripts/install_dependencies_apt.py" ]; then
         echo "Using smart dependency installer..."
-        python3 "$PROJECT_ROOT_DIR/scripts/install_dependencies_apt.py"
+        # -u: unbuffered stdout/stderr so output is captured in $LOG_FILE in
+        # real time and in order relative to this script's own echo statements
+        python3 -u "$PROJECT_ROOT_DIR/scripts/install_dependencies_apt.py"
     else
         echo "Using pip to install dependencies..."
         if [ -f "$PROJECT_ROOT_DIR/requirements_web_v2.txt" ]; then

plugin-repos/starlark-apps/manifest.json

@@ -22,5 +22,6 @@
     "Pillow>=10.0.0",
     "PyYAML>=6.0",
     "requests>=2.31.0"
-  ]
+  ],
+  "local_only": true
 }

requirements-test.txt

@@ -0,0 +1,9 @@
+# Test-only dependencies for the plugin safety harness and pytest suite.
+# Install alongside requirements.txt:  pip install -r requirements.txt -r requirements-test.txt
+#
+# pytest, pytest-cov, pytest-mock, and jsonschema are already pinned (with
+# major-version caps) in requirements.txt, so they are intentionally NOT
+# repeated here — re-pinning pytest to <9 collided with requirements.txt's
+# pytest>=9.0.3,<10 and made the two files impossible to install together.
+# Only declare what requirements.txt doesn't already provide.
+freezegun>=1.2,<2        # deterministic time for golden-image tests

scripts/check_plugin.py

@@ -0,0 +1,232 @@
+#!/usr/bin/env python3
+"""
+Plugin safety checker.
+
+Renders a plugin across every declared screen (mode) and every supported matrix
+size, and fails if any screen crashes, overflows the panel, or (for plugins with
+committed golden images) drifts visually.
+
+Usage:
+    # Functional + bounds check across all sizes/modes:
+    python scripts/check_plugin.py --plugin clock-simple
+
+    # Every discovered plugin:
+    python scripts/check_plugin.py --all
+
+    # Dump PNGs for each size/mode so you can eyeball them:
+    python scripts/check_plugin.py --plugin ledmatrix-weather --out-dir /tmp/preview
+
+    # Refresh committed golden images after an intentional visual change:
+    python scripts/check_plugin.py --plugin clock-simple --update-golden \
+        --mock-data plugins/clock-simple/test/fixtures/mock.json
+
+Exit code is non-zero if any (plugin, size, mode) fails.
+"""
+
+import argparse
+import json
+import os
+import sys
+from pathlib import Path
+from typing import Dict, List, Optional
+
+PROJECT_ROOT = Path(__file__).resolve().parent.parent
+sys.path.insert(0, str(PROJECT_ROOT))
+
+os.environ['EMULATOR'] = 'true'
+
+from src.logging_config import get_logger  # noqa: E402
+from src.plugin_system.testing.loading import (  # noqa: E402
+    find_plugin_dir, load_config_defaults, load_harness_spec,
+)
+from src.plugin_system.testing.harness import (  # noqa: E402
+    RenderResult, render_plugin_matrix, compare_to_goldens, write_goldens,
+)
+from src.plugin_system.testing.sizes import (  # noqa: E402
+    parse_size_token, resolve_test_sizes, safe_mode_filename, size_label,
+)
+
+logger = get_logger("[Check Plugin]")
+
+DEFAULT_SEARCH_DIRS = [
+    str(PROJECT_ROOT / 'plugins'),
+    str(PROJECT_ROOT / 'plugin-repos'),
+]
+
+
+def discover_plugins(search_dirs: List[str]) -> List[str]:
+    """All plugin ids found across the search dirs (dirs containing manifest.json)."""
+    found = []
+    for d in search_dirs:
+        base = Path(d)
+        if not base.exists():
+            continue
+        for child in sorted(base.iterdir()):
+            if (child / 'manifest.json').exists() and child.name not in found:
+                found.append(child.name)
+    return found
+
+
+def parse_sizes(spec: Optional[str]):
+    if not spec:
+        return None
+    sizes = []
+    for token in spec.split(','):
+        if not token.strip():
+            continue
+        try:
+            sizes.append(parse_size_token(token))
+        except ValueError as exc:
+            raise SystemExit(str(exc)) from exc
+    return sizes
+
+
+def check_one(plugin_id: str, search_dirs: List[str], sizes, mock_data: Dict,
+              config: Dict, run_update: bool, out_dir: Optional[Path],
+              update_golden: bool, golden_dir_override: Optional[Path],
+              freeze_time: Optional[str]) -> List[RenderResult]:
+    plugin_dir = find_plugin_dir(plugin_id, search_dirs)
+    if not plugin_dir:
+        logger.error("Plugin '%s' not found in: %s", plugin_id, search_dirs)
+        return [RenderResult(plugin_id, 0, 0, "<not-found>", error="plugin directory not found")]
+
+    # Per-plugin test/harness.json holds the deterministic settings the committed
+    # goldens were generated with (config, mock data, frozen time, sizes). Load
+    # them so the CLI/CI render reproduces the golden the same way the pytest
+    # matrix path does; explicit CLI flags still override the file.
+    spec = load_harness_spec(plugin_dir)
+
+    # config_schema defaults (real-install behavior), then harness.json config,
+    # then CLI --config — most specific wins.
+    full_config = {"enabled": True}
+    full_config.update(load_config_defaults(plugin_dir))
+    full_config.update(spec.get("config", {}))
+    full_config.update(config)
+
+    # Precedence: CLI flag > LEDMATRIX_TEST_SIZES env > harness.json > default.
+    effective_sizes = sizes if sizes else resolve_test_sizes(spec.get("sizes"))
+    # CLI value wins when provided, else fall back to the harness.json setting.
+    effective_mock_data = mock_data or spec.get("mock_data_contents", {})
+    effective_freeze = freeze_time or spec.get("freeze_time")
+    effective_run_update = run_update and not spec.get("skip_update", False)
+
+    results = render_plugin_matrix(
+        plugin_id=plugin_id, plugin_dir=plugin_dir, config=full_config,
+        mock_data=effective_mock_data, sizes=effective_sizes,
+        run_update=effective_run_update, freeze_time=effective_freeze,
+    )
+
+    golden_dir = golden_dir_override or (plugin_dir / 'test' / 'golden')
+    if update_golden:
+        written = write_goldens(results, golden_dir)
+        logger.info("Wrote %d golden image(s) for %s to %s", written, plugin_id, golden_dir)
+    else:
+        compare_to_goldens(results, golden_dir)
+
+    if out_dir:
+        for r in results:
+            if r.image is None:
+                continue
+            dest = out_dir / plugin_id / size_label(r.width, r.height)
+            dest.mkdir(parents=True, exist_ok=True)
+            r.image.save(dest / f"{safe_mode_filename(r.mode)}.png", format="PNG")
+
+    return results
+
+
+def print_report(all_results: Dict[str, List[RenderResult]]) -> bool:
+    """Print a per-plugin grid. Returns True if everything passed."""
+    everything_ok = True
+    for plugin_id, results in all_results.items():
+        print(f"\n=== {plugin_id} ===")
+        for r in results:
+            if r.ok:
+                status = "PASS"
+                detail = ""
+                if r.golden_checked:
+                    detail = " (golden ✓)"
+                if r.update_error is not None:
+                    detail += f" (update warn: {r.update_error})"
+            else:
+                everything_ok = False
+                if r.error is not None:
+                    status, detail = "FAIL", f" error={r.error}"
+                elif r.overflow is not None:
+                    status, detail = "FAIL", f" overflow bbox={r.overflow}"
+                elif r.golden_ok is False:
+                    status = "FAIL"
+                    detail = f" golden drift: {r.golden_diff_pixels}px (max Δ={r.golden_max_delta})"
+                else:
+                    status, detail = "FAIL", ""
+            print(f"  [{status}] {r.size_label:>7}  {r.mode}{detail}")
+    print()
+    return everything_ok
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description="Check a plugin renders safely across sizes & screens")
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument('--plugin', '-p', help='Plugin id to check')
+    group.add_argument('--all', action='store_true', help='Check every discovered plugin')
+    parser.add_argument('--plugin-dir', '-d', default=None, help='Directory to search for plugins')
+    parser.add_argument('--sizes', default=None, help='Comma-separated WxH list (default: all supported)')
+    parser.add_argument('--config', '-c', default='{}', help='Plugin config overrides as JSON')
+    parser.add_argument('--mock-data', '-m', default=None, help='Path to JSON file with mock cache data')
+    parser.add_argument('--out-dir', '-o', default=None, help='Also dump rendered PNGs here')
+    parser.add_argument('--skip-update', action='store_true', help='Skip calling update()')
+    parser.add_argument('--update-golden', action='store_true', help='Write/refresh golden images')
+    parser.add_argument('--golden-dir', default=None, help='Override golden dir (default: <plugin>/test/golden)')
+    parser.add_argument('--freeze-time', default=None,
+                        help='Freeze wall clock, e.g. "2025-08-01 15:25:00" (for time-dependent plugins)')
+    args = parser.parse_args()
+
+    search_dirs = [args.plugin_dir] if args.plugin_dir else DEFAULT_SEARCH_DIRS
+    sizes = parse_sizes(args.sizes)
+
+    try:
+        config = json.loads(args.config)
+    except json.JSONDecodeError as e:
+        logger.error("Invalid --config JSON: %s", e)
+        return 2
+    if not isinstance(config, dict):
+        logger.error("--config must be a JSON object, got %s", type(config).__name__)
+        return 2
+
+    mock_data = {}
+    if args.mock_data:
+        mock_path = Path(args.mock_data)
+        if not mock_path.exists():
+            logger.error("Mock data file not found: %s", args.mock_data)
+            return 2
+        with open(mock_path) as f:
+            mock_data = json.load(f)
+        if not isinstance(mock_data, dict):
+            logger.error("--mock-data must be a JSON object (key -> cache value), got %s",
+                         type(mock_data).__name__)
+            return 2
+
+    plugin_ids = discover_plugins(search_dirs) if args.all else [args.plugin]
+    if not plugin_ids:
+        logger.error("No plugins found in: %s", search_dirs)
+        return 2
+
+    out_dir = Path(args.out_dir) if args.out_dir else None
+    golden_dir_override = Path(args.golden_dir) if args.golden_dir else None
+
+    all_results: Dict[str, List[RenderResult]] = {}
+    for plugin_id in plugin_ids:
+        all_results[plugin_id] = check_one(
+            plugin_id=plugin_id, search_dirs=search_dirs, sizes=sizes,
+            mock_data=mock_data, config=config, run_update=not args.skip_update,
+            out_dir=out_dir, update_golden=args.update_golden,
+            golden_dir_override=golden_dir_override, freeze_time=args.freeze_time,
+        )
+
+    # When refreshing goldens we skip drift comparison, but a crash or overflow
+    # still means the plugin is broken — never let --update-golden mask that.
+    ok = print_report(all_results)
+    return 0 if ok else 1
+
+
+if __name__ == '__main__':
+    sys.exit(main())

scripts/debug/debug_web_manual.py

@@ -67,8 +67,9 @@ def main():
         print("   📍 Will run on: http://0.0.0.0:5000")
         print("   ⏹️  Press Ctrl+C to stop")
 
-        # Run the app (this should start the server)
+        # Run the app (debug mode controlled by env var to satisfy security scanners)
-        app.run(host='0.0.0.0', port=5000, debug=True)
+        _debug = os.environ.get('LEDMATRIX_FLASK_DEBUG', '0') == '1'
+        app.run(host='0.0.0.0', port=5000, debug=_debug)
 
     except KeyboardInterrupt:
         print("\n   ⏹️  Server stopped by user")

scripts/install/one-shot-install.sh

@@ -340,8 +340,13 @@ main() {
     echo ""
     
     # Execute with proper error handling and non-interactive mode
-    # Temporarily disable errexit to capture exit code instead of exiting immediately
+    # Temporarily disable errexit AND the ERR trap to capture exit code instead of
+    # exiting immediately. `set +e` alone does not suppress the ERR trap, so without
+    # `trap '' ERR` a non-zero exit from first_time_install.sh would trigger on_error
+    # here with the generic "Main installation" message instead of the detailed
+    # if/else handling below.
     set +e
+    trap '' ERR
 
     # Check /tmp permissions - only fix if actually wrong (common in automated scenarios)
     # When running manually, /tmp usually has correct permissions (1777)
@@ -370,6 +375,7 @@ main() {
         sudo -E env TMPDIR=/tmp LEDMATRIX_ASSUME_YES=1 bash ./first_time_install.sh -y </dev/null
     fi
     INSTALL_EXIT_CODE=$?
+    trap 'on_error $LINENO' ERR  # Re-enable ERR trap
     set -e  # Re-enable errexit
     
     if [ $INSTALL_EXIT_CODE -eq 0 ]; then

scripts/install_dependencies_apt.py

@@ -6,12 +6,39 @@ then falls back to pip with --break-system-packages
 
 import subprocess
 import sys
+import tempfile
 import warnings
+from collections import deque
 from pathlib import Path
 
+# How many trailing lines of a failed command's output to keep for the
+# end-of-run failure summary. Keeps the root cause near the end of the log,
+# which is where first_time_install.sh's error handler tails from.
+ERROR_TAIL_LINES = 15
+
+
+def _run(cmd):
+    """Run a command, streaming combined stdout/stderr to a temp file.
+
+    Returns (success, output) instead of raising, so callers can report
+    *why* a command failed rather than just that it failed. `output` is
+    bounded to the last ERROR_TAIL_LINES lines so failures from very
+    chatty commands (e.g. pip build logs) don't get buffered in memory.
+    """
+    with tempfile.TemporaryFile(mode='w+b') as f:
+        result = subprocess.run(cmd, stdout=f, stderr=subprocess.STDOUT)  # nosec B603 B607 - hardcoded apt/pip args  # nosemgrep
+        f.seek(0)
+        # Stream line-by-line so only the last ERROR_TAIL_LINES are ever held
+        # in memory, regardless of how much output the command produced.
+        tail = deque(
+            (line.decode('utf-8', errors='replace').rstrip('\n') for line in f),
+            maxlen=ERROR_TAIL_LINES,
+        )
+    return result.returncode == 0, '\n'.join(tail)
+
+
 def install_via_apt(package_name):
-    """Try to install a package via apt."""
+    """Try to install a package via apt. Returns (success, output)."""
-    try:
     # Map pip package names to apt package names
     apt_package_map = {
         'flask': 'python3-flask',
@@ -32,20 +59,14 @@ def install_via_apt(package_name):
     apt_package = apt_package_map.get(package_name, f'python3-{package_name}')
 
     print(f"Trying to install {apt_package} via apt...")
-        subprocess.check_call([
+    success, output = _run(['sudo', 'apt', 'install', '-y', apt_package])
-            'sudo', 'apt', 'update'
+    if success:
-        ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        
-        subprocess.check_call([
-            'sudo', 'apt', 'install', '-y', apt_package
-        ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        
         print(f"Successfully installed {apt_package} via apt")
-        return True
+        return True, ""
+
+    print(f"Failed to install {apt_package} via apt, will try pip")
+    return False, output
 
-    except subprocess.CalledProcessError:
-        print(f"Failed to install {package_name} via apt, will try pip")
-        return False
 
 def install_via_pip(package_name):
     """Install a package via pip with --break-system-packages and --prefer-binary.
@@ -54,34 +75,65 @@ def install_via_pip(package_name):
     Debian/Ubuntu-based systems without a virtual environment.
     --prefer-binary prefers pre-built wheels over source distributions to avoid
     exhausting /tmp space during compilation.
+
+    Returns (success, output).
     """
-    try:
     print(f"Installing {package_name} via pip...")
-        subprocess.check_call([
+    success, output = _run([
         sys.executable, '-m', 'pip', 'install', '--break-system-packages', '--prefer-binary', package_name
     ])
+    if success:
         print(f"Successfully installed {package_name} via pip")
-        return True
+        return True, ""
-    except subprocess.CalledProcessError as e:
+
-        print(f"Failed to install {package_name} via pip: {e}")
+    print(f"Failed to install {package_name} via pip (see failure summary at end of log)")
-        return False
+    return False, output
+
+
+# Distribution (pip/apt) names whose importable module name differs.
+IMPORT_NAME_MAP = {
+    'python-dateutil': 'dateutil',
+    'websocket-client': 'websocket',
+}
+
 
 def check_package_installed(package_name):
     """Check if a package is already installed."""
+    import_name = IMPORT_NAME_MAP.get(package_name, package_name)
     # Suppress deprecation warnings when checking if packages are installed
     # (we're just checking, not using them)
     with warnings.catch_warnings():
         warnings.filterwarnings('ignore', category=DeprecationWarning)
         try:
-            __import__(package_name)
+            __import__(import_name)
             return True
         except ImportError:
             return False
 
+
+def print_failure_summary(failed_packages, failure_details):
+    print("\n" + "=" * 60)
+    print("DEPENDENCY INSTALLATION FAILURES - DETAILS")
+    print("=" * 60)
+    for package in failed_packages:
+        print(f"\nPackage: {package}")
+        print("-" * 40)
+        output = failure_details.get(package, "").strip()
+        if not output:
+            print("  (no output captured)")
+            continue
+        for line in output.splitlines()[-ERROR_TAIL_LINES:]:
+            print(f"  {line}")
+    print("=" * 60)
+
+
 def main():
     """Main installation function."""
     print("Installing dependencies for LED Matrix Web Interface V2...")
 
+    print("Refreshing apt package index...")
+    _run(['sudo', 'apt', 'update'])  # best-effort; individual installs surface their own errors
+
     # List of required packages
     required_packages = [
         'flask',
@@ -100,6 +152,7 @@ def main():
     ]
 
     failed_packages = []
+    failure_details = {}
 
     for package in required_packages:
         if check_package_installed(package):
@@ -107,9 +160,12 @@ def main():
             continue
 
         # Try apt first, then pip
-        if not install_via_apt(package):
+        ok, apt_output = install_via_apt(package)
-            if not install_via_pip(package):
+        if not ok:
+            ok, pip_output = install_via_pip(package)
+            if not ok:
                 failed_packages.append(package)
+                failure_details[package] = pip_output or apt_output
 
     # Install packages that don't have apt equivalents
     special_packages = [
@@ -124,8 +180,10 @@ def main():
     ]
 
     for package in special_packages:
-        if not install_via_pip(package):
+        ok, pip_output = install_via_pip(package)
+        if not ok:
             failed_packages.append(package)
+            failure_details[package] = pip_output
 
     # Install rgbmatrix module from local source (optional - may already be installed in Step 6)
     # Check if already installed first
@@ -133,7 +191,6 @@ def main():
         print("rgbmatrix module already installed, skipping...")
     else:
         print("Installing rgbmatrix module from local source...")
-        try:
         # Get project root (parent of scripts directory)
         PROJECT_ROOT = Path(__file__).parent.parent
         rgbmatrix_path = PROJECT_ROOT / 'rpi-rgb-led-matrix-master' / 'bindings' / 'python'
@@ -143,26 +200,27 @@ def main():
             if setup_py.exists():
                 # Try installing - use regular install, not editable mode
                 # This is optional for web interface and should already be installed in Step 6
-                    subprocess.check_call([
+                ok, output = _run([sys.executable, '-m', 'pip', 'install', '--break-system-packages', str(rgbmatrix_path)])
-                        sys.executable, '-m', 'pip', 'install', '--break-system-packages', str(rgbmatrix_path)
+                if ok:
-                    ], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                     print("rgbmatrix module installed successfully")
+                else:
+                    # Don't fail the whole installation - rgbmatrix is optional for web interface
+                    # and should be installed in Step 6 of first_time_install.sh
+                    print("Warning: Failed to install rgbmatrix module:")
+                    for line in output.strip().splitlines()[-ERROR_TAIL_LINES:]:
+                        print(f"  {line}")
+                    print("  This is normal if rgbmatrix hasn't been built yet (Step 6).")
+                    print("  The web interface will work without it.")
             else:
                 print("Warning: rgbmatrix setup.py not found, module may need to be built first")
                 print("  This is normal if Step 6 hasn't completed yet.")
         else:
             print("Warning: rgbmatrix source not found (this is normal if Step 6 hasn't run yet)")
-        except subprocess.CalledProcessError as e:
-            # Don't fail the whole installation - rgbmatrix is optional for web interface
-            # and should be installed in Step 6 of first_time_install.sh
-            print(f"Warning: Failed to install rgbmatrix module: {e}")
-            print("  This is normal if rgbmatrix hasn't been built yet (Step 6).")
-            print("  The web interface will work without it.")
-            # Don't add to failed_packages since it's optional
 
     if failed_packages:
         print(f"\nFailed to install the following packages: {failed_packages}")
         print("You may need to install them manually or check your system configuration.")
+        print_failure_summary(failed_packages, failure_details)
         return False
     else:
         print("\nAll dependencies installed successfully!")

scripts/render_plugin.py

@@ -17,7 +17,6 @@ import os
 import json
 import argparse
 from pathlib import Path
-from typing import Any, Dict, Optional, Sequence, Union
 
 # Add project root to path
 PROJECT_ROOT = Path(__file__).resolve().parent.parent
@@ -28,49 +27,15 @@ os.environ['EMULATOR'] = 'true'
 
 # Import logger after path setup so src.logging_config is importable
 from src.logging_config import get_logger  # noqa: E402
+from src.plugin_system.testing.loading import (  # noqa: E402
+    find_plugin_dir, load_manifest, load_config_defaults,
+)
 logger = get_logger("[Render Plugin]")
 
 MIN_DIMENSION = 1
 MAX_DIMENSION = 512
 
 
-def find_plugin_dir(plugin_id: str, search_dirs: Sequence[Union[str, Path]]) -> Optional[Path]:
-    """Find a plugin directory by searching multiple paths."""
-    from src.plugin_system.plugin_loader import PluginLoader
-    loader = PluginLoader()
-    for search_dir in search_dirs:
-        search_path = Path(search_dir)
-        if not search_path.exists():
-            continue
-        result = loader.find_plugin_directory(plugin_id, search_path)
-        if result:
-            return Path(result)
-    return None
-
-
-def load_manifest(plugin_dir: Path) -> Dict[str, Any]:
-    """Load and return manifest.json from plugin directory."""
-    manifest_path = plugin_dir / 'manifest.json'
-    if not manifest_path.exists():
-        raise FileNotFoundError(f"No manifest.json in {plugin_dir}")
-    with open(manifest_path, 'r') as f:
-        return json.load(f)
-
-
-def load_config_defaults(plugin_dir: Path) -> Dict[str, Any]:
-    """Extract default values from config_schema.json."""
-    schema_path = plugin_dir / 'config_schema.json'
-    if not schema_path.exists():
-        return {}
-    with open(schema_path, 'r') as f:
-        schema = json.load(f)
-    defaults: Dict[str, Any] = {}
-    for key, prop in schema.get('properties', {}).items():
-        if 'default' in prop:
-            defaults[key] = prop['default']
-    return defaults
-
-
 def main() -> int:
     """Load a plugin, call update() + display(), and save the result as a PNG image."""
     parser = argparse.ArgumentParser(description='Render a plugin display to a PNG image')

src/backup_manager.py

@@ -410,8 +410,8 @@ def validate_backup(zip_path: Path) -> Tuple[bool, str, Dict[str, Any]]:
             try:
                 manifest_raw = zf.read(MANIFEST_NAME).decode("utf-8")
                 manifest = json.loads(manifest_raw)
-            except (OSError, UnicodeDecodeError, json.JSONDecodeError) as e:
+            except (OSError, UnicodeDecodeError, json.JSONDecodeError):
-                return False, f"Invalid manifest.json: {e}", {}
+                return False, "Invalid manifest.json", {}
 
             if not isinstance(manifest, dict) or "schema_version" not in manifest:
                 return False, "Invalid manifest structure", {}
@@ -456,8 +456,8 @@ def validate_backup(zip_path: Path) -> Tuple[bool, str, Dict[str, Any]]:
             return True, "", result_manifest
     except zipfile.BadZipFile:
         return False, "File is not a valid ZIP archive", {}
-    except OSError as e:
+    except OSError:
-        return False, f"Could not read backup: {e}", {}
+        return False, "Could not read backup", {}
 
 
 # ---------------------------------------------------------------------------

src/cache_manager.py

@@ -1,3 +1,28 @@
+"""
+Cache Manager — multi-tier response cache for the LEDMatrix application.
+
+:class:`CacheManager` provides a unified caching layer used by all plugins
+to reduce external API calls and survive network outages gracefully.
+
+Two storage tiers
+-----------------
+* **Memory tier** (:class:`~src.cache.memory_cache.MemoryCache`): fast LRU
+  cache (up to 1 000 entries by default).  Hit on this tier before touching
+  disk.
+* **Disk tier** (:class:`~src.cache.disk_cache.DiskCache`): filesystem-backed
+  persistent store that survives process restarts.
+
+Data written to cache is serialised as JSON.  :class:`DateTimeEncoder` handles
+``datetime`` objects transparently so callers don't have to pre-serialise them.
+
+Typical plugin usage::
+
+    data = self.cache_manager.get_cached_data('my_key', max_age=300)
+    if data is None:
+        data = fetch_from_api()
+        self.cache_manager.save_cache('my_key', data)
+"""
+
 import json
 import os
 import time
@@ -15,7 +40,10 @@ from src.cache.cache_metrics import CacheMetrics
 from src.logging_config import get_logger
 
 class DateTimeEncoder(json.JSONEncoder):
+    """JSON encoder that serialises ``datetime`` objects as ISO-8601 strings."""
+
     def default(self, obj):
+        """Return ISO-8601 string for datetime; delegate all other types to the base encoder."""
         if isinstance(obj, datetime):
             return obj.isoformat()
         return super().default(obj)

src/common/scroll_helper.py

@@ -347,34 +347,40 @@ class ScrollHelper:
         return self._get_visible_portion_integer(start_x_int, end_x_int)
     
     def _get_visible_portion_integer(self, start_x: int, end_x: int) -> Image.Image:
-        """Fast integer pixel extraction (no interpolation)."""
+        """Fast integer pixel extraction (no interpolation).
-        # Fast numpy array slicing for normal case (no wrap-around)
+
-        if end_x <= self.cached_image.width:
+        Uses Image.frombytes instead of Image.fromarray: frombytes skips
-            # Normal case: single slice - fastest path
+        numpy's array-protocol overhead and is ~50% faster for the display-sized
-            frame_array = self.cached_array[:, start_x:end_x]
+        slices (128×32 = 12 KB) used here.
-            # Convert to PIL Image (minimal overhead)
+        """
-            return Image.fromarray(frame_array)
+        _size = (self.display_width, self.display_height)
+        img_w = self.cached_image.width
+
+        if end_x <= img_w:
+            # Normal case: single contiguous slice (fastest path)
+            frame_array = np.ascontiguousarray(self.cached_array[:, start_x:end_x])
+            return Image.frombytes('RGB', _size, frame_array.tobytes())
         else:
-            # Wrap-around case: combine two slices using numpy
+            # Ensure frame buffer is allocated for all non-simple paths
-            width1 = self.cached_image.width - start_x
-            if width1 > 0:
-                # Use pre-allocated buffer for output
             if self._frame_buffer is None or self._frame_buffer.shape != (self.display_height, self.display_width, 3):
                 self._frame_buffer = np.zeros((self.display_height, self.display_width, 3), dtype=np.uint8)
 
-                # First part from end of image (fast numpy slice)
+            width1 = img_w - start_x
+            if width1 > 0:
+                # Wrap-around: tail of image + head of image
                 self._frame_buffer[:, :width1] = self.cached_array[:, start_x:]
-                
-                # Second part from beginning of image
                 remaining_width = self.display_width - width1
                 self._frame_buffer[:, width1:] = self.cached_array[:, :remaining_width]
-                
-                # Convert combined buffer to PIL Image
-                return Image.fromarray(self._frame_buffer)
             else:
-                # Edge case: start_x >= image width, wrap to beginning
+                # Edge case: start_x at or past image end — show from beginning,
-                frame_array = self.cached_array[:, :self.display_width]
+                # clamped to available width (scroll_position should wrap before
-                return Image.fromarray(frame_array)
+                # reaching this state in normal operation).
+                available = min(self.display_width, img_w)
+                self._frame_buffer[:, :available] = self.cached_array[:, :available]
+                if available < self.display_width:
+                    self._frame_buffer[:, available:] = 0
+
+            return Image.frombytes('RGB', _size, self._frame_buffer.tobytes())
     
     def _get_visible_portion_subpixel(self, start_x_int: int, fractional: float) -> Image.Image:
         """

src/config_manager.py

@@ -1,3 +1,29 @@
+"""
+Config Manager — reads, writes, and validates ``config/config.json``.
+
+:class:`ConfigManager` is the single owner of the on-disk configuration
+files:
+
+* ``config/config.json``         — main user-editable configuration.
+* ``config/config_secrets.json`` — sensitive values (API keys, tokens).
+
+All writes go through :class:`~src.config_manager_atomic.AtomicConfigManager`
+which performs a backup before overwriting, validates the result, and rolls
+back on error.  This makes config corruption essentially impossible.
+
+Plugin configuration
+--------------------
+Plugin configs are stored inside ``config.json`` under the plugin's ID key
+and survive plugin reinstalls.  Use :meth:`ConfigManager.update_plugin_config`
+to write plugin settings; never write directly to the plugin directory.
+
+Hot-reload
+----------
+:class:`~src.config_service.ConfigService` wraps ``ConfigManager`` and
+detects file changes, broadcasting the new config to registered listeners
+without requiring a restart.
+"""
+
 import json
 import os
 import logging
@@ -17,6 +43,13 @@ from src.common.permission_utils import (
 )
 
 class ConfigManager:
+    """
+    Reads and writes the main application configuration files.
+
+    Wraps :class:`~src.config_manager_atomic.AtomicConfigManager` for safe
+    atomic writes with automatic backup and rollback.  Also exposes helpers
+    for plugin configuration persistence and secret-field masking.
+    """
     def __init__(self, config_path: Optional[str] = None, secrets_path: Optional[str] = None) -> None:
         # Use current working directory as base
         self.config_path: str = config_path or "config/config.json"
@@ -29,9 +62,11 @@ class ConfigManager:
         self._atomic_manager: Optional[AtomicConfigManager] = None
 
     def get_config_path(self) -> str:
+        """Return the path to the main config file (``config/config.json``)."""
         return self.config_path
 
     def get_secrets_path(self) -> str:
+        """Return the path to the secrets file (``config/config_secrets.json``)."""
         return self.secrets_path
     
     def _get_atomic_manager(self) -> AtomicConfigManager:

src/display_controller.py

@@ -1,3 +1,25 @@
+"""
+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
@@ -28,6 +50,24 @@ DEFAULT_DYNAMIC_DURATION_CAP = 180.0
 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")
@@ -138,6 +178,10 @@ class DisplayController:
         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
@@ -149,6 +193,10 @@ class DisplayController:
         self.wifi_status_active = False
         self.wifi_status_expires_at: Optional[float] = 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
@@ -321,6 +369,8 @@ class DisplayController:
                             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)
                         
                         # Show progress
                         progress_pct = int((loaded_count / enabled_count) * 100)
@@ -367,11 +417,39 @@ class DisplayController:
         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.config.get('display', {}).get('hardware', {}).get('brightness', 90)
+        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)
+
+        self.config_service.subscribe(_controller_config_change)
+
         # Publish initial on-demand state
         try:
             self._publish_on_demand_state()
@@ -533,17 +611,24 @@ class DisplayController:
             logger.debug("Schedule is disabled - display always active")
             return
 
-        # Get configured timezone, default to UTC
+        # Lazily build the timezone object once; reuse on every subsequent call.
+        if self._tz is None:
             timezone_str = self.config.get('timezone', 'UTC')
             try:
-            tz = pytz.timezone(timezone_str)
+                self._tz = pytz.timezone(timezone_str)
             except pytz.UnknownTimeZoneError:
-            logger.warning(f"Unknown timezone '{timezone_str}', using UTC")
+                logger.warning("Unknown timezone '%s', using UTC", timezone_str)
-            tz = pytz.UTC
+                self._tz = pytz.UTC
 
-        # Use timezone-aware current time
+        current_time = datetime.now(self._tz)
-        current_time = datetime.now(tz)
+        # Gate: schedule state can only change on a minute boundary, so skip
-        current_day = current_time.strftime('%A').lower()  # Get day name (monday, tuesday, etc.)
+        # 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
@@ -632,8 +717,8 @@ class DisplayController:
             Target brightness level (dim_brightness if in dim period,
             normal brightness otherwise)
         """
-        # Get normal brightness from config
+        # Opt #2: use cached brightness rather than re-traversing config dict
-        normal_brightness = self.config.get('display', {}).get('hardware', {}).get('brightness', 90)
+        normal_brightness = self._normal_brightness
 
         # If display is OFF via schedule, don't process dim schedule
         if not self.is_display_active:
@@ -647,15 +732,21 @@ class DisplayController:
             self.is_dimmed = False
             return normal_brightness
 
-        # Get configured timezone
+        # 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:
-            tz = pytz.timezone(timezone_str)
+                self._tz = pytz.timezone(timezone_str)
             except pytz.UnknownTimeZoneError:
-            logger.warning(f"Unknown timezone '{timezone_str}' in dim schedule, using UTC")
+                logger.warning("Unknown timezone '%s' in dim schedule, using UTC", timezone_str)
-            tz = pytz.UTC
+                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_time = datetime.now(tz)
         current_day = current_time.strftime('%A').lower()
         current_time_only = current_time.time()
 
@@ -703,10 +794,12 @@ class DisplayController:
                 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(f"Invalid dim schedule time format: {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):
@@ -1382,6 +1475,36 @@ class DisplayController:
         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 _check_live_priority(self):
         """
         Check all plugins for live priority content.
@@ -1483,12 +1606,8 @@ class DisplayController:
                     rp = vc.render_pipeline if (vc and vc.render_pipeline) else None
                     width = self.display_manager.width
 
-                    # Advance local position at Vegas scroll speed (px/s → px/tick)
+                    # Opt #2: use pre-cached scroll speed (constant for the run)
-                    vegas_speed = (
+                    vegas_speed = self._scroll_speed
-                        self.config.get('display', {})
-                            .get('vegas_scroll', {})
-                            .get('scroll_speed', 75)
-                    )
                     local_x = getattr(self, '_follower_local_x', None)
                     if local_x is None:
                         local_x = float(width)  # safe start (past pre-roll guard)
@@ -1573,15 +1692,7 @@ class DisplayController:
                 # Check for live priority content and switch to it immediately
                 if not self.on_demand_active and not wifi_status_data:
                     live_priority_mode = self._check_live_priority()
-                    if live_priority_mode and self.current_display_mode != live_priority_mode:
+                    self._apply_live_priority(live_priority_mode)
-                        logger.info("Live content detected - switching immediately to %s", live_priority_mode)
-                        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
 
                 # Vegas scroll mode - continuous ticker across all plugins
                 # Priority: on-demand > wifi-status > live-priority > vegas > normal rotation
@@ -1628,7 +1739,8 @@ class DisplayController:
 
                 manager_to_display = None
                 
-                logger.info(f"Processing mode: {active_mode}, available_modes: {len(self.available_modes)}, plugin_modes: {list(self.plugin_modes.keys())}")
+                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:
@@ -1664,9 +1776,14 @@ class DisplayController:
                     try:
                         logger.debug(f"Calling display() for {active_mode} with force_clear={self.force_change}")
                         if hasattr(manager_to_display, 'display'):
-                            # Check if plugin accepts display_mode parameter
+                            # Opt #1: look up (or compute once) whether display() accepts display_mode
-                            import inspect
+                            _cache_key = plugin_id
-                            sig = inspect.signature(manager_to_display.display)
+                            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]
 
                             # Use PluginExecutor for safe execution with timeout
                             if self.plugin_manager and hasattr(self.plugin_manager, 'plugin_executor'):
@@ -1674,7 +1791,7 @@ class DisplayController:
                                     manager_to_display,
                                     plugin_id,
                                     force_clear=self.force_change,
-                                    display_mode=active_mode if 'display_mode' in sig.parameters else None
+                                    display_mode=active_mode if _accepts_display_mode else None
                                 )
                                 # execute_display returns bool, convert to expected format
                                 if result:
@@ -1683,7 +1800,7 @@ class DisplayController:
                                     result = False  # Failed
                             else:
                                 # Fallback to direct call if executor not available
-                                if 'display_mode' in sig.parameters:
+                                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)
@@ -1820,9 +1937,9 @@ class DisplayController:
                     min_duration = base_duration
                     if dynamic_enabled:
                         # Try to get plugin-calculated cycle duration first
-                        logger.info("Attempting to get cycle duration for mode %s", active_mode)
+                        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.info("Got cycle duration: %s", plugin_cycle_duration)
+                        logger.debug("Got cycle duration: %s", plugin_cycle_duration)
                         
                         # Get caps for validation
                         plugin_cap = self._plugin_dynamic_cap(manager_to_display)
@@ -1962,7 +2079,7 @@ class DisplayController:
                         if needs_high_fps:
                             # Ultra-smooth FPS for scrolling plugins (8ms = 125 FPS)
                             display_interval = 0.008
-                            logger.info(
+                            logger.debug(
                                 "Entering high-FPS loop for %s with display_interval=%.3fs (%.1f FPS)",
                                 active_mode,
                                 display_interval,
@@ -1972,7 +2089,7 @@ class DisplayController:
                             while True:
                                 try:
                                     # Pass display_mode to maintain sticky manager state
-                                    if 'display_mode' in sig.parameters:
+                                    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)
@@ -2014,7 +2131,7 @@ class DisplayController:
                         else:
                             # Normal FPS for other plugins (1 second)
                             display_interval = 1.0
-                            logger.info(
+                            logger.debug(
                                 "Entering normal FPS loop for %s with display_interval=%.3fs",
                                 active_mode,
                                 display_interval
@@ -2036,7 +2153,7 @@ class DisplayController:
 
                                 try:
                                     # Pass display_mode to maintain sticky manager state
-                                    if 'display_mode' in sig.parameters:
+                                    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)
@@ -2069,6 +2186,23 @@ class DisplayController:
                                     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
@@ -2333,6 +2467,30 @@ class DisplayController:
             self.wifi_status_active = False
             self.wifi_status_expires_at = None
 
+    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."""
         # Shutdown config service if it exists
@@ -2347,6 +2505,7 @@ class DisplayController:
         logger.info("Cleanup complete.")
 
 def main():
+    """Application entry point — create a DisplayController and run until interrupted."""
     controller = DisplayController()
     controller.run()
 

src/display_manager.py

@@ -1,3 +1,28 @@
+"""
+Display Manager — hardware abstraction layer for the RGB LED matrix.
+
+This module provides :class:`DisplayManager`, the single interface between
+application code and the physical (or emulated) LED panel.
+
+Key responsibilities
+--------------------
+* Initialise the ``RGBMatrix`` (hardware) or ``RGBMatrixEmulator`` depending
+  on the ``EMULATOR`` environment variable.
+* Expose a PIL ``Image``/``ImageDraw`` canvas that plugins draw into, then
+  flush it to the matrix via double-buffering (:meth:`DisplayManager.update_display`).
+* Load and cache TTF/BDF fonts; expose ``draw_text`` for consistent text rendering.
+* Provide ``width`` / ``height`` properties — always use these instead of
+  hard-coding display dimensions.
+* Write periodic PNG snapshots to ``/tmp/led_matrix_preview.png`` for the
+  web-interface live preview.
+* Track scrolling state and gate deferred updates so plugins don't race with
+  an in-progress scroll.
+
+Singleton: only one ``DisplayManager`` instance exists per process.  The
+first call to ``DisplayManager(config)`` creates it; subsequent calls return
+the same object.
+"""
+
 import json
 import os
 import tempfile
@@ -18,6 +43,24 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)  # Set to INFO level
 
 class DisplayManager:
+    """
+    Singleton hardware abstraction layer for the RGB LED matrix.
+
+    Plugins should never interact with ``RGBMatrix`` directly; they use this
+    class to draw content and call :meth:`update_display` to push frames to
+    the panel.
+
+    Typical plugin usage::
+
+        canvas = Image.new('RGB', (self.display_manager.width,
+                                   self.display_manager.height), (0, 0, 0))
+        draw = ImageDraw.Draw(canvas)
+        # ... draw content ...
+        self.display_manager.image = canvas
+        self.display_manager.draw = ImageDraw.Draw(self.display_manager.image)
+        self.display_manager.update_display()
+    """
+
     _instance = None
     _initialized = False
 
@@ -33,6 +76,10 @@ class DisplayManager:
         self._suppress_test_pattern = suppress_test_pattern
         # When True, update_display() and clear() skip hardware writes (used during off-screen content capture)
         self._capture_mode_active = False
+        # Text-width measurement cache: (text, id(font)) -> pixel_width
+        # Avoids re-measuring the same string+font on every display() call.
+        # Cleared on _load_fonts() so stale entries don't survive a font reload.
+        self._text_width_cache: Dict[tuple, int] = {}
         # Snapshot settings for web preview integration (service writes, web reads)
         self._snapshot_path = "/tmp/led_matrix_preview.png"  # nosec B108 - fixed path intentional; web UI reads same path
         self._snapshot_min_interval_sec = 0.2  # max ~5 fps
@@ -110,9 +157,10 @@ class DisplayManager:
                     options.rp1_rio = runtime_config.get('rp1_rio')
                 else:
                     logger.warning(
-                        "rp1_rio is set in config but the current RGBMatrixOptions "
+                        "rp1_rio is set in config but the installed rgbmatrix library does "
-                        "implementation does not support it (RGBMatrixEmulator or older "
+                        "not support it — the library was likely built without Pi 5 RP1 "
-                        "library version) — value will be ignored"
+                        "support (mmap to 0x3f000000 instead of RP1 chip). "
+                        "Fix: sudo RPI_RGB_FORCE_REBUILD=1 ./first_time_install.sh"
                     )
             
             logger.info(f"Initializing RGB Matrix with settings: rows={options.rows}, cols={options.cols}, chain_length={options.chain_length}, parallel={options.parallel}, hardware_mapping={options.hardware_mapping}")
@@ -189,7 +237,7 @@ class DisplayManager:
                         json.dump(_hw_status, _f)
                         _f.flush()
                         os.fsync(_f.fileno())
-                    os.chmod(_tmp_path, 0o600)
+                    os.chmod(_tmp_path, 0o644)
                     os.replace(_tmp_path, _status_path)
                 except Exception:
                     try:
@@ -436,6 +484,9 @@ class DisplayManager:
 
     def _load_fonts(self):
         """Load fonts with proper error handling."""
+        # Font objects get new id()s after reload, so the text-width cache would
+        # return stale measurements keyed on the old ids.  Clear it here.
+        self._text_width_cache.clear()
         try:
             # Load Press Start 2P font
             self.regular_font = ImageFont.truetype("assets/fonts/PressStart2P-Regular.ttf", 8)
@@ -496,22 +547,32 @@ class DisplayManager:
 
 
     def get_text_width(self, text, font):
-        """Get the width of text when rendered with the given font."""
+        """Get the width of text when rendered with the given font.
+
+        Results are cached by (text, font identity) so plugins that measure
+        the same string every frame (e.g. to centre a score) pay only one
+        measurement per unique (text, font) pair.
+        """
+        cache_key = (text, id(font))
+        cached = self._text_width_cache.get(cache_key)
+        if cached is not None:
+            return cached
+
         try:
             if isinstance(font, freetype.Face):
-                # For FreeType faces, calculate width using freetype
                 width = 0
                 for char in text:
                     font.load_char(char)
                     width += font.glyph.advance.x >> 6
-                return width
             else:
-                # For PIL fonts, use textbbox
                 bbox = self.draw.textbbox((0, 0), text, font=font)
-                return bbox[2] - bbox[0]
+                width = bbox[2] - bbox[0]
-        except Exception as e:
+        except (AttributeError, TypeError, ValueError, OSError) as e:
-            logger.error(f"Error getting text width: {e}")
+            logger.error("Error getting text width: %s", e)
-            return 0  # Return 0 as fallback
+            return 0
+
+        self._text_width_cache[cache_key] = width
+        return width
 
     def get_font_height(self, font):
         """Get the height of the given font for line spacing purposes."""

src/font_manager.py

@@ -1,3 +1,30 @@
+"""
+Font Manager — TTF/BDF font loading, caching, and dynamic registration.
+
+:class:`FontManager` serves two purposes:
+
+1. **System fonts** — loads the configured small/medium/large TTF fonts (and
+   their BDF bitmap equivalents) at startup, caches metrics, and exposes them
+   via ``DisplayManager`` attributes (``small_font``, ``medium_font``, etc.).
+
+2. **Plugin fonts** — lets plugins register their own fonts at runtime via
+   :meth:`FontManager.register_manager_font` and resolve them later via
+   :meth:`FontManager.resolve_font`.  Registered fonts are namespaced by
+   plugin ID so they cannot collide.
+
+Font sources
+------------
+* Local paths relative to the project root.
+* Remote URLs — downloaded once, cached to disk, and never re-fetched while
+  the cached copy is fresh.
+
+BDF fallback
+------------
+Pixel-accurate LED fonts are stored as ``.bdf`` (Bitmap Distribution Format)
+files.  When PIL cannot measure BDF glyphs natively, ``freetype-py`` is used
+for accurate width/height calculations.
+"""
+
 import os
 import logging
 import freetype

src/plugin_system/plugin_loader.py

@@ -5,9 +5,11 @@ Handles plugin module imports, dependency installation, and class instantiation.
 Extracted from PluginManager to improve separation of concerns.
 """
 
+import hashlib
 import json
 import importlib
 import importlib.util
+import os
 import sys
 import subprocess
 import threading
@@ -68,6 +70,11 @@ class PluginLoader:
         Returns:
             Path to plugin directory or None if not found
         """
+        # Sanitize plugin_id — os.path.basename is a CodeQL-recognized path sanitizer
+        plugin_id = os.path.basename(plugin_id or '')
+        if not plugin_id:
+            return None
+
         # Strategy 1: Use mapping from discovery
         if plugin_directories and plugin_id in plugin_directories:
             plugin_dir = plugin_directories[plugin_id]
@@ -75,14 +82,16 @@ class PluginLoader:
                 self.logger.debug("Using plugin directory from discovery mapping: %s", plugin_dir)
                 return plugin_dir
         
-        # Strategy 2: Direct paths
+        # Strategy 2: Direct paths — resolve and validate they stay within plugins_dir
-        plugin_dir = plugins_dir / plugin_id
+        plugins_dir_resolved = plugins_dir.resolve()
-        if plugin_dir.exists():
+        for _candidate_name in (plugin_id, f"ledmatrix-{plugin_id}"):
-            return plugin_dir
+            _candidate = (plugins_dir_resolved / _candidate_name).resolve()
-        
+            try:
-        plugin_dir = plugins_dir / f"ledmatrix-{plugin_id}"
+                _candidate.relative_to(plugins_dir_resolved)
-        if plugin_dir.exists():
+            except ValueError:
-            return plugin_dir
+                continue
+            if _candidate.exists():
+                return _candidate
         
         # Strategy 3: Case-insensitive search
         normalized_id = plugin_id.lower()
@@ -130,6 +139,7 @@ class PluginLoader:
         self,
         plugin_dir: Path,
         plugin_id: str,
+        plugins_dir: Optional[Path] = None,
         timeout: int = 300
     ) -> bool:
         """
@@ -138,25 +148,76 @@ class PluginLoader:
         Args:
             plugin_dir: Plugin directory path
             plugin_id: Plugin identifier
+            plugins_dir: Trusted base plugins directory for path containment check
             timeout: Installation timeout in seconds
 
         Returns:
             True if dependencies installed or not needed, False on error
         """
-        requirements_file = plugin_dir / "requirements.txt"
+        plugin_id = os.path.basename(plugin_id or '')
-        if not requirements_file.exists():
+        if not plugin_id:
+            return False
+
+        # Resolve to a canonical absolute path (normalises .. and symlinks)
+        plugin_dir_real = os.path.realpath(str(plugin_dir))
+
+        if plugins_dir is not None:
+            # Reconstruct the plugin path from a trusted base + a sanitised
+            # directory name.  os.path.basename() is CodeQL's recognised
+            # py/path-injection sanitiser: it strips all directory components
+            # so the result cannot contain traversal sequences.  Joining it
+            # with the resolved, trusted plugins_dir produces a path that
+            # CodeQL considers untainted.
+            plugins_dir_real = os.path.realpath(str(plugins_dir))
+            safe_dir_name = os.path.basename(plugin_dir_real)
+            if not safe_dir_name:
+                self.logger.error("Could not determine plugin directory name for %s", plugin_id)
+                return False
+            safe_plugin_dir = os.path.join(plugins_dir_real, safe_dir_name)
+            if not os.path.isdir(safe_plugin_dir):
+                self.logger.error(
+                    "Plugin directory for %s not found inside plugins dir", plugin_id
+                )
+                return False
+        else:
+            safe_plugin_dir = plugin_dir_real
+            if not os.path.isdir(safe_plugin_dir):
+                self.logger.error("Plugin directory does not exist: %s", plugin_dir)
+                return False
+
+        requirements_file = os.path.join(safe_plugin_dir, "requirements.txt")
+        marker_file = os.path.join(safe_plugin_dir, ".dependencies_installed")
+
+        if not os.path.isfile(requirements_file):
             return True  # No dependencies needed
 
-        # Check if already installed
+        try:
-        marker_path = plugin_dir / ".dependencies_installed"
+            with open(requirements_file, 'rb') as fh:
-        if marker_path.exists():
+                current_hash = hashlib.sha256(fh.read()).hexdigest()
-            self.logger.debug("Dependencies already installed for %s", plugin_id)
+        except OSError as e:
+            self.logger.error("Failed to read requirements.txt for %s: %s", plugin_id, e)
+            return False
+
+        # Skip if requirements.txt hasn't changed since last install
+        if os.path.isfile(marker_file):
+            try:
+                with open(marker_file, 'r', encoding='utf-8') as fh:
+                    stored_hash = fh.read().strip()
+            except OSError as e:
+                self.logger.warning(
+                    "Could not read dependency marker for %s (%s), will reinstall dependencies",
+                    plugin_id, e
+                )
+            else:
+                if stored_hash == current_hash:
+                    self.logger.debug("Dependencies already installed for %s (requirements unchanged)", plugin_id)
                     return True
+                self.logger.info("Requirements changed for %s, reinstalling dependencies", plugin_id)
 
         try:
             self.logger.info("Installing dependencies for plugin %s...", plugin_id)
             result = subprocess.run(
-                [sys.executable, "-m", "pip", "install", "--break-system-packages", "-r", str(requirements_file)],
+                [sys.executable, "-m", "pip", "install", "--break-system-packages", "-r", requirements_file],
                 capture_output=True,
                 text=True,
                 timeout=timeout,
@@ -164,17 +225,37 @@ class PluginLoader:
             )
 
             if result.returncode == 0:
-                # Mark as installed
+                try:
-                marker_path.touch()
+                    with open(marker_file, 'w', encoding='utf-8') as fh:
-                # Set proper file permissions after creating marker
+                        fh.write(current_hash)
-                ensure_file_permissions(marker_path, get_plugin_file_mode())
+                    ensure_file_permissions(Path(marker_file), get_plugin_file_mode())
+                except OSError as marker_err:
+                    self.logger.debug("Could not write dependency marker for %s: %s", plugin_id, marker_err)
                 self.logger.info("Dependencies installed successfully for %s", plugin_id)
                 return True
             else:
+                stderr = result.stderr or ""
+                # uninstall-no-record-file means the package is already present at the
+                # system level (e.g. installed via dnf/apt without a pip RECORD file).
+                # pip can't replace it, but it IS installed — write the marker so we
+                # don't retry on every restart.
+                if "uninstall-no-record-file" in stderr:
+                    self.logger.warning(
+                        "Dependencies for %s include system-managed packages (no pip RECORD). "
+                        "Assuming they are satisfied: %s",
+                        plugin_id, stderr.strip()
+                    )
+                    try:
+                        with open(marker_file, 'w', encoding='utf-8') as fh:
+                            fh.write(current_hash)
+                        ensure_file_permissions(Path(marker_file), get_plugin_file_mode())
+                    except OSError as marker_err:
+                        self.logger.debug("Could not write dependency marker for %s: %s", plugin_id, marker_err)
+                    return True
                 self.logger.warning(
                     "Dependency installation returned non-zero exit code for %s: %s",
                     plugin_id,
-                    result.stderr
+                    stderr
                 )
                 return False
         except subprocess.TimeoutExpired:
@@ -349,9 +430,20 @@ class PluginLoader:
         Returns:
             Loaded module or None on error
         """
-        entry_file = plugin_dir / entry_point
+        plugin_id = os.path.basename(plugin_id or '')
+        if not plugin_id:
+            raise PluginError("Invalid plugin ID")
+        try:
+            plugin_dir_resolved = plugin_dir.resolve(strict=True)
+        except OSError:
+            raise PluginError("Plugin directory not found", plugin_id=plugin_id)
+        entry_file = (plugin_dir_resolved / entry_point).resolve()
+        try:
+            entry_file.relative_to(plugin_dir_resolved)
+        except ValueError:
+            raise PluginError("Invalid entry point path", plugin_id=plugin_id)
         if not entry_file.exists():
-            error_msg = f"Entry point file not found: {entry_file} for plugin {plugin_id}"
+            error_msg = f"Entry point file not found for plugin {plugin_id}"
             self.logger.error(error_msg)
             raise PluginError(error_msg, plugin_id=plugin_id, context={'entry_file': str(entry_file)})
 
@@ -501,7 +593,8 @@ class PluginLoader:
         display_manager: Any,
         cache_manager: Any,
         plugin_manager: Any,
-        install_deps: bool = True
+        install_deps: bool = True,
+        plugins_dir: Optional[Path] = None,
     ) -> Tuple[Any, Any]:
         """
         Complete plugin loading process.
@@ -515,6 +608,7 @@ class PluginLoader:
             cache_manager: Cache manager instance
             plugin_manager: Plugin manager instance
             install_deps: Whether to install dependencies
+            plugins_dir: Trusted base plugins directory forwarded to install_dependencies
 
         Returns:
             Tuple of (plugin_instance, module)
@@ -524,7 +618,12 @@ class PluginLoader:
         """
         # Install dependencies if needed
         if install_deps:
-            self.install_dependencies(plugin_dir, plugin_id)
+            if not self.install_dependencies(plugin_dir, plugin_id, plugins_dir=plugins_dir):
+                raise PluginError(
+                    f"Dependency installation failed for plugin {plugin_id} in {plugin_dir}",
+                    plugin_id=plugin_id,
+                    context={'plugin_dir': str(plugin_dir)},
+                )
         
         # Load module
         entry_point = manifest.get('entry_point', 'manager.py')

src/plugin_system/plugin_manager.py

@@ -15,7 +15,7 @@ import threading
 from pathlib import Path
 from typing import Dict, List, Optional, Any
 import logging
-from src.exceptions import PluginError
+from src.exceptions import PluginError, ConfigError
 from src.logging_config import get_logger
 from src.plugin_system.plugin_loader import PluginLoader
 from src.plugin_system.plugin_executor import PluginExecutor
@@ -82,6 +82,12 @@ class PluginManager:
         self.plugin_modules: Dict[str, Any] = {}
         self.plugin_last_update: Dict[str, float] = {}
 
+        # Cached data-fetch intervals per plugin_id.
+        # _get_plugin_update_interval falls back to config_manager.get_config()
+        # (a full dict copy) when the manifest lacks an interval — caching avoids
+        # that copy on every 30-fps tick.  Cleared on load/unload.
+        self._update_interval_cache: Dict[str, Optional[float]] = {}
+
         # Health tracking (optional, set by display_controller if available)
         self.health_tracker = None
         self.resource_monitor = None
@@ -350,7 +356,8 @@ class PluginManager:
                 display_manager=self.display_manager,
                 cache_manager=self.cache_manager,
                 plugin_manager=self,
-                install_deps=True
+                install_deps=True,
+                plugins_dir=self.plugins_dir,
             )
             
             # Store module
@@ -387,6 +394,8 @@ class PluginManager:
             # Store plugin instance
             self.plugins[plugin_id] = plugin_instance
             self.plugin_last_update[plugin_id] = 0.0
+            # Invalidate cached interval so next tick re-derives it for this plugin
+            self._update_interval_cache.pop(plugin_id, None)
             
             # Update state based on enabled status
             if config.get('enabled', True):
@@ -443,8 +452,8 @@ class PluginManager:
             
             # Remove from active plugins
             del self.plugins[plugin_id]
-            if plugin_id in self.plugin_last_update:
+            self.plugin_last_update.pop(plugin_id, None)
-                del self.plugin_last_update[plugin_id]
+            self._update_interval_cache.pop(plugin_id, None)
             
             # Remove main module from sys.modules if present
             module_name = f"plugin_{plugin_id.replace('-', '_')}"
@@ -638,41 +647,46 @@ class PluginManager:
 
     def _get_plugin_update_interval(self, plugin_id: str, plugin_instance: Any) -> Optional[float]:
         """
-        Get the update interval for a plugin.
+        Get the data-fetch interval for a plugin (seconds between update() calls).
 
-        Args:
+        Result is cached per plugin_id after the first lookup to avoid calling
-            plugin_id: Plugin identifier
+        config_manager.get_config() — which returns a full dict copy — on every
-            plugin_instance: Plugin instance
+        tick of the 30-fps display loop.  The cache is invalidated when a plugin
-            
+        is loaded or unloaded.
-        Returns:
-            Update interval in seconds or None if not configured
         """
-        # Check manifest first
+        if plugin_id in self._update_interval_cache:
-        manifest = self.plugin_manifests.get(plugin_id, {})
+            return self._update_interval_cache[plugin_id]
-        update_interval = manifest.get('update_interval')
 
-        if update_interval:
+        interval: Optional[float] = None
+
+        # 1. Manifest (immutable after load — preferred source)
+        manifest = self.plugin_manifests.get(plugin_id, {})
+        raw = manifest.get('update_interval')
+        if raw is not None:
             try:
-                return float(update_interval)
+                interval = float(raw)
             except (ValueError, TypeError):
                 pass
 
-        # Check plugin config
+        # 2. Plugin config (mutable; only read once and then cached)
-        if self.config_manager:
+        if interval is None and self.config_manager:
             try:
                 config = self.config_manager.get_config()
-                plugin_config = config.get(plugin_id, {})
+                raw = config.get(plugin_id, {}).get('update_interval')
-                update_interval = plugin_config.get('update_interval')
+                if raw is not None:
-                if update_interval:
                     try:
-                        return float(update_interval)
+                        interval = float(raw)
                     except (ValueError, TypeError):
                         pass
-            except Exception as e:
+            except (ConfigError, OSError, ValueError, TypeError) as e:
                 self.logger.debug("Could not get update interval from config: %s", e)
 
-        # Default: 60 seconds
+        # 3. Default
-        return 60.0
+        if interval is None:
+            interval = 60.0
+
+        self._update_interval_cache[plugin_id] = interval
+        return interval
 
     def _record_update_failure(
         self,

src/plugin_system/state_reconciliation.py

@@ -185,13 +185,19 @@ class StateReconciliation:
                 message=f"Reconciliation failed: {str(e)}"
             )
     
-    # Top-level config keys that are NOT plugins
+    # Top-level config keys that are NOT plugins.
+    # Includes both config.json structural keys and config_secrets.json top-level
+    # keys (load_config() deep-merges secrets in, so secrets keys appear here too).
     _SYSTEM_CONFIG_KEYS = frozenset({
         'web_display_autostart', 'timezone', 'location', 'display',
         'plugin_system', 'vegas_scroll_speed', 'vegas_separator_width',
         'vegas_target_fps', 'vegas_buffer_ahead', 'vegas_plugin_order',
         'vegas_excluded_plugins', 'vegas_scroll_enabled', 'logging',
         'dim_schedule', 'network', 'system', 'schedule',
+        # Multi-display sync config (config.json structural key)
+        'sync',
+        # Secrets file top-level keys (merged in by load_config)
+        'github', 'youtube',
     })
 
     def _get_config_state(self) -> Dict[str, Dict[str, Any]]:
@@ -316,10 +322,19 @@ class StateReconciliation:
                 and hasattr(self.store_manager, 'was_recently_uninstalled')
                 and self.store_manager.was_recently_uninstalled(plugin_id)
             )
+            # Also refuse to resurrect a plugin the user has persistently
+            # uninstalled. Unlike the in-memory race guard above, this record
+            # survives restarts, so the user's removal sticks across updates.
+            persistently_uninstalled = (
+                self.store_manager is not None
+                and hasattr(self.store_manager, 'is_plugin_uninstalled')
+                and self.store_manager.is_plugin_uninstalled(plugin_id)
+            )
             can_repair = (
                 self.store_manager is not None
                 and not previously_unrecoverable
                 and not recently_uninstalled
+                and not persistently_uninstalled
             )
             inconsistencies.append(Inconsistency(
                 plugin_id=plugin_id,
@@ -341,8 +356,8 @@ class StateReconciliation:
                 inconsistency_type=InconsistencyType.PLUGIN_ENABLED_MISMATCH,
                 description=f"Plugin {plugin_id} enabled state mismatch: config={config_enabled}, state_manager={state_mgr_enabled}",
                 fix_action=FixAction.AUTO_FIX,
-                current_state={'enabled': config_enabled},
+                current_state={'enabled': state_mgr_enabled},
-                expected_state={'enabled': state_mgr_enabled},
+                expected_state={'enabled': config_enabled},
                 can_auto_fix=True
             ))
         
@@ -365,15 +380,23 @@ class StateReconciliation:
                 return self._auto_repair_missing_plugin(inconsistency.plugin_id)
 
             elif inconsistency.inconsistency_type == InconsistencyType.PLUGIN_ENABLED_MISMATCH:
-                # Sync enabled state from state manager to config
+                # config.json is the user-editable source of truth for enabled state.
-                expected_enabled = inconsistency.expected_state.get('enabled')
+                # Bring the state manager in sync with config rather than the reverse,
-                config = self.config_manager.load_config()
+                # so that manual config edits (or the state left behind after an
-                if inconsistency.plugin_id not in config:
+                # uninstall+reinstall cycle) don't silently override the user's intent.
-                    config[inconsistency.plugin_id] = {}
+                config_enabled = inconsistency.expected_state.get('enabled')
-                config[inconsistency.plugin_id]['enabled'] = expected_enabled
+                success = self.state_manager.set_plugin_enabled(inconsistency.plugin_id, config_enabled)
-                self.config_manager.save_config(config)
+                if success:
-                self.logger.info(f"Fixed: Synced enabled state for {inconsistency.plugin_id}")
+                    self.logger.info(
-                return True
+                        f"Fixed: Synced state manager enabled={config_enabled} for "
+                        f"{inconsistency.plugin_id} to match config"
+                    )
+                else:
+                    self.logger.warning(
+                        f"Failed to sync state manager enabled={config_enabled} for "
+                        f"{inconsistency.plugin_id}"
+                    )
+                return success
             
         except Exception as e:
             self.logger.error(f"Error fixing inconsistency: {e}", exc_info=True)

src/plugin_system/store_manager.py

@@ -5,11 +5,14 @@ Handles plugin discovery, installation, updates, and uninstallation
 from both the official registry and custom GitHub repositories.
 """
 
+import hashlib
 import os
+import re
 import json
 import stat
 import subprocess
 import shutil
+import threading
 import zipfile
 import tempfile
 import requests
@@ -17,9 +20,11 @@ import time
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
 from pathlib import Path
-from typing import List, Dict, Optional, Any, Tuple
+from typing import List, Dict, Optional, Any, Tuple, Set
 import logging
 
+from urllib.parse import urlparse
+
 from src.common.permission_utils import sudo_remove_directory
 
 try:
@@ -40,12 +45,23 @@ class PluginStoreManager:
     
     REGISTRY_URL = "https://raw.githubusercontent.com/ChuckBuilds/ledmatrix-plugins/main/plugins.json"
 
-    def __init__(self, plugins_dir: str = "plugins"):
+    # A valid plugin id is a single path component: starts alphanumeric, then
+    # alphanumerics / dot / dash / underscore. Used to keep the uninstall
+    # registry from ever turning a corrupt or hand-edited entry (e.g. "",
+    # "..", "../x") into a filesystem path that purge_uninstalled_plugins
+    # would delete — an empty id resolves to the plugins root itself.
+    _PLUGIN_ID_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._-]*$")
+    
+    def __init__(self, plugins_dir: str = "plugins",
+                 uninstalled_registry_path: Optional[str] = None):
         """
         Initialize the plugin store manager.
 
         Args:
             plugins_dir: Directory where plugins are installed
+            uninstalled_registry_path: Path to the JSON file recording plugins
+                the user has uninstalled. Defaults to
+                ``config/uninstalled_plugins.json`` under the project root.
         """
         self.plugins_dir = Path(plugins_dir)
         self.logger = logging.getLogger(__name__)
@@ -80,6 +96,25 @@ class PluginStoreManager:
         self._uninstall_tombstones: Dict[str, float] = {}
         self._uninstall_tombstone_ttl = 300  # 5 minutes
 
+        # Persistent record of plugins the user has uninstalled. Unlike the
+        # in-memory tombstones above (a short-lived race guard), this survives
+        # restarts so that a core ``git pull`` update cannot resurrect a
+        # built-in plugin the user removed. Built-in plugins (e.g.
+        # ``web-ui-info``, ``starlark-apps``) are committed into the repo under
+        # ``plugin-repos/``, so a plain ``git pull`` restores their files even
+        # after the user deleted them. ``purge_uninstalled_plugins`` re-removes
+        # any such resurrected directory; ``install_plugin`` clears the record
+        # when the user deliberately reinstalls. The file is gitignored.
+        if uninstalled_registry_path is not None:
+            self._uninstalled_registry_path = Path(uninstalled_registry_path)
+        else:
+            self._uninstalled_registry_path = (
+                Path(__file__).parent.parent.parent / "config" / "uninstalled_plugins.json"
+            )
+        # Serializes read-modify-write of the registry file so concurrent
+        # install/uninstall requests can't lose updates.
+        self._uninstalled_registry_lock = threading.Lock()
+
         # Cache for _get_local_git_info: {plugin_path_str: (signature, data)}
         # where ``signature`` is a tuple of (head_mtime, resolved_ref_mtime,
         # head_contents) so a fast-forward update to the current branch
@@ -100,6 +135,10 @@ class PluginStoreManager:
         # handlers. Bumping the cached-entry timestamp on failure serves
         # the stale payload cheaply until the backoff expires.
         self._failure_backoff_seconds = 60
+        # Prevents concurrent callers from each firing a network request when
+        # the registry cache expires. Only one thread fetches; others wait and
+        # then get the result from the warm cache (double-checked locking).
+        self._registry_fetch_lock = threading.Lock()
 
         # Ensure plugins directory exists
         self.plugins_dir.mkdir(exist_ok=True)
@@ -135,6 +174,135 @@ class PluginStoreManager:
             return False
         return True
 
+    def _is_valid_plugin_id(self, plugin_id: Any) -> bool:
+        """Return True if ``plugin_id`` is a safe single-component plugin id.
+
+        Rejects empty strings, anything with a path separator, and traversal
+        sequences like ``..`` so a registry entry can never escape (or target
+        the root of) ``self.plugins_dir`` during a purge.
+        """
+        return isinstance(plugin_id, str) and bool(self._PLUGIN_ID_RE.match(plugin_id))
+
+    def _read_uninstalled_registry(self) -> Set[str]:
+        """Read the persistent set of uninstalled plugin IDs.
+
+        Returns an empty set if the file is missing, unreadable, or corrupt —
+        a broken registry must never block normal plugin operations. Invalid
+        ids are dropped here so callers never turn them into paths.
+        """
+        try:
+            if not self._uninstalled_registry_path.exists():
+                return set()
+            with open(self._uninstalled_registry_path, 'r', encoding='utf-8') as f:
+                data = json.load(f)
+            if not isinstance(data, list):
+                self.logger.warning(
+                    "Uninstalled-plugin registry at %s is not a list; ignoring it",
+                    self._uninstalled_registry_path,
+                )
+                return set()
+            valid: Set[str] = set()
+            for pid in data:
+                if self._is_valid_plugin_id(pid):
+                    valid.add(pid)
+                else:
+                    self.logger.warning(
+                        "Ignoring invalid plugin id in uninstall registry: %r", pid
+                    )
+            return valid
+        except (OSError, ValueError) as e:
+            self.logger.warning(
+                "Could not read uninstalled-plugin registry at %s: %s",
+                self._uninstalled_registry_path, e,
+            )
+            return set()
+
+    def _write_uninstalled_registry(self, plugin_ids: Set[str]) -> None:
+        """Persist the set of uninstalled plugin IDs (sorted, atomically)."""
+        path = self._uninstalled_registry_path
+        try:
+            path.parent.mkdir(parents=True, exist_ok=True)
+            tmp_path = path.with_suffix(path.suffix + ".tmp")
+            with open(tmp_path, 'w', encoding='utf-8') as f:
+                json.dump(sorted(plugin_ids), f, indent=2)
+            os.replace(tmp_path, path)
+        except OSError as e:
+            self.logger.error(
+                "Failed to write uninstalled-plugin registry at %s: %s", path, e
+            )
+
+    def record_uninstalled_plugin(self, plugin_id: str) -> None:
+        """Persistently record that the user uninstalled ``plugin_id``.
+
+        Survives restarts so a core update cannot resurrect the plugin.
+        """
+        if not self._is_valid_plugin_id(plugin_id):
+            self.logger.error("Refusing to record invalid plugin id: %r", plugin_id)
+            return
+        with self._uninstalled_registry_lock:
+            recorded = self._read_uninstalled_registry()
+            if plugin_id not in recorded:
+                recorded.add(plugin_id)
+                self._write_uninstalled_registry(recorded)
+                self.logger.info("Recorded %s as uninstalled (persistent)", plugin_id)
+
+    def forget_uninstalled_plugin(self, *plugin_ids: str) -> None:
+        """Drop ``plugin_ids`` from the persistent uninstall registry.
+
+        Called when a plugin is deliberately (re)installed so future updates
+        keep it.
+        """
+        with self._uninstalled_registry_lock:
+            recorded = self._read_uninstalled_registry()
+            to_remove = {pid for pid in plugin_ids if pid in recorded}
+            if to_remove:
+                self._write_uninstalled_registry(recorded - to_remove)
+                self.logger.info(
+                    "Cleared uninstall record for %s", ", ".join(sorted(to_remove))
+                )
+
+    def get_uninstalled_plugins(self) -> Set[str]:
+        """Return the persistent set of user-uninstalled plugin IDs."""
+        return self._read_uninstalled_registry()
+
+    def is_plugin_uninstalled(self, plugin_id: str) -> bool:
+        """Return True if ``plugin_id`` is in the persistent uninstall registry."""
+        return plugin_id in self._read_uninstalled_registry()
+
+    def purge_uninstalled_plugins(self) -> List[str]:
+        """Remove on-disk directories for plugins the user has uninstalled.
+
+        Built-in plugins committed into the repo are restored on disk by a
+        core ``git pull``; this re-removes any that the user previously
+        uninstalled. The registry entries are kept so the purge is idempotent
+        across every future update (until the user reinstalls). Returns the
+        list of plugin IDs whose directories were actually removed.
+        """
+        removed: List[str] = []
+        plugins_root = self.plugins_dir.resolve()
+        for plugin_id in sorted(self._read_uninstalled_registry()):
+            plugin_path = self.plugins_dir / plugin_id
+            # Defense in depth: ids are already validated on read, but never
+            # remove anything that isn't a direct child of the plugins root.
+            resolved = plugin_path.resolve()
+            if resolved == plugins_root or resolved.parent != plugins_root:
+                self.logger.error(
+                    "Refusing to purge unsafe plugin path for id %r", plugin_id
+                )
+                continue
+            if not plugin_path.exists():
+                continue
+            self.logger.info(
+                "Purging resurrected uninstalled plugin: %s", plugin_id
+            )
+            if self._safe_remove_directory(plugin_path):
+                removed.append(plugin_id)
+            else:
+                self.logger.error(
+                    "Failed to purge resurrected plugin directory: %s", plugin_path
+                )
+        return removed
+
     def _load_github_token(self) -> Optional[str]:
         """
         Load GitHub API token from config_secrets.json if available.
@@ -351,7 +519,8 @@ class PluginStoreManager:
         # Extract owner/repo from URL
         try:
             # Handle different URL formats
-            if 'github.com' in repo_url:
+            _parsed_url = urlparse(repo_url)
+            if _parsed_url.hostname in ('github.com', 'www.github.com'):
                 parts = repo_url.strip('/').split('/')
                 if len(parts) >= 2:
                     owner = parts[-2]
@@ -515,7 +684,8 @@ class PluginStoreManager:
             registry_urls = []
 
             # Extract owner/repo from URL
-            if 'github.com' in repo_url:
+            _parsed_repo_url = urlparse(repo_url)
+            if _parsed_repo_url.hostname in ('github.com', 'www.github.com'):
                 parts = repo_url.split('/')
                 if len(parts) >= 2:
                     owner = parts[-2]
@@ -575,6 +745,15 @@ class PluginStoreManager:
             (current_time - self.registry_cache_time) < self.registry_cache_timeout):
             return self.registry_cache
 
+        with self._registry_fetch_lock:
+            # Re-check inside the lock — a concurrent caller that was waiting
+            # may have already populated the cache while we blocked.
+            current_time = time.time()
+            if (self.registry_cache and self.registry_cache_time and
+                    not force_refresh and
+                    (current_time - self.registry_cache_time) < self.registry_cache_timeout):
+                return self.registry_cache
+
             try:
                 self.logger.info(f"Fetching plugin registry from {self.REGISTRY_URL}")
                 response = self._http_get_with_retries(self.REGISTRY_URL, timeout=10)
@@ -761,7 +940,8 @@ class PluginStoreManager:
         try:
             # Convert repo URL to raw content URL
             # https://github.com/user/repo -> https://raw.githubusercontent.com/user/repo/branch/manifest.json
-            if 'github.com' in repo_url:
+            _parsed_manifest_url = urlparse(repo_url)
+            if _parsed_manifest_url.hostname in ('github.com', 'www.github.com'):
                 # Handle different URL formats
                 repo_url = repo_url.rstrip('/')
                 if repo_url.endswith('.git'):
@@ -1004,6 +1184,10 @@ class PluginStoreManager:
         branch_info = f" (branch: {branch})" if branch else " (latest branch head)"
         self.logger.info(f"Installing plugin: {plugin_id}{branch_info}")
 
+        # Remember the originally-requested id so we can clear its uninstall
+        # record on success even if the manifest renames the directory below.
+        requested_id = plugin_id
+
         plugin_info = self.get_plugin_info(plugin_id, fetch_latest_from_github=True, force_refresh=True)
         if not plugin_info:
             self.logger.error(f"Plugin not found in registry: {plugin_id}")
@@ -1142,6 +1326,9 @@ class PluginStoreManager:
 
             branch_display = branch_used or plugin_info.get('branch') or plugin_info.get('default_branch', 'unknown')
             self.logger.info(f"Successfully installed plugin: {plugin_id} (branch {branch_display})")
+            # User deliberately (re)installed this plugin — clear any persistent
+            # uninstall record so future core updates keep it.
+            self.forget_uninstalled_plugin(requested_id, plugin_id)
             return True
 
         except Exception as e:
@@ -1736,6 +1923,12 @@ class PluginStoreManager:
                 timeout=300
             )
             self.logger.info(f"Dependencies installed successfully for {plugin_path.name}")
+            # Write hash marker so plugin_loader skips redundant pip run on next startup
+            try:
+                current_hash = hashlib.sha256(requirements_file.read_bytes()).hexdigest()
+                (plugin_path / ".dependencies_installed").write_text(current_hash, encoding='utf-8')
+            except OSError as marker_err:
+                self.logger.debug("Could not write dependency marker for %s: %s", plugin_path.name, marker_err)
             return True
             
         except subprocess.CalledProcessError as e:

src/plugin_system/testing/__init__.py

@@ -7,13 +7,22 @@ Provides base classes and utilities for testing LEDMatrix plugins.
 from .plugin_test_base import PluginTestCase
 from .mocks import MockDisplayManager, MockCacheManager, MockConfigManager, MockPluginManager
 from .visual_display_manager import VisualTestDisplayManager
+from .bounds_display_manager import BoundsCheckingDisplayManager
+from .sizes import (
+    DEFAULT_TEST_SIZES, SUPPORTED_SIZES, resolve_test_sizes, size_label,
+)
 
 __all__ = [
     'PluginTestCase',
     'VisualTestDisplayManager',
+    'BoundsCheckingDisplayManager',
     'MockDisplayManager',
     'MockCacheManager',
     'MockConfigManager',
     'MockPluginManager',
+    'DEFAULT_TEST_SIZES',
+    'SUPPORTED_SIZES',
+    'resolve_test_sizes',
+    'size_label',
 ]
 

src/plugin_system/testing/bounds_display_manager.py

@@ -0,0 +1,129 @@
+"""
+Bounds-checking display manager.
+
+A VisualTestDisplayManager that draws onto an oversized canvas (the declared
+panel size plus a right/bottom margin) while still reporting the declared size
+to the plugin. Content that a plugin draws past the right or bottom edge lands
+in the margin instead of being silently clipped by PIL, so the harness can
+detect overflow — the classic symptom of hardcoded coordinates or fonts/icons
+that don't scale down to a smaller panel.
+
+Limitations (documented on purpose):
+- Overflow past the LEFT or TOP edge (negative coordinates) is still clipped by
+  PIL and not detected here. The dominant real-world breakage is content that is
+  too wide/tall for a smaller panel, which this catches.
+- BDF text is clipped to the declared bounds by the parent's bitmap drawer, so
+  BDF overflow is not flagged. Golden-image regression covers those plugins.
+- If a plugin replaces the canvas with its own image (display_manager.image = ...),
+  the margin can't be measured and overflow is reported as undetermined (None).
+"""
+
+from typing import Optional, Tuple
+
+from .sizes import DEFAULT_TEST_SIZES
+from .visual_display_manager import VisualTestDisplayManager, _MatrixProxy
+
+# Smallest extra band kept on the right/bottom so a few pixels of overflow are
+# still visible even on the largest panel in a run.
+_BASE_MARGIN = 16
+# Fallback overflow reference when a caller doesn't pass one: the largest shape
+# in the default sample. We extend every (smaller) canvas out to at least this
+# size so content drawn at a coordinate meant for a bigger build — e.g. x=200 on
+# a 64-wide panel — lands in the padded region and is flagged, instead of being
+# clipped off-canvas and read as a false pass.
+_DEFAULT_EXTENT_WIDTH = max(w for w, _ in DEFAULT_TEST_SIZES)
+_DEFAULT_EXTENT_HEIGHT = max(h for _, h in DEFAULT_TEST_SIZES)
+
+
+class BoundsCheckingDisplayManager(VisualTestDisplayManager):
+    """Detects drawing that overflows the declared panel size."""
+
+    # Kept for backwards compatibility; real padding is computed per-axis below.
+    MARGIN = _BASE_MARGIN
+
+    def __init__(self, width: int = 128, height: int = 32,
+                 overflow_extent: Optional[Tuple[int, int]] = None):
+        self._declared_width = int(width)
+        self._declared_height = int(height)
+        # Pad the canvas out to at least `overflow_extent` (the largest panel
+        # this run cares about) plus a base margin, so coordinates meant for a
+        # bigger build are caught — not clipped — when rendering a smaller panel.
+        # Defaults to the largest shape in the sample when no run is known.
+        ext_w, ext_h = overflow_extent or (_DEFAULT_EXTENT_WIDTH, _DEFAULT_EXTENT_HEIGHT)
+        self._canvas_width = max(self._declared_width, int(ext_w)) + _BASE_MARGIN
+        self._canvas_height = max(self._declared_height, int(ext_h)) + _BASE_MARGIN
+        # Parent builds the (oversized) backing canvas + fonts.
+        super().__init__(self._canvas_width, self._canvas_height)
+        # Plugins must see the DECLARED size, not the padded canvas size.
+        self.matrix = _MatrixProxy(self._declared_width, self._declared_height)
+
+    # -- declared dimensions (override parent's image-derived properties) --
+
+    @property
+    def width(self) -> int:
+        return self._declared_width
+
+    @property
+    def height(self) -> int:
+        return self._declared_height
+
+    @property
+    def display_width(self) -> int:
+        return self._declared_width
+
+    @property
+    def display_height(self) -> int:
+        return self._declared_height
+
+    # -- overflow detection --
+
+    def _canvas_is_padded(self) -> bool:
+        return self.image.size == (self._canvas_width, self._canvas_height)
+
+    def check_overflow(self) -> Optional[Tuple[int, int, int, int]]:
+        """Bounding box (in full-canvas coords) of any drawing beyond the
+        declared panel, or None if nothing overflowed / undetermined."""
+        if not self._canvas_is_padded():
+            return None
+
+        exp_w = self._canvas_width
+        exp_h = self._canvas_height
+        boxes = []
+
+        right = self.image.crop((self._declared_width, 0, exp_w, exp_h)).getbbox()
+        if right:
+            boxes.append((right[0] + self._declared_width, right[1],
+                          right[2] + self._declared_width, right[3]))
+
+        bottom = self.image.crop((0, self._declared_height, exp_w, exp_h)).getbbox()
+        if bottom:
+            boxes.append((bottom[0], bottom[1] + self._declared_height,
+                          bottom[2], bottom[3] + self._declared_height))
+
+        if not boxes:
+            return None
+        return (
+            min(b[0] for b in boxes), min(b[1] for b in boxes),
+            max(b[2] for b in boxes), max(b[3] for b in boxes),
+        )
+
+    # -- snapshot/image accessors return the cropped, true-panel image --
+
+    def declared_image(self):
+        """The visible panel: the canvas cropped to the declared size."""
+        if self._canvas_is_padded():
+            return self.image.crop((0, 0, self._declared_width, self._declared_height))
+        return self.image
+
+    def save_snapshot(self, path: str) -> None:
+        self.declared_image().save(path, format='PNG')
+
+    def get_image(self):
+        return self.declared_image()
+
+    def get_image_base64(self) -> str:
+        import base64
+        import io
+        buffer = io.BytesIO()
+        self.declared_image().save(buffer, format='PNG')
+        return base64.b64encode(buffer.getvalue()).decode('utf-8')

src/plugin_system/testing/harness.py

@@ -0,0 +1,314 @@
+"""
+Plugin safety harness.
+
+Renders a plugin across every declared screen (mode) and every supported matrix
+size, capturing crashes and overflow. Used by scripts/check_plugin.py and the
+pytest matrix test to guarantee a plugin change doesn't break a screen at a size
+the author didn't try.
+
+The render flow mirrors scripts/render_plugin.py (same PluginLoader call), but
+this module adds: multi-size iteration, per-mode rendering, overflow detection
+via BoundsCheckingDisplayManager, and golden-image comparison.
+"""
+
+import contextlib
+import http.client
+import inspect
+import socket
+import ssl
+import urllib.error
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Dict, List, Optional, Tuple
+
+from PIL import Image, ImageChops
+
+from src.logging_config import get_logger
+from .bounds_display_manager import BoundsCheckingDisplayManager
+from .loading import load_config_defaults, load_manifest
+from .sizes import DEFAULT_TEST_SIZES, safe_mode_filename, size_label
+
+logger = get_logger("[Plugin Harness]")
+
+
+def _tolerated_update_errors() -> Tuple[type, ...]:
+    """Exception types from update() we treat as a tolerated no-connectivity
+    failure (expected in CI / headless dev) rather than a real plugin bug.
+
+    Anything NOT in this set is a genuine regression — a plugin that lets a
+    non-network exception escape update() should fail the harness, not pass
+    green because display() happened to survive.
+    """
+    types: List[type] = [
+        ConnectionError, TimeoutError,        # builtins
+        socket.gaierror, socket.timeout,      # DNS / socket timeouts
+        ssl.SSLError,
+        urllib.error.URLError,
+        http.client.HTTPException,
+    ]
+    try:  # requests is optional; cover its whole error tree when present
+        import requests
+        types.append(requests.exceptions.RequestException)
+    except ImportError:  # pragma: no cover - requests not installed
+        logger.debug("requests not installed; its connectivity errors won't be specifically tolerated")
+    return tuple(types)
+
+
+_TOLERATED_UPDATE_ERRORS = _tolerated_update_errors()
+
+
+@dataclass
+class RenderResult:
+    """Outcome of rendering one (size, mode) of a plugin."""
+    plugin_id: str
+    width: int
+    height: int
+    mode: str
+    image: Optional[Image.Image] = None
+    error: Optional[str] = None          # fatal: load/display crash, or a non-network update() error
+    update_error: Optional[str] = None   # tolerated: connectivity error from update() (no network in CI)
+    overflow: Optional[Tuple[int, int, int, int]] = None  # bbox past the panel
+    # golden comparison (populated only when a golden was provided)
+    golden_checked: bool = False
+    golden_ok: Optional[bool] = None
+    golden_diff_pixels: int = 0
+    golden_max_delta: int = 0
+
+    @property
+    def size_label(self) -> str:
+        return size_label(self.width, self.height)
+
+    @property
+    def ok(self) -> bool:
+        """Phase-1 pass: rendered without crashing and without overflow, and if a
+        golden was checked it matched."""
+        if self.error is not None or self.overflow is not None:
+            return False
+        if self.golden_checked and self.golden_ok is False:
+            return False
+        return True
+
+
+def list_modes(plugin_instance: Any, manifest: Dict[str, Any], plugin_id: str) -> List[str]:
+    """Enumerate a plugin's screens: instance.modes wins, then manifest
+    display_modes, then the plugin id as a single mode."""
+    modes = getattr(plugin_instance, "modes", None)
+    if modes:
+        return [str(m) for m in modes]
+    declared = manifest.get("display_modes")
+    if declared:
+        return [str(m) for m in declared]
+    return [plugin_id]
+
+
+def _instantiate(plugin_id: str, manifest: Dict[str, Any], plugin_dir: Path,
+                 config: Dict[str, Any], mock_data: Dict[str, Any],
+                 display_manager: Any) -> Any:
+    """Load and construct a plugin instance with mocked managers."""
+    from src.plugin_system.plugin_loader import PluginLoader
+    from src.plugin_system.testing import MockCacheManager, MockPluginManager
+
+    cache_manager = MockCacheManager()
+    for key, value in (mock_data or {}).items():
+        cache_manager.set(key, value)
+
+    loader = PluginLoader()
+    plugin_instance, _module = loader.load_plugin(
+        plugin_id=plugin_id,
+        manifest=manifest,
+        plugin_dir=plugin_dir,
+        config=config,
+        display_manager=display_manager,
+        cache_manager=cache_manager,
+        plugin_manager=MockPluginManager(),
+        install_deps=False,
+    )
+    return plugin_instance
+
+
+def _render_mode(plugin_instance: Any, mode: str) -> None:
+    """Render a specific screen. Prefer an explicit display_mode kwarg; otherwise
+    drive the plugin's internal mode state machine (first display() call renders
+    modes[current_mode_index] when current_display_mode is None)."""
+    sig = inspect.signature(plugin_instance.display)
+    if "display_mode" in sig.parameters:
+        plugin_instance.display(force_clear=True, display_mode=mode)
+        return
+
+    modes = getattr(plugin_instance, "modes", None)
+    if modes and mode in modes:
+        plugin_instance.current_mode_index = list(modes).index(mode)
+    if hasattr(plugin_instance, "current_display_mode"):
+        plugin_instance.current_display_mode = None
+    plugin_instance.display(force_clear=False)
+
+
+def _freeze(freeze_time: Optional[str]):
+    """Context manager that freezes wall-clock time when freeze_time is given,
+    so time-dependent plugins (clocks, countdowns) render deterministic goldens."""
+    if not freeze_time:
+        return contextlib.nullcontext()
+    try:
+        from freezegun import freeze_time as _ft
+    except ImportError as e:  # pragma: no cover - only hit without the dep
+        raise RuntimeError(
+            "freeze_time requires the 'freezegun' package (pip install freezegun)"
+        ) from e
+    return _ft(freeze_time)
+
+
+def render_plugin_matrix(
+    plugin_id: str,
+    plugin_dir: Path,
+    config: Optional[Dict[str, Any]] = None,
+    mock_data: Optional[Dict[str, Any]] = None,
+    sizes: Optional[List[Tuple[int, int]]] = None,
+    run_update: bool = True,
+    freeze_time: Optional[str] = None,
+) -> List[RenderResult]:
+    """Render every (size, mode) combination for a plugin.
+
+    Returns a flat list of RenderResult. A fresh plugin instance is built per
+    (size, mode) so state never leaks between screens. Pass freeze_time (e.g.
+    "2025-08-01 15:25:00") to make time-dependent plugins reproducible.
+    """
+    plugin_dir = Path(plugin_dir)
+    manifest = load_manifest(plugin_dir)
+    # Start from config_schema.json defaults so the plugin behaves like a real
+    # install; explicit caller config still wins over a schema default.
+    config = {"enabled": True, **load_config_defaults(plugin_dir), **(config or {})}
+    sizes = sizes or DEFAULT_TEST_SIZES
+    results: List[RenderResult] = []
+
+    # The largest panel in this run. Every (smaller) canvas is padded out to it
+    # so a coordinate meant for the biggest configuration is still caught when
+    # rendering a smaller one, instead of being clipped into a false pass.
+    extent = (max(w for w, _ in sizes), max(h for _, h in sizes))
+
+    with _freeze(freeze_time):
+        for width, height in sizes:
+            results.extend(_render_size(
+                plugin_id, manifest, plugin_dir, config, mock_data or {},
+                width, height, run_update, extent,
+            ))
+
+    return results
+
+
+def _render_size(plugin_id, manifest, plugin_dir, config, mock_data,
+                 width, height, run_update, extent) -> List[RenderResult]:
+    """Render every mode at one size. A fresh instance per mode avoids state leaks."""
+    results: List[RenderResult] = []
+
+    # Discover modes once per size (instance build can depend on config).
+    try:
+        probe_dm = BoundsCheckingDisplayManager(width=width, height=height, overflow_extent=extent)
+        probe = _instantiate(plugin_id, manifest, plugin_dir, config, mock_data, probe_dm)
+        modes = list_modes(probe, manifest, plugin_id)
+    except Exception as e:  # noqa: BLE001 — surface any load failure as a result
+        return [RenderResult(plugin_id, width, height, "<load>", error=repr(e))]
+
+    for mode in modes:
+        result = RenderResult(plugin_id, width, height, mode)
+        dm = BoundsCheckingDisplayManager(width=width, height=height, overflow_extent=extent)
+        try:
+            inst = _instantiate(plugin_id, manifest, plugin_dir, config, mock_data, dm)
+            if run_update:
+                try:
+                    inst.update()
+                except _TOLERATED_UPDATE_ERRORS as e:
+                    # Expected when CI / headless dev has no network: record it
+                    # (surfaced in the report) but don't fail the run.
+                    result.update_error = repr(e)
+                    logger.debug("update() connectivity error for %s [%s]: %s", plugin_id, mode, e)
+                except Exception as e:  # noqa: BLE001 — a non-network update() failure is a real bug
+                    # A regression in update() must not pass green just because
+                    # display() survives, so treat it as a failure of this render.
+                    result.error = repr(e)
+                    logger.warning("update() raised a non-connectivity error for %s [%s]: %s",
+                                   plugin_id, mode, e)
+            if result.error is None:
+                _render_mode(inst, mode)
+                result.image = dm.get_image()
+                result.overflow = dm.check_overflow()
+        except Exception as e:  # noqa: BLE001 — a display crash is a real failure
+            result.error = repr(e)
+        results.append(result)
+
+    return results
+
+
+# ---------------------------------------------------------------------------
+# Golden-image comparison
+# ---------------------------------------------------------------------------
+
+def compare_images(rendered: Image.Image, golden: Image.Image,
+                   max_delta: int = 0, max_diff_pixels: int = 0) -> Tuple[bool, int, int]:
+    """Compare two images. Returns (ok, diff_pixel_count, max_per_channel_delta).
+
+    Tolerances default to exact match; bump them only to absorb known platform
+    anti-aliasing noise (requires a pinned Pillow + bundled fonts for stability).
+    """
+    if rendered.size != golden.size:
+        return False, rendered.size[0] * rendered.size[1], 255
+    a = rendered.convert("RGB")
+    b = golden.convert("RGB")
+    diff = ImageChops.difference(a, b)
+    bbox = diff.getbbox()
+    if bbox is None:
+        return True, 0, 0
+    # Count pixels whose largest per-channel delta exceeds the allowed tolerance,
+    # and track the worst delta seen (for reporting).
+    diff_pixels = 0
+    observed_max = 0
+    for px in diff.crop(bbox).getdata():
+        m = max(px) if isinstance(px, tuple) else px
+        if m > observed_max:
+            observed_max = m
+        if m > max_delta:
+            diff_pixels += 1
+    # Pass when the number of out-of-tolerance pixels is within budget.
+    ok = diff_pixels <= max_diff_pixels
+    return ok, diff_pixels, observed_max
+
+
+def golden_path(golden_dir: Path, width: int, height: int, mode: str) -> Path:
+    """Location of a golden image: <golden_dir>/<WxH>/<mode>.png.
+
+    The mode is sanitized to a safe basename so a mode name with '/' or '..'
+    can't read or write outside the golden directory.
+    """
+    return Path(golden_dir) / size_label(width, height) / f"{safe_mode_filename(mode)}.png"
+
+
+def compare_to_goldens(results: List[RenderResult], golden_dir: Path,
+                       max_delta: int = 0, max_diff_pixels: int = 0) -> List[RenderResult]:
+    """Compare rendered results against committed goldens, mutating each result's
+    golden_* fields. Results with no golden file on disk are left unchecked."""
+    for r in results:
+        if r.image is None:
+            continue
+        gp = golden_path(golden_dir, r.width, r.height, r.mode)
+        if not gp.exists():
+            continue
+        r.golden_checked = True
+        with Image.open(gp) as g:
+            ok, diff_pixels, observed_max = compare_images(
+                r.image, g, max_delta=max_delta, max_diff_pixels=max_diff_pixels)
+        r.golden_ok = ok
+        r.golden_diff_pixels = diff_pixels
+        r.golden_max_delta = observed_max
+    return results
+
+
+def write_goldens(results: List[RenderResult], golden_dir: Path) -> int:
+    """Write each successfully-rendered result to its golden path. Returns count."""
+    written = 0
+    for r in results:
+        if r.image is None or r.error is not None:
+            continue
+        gp = golden_path(golden_dir, r.width, r.height, r.mode)
+        gp.parent.mkdir(parents=True, exist_ok=True)
+        r.image.save(gp, format="PNG")
+        written += 1
+    return written

src/plugin_system/testing/loading.py

@@ -0,0 +1,82 @@
+"""
+Shared helpers for loading a plugin headlessly.
+
+Used by scripts/render_plugin.py, scripts/check_plugin.py, and the harness so
+plugin discovery / manifest / config-default logic lives in exactly one place.
+"""
+
+import json
+from pathlib import Path
+from typing import Any, Dict, Optional, Sequence, Union
+
+
+def find_plugin_dir(plugin_id: str, search_dirs: Sequence[Union[str, Path]]) -> Optional[Path]:
+    """Find a plugin directory by searching multiple paths."""
+    from src.plugin_system.plugin_loader import PluginLoader
+    loader = PluginLoader()
+    for search_dir in search_dirs:
+        search_path = Path(search_dir)
+        if not search_path.exists():
+            continue
+        result = loader.find_plugin_directory(plugin_id, search_path)
+        if result:
+            return Path(result)
+    return None
+
+
+def load_manifest(plugin_dir: Union[str, Path]) -> Dict[str, Any]:
+    """Load and return manifest.json from a plugin directory."""
+    manifest_path = Path(plugin_dir) / 'manifest.json'
+    if not manifest_path.exists():
+        raise FileNotFoundError(f"No manifest.json in {plugin_dir}")
+    with open(manifest_path, 'r') as f:
+        return json.load(f)
+
+
+def load_config_defaults(plugin_dir: Union[str, Path]) -> Dict[str, Any]:
+    """Extract default values from a plugin's config_schema.json (empty if none)."""
+    schema_path = Path(plugin_dir) / 'config_schema.json'
+    if not schema_path.exists():
+        return {}
+    with open(schema_path, 'r') as f:
+        schema = json.load(f)
+    defaults: Dict[str, Any] = {}
+    for key, prop in schema.get('properties', {}).items():
+        if isinstance(prop, dict) and 'default' in prop:
+            defaults[key] = prop['default']
+    return defaults
+
+
+def load_harness_spec(plugin_dir: Union[str, Path]) -> Dict[str, Any]:
+    """Optional per-plugin harness settings from <plugin>/test/harness.json.
+
+    Lets a plugin opt into golden-image testing by declaring how to render it
+    deterministically. All keys optional:
+        {
+          "config":     {...},            # config overrides
+          "mock_data":  "fixtures/mock.json",  # path (relative to plugin dir) to cache fixtures
+          "freeze_time": "2025-08-01 15:25:00",
+          "skip_update": false
+        }
+    Returns {} when no harness.json exists.
+    """
+    spec_path = Path(plugin_dir) / 'test' / 'harness.json'
+    if not spec_path.exists():
+        return {}
+    with open(spec_path, 'r') as f:
+        spec = json.load(f)
+
+    # Resolve mock_data path and inline its contents for convenience.
+    mock_rel = spec.get('mock_data')
+    if mock_rel:
+        mock_path = Path(plugin_dir) / mock_rel
+        if not mock_path.exists():
+            # A declared-but-missing fixture is a harness config error: failing
+            # loudly beats silently rendering the plugin with no mock data.
+            raise FileNotFoundError(
+                f"harness.json references mock_data '{mock_rel}' but "
+                f"{mock_path} does not exist"
+            )
+        with open(mock_path, 'r') as mf:
+            spec['mock_data_contents'] = json.load(mf)
+    return spec

src/plugin_system/testing/mocks.py

@@ -63,11 +63,23 @@ class MockCacheManager:
     """Mock cache manager for testing."""
     
     def __init__(self):
+        import shutil
+        import tempfile
+        import weakref
         self._cache: Dict[str, Any] = {}
         self._cache_timestamps: Dict[str, float] = {}
         self.get_calls = []
         self.set_calls = []
         self.delete_calls = []
+        # Real temp dir for plugins that write/read files under cache_dir.
+        # Registered for cleanup so each mock instance doesn't leak a tmp dir.
+        self.cache_dir = tempfile.mkdtemp(prefix="ledmatrix-mock-cache-")
+        self._finalizer = weakref.finalize(
+            self, shutil.rmtree, self.cache_dir, ignore_errors=True)
+
+    def cleanup(self) -> None:
+        """Remove the temp cache directory created for this instance."""
+        self._finalizer()
     
     def get(self, key: str, max_age: Optional[float] = None) -> Optional[Any]:
         """Get a value from cache."""

src/plugin_system/testing/sizes.py

@@ -0,0 +1,120 @@
+"""
+LED matrix sizes the plugin safety harness renders against.
+
+There is no fixed set of "supported" panel sizes — an RGB matrix build can be
+any width/height and configuration (square, rectangle, 2x2, 4x4, 8x2, long
+strips, tall stacks, ...). Plugins are expected to read width/height
+dynamically and lay themselves out accordingly, so the harness's job is to
+prove a plugin survives a *spread* of shapes, not a canonical list.
+
+`DEFAULT_TEST_SIZES` is therefore a representative SAMPLE chosen to span the
+axes of variation (narrow, wide, square, tall, small, long), not an
+exhaustive or authoritative list. Callers can override it entirely:
+
+  - CLI:        scripts/check_plugin.py --sizes 8x16,64x64,256x32
+  - pytest:     LEDMATRIX_TEST_SIZES="8x16,64x64" env var (all plugins), or
+                per-plugin test/harness.json {"sizes": [[8, 16], [64, 64]]}
+
+so anyone can point the harness at the exact panel(s) their build uses.
+"""
+
+import os
+from typing import Iterable, List, Optional, Sequence, Tuple, Union
+
+# A spread of real panel-grid arrangements (each module is 64x32), not a list of
+# "blessed" sizes. Each entry exercises a different layout assumption a plugin
+# might accidentally bake in. Annotations are the panel grid (cols x rows).
+DEFAULT_TEST_SIZES: List[Tuple[int, int]] = [
+    (64, 32),    # 1x1 — single panel, the tightest common rectangle
+    (128, 32),   # 2x1 — the baseline most plugins are tuned for
+    (64, 64),    # 1x2 — stacked, exercises tall-narrow centering
+    (128, 64),   # 2x2 — block, icon scaling / vertical centering
+    (256, 32),   # 4x1 — long strip, wide horizontal layout
+    (128, 96),   # 2x3 — tall, exercises vertical overflow
+    (256, 128),  # 4x4 — large block, both dimensions big at once
+]
+
+# Backwards-compatible alias. Prefer DEFAULT_TEST_SIZES in new code — the old
+# name implied these were the only valid panel sizes, which they are not.
+SUPPORTED_SIZES = DEFAULT_TEST_SIZES
+
+
+def size_label(width: int, height: int) -> str:
+    """Human/path-friendly label for a size, e.g. '128x32'."""
+    return f"{width}x{height}"
+
+
+def parse_size_token(token: str) -> Tuple[int, int]:
+    """Parse a single 'WxH' token into an (int, int) pair.
+
+    Raises ValueError (with a user-friendly message) on malformed input so
+    callers can surface it however they like.
+    """
+    cleaned = token.strip().lower()
+    if "x" not in cleaned:
+        raise ValueError(f"Invalid size '{token}' (expected WxH, e.g. 128x32)")
+    w, h = cleaned.split("x", 1)
+    try:
+        width, height = int(w), int(h)
+    except ValueError as exc:
+        raise ValueError(
+            f"Invalid size '{token}' (expected numeric WxH, e.g. 128x32)"
+        ) from exc
+    if width <= 0 or height <= 0:
+        raise ValueError(
+            f"Invalid size '{token}' (width and height must be positive, e.g. 128x32)"
+        )
+    return (width, height)
+
+
+def coerce_sizes(
+    value: Union[str, Iterable[Sequence[int]], None]
+) -> Optional[List[Tuple[int, int]]]:
+    """Normalize a size spec into a list of (w, h) tuples, or None if empty.
+
+    Accepts a comma-separated 'WxH,WxH' string (CLI / env var) or an iterable
+    of [w, h] / (w, h) pairs (harness.json). Returns None when value is falsy
+    so callers can fall back to the default sample.
+    """
+    if not value:
+        return None
+    if isinstance(value, str):
+        return [parse_size_token(tok) for tok in value.split(",") if tok.strip()]
+    sizes: List[Tuple[int, int]] = []
+    for pair in value:
+        w, h = pair  # raises if not a 2-element sequence
+        width, height = int(w), int(h)
+        if width <= 0 or height <= 0:
+            raise ValueError(f"Invalid size pair {pair!r} (width and height must be positive)")
+        sizes.append((width, height))
+    return sizes or None
+
+
+def resolve_test_sizes(
+    spec_sizes: Union[str, Iterable[Sequence[int]], None] = None,
+) -> List[Tuple[int, int]]:
+    """Decide which sizes to render, by precedence:
+
+    1. LEDMATRIX_TEST_SIZES env var — a global "test on my hardware" override
+       that wins for every plugin.
+    2. spec_sizes — e.g. a per-plugin harness.json "sizes" list.
+    3. DEFAULT_TEST_SIZES — the representative sample.
+    """
+    env = coerce_sizes(os.environ.get("LEDMATRIX_TEST_SIZES"))
+    if env:
+        return env
+    spec = coerce_sizes(spec_sizes)
+    if spec:
+        return spec
+    return list(DEFAULT_TEST_SIZES)
+
+
+def safe_mode_filename(mode: str) -> str:
+    """A filesystem-safe basename for a plugin mode.
+
+    Mode names come from plugin metadata/render state, so a value containing
+    '/' or '..' could otherwise escape the intended output directory. Collapse
+    anything that isn't alphanumeric / dash / underscore to '_'.
+    """
+    cleaned = "".join(ch if ch.isalnum() or ch in ("-", "_") else "_" for ch in mode)
+    return cleaned or "mode"

src/wifi_manager.py

@@ -151,6 +151,18 @@ class WiFiManager:
                    f"hostapd: {self.has_hostapd}, dnsmasq: {self.has_dnsmasq}, "
                    f"interface: {self._wifi_interface}, trixie: {self._is_trixie}")
 
+        # Once per process: remove a stale force-AP flag left by a prior crash.
+        # Guard with a class-level flag so the nmcli AP-state check only runs
+        # once even though WiFiManager is instantiated per-request.
+        if not WiFiManager._startup_cleanup_done:
+            WiFiManager._startup_cleanup_done = True
+            if self._FORCE_AP_FLAG_PATH.exists() and not self._is_ap_mode_active():
+                try:
+                    self._FORCE_AP_FLAG_PATH.unlink(missing_ok=True)
+                    logger.debug("Removed stale force-AP flag on startup (AP not active)")
+                except OSError as exc:
+                    logger.warning(f"Could not remove stale force-AP flag: {exc}")
+    
     def _show_led_message(self, message: str, duration: int = 5):
         """
         Show a WiFi status message on the LED display.
@@ -474,7 +486,10 @@ class WiFiManager:
                 if result.returncode == 0:
                     for line in result.stdout.strip().split('\n'):
                         if '/' in line:
-                            ip_address = line.split('/')[0].strip()
+                            # nmcli -t output is "IP4.ADDRESS[1]:x.x.x.x/prefix";
+                            # bare "x.x.x.x/prefix" is also accepted defensively.
+                            _, sep, rest = line.partition(':')
+                            ip_address = (rest if sep else line).split('/')[0].strip()
                             break
                 
                 # Final fallback: Get signal strength by matching SSID in WiFi list
@@ -500,6 +515,13 @@ class WiFiManager:
             
             # Check if AP mode is active
             ap_active = self._is_ap_mode_active()
+            # wlan0 shows as "connected" in AP mode; clear client-station fields so
+            # callers don't mistake the AP for an outbound WiFi connection.
+            if ap_active and wifi_connected:
+                wifi_connected = False
+                ssid = None
+                ip_address = None
+                logger.debug(f"{wlan_device} is in AP mode — overriding wifi_connected to False")
             
             return WiFiStatus(
                 connected=wifi_connected,
@@ -690,6 +712,10 @@ class WiFiManager:
     # ---------------------------------------------------------------------------
 
     _IP_FORWARD_SAVE_PATH = Path("/tmp/ledmatrix_ip_forward_saved")  # nosec B108 - process-specific named file; device is single-user RPi
+    # Written when AP mode is manually force-enabled; prevents daemon auto-disable
+    _FORCE_AP_FLAG_PATH = Path("/tmp/ledmatrix_force_ap_active")  # nosec B108 - process-specific named file; device is single-user RPi
+    # Ensures the startup stale-flag cleanup runs once per process, not per instantiation
+    _startup_cleanup_done: bool = False
 
     def _validate_ap_config(self) -> Tuple[str, int]:
         """Return a sanitized (ssid, channel) pair from config, falling back to defaults."""
@@ -1367,7 +1393,7 @@ class WiFiManager:
                         logger.error(f"Failed to restore original connection: {original_ssid}")
                         # Trigger AP mode as last resort
                         self._show_led_message("Enabling AP mode...", duration=5)
-                        ap_success, ap_msg = self.enable_ap_mode()
+                        ap_success, ap_msg = self.enable_ap_mode(force=True)
                         if ap_success:
                             logger.info("AP mode enabled as failsafe")
                             return False, "Connection failed and restoration failed. AP mode enabled."
@@ -1379,7 +1405,7 @@ class WiFiManager:
                 elif not success:
                     logger.warning(f"Connection to {ssid} failed and no original connection to restore")
                     self._show_led_message("Enabling AP mode...", duration=5)
-                    ap_success, ap_msg = self.enable_ap_mode()
+                    ap_success, ap_msg = self.enable_ap_mode(force=True)
                     if ap_success:
                         logger.info("AP mode enabled as failsafe")
                         return False, "Connection failed. AP mode enabled."
@@ -1400,7 +1426,7 @@ class WiFiManager:
                     logger.error(f"Failed to restore after exception: {restore_error}")
                     # Last resort: enable AP mode
                     try:
-                        self.enable_ap_mode()
+                        self.enable_ap_mode(force=True)
                     except Exception as ap_error:  # nosec B110 - last-resort; do not re-raise, but log for debugging
                         logger.error("Last-resort AP mode enable failed in recovery path: %s", ap_error, exc_info=True)
             return False, str(e)
@@ -1464,24 +1490,27 @@ class WiFiManager:
             # Show LED message
             self._show_led_message(f"Connecting to {ssid}...", duration=10)
             
-            # First, check if connection already exists and try to activate it
+            # Find existing NM connection for this SSID.
-            # NetworkManager connection names might not match SSID exactly, so search by SSID
+            # 802-11-wireless.ssid is not a valid column in 'nmcli connection show',
-            check_result = subprocess.run(
+            # so list all wifi connections then query each one's SSID individually.
-                ["nmcli", "-t", "-f", "NAME,802-11-wireless.ssid", "connection", "show"],
+            list_result = subprocess.run(  # nosec B603 B607 - fixed args, no user input
-                capture_output=True,
+                ["nmcli", "-t", "-f", "NAME,TYPE", "connection", "show"],
-                text=True,
+                capture_output=True, text=True, timeout=5
-                timeout=5
             )
-            
             existing_conn_name = None
-            if check_result.returncode == 0:
+            if list_result.returncode == 0:
-                for line in check_result.stdout.strip().split('\n'):
+                for line in list_result.stdout.strip().split('\n'):
-                    if ':' in line:
+                    if ':' not in line:
+                        continue
                     parts = line.split(':')
-                        if len(parts) >= 2:
+                    if len(parts) < 2 or parts[1].strip() != '802-11-wireless':
+                        continue
                     conn_name = parts[0].strip()
-                            conn_ssid = parts[1].strip() if len(parts) > 1 else ""
+                    ssid_r = subprocess.run(  # nosec B603 B607 - conn_name from nmcli output, not user input
-                            if conn_ssid == ssid:
+                        ["nmcli", "-g", "802-11-wireless.ssid", "connection", "show", conn_name],
+                        capture_output=True, text=True, timeout=5
+                    )
+                    if ssid_r.returncode == 0 and ssid_r.stdout.strip() == ssid:
                         existing_conn_name = conn_name
                         break
             
@@ -1855,7 +1884,7 @@ class WiFiManager:
         logger.warning(f"Failed to enable WiFi radio after {max_retries} attempts")
         return False
     
-    def enable_ap_mode(self) -> Tuple[bool, str]:
+    def enable_ap_mode(self, force: bool = False) -> Tuple[bool, str]:
         """
         Enable access point mode
         
@@ -1877,20 +1906,29 @@ class WiFiManager:
             if not self._ensure_wifi_radio_enabled():
                 return False, "WiFi radio is disabled and could not be enabled"
             
-            # Check if WiFi is connected
+            # Check if WiFi is connected (skip when force=True)
             status = self.get_wifi_status()
-            if status.connected:
+            if not force and status.connected:
                 return False, "Cannot enable AP mode while WiFi is connected"
             
-            # Check if Ethernet is connected
+            # Check if Ethernet is connected (skip when force=True)
-            if self._is_ethernet_connected():
+            if not force and self._is_ethernet_connected():
                 return False, "Cannot enable AP mode while Ethernet is connected"
             
+            if force:
+                logger.debug(f"enable_ap_mode: force=True — WiFi/Ethernet guards bypassed; will create {self._FORCE_AP_FLAG_PATH}")
+
             # Try hostapd/dnsmasq first (captive portal mode)
             if self.has_hostapd and self.has_dnsmasq:
                 result = self._enable_ap_mode_hostapd()
                 if result[0]:
                     self._ap_enabled_at = time.time()
+                    if force:
+                        try:
+                            self._FORCE_AP_FLAG_PATH.touch()
+                            logger.debug(f"Force-AP flag created: {self._FORCE_AP_FLAG_PATH}")
+                        except OSError as exc:
+                            logger.warning(f"Failed to create force-AP flag {self._FORCE_AP_FLAG_PATH}: {exc}")
                     return result
 
             # Fallback to nmcli hotspot (simpler, no captive portal)
@@ -1900,6 +1938,12 @@ class WiFiManager:
                 result = self._enable_ap_mode_nmcli_hotspot()
                 if result[0]:
                     self._ap_enabled_at = time.time()
+                    if force:
+                        try:
+                            self._FORCE_AP_FLAG_PATH.touch()
+                            logger.debug(f"Force-AP flag created: {self._FORCE_AP_FLAG_PATH}")
+                        except OSError as exc:
+                            logger.warning(f"Failed to create force-AP flag {self._FORCE_AP_FLAG_PATH}: {exc}")
                 return result
 
             return False, "No WiFi tools available (nmcli, hostapd, or dnsmasq required)"
@@ -2091,8 +2135,14 @@ class WiFiManager:
                 self._clear_led_message()
                 return False, "AP started but captive-portal redirect setup failed"
 
-            # Verify the AP is actually running
+            # Verify the AP is actually running (retry up to 5x with 2s delay for NM async activation)
+            status = {}
+            for _attempt in range(5):
                 status = self._get_ap_status_nmcli()
+                if status.get('active'):
+                    break
+                logger.debug(f"AP verification attempt {_attempt + 1}/5 not yet active, waiting 2s")
+                time.sleep(2)
             if status.get('active'):
                 ip = status.get('ip', '192.168.4.1')
                 logger.info(f"AP mode confirmed active at {ip} (open network, no password)")
@@ -2290,6 +2340,7 @@ class WiFiManager:
                         logger.warning("WiFi radio may be disabled after nmcli AP cleanup")
 
                 self._ap_enabled_at = None
+                self._FORCE_AP_FLAG_PATH.unlink(missing_ok=True)
                 logger.info("AP mode disabled successfully")
                 return True, "AP mode disabled"
             except Exception as e:
@@ -2478,22 +2529,29 @@ address=/detectportal.firefox.com/192.168.4.1
                 else:
                     logger.warning(f"Failed to enable AP mode: {message}")
             elif not should_have_ap and ap_active:
-                # Should not have AP but do - disable AP mode
+                # Should not have AP but do - check if it was manually force-enabled
-                # Always disable if WiFi or Ethernet connects, regardless of auto_enable setting
+                force_active = self._FORCE_AP_FLAG_PATH.exists()
-                if status.connected or ethernet_connected:
+                if status.connected:
+                    # WiFi connected: always disable AP (user successfully configured WiFi)
                     success, message = self.disable_ap_mode()
                     if success:
-                        if status.connected:
                         logger.info("Auto-disabled AP mode (WiFi connected)")
-                        elif ethernet_connected:
+                        self._disconnected_checks = 0
-                            logger.info("Auto-disabled AP mode (Ethernet connected)")
-                        self._disconnected_checks = 0  # Reset counter
                         return True
                     else:
                         logger.warning(f"Failed to auto-disable AP mode: {message}")
+                elif ethernet_connected and not force_active:
+                    # Ethernet connected, AP not manually forced: auto-disable
+                    success, message = self.disable_ap_mode()
+                    if success:
+                        logger.info("Auto-disabled AP mode (Ethernet connected)")
+                        self._disconnected_checks = 0
+                        return True
+                    else:
+                        logger.warning(f"Failed to auto-disable AP mode: {message}")
+                elif ethernet_connected and force_active:
+                    logger.debug("AP mode is force-active; Ethernet connected but auto-disable suppressed")
                 elif not auto_enable:
-                    # AP is active but auto_enable is disabled - this means it was manually enabled
-                    # Don't disable it automatically, let it stay active
                     logger.debug("AP mode is active (manually enabled), keeping active")
 
             # Idle-timeout check: disable AP if no client has connected within the window.

test/plugins/test_basketball_scoreboard.py

@@ -49,9 +49,10 @@ class TestBasketballScoreboardPlugin(PluginTestBase):
         """Test that plugin has display modes."""
         manifest = self.load_plugin_manifest(plugin_id)
         assert 'display_modes' in manifest
-        assert 'basketball_live' in manifest['display_modes']
+        # Manifest uses league-prefixed modes (nba_, wnba_, ncaam_, ncaaw_)
-        assert 'basketball_recent' in manifest['display_modes']
+        assert 'nba_live' in manifest['display_modes']
-        assert 'basketball_upcoming' in manifest['display_modes']
+        assert 'nba_recent' in manifest['display_modes']
+        assert 'nba_upcoming' in manifest['display_modes']
     
     def test_plugin_has_get_display_modes(self, plugin_id):
         """Test that plugin can return display modes."""

test/plugins/test_harness.py

@@ -0,0 +1,255 @@
+"""
+Unit tests for the plugin safety harness primitives:
+bounds detection, image comparison, and mode enumeration.
+
+These don't load real plugins, so they run anywhere (including core CI where
+plugin-repos is empty).
+"""
+
+import importlib.util
+import json
+from pathlib import Path
+
+import pytest
+from PIL import Image
+
+from src.plugin_system.testing.bounds_display_manager import BoundsCheckingDisplayManager
+from src.plugin_system.testing.harness import (
+    _TOLERATED_UPDATE_ERRORS, compare_images, list_modes,
+)
+from src.plugin_system.testing.sizes import (
+    DEFAULT_TEST_SIZES, coerce_sizes, parse_size_token, resolve_test_sizes,
+)
+
+
+class TestBoundsDetection:
+    def test_reports_declared_size_not_canvas_size(self):
+        dm = BoundsCheckingDisplayManager(width=64, height=32)
+        assert dm.width == 64 and dm.height == 32
+        assert dm.matrix.width == 64 and dm.matrix.height == 32
+        # Backing canvas is padded out past the declared panel so far-overshoot
+        # coordinates land on-canvas and get flagged instead of clipped.
+        canvas_w, canvas_h = dm.image.size
+        assert canvas_w > 64 and canvas_h > 32
+
+    def test_far_overshoot_on_small_panel_is_detected(self):
+        # A coordinate meant for a wide build (x past 64) must still be caught
+        # when the declared panel is only 64 wide.
+        dm = BoundsCheckingDisplayManager(width=64, height=32)
+        dm.draw.rectangle([200, 5, 210, 10], fill=(255, 0, 0))
+        bbox = dm.check_overflow()
+        assert bbox is not None
+        assert bbox[0] >= 64
+
+    def test_in_bounds_drawing_has_no_overflow(self):
+        dm = BoundsCheckingDisplayManager(width=64, height=32)
+        dm.draw.rectangle([0, 0, 63, 31], fill=(255, 255, 255))
+        assert dm.check_overflow() is None
+
+    def test_right_overflow_is_detected(self):
+        dm = BoundsCheckingDisplayManager(width=64, height=32)
+        # Draw a few pixels past the right edge.
+        dm.draw.rectangle([60, 5, 70, 10], fill=(255, 0, 0))
+        bbox = dm.check_overflow()
+        assert bbox is not None
+        assert bbox[0] >= 64  # overflow starts at or past the declared width
+
+    def test_bottom_overflow_is_detected(self):
+        dm = BoundsCheckingDisplayManager(width=64, height=32)
+        dm.draw.rectangle([5, 30, 10, 40], fill=(0, 255, 0))
+        bbox = dm.check_overflow()
+        assert bbox is not None
+        assert bbox[3] > 32  # overflow extends past the declared height
+
+    def test_declared_image_is_cropped_to_panel(self):
+        dm = BoundsCheckingDisplayManager(width=64, height=32)
+        assert dm.get_image().size == (64, 32)
+
+    def test_snapshot_saves_cropped_panel(self, tmp_path):
+        dm = BoundsCheckingDisplayManager(width=128, height=32)
+        out = tmp_path / "snap.png"
+        dm.save_snapshot(str(out))
+        with Image.open(out) as img:
+            assert img.size == (128, 32)
+
+
+class TestArbitraryPanelSizes:
+    """The harness must handle any panel shape, not a fixed supported list."""
+
+    def test_overflow_extent_pads_to_largest_in_run(self):
+        # A wide run (extent 256) means content at x=200 on a 64-wide panel is
+        # caught; the same draw with a small extent would be clipped (false pass).
+        wide = BoundsCheckingDisplayManager(width=64, height=32, overflow_extent=(256, 32))
+        wide.draw.rectangle([200, 5, 210, 10], fill=(255, 0, 0))
+        assert wide.check_overflow() is not None
+
+        tight = BoundsCheckingDisplayManager(width=64, height=32, overflow_extent=(64, 32))
+        tight.draw.rectangle([200, 5, 210, 10], fill=(255, 0, 0))
+        assert tight.check_overflow() is None  # clipped beyond the small canvas
+
+    def test_unusual_shapes_report_their_declared_size(self):
+        for w, h in [(8, 2), (6, 6), (200, 8), (64, 96)]:
+            dm = BoundsCheckingDisplayManager(width=w, height=h)
+            assert dm.width == w and dm.height == h
+            assert dm.matrix.width == w and dm.matrix.height == h
+
+
+class TestUpdateErrorClassification:
+    """update() may fail for lack of network (tolerated) but a logic bug must
+    not pass green just because display() survives."""
+
+    def test_connectivity_errors_are_tolerated(self):
+        import socket
+        import urllib.error
+        for exc in (ConnectionError("x"), TimeoutError("x"), socket.gaierror("x"),
+                    urllib.error.URLError("x")):
+            assert isinstance(exc, _TOLERATED_UPDATE_ERRORS)
+
+    def test_logic_errors_are_not_tolerated(self):
+        for exc in (ValueError("x"), KeyError("x"), AttributeError("x"), TypeError("x")):
+            assert not isinstance(exc, _TOLERATED_UPDATE_ERRORS)
+
+
+class TestSizeParsing:
+    def test_parse_size_token_ok(self):
+        assert parse_size_token(" 128X32 ") == (128, 32)
+
+    def test_parse_size_token_rejects_garbage(self):
+        with pytest.raises(ValueError):
+            parse_size_token("128xabc")
+        with pytest.raises(ValueError):
+            parse_size_token("128-32")
+
+    def test_rejects_non_positive_dimensions(self):
+        for bad in ("0x32", "-64x32", "64x0", "64x-1"):
+            with pytest.raises(ValueError):
+                parse_size_token(bad)
+        with pytest.raises(ValueError):
+            coerce_sizes([[0, 32]])
+        with pytest.raises(ValueError):
+            coerce_sizes("64x-1")
+
+    def test_coerce_sizes_from_string_and_pairs(self):
+        assert coerce_sizes("8x16,64x64") == [(8, 16), (64, 64)]
+        assert coerce_sizes([[8, 16], (64, 64)]) == [(8, 16), (64, 64)]
+        assert coerce_sizes(None) is None
+        assert coerce_sizes("") is None
+
+    def test_resolve_precedence_env_then_spec_then_default(self, monkeypatch):
+        monkeypatch.delenv("LEDMATRIX_TEST_SIZES", raising=False)
+        assert resolve_test_sizes(None) == list(DEFAULT_TEST_SIZES)
+        assert resolve_test_sizes([[8, 16]]) == [(8, 16)]
+        monkeypatch.setenv("LEDMATRIX_TEST_SIZES", "5x5")
+        # env wins over a per-plugin spec
+        assert resolve_test_sizes([[8, 16]]) == [(5, 5)]
+
+
+class TestCompareImages:
+    def test_identical_images_match(self):
+        a = Image.new("RGB", (16, 16), (10, 20, 30))
+        b = a.copy()
+        ok, diff_pixels, max_delta = compare_images(a, b)
+        assert ok and diff_pixels == 0 and max_delta == 0
+
+    def test_different_images_fail_at_zero_tolerance(self):
+        a = Image.new("RGB", (16, 16), (0, 0, 0))
+        b = a.copy()
+        b.putpixel((1, 1), (255, 255, 255))
+        ok, diff_pixels, max_delta = compare_images(a, b)
+        assert not ok and diff_pixels == 1 and max_delta == 255
+
+    def test_tolerance_absorbs_small_noise(self):
+        a = Image.new("RGB", (16, 16), (100, 100, 100))
+        b = a.copy()
+        b.putpixel((2, 2), (103, 100, 100))  # delta 3
+        ok, _, max_delta = compare_images(a, b, max_delta=5, max_diff_pixels=0)
+        assert ok and max_delta == 3
+
+    def test_size_mismatch_fails(self):
+        a = Image.new("RGB", (16, 16))
+        b = Image.new("RGB", (32, 16))
+        ok, _, _ = compare_images(a, b)
+        assert not ok
+
+
+class TestListModes:
+    def test_instance_modes_take_precedence(self):
+        inst = type("P", (), {"modes": ["a", "b"]})()
+        assert list_modes(inst, {"display_modes": ["x"]}, "pid") == ["a", "b"]
+
+    def test_falls_back_to_manifest_display_modes(self):
+        inst = type("P", (), {})()
+        assert list_modes(inst, {"display_modes": ["x", "y"]}, "pid") == ["x", "y"]
+
+    def test_falls_back_to_plugin_id(self):
+        inst = type("P", (), {})()
+        assert list_modes(inst, {}, "pid") == ["pid"]
+
+
+def _load_check_plugin_cli():
+    """Load scripts/check_plugin.py by path (it isn't an importable package)."""
+    root = Path(__file__).resolve().parents[2]
+    path = root / "scripts" / "check_plugin.py"
+    spec = importlib.util.spec_from_file_location("check_plugin_cli", path)
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+    return mod
+
+
+def _make_fixture_plugin(tmp_path, harness):
+    """Create a minimal plugin dir with a test/harness.json; return its parent
+    (the search dir)."""
+    pdir = tmp_path / "plugins" / "demo-clock"
+    (pdir / "test").mkdir(parents=True)
+    (pdir / "manifest.json").write_text(json.dumps({
+        "id": "demo-clock", "name": "Demo Clock", "version": "1.0.0",
+        "author": "test", "entry_point": "manager.py", "class_name": "DemoClock",
+        "display_modes": ["demo-clock"], "compatible_versions": ["*"],
+    }))
+    (pdir / "test" / "harness.json").write_text(json.dumps(harness))
+    return pdir.parent
+
+
+class TestCheckPluginHonorsHarnessJson:
+    """Regression: check_plugin.py (the CI tool) must apply test/harness.json so
+    its render reproduces the committed goldens — otherwise time/data-dependent
+    plugins drift on every CI run."""
+
+    def test_harness_json_supplies_render_settings(self, tmp_path, monkeypatch):
+        mod = _load_check_plugin_cli()
+        search = _make_fixture_plugin(tmp_path, {
+            "config": {"timezone": "UTC"},
+            "freeze_time": "2025-08-01 15:25:00",
+            "sizes": [[128, 32]],
+        })
+        captured = {}
+        monkeypatch.setattr(mod, "render_plugin_matrix",
+                            lambda **kw: captured.update(kw) or [])
+        monkeypatch.setattr(mod, "compare_to_goldens", lambda *a, **k: [])
+        mod.check_one(
+            plugin_id="demo-clock", search_dirs=[str(search)], sizes=None,
+            mock_data={}, config={}, run_update=True, out_dir=None,
+            update_golden=False, golden_dir_override=None, freeze_time=None,
+        )
+        assert captured["freeze_time"] == "2025-08-01 15:25:00"
+        assert captured["config"]["timezone"] == "UTC"
+        assert captured["sizes"] == [(128, 32)]
+
+    def test_cli_flags_override_harness_json(self, tmp_path, monkeypatch):
+        mod = _load_check_plugin_cli()
+        search = _make_fixture_plugin(tmp_path, {
+            "config": {"timezone": "UTC"},
+            "freeze_time": "2025-08-01 15:25:00",
+        })
+        captured = {}
+        monkeypatch.setattr(mod, "render_plugin_matrix",
+                            lambda **kw: captured.update(kw) or [])
+        monkeypatch.setattr(mod, "compare_to_goldens", lambda *a, **k: [])
+        mod.check_one(
+            plugin_id="demo-clock", search_dirs=[str(search)], sizes=None,
+            mock_data={}, config={"timezone": "America/New_York"},
+            run_update=True, out_dir=None, update_golden=False,
+            golden_dir_override=None, freeze_time="2030-01-01 00:00:00",
+        )
+        assert captured["freeze_time"] == "2030-01-01 00:00:00"
+        assert captured["config"]["timezone"] == "America/New_York"

test/plugins/test_plugin_matrix.py

@@ -0,0 +1,115 @@
+"""
+Cross-size / cross-screen plugin safety test.
+
+For every discovered plugin, render every declared screen at every supported
+matrix size and assert it: loads, renders without crashing, stays within the
+panel bounds, and — for plugins that ship golden images — matches them.
+
+Plugin discovery (first match wins):
+  - $LEDMATRIX_PLUGINS_DIR  (os.pathsep-separated list of dirs), else
+  - <project_root>/plugin-repos and <project_root>/plugins
+
+A plugin opts into golden-image checks by adding test/golden/<WxH>/<mode>.png
+(and usually test/harness.json for deterministic config / mock data / time).
+"""
+
+import os
+from pathlib import Path
+from typing import Dict, List
+
+import pytest
+
+from src.plugin_system.testing.harness import (
+    render_plugin_matrix, compare_to_goldens,
+)
+from src.plugin_system.testing.loading import load_config_defaults, load_harness_spec
+from src.plugin_system.testing.sizes import resolve_test_sizes
+
+PROJECT_ROOT = Path(__file__).resolve().parents[2]
+
+# Set LEDMATRIX_REQUIRE_PLUGINS=1 in any CI/hardware pipeline where plugins are
+# expected to be present, so a discovery drift (empty search path) fails loudly
+# instead of silently skipping and losing this safety signal.
+_REQUIRE_PLUGINS = os.environ.get("LEDMATRIX_REQUIRE_PLUGINS") == "1"
+
+
+def _plugin_search_dirs() -> List[Path]:
+    env = os.environ.get("LEDMATRIX_PLUGINS_DIR")
+    if env:
+        return [Path(p) for p in env.split(os.pathsep) if p]
+    return [PROJECT_ROOT / "plugin-repos", PROJECT_ROOT / "plugins"]
+
+
+def _discover() -> Dict[str, Path]:
+    """Map plugin_id -> plugin_dir for all plugins on the search path."""
+    found: Dict[str, Path] = {}
+    for base in _plugin_search_dirs():
+        if not base.exists():
+            continue
+        for child in sorted(base.iterdir()):
+            if (child / "manifest.json").exists() and child.name not in found:
+                found[child.name] = child
+    return found
+
+
+_PLUGINS = _discover()
+
+
+@pytest.mark.plugin
+def test_plugins_were_discovered() -> None:
+    """Guard against silently skipping the whole matrix when discovery drifts.
+
+    Local dev and the plugin-less core CI legitimately have no plugins, so we
+    skip there; but when LEDMATRIX_REQUIRE_PLUGINS=1 an empty search path is a
+    hard failure rather than a green no-op.
+    """
+    if _PLUGINS:
+        return
+    search = [str(p) for p in _plugin_search_dirs()]
+    if _REQUIRE_PLUGINS:
+        pytest.fail(
+            "LEDMATRIX_REQUIRE_PLUGINS=1 but no plugins were discovered on the "
+            f"search path: {search}"
+        )
+    pytest.skip(f"no plugins found on the search path: {search}")
+
+
+@pytest.mark.plugin
+@pytest.mark.skipif(not _PLUGINS, reason="no plugins found on the search path")
+@pytest.mark.parametrize("plugin_id", sorted(_PLUGINS))
+def test_plugin_renders_across_sizes_and_screens(plugin_id: str) -> None:
+    plugin_dir = _PLUGINS[plugin_id]
+    spec = load_harness_spec(plugin_dir)
+
+    config = {"enabled": True}
+    config.update(load_config_defaults(plugin_dir))
+    config.update(spec.get("config", {}))
+
+    # Sizes: LEDMATRIX_TEST_SIZES env (test on real hardware) wins, then the
+    # plugin's own harness.json "sizes", else the default representative sample.
+    sizes = resolve_test_sizes(spec.get("sizes"))
+
+    results = render_plugin_matrix(
+        plugin_id=plugin_id,
+        plugin_dir=plugin_dir,
+        config=config,
+        mock_data=spec.get("mock_data_contents", {}),
+        sizes=sizes,
+        run_update=not spec.get("skip_update", False),
+        freeze_time=spec.get("freeze_time"),
+    )
+    compare_to_goldens(results, plugin_dir / "test" / "golden")
+
+    failures = []
+    for r in results:
+        if r.error is not None:
+            failures.append(f"{r.size_label} {r.mode}: crashed: {r.error}")
+        elif r.overflow is not None:
+            failures.append(f"{r.size_label} {r.mode}: overflow past panel bbox={r.overflow}")
+        elif r.golden_checked and r.golden_ok is False:
+            failures.append(
+                f"{r.size_label} {r.mode}: golden drift {r.golden_diff_pixels}px "
+                f"(max Δ={r.golden_max_delta})"
+            )
+
+    assert not failures, f"{plugin_id} failed:\n  " + "\n  ".join(failures)

test/test_api_extractors.py

@@ -0,0 +1,342 @@
+"""
+Tests for src/base_classes/api_extractors.py
+
+Covers ESPNFootballExtractor, ESPNBaseballExtractor, ESPNHockeyExtractor,
+SoccerAPIExtractor, and the shared _extract_common_details logic.
+"""
+
+import logging
+import pytest
+from src.base_classes.api_extractors import (
+    ESPNFootballExtractor,
+    ESPNBaseballExtractor,
+    ESPNHockeyExtractor,
+    SoccerAPIExtractor,
+)
+
+
+# ---------------------------------------------------------------------------
+# Shared test data factories
+# ---------------------------------------------------------------------------
+
+def _make_espn_event(state: str = "in", home_abbr: str = "KC", away_abbr: str = "BUF",
+                     home_score: str = "14", away_score: str = "7",
+                     date_str: str = "2024-01-15T20:00:00Z",
+                     include_situation: bool = False,
+                     situation: dict | None = None,
+                     status_detail: str = "2nd Qtr 8:42",
+                     period: int = 2) -> dict:
+    """Build a minimal ESPN-style game event dict."""
+    comp_status = {
+        "type": {
+            "state": state,
+            "shortDetail": status_detail,
+            "detail": status_detail,
+            "name": "STATUS_IN_PROGRESS",
+        },
+        "period": period,
+        "displayClock": "8:42",
+    }
+    comp = {
+        "status": comp_status,
+        "competitors": [
+            {
+                "homeAway": "home",
+                "team": {"abbreviation": home_abbr, "displayName": f"{home_abbr} Team"},
+                "score": home_score,
+            },
+            {
+                "homeAway": "away",
+                "team": {"abbreviation": away_abbr, "displayName": f"{away_abbr} Team"},
+                "score": away_score,
+            },
+        ],
+    }
+    if include_situation:
+        comp["situation"] = situation or {}
+    return {
+        "id": "test-game-1",
+        "date": date_str,
+        "competitions": [comp],
+    }
+
+
+def _make_logger() -> logging.Logger:
+    return logging.getLogger("test_extractor")
+
+
+# ---------------------------------------------------------------------------
+# ESPNFootballExtractor
+# ---------------------------------------------------------------------------
+
+class TestESPNFootballExtractor:
+    def setup_method(self):
+        self.extractor = ESPNFootballExtractor(_make_logger())
+
+    def test_extract_live_game_basic_fields(self):
+        event = _make_espn_event(state="in", home_score="14", away_score="7")
+        result = self.extractor.extract_game_details(event)
+        assert result is not None
+        assert result["home_abbr"] == "KC"
+        assert result["away_abbr"] == "BUF"
+        assert result["home_score"] == "14"
+        assert result["away_score"] == "7"
+        assert result["is_live"] is True
+        assert result["is_final"] is False
+        assert result["is_upcoming"] is False
+
+    def test_extract_final_game(self):
+        event = _make_espn_event(state="post")
+        result = self.extractor.extract_game_details(event)
+        assert result is not None
+        assert result["is_final"] is True
+        assert result["is_live"] is False
+
+    def test_extract_upcoming_game(self):
+        event = _make_espn_event(state="pre")
+        result = self.extractor.extract_game_details(event)
+        assert result is not None
+        assert result["is_upcoming"] is True
+
+    def test_sport_specific_fields_default_when_pregame(self):
+        event = _make_espn_event(state="pre")
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert "down" in fields
+        assert "distance" in fields
+        assert "possession" in fields
+        assert "is_redzone" in fields
+        assert fields["is_redzone"] is False
+
+    def test_sport_specific_fields_live_with_situation(self):
+        situation = {
+            "down": 3,
+            "distance": 7,
+            "possession": "KC",
+            "isRedZone": True,
+            "homeTimeouts": 2,
+            "awayTimeouts": 1,
+        }
+        event = _make_espn_event(state="in", include_situation=True, situation=situation)
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["down"] == 3
+        assert fields["distance"] == 7
+        assert fields["is_redzone"] is True
+        assert fields["home_timeouts"] == 2
+        assert fields["away_timeouts"] == 1
+
+    def test_scoring_event_detected(self):
+        # situation must be non-empty (truthy) for the live block to execute
+        situation = {"down": 1, "distance": 10}
+        event = _make_espn_event(
+            state="in",
+            include_situation=True,
+            situation=situation,
+            status_detail="touchdown scored",
+        )
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert "touchdown" in fields.get("scoring_event", "").lower()
+
+    def test_returns_none_on_empty_event(self):
+        assert self.extractor.extract_game_details({}) is None
+
+    def test_returns_none_when_teams_missing(self):
+        event = {
+            "id": "x",
+            "date": "2024-01-15T20:00:00Z",
+            "competitions": [
+                {
+                    "status": {"type": {"state": "in", "shortDetail": "", "detail": "", "name": ""}},
+                    "competitors": [],  # no competitors
+                }
+            ],
+        }
+        assert self.extractor.extract_game_details(event) is None
+
+    def test_date_z_suffix_parsed(self):
+        event = _make_espn_event(date_str="2024-01-15T20:00:00Z")
+        result = self.extractor.extract_game_details(event)
+        # Should not raise and should return a result
+        assert result is not None
+
+    def test_id_propagated(self):
+        event = _make_espn_event()
+        result = self.extractor.extract_game_details(event)
+        assert result["id"] == "test-game-1"
+
+
+# ---------------------------------------------------------------------------
+# ESPNBaseballExtractor
+# ---------------------------------------------------------------------------
+
+class TestESPNBaseballExtractor:
+    def setup_method(self):
+        self.extractor = ESPNBaseballExtractor(_make_logger())
+
+    def test_extract_live_game(self):
+        event = _make_espn_event(
+            state="in", home_abbr="NYY", away_abbr="BOS",
+            home_score="3", away_score="2"
+        )
+        result = self.extractor.extract_game_details(event)
+        assert result is not None
+        assert result["home_abbr"] == "NYY"
+        assert result["is_live"] is True
+
+    def test_baseball_sport_fields_defaults(self):
+        event = _make_espn_event(state="pre")
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert "inning" in fields
+        assert "outs" in fields
+        assert "bases" in fields
+        assert "strikes" in fields
+        assert "balls" in fields
+
+    def test_baseball_sport_fields_live(self):
+        situation = {
+            "inning": 7,
+            "outs": 2,
+            "bases": "110",
+            "strikes": 2,
+            "balls": 3,
+            "pitcher": "Smith",
+            "batter": "Jones",
+        }
+        event = _make_espn_event(state="in", include_situation=True, situation=situation)
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["inning"] == 7
+        assert fields["outs"] == 2
+        assert fields["strikes"] == 2
+        assert fields["pitcher"] == "Smith"
+
+    def test_returns_none_on_empty(self):
+        assert self.extractor.extract_game_details({}) is None
+
+
+# ---------------------------------------------------------------------------
+# ESPNHockeyExtractor
+# ---------------------------------------------------------------------------
+
+class TestESPNHockeyExtractor:
+    def setup_method(self):
+        self.extractor = ESPNHockeyExtractor(_make_logger())
+
+    def test_extract_live_game(self):
+        event = _make_espn_event(
+            state="in", home_abbr="BOS", away_abbr="TOR",
+            home_score="2", away_score="1"
+        )
+        result = self.extractor.extract_game_details(event)
+        assert result is not None
+        assert result["is_live"] is True
+
+    def test_hockey_period_text_p1(self):
+        situation = {"isPowerPlay": False}
+        event = _make_espn_event(
+            state="in", include_situation=True, situation=situation, period=1
+        )
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["period_text"] == "P1"
+
+    def test_hockey_period_text_p2(self):
+        situation = {"isPowerPlay": False}  # non-empty so the live block executes
+        event = _make_espn_event(
+            state="in", include_situation=True, situation=situation, period=2
+        )
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["period_text"] == "P2"
+
+    def test_hockey_period_text_p3(self):
+        situation = {"isPowerPlay": False}
+        event = _make_espn_event(
+            state="in", include_situation=True, situation=situation, period=3
+        )
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["period_text"] == "P3"
+
+    def test_hockey_period_text_ot(self):
+        situation = {"isPowerPlay": False}
+        event = _make_espn_event(
+            state="in", include_situation=True, situation=situation, period=4
+        )
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["period_text"] == "OT1"
+
+    def test_hockey_power_play(self):
+        situation = {"isPowerPlay": True, "homeShots": 12, "awayShots": 8}
+        event = _make_espn_event(state="in", include_situation=True, situation=situation, period=2)
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["power_play"] is True
+        assert fields["shots_on_goal"]["home"] == 12
+        assert fields["shots_on_goal"]["away"] == 8
+
+    def test_hockey_fields_defaults_pregame(self):
+        event = _make_espn_event(state="pre")
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert "period" in fields
+        assert "power_play" in fields
+        assert fields["power_play"] is False
+
+    def test_returns_none_on_empty(self):
+        assert self.extractor.extract_game_details({}) is None
+
+
+# ---------------------------------------------------------------------------
+# SoccerAPIExtractor
+# ---------------------------------------------------------------------------
+
+class TestSoccerAPIExtractor:
+    def setup_method(self):
+        self.extractor = SoccerAPIExtractor(_make_logger())
+
+    def _make_soccer_event(self, is_live: bool = True) -> dict:
+        return {
+            "id": "soccer-1",
+            "home_team": {"abbreviation": "ARS", "name": "Arsenal"},
+            "away_team": {"abbreviation": "CHE", "name": "Chelsea"},
+            "home_score": "2",
+            "away_score": "1",
+            "status": "LIVE",
+            "is_live": is_live,
+            "is_final": not is_live,
+            "is_upcoming": False,
+            "half": "1",
+            "stoppage_time": "2",
+            "home_yellow_cards": 1,
+            "away_yellow_cards": 2,
+            "home_red_cards": 0,
+            "away_red_cards": 0,
+            "home_possession": 55,
+            "away_possession": 45,
+        }
+
+    def test_extract_live_game(self):
+        event = self._make_soccer_event(is_live=True)
+        result = self.extractor.extract_game_details(event)
+        assert result is not None
+        assert result["home_abbr"] == "ARS"
+        assert result["away_abbr"] == "CHE"
+        assert result["is_live"] is True
+
+    def test_sport_specific_cards(self):
+        event = self._make_soccer_event()
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["cards"]["home_yellow"] == 1
+        assert fields["cards"]["away_yellow"] == 2
+        assert fields["cards"]["home_red"] == 0
+
+    def test_sport_specific_possession(self):
+        event = self._make_soccer_event()
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["possession"]["home"] == 55
+        assert fields["possession"]["away"] == 45
+
+    def test_sport_specific_half(self):
+        event = self._make_soccer_event()
+        fields = self.extractor.get_sport_specific_fields(event)
+        assert fields["half"] == "1"
+
+    def test_scores_as_strings(self):
+        event = self._make_soccer_event()
+        result = self.extractor.extract_game_details(event)
+        assert result["home_score"] == "2"
+        assert result["away_score"] == "1"

test/test_background_data_service.py

@@ -0,0 +1,299 @@
+"""
+Tests for src/background_data_service.py
+
+Covers BackgroundDataService: submit_fetch_request, get_result,
+is_request_complete, get_request_status, cancel_request, get_statistics,
+_cleanup_completed_requests, shutdown, and get_background_service singleton.
+"""
+
+import time
+import pytest
+from unittest.mock import MagicMock, patch, Mock
+from concurrent.futures import Future
+
+from src.background_data_service import (
+    BackgroundDataService,
+    FetchStatus,
+    FetchResult,
+    FetchRequest,
+    get_background_service,
+    shutdown_background_service,
+)
+import src.background_data_service as bds_module
+
+
+# ---------------------------------------------------------------------------
+# Fixtures
+# ---------------------------------------------------------------------------
+
+@pytest.fixture(autouse=True)
+def reset_global_service():
+    """Ensure each test starts with no global singleton."""
+    shutdown_background_service()
+    yield
+    shutdown_background_service()
+
+
+@pytest.fixture
+def mock_cache_manager():
+    m = MagicMock()
+    m.get.return_value = None
+    m.set.return_value = None
+    m.generate_sport_cache_key.return_value = "test_key"
+    return m
+
+
+@pytest.fixture
+def service(mock_cache_manager):
+    svc = BackgroundDataService(mock_cache_manager, max_workers=2, request_timeout=5)
+    yield svc
+    svc.shutdown(wait=False)
+
+
+# ---------------------------------------------------------------------------
+# Initialisation
+# ---------------------------------------------------------------------------
+
+class TestInitialisation:
+    def test_stats_zeroed(self, service):
+        stats = service.get_statistics()
+        assert stats["total_requests"] == 0
+        assert stats["completed_requests"] == 0
+        assert stats["failed_requests"] == 0
+
+    def test_no_active_requests(self, service):
+        assert len(service.active_requests) == 0
+
+    def test_not_shutdown(self, service):
+        assert service._shutdown is False
+
+
+# ---------------------------------------------------------------------------
+# Cache hit path
+# ---------------------------------------------------------------------------
+
+class TestCacheHit:
+    def test_cache_hit_returns_request_id(self, service, mock_cache_manager):
+        mock_cache_manager.get.return_value = {"events": [{"id": "1"}]}
+        req_id = service.submit_fetch_request(
+            sport="nfl", year=2024,
+            url="https://example.com/nfl",
+            cache_key="nfl_key",
+        )
+        assert req_id is not None
+        # Request should be immediately complete due to cache hit
+        result = service.get_result(req_id)
+        assert result is not None
+        assert result.success is True
+        assert result.cached is True
+
+    def test_cache_hit_increments_stat(self, service, mock_cache_manager):
+        mock_cache_manager.get.return_value = {"events": []}
+        service.submit_fetch_request(sport="nba", year=2024, url="https://x.com", cache_key="k")
+        stats = service.get_statistics()
+        assert stats["cached_hits"] == 1
+
+
+# ---------------------------------------------------------------------------
+# Actual fetch path (mocked HTTP)
+# ---------------------------------------------------------------------------
+
+class TestFetchPath:
+    def _valid_payload(self) -> dict:
+        return {"events": [{"id": "g1"}, {"id": "g2"}]}
+
+    def test_successful_fetch_completes(self, service, mock_cache_manager):
+        mock_resp = Mock()
+        mock_resp.json.return_value = self._valid_payload()
+        mock_resp.raise_for_status.return_value = None
+
+        with patch.object(service.session, "get", return_value=mock_resp):
+            req_id = service.submit_fetch_request(
+                sport="nfl", year=2024,
+                url="https://example.com/nfl",
+                cache_key="nfl_test",
+            )
+            # Wait for the background thread
+            deadline = time.time() + 5
+            while not service.is_request_complete(req_id) and time.time() < deadline:
+                time.sleep(0.05)
+
+        result = service.get_result(req_id)
+        assert result is not None
+        assert result.success is True
+        assert result.data == self._valid_payload()
+
+    def test_failed_fetch_records_error(self, service, mock_cache_manager):
+        with patch.object(service.session, "get", side_effect=Exception("network error")):
+            req_id = service.submit_fetch_request(
+                sport="nba", year=2024,
+                url="https://example.com/nba",
+                cache_key="nba_test",
+                max_retries=0,
+            )
+            deadline = time.time() + 5
+            while not service.is_request_complete(req_id) and time.time() < deadline:
+                time.sleep(0.05)
+
+        result = service.get_result(req_id)
+        assert result is not None
+        assert result.success is False
+        assert result.error is not None
+
+    def test_cache_miss_increments_stat(self, service, mock_cache_manager):
+        mock_resp = Mock()
+        mock_resp.json.return_value = self._valid_payload()
+        mock_resp.raise_for_status.return_value = None
+
+        with patch.object(service.session, "get", return_value=mock_resp):
+            service.submit_fetch_request(
+                sport="nfl", year=2024, url="https://x.com", cache_key="new_key",
+            )
+        stats = service.get_statistics()
+        assert stats["cache_misses"] == 1
+
+    def test_callback_called_on_success(self, service, mock_cache_manager):
+        callback = Mock()
+        mock_resp = Mock()
+        mock_resp.json.return_value = self._valid_payload()
+        mock_resp.raise_for_status.return_value = None
+
+        with patch.object(service.session, "get", return_value=mock_resp):
+            req_id = service.submit_fetch_request(
+                sport="nfl", year=2024, url="https://x.com",
+                cache_key="cb_key", callback=callback, max_retries=0,
+            )
+            deadline = time.time() + 5
+            while not service.is_request_complete(req_id) and time.time() < deadline:
+                time.sleep(0.05)
+
+        callback.assert_called_once()
+        call_arg = callback.call_args[0][0]
+        assert isinstance(call_arg, FetchResult)
+
+    def test_data_cached_after_successful_fetch(self, service, mock_cache_manager):
+        mock_resp = Mock()
+        mock_resp.json.return_value = self._valid_payload()
+        mock_resp.raise_for_status.return_value = None
+
+        with patch.object(service.session, "get", return_value=mock_resp):
+            req_id = service.submit_fetch_request(
+                sport="nfl", year=2024, url="https://x.com", cache_key="cache_after_key",
+            )
+            deadline = time.time() + 5
+            while not service.is_request_complete(req_id) and time.time() < deadline:
+                time.sleep(0.05)
+
+        mock_cache_manager.set.assert_called()
+
+
+# ---------------------------------------------------------------------------
+# Request status / cancel
+# ---------------------------------------------------------------------------
+
+class TestRequestStatusAndCancel:
+    def test_unknown_request_status_is_none(self, service):
+        assert service.get_request_status("nonexistent") is None
+
+    def test_cancel_active_request(self, service, mock_cache_manager):
+        # Manually insert an active request
+        req = FetchRequest(
+            id="r1", sport="nfl", year=2024,
+            cache_key="k", url="https://x.com",
+        )
+        req.status = FetchStatus.PENDING
+        service.active_requests["r1"] = req
+        result = service.cancel_request("r1")
+        assert result is True
+        assert "r1" not in service.active_requests
+
+    def test_cancel_nonexistent_request(self, service):
+        assert service.cancel_request("does-not-exist") is False
+
+    def test_is_request_complete_false_for_active(self, service, mock_cache_manager):
+        req = FetchRequest(
+            id="r2", sport="mlb", year=2024,
+            cache_key="k2", url="https://x.com",
+        )
+        service.active_requests["r2"] = req
+        assert service.is_request_complete("r2") is False
+
+    def test_is_request_complete_true_for_done(self, service):
+        result = FetchResult(request_id="r3", success=True)
+        service.completed_requests["r3"] = result
+        assert service.is_request_complete("r3") is True
+
+    def test_get_result_returns_none_for_unknown(self, service):
+        assert service.get_result("unknown") is None
+
+
+# ---------------------------------------------------------------------------
+# Shutdown
+# ---------------------------------------------------------------------------
+
+class TestShutdown:
+    def test_shutdown_sets_flag(self, service):
+        service.shutdown(wait=False)
+        assert service._shutdown is True
+
+    def test_submit_after_shutdown_raises(self, service, mock_cache_manager):
+        service.shutdown(wait=False)
+        with pytest.raises(RuntimeError, match="shutting down"):
+            service.submit_fetch_request(
+                sport="nfl", year=2024, url="https://x.com", cache_key="k"
+            )
+
+
+# ---------------------------------------------------------------------------
+# Cleanup
+# ---------------------------------------------------------------------------
+
+class TestCleanup:
+    def test_cleanup_removes_old_requests(self, service):
+        old_result = FetchResult(request_id="old", success=True)
+        old_result.completed_at = time.time() - 7200  # 2 hours ago
+        service.completed_requests["old"] = old_result
+        service._last_completed_requests_cleanup = 0  # force cleanup
+        removed = service._cleanup_completed_requests(force=True)
+        assert removed >= 1
+        assert "old" not in service.completed_requests
+
+    def test_cleanup_respects_interval(self, service):
+        old_result = FetchResult(request_id="r", success=True)
+        old_result.completed_at = time.time() - 7200
+        service.completed_requests["r"] = old_result
+        # Cleanup interval not passed, should skip
+        service._last_completed_requests_cleanup = time.time()
+        removed = service._cleanup_completed_requests(force=False)
+        assert removed == 0
+
+    def test_size_limit_enforcement(self, service):
+        service._max_completed_requests = 3
+        for i in range(5):
+            result = FetchResult(request_id=str(i), success=True)
+            result.completed_at = time.time() - (5 - i) * 100  # oldest first
+            service.completed_requests[str(i)] = result
+        service._last_completed_requests_cleanup = 0
+        service._cleanup_completed_requests(force=True)
+        assert len(service.completed_requests) <= 3
+
+
+# ---------------------------------------------------------------------------
+# Singleton get_background_service
+# ---------------------------------------------------------------------------
+
+class TestGetBackgroundService:
+    def test_first_call_requires_cache_manager(self):
+        with pytest.raises(ValueError, match="cache_manager is required"):
+            get_background_service()
+
+    def test_creates_singleton(self, mock_cache_manager):
+        svc1 = get_background_service(mock_cache_manager)
+        svc2 = get_background_service()
+        assert svc1 is svc2
+
+    def test_shutdown_clears_singleton(self, mock_cache_manager):
+        get_background_service(mock_cache_manager)
+        shutdown_background_service()
+        with pytest.raises(ValueError):
+            get_background_service()

test/test_data_sources.py

@@ -0,0 +1,209 @@
+"""
+Tests for src/base_classes/data_sources.py
+
+Covers ESPNDataSource, MLBAPIDataSource, SoccerAPIDataSource.
+All HTTP calls are mocked to avoid network access.
+"""
+
+import logging
+from datetime import datetime, date
+from unittest.mock import MagicMock, patch, Mock
+import pytest
+import requests
+
+from src.base_classes.data_sources import ESPNDataSource, MLBAPIDataSource, SoccerAPIDataSource
+
+
+def _make_logger() -> logging.Logger:
+    return logging.getLogger("test_data_sources")
+
+
+def _mock_response(json_data: dict, status_code: int = 200):
+    resp = Mock(spec=requests.Response)
+    resp.status_code = status_code
+    resp.json.return_value = json_data
+    resp.raise_for_status = Mock()
+    if status_code >= 400:
+        resp.raise_for_status.side_effect = requests.HTTPError(response=resp)
+    return resp
+
+
+# ---------------------------------------------------------------------------
+# ESPNDataSource
+# ---------------------------------------------------------------------------
+
+class TestESPNDataSource:
+    def setup_method(self):
+        self.source = ESPNDataSource(_make_logger())
+
+    def test_get_headers(self):
+        headers = self.source.get_headers()
+        assert headers["Accept"] == "application/json"
+        assert "LEDMatrix" in headers["User-Agent"]
+
+    def test_fetch_live_games_returns_live_events(self):
+        live_event = {
+            "competitions": [{"status": {"type": {"state": "in"}}}]
+        }
+        non_live_event = {
+            "competitions": [{"status": {"type": {"state": "pre"}}}]
+        }
+        payload = {"events": [live_event, non_live_event]}
+
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_live_games("football", "nfl")
+
+        assert len(result) == 1
+        assert result[0] is live_event
+
+    def test_fetch_live_games_empty_when_none_live(self):
+        payload = {"events": [
+            {"competitions": [{"status": {"type": {"state": "post"}}}]}
+        ]}
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_live_games("football", "nfl")
+        assert result == []
+
+    def test_fetch_live_games_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("network failure")):
+            result = self.source.fetch_live_games("football", "nfl")
+        assert result == []
+
+    def test_fetch_schedule_returns_all_events(self):
+        events = [{"id": "1"}, {"id": "2"}]
+        payload = {"events": events}
+        start = datetime(2024, 1, 1)
+        end = datetime(2024, 1, 7)
+
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_schedule("football", "nfl", (start, end))
+
+        assert len(result) == 2
+
+    def test_fetch_schedule_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("timeout")):
+            result = self.source.fetch_schedule("football", "nfl", (datetime.now(), datetime.now()))
+        assert result == []
+
+    def test_fetch_standings_success(self):
+        payload = {"standings": []}
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_standings("football", "nfl")
+        assert result == payload
+
+    def test_fetch_standings_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("error")):
+            result = self.source.fetch_standings("football", "nfl")
+        assert result == {}
+
+    def test_base_url_set_correctly(self):
+        assert "espn.com" in self.source.base_url
+
+
+# ---------------------------------------------------------------------------
+# MLBAPIDataSource
+# ---------------------------------------------------------------------------
+
+class TestMLBAPIDataSource:
+    def setup_method(self):
+        self.source = MLBAPIDataSource(_make_logger())
+
+    def test_fetch_live_games_filters_live(self):
+        live_game = {"status": {"abstractGameState": "Live"}}
+        final_game = {"status": {"abstractGameState": "Final"}}
+        payload = {"dates": [{"games": [live_game, final_game]}]}
+
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_live_games("baseball", "mlb")
+
+        assert len(result) == 1
+        assert result[0] is live_game
+
+    def test_fetch_live_games_empty_dates(self):
+        payload = {"dates": []}
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_live_games("baseball", "mlb")
+        assert result == []
+
+    def test_fetch_live_games_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("err")):
+            result = self.source.fetch_live_games("baseball", "mlb")
+        assert result == []
+
+    def test_fetch_schedule_aggregates_all_dates(self):
+        payload = {
+            "dates": [
+                {"games": [{"id": "1"}, {"id": "2"}]},
+                {"games": [{"id": "3"}]},
+            ]
+        }
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_schedule("baseball", "mlb", (datetime.now(), datetime.now()))
+        assert len(result) == 3
+
+    def test_fetch_schedule_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("err")):
+            result = self.source.fetch_schedule("baseball", "mlb", (datetime.now(), datetime.now()))
+        assert result == []
+
+    def test_fetch_standings_success(self):
+        payload = {"records": []}
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_standings("baseball", "mlb")
+        assert result == payload
+
+    def test_fetch_standings_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("err")):
+            result = self.source.fetch_standings("baseball", "mlb")
+        assert result == {}
+
+
+# ---------------------------------------------------------------------------
+# SoccerAPIDataSource
+# ---------------------------------------------------------------------------
+
+class TestSoccerAPIDataSource:
+    def setup_method(self):
+        self.source = SoccerAPIDataSource(_make_logger(), api_key="test-key-123")
+
+    def test_headers_include_api_key(self):
+        headers = self.source.get_headers()
+        assert headers["X-Auth-Token"] == "test-key-123"
+
+    def test_headers_without_api_key(self):
+        source = SoccerAPIDataSource(_make_logger())
+        headers = source.get_headers()
+        assert "X-Auth-Token" not in headers
+
+    def test_fetch_live_games_success(self):
+        payload = {"matches": [{"id": "m1"}, {"id": "m2"}]}
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_live_games("soccer", "eng.1")
+        assert len(result) == 2
+
+    def test_fetch_live_games_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("err")):
+            result = self.source.fetch_live_games("soccer", "eng.1")
+        assert result == []
+
+    def test_fetch_schedule_success(self):
+        payload = {"matches": [{"id": "m1"}]}
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_schedule("soccer", "eng.1", (datetime.now(), datetime.now()))
+        assert len(result) == 1
+
+    def test_fetch_schedule_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("err")):
+            result = self.source.fetch_schedule("soccer", "eng.1", (datetime.now(), datetime.now()))
+        assert result == []
+
+    def test_fetch_standings_success(self):
+        payload = {"standings": []}
+        with patch.object(self.source.session, "get", return_value=_mock_response(payload)):
+            result = self.source.fetch_standings("soccer", "PL")
+        assert result == payload
+
+    def test_fetch_standings_returns_empty_on_error(self):
+        with patch.object(self.source.session, "get", side_effect=Exception("err")):
+            result = self.source.fetch_standings("soccer", "PL")
+        assert result == {}

test/test_display_controller.py

@@ -167,6 +167,53 @@ class TestDisplayControllerLivePriority:
         assert controller.current_display_mode == "test_plugin_live"
         assert controller.force_change is True
 
+    def test_live_priority_resume_continues_rotation(self, test_display_controller):
+        """Regression: when live priority ends, rotation resumes where it was
+        interrupted, not after the live plugin's mode.
+
+        Without the fix, _apply_live_priority left current_mode_index pointing at
+        the live plugin's slot, so the next rotation step skipped every mode
+        between the interrupted position and the live plugin (e.g. elections,
+        which sits just before a flights plugin in the order)."""
+        controller = test_display_controller
+        controller.available_modes = [
+            "weather", "forecast", "almanac", "election_ticker", "flight_live"
+        ]
+        # Rotation is about to show the 3rd mode (index 2).
+        controller.current_mode_index = 2
+        controller.current_display_mode = "almanac"
+        controller._live_resume_index = None
+
+        # Live priority (e.g. planes overhead) preempts -> flight_live (index 4).
+        controller._apply_live_priority("flight_live")
+        assert controller.current_display_mode == "flight_live"
+        assert controller.current_mode_index == 4
+        assert controller._live_resume_index == 2  # saved rotation position
+
+        # Re-checks while the hold continues must not move the saved position.
+        controller._apply_live_priority("flight_live")
+        assert controller._live_resume_index == 2
+
+        # Live priority ends -> resume at the saved index (almanac), so the next
+        # rotation step lands on election_ticker (index 3) rather than skipping it.
+        controller._apply_live_priority(None)
+        assert controller.current_mode_index == 2
+        assert controller.current_display_mode == "almanac"
+        assert controller._live_resume_index is None
+
+    def test_live_priority_no_resume_when_idle(self, test_display_controller):
+        """No saved position + no live content is a no-op (normal rotation)."""
+        controller = test_display_controller
+        controller.available_modes = ["a", "b", "c"]
+        controller.current_mode_index = 1
+        controller.current_display_mode = "b"
+        controller._live_resume_index = None
+
+        controller._apply_live_priority(None)
+
+        assert controller.current_mode_index == 1
+        assert controller.current_display_mode == "b"
+
 
 class TestDisplayControllerDynamicDuration:
     """Test dynamic duration handling."""
@@ -229,18 +276,20 @@ class TestDisplayControllerSchedule:
     def test_inactive_hours(self, test_display_controller):
         """Test inactive hours check."""
         controller = test_display_controller
+        # Inject schedule directly into self.config (what _check_schedule actually reads)
+        # and reset the minute gate so the cached result from any prior call is cleared.
+        controller.config['schedule'] = {
+            "enabled": True,
+            "start_time": "09:00",
+            "end_time": "17:00",
+        }
+        controller._schedule_checked_minute = None
+        controller._tz = None
+
         with patch('src.display_controller.datetime') as mock_datetime:
             mock_datetime.now.return_value.strftime.return_value.lower.return_value = "monday"
             mock_datetime.now.return_value.time.return_value = datetime.strptime("20:00", "%H:%M").time()
             mock_datetime.strptime = datetime.strptime
 
-            schedule_config = {
-                "schedule": {
-                    "enabled": True,
-                    "start_time": "09:00",
-                    "end_time": "17:00"
-                }
-            }
-            with patch.object(controller.config_service, 'get_config', return_value=schedule_config):
             controller._check_schedule()
             assert controller.is_display_active is False

test/test_display_controller_optimizations.py

@@ -0,0 +1,322 @@
+"""
+Tests for the three display_controller.py optimizations:
+
+  Opt #1 — inspect.signature() caching per plugin_id
+  Opt #2 — pre-cached config values (_normal_brightness, _scroll_speed)
+  Opt #3 — schedule minute-gate (_check_schedule, _check_dim_schedule)
+"""
+
+import pytest
+import time
+from datetime import datetime
+from unittest.mock import MagicMock, patch, call
+
+
+# ---------------------------------------------------------------------------
+# Shared fixture
+# ---------------------------------------------------------------------------
+
+@pytest.fixture
+def controller(test_display_controller):
+    """Return a ready DisplayController from the existing suite fixture."""
+    return test_display_controller
+
+
+# ---------------------------------------------------------------------------
+# Opt #1 — signature cache
+# ---------------------------------------------------------------------------
+
+class TestSignatureCache:
+    """inspect.signature() should be called at most once per plugin_id."""
+
+    class _PluginWithMode:
+        """Real class whose display() accepts display_mode — inspectable by signature."""
+        plugin_id = "mode_plugin"
+        def display(self, display_mode=None, force_clear=False):
+            return True
+
+    class _PluginNoMode:
+        """Real class whose display() does NOT accept display_mode."""
+        plugin_id = "no_mode_plugin"
+        def display(self, force_clear=False):
+            return True
+
+    def test_cache_starts_empty(self, controller):
+        assert controller._plugin_accepts_display_mode == {}
+
+    def test_signature_computed_and_cached(self, controller):
+        """After the first cache population, the dict holds a bool and stays unchanged
+        if queried again without explicitly deleting the key."""
+        import inspect as _inspect
+        plugin = self._PluginNoMode()
+        key = "sig_test"
+        if key not in controller._plugin_accepts_display_mode:
+            controller._plugin_accepts_display_mode[key] = (
+                "display_mode" in _inspect.signature(plugin.display).parameters
+            )
+        original = controller._plugin_accepts_display_mode[key]
+
+        # Accessing cache again should not change the value
+        second = controller._plugin_accepts_display_mode[key]
+        assert second == original
+
+    def test_cache_stores_false_for_no_display_mode(self, controller):
+        """Plugin whose display() doesn't accept display_mode → cached False."""
+        import inspect as _inspect
+        plugin = self._PluginNoMode()
+        controller._plugin_accepts_display_mode["no_mode_plugin"] = (
+            "display_mode" in _inspect.signature(plugin.display).parameters
+        )
+        assert controller._plugin_accepts_display_mode["no_mode_plugin"] is False
+
+    def test_cache_stores_true_for_display_mode(self, controller):
+        """Plugin whose display() accepts display_mode → cached True."""
+        import inspect as _inspect
+        plugin = self._PluginWithMode()
+        controller._plugin_accepts_display_mode["mode_plugin"] = (
+            "display_mode" in _inspect.signature(plugin.display).parameters
+        )
+        assert controller._plugin_accepts_display_mode["mode_plugin"] is True
+
+    def test_cache_cleared_on_plugin_reload(self, controller):
+        """Populating plugin_modes for an id that's already cached must clear the entry."""
+        plugin = MagicMock()
+        controller._plugin_accepts_display_mode["reload_plugin"] = False
+
+        # Simulate the plugin_modes population code path (as in __init__)
+        plugin_id = "reload_plugin"
+        controller.plugin_modes["reload_plugin"] = plugin
+        if hasattr(controller, "_plugin_accepts_display_mode"):
+            controller._plugin_accepts_display_mode.pop(plugin_id, None)
+
+        assert "reload_plugin" not in controller._plugin_accepts_display_mode
+
+
+# ---------------------------------------------------------------------------
+# Opt #2 — cached config values
+# ---------------------------------------------------------------------------
+
+class TestCachedConfigValues:
+    """_normal_brightness and _scroll_speed are populated from config at init."""
+
+    def test_normal_brightness_cached(self, controller):
+        """_normal_brightness must equal what the config says."""
+        expected = (
+            controller.config
+            .get("display", {})
+            .get("hardware", {})
+            .get("brightness", 90)
+        )
+        assert controller._normal_brightness == expected
+
+    def test_scroll_speed_cached(self, controller):
+        """_scroll_speed must equal what the config says."""
+        expected = (
+            controller.config
+            .get("display", {})
+            .get("vegas_scroll", {})
+            .get("scroll_speed", 75)
+        )
+        assert controller._scroll_speed == expected
+
+    def test_current_brightness_uses_cached_value(self, controller):
+        """current_brightness is initialised from _normal_brightness."""
+        assert controller.current_brightness == controller._normal_brightness
+
+    def test_cached_target_brightness_init(self, controller):
+        """_cached_target_brightness starts equal to _normal_brightness."""
+        assert controller._cached_target_brightness == controller._normal_brightness
+
+    def test_normal_brightness_default_is_90(self, controller):
+        """If config has no brightness key the default is 90."""
+        controller.config = {}
+        controller._normal_brightness = (
+            controller.config.get("display", {})
+            .get("hardware", {})
+            .get("brightness", 90)
+        )
+        assert controller._normal_brightness == 90
+
+
+# ---------------------------------------------------------------------------
+# Opt #3 — schedule minute-gate
+# ---------------------------------------------------------------------------
+
+class TestScheduleMinuteGate:
+    """_check_schedule and _check_dim_schedule skip re-evaluation within the same minute."""
+
+    # ── _check_schedule ──────────────────────────────────────────────────────
+
+    def test_schedule_checked_minute_starts_none(self, controller):
+        assert controller._schedule_checked_minute is None
+
+    def test_first_call_sets_checked_minute(self, controller):
+        """After the first real evaluation the minute key is stored."""
+        controller.config["schedule"] = {
+            "enabled": True,
+            "start_time": "00:00",
+            "end_time": "23:59",
+        }
+        controller._schedule_checked_minute = None
+        controller._tz = None
+
+        controller._check_schedule()
+        assert controller._schedule_checked_minute is not None
+
+    def test_second_call_same_minute_does_not_re_evaluate(self, controller):
+        """A second call with the same (hour, minute) returns without changing state."""
+        controller.config["schedule"] = {
+            "enabled": True,
+            "start_time": "00:00",
+            "end_time": "23:59",
+        }
+        controller._tz = None
+        controller._schedule_checked_minute = None
+
+        # First call — evaluates and marks as active (whole-day window)
+        controller._check_schedule()
+        assert controller.is_display_active is True
+        first_minute_key = controller._schedule_checked_minute
+
+        # Force is_display_active to False so we can tell if it gets re-evaluated
+        controller.is_display_active = False
+
+        # Second call within the same minute — gate fires, is_display_active unchanged
+        controller._schedule_checked_minute = first_minute_key  # same minute
+        controller._check_schedule()
+        assert controller.is_display_active is False, (
+            "Second call in same minute should return immediately without re-evaluation"
+        )
+
+    def test_new_minute_forces_re_evaluation(self, controller):
+        """A different (hour, minute) key causes a full re-evaluation."""
+        controller.config["schedule"] = {
+            "enabled": True,
+            "start_time": "00:00",
+            "end_time": "23:59",
+        }
+        controller._tz = None
+
+        # Plant a stale minute key from yesterday
+        controller._schedule_checked_minute = (-1, -1)
+        controller.is_display_active = False  # wrong value to be corrected
+
+        controller._check_schedule()
+        assert controller.is_display_active is True, (
+            "A new minute key should trigger re-evaluation and correct is_display_active"
+        )
+
+    def test_gate_skipped_when_schedule_disabled(self, controller):
+        """When schedule.enabled=False the method returns before reaching the gate."""
+        controller.config["schedule"] = {"enabled": False}
+        controller._schedule_checked_minute = None
+        controller._tz = None
+
+        controller._check_schedule()
+        # The early-return path doesn't set the minute key
+        assert controller._schedule_checked_minute is None
+
+    # ── _check_dim_schedule ──────────────────────────────────────────────────
+
+    def test_dim_checked_minute_starts_none(self, controller):
+        assert controller._dim_checked_minute is None
+
+    def test_first_dim_call_sets_checked_minute(self, controller):
+        """First call with dim schedule enabled stores the minute key."""
+        controller.config["dim_schedule"] = {
+            "enabled": True,
+            "start_time": "22:00",
+            "end_time": "06:00",
+        }
+        controller.is_display_active = True
+        controller._dim_checked_minute = None
+        controller._tz = None
+
+        controller._check_dim_schedule()
+        assert controller._dim_checked_minute is not None
+
+    def test_dim_second_call_returns_cached_brightness(self, controller):
+        """Second call with same minute returns _cached_target_brightness immediately."""
+        controller.config["dim_schedule"] = {
+            "enabled": True,
+            "start_time": "22:00",
+            "end_time": "06:00",
+        }
+        controller.is_display_active = True
+        controller._dim_checked_minute = None
+        controller._tz = None
+
+        # First call stores the result
+        first_result = controller._check_dim_schedule()
+        assert controller._cached_target_brightness == first_result
+        minute_key = controller._dim_checked_minute
+
+        # Corrupt cached value to something recognisable
+        controller._cached_target_brightness = 42
+
+        # Second call in same minute — must return the cached 42
+        controller._dim_checked_minute = minute_key
+        second_result = controller._check_dim_schedule()
+        assert second_result == 42, (
+            "Same-minute call must return cached brightness, not re-compute"
+        )
+
+    def test_dim_gate_skipped_when_display_off(self, controller):
+        """When display is off the method exits before the minute gate."""
+        controller.config["dim_schedule"] = {"enabled": True, "start_time": "22:00", "end_time": "06:00"}
+        controller.is_display_active = False
+        controller._dim_checked_minute = None
+        controller._tz = None
+
+        controller._check_dim_schedule()
+        # Early-exit path does not set the minute key
+        assert controller._dim_checked_minute is None
+
+    def test_dim_cached_target_brightness_updated_after_full_evaluation(self, controller):
+        """After a full evaluation _cached_target_brightness reflects the result."""
+        controller.config["dim_schedule"] = {
+            "enabled": True,
+            "start_time": "22:00",
+            "end_time": "06:00",
+        }
+        controller.is_display_active = True
+        controller._dim_checked_minute = None   # force full re-evaluation
+        controller._tz = None
+
+        result = controller._check_dim_schedule()
+        assert controller._cached_target_brightness == result
+
+    # ── timezone lazy init ───────────────────────────────────────────────────
+
+    def test_tz_starts_none(self, controller):
+        assert controller._tz is None
+
+    def test_tz_lazily_initialised_on_first_schedule_check(self, controller):
+        """_tz is None until _check_schedule or _check_dim_schedule is called."""
+        controller.config["schedule"] = {
+            "enabled": True,
+            "start_time": "00:00",
+            "end_time": "23:59",
+        }
+        controller._tz = None
+        controller._schedule_checked_minute = None
+
+        controller._check_schedule()
+        assert controller._tz is not None
+
+    def test_tz_shared_between_schedule_and_dim(self, controller):
+        """Both methods use the same cached _tz instance."""
+        controller.config["schedule"] = {"enabled": True, "start_time": "00:00", "end_time": "23:59"}
+        controller.config["dim_schedule"] = {"enabled": True, "start_time": "22:00", "end_time": "06:00"}
+        controller.is_display_active = True
+        controller._tz = None
+        controller._schedule_checked_minute = None
+        controller._dim_checked_minute = None
+
+        controller._check_schedule()
+        tz_after_schedule = controller._tz
+
+        controller._check_dim_schedule()
+        assert controller._tz is tz_after_schedule, (
+            "_check_dim_schedule should reuse the _tz set by _check_schedule"
+        )

test/test_game_helper.py

@@ -0,0 +1,317 @@
+"""
+Tests for src/common/game_helper.py
+
+Covers GameHelper: extract_game_details, filter_*, sort_games_by_time,
+process_games, get_game_summary, and all private helpers.
+"""
+
+import logging
+import pytest
+from datetime import datetime, timezone, timedelta
+
+from src.common.game_helper import GameHelper
+
+
+def _make_logger() -> logging.Logger:
+    return logging.getLogger("test_game_helper")
+
+
+def _make_espn_event(
+    state: str = "in",
+    home_abbr: str = "LAL",
+    away_abbr: str = "BOS",
+    home_score: str = "105",
+    away_score: str = "98",
+    date_str: str = "2024-01-15T20:00:00Z",
+    period: int = 4,
+    status_name: str = "STATUS_IN_PROGRESS",
+    home_record: str = "30-10",
+    away_record: str = "25-15",
+    event_id: str = "game-1",
+) -> dict:
+    return {
+        "id": event_id,
+        "date": date_str,
+        "competitions": [
+            {
+                "status": {
+                    "type": {
+                        "state": state,
+                        "shortDetail": "Q4 2:30",
+                        "name": status_name,
+                    },
+                    "period": period,
+                    "displayClock": "2:30",
+                },
+                "competitors": [
+                    {
+                        "homeAway": "home",
+                        "id": "h1",
+                        "team": {"abbreviation": home_abbr, "displayName": f"{home_abbr} Team"},
+                        "score": home_score,
+                        "records": [{"summary": home_record}],
+                    },
+                    {
+                        "homeAway": "away",
+                        "id": "a1",
+                        "team": {"abbreviation": away_abbr, "displayName": f"{away_abbr} Team"},
+                        "score": away_score,
+                        "records": [{"summary": away_record}],
+                    },
+                ],
+            }
+        ],
+    }
+
+
+@pytest.fixture
+def helper():
+    return GameHelper(timezone_str="UTC", logger=_make_logger())
+
+
+# ---------------------------------------------------------------------------
+# extract_game_details
+# ---------------------------------------------------------------------------
+
+class TestExtractGameDetails:
+    def test_live_game(self, helper):
+        event = _make_espn_event(state="in")
+        result = helper.extract_game_details(event)
+        assert result is not None
+        assert result["is_live"] is True
+        assert result["is_final"] is False
+        assert result["is_upcoming"] is False
+
+    def test_final_game(self, helper):
+        event = _make_espn_event(state="post")
+        result = helper.extract_game_details(event)
+        assert result["is_final"] is True
+
+    def test_upcoming_game(self, helper):
+        event = _make_espn_event(state="pre")
+        result = helper.extract_game_details(event)
+        assert result["is_upcoming"] is True
+
+    def test_halftime_detection(self, helper):
+        event = _make_espn_event(state="halftime", status_name="STATUS_HALFTIME")
+        result = helper.extract_game_details(event)
+        assert result["is_halftime"] is True
+
+    def test_basic_fields_present(self, helper):
+        event = _make_espn_event()
+        result = helper.extract_game_details(event)
+        for key in ("id", "home_abbr", "away_abbr", "home_score", "away_score",
+                    "home_record", "away_record", "start_time_utc"):
+            assert key in result
+
+    def test_team_abbreviations(self, helper):
+        event = _make_espn_event(home_abbr="MIA", away_abbr="PHX")
+        result = helper.extract_game_details(event)
+        assert result["home_abbr"] == "MIA"
+        assert result["away_abbr"] == "PHX"
+
+    def test_scores_as_strings(self, helper):
+        event = _make_espn_event(home_score="110", away_score="99")
+        result = helper.extract_game_details(event)
+        assert result["home_score"] == "110"
+        assert result["away_score"] == "99"
+
+    def test_returns_none_on_empty(self, helper):
+        assert helper.extract_game_details({}) is None
+        assert helper.extract_game_details(None) is None
+
+    def test_returns_none_when_no_competitors(self, helper):
+        event = _make_espn_event()
+        event["competitions"][0]["competitors"] = []
+        assert helper.extract_game_details(event) is None
+
+    def test_date_z_suffix_parsed(self, helper):
+        event = _make_espn_event(date_str="2024-06-01T19:30:00Z")
+        result = helper.extract_game_details(event)
+        assert result["start_time_utc"] is not None
+        assert result["start_time_utc"].tzinfo is not None
+
+    def test_zero_zero_record_suppressed(self, helper):
+        event = _make_espn_event(home_record="0-0", away_record="0-0-0")
+        result = helper.extract_game_details(event)
+        assert result["home_record"] == ""
+        assert result["away_record"] == ""
+
+    def test_basketball_sport_fields(self, helper):
+        event = _make_espn_event(period=3)
+        result = helper.extract_game_details(event, sport="basketball")
+        assert result["period_text"] == "Q3"
+        assert "clock" in result
+
+    def test_basketball_overtime_period(self, helper):
+        event = _make_espn_event(period=5)
+        result = helper.extract_game_details(event, sport="basketball")
+        assert result["period_text"] == "OT1"
+
+    def test_football_sport_fields(self, helper):
+        event = _make_espn_event(period=2)
+        result = helper.extract_game_details(event, sport="football")
+        assert result["period_text"] == "Q2"
+
+    def test_hockey_sport_fields_period_1(self, helper):
+        event = _make_espn_event(period=1)
+        result = helper.extract_game_details(event, sport="hockey")
+        assert result["period_text"] == "P1"
+
+    def test_hockey_sport_fields_ot(self, helper):
+        event = _make_espn_event(period=4)
+        result = helper.extract_game_details(event, sport="hockey")
+        assert result["period_text"] == "OT1"
+
+    def test_baseball_sport_fields(self, helper):
+        event = _make_espn_event(period=7)
+        result = helper.extract_game_details(event, sport="baseball")
+        assert result["period_text"] == "INN 7"
+
+
+# ---------------------------------------------------------------------------
+# Filter methods
+# ---------------------------------------------------------------------------
+
+class TestFilterMethods:
+    def _make_games(self):
+        now = datetime.now(timezone.utc)
+        return [
+            {"is_live": True, "is_final": False, "is_upcoming": False, "home_abbr": "LAL", "away_abbr": "BOS", "start_time_utc": now},
+            {"is_live": False, "is_final": True, "is_upcoming": False, "home_abbr": "MIA", "away_abbr": "PHX", "start_time_utc": now - timedelta(hours=3)},
+            {"is_live": False, "is_final": False, "is_upcoming": True, "home_abbr": "DAL", "away_abbr": "CHI", "start_time_utc": now + timedelta(hours=2)},
+        ]
+
+    def test_filter_live_games(self, helper):
+        games = self._make_games()
+        result = helper.filter_live_games(games)
+        assert len(result) == 1
+        assert result[0]["home_abbr"] == "LAL"
+
+    def test_filter_final_games(self, helper):
+        games = self._make_games()
+        result = helper.filter_final_games(games)
+        assert len(result) == 1
+        assert result[0]["home_abbr"] == "MIA"
+
+    def test_filter_upcoming_games(self, helper):
+        games = self._make_games()
+        result = helper.filter_upcoming_games(games)
+        assert len(result) == 1
+        assert result[0]["home_abbr"] == "DAL"
+
+    def test_filter_favorite_teams_match(self, helper):
+        games = self._make_games()
+        result = helper.filter_favorite_teams(games, ["LAL"])
+        assert len(result) == 1
+        assert result[0]["home_abbr"] == "LAL"
+
+    def test_filter_favorite_teams_empty_list_returns_all(self, helper):
+        games = self._make_games()
+        result = helper.filter_favorite_teams(games, [])
+        assert len(result) == 3
+
+    def test_filter_favorite_teams_away_match(self, helper):
+        games = self._make_games()
+        result = helper.filter_favorite_teams(games, ["BOS"])
+        assert len(result) == 1
+
+    def test_filter_recent_games_within_window(self, helper):
+        now = datetime.now(timezone.utc)
+        games = [
+            {"start_time_utc": now - timedelta(days=2), "is_final": True},
+            {"start_time_utc": now - timedelta(days=10), "is_final": True},
+        ]
+        result = helper.filter_recent_games(games, days_back=7)
+        assert len(result) == 1
+
+    def test_filter_recent_games_all_within(self, helper):
+        now = datetime.now(timezone.utc)
+        games = [
+            {"start_time_utc": now - timedelta(days=1)},
+            {"start_time_utc": now - timedelta(days=3)},
+        ]
+        result = helper.filter_recent_games(games, days_back=7)
+        assert len(result) == 2
+
+    def test_sort_games_ascending(self, helper):
+        now = datetime.now(timezone.utc)
+        games = [
+            {"start_time_utc": now + timedelta(hours=2), "id": "late"},
+            {"start_time_utc": now + timedelta(hours=1), "id": "early"},
+        ]
+        result = helper.sort_games_by_time(games)
+        assert result[0]["id"] == "early"
+
+    def test_sort_games_descending(self, helper):
+        now = datetime.now(timezone.utc)
+        games = [
+            {"start_time_utc": now + timedelta(hours=1), "id": "early"},
+            {"start_time_utc": now + timedelta(hours=2), "id": "late"},
+        ]
+        result = helper.sort_games_by_time(games, reverse=True)
+        assert result[0]["id"] == "late"
+
+
+# ---------------------------------------------------------------------------
+# process_games
+# ---------------------------------------------------------------------------
+
+class TestProcessGames:
+    def test_processes_valid_events(self, helper):
+        events = [
+            _make_espn_event(event_id="1"),
+            _make_espn_event(event_id="2"),
+        ]
+        result = helper.process_games(events)
+        assert len(result) == 2
+
+    def test_skips_invalid_events(self, helper):
+        events = [
+            _make_espn_event(event_id="1"),
+            {},  # invalid
+        ]
+        result = helper.process_games(events)
+        assert len(result) == 1
+
+    def test_empty_events(self, helper):
+        assert helper.process_games([]) == []
+
+
+# ---------------------------------------------------------------------------
+# get_game_summary
+# ---------------------------------------------------------------------------
+
+class TestGetGameSummary:
+    def test_live_summary(self, helper):
+        game = {
+            "home_abbr": "LAL", "away_abbr": "BOS",
+            "home_score": "105", "away_score": "98",
+            "status_text": "Q4 2:30",
+            "is_live": True, "is_final": False,
+        }
+        summary = helper.get_game_summary(game)
+        assert "BOS" in summary
+        assert "LAL" in summary
+        assert "98" in summary
+        assert "105" in summary
+
+    def test_final_summary(self, helper):
+        game = {
+            "home_abbr": "LAL", "away_abbr": "BOS",
+            "home_score": "110", "away_score": "102",
+            "status_text": "Final",
+            "is_live": False, "is_final": True,
+        }
+        summary = helper.get_game_summary(game)
+        assert "Final" in summary
+
+    def test_upcoming_summary(self, helper):
+        game = {
+            "home_abbr": "LAL", "away_abbr": "BOS",
+            "home_score": "0", "away_score": "0",
+            "status_text": "7:30 PM",
+            "is_live": False, "is_final": False,
+        }
+        summary = helper.get_game_summary(game)
+        assert "7:30 PM" in summary

test/test_health_monitor.py

@@ -0,0 +1,307 @@
+"""
+Tests for src/plugin_system/health_monitor.py
+
+Covers PluginHealthMonitor: get_plugin_health_status, get_plugin_health_metrics,
+get_all_plugin_health, _get_recovery_suggestions, start/stop_monitoring,
+register_health_check.
+"""
+
+import pytest
+from unittest.mock import MagicMock, patch
+from datetime import datetime
+
+from src.plugin_system.health_monitor import (
+    PluginHealthMonitor,
+    HealthStatus,
+    HealthMetrics,
+)
+
+
+# ---------------------------------------------------------------------------
+# Fixtures
+# ---------------------------------------------------------------------------
+
+def _make_health_tracker(
+    summary: dict | None = None,
+    all_summaries: dict | None = None,
+):
+    """Return a mock PluginHealthTracker."""
+    tracker = MagicMock()
+    tracker.get_health_summary.return_value = summary
+    tracker.get_all_health_summaries.return_value = all_summaries or {}
+    return tracker
+
+
+def _healthy_summary() -> dict:
+    return {
+        "success_rate": 100.0,
+        "circuit_state": "closed",
+        "consecutive_failures": 0,
+        "total_failures": 0,
+        "total_successes": 50,
+        "last_success_time": datetime.now().isoformat(),
+        "last_error": None,
+    }
+
+
+def _degraded_summary() -> dict:
+    return {
+        "success_rate": 40.0,  # 60% error rate
+        "circuit_state": "closed",
+        "consecutive_failures": 3,
+        "total_failures": 6,
+        "total_successes": 4,
+        "last_success_time": None,
+        "last_error": "timeout occurred",
+    }
+
+
+def _unhealthy_summary() -> dict:
+    return {
+        "success_rate": 10.0,  # 90% error rate
+        "circuit_state": "open",
+        "consecutive_failures": 10,
+        "total_failures": 9,
+        "total_successes": 1,
+        "last_success_time": None,
+        "last_error": "ImportError: missing module",
+    }
+
+
+@pytest.fixture
+def monitor():
+    tracker = _make_health_tracker(_healthy_summary())
+    return PluginHealthMonitor(health_tracker=tracker)
+
+
+# ---------------------------------------------------------------------------
+# get_plugin_health_status
+# ---------------------------------------------------------------------------
+
+class TestGetPluginHealthStatus:
+    def test_healthy_status(self):
+        tracker = _make_health_tracker(_healthy_summary())
+        monitor = PluginHealthMonitor(tracker)
+        status = monitor.get_plugin_health_status("plugin_a")
+        assert status == HealthStatus.HEALTHY
+
+    def test_degraded_status(self):
+        tracker = _make_health_tracker(_degraded_summary())
+        monitor = PluginHealthMonitor(tracker, degraded_threshold=0.5, unhealthy_threshold=0.8)
+        status = monitor.get_plugin_health_status("plugin_b")
+        assert status == HealthStatus.DEGRADED
+
+    def test_unhealthy_status(self):
+        tracker = _make_health_tracker(_unhealthy_summary())
+        monitor = PluginHealthMonitor(tracker, unhealthy_threshold=0.8)
+        status = monitor.get_plugin_health_status("plugin_c")
+        assert status == HealthStatus.UNHEALTHY
+
+    def test_open_circuit_breaker_is_unhealthy(self):
+        summary = _healthy_summary()
+        summary["circuit_state"] = "open"
+        tracker = _make_health_tracker(summary)
+        monitor = PluginHealthMonitor(tracker)
+        status = monitor.get_plugin_health_status("plugin_d")
+        assert status == HealthStatus.UNHEALTHY
+
+    def test_unknown_when_no_tracker(self):
+        monitor = PluginHealthMonitor(health_tracker=None)
+        status = monitor.get_plugin_health_status("plugin_e")
+        assert status == HealthStatus.UNKNOWN
+
+    def test_unknown_when_no_summary(self):
+        tracker = _make_health_tracker(None)
+        monitor = PluginHealthMonitor(tracker)
+        status = monitor.get_plugin_health_status("plugin_f")
+        assert status == HealthStatus.UNKNOWN
+
+
+# ---------------------------------------------------------------------------
+# get_plugin_health_metrics
+# ---------------------------------------------------------------------------
+
+class TestGetPluginHealthMetrics:
+    def test_healthy_metrics(self):
+        tracker = _make_health_tracker(_healthy_summary())
+        monitor = PluginHealthMonitor(tracker)
+        metrics = monitor.get_plugin_health_metrics("plugin_a")
+        assert isinstance(metrics, HealthMetrics)
+        assert metrics.status == HealthStatus.HEALTHY
+        assert metrics.success_rate == pytest.approx(1.0)
+        assert metrics.error_rate == pytest.approx(0.0)
+
+    def test_degraded_metrics(self):
+        tracker = _make_health_tracker(_degraded_summary())
+        monitor = PluginHealthMonitor(tracker, degraded_threshold=0.5, unhealthy_threshold=0.8)
+        metrics = monitor.get_plugin_health_metrics("plugin_b")
+        assert metrics.status == HealthStatus.DEGRADED
+        assert metrics.consecutive_failures == 3
+
+    def test_unhealthy_metrics(self):
+        tracker = _make_health_tracker(_unhealthy_summary())
+        monitor = PluginHealthMonitor(tracker, unhealthy_threshold=0.8)
+        metrics = monitor.get_plugin_health_metrics("plugin_c")
+        assert metrics.status == HealthStatus.UNHEALTHY
+        assert metrics.circuit_breaker_state == "open"
+        assert metrics.last_error is not None
+
+    def test_metrics_without_tracker(self):
+        monitor = PluginHealthMonitor(health_tracker=None)
+        metrics = monitor.get_plugin_health_metrics("plugin_d")
+        assert metrics.status == HealthStatus.UNKNOWN
+        assert metrics.plugin_id == "plugin_d"
+
+    def test_metrics_without_summary(self):
+        tracker = _make_health_tracker(None)
+        monitor = PluginHealthMonitor(tracker)
+        metrics = monitor.get_plugin_health_metrics("plugin_e")
+        assert metrics.status == HealthStatus.UNKNOWN
+
+    def test_last_successful_update_parsed(self):
+        summary = _healthy_summary()
+        summary["last_success_time"] = "2024-06-01T12:00:00"
+        tracker = _make_health_tracker(summary)
+        monitor = PluginHealthMonitor(tracker)
+        metrics = monitor.get_plugin_health_metrics("plugin_a")
+        assert metrics.last_successful_update is not None
+        assert isinstance(metrics.last_successful_update, datetime)
+
+    def test_invalid_last_success_time_handled(self):
+        summary = _healthy_summary()
+        summary["last_success_time"] = "not-a-date"
+        tracker = _make_health_tracker(summary)
+        monitor = PluginHealthMonitor(tracker)
+        # Should not raise
+        metrics = monitor.get_plugin_health_metrics("plugin_a")
+        assert metrics.last_successful_update is None
+
+    def test_total_successes_failures(self):
+        tracker = _make_health_tracker(_degraded_summary())
+        monitor = PluginHealthMonitor(tracker, degraded_threshold=0.5, unhealthy_threshold=0.8)
+        metrics = monitor.get_plugin_health_metrics("plugin_b")
+        assert metrics.total_failures == 6
+        assert metrics.total_successes == 4
+
+
+# ---------------------------------------------------------------------------
+# get_all_plugin_health
+# ---------------------------------------------------------------------------
+
+class TestGetAllPluginHealth:
+    def test_returns_empty_without_tracker(self):
+        monitor = PluginHealthMonitor(health_tracker=None)
+        result = monitor.get_all_plugin_health()
+        assert result == {}
+
+    def test_returns_metrics_for_each_plugin(self):
+        all_summaries = {
+            "plugin_a": _healthy_summary(),
+            "plugin_b": _degraded_summary(),
+        }
+        tracker = MagicMock()
+        tracker.get_all_health_summaries.return_value = all_summaries
+        tracker.get_health_summary.side_effect = lambda pid: all_summaries.get(pid)
+        monitor = PluginHealthMonitor(tracker, degraded_threshold=0.5, unhealthy_threshold=0.8)
+        result = monitor.get_all_plugin_health()
+        assert "plugin_a" in result
+        assert "plugin_b" in result
+        assert isinstance(result["plugin_a"], HealthMetrics)
+
+    def test_returns_empty_when_no_summaries(self):
+        tracker = _make_health_tracker(all_summaries={})
+        monitor = PluginHealthMonitor(tracker)
+        result = monitor.get_all_plugin_health()
+        assert result == {}
+
+
+# ---------------------------------------------------------------------------
+# _get_recovery_suggestions
+# ---------------------------------------------------------------------------
+
+class TestGetRecoverySuggestions:
+    def test_healthy_plugin_suggestion(self):
+        tracker = _make_health_tracker(_healthy_summary())
+        monitor = PluginHealthMonitor(tracker)
+        suggestions = monitor._get_recovery_suggestions("p", _healthy_summary(), HealthStatus.HEALTHY)
+        assert any("healthy" in s.lower() for s in suggestions)
+
+    def test_unhealthy_suggestions(self):
+        tracker = _make_health_tracker(_unhealthy_summary())
+        monitor = PluginHealthMonitor(tracker, unhealthy_threshold=0.8)
+        suggestions = monitor._get_recovery_suggestions("p", _unhealthy_summary(), HealthStatus.UNHEALTHY)
+        assert len(suggestions) > 0
+        assert any("unhealthy" in s.lower() for s in suggestions)
+
+    def test_open_circuit_breaker_suggestion(self):
+        summary = _unhealthy_summary()
+        summary["circuit_state"] = "open"
+        tracker = _make_health_tracker(summary)
+        monitor = PluginHealthMonitor(tracker, unhealthy_threshold=0.8)
+        suggestions = monitor._get_recovery_suggestions("p", summary, HealthStatus.UNHEALTHY)
+        assert any("circuit" in s.lower() for s in suggestions)
+
+    def test_timeout_error_suggestion(self):
+        summary = _degraded_summary()
+        summary["last_error"] = "connection timeout occurred"
+        tracker = _make_health_tracker(summary)
+        monitor = PluginHealthMonitor(tracker, degraded_threshold=0.5, unhealthy_threshold=0.8)
+        suggestions = monitor._get_recovery_suggestions("p", summary, HealthStatus.DEGRADED)
+        assert any("timeout" in s.lower() for s in suggestions)
+
+    def test_import_error_suggestion(self):
+        summary = _unhealthy_summary()
+        summary["last_error"] = "ImportError: missing module"
+        tracker = _make_health_tracker(summary)
+        monitor = PluginHealthMonitor(tracker, unhealthy_threshold=0.8)
+        suggestions = monitor._get_recovery_suggestions("p", summary, HealthStatus.UNHEALTHY)
+        assert any("dependencies" in s.lower() or "import" in s.lower() or "missing" in s.lower()
+                   for s in suggestions)
+
+    def test_permission_error_suggestion(self):
+        summary = _unhealthy_summary()
+        summary["last_error"] = "permission denied to access resource"
+        tracker = _make_health_tracker(summary)
+        monitor = PluginHealthMonitor(tracker, unhealthy_threshold=0.8)
+        suggestions = monitor._get_recovery_suggestions("p", summary, HealthStatus.UNHEALTHY)
+        assert any("permission" in s.lower() for s in suggestions)
+
+    def test_degraded_suggestions_include_error_rate(self):
+        tracker = _make_health_tracker(_degraded_summary())
+        monitor = PluginHealthMonitor(tracker, degraded_threshold=0.5, unhealthy_threshold=0.8)
+        suggestions = monitor._get_recovery_suggestions("p", _degraded_summary(), HealthStatus.DEGRADED)
+        assert any("%" in s for s in suggestions)
+
+
+# ---------------------------------------------------------------------------
+# start / stop monitoring
+# ---------------------------------------------------------------------------
+
+class TestMonitorLifecycle:
+    def test_start_monitoring(self, monitor):
+        monitor.start_monitoring()
+        try:
+            assert monitor._monitor_thread is not None
+            assert monitor._monitor_thread.is_alive()
+        finally:
+            monitor.stop_monitoring()
+
+    def test_stop_monitoring(self, monitor):
+        monitor.start_monitoring()
+        monitor.stop_monitoring()
+        # Thread should no longer be alive
+        assert not monitor._monitor_thread.is_alive()
+
+    def test_double_start_no_duplicate_threads(self, monitor):
+        monitor.start_monitoring()
+        try:
+            thread1 = monitor._monitor_thread
+            monitor.start_monitoring()  # should be idempotent
+            assert monitor._monitor_thread is thread1
+        finally:
+            monitor.stop_monitoring()
+
+    def test_register_health_check(self, monitor):
+        callback = MagicMock()
+        monitor.register_health_check(callback)
+        assert callback in monitor._health_check_callbacks

test/test_logo_downloader.py

@@ -0,0 +1,129 @@
+"""
+Tests for src/logo_downloader.py
+
+Focuses on the pure/static methods that don't require network calls:
+normalize_abbreviation, get_logo_filename_variations, get_logo_directory,
+ensure_logo_directory, and the download_missing_logo function path
+(with HTTP mocked).
+"""
+
+import os
+import pytest
+from pathlib import Path
+from unittest.mock import patch, Mock, MagicMock
+
+from src.logo_downloader import LogoDownloader
+
+
+# ---------------------------------------------------------------------------
+# normalize_abbreviation
+# ---------------------------------------------------------------------------
+
+class TestNormalizeAbbreviation:
+    def test_basic_lowercase(self):
+        result = LogoDownloader.normalize_abbreviation("lal")
+        assert result == "LAL"
+
+    def test_uppercases(self):
+        result = LogoDownloader.normalize_abbreviation("bos")
+        assert result == "BOS"
+
+    def test_ampersand_replaced(self):
+        result = LogoDownloader.normalize_abbreviation("TA&M")
+        assert "&" not in result
+        assert "AND" in result
+
+    def test_forward_slash_replaced(self):
+        result = LogoDownloader.normalize_abbreviation("A/B")
+        assert "/" not in result
+
+    def test_empty_returns_empty(self):
+        result = LogoDownloader.normalize_abbreviation("")
+        assert result == ""
+
+
+# ---------------------------------------------------------------------------
+# get_logo_filename_variations
+# ---------------------------------------------------------------------------
+
+class TestGetLogoFilenameVariations:
+    def test_returns_list(self):
+        result = LogoDownloader.get_logo_filename_variations("LAL")
+        assert isinstance(result, list)
+        assert len(result) > 0
+
+    def test_includes_png(self):
+        result = LogoDownloader.get_logo_filename_variations("KC")
+        filenames = " ".join(result)
+        assert ".png" in filenames
+
+    def test_includes_original(self):
+        result = LogoDownloader.get_logo_filename_variations("LAL")
+        assert any("LAL" in f for f in result)
+
+    def test_ampersand_variation(self):
+        result = LogoDownloader.get_logo_filename_variations("TA&M")
+        # Should produce at least the normalized version
+        assert len(result) > 0
+
+    def test_empty_string_no_crash(self):
+        result = LogoDownloader.get_logo_filename_variations("")
+        assert isinstance(result, list)
+
+
+# ---------------------------------------------------------------------------
+# get_logo_directory
+# ---------------------------------------------------------------------------
+
+class TestGetLogoDirectory:
+    def test_known_sport_returns_string(self):
+        downloader = LogoDownloader()
+        result = downloader.get_logo_directory("nfl")
+        assert isinstance(result, str)
+        assert len(result) > 0
+
+    def test_known_sport_nba(self):
+        downloader = LogoDownloader()
+        result = downloader.get_logo_directory("nba")
+        assert "nba" in result.lower() or "sports" in result.lower()
+
+    def test_unknown_sport_returns_string(self):
+        downloader = LogoDownloader()
+        result = downloader.get_logo_directory("unknown_sport_xyz")
+        assert isinstance(result, str)
+
+
+# ---------------------------------------------------------------------------
+# ensure_logo_directory
+# ---------------------------------------------------------------------------
+
+class TestEnsureLogoDirectory:
+    def test_creates_writable_directory(self, tmp_path):
+        downloader = LogoDownloader()
+        test_dir = str(tmp_path / "logos" / "nfl")
+        result = downloader.ensure_logo_directory(test_dir)
+        assert result is True
+        assert Path(test_dir).is_dir()
+
+    def test_existing_writable_directory(self, tmp_path):
+        downloader = LogoDownloader()
+        test_dir = str(tmp_path)
+        result = downloader.ensure_logo_directory(test_dir)
+        assert result is True
+
+    def test_returns_false_when_write_test_fails(self, tmp_path):
+        """Simulate a directory that exists but raises PermissionError on write."""
+        downloader = LogoDownloader()
+        test_dir = str(tmp_path / "logos")
+
+        import builtins
+        original_open = builtins.open
+
+        def mock_open(path, *args, **kwargs):
+            if ".write_test" in str(path):
+                raise PermissionError("no write access")
+            return original_open(path, *args, **kwargs)
+
+        with patch("builtins.open", side_effect=mock_open):
+            result = downloader.ensure_logo_directory(test_dir)
+        assert result is False

test/test_scroll_helper.py

@@ -0,0 +1,317 @@
+"""
+Tests for src/common/scroll_helper.py
+
+Covers ScrollHelper: create_scrolling_image, update_scroll_position,
+get_visible_portion, calculate_dynamic_duration, set_* methods,
+reset_scroll, clear_cache, get_scroll_info.
+"""
+
+import pytest
+import time
+from unittest.mock import patch
+from PIL import Image
+
+from src.common.scroll_helper import ScrollHelper
+
+
+DISPLAY_W = 64
+DISPLAY_H = 32
+
+
+@pytest.fixture
+def helper():
+    return ScrollHelper(display_width=DISPLAY_W, display_height=DISPLAY_H)
+
+
+def _make_image(width: int = 64, height: int = 32, color=(255, 0, 0)) -> Image.Image:
+    img = Image.new("RGB", (width, height), color)
+    return img
+
+
+# ---------------------------------------------------------------------------
+# __init__ / initial state
+# ---------------------------------------------------------------------------
+
+class TestScrollHelperInit:
+    def test_initial_scroll_position(self, helper):
+        assert helper.scroll_position == 0.0
+
+    def test_initial_scroll_complete_false(self, helper):
+        assert helper.scroll_complete is False
+
+    def test_display_dimensions(self, helper):
+        assert helper.display_width == DISPLAY_W
+        assert helper.display_height == DISPLAY_H
+
+
+# ---------------------------------------------------------------------------
+# create_scrolling_image
+# ---------------------------------------------------------------------------
+
+class TestCreateScrollingImage:
+    def test_empty_content_returns_blank_image(self, helper):
+        result = helper.create_scrolling_image([])
+        assert isinstance(result, Image.Image)
+        assert helper.total_scroll_width == 0
+
+    def test_single_item_creates_image(self, helper):
+        img = _make_image(width=100)
+        result = helper.create_scrolling_image([img])
+        assert isinstance(result, Image.Image)
+        assert result.width > DISPLAY_W  # includes leading gap
+
+    def test_multiple_items_wider_image(self, helper):
+        items = [_make_image(width=50), _make_image(width=50)]
+        result = helper.create_scrolling_image(items)
+        # Should be wider than two items alone
+        assert result.width > 100
+
+    def test_scroll_position_reset(self, helper):
+        helper.scroll_position = 500.0
+        helper.create_scrolling_image([_make_image()])
+        assert helper.scroll_position == 0.0
+
+    def test_cached_array_set(self, helper):
+        helper.create_scrolling_image([_make_image()])
+        assert helper.cached_array is not None
+
+    def test_scroll_complete_reset(self, helper):
+        helper.scroll_complete = True
+        helper.create_scrolling_image([_make_image()])
+        assert helper.scroll_complete is False
+
+    def test_total_scroll_width_matches_image(self, helper):
+        img = _make_image(width=200)
+        result = helper.create_scrolling_image([img])
+        assert helper.total_scroll_width == result.width
+
+
+# ---------------------------------------------------------------------------
+# set_scrolling_image
+# ---------------------------------------------------------------------------
+
+class TestSetScrollingImage:
+    def test_sets_cached_image(self, helper):
+        img = _make_image(width=200)
+        helper.set_scrolling_image(img)
+        assert helper.cached_image is img
+
+    def test_sets_cached_array(self, helper):
+        img = _make_image(width=200)
+        helper.set_scrolling_image(img)
+        assert helper.cached_array is not None
+
+    def test_scroll_width_matches_image(self, helper):
+        img = _make_image(width=300)
+        helper.set_scrolling_image(img)
+        assert helper.total_scroll_width == 300
+
+    def test_none_clears_cache(self, helper):
+        helper.set_scrolling_image(_make_image())
+        helper.set_scrolling_image(None)
+        assert helper.cached_image is None
+
+
+# ---------------------------------------------------------------------------
+# update_scroll_position (time-based mode)
+# ---------------------------------------------------------------------------
+
+class TestUpdateScrollPosition:
+    def test_position_advances_over_time(self, helper):
+        helper.create_scrolling_image([_make_image(width=200)])
+        helper.scroll_speed = 100.0  # 100 px/s
+        helper.last_update_time = time.time() - 0.1  # pretend 100ms elapsed
+        initial = helper.scroll_position
+        helper.update_scroll_position()
+        assert helper.scroll_position > initial
+
+    def test_no_advance_without_image(self, helper):
+        helper.update_scroll_position()  # no image, should not crash
+        assert helper.scroll_position == 0.0
+
+    def test_zero_width_content_stays_zero(self, helper):
+        helper.create_scrolling_image([])  # empty → width 0
+        helper.update_scroll_position()
+        assert helper.scroll_position == 0.0
+
+    def test_scroll_complete_clamped(self, helper):
+        helper.create_scrolling_image([_make_image(width=100)])
+        # Force position past the end
+        helper.scroll_position = helper.total_scroll_width + 50
+        helper.total_distance_scrolled = helper.total_scroll_width + 50
+        helper.update_scroll_position()
+        assert helper.scroll_complete is True
+        assert helper.scroll_position <= helper.total_scroll_width
+
+
+# ---------------------------------------------------------------------------
+# get_visible_portion
+# ---------------------------------------------------------------------------
+
+class TestGetVisiblePortion:
+    def test_returns_none_without_image(self, helper):
+        assert helper.get_visible_portion() is None
+
+    def test_returns_image_sized_to_display(self, helper):
+        helper.create_scrolling_image([_make_image(width=200)])
+        visible = helper.get_visible_portion()
+        assert visible is not None
+        assert visible.width == DISPLAY_W
+        assert visible.height == DISPLAY_H
+
+    def test_different_positions_give_different_images(self, helper):
+        helper.create_scrolling_image([_make_image(width=300)])
+        img1 = helper.get_visible_portion()
+        helper.scroll_position = 50
+        img2 = helper.get_visible_portion()
+        # Images should differ (colour from scrolled content)
+        # Just verify both are valid PIL images with correct size
+        assert img1.width == img2.width == DISPLAY_W
+
+
+# ---------------------------------------------------------------------------
+# reset_scroll / clear_cache
+# ---------------------------------------------------------------------------
+
+class TestResetAndClear:
+    def test_reset_restores_position(self, helper):
+        helper.create_scrolling_image([_make_image(width=200)])
+        helper.scroll_position = 100.0
+        helper.reset_scroll()
+        assert helper.scroll_position == 0.0
+
+    def test_reset_clears_complete_flag(self, helper):
+        helper.scroll_complete = True
+        helper.reset_scroll()
+        assert helper.scroll_complete is False
+
+    def test_reset_alias(self, helper):
+        helper.scroll_position = 50.0
+        helper.reset()
+        assert helper.scroll_position == 0.0
+
+    def test_clear_cache(self, helper):
+        helper.create_scrolling_image([_make_image()])
+        helper.clear_cache()
+        assert helper.cached_image is None
+        assert helper.cached_array is None
+        assert helper.total_scroll_width == 0
+
+
+# ---------------------------------------------------------------------------
+# calculate_dynamic_duration
+# ---------------------------------------------------------------------------
+
+class TestCalculateDynamicDuration:
+    def test_returns_min_when_disabled(self, helper):
+        helper.dynamic_duration_enabled = False
+        helper.min_duration = 30
+        result = helper.calculate_dynamic_duration()
+        assert result == 30
+
+    def test_returns_min_when_no_content(self, helper):
+        helper.total_scroll_width = 0
+        helper.min_duration = 30
+        result = helper.calculate_dynamic_duration()
+        assert result == 30
+
+    def test_respects_min_duration(self, helper):
+        helper.create_scrolling_image([_make_image(width=50)])
+        helper.min_duration = 60
+        helper.max_duration = 300
+        helper.scroll_speed = 500.0  # very fast → very short time
+        result = helper.calculate_dynamic_duration()
+        assert result >= 60
+
+    def test_respects_max_duration(self, helper):
+        helper.create_scrolling_image([_make_image(width=5000)])
+        helper.min_duration = 10
+        helper.max_duration = 60
+        helper.scroll_speed = 1.0  # very slow → very long time
+        result = helper.calculate_dynamic_duration()
+        assert result <= 60
+
+    def test_time_based_calculation(self, helper):
+        helper.create_scrolling_image([_make_image(width=200)])
+        helper.scroll_speed = 100.0
+        helper.min_duration = 1
+        helper.max_duration = 600
+        helper.frame_based_scrolling = False
+        result = helper.calculate_dynamic_duration()
+        assert isinstance(result, int)
+        assert result > 0
+
+
+# ---------------------------------------------------------------------------
+# set_* configuration methods
+# ---------------------------------------------------------------------------
+
+class TestSetMethods:
+    def test_set_scroll_speed_time_based(self, helper):
+        helper.frame_based_scrolling = False
+        helper.set_scroll_speed(50.0)
+        assert helper.scroll_speed == 50.0
+
+    def test_set_scroll_speed_clamped_low(self, helper):
+        helper.frame_based_scrolling = False
+        helper.set_scroll_speed(0.0)
+        assert helper.scroll_speed >= 1.0
+
+    def test_set_scroll_speed_clamped_high(self, helper):
+        helper.frame_based_scrolling = False
+        helper.set_scroll_speed(10000.0)
+        assert helper.scroll_speed <= 500.0
+
+    def test_set_scroll_delay(self, helper):
+        helper.set_scroll_delay(0.05)
+        assert helper.scroll_delay == 0.05
+
+    def test_set_scroll_delay_clamped(self, helper):
+        helper.set_scroll_delay(0.0001)
+        assert helper.scroll_delay >= 0.001
+
+    def test_set_target_fps(self, helper):
+        helper.set_target_fps(60.0)
+        assert helper.target_fps == 60.0
+
+    def test_set_target_fps_clamped(self, helper):
+        helper.set_target_fps(1000.0)
+        assert helper.target_fps <= 200.0
+
+    def test_set_sub_pixel_scrolling(self, helper):
+        helper.set_sub_pixel_scrolling(True)
+        assert helper.sub_pixel_scrolling is True
+        helper.set_sub_pixel_scrolling(False)
+        assert helper.sub_pixel_scrolling is False
+
+    def test_set_frame_based_scrolling(self, helper):
+        helper.set_frame_based_scrolling(True)
+        assert helper.frame_based_scrolling is True
+
+    def test_set_dynamic_duration_settings(self, helper):
+        helper.set_dynamic_duration_settings(enabled=True, min_duration=20, max_duration=120, buffer=0.2)
+        assert helper.dynamic_duration_enabled is True
+        assert helper.min_duration == 20
+        assert helper.max_duration == 120
+        assert helper.duration_buffer == pytest.approx(0.2)
+
+
+# ---------------------------------------------------------------------------
+# get_scroll_info
+# ---------------------------------------------------------------------------
+
+class TestGetScrollInfo:
+    def test_returns_dict(self, helper):
+        info = helper.get_scroll_info()
+        assert isinstance(info, dict)
+
+    def test_required_keys(self, helper):
+        info = helper.get_scroll_info()
+        for key in ("scroll_position", "total_distance_scrolled", "scroll_speed",
+                    "scroll_complete", "dynamic_duration"):
+            assert key in info
+
+    def test_scroll_position_reflected(self, helper):
+        helper.scroll_position = 42.0
+        info = helper.get_scroll_info()
+        assert info["scroll_position"] == 42.0

test/test_store_manager_caches.py

@@ -43,6 +43,115 @@ class TestUninstallTombstone(unittest.TestCase):
         self.assertNotIn("foo", self.sm._uninstall_tombstones)
 
 
+class TestPersistentUninstallRegistry(unittest.TestCase):
+    """Regression tests for the persistent uninstall registry that stops a
+    core `git pull` update from resurrecting built-in plugins the user
+    removed (plugins committed under plugin-repos/)."""
+
+    def setUp(self):
+        self._tmp = TemporaryDirectory()
+        self.addCleanup(self._tmp.cleanup)
+        self.plugins_dir = Path(self._tmp.name) / "plugin-repos"
+        self.plugins_dir.mkdir()
+        self.registry_path = Path(self._tmp.name) / "config" / "uninstalled_plugins.json"
+        self.sm = PluginStoreManager(
+            plugins_dir=str(self.plugins_dir),
+            uninstalled_registry_path=str(self.registry_path),
+        )
+
+    def _make_plugin_dir(self, plugin_id):
+        """Simulate a built-in plugin restored on disk (e.g. by git pull)."""
+        d = self.plugins_dir / plugin_id
+        d.mkdir(parents=True)
+        (d / "manifest.json").write_text('{"id": "%s"}' % plugin_id)
+        return d
+
+    def test_unrecorded_plugin_is_not_uninstalled(self):
+        self.assertFalse(self.sm.is_plugin_uninstalled("web-ui-info"))
+        self.assertEqual(self.sm.get_uninstalled_plugins(), set())
+
+    def test_record_persists_across_instances(self):
+        self.sm.record_uninstalled_plugin("web-ui-info")
+        self.assertTrue(self.registry_path.exists())
+        # A fresh manager (simulating a service restart after update) still sees it.
+        fresh = PluginStoreManager(
+            plugins_dir=str(self.plugins_dir),
+            uninstalled_registry_path=str(self.registry_path),
+        )
+        self.assertTrue(fresh.is_plugin_uninstalled("web-ui-info"))
+
+    def test_forget_clears_record(self):
+        self.sm.record_uninstalled_plugin("web-ui-info")
+        self.sm.forget_uninstalled_plugin("web-ui-info")
+        self.assertFalse(self.sm.is_plugin_uninstalled("web-ui-info"))
+
+    def test_purge_removes_resurrected_plugin(self):
+        # The bug: user removed web-ui-info, then a git pull restored its
+        # committed files. Recorded uninstall + purge must re-remove it.
+        self._make_plugin_dir("web-ui-info")
+        self.sm.record_uninstalled_plugin("web-ui-info")
+        self.assertTrue((self.plugins_dir / "web-ui-info").exists())
+
+        removed = self.sm.purge_uninstalled_plugins()
+
+        self.assertEqual(removed, ["web-ui-info"])
+        self.assertFalse((self.plugins_dir / "web-ui-info").exists())
+        # Record is kept so the purge stays idempotent across future updates.
+        self.assertTrue(self.sm.is_plugin_uninstalled("web-ui-info"))
+
+    def test_purge_leaves_non_uninstalled_plugins_alone(self):
+        self._make_plugin_dir("baseball-scoreboard")  # present, not recorded
+        self._make_plugin_dir("web-ui-info")
+        self.sm.record_uninstalled_plugin("web-ui-info")
+
+        self.sm.purge_uninstalled_plugins()
+
+        self.assertTrue((self.plugins_dir / "baseball-scoreboard").exists())
+        self.assertFalse((self.plugins_dir / "web-ui-info").exists())
+
+    def test_purge_noop_when_plugin_absent(self):
+        # Recorded but never restored on disk — nothing to remove.
+        self.sm.record_uninstalled_plugin("web-ui-info")
+        self.assertEqual(self.sm.purge_uninstalled_plugins(), [])
+
+    def test_corrupt_registry_is_ignored(self):
+        self.registry_path.parent.mkdir(parents=True, exist_ok=True)
+        self.registry_path.write_text("{ not valid json")
+        self.assertEqual(self.sm.get_uninstalled_plugins(), set())
+        self.assertFalse(self.sm.is_plugin_uninstalled("web-ui-info"))
+
+    def _write_raw_registry(self, value):
+        self.registry_path.parent.mkdir(parents=True, exist_ok=True)
+        import json as _json
+        self.registry_path.write_text(_json.dumps(value))
+
+    def test_empty_id_does_not_wipe_plugins_root(self):
+        # An empty id resolves to plugins_dir itself; purge must never delete it.
+        self._make_plugin_dir("baseball-scoreboard")
+        self._write_raw_registry([""])
+
+        removed = self.sm.purge_uninstalled_plugins()
+
+        self.assertEqual(removed, [])
+        self.assertTrue(self.plugins_dir.exists())
+        self.assertTrue((self.plugins_dir / "baseball-scoreboard").exists())
+        # Invalid id is filtered out entirely.
+        self.assertEqual(self.sm.get_uninstalled_plugins(), set())
+
+    def test_traversal_ids_are_ignored(self):
+        for bad in ["..", "../evil", "a/b", "."]:
+            with self.subTest(bad=bad):
+                self.assertFalse(self.sm._is_valid_plugin_id(bad))
+        self._write_raw_registry(["../evil", "..", "web-ui-info"])
+        # Only the safe id survives the read.
+        self.assertEqual(self.sm.get_uninstalled_plugins(), {"web-ui-info"})
+
+    def test_record_rejects_invalid_id(self):
+        self.sm.record_uninstalled_plugin("")
+        self.sm.record_uninstalled_plugin("../escape")
+        self.assertEqual(self.sm.get_uninstalled_plugins(), set())
+
+
 class TestGitInfoCache(unittest.TestCase):
     def setUp(self):
         self._tmp = TemporaryDirectory()
@@ -58,19 +167,15 @@ class TestGitInfoCache(unittest.TestCase):
         (self.plugin_path / ".git" / "HEAD").write_text("ref: refs/heads/main\n")
 
     def _fake_subprocess_run(self, *args, **kwargs):
-        # Return different dummy values depending on which git subcommand
+        # _get_local_git_info now reads branch and remote_url directly from
-        # was invoked so the code paths that parse output all succeed.
+        # .git/HEAD and .git/config (no subprocess) and uses a single
+        # ``git log --format=%H%n%cI`` call that returns SHA on line 1 and
+        # ISO date on line 2.  Adjust the fake accordingly.
         cmd = args[0]
         result = MagicMock()
         result.returncode = 0
-        if "rev-parse" in cmd and "HEAD" in cmd and "--abbrev-ref" not in cmd:
+        if "log" in cmd:
-            result.stdout = "abcdef1234567890\n"
+            result.stdout = "abcdef1234567890\n2026-04-08T12:00:00+00:00\n"
-        elif "--abbrev-ref" in cmd:
-            result.stdout = "main\n"
-        elif "config" in cmd:
-            result.stdout = "https://example.com/repo.git\n"
-        elif "log" in cmd:
-            result.stdout = "2026-04-08T12:00:00+00:00\n"
         else:
             result.stdout = ""
         return result
@@ -84,7 +189,8 @@ class TestGitInfoCache(unittest.TestCase):
             self.assertIsNotNone(first)
             self.assertEqual(first["short_sha"], "abcdef1")
             calls_after_first = mock_run.call_count
-            self.assertEqual(calls_after_first, 4)
+            # Production code now uses a single ``git log`` call.
+            self.assertEqual(calls_after_first, 1)
 
             # Second call with unchanged HEAD: zero new subprocess calls.
             second = self.sm._get_local_git_info(self.plugin_path)
@@ -105,7 +211,8 @@ class TestGitInfoCache(unittest.TestCase):
             os.utime(head, (new_time, new_time))
 
             self.sm._get_local_git_info(self.plugin_path)
-            self.assertEqual(mock_run.call_count, calls_after_first + 4)
+            # One new ``git log`` call after cache invalidation.
+            self.assertEqual(mock_run.call_count, calls_after_first + 1)
 
     def test_no_git_directory_returns_none(self):
         non_git = self.plugins_dir / "no_git"
@@ -192,14 +299,11 @@ class TestGitInfoCache(unittest.TestCase):
             result = MagicMock()
             result.returncode = 0
             cmd = args[0]
-            if "rev-parse" in cmd and "--abbrev-ref" not in cmd:
+            # Production code now uses a single ``git log --format=%H%n%cI``.
-                result.stdout = branch_file.read_text().strip() + "\n"
+            # Branch and remote_url are read directly from .git/HEAD/.git/config.
-            elif "--abbrev-ref" in cmd:
+            if "log" in cmd:
-                result.stdout = "main\n"
+                sha = branch_file.read_text().strip()
-            elif "config" in cmd:
+                result.stdout = f"{sha}\n2026-04-08T12:00:00+00:00\n"
-                result.stdout = "https://example.com/repo.git\n"
-            elif "log" in cmd:
-                result.stdout = "2026-04-08T12:00:00+00:00\n"
             else:
                 result.stdout = ""
             return result

test/test_utils.py

@@ -0,0 +1,329 @@
+"""
+Tests for src/common/utils.py
+
+Covers all pure utility functions: normalize_team_abbreviation, format_time,
+format_date, get_timezone, validate_dimensions, parse_team_abbreviation,
+format_score, format_period, is_live_game, is_final_game, is_upcoming_game,
+sanitize_filename, truncate_text, parse_boolean.
+"""
+
+import pytest
+from datetime import datetime, timezone
+import pytz
+
+from src.common.utils import (
+    normalize_team_abbreviation,
+    format_time,
+    format_date,
+    get_timezone,
+    validate_dimensions,
+    parse_team_abbreviation,
+    format_score,
+    format_period,
+    is_live_game,
+    is_final_game,
+    is_upcoming_game,
+    sanitize_filename,
+    truncate_text,
+    parse_boolean,
+)
+
+
+# ---------------------------------------------------------------------------
+# normalize_team_abbreviation
+# ---------------------------------------------------------------------------
+
+class TestNormalizeTeamAbbreviation:
+    def test_basic_uppercase(self):
+        assert normalize_team_abbreviation("lal") == "LAL"
+
+    def test_strips_spaces(self):
+        assert normalize_team_abbreviation("  KC  ") == "KC"
+
+    def test_replaces_ampersand(self):
+        assert normalize_team_abbreviation("TA&M") == "TAANDM"
+
+    def test_removes_internal_spaces(self):
+        assert normalize_team_abbreviation("A B") == "AB"
+
+    def test_removes_hyphens(self):
+        assert normalize_team_abbreviation("A-B") == "AB"
+
+    def test_empty_string_returns_empty(self):
+        assert normalize_team_abbreviation("") == ""
+
+    def test_none_returns_empty(self):
+        assert normalize_team_abbreviation(None) == ""
+
+
+# ---------------------------------------------------------------------------
+# format_time / format_date
+# ---------------------------------------------------------------------------
+
+class TestFormatTime:
+    def _utc_dt(self, hour=20, minute=30):
+        return datetime(2024, 1, 15, hour, minute, 0, tzinfo=timezone.utc)
+
+    def test_formats_utc_to_utc(self):
+        dt = self._utc_dt(20, 30)
+        result = format_time(dt, timezone_str="UTC")
+        # 20:30 UTC → "8:30PM" (leading zero stripped)
+        assert "8:30PM" in result or "8:30 PM" in result or result != ""
+
+    def test_naive_datetime_treated_as_utc(self):
+        dt = datetime(2024, 1, 15, 12, 0, 0)  # naive
+        result = format_time(dt, timezone_str="UTC")
+        assert result != ""
+
+    def test_invalid_timezone_returns_empty(self):
+        dt = self._utc_dt()
+        result = format_time(dt, timezone_str="Invalid/TZ")
+        assert result == ""
+
+    def test_eastern_timezone(self):
+        dt = self._utc_dt(20, 0)  # 8 PM UTC = 3 PM ET
+        result = format_time(dt, timezone_str="America/New_York")
+        assert result != ""
+
+
+class TestFormatDate:
+    def test_formats_date(self):
+        dt = datetime(2024, 6, 15, 18, 0, 0, tzinfo=timezone.utc)
+        result = format_date(dt, timezone_str="UTC")
+        assert "June" in result or "15" in result
+
+    def test_naive_datetime(self):
+        dt = datetime(2024, 3, 10, 12, 0, 0)
+        result = format_date(dt, timezone_str="UTC")
+        assert result != ""
+
+    def test_invalid_timezone_returns_empty(self):
+        dt = datetime(2024, 6, 15, 18, 0, 0, tzinfo=timezone.utc)
+        result = format_date(dt, timezone_str="BadZone/Here")
+        assert result == ""
+
+
+# ---------------------------------------------------------------------------
+# get_timezone
+# ---------------------------------------------------------------------------
+
+class TestGetTimezone:
+    def test_valid_timezone(self):
+        tz = get_timezone("America/New_York")
+        assert tz is not None
+
+    def test_utc(self):
+        tz = get_timezone("UTC")
+        assert tz is pytz.utc or str(tz) == "UTC"
+
+    def test_invalid_returns_utc(self):
+        tz = get_timezone("Not/ATimezone")
+        assert tz is pytz.utc
+
+
+# ---------------------------------------------------------------------------
+# validate_dimensions
+# ---------------------------------------------------------------------------
+
+class TestValidateDimensions:
+    def test_valid(self):
+        assert validate_dimensions(64, 32) is True
+
+    def test_zero_width(self):
+        assert validate_dimensions(0, 32) is False
+
+    def test_zero_height(self):
+        assert validate_dimensions(64, 0) is False
+
+    def test_negative(self):
+        assert validate_dimensions(-1, 32) is False
+
+    def test_too_large(self):
+        assert validate_dimensions(1001, 32) is False
+
+    def test_max_valid(self):
+        assert validate_dimensions(1000, 1000) is True
+
+    def test_non_integer(self):
+        assert validate_dimensions("64", 32) is False  # type: ignore[arg-type]
+
+
+# ---------------------------------------------------------------------------
+# parse_team_abbreviation
+# ---------------------------------------------------------------------------
+
+class TestParseTeamAbbreviation:
+    def test_empty_string(self):
+        assert parse_team_abbreviation("") == ""
+
+    def test_none_returns_empty(self):
+        assert parse_team_abbreviation(None) == ""
+
+    def test_extracts_uppercase(self):
+        result = parse_team_abbreviation("LAL")
+        assert result == "LAL"
+
+    def test_fallback_first_three(self):
+        # text without recognisable 2-4 char uppercase block
+        result = parse_team_abbreviation("ab")
+        assert len(result) <= 3
+
+
+# ---------------------------------------------------------------------------
+# format_score
+# ---------------------------------------------------------------------------
+
+class TestFormatScore:
+    def test_format_score(self):
+        assert format_score(14, 7) == "7-14"
+
+    def test_format_score_strings(self):
+        assert format_score("21", "14") == "14-21"
+
+    def test_zero_zero(self):
+        assert format_score(0, 0) == "0-0"
+
+
+# ---------------------------------------------------------------------------
+# format_period
+# ---------------------------------------------------------------------------
+
+class TestFormatPeriod:
+    def test_basketball_q1(self):
+        assert format_period(1, "basketball") == "Q1"
+
+    def test_basketball_q4(self):
+        assert format_period(4, "basketball") == "Q4"
+
+    def test_basketball_ot1(self):
+        assert format_period(5, "basketball") == "OT1"
+
+    def test_basketball_ot2(self):
+        assert format_period(6, "basketball") == "OT2"
+
+    def test_football_q1(self):
+        assert format_period(1, "football") == "Q1"
+
+    def test_football_ot(self):
+        assert format_period(5, "football") == "OT1"
+
+    def test_hockey_p1(self):
+        assert format_period(1, "hockey") == "P1"
+
+    def test_hockey_p3(self):
+        assert format_period(3, "hockey") == "P3"
+
+    def test_hockey_ot(self):
+        assert format_period(4, "hockey") == "OT1"
+
+    def test_baseball_inning(self):
+        assert format_period(7, "baseball") == "INN 7"
+
+    def test_unknown_sport(self):
+        result = format_period(2, "unknown")
+        assert "2" in result
+
+
+# ---------------------------------------------------------------------------
+# is_live_game / is_final_game / is_upcoming_game
+# ---------------------------------------------------------------------------
+
+class TestGameStatusHelpers:
+    def test_is_live_game_true(self):
+        assert is_live_game("In Progress") is True
+        assert is_live_game("halftime") is True
+        assert is_live_game("overtime") is True
+
+    def test_is_live_game_false(self):
+        assert is_live_game("Final") is False
+        assert is_live_game("Scheduled") is False
+
+    def test_is_final_game_true(self):
+        assert is_final_game("Final") is True
+        assert is_final_game("COMPLETED") is True
+
+    def test_is_final_game_false(self):
+        assert is_final_game("In Progress") is False
+
+    def test_is_upcoming_game_true(self):
+        assert is_upcoming_game("Scheduled") is True
+        assert is_upcoming_game("upcoming") is True
+
+    def test_is_upcoming_game_false(self):
+        assert is_upcoming_game("Final") is False
+        assert is_upcoming_game("In Progress") is False
+
+
+# ---------------------------------------------------------------------------
+# sanitize_filename
+# ---------------------------------------------------------------------------
+
+class TestSanitizeFilename:
+    def test_removes_invalid_chars(self):
+        result = sanitize_filename('file<>:"/\\|?*.txt')
+        assert "<" not in result
+        assert ">" not in result
+        assert ":" not in result
+
+    def test_collapses_underscores(self):
+        result = sanitize_filename("file___name")
+        assert "__" not in result
+
+    def test_strips_leading_trailing(self):
+        result = sanitize_filename("_file_")
+        assert not result.startswith("_")
+        assert not result.endswith("_")
+
+    def test_normal_filename_unchanged(self):
+        result = sanitize_filename("my_logo")
+        assert result == "my_logo"
+
+
+# ---------------------------------------------------------------------------
+# truncate_text
+# ---------------------------------------------------------------------------
+
+class TestTruncateText:
+    def test_no_truncation_needed(self):
+        assert truncate_text("hello", 10) == "hello"
+
+    def test_truncation_adds_suffix(self):
+        result = truncate_text("hello world", 8)
+        assert result.endswith("...")
+        assert len(result) == 8
+
+    def test_exact_length(self):
+        assert truncate_text("hello", 5) == "hello"
+
+    def test_custom_suffix(self):
+        result = truncate_text("hello world", 8, suffix="~")
+        assert result.endswith("~")
+
+
+# ---------------------------------------------------------------------------
+# parse_boolean
+# ---------------------------------------------------------------------------
+
+class TestParseBoolean:
+    def test_true_bool(self):
+        assert parse_boolean(True) is True
+
+    def test_false_bool(self):
+        assert parse_boolean(False) is False
+
+    def test_int_1(self):
+        assert parse_boolean(1) is True
+
+    def test_int_0(self):
+        assert parse_boolean(0) is False
+
+    def test_string_true(self):
+        for val in ("true", "True", "TRUE", "1", "yes", "on", "enabled"):
+            assert parse_boolean(val) is True, f"Expected True for {val!r}"
+
+    def test_string_false(self):
+        for val in ("false", "False", "0", "no", "off", "disabled"):
+            assert parse_boolean(val) is False, f"Expected False for {val!r}"
+
+    def test_none_returns_false(self):
+        assert parse_boolean(None) is False  # type: ignore[arg-type]

test/test_vegas_config.py

@@ -0,0 +1,310 @@
+"""
+Tests for src/vegas_mode/config.py
+
+Covers VegasModeConfig: from_config, to_dict, get_frame_interval,
+is_plugin_included, get_ordered_plugins, validate, update.
+"""
+
+import pytest
+from src.vegas_mode.config import VegasModeConfig
+
+
+# ---------------------------------------------------------------------------
+# Default construction
+# ---------------------------------------------------------------------------
+
+class TestVegasModeConfigDefaults:
+    def test_default_disabled(self):
+        cfg = VegasModeConfig()
+        assert cfg.enabled is False
+
+    def test_default_scroll_speed(self):
+        cfg = VegasModeConfig()
+        assert cfg.scroll_speed == 50.0
+
+    def test_default_separator_width(self):
+        cfg = VegasModeConfig()
+        assert cfg.separator_width == 32
+
+    def test_default_target_fps(self):
+        cfg = VegasModeConfig()
+        assert cfg.target_fps == 125
+
+    def test_default_plugin_order_empty(self):
+        cfg = VegasModeConfig()
+        assert cfg.plugin_order == []
+
+    def test_default_excluded_plugins_empty(self):
+        cfg = VegasModeConfig()
+        assert len(cfg.excluded_plugins) == 0
+
+
+# ---------------------------------------------------------------------------
+# from_config
+# ---------------------------------------------------------------------------
+
+class TestFromConfig:
+    def _cfg(self, **kwargs) -> dict:
+        return {"display": {"vegas_scroll": kwargs}}
+
+    def test_enabled_flag(self):
+        cfg = VegasModeConfig.from_config(self._cfg(enabled=True))
+        assert cfg.enabled is True
+
+    def test_scroll_speed(self):
+        cfg = VegasModeConfig.from_config(self._cfg(scroll_speed=80.0))
+        assert cfg.scroll_speed == 80.0
+
+    def test_separator_width(self):
+        cfg = VegasModeConfig.from_config(self._cfg(separator_width=16))
+        assert cfg.separator_width == 16
+
+    def test_plugin_order(self):
+        cfg = VegasModeConfig.from_config(self._cfg(plugin_order=["a", "b", "c"]))
+        assert cfg.plugin_order == ["a", "b", "c"]
+
+    def test_excluded_plugins(self):
+        cfg = VegasModeConfig.from_config(self._cfg(excluded_plugins=["x", "y"]))
+        assert "x" in cfg.excluded_plugins
+        assert "y" in cfg.excluded_plugins
+
+    def test_target_fps(self):
+        cfg = VegasModeConfig.from_config(self._cfg(target_fps=60))
+        assert cfg.target_fps == 60
+
+    def test_buffer_ahead(self):
+        cfg = VegasModeConfig.from_config(self._cfg(buffer_ahead=3))
+        assert cfg.buffer_ahead == 3
+
+    def test_min_max_cycle_duration(self):
+        cfg = VegasModeConfig.from_config(self._cfg(min_cycle_duration=30, max_cycle_duration=120))
+        assert cfg.min_cycle_duration == 30
+        assert cfg.max_cycle_duration == 120
+
+    def test_defaults_when_missing(self):
+        cfg = VegasModeConfig.from_config({})
+        assert cfg.enabled is False
+        assert cfg.scroll_speed == 50.0
+
+    def test_frame_based_scrolling(self):
+        cfg = VegasModeConfig.from_config(self._cfg(frame_based_scrolling=False))
+        assert cfg.frame_based_scrolling is False
+
+
+# ---------------------------------------------------------------------------
+# to_dict
+# ---------------------------------------------------------------------------
+
+class TestToDict:
+    def test_roundtrip(self):
+        original = VegasModeConfig(
+            enabled=True,
+            scroll_speed=75.0,
+            separator_width=24,
+            plugin_order=["a", "b"],
+            excluded_plugins={"z"},
+            target_fps=100,
+        )
+        d = original.to_dict()
+        assert d["enabled"] is True
+        assert d["scroll_speed"] == 75.0
+        assert d["separator_width"] == 24
+        assert d["plugin_order"] == ["a", "b"]
+        assert "z" in d["excluded_plugins"]
+        assert d["target_fps"] == 100
+
+    def test_excluded_plugins_is_list(self):
+        cfg = VegasModeConfig(excluded_plugins={"x"})
+        d = cfg.to_dict()
+        assert isinstance(d["excluded_plugins"], list)
+
+    def test_all_keys_present(self):
+        d = VegasModeConfig().to_dict()
+        for key in ("enabled", "scroll_speed", "separator_width", "plugin_order",
+                    "excluded_plugins", "target_fps", "buffer_ahead",
+                    "frame_based_scrolling", "scroll_delay",
+                    "dynamic_duration_enabled", "min_cycle_duration", "max_cycle_duration"):
+            assert key in d
+
+
+# ---------------------------------------------------------------------------
+# get_frame_interval
+# ---------------------------------------------------------------------------
+
+class TestGetFrameInterval:
+    def test_125fps(self):
+        cfg = VegasModeConfig(target_fps=125)
+        assert abs(cfg.get_frame_interval() - 1.0 / 125) < 1e-9
+
+    def test_60fps(self):
+        cfg = VegasModeConfig(target_fps=60)
+        assert abs(cfg.get_frame_interval() - 1.0 / 60) < 1e-6
+
+    def test_zero_fps_guarded(self):
+        cfg = VegasModeConfig(target_fps=0)
+        # Should not raise ZeroDivisionError (max(1, fps) guard)
+        result = cfg.get_frame_interval()
+        assert result == 1.0
+
+
+# ---------------------------------------------------------------------------
+# is_plugin_included
+# ---------------------------------------------------------------------------
+
+class TestIsPluginIncluded:
+    def test_not_excluded_is_included(self):
+        cfg = VegasModeConfig(excluded_plugins={"bad_plugin"})
+        assert cfg.is_plugin_included("good_plugin") is True
+
+    def test_excluded_plugin_not_included(self):
+        cfg = VegasModeConfig(excluded_plugins={"bad_plugin"})
+        assert cfg.is_plugin_included("bad_plugin") is False
+
+    def test_empty_exclusions_all_included(self):
+        cfg = VegasModeConfig()
+        assert cfg.is_plugin_included("anything") is True
+
+
+# ---------------------------------------------------------------------------
+# get_ordered_plugins
+# ---------------------------------------------------------------------------
+
+class TestGetOrderedPlugins:
+    def test_natural_order_when_no_order_configured(self):
+        cfg = VegasModeConfig()
+        available = ["a", "b", "c"]
+        result = cfg.get_ordered_plugins(available)
+        assert result == ["a", "b", "c"]
+
+    def test_explicit_order_followed(self):
+        cfg = VegasModeConfig(plugin_order=["c", "a", "b"])
+        available = ["a", "b", "c"]
+        result = cfg.get_ordered_plugins(available)
+        assert result == ["c", "a", "b"]
+
+    def test_unavailable_plugins_skipped(self):
+        cfg = VegasModeConfig(plugin_order=["c", "x", "a"])
+        available = ["a", "b", "c"]
+        result = cfg.get_ordered_plugins(available)
+        assert "x" not in result
+        assert result[:2] == ["c", "a"]
+
+    def test_excluded_plugins_removed(self):
+        cfg = VegasModeConfig(excluded_plugins={"b"})
+        available = ["a", "b", "c"]
+        result = cfg.get_ordered_plugins(available)
+        assert "b" not in result
+
+    def test_unordered_available_appended(self):
+        cfg = VegasModeConfig(plugin_order=["a"])
+        available = ["a", "b", "c"]
+        result = cfg.get_ordered_plugins(available)
+        assert result[0] == "a"
+        assert "b" in result
+        assert "c" in result
+
+    def test_empty_available(self):
+        cfg = VegasModeConfig(plugin_order=["a"])
+        result = cfg.get_ordered_plugins([])
+        assert result == []
+
+
+# ---------------------------------------------------------------------------
+# validate
+# ---------------------------------------------------------------------------
+
+class TestValidate:
+    def test_valid_config_no_errors(self):
+        cfg = VegasModeConfig()
+        errors = cfg.validate()
+        assert errors == []
+
+    def test_scroll_speed_too_low(self):
+        cfg = VegasModeConfig(scroll_speed=0.5)
+        errors = cfg.validate()
+        assert any("scroll_speed" in e for e in errors)
+
+    def test_scroll_speed_too_high(self):
+        cfg = VegasModeConfig(scroll_speed=300.0)
+        errors = cfg.validate()
+        assert any("scroll_speed" in e for e in errors)
+
+    def test_separator_width_negative(self):
+        cfg = VegasModeConfig(separator_width=-1)
+        errors = cfg.validate()
+        assert any("separator_width" in e for e in errors)
+
+    def test_separator_width_too_large(self):
+        cfg = VegasModeConfig(separator_width=200)
+        errors = cfg.validate()
+        assert any("separator_width" in e for e in errors)
+
+    def test_target_fps_too_low(self):
+        cfg = VegasModeConfig(target_fps=10)
+        errors = cfg.validate()
+        assert any("target_fps" in e for e in errors)
+
+    def test_target_fps_too_high(self):
+        cfg = VegasModeConfig(target_fps=300)
+        errors = cfg.validate()
+        assert any("target_fps" in e for e in errors)
+
+    def test_buffer_ahead_too_low(self):
+        cfg = VegasModeConfig(buffer_ahead=0)
+        errors = cfg.validate()
+        assert any("buffer_ahead" in e for e in errors)
+
+    def test_buffer_ahead_too_high(self):
+        cfg = VegasModeConfig(buffer_ahead=10)
+        errors = cfg.validate()
+        assert any("buffer_ahead" in e for e in errors)
+
+    def test_multiple_errors_returned(self):
+        cfg = VegasModeConfig(scroll_speed=0.1, target_fps=5)
+        errors = cfg.validate()
+        assert len(errors) >= 2
+
+
+# ---------------------------------------------------------------------------
+# update
+# ---------------------------------------------------------------------------
+
+class TestUpdate:
+    def _wrap(self, **kwargs) -> dict:
+        return {"display": {"vegas_scroll": kwargs}}
+
+    def test_update_enabled(self):
+        cfg = VegasModeConfig(enabled=False)
+        cfg.update(self._wrap(enabled=True))
+        assert cfg.enabled is True
+
+    def test_update_scroll_speed(self):
+        cfg = VegasModeConfig(scroll_speed=50.0)
+        cfg.update(self._wrap(scroll_speed=90.0))
+        assert cfg.scroll_speed == 90.0
+
+    def test_update_separator_width(self):
+        cfg = VegasModeConfig(separator_width=32)
+        cfg.update(self._wrap(separator_width=8))
+        assert cfg.separator_width == 8
+
+    def test_update_plugin_order(self):
+        cfg = VegasModeConfig(plugin_order=[])
+        cfg.update(self._wrap(plugin_order=["x", "y"]))
+        assert cfg.plugin_order == ["x", "y"]
+
+    def test_update_excluded_plugins(self):
+        cfg = VegasModeConfig()
+        cfg.update(self._wrap(excluded_plugins=["skip_me"]))
+        assert "skip_me" in cfg.excluded_plugins
+
+    def test_update_ignores_missing_keys(self):
+        cfg = VegasModeConfig(scroll_speed=50.0)
+        cfg.update(self._wrap(target_fps=80))  # only fps, not speed
+        assert cfg.scroll_speed == 50.0
+        assert cfg.target_fps == 80
+
+    def test_empty_update_no_change(self):
+        cfg = VegasModeConfig(scroll_speed=50.0)
+        cfg.update({})
+        assert cfg.scroll_speed == 50.0

test/test_web_api.py

@@ -617,7 +617,8 @@ class TestDottedKeyNormalization:
             'leagues': {'eng.1': {'enabled': True, 'favorite_teams': []}},
         }
         schema_mgr.merge_with_defaults.side_effect = lambda config, defaults: {**defaults, **config}
-        schema_mgr.validate_config_against_schema.return_value = []
+        # Must be a (bool, list) tuple: the endpoint does is_valid, errors = validate_config_against_schema(...)
+        schema_mgr.validate_config_against_schema.return_value = (True, [])
         api_v3.schema_manager = schema_mgr
 
         request_data = {
@@ -679,7 +680,7 @@ class TestDottedKeyNormalization:
             'leagues': {'eng.1': {'favorite_teams': []}},
         }
         schema_mgr.merge_with_defaults.side_effect = lambda config, defaults: {**defaults, **config}
-        schema_mgr.validate_config_against_schema.return_value = []
+        schema_mgr.validate_config_against_schema.return_value = (True, [])
         api_v3.schema_manager = schema_mgr
 
         request_data = {

test/web_interface/test_state_reconciliation.py

@@ -224,20 +224,14 @@ class TestStateReconciliation(unittest.TestCase):
         with open(manifest_path, 'w') as f:
             json.dump({"version": "1.0.0", "name": "Plugin 1"}, f)
         
-        # Mock save_config to track calls
-        saved_configs = []
-        def save_config(config):
-            saved_configs.append(config)
-        
-        self.config_manager.save_config = save_config
-        
         # Run reconciliation
         result = self.reconciler.reconcile_state()
 
-        # Verify fix was attempted
+        # config.json is the source of truth for enabled state. The fix syncs
+        # the state manager to match config (config says True → state set True),
+        # rather than overwriting the config with the stale state value.
         self.assertEqual(len(result.inconsistencies_fixed), 1)
-        self.assertEqual(len(saved_configs), 1)
+        self.state_manager.set_plugin_enabled.assert_called_once_with("plugin1", True)
-        self.assertEqual(saved_configs[0]["plugin1"]["enabled"], False)
     
     def test_multiple_inconsistencies(self):
         """Test reconciliation with multiple inconsistencies."""

test/web_interface/test_systemctl_sudoers_alignment.py

@@ -0,0 +1,76 @@
+"""Guards that every privileged systemctl call the web interface makes is
+covered by a passwordless-sudo grant in configure_web_sudo.sh.
+
+The web interface runs headless (no TTY), so any `sudo` call that is not
+matched by a NOPASSWD rule in /etc/sudoers.d/ledmatrix_web falls back to a
+password prompt and fails with:
+
+    sudo: a terminal is required to read the password
+
+sudo matches the command line by exact string, so `systemctl start ledmatrix`
+and `systemctl start ledmatrix.service` are NOT interchangeable. This test
+parses both the production blueprint and the sudoers-generator script and
+asserts the (verb, unit) pairs line up, catching the suffix-mismatch class of
+bug before it ships.
+"""
+
+import ast
+import re
+from pathlib import Path
+
+PROJECT_ROOT = Path(__file__).resolve().parents[2]
+API_V3 = PROJECT_ROOT / "web_interface" / "blueprints" / "api_v3.py"
+SUDOERS_SCRIPT = PROJECT_ROOT / "scripts" / "install" / "configure_web_sudo.sh"
+
+
+def _sudo_systemctl_calls(source: str) -> set[tuple[str, str]]:
+    """Return (verb, unit) for every list literal beginning with
+    ['sudo', 'systemctl', ...] passed to a subprocess call in the source."""
+    calls: set[tuple[str, str]] = set()
+    for node in ast.walk(ast.parse(source)):
+        if not isinstance(node, ast.List):
+            continue
+        elts = node.elts
+        if len(elts) < 4:
+            continue
+        if not all(isinstance(e, ast.Constant) and isinstance(e.value, str) for e in elts[:4]):
+            continue
+        if elts[0].value == "sudo" and elts[1].value == "systemctl":
+            calls.add((elts[2].value, elts[3].value))
+    return calls
+
+
+def _granted_systemctl_rules(script: str) -> set[tuple[str, str]]:
+    """Return (verb, unit) for each `$SYSTEMCTL_PATH <verb> <unit>` NOPASSWD
+    grant emitted by the sudoers-generator script."""
+    rules: set[tuple[str, str]] = set()
+    for match in re.finditer(r"\$SYSTEMCTL_PATH\s+(\S+)\s+(\S+)", script):
+        verb, unit = match.group(1), match.group(2).rstrip('"')
+        rules.add((verb, unit))
+    return rules
+
+
+def test_every_sudo_systemctl_call_is_granted() -> None:
+    calls = _sudo_systemctl_calls(API_V3.read_text())
+    rules = _granted_systemctl_rules(SUDOERS_SCRIPT.read_text())
+
+    assert calls, "expected to find sudo systemctl calls in api_v3.py"
+
+    uncovered = {c for c in calls if c not in rules}
+    assert not uncovered, (
+        "These sudo systemctl calls have no matching NOPASSWD grant in "
+        "configure_web_sudo.sh; they will fail headless with "
+        "'sudo: a terminal is required to read the password': "
+        + ", ".join(f"systemctl {v} {u}" for v, u in sorted(uncovered))
+    )
+
+
+def test_units_are_fully_qualified() -> None:
+    """Privileged systemctl calls must name the unit as <name>.service so they
+    match the sudoers grants, which use the fully-qualified unit name."""
+    calls = _sudo_systemctl_calls(API_V3.read_text())
+    unqualified = {(v, u) for v, u in calls if not u.endswith(".service")}
+    assert not unqualified, (
+        "sudo systemctl calls must use fully-qualified .service unit names: "
+        + ", ".join(f"systemctl {v} {u}" for v, u in sorted(unqualified))
+    )

web_interface/app.py

@@ -2,8 +2,11 @@ from flask import Flask, request, redirect, url_for, jsonify, Response, send_fro
 import json
 import logging
 import os
+import queue
+import shutil
 import sys
 import subprocess
+import threading
 import time
 from pathlib import Path
 from datetime import datetime, timedelta
@@ -22,6 +25,9 @@ from src.plugin_system.state_manager import PluginStateManager
 from src.plugin_system.operation_history import OperationHistory
 from src.plugin_system.health_monitor import PluginHealthMonitor
 
+_JOURNALCTL = shutil.which('journalctl')
+_SYSTEMCTL = shutil.which('systemctl')
+
 # Create Flask app
 app = Flask(__name__)
 app.secret_key = os.urandom(24)
@@ -73,6 +79,21 @@ plugin_manager = PluginManager(
     cache_manager=None     # Not needed for web interface
 )
 plugin_store_manager = PluginStoreManager(plugins_dir=str(plugins_dir))
+# A core `git pull` update (or any checkout) restores built-in plugins
+# committed under plugin-repos/, even ones the user uninstalled. Re-remove any
+# the user previously uninstalled at startup so a manual update on the Pi
+# doesn't resurrect them.
+try:
+    _purged = plugin_store_manager.purge_uninstalled_plugins()
+    if _purged:
+        logging.getLogger(__name__).info(
+            "Re-removed %d uninstalled plugin(s) restored since last run: %s",
+            len(_purged), ", ".join(_purged),
+        )
+except (OSError, RuntimeError) as _purge_err:
+    logging.getLogger(__name__).warning(
+        "Startup plugin purge failed: %s", _purge_err
+    )
 saved_repositories_manager = SavedRepositoriesManager()
 
 # Initialize schema manager
@@ -204,20 +225,8 @@ def serve_plugin_asset(plugin_id, filename):
         # Use send_from_directory to serve the file
         return send_from_directory(str(assets_dir), filename, mimetype=content_type)
         
-    except Exception as e:
+    except Exception:
-        # Log the exception with full traceback server-side
-        import traceback
         app.logger.exception('Error serving plugin asset file')
-        
-        # Return generic error message to client (avoid leaking internal details)
-        # Only include detailed error information when in debug mode
-        if app.debug:
-            return jsonify({
-                'status': 'error',
-                'message': str(e),
-                'traceback': traceback.format_exc()
-            }), 500
-        else:
         return jsonify({
             'status': 'error',
             'message': 'Internal server error'
@@ -342,35 +351,25 @@ def not_found_error(error):
 @app.errorhandler(500)
 def internal_error(error):
     """Handle 500 errors."""
-    import traceback
-    error_details = traceback.format_exc()
-    
-    # Log the error
     import logging
     logger = logging.getLogger('web_interface')
-    logger.error(f"Internal server error: {error}", exc_info=True)
+    logger.error("Internal server error", exc_info=True)
-    
-    # Return user-friendly error (hide internal details in production)
     return jsonify({
         'status': 'error',
         'error_code': 'INTERNAL_ERROR',
-        'message': 'An internal error occurred',
+        'message': 'An internal error occurred; see logs for details',
-        'details': error_details if app.debug else None
     }), 500
 
 @app.errorhandler(Exception)
 def handle_exception(error):
     """Handle all unhandled exceptions."""
-    import traceback
     import logging
     logger = logging.getLogger('web_interface')
-    logger.error(f"Unhandled exception: {error}", exc_info=True)
+    logger.error("Unhandled exception", exc_info=True)
-    
     return jsonify({
         'status': 'error',
         'error_code': 'UNKNOWN_ERROR',
-        'message': str(error) if app.debug else 'An error occurred',
+        'message': 'An error occurred; see logs for details',
-        'details': traceback.format_exc() if app.debug else None
     }), 500
 
 # Captive portal redirect middleware
@@ -407,6 +406,22 @@ def captive_portal_redirect():
     # Redirect to lightweight captive portal setup page (not the full UI)
     return redirect(url_for('pages_v3.captive_setup'), code=302)
 
+# Append a content-version query param (file mtime) to every static URL so the
+# long-lived `immutable` cache (see add_security_headers below) is actually safe:
+# when a static file changes its URL changes, so browsers refetch it. Without
+# this, edited JS/CSS were served immutable under an unchanging URL and never
+# reached clients until a manual cache clear.
+@app.url_defaults
+def add_static_version(endpoint, values):
+    if endpoint == 'static' and values.get('filename'):
+        try:
+            file_path = os.path.join(app.static_folder, values['filename'])
+            values['v'] = int(os.path.getmtime(file_path))
+        except OSError:
+            # File missing (e.g. plugin asset not yet installed) — skip versioning.
+            pass
+
+
 # Add security headers and caching to all responses
 @app.after_request
 def add_security_headers(response):
@@ -435,13 +450,53 @@ def add_security_headers(response):
     
     return response
 
-# SSE helper function
+class _StreamBroadcaster:
-def sse_response(generator_func):
+    """Fan-out broadcaster: one background generator thread pushes to all SSE clients.
-    """Helper to create SSE responses"""
+
-    def generate():
+    This means N browser tabs share one generator instead of each running their own,
-        for data in generator_func():
+    keeping PIL encodes / subprocess forks constant regardless of how many tabs are open.
-            yield f"data: {json.dumps(data)}\n\n"
+    """
-    return Response(generate(), mimetype='text/event-stream')
+
+    def __init__(self, generator_factory):
+        self._generator_factory = generator_factory
+        self._clients: set = set()
+        self._lock = threading.Lock()
+        self._thread: threading.Thread | None = None
+
+    def subscribe(self) -> queue.Queue:
+        q: queue.Queue = queue.Queue(maxsize=5)
+        with self._lock:
+            self._clients.add(q)
+            if not (self._thread and self._thread.is_alive()):
+                self._thread = threading.Thread(target=self._broadcast, daemon=True)
+                self._thread.start()
+        return q
+
+    def unsubscribe(self, q: queue.Queue) -> None:
+        with self._lock:
+            self._clients.discard(q)
+
+    def _broadcast(self):
+        for data in self._generator_factory():
+            with self._lock:
+                if not self._clients:
+                    # No subscribers — exit so the thread doesn't spin indefinitely.
+                    # subscribe() will restart it when a new client arrives.
+                    break
+                for q in self._clients:
+                    try:
+                        q.put_nowait(data)
+                    except queue.Full:
+                        # Client is reading too slowly; drop the oldest item and
+                        # deliver the latest so the queue never stalls the client.
+                        try:
+                            q.get_nowait()
+                        except queue.Empty:
+                            pass
+                        try:
+                            q.put_nowait(data)
+                        except queue.Full:
+                            pass
 
 # System status generator for SSE
 def system_status_generator():
@@ -472,12 +527,13 @@ def system_status_generator():
             # Check if display service is running (cached to avoid per-client subprocess forks)
             now = time.time()
             if (now - _ledmatrix_service_cache['timestamp']) >= _LEDMATRIX_SERVICE_CACHE_TTL:
+                if _SYSTEMCTL:
                     try:
-                    result = subprocess.run(['systemctl', 'is-active', 'ledmatrix'],
+                        result = subprocess.run([_SYSTEMCTL, 'is-active', 'ledmatrix'],
                                                 capture_output=True, text=True, timeout=2)
                         _ledmatrix_service_cache['active'] = result.stdout.strip() == 'active'
-                except (subprocess.SubprocessError, OSError):
+                    except (subprocess.SubprocessError, OSError) as e:
-                    pass
+                        app.logger.warning("systemctl status check failed: %s", e)
                 _ledmatrix_service_cache['timestamp'] = now
             service_active = _ledmatrix_service_cache['active']
             
@@ -492,7 +548,8 @@ def system_status_generator():
             }
             yield status
         except Exception as e:
-            yield {'error': str(e)}
+            app.logger.error("SSE generator error", exc_info=True)
+            yield {'error': 'An error occurred; see server logs'}
         time.sleep(10)  # Update every 10 seconds (reduced frequency for better performance)
 
 # Display preview generator for SSE
@@ -555,7 +612,8 @@ def display_preview_generator():
                 }
                 
         except Exception as e:
-            yield {'error': str(e)}
+            app.logger.error("SSE generator error", exc_info=True)
+            yield {'error': 'An error occurred; see server logs'}
         
         time.sleep(1.0)  # Check once per second — halves PIL encode overhead vs 0.5s
 
@@ -567,8 +625,13 @@ def logs_generator():
             # Get recent logs from journalctl (simplified version)
             # Note: User should be in systemd-journal group to read logs without sudo
             try:
+                if not _JOURNALCTL:
+                    yield {'timestamp': time.time(), 'logs': 'journalctl not found; cannot read logs'}
+                    time.sleep(60)
+                    continue
                 result = subprocess.run(
-                    ['journalctl', '-u', 'ledmatrix.service', '-n', '50', '--no-pager'],
+                    [_JOURNALCTL, '-u', 'ledmatrix.service', '-u', 'ledmatrix-web.service',
+                     '-n', '50', '--no-pager', '--output=short-iso'],
                     capture_output=True, text=True, timeout=5
                 )
 
@@ -584,7 +647,7 @@ def logs_generator():
                         # No logs available
                         logs_data = {
                             'timestamp': time.time(),
-                            'logs': 'No logs available from ledmatrix service'
+                            'logs': 'No logs available from ledmatrix or ledmatrix-web service'
                         }
                         yield logs_data
                 else:
@@ -598,36 +661,68 @@ def logs_generator():
             except subprocess.TimeoutExpired:
                 # Timeout - just skip this update
                 pass
-            except Exception as e:
+            except Exception:
+                app.logger.error("Error running journalctl", exc_info=True)
                 error_data = {
                     'timestamp': time.time(),
-                    'logs': f'Error running journalctl: {str(e)}'
+                    'logs': 'Error running journalctl; see server logs'
                 }
                 yield error_data
 
-        except Exception as e:
+        except Exception:
+            app.logger.error("Unexpected error in logs generator", exc_info=True)
             error_data = {
                 'timestamp': time.time(),
-                'logs': f'Unexpected error in logs generator: {str(e)}'
+                'logs': 'Unexpected error in logs generator; see server logs'
             }
             yield error_data
 
         time.sleep(5)  # Update every 5 seconds (reduced frequency for better performance)
 
+# One broadcaster per stream — shared across all SSE clients
+_stats_broadcaster = _StreamBroadcaster(system_status_generator)
+_display_broadcaster = _StreamBroadcaster(display_preview_generator)
+_logs_broadcaster = _StreamBroadcaster(logs_generator)
+
+
+def _sse_stream(broadcaster: _StreamBroadcaster) -> Response:
+    """Return a streaming SSE response backed by a shared broadcaster."""
+    q = broadcaster.subscribe()
+
+    def generate():
+        try:
+            while True:
+                try:
+                    data = q.get(timeout=30)
+                    yield f"data: {json.dumps(data)}\n\n"
+                except queue.Empty:
+                    # Send an SSE comment heartbeat to keep the connection alive
+                    # through proxies that close idle connections.
+                    yield ": heartbeat\n\n"
+        except GeneratorExit:
+            pass
+        finally:
+            broadcaster.unsubscribe(q)
+
+    return Response(generate(), mimetype='text/event-stream')
+
+
 # SSE endpoints
 @app.route('/api/v3/stream/stats')
 def stream_stats():
-    return sse_response(system_status_generator)
+    return _sse_stream(_stats_broadcaster)
 
 @app.route('/api/v3/stream/display')
 def stream_display():
-    return sse_response(display_preview_generator)
+    return _sse_stream(_display_broadcaster)
 
 @app.route('/api/v3/stream/logs')
 def stream_logs():
-    return sse_response(logs_generator)
+    return _sse_stream(_logs_broadcaster)
 
-# Exempt SSE streams from CSRF and add rate limiting
+# Exempt SSE streams from CSRF and apply a generous rate limit.
+# SSE connections are long-lived HTTP requests, not repeated API calls, so the
+# tight "20 per minute" default would be exhausted quickly on reconnects.
 if csrf:
     csrf.exempt(stream_stats)
     csrf.exempt(stream_display)
@@ -635,9 +730,9 @@ if csrf:
     # Note: api_v3 blueprint is exempted above after registration
 
 if limiter:
-    limiter.limit("20 per minute")(stream_stats)
+    limiter.limit("200 per minute")(stream_stats)
-    limiter.limit("20 per minute")(stream_display)
+    limiter.limit("200 per minute")(stream_display)
-    limiter.limit("20 per minute")(stream_logs)
+    limiter.limit("200 per minute")(stream_logs)
 
 # Main route - redirect to v3 interface as default
 @app.route('/')
@@ -716,6 +811,41 @@ def _run_startup_reconciliation() -> None:
                 "manual 'Reconcile' action to resolve.",
                 len(result.inconsistencies_manual),
             )
+
+        # Write status file so the web UI can surface unresolved issues as a
+        # banner without the user having to read journalctl. Mirrors the
+        # hw_status pattern (/tmp/led_matrix_hw_status.json).
+        import json as _json, tempfile as _tempfile, os as _os
+        _recon_status = {
+            "done": True,
+            "successful": result.reconciliation_successful,
+            "fixed_count": len(result.inconsistencies_fixed),
+            "unresolved": [
+                {
+                    "plugin_id": inc.plugin_id,
+                    "type": inc.inconsistency_type.value,
+                    "description": inc.description,
+                }
+                for inc in result.inconsistencies_manual
+            ],
+        }
+        _recon_path = _os.path.join(_tempfile.gettempdir(), "ledmatrix_reconciliation.json")
+        _tmp = None
+        try:
+            if not _os.path.islink(_recon_path):
+                _fd, _tmp = _tempfile.mkstemp(dir=_tempfile.gettempdir(), prefix=".led_recon_")
+                with _os.fdopen(_fd, "w") as _f:
+                    _json.dump(_recon_status, _f)
+                _os.replace(_tmp, _recon_path)
+                _tmp = None  # Rename succeeded; nothing to clean up
+        except (OSError, ValueError, TypeError) as _e:
+            _logger.warning("[Reconciliation] Could not write status file: %s", _e)
+        finally:
+            if _tmp is not None and _os.path.exists(_tmp):
+                try:
+                    _os.unlink(_tmp)
+                except OSError:
+                    pass
     except Exception as e:
         _logger.error("[Reconciliation] Error: %s", e, exc_info=True)
     finally:

web_interface/blueprints/pages_v3.py

@@ -2,7 +2,14 @@ from flask import Blueprint, render_template, flash
 from markupsafe import escape
 import json
 import logging
+import os
+import os.path
+import re
 from pathlib import Path
+
+# Strict allowlists for URL-derived values used in path and script operations.
+_SAFE_PLUGIN_ID_RE = re.compile(r'^[a-zA-Z0-9_-]{1,64}$')
+_SAFE_WEB_UI_FILE_RE = re.compile(r'^[a-zA-Z0-9_-]{1,64}\.html$')
 from src.web_interface.secret_helpers import mask_secret_fields
 
 logger = logging.getLogger(__name__)
@@ -84,10 +91,11 @@ def load_partial(partial_name):
         elif partial_name == 'operation-history':
             return _load_operation_history_partial()
         else:
-            return f"Partial '{partial_name}' not found", 404
+            return "Partial not found", 404
 
     except Exception as e:
-        return f"Error loading partial '{partial_name}': {str(e)}", 500
+        logger.error("Error loading partial %s", partial_name, exc_info=True)
+        return "Error loading partial", 500
 
 
 @pages_v3.route('/partials/plugin-config/<plugin_id>')
@@ -95,8 +103,102 @@ def load_plugin_config_partial(plugin_id):
     """Load plugin configuration partial via HTMX - server-side rendered form"""
     try:
         return _load_plugin_config_partial(plugin_id)
-    except Exception as e:
+    except Exception:
-        return f'<div class="text-red-500 p-4">Error loading plugin config: {escape(str(e))}</div>', 500
+        logger.error("Error loading plugin config partial for %s", plugin_id, exc_info=True)
+        return '<div class="text-red-500 p-4">Error loading plugin config; see logs for details</div>', 500
+
+
+@pages_v3.route('/plugin-ui/<plugin_id>/web-ui/<path:filename>')
+def serve_plugin_web_ui(plugin_id, filename):
+    """Serve a plugin's web_ui/ HTML fragment as a standalone page.
+
+    Wraps the fragment with a minimal HTML page that injects window.PLUGIN_ID
+    and loads Tailwind CSS so the fragment runs correctly in a sandboxed iframe.
+    """
+    # Validate URL-derived values against strict allowlists before any path or
+    # script operations.
+    if not _SAFE_PLUGIN_ID_RE.match(plugin_id):
+        return 'Invalid plugin ID', 400, {'Content-Type': 'text/plain'}
+    if not _SAFE_WEB_UI_FILE_RE.match(filename):
+        return 'Invalid filename', 400, {'Content-Type': 'text/plain'}
+
+    # os.path.basename() is the CodeQL-recognised path sanitizer used throughout
+    # this codebase (see plugin_loader.py).  Applying it here breaks the taint
+    # chain even though the allowlist above already prevents path separators.
+    safe_id = os.path.basename(plugin_id)
+    safe_fn = os.path.basename(filename)
+    if not safe_id or not safe_fn:
+        return 'Invalid path component', 400, {'Content-Type': 'text/plain'}
+
+    if not pages_v3.plugin_manager:
+        return 'Plugin manager not available', 503, {'Content-Type': 'text/plain'}
+
+    try:
+        _plugins_base = Path(pages_v3.plugin_manager.plugins_dir).resolve()
+
+        # Reconstruct from sanitised basename — CodeQL-approved pattern.
+        _plugin_dir = (_plugins_base / safe_id).resolve()
+        _plugin_dir.relative_to(_plugins_base)  # containment guard
+
+        # Mirror PluginManager's ledmatrix- prefix fallback.
+        if not _plugin_dir.exists():
+            _alt_id  = os.path.basename(f'ledmatrix-{safe_id}')
+            _alt     = (_plugins_base / _alt_id).resolve()
+            try:
+                _alt.relative_to(_plugins_base)
+                _plugin_dir = _alt
+            except ValueError:
+                pass
+
+        web_ui_path = (_plugin_dir / 'web_ui' / safe_fn).resolve()
+        web_ui_path.relative_to(_plugin_dir / 'web_ui')  # second guard
+
+        if not web_ui_path.exists():
+            return 'Not found', 404, {'Content-Type': 'text/plain'}
+
+        fragment = web_ui_path.read_text(encoding='utf-8')
+
+        # json.dumps wraps the value in quotes.  Replace HTML meta-chars with
+        # their JS Unicode escape sequences so the value cannot close or escape
+        # the enclosing <script> tag.
+        # r'<' is the 6-char literal string <, which JavaScript
+        # interprets as <.  This is the standard JSON-in-HTML hardening pattern.
+        safe_plugin_id_js = (
+            json.dumps(safe_id)
+            .replace('<', '\\u003c')
+            .replace('>', '\\u003e')
+            .replace('&', '\\u0026')
+        )
+
+        page = (
+            '<!DOCTYPE html>\n'
+            '<html lang="en">\n'
+            '<head>\n'
+            '<meta charset="UTF-8">\n'
+            '<meta name="viewport" content="width=device-width,initial-scale=1">\n'
+            '<script>\n'
+            # Inject plugin context before the fragment runs.
+            # plugin_id is validated to [a-zA-Z0-9_-] above, so this is safe,
+            # but we also Unicode-escape HTML meta-chars as defence in depth.
+            f'  window.PLUGIN_ID = {safe_plugin_id_js};\n'
+            '</script>\n'
+            # Tailwind v2 CDN — same version used by the parent LEDMatrix UI
+            '<link rel="stylesheet" '
+            'href="https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.19/tailwind.min.css" '
+            'crossorigin="anonymous">\n'
+            '<style>body{margin:0;padding:0;background:#fff;}</style>\n'
+            '</head>\n'
+            '<body>\n'
+            + fragment +
+            '\n</body>\n</html>'
+        )
+        return page, 200, {'Content-Type': 'text/html; charset=utf-8'}
+
+    except ValueError:
+        return 'Forbidden', 403, {'Content-Type': 'text/plain'}
+    except Exception:
+        logger.error('Error serving plugin web_ui %s/%s', plugin_id, filename, exc_info=True)
+        return 'Error serving file', 500, {'Content-Type': 'text/plain'}
 
 def _load_overview_partial():
     """Load overview partial with system stats"""
@@ -107,7 +209,8 @@ def _load_overview_partial():
             return render_template('v3/partials/overview.html',
                                  main_config=main_config)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_general_partial():
     """Load general settings partial"""
@@ -117,7 +220,8 @@ def _load_general_partial():
             return render_template('v3/partials/general.html',
                                  main_config=main_config)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_display_partial():
     """Load display settings partial"""
@@ -127,7 +231,8 @@ def _load_display_partial():
             return render_template('v3/partials/display.html',
                                  main_config=main_config)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_durations_partial():
     """Load display durations partial"""
@@ -137,7 +242,8 @@ def _load_durations_partial():
             return render_template('v3/partials/durations.html',
                                  main_config=main_config)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_schedule_partial():
     """Load schedule settings partial"""
@@ -153,7 +259,8 @@ def _load_schedule_partial():
                                  dim_schedule_config=dim_schedule_config,
                                  normal_brightness=normal_brightness)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 
 def _load_weather_partial():
@@ -164,7 +271,8 @@ def _load_weather_partial():
             return render_template('v3/partials/weather.html',
                                  main_config=main_config)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_stocks_partial():
     """Load stocks configuration partial"""
@@ -174,7 +282,8 @@ def _load_stocks_partial():
             return render_template('v3/partials/stocks.html',
                                  main_config=main_config)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_plugins_partial():
     """Load plugins management partial"""
@@ -208,7 +317,7 @@ def _load_plugins_partial():
                             plugin_info.update(fresh_manifest)
                         except Exception as e:
                             # If we can't read the fresh manifest, use the cached one
-                            print(f"Warning: Could not read fresh manifest for {plugin_id}: {e}")
+                            logger.warning("Could not read fresh manifest for plugin: %s", plugin_id)
 
                     # Get enabled status from config (source of truth)
                     # Read from config file first, fall back to plugin instance if config doesn't have the key
@@ -256,12 +365,13 @@ def _load_plugins_partial():
                         'branch': branch
                     })
             except Exception as e:
-                print(f"Error loading plugin data: {e}")
+                logger.error("Error loading plugin data", exc_info=True)
 
         return render_template('v3/partials/plugins.html',
                              plugins=plugins_data)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_fonts_partial():
     """Load fonts management partial"""
@@ -271,14 +381,16 @@ def _load_fonts_partial():
         return render_template('v3/partials/fonts.html',
                              fonts=fonts_data)
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_logs_partial():
     """Load logs viewer partial"""
     try:
         return render_template('v3/partials/logs.html')
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_raw_json_partial():
     """Load raw JSON editor partial"""
@@ -295,14 +407,16 @@ def _load_raw_json_partial():
                                  main_config_path=pages_v3.config_manager.get_config_path(),
                                  secrets_config_path=pages_v3.config_manager.get_secrets_path())
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_backup_restore_partial():
     """Load backup & restore partial."""
     try:
         return render_template('v3/partials/backup_restore.html')
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 @pages_v3.route('/setup')
 def captive_setup():
@@ -314,21 +428,24 @@ def _load_wifi_partial():
     try:
         return render_template('v3/partials/wifi.html')
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_cache_partial():
     """Load cache management partial"""
     try:
         return render_template('v3/partials/cache.html')
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 def _load_operation_history_partial():
     """Load operation history partial"""
     try:
         return render_template('v3/partials/operation_history.html')
     except Exception as e:
-        return f"Error: {str(e)}", 500
+        logger.error("Error loading partial", exc_info=True)
+        return "Error loading partial", 500
 
 
 def _load_plugin_config_partial(plugin_id):
@@ -336,6 +453,11 @@ def _load_plugin_config_partial(plugin_id):
     Load plugin configuration partial - server-side rendered form.
     This replaces the client-side generateConfigForm() JavaScript.
     """
+    # Sanitize with basename (CodeQL-recognized sanitizer) then regex-validate format
+    plugin_id = os.path.basename(plugin_id or '')
+    if not re.match(r'^[a-zA-Z0-9][a-zA-Z0-9._\-:]*$', plugin_id):
+        return '<div class="text-red-500 p-4">Invalid plugin ID</div>', 400
+
     try:
         if not pages_v3.plugin_manager:
             return '<div class="text-red-500 p-4">Plugin manager not available</div>', 500
@@ -344,6 +466,14 @@ def _load_plugin_config_partial(plugin_id):
         if plugin_id.startswith('starlark:'):
             return _load_starlark_config_partial(plugin_id[len('starlark:'):])
 
+        # Resolve and validate all plugin paths against the plugins base directory
+        _plugins_base = Path(pages_v3.plugin_manager.plugins_dir).resolve()
+        _plugin_dir = (_plugins_base / plugin_id).resolve()
+        try:
+            _plugin_dir.relative_to(_plugins_base)
+        except ValueError:
+            return '<div class="text-red-500 p-4">Invalid plugin ID</div>', 400
+
         # Try to get plugin info first
         plugin_info = pages_v3.plugin_manager.get_plugin_info(plugin_id)
 
@@ -353,7 +483,7 @@ def _load_plugin_config_partial(plugin_id):
             plugin_info = pages_v3.plugin_manager.get_plugin_info(plugin_id)
 
         if not plugin_info:
-            return f'<div class="text-red-500 p-4">Plugin "{escape(plugin_id)}" not found</div>', 404
+            return '<div class="text-red-500 p-4">Plugin not found</div>', 404
 
         # Get plugin instance (may be None if not loaded)
         plugin_instance = pages_v3.plugin_manager.get_plugin(plugin_id)
@@ -365,59 +495,56 @@ def _load_plugin_config_partial(plugin_id):
             config = full_config.get(plugin_id, {})
 
         # Load uploaded images from metadata file if images field exists in schema
-        # This ensures uploaded images appear even if config hasn't been saved yet
+        schema_path_temp = _plugin_dir / "config_schema.json"
-        schema_path_temp = Path(pages_v3.plugin_manager.plugins_dir) / plugin_id / "config_schema.json"
         if schema_path_temp.exists():
             try:
                 with open(schema_path_temp, 'r', encoding='utf-8') as f:
                     temp_schema = json.load(f)
-                    # Check if schema has an images field with x-widget: file-upload
                     if (temp_schema.get('properties', {}).get('images', {}).get('x-widget') == 'file-upload' or
                         temp_schema.get('properties', {}).get('images', {}).get('x_widget') == 'file-upload'):
-                        # Load metadata file
+                        _assets_base = (Path(__file__).parent.parent.parent / 'assets' / 'plugins').resolve()
-                        # Get PROJECT_ROOT relative to this file
+                        metadata_file = (_assets_base / plugin_id / 'uploads' / '.metadata.json').resolve()
-                        project_root = Path(__file__).parent.parent.parent
+                        try:
-                        metadata_file = project_root / 'assets' / 'plugins' / plugin_id / 'uploads' / '.metadata.json'
+                            metadata_file.relative_to(_assets_base)
-                        if metadata_file.exists():
+                        except ValueError:
+                            metadata_file = None
+                        if metadata_file and metadata_file.exists():
                             try:
                                 with open(metadata_file, 'r', encoding='utf-8') as mf:
                                     metadata = json.load(mf)
-                                    # Convert metadata dict to list of image objects
                                     images_from_metadata = list(metadata.values())
-                                    # Only use metadata images if config doesn't have images or config images is empty
                                     if not config.get('images') or len(config.get('images', [])) == 0:
                                         config['images'] = images_from_metadata
                                     else:
-                                        # Merge: add metadata images that aren't already in config
                                         config_image_ids = {img.get('id') for img in config.get('images', []) if img.get('id')}
                                         new_images = [img for img in images_from_metadata if img.get('id') not in config_image_ids]
                                         if new_images:
                                             config['images'] = config.get('images', []) + new_images
                             except Exception as e:
-                                print(f"Warning: Could not load metadata for {plugin_id}: {e}")
+                                logger.warning("Could not load plugin upload metadata: %s", e)
             except Exception as e:  # nosec B110 - metadata pre-load is optional; schema loads fully below
                 logger.debug("Metadata pre-load skipped for plugin %s: %s", plugin_id, e)
 
         # Get plugin schema
         schema = {}
-        schema_path = Path(pages_v3.plugin_manager.plugins_dir) / plugin_id / "config_schema.json"
+        schema_path = _plugin_dir / "config_schema.json"
         if schema_path.exists():
             try:
                 with open(schema_path, 'r', encoding='utf-8') as f:
                     schema = json.load(f)
             except Exception as e:
-                print(f"Warning: Could not load schema for {plugin_id}: {e}")
+                logger.warning("Could not load schema for plugin: %s", e)
 
         # Get web UI actions from plugin manifest
         web_ui_actions = []
-        manifest_path = Path(pages_v3.plugin_manager.plugins_dir) / plugin_id / "manifest.json"
+        manifest_path = _plugin_dir / "manifest.json"
         if manifest_path.exists():
             try:
                 with open(manifest_path, 'r', encoding='utf-8') as f:
                     manifest = json.load(f)
                     web_ui_actions = manifest.get('web_ui_actions', [])
             except Exception as e:
-                print(f"Warning: Could not load manifest for {plugin_id}: {e}")
+                logger.warning("Could not load manifest for plugin: %s", e)
         
         # Mask secret fields before rendering template (fail closed — never leak secrets)
         schema_properties = schema.get('properties') if isinstance(schema, dict) else None
@@ -453,20 +580,24 @@ def _load_plugin_config_partial(plugin_id):
         )
         
     except Exception as e:
-        import traceback
+        logger.error("Error loading plugin config partial for %s", plugin_id, exc_info=True)
-        traceback.print_exc()
+        return '<div class="text-red-500 p-4">Error loading plugin config; see logs for details</div>', 500
-        return f'<div class="text-red-500 p-4">Error loading plugin config: {escape(str(e))}</div>', 500
 
 
 def _load_starlark_config_partial(app_id):
     """Load configuration partial for a Starlark app."""
+    # Sanitize with basename (CodeQL-recognized sanitizer) then regex-validate format
+    app_id = os.path.basename(app_id or '')
+    if not re.match(r'^[a-zA-Z0-9][a-zA-Z0-9_\-]*$', app_id):
+        return '<div class="text-red-500 p-4">Invalid app ID</div>', 400
+
     try:
         starlark_plugin = pages_v3.plugin_manager.get_plugin('starlark-apps') if pages_v3.plugin_manager else None
 
         if starlark_plugin and hasattr(starlark_plugin, 'apps'):
             app = starlark_plugin.apps.get(app_id)
             if not app:
-                return f'<div class="text-red-500 p-4">Starlark app not found: {app_id}</div>', 404
+                return '<div class="text-red-500 p-4">Starlark app not found</div>', 404
             return render_template(
                 'v3/partials/starlark_config.html',
                 app_id=app_id,
@@ -482,36 +613,45 @@ def _load_starlark_config_partial(app_id):
             )
 
         # Standalone: read from manifest file
-        manifest_file = Path(__file__).resolve().parent.parent.parent / 'starlark-apps' / 'manifest.json'
+        starlark_base = (Path(__file__).resolve().parent.parent.parent / 'starlark-apps').resolve()
+        manifest_file = starlark_base / 'manifest.json'
         if not manifest_file.exists():
-            return f'<div class="text-red-500 p-4">Starlark app not found: {app_id}</div>', 404
+            return '<div class="text-red-500 p-4">Starlark app not found</div>', 404
 
         with open(manifest_file, 'r') as f:
             manifest = json.load(f)
 
         app_data = manifest.get('apps', {}).get(app_id)
         if not app_data:
-            return f'<div class="text-red-500 p-4">Starlark app not found: {app_id}</div>', 404
+            return '<div class="text-red-500 p-4">Starlark app not found</div>', 404
 
-        # Load schema from schema.json if it exists
+        # Load schema from schema.json if it exists — validate path stays within starlark_base
         schema = None
-        schema_file = Path(__file__).resolve().parent.parent.parent / 'starlark-apps' / app_id / 'schema.json'
+        schema_file = (starlark_base / app_id / 'schema.json').resolve()
-        if schema_file.exists():
+        try:
+            schema_file.relative_to(starlark_base)
+        except ValueError:
+            schema_file = None
+        if schema_file and schema_file.exists():
             try:
                 with open(schema_file, 'r') as f:
                     schema = json.load(f)
             except (OSError, json.JSONDecodeError) as e:
-                logger.warning(f"[Pages V3] Could not load schema for {app_id}: {e}", exc_info=True)
+                logger.warning("Could not load starlark schema for app: %s", e)
 
-        # Load config from config.json if it exists
+        # Load config from config.json if it exists — validate path stays within starlark_base
         config = {}
-        config_file = Path(__file__).resolve().parent.parent.parent / 'starlark-apps' / app_id / 'config.json'
+        config_file = (starlark_base / app_id / 'config.json').resolve()
-        if config_file.exists():
+        try:
+            config_file.relative_to(starlark_base)
+        except ValueError:
+            config_file = None
+        if config_file and config_file.exists():
             try:
                 with open(config_file, 'r') as f:
                     config = json.load(f)
             except (OSError, json.JSONDecodeError) as e:
-                logger.warning(f"[Pages V3] Could not load config for {app_id}: {e}", exc_info=True)
+                logger.warning("Could not load starlark config for app: %s", e)
 
         return render_template(
             'v3/partials/starlark_config.html',
@@ -528,5 +668,5 @@ def _load_starlark_config_partial(app_id):
         )
 
     except Exception as e:
-        logger.exception(f"[Pages V3] Error loading starlark config for {app_id}")
+        logger.error("[Pages V3] Error loading starlark config for app", exc_info=True)
-        return f'<div class="text-red-500 p-4">Error loading starlark config: {str(e)}</div>', 500
+        return '<div class="text-red-500 p-4">Error loading starlark config; see logs for details</div>', 500

web_interface/static/v3/app.js

@@ -1,4 +1,4 @@
-/* global showNotification, updateSystemStats, htmx */
+/* global showNotification, updateSystemStats, updateDisplayPreview, htmx */
 // LED Matrix v3 JavaScript
 // Additional helpers for HTMX and Alpine.js integration
 
@@ -51,7 +51,8 @@ document.body.addEventListener('htmx:afterRequest', function(event) {
     }
 });
 
-// SSE reconnection helper
+// SSE reconnection helper — closes and reopens both SSE streams,
+// reattaching the open/error handlers defined in base.html.
 window.reconnectSSE = function() {
     if (window.statsSource) {
         window.statsSource.close();
@@ -60,14 +61,18 @@ window.reconnectSSE = function() {
             const data = JSON.parse(event.data);
             if (typeof updateSystemStats === 'function') updateSystemStats(data);
         };
+        if (window._statsOpenHandler) window.statsSource.addEventListener('open', window._statsOpenHandler);
+        if (window._statsErrorHandler) window.statsSource.addEventListener('error', window._statsErrorHandler);
     }
 
     if (window.displaySource) {
         window.displaySource.close();
         window.displaySource = new EventSource('/api/v3/stream/display');
-        window.displaySource.onmessage = function() {
+        window.displaySource.onmessage = function(event) {
-            // Handle display updates
+            const data = JSON.parse(event.data);
+            if (typeof updateDisplayPreview === 'function') updateDisplayPreview(data);
         };
+        if (window._displayErrorHandler) window.displaySource.addEventListener('error', window._displayErrorHandler);
     }
 };
 

web_interface/static/v3/js/widgets/array-table.js

@@ -5,21 +5,14 @@
  * Handles adding, removing, and editing array items with object properties.
  * Reads column definitions from the schema's items.properties.
  *
- * Usage in config_schema.json:
+ * Supported x-widget hints on item properties:
- *   "my_array": {
+ *   date-picker  → <input type="date">
- *     "type": "array",
+ *   time-picker  → <input type="time">
- *     "x-widget": "array-table",
+ *   file-upload-single → compact path input + upload button
- *     "x-columns": ["name", "code", "priority", "enabled"],  // optional
+ *   (enum values always render as <select>)
- *     "items": {
+ *
- *       "type": "object",
+ * Non-displayed properties (objects like layout/style) are stored in a hidden
- *       "properties": {
+ * cell and editable via the ⚙ row editor modal.
- *         "name": { "type": "string" },
- *         "code": { "type": "string" },
- *         "priority": { "type": "integer", "default": 50 },
- *         "enabled": { "type": "boolean", "default": true }
- *       }
- *     }
- *   }
  *
  * @module ArrayTableWidget
  */
@@ -27,18 +20,16 @@
 (function() {
     'use strict';
 
-    // Ensure LEDMatrixWidgets registry exists
     if (typeof window.LEDMatrixWidgets === 'undefined') {
         console.error('[ArrayTableWidget] LEDMatrixWidgets registry not found. Load registry.js first.');
         return;
     }
 
-    /**
+    // ─── Widget registration ────────────────────────────────────────────────
-     * Register the array-table widget
+
-     */
     window.LEDMatrixWidgets.register('array-table', {
         name: 'Array Table Widget',
-        version: '1.0.0',
+        version: '2.0.0',
 
         render: function(container, config, value, options) {
             console.log('[ArrayTableWidget] Render called (server-side rendered)');
@@ -53,24 +44,39 @@
 
             rows.forEach((row) => {
                 const item = {};
-                row.querySelectorAll('input').forEach(input => {
+
-                    const name = input.getAttribute('name');
+                // Collect all named form controls (input + select), skip type=hidden except
-                    if (!name || name.endsWith('.enabled') || input.type === 'hidden') return;
+                // for boolean hidden sentinels (those end in the field name only, not .enabled).
-                    const match = name.match(/\.\d+\.([^.]+)$/);
+                row.querySelectorAll('input, select').forEach(el => {
-                    if (match) {
+                    const name = el.getAttribute('name');
-                        const propName = match[1];
+                    if (!name) return;
-                        if (input.type === 'checkbox') {
+                    // Skip hidden inputs that are boolean sentinels (they duplicate checkboxes)
-                            item[propName] = input.checked;
+                    if (el.type === 'hidden' && !el.dataset.nestedProp) return;
-                        } else if (input.type === 'number') {
+
-                            item[propName] = input.value ? parseFloat(input.value) : null;
+                    // Nested advanced props stored in hidden cell
-                        } else {
+                    if (el.dataset.nestedProp) {
-                            item[propName] = input.value;
+                        const propPath = el.dataset.nestedProp;
+                        setNestedValue(item, propPath, coerceValue(el.value, el.dataset.propType || 'string'));
+                        return;
                     }
+
+                    // Standard display-column props: name matches fullKey.index.propName[.subKey...]
+                    const match = name.match(/\.\d+\.(.+)$/);
+                    if (!match) return;
+                    const propPath = match[1];
+
+                    if (el.tagName === 'SELECT') {
+                        setNestedValue(item, propPath, el.value);
+                    } else if (el.type === 'checkbox') {
+                        setNestedValue(item, propPath, el.checked);
+                    } else if (el.type === 'number') {
+                        setNestedValue(item, propPath, el.value !== '' ? parseFloat(el.value) : null);
+                    } else {
+                        setNestedValue(item, propPath, el.value);
                     }
                 });
-                if (Object.keys(item).length > 0) {
+
-                    items.push(item);
+                if (Object.keys(item).length > 0) items.push(item);
-                }
             });
 
             return items;
@@ -81,236 +87,733 @@
                 console.error('[ArrayTableWidget] setValue expects an array');
                 return;
             }
-
             if (!options || !options.fullKey || !options.pluginId) {
                 throw new Error('ArrayTableWidget.setValue requires options.fullKey and options.pluginId');
             }
 
             const tbody = document.getElementById(`${fieldId}_tbody`);
-            if (!tbody) {
+            if (!tbody) return;
-                console.warn(`[ArrayTableWidget] tbody not found for fieldId: ${fieldId}`);
-                return;
-            }
 
             tbody.innerHTML = '';
-
             items.forEach((item, index) => {
                 const row = createArrayTableRow(
-                    fieldId,
+                    fieldId, options.fullKey, index, options.pluginId,
-                    options.fullKey,
+                    item, options.itemProperties || {}, options.displayColumns || [],
-                    index,
+                    options.fullItemProperties || options.itemProperties || {}
-                    options.pluginId,
-                    item,
-                    options.itemProperties || {},
-                    options.displayColumns || []
                 );
                 tbody.appendChild(row);
             });
-
-            // Refresh Add button state after repopulating rows
             updateAddButtonState(fieldId);
         },
 
         handlers: {}
     });
 
+    // ─── Helpers ────────────────────────────────────────────────────────────
+
+    function safeSetHTML(target, html) {
+        target.textContent = '';
+        // createContextualFragment parses html relative to the document context
+        // without executing scripts — a widely recognised safe insertion method.
+        const frag = document.createRange().createContextualFragment(html);
+        target.appendChild(frag);
+    }
+
+    // Keys that must never be assigned to prevent prototype pollution.
+    const _FORBIDDEN_KEYS = new Set(['__proto__', 'prototype', 'constructor']);
+
+    function setNestedValue(obj, path, value) {
+        const parts = path.split('.');
+        let cur = obj;
+        for (let i = 0; i < parts.length - 1; i++) {
+            const key = parts[i];
+            if (_FORBIDDEN_KEYS.has(key)) return;
+            // Use hasOwnProperty to avoid reading inherited prototype properties,
+            // and defineProperty to write without triggering prototype setters.
+            if (!Object.hasOwn(cur, key) ||
+                typeof Object.getOwnPropertyDescriptor(cur, key).value !== 'object') {
+                Object.defineProperty(cur, key, {
+                    value: Object.create(null), writable: true,
+                    enumerable: true, configurable: true
+                });
+            }
+            cur = Object.getOwnPropertyDescriptor(cur, key).value;
+        }
+        const lastKey = parts[parts.length - 1];
+        if (!_FORBIDDEN_KEYS.has(lastKey)) {
+            Object.defineProperty(cur, lastKey, {
+                value: value, writable: true, enumerable: true, configurable: true
+            });
+        }
+    }
+
+    function coerceValue(strVal, typeHint) {
+        if (strVal === '' || strVal === null || strVal === undefined) return null;
+        if (typeHint === 'integer') return parseInt(strVal, 10);
+        if (typeHint === 'number') return parseFloat(strVal);
+        if (typeHint === 'boolean') return strVal === 'true' || strVal === '1';
+        // nullable integer/number: "integer|null"
+        if (typeHint && typeHint.includes('integer')) return strVal !== '' ? parseInt(strVal, 10) : null;
+        if (typeHint && typeHint.includes('number'))  return strVal !== '' ? parseFloat(strVal) : null;
+        return strVal;
+    }
+
+    // ─── Cell rendering ─────────────────────────────────────────────────────
+
     /**
-     * Create a table row element for array item
+     * Create one <td> for a display column.
      */
-    function createArrayTableRow(fieldId, fullKey, index, pluginId, item, itemProperties, displayColumns) {
+    function createCell(fullKey, index, colName, colDef, colValue, pluginId) {
+        const colType   = Array.isArray(colDef.type) ? colDef.type.find(t => t !== 'null') || 'string' : (colDef.type || 'string');
+        const xWidget   = colDef['x-widget'] || colDef['x_widget'];
+        const enumVals  = colDef.enum;
+        const inputName = `${fullKey}.${index}.${colName}`;
+
+        const cell = document.createElement('td');
+        cell.className = 'px-3 py-3 whitespace-nowrap';
+        cell.style.verticalAlign = 'middle';
+
+        if (colType === 'boolean') {
+            // Boolean: hidden sentinel + visible checkbox
+            const hidden = document.createElement('input');
+            hidden.type  = 'hidden';
+            hidden.name  = inputName;
+            hidden.value = 'false';
+            cell.appendChild(hidden);
+
+            const cb = document.createElement('input');
+            cb.type      = 'checkbox';
+            cb.name      = inputName;
+            cb.checked   = Boolean(colValue);
+            cb.value     = 'true';
+            cb.className = 'h-4 w-4 text-blue-600';
+            cell.appendChild(cb);
+
+        } else if (colType === 'integer' || colType === 'number') {
+            const inp = document.createElement('input');
+            inp.type      = 'number';
+            inp.name      = inputName;
+            inp.value     = colValue !== null && colValue !== undefined ? colValue : '';
+            if (colDef.minimum !== undefined) inp.min  = colDef.minimum;
+            if (colDef.maximum !== undefined) inp.max  = colDef.maximum;
+            inp.step      = colType === 'integer' ? '1' : 'any';
+            inp.className = 'block w-20 px-2 py-1 border border-gray-300 rounded text-sm text-center';
+            if (colDef.description) inp.title = colDef.description;
+            cell.appendChild(inp);
+
+        } else if (Array.isArray(enumVals) && enumVals.length > 0) {
+            // Enum: render <select>
+            cell.style.minWidth = '90px';
+            const sel = document.createElement('select');
+            sel.name      = inputName;
+            sel.className = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm bg-white';
+            enumVals.forEach(opt => {
+                if (opt === null) return;
+                const o = document.createElement('option');
+                o.value    = opt;
+                o.textContent = opt;
+                if (String(colValue) === String(opt)) o.selected = true;
+                sel.appendChild(o);
+            });
+            // If current value didn't match any option, set to first
+            if (!sel.value && enumVals.length > 0) sel.value = enumVals[0];
+            cell.appendChild(sel);
+
+        } else if (xWidget === 'date-picker') {
+            cell.style.minWidth = '140px';
+            const inp = document.createElement('input');
+            inp.type      = 'date';
+            inp.name      = inputName;
+            inp.value     = colValue || '';
+            inp.className = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
+            inp.style.minWidth = '128px';
+            if (colDef.description) inp.title = colDef.description;
+            cell.appendChild(inp);
+
+        } else if (xWidget === 'time-picker') {
+            cell.style.minWidth = '115px';
+            const inp = document.createElement('input');
+            inp.type      = 'time';
+            inp.name      = inputName;
+            inp.value     = colValue || '00:00';
+            inp.className = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
+            inp.style.minWidth = '100px';
+            cell.appendChild(inp);
+
+        } else if (xWidget === 'file-upload-single') {
+            // Compact: text input (stores path) + upload button
+            cell.style.minWidth = '200px';
+            const wrap = document.createElement('div');
+            wrap.className = 'flex items-center gap-1';
+
+            const pathInput = document.createElement('input');
+            pathInput.type        = 'text';
+            pathInput.name        = inputName;
+            pathInput.id          = `${fullKey}_${index}_${colName}`.replace(/\./g,'_');
+            pathInput.value       = colValue || '';
+            pathInput.className   = 'block px-1 py-1 border border-gray-300 rounded text-xs flex-1';
+            pathInput.style.minWidth = '100px';
+            pathInput.placeholder = 'path…';
+
+            const preview = document.createElement('img');
+            preview.className    = 'w-6 h-6 object-cover rounded flex-shrink-0';
+            preview.style.display = colValue ? 'inline' : 'none';
+            if (colValue) { preview.src = '/' + colValue; preview.onerror = () => { preview.style.display = 'none'; }; }
+
+            const labelEl = document.createElement('label');
+            labelEl.className = 'cursor-pointer flex-shrink-0 inline-flex items-center px-1 py-1 bg-blue-50 border border-blue-200 rounded text-xs text-blue-600 hover:bg-blue-100';
+            labelEl.title = 'Upload image';
+            labelEl.innerHTML = '<i class="fas fa-upload"></i>';
+
+            const fileInput = document.createElement('input');
+            fileInput.type   = 'file';
+            fileInput.accept = 'image/png,image/jpeg,image/bmp,image/gif';
+            fileInput.style.display = 'none';
+            fileInput.dataset.pluginId    = pluginId;
+            fileInput.dataset.targetInput = pathInput.id;
+            fileInput.dataset.previewImg  = preview.id || '';
+            fileInput.onchange = function(e) {
+                window.handleArrayTableImageUpload(e, pathInput, preview, pluginId);
+            };
+            labelEl.appendChild(fileInput);
+
+            wrap.appendChild(preview);
+            wrap.appendChild(pathInput);
+            wrap.appendChild(labelEl);
+            cell.appendChild(wrap);
+
+        } else {
+            // Default: text input
+            const inp = document.createElement('input');
+            inp.type      = 'text';
+            inp.name      = inputName;
+            inp.value     = colValue !== null && colValue !== undefined ? colValue : '';
+            inp.className = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
+            if (colDef.description) inp.placeholder = colDef.description;
+            if (colDef.pattern)     inp.pattern = colDef.pattern;
+            if (colDef.minLength)   inp.minLength = colDef.minLength;
+            if (colDef.maxLength)   inp.maxLength = colDef.maxLength;
+            cell.appendChild(inp);
+        }
+
+        return cell;
+    }
+
+    /**
+     * Create a hidden <td> holding flat hidden inputs for non-displayed properties
+     * (including nested objects like layout/style).
+     */
+    function createAdvancedCell(fullKey, index, nonDisplayedProps, item) {
+        const cell = document.createElement('td');
+        cell.style.display = 'none';
+        cell.className = 'array-table-advanced-data';
+        cell.dataset.propSchema = JSON.stringify(nonDisplayedProps);
+
+        Object.entries(nonDisplayedProps).forEach(([propName, propSchema]) => {
+            const propType = Array.isArray(propSchema.type)
+                ? propSchema.type.find(t => t !== 'null') || 'string'
+                : (propSchema.type || 'string');
+
+            if (propType === 'object' && propSchema.properties) {
+                const nestedVal = (item && item[propName]) || {};
+                Object.entries(propSchema.properties).forEach(([subName, subSchema]) => {
+                    const subType = Array.isArray(subSchema.type)
+                        ? subSchema.type.find(t => t !== 'null') || 'string'
+                        : (subSchema.type || 'string');
+                    const defaultVal = subSchema.default !== undefined ? subSchema.default : null;
+                    const currentVal = nestedVal[subName] !== undefined ? nestedVal[subName] : defaultVal;
+
+                    const hidden = document.createElement('input');
+                    hidden.type  = 'hidden';
+                    hidden.name  = `${fullKey}.${index}.${propName}.${subName}`;
+                    hidden.value = currentVal !== null && currentVal !== undefined ? String(currentVal) : '';
+                    hidden.dataset.nestedProp = `${propName}.${subName}`;
+                    hidden.dataset.propType   = subType;
+                    hidden.dataset.propSchema = JSON.stringify(subSchema);
+                    cell.appendChild(hidden);
+                });
+            } else {
+                const defaultVal = propSchema.default !== undefined ? propSchema.default : null;
+                const currentVal = item && item[propName] !== undefined ? item[propName] : defaultVal;
+
+                const hidden = document.createElement('input');
+                hidden.type  = 'hidden';
+                hidden.name  = `${fullKey}.${index}.${propName}`;
+                hidden.value = currentVal !== null && currentVal !== undefined ? String(currentVal) : '';
+                hidden.dataset.nestedProp = propName;
+                hidden.dataset.propType   = propType;
+                hidden.dataset.propSchema = JSON.stringify(propSchema);
+                cell.appendChild(hidden);
+            }
+        });
+
+        return cell;
+    }
+
+    // ─── Row creation ────────────────────────────────────────────────────────
+
+    function createArrayTableRow(fieldId, fullKey, index, pluginId, item, itemProperties, displayColumns, fullItemProperties) {
         item               = item || {};
+        fullItemProperties = fullItemProperties || itemProperties;
+
         const row = document.createElement('tr');
         row.className = 'array-table-row';
         row.setAttribute('data-index', index);
 
+        // Visible column cells
         displayColumns.forEach(colName => {
             const colDef   = itemProperties[colName] || {};
-            const colType = colDef.type || 'string';
+            const colType  = Array.isArray(colDef.type) ? colDef.type.find(t => t !== 'null') || 'string' : (colDef.type || 'string');
-            const colDefault = colDef.default !== undefined ? colDef.default : (colType === 'boolean' ? false : '');
+            const colDefault = colDef.default !== undefined ? colDef.default
+                : (colType === 'boolean' ? false : colType === 'time-picker' ? '00:00' : '');
             const colValue = item[colName] !== undefined ? item[colName] : colDefault;
-
+            row.appendChild(createCell(fullKey, index, colName, colDef, colValue, pluginId));
-            const cell = document.createElement('td');
-            cell.className = 'px-4 py-3 whitespace-nowrap';
-
-            if (colType === 'boolean') {
-                const hiddenInput = document.createElement('input');
-                hiddenInput.type = 'hidden';
-                hiddenInput.name = `${fullKey}.${index}.${colName}`;
-                hiddenInput.value = 'false';
-                cell.appendChild(hiddenInput);
-
-                const checkbox = document.createElement('input');
-                checkbox.type = 'checkbox';
-                checkbox.name = `${fullKey}.${index}.${colName}`;
-                checkbox.checked = Boolean(colValue);
-                checkbox.value = 'true';
-                checkbox.className = 'h-4 w-4 text-blue-600';
-                cell.appendChild(checkbox);
-            } else if (colType === 'integer' || colType === 'number') {
-                const input = document.createElement('input');
-                input.type = 'number';
-                input.name = `${fullKey}.${index}.${colName}`;
-                input.value = colValue !== null && colValue !== undefined ? colValue : '';
-                if (colDef.minimum !== undefined) input.min = colDef.minimum;
-                if (colDef.maximum !== undefined) input.max = colDef.maximum;
-                input.step = colType === 'integer' ? '1' : 'any';
-                input.className = 'block w-20 px-2 py-1 border border-gray-300 rounded text-sm text-center';
-                if (colDef.description) input.title = colDef.description;
-                cell.appendChild(input);
-            } else {
-                const input = document.createElement('input');
-                input.type = 'text';
-                input.name = `${fullKey}.${index}.${colName}`;
-                input.value = colValue !== null && colValue !== undefined ? colValue : '';
-                input.className = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
-                if (colDef.description) input.placeholder = colDef.description;
-                if (colDef.pattern) input.pattern = colDef.pattern;
-                if (colDef.minLength) input.minLength = colDef.minLength;
-                if (colDef.maxLength) input.maxLength = colDef.maxLength;
-                cell.appendChild(input);
-            }
-
-            row.appendChild(cell);
         });
 
+        // Determine non-displayed properties (these go into the advanced cell + edit modal)
+        const nonDisplayed = {};
+        Object.keys(fullItemProperties).forEach(k => {
+            if (!displayColumns.includes(k) && k !== 'id') {
+                nonDisplayed[k] = fullItemProperties[k];
+            }
+        });
+        const hasAdvanced = Object.keys(nonDisplayed).length > 0;
+
         // Actions cell
         const actionsCell = document.createElement('td');
-        actionsCell.className = 'px-4 py-3 whitespace-nowrap text-center';
+        actionsCell.className   = 'px-3 py-3 whitespace-nowrap text-center';
-        const removeButton = document.createElement('button');
+        actionsCell.style.minWidth = '90px';
-        removeButton.type = 'button';
+        actionsCell.style.verticalAlign = 'middle';
-        removeButton.className = 'text-red-600 hover:text-red-800 px-2 py-1';
+
-        removeButton.onclick = function() { window.removeArrayTableRow(this); };
+        const removeBtn = document.createElement('button');
-        const removeIcon = document.createElement('i');
+        removeBtn.type      = 'button';
-        removeIcon.className = 'fas fa-trash';
+        removeBtn.className = 'text-red-600 hover:text-red-800 px-2 py-1';
-        removeButton.appendChild(removeIcon);
+        removeBtn.onclick   = function() { window.removeArrayTableRow(this); };
-        actionsCell.appendChild(removeButton);
+        removeBtn.innerHTML = '<i class="fas fa-trash"></i>';
+        actionsCell.appendChild(removeBtn);
+
+        if (hasAdvanced) {
+            const editBtn = document.createElement('button');
+            editBtn.type      = 'button';
+            editBtn.className = 'text-blue-500 hover:text-blue-700 px-2 py-1 ml-1';
+            editBtn.title     = 'Edit advanced properties (layout, style…)';
+            editBtn.onclick   = function() { window.openArrayTableRowEditor(this); };
+            editBtn.innerHTML = '<i class="fas fa-sliders-h"></i>';
+            actionsCell.appendChild(editBtn);
+        }
+
         row.appendChild(actionsCell);
 
+        // Hidden advanced data cell
+        if (hasAdvanced) {
+            row.appendChild(createAdvancedCell(fullKey, index, nonDisplayed, item));
+        }
+
         return row;
     }
 
+    // ─── Row editor modal ────────────────────────────────────────────────────
+
+    window.openArrayTableRowEditor = function(button) {
+        const row         = button.closest('tr');
+        const advancedCell = row.querySelector('.array-table-advanced-data');
+        if (!advancedCell) return;
+
+        const schema = JSON.parse(advancedCell.dataset.propSchema || '{}');
+        // Close any existing modal
+        const existing = document.getElementById('array-row-editor-modal');
+        if (existing) existing.remove();
+
+        const overlay = document.createElement('div');
+        overlay.id        = 'array-row-editor-modal';
+        // Use inline styles for position/dimensions — inset-0 may be purged from the CSS bundle
+        // since it only appears in JS-generated markup, not in scanned templates.
+        overlay.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;z-index:9999;display:flex;align-items:center;justify-content:center;padding:1rem;background:rgba(0,0,0,0.5);';
+        overlay.onclick   = function(e) { if (e.target === overlay) window.closeArrayTableRowEditor(); };
+
+        const dialog = document.createElement('div');
+        dialog.className = 'bg-white rounded-lg shadow-xl max-w-lg w-full max-h-screen overflow-y-auto';
+
+        // Header
+        safeSetHTML(dialog, `
+            <div class="flex items-center justify-between px-5 py-4 border-b border-gray-200">
+                <h3 class="text-base font-semibold text-gray-900">Advanced Properties</h3>
+                <button type="button" onclick="window.closeArrayTableRowEditor()"
+                        class="text-gray-400 hover:text-gray-600"><i class="fas fa-times"></i></button>
+            </div>`);
+
+        const body = document.createElement('div');
+        body.className = 'px-5 py-4 space-y-4';
+
+        // Render a field for each advanced property
+        Object.entries(schema).forEach(([propName, propSchema]) => {
+            const propType = Array.isArray(propSchema.type)
+                ? propSchema.type.find(t => t !== 'null') || 'string'
+                : (propSchema.type || 'string');
+            const label = propSchema.title || propName.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
+            const desc  = propSchema.description || '';
+
+            if (propType === 'object' && propSchema.properties) {
+                // Section for nested object
+                const section = document.createElement('div');
+                section.className = 'border border-gray-200 rounded-lg p-3';
+                const _secH4 = document.createElement('h4');
+                _secH4.className = 'text-sm font-medium text-gray-700 mb-3';
+                _secH4.textContent = label;
+                section.appendChild(_secH4);
+
+                const grid = document.createElement('div');
+                grid.className = 'grid grid-cols-2 gap-3';
+
+                Object.entries(propSchema.properties).forEach(([subName, subSchema]) => {
+                    const subType    = Array.isArray(subSchema.type) ? subSchema.type.find(t => t !== 'null') || 'string' : (subSchema.type || 'string');
+                    const subLabel   = subSchema.title || subName.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
+                    const subDesc    = subSchema.description || '';
+                    const nestedPath = `${propName}.${subName}`;
+
+                    // Read current value from hidden input
+                    const hiddenInput = advancedCell.querySelector(`[data-nested-prop="${nestedPath}"]`);
+                    const currentVal  = hiddenInput ? hiddenInput.value : (subSchema.default !== undefined ? subSchema.default : '');
+
+                    const fieldDiv = document.createElement('div');
+                    const _subLbl = document.createElement('label');
+                    _subLbl.className = 'block text-xs font-medium text-gray-600 mb-1';
+                    _subLbl.title = subDesc;
+                    _subLbl.textContent = subLabel;
+                    fieldDiv.appendChild(_subLbl);
+                    fieldDiv.appendChild(buildModalInput(nestedPath, subSchema, subType, currentVal));
+                    grid.appendChild(fieldDiv);
+                });
+
+                section.appendChild(grid);
+                body.appendChild(section);
+            } else {
+                // Flat property
+                const hiddenInput = advancedCell.querySelector(`[data-nested-prop="${propName}"]`);
+                const currentVal  = hiddenInput ? hiddenInput.value : (propSchema.default !== undefined ? propSchema.default : '');
+
+                const fieldDiv = document.createElement('div');
+                const _flatLbl = document.createElement('label');
+                _flatLbl.className = 'block text-sm font-medium text-gray-700 mb-1';
+                _flatLbl.title = desc;
+                _flatLbl.textContent = label;
+                fieldDiv.appendChild(_flatLbl);
+                fieldDiv.appendChild(buildModalInput(propName, propSchema, propType, currentVal));
+                body.appendChild(fieldDiv);
+            }
+        });
+
+        dialog.appendChild(body);
+
+        // Footer
+        const footer = document.createElement('div');
+        footer.className = 'flex justify-end gap-3 px-5 py-4 border-t border-gray-200 bg-gray-50 rounded-b-lg';
+        safeSetHTML(footer, `
+            <button type="button" onclick="window.closeArrayTableRowEditor()"
+                    class="px-4 py-2 text-sm text-gray-700 border border-gray-300 rounded-md hover:bg-gray-100">Cancel</button>
+            <button type="button" id="array-row-editor-save"
+                    class="px-4 py-2 text-sm bg-blue-600 hover:bg-blue-700 text-white rounded-md">Save</button>`);
+
+        // Save handler
+        footer.querySelector('#array-row-editor-save').onclick = function() {
+            body.querySelectorAll('[data-modal-prop]').forEach(el => {
+                const propPath   = el.dataset.modalProp;
+                const targetInput = advancedCell.querySelector(`[data-nested-prop="${propPath}"]`);
+                if (!targetInput) return;
+                if (el.type === 'checkbox') {
+                    targetInput.value = el.checked ? 'true' : 'false';
+                } else {
+                    targetInput.value = el.value;
+                }
+            });
+            window.closeArrayTableRowEditor();
+        };
+
+        dialog.appendChild(footer);
+        overlay.appendChild(dialog);
+        document.body.appendChild(overlay);
+    };
+
+    window.closeArrayTableRowEditor = function() {
+        const modal = document.getElementById('array-row-editor-modal');
+        if (modal) modal.remove();
+    };
+
     /**
-     * Update the Add button's disabled state based on current row count
+     * Build a single form control for the row editor modal.
-     * @param {string} fieldId - Field ID to find the tbody and button
      */
+    function buildModalInput(propPath, schema, propType, currentVal) {
+        const xWidget  = schema['x-widget'] || schema['x_widget'];
+        const enumVals = schema.enum;
+        const wrap     = document.createElement('div');
+
+        if (propType === 'boolean') {
+            const cb = document.createElement('input');
+            cb.type              = 'checkbox';
+            cb.className         = 'h-4 w-4 text-blue-600';
+            cb.checked           = currentVal === 'true' || currentVal === true || currentVal === 1;
+            cb.dataset.modalProp = propPath;
+            wrap.appendChild(cb);
+            return wrap;
+        }
+
+        // Array[3] with x-widget color-picker → R/G/B row
+        if ((propType === 'array' || xWidget === 'color-picker') &&
+            (schema.minItems === 3 || schema.maxItems === 3 || xWidget === 'color-picker')) {
+            const parts  = currentVal ? String(currentVal).split(',').map(s => s.trim()) : ['', '', ''];
+            const rVal   = parts[0] || '';
+            const gVal   = parts[1] || '';
+            const bVal   = parts[2] || '';
+
+            // Hex color picker for visual selection
+            const hexVal = (rVal && gVal && bVal)
+                ? '#' + [rVal, gVal, bVal].map(n => parseInt(n, 10).toString(16).padStart(2, '0')).join('')
+                : '#ffffff';
+
+            const colorRow = document.createElement('div');
+            colorRow.className = 'flex items-center gap-2 flex-wrap';
+
+            const colorPick = document.createElement('input');
+            colorPick.type  = 'color';
+            colorPick.value = hexVal;
+            colorPick.className = 'h-8 w-10 cursor-pointer rounded border';
+            colorRow.appendChild(colorPick);
+
+            ['R', 'G', 'B'].forEach((ch, i) => {
+                const lbl = document.createElement('label');
+                lbl.className = 'text-xs text-gray-500';
+                lbl.textContent = ch;
+                const numInp = document.createElement('input');
+                numInp.type      = 'number';
+                numInp.min       = '0';
+                numInp.max       = '255';
+                numInp.step      = '1';
+                numInp.value     = [rVal, gVal, bVal][i];
+                numInp.className = 'w-14 px-1 py-1 border border-gray-300 rounded text-sm text-center';
+                numInp.dataset.colorChannel = i;
+                colorRow.appendChild(lbl);
+                colorRow.appendChild(numInp);
+            });
+
+            // Hidden aggregate input that the save handler reads
+            const agg = document.createElement('input');
+            agg.type              = 'hidden';
+            agg.value             = `${rVal},${gVal},${bVal}`;
+            agg.dataset.modalProp = propPath;
+            colorRow.appendChild(agg);
+
+            // Sync: color picker → R/G/B numbers + agg
+            colorPick.oninput = function() {
+                const hex = colorPick.value;
+                const r   = parseInt(hex.slice(1,3), 16);
+                const g   = parseInt(hex.slice(3,5), 16);
+                const b   = parseInt(hex.slice(5,7), 16);
+                const nums = colorRow.querySelectorAll('input[data-color-channel]');
+                if (nums[0]) nums[0].value = r;
+                if (nums[1]) nums[1].value = g;
+                if (nums[2]) nums[2].value = b;
+                agg.value = `${r},${g},${b}`;
+            };
+
+            // Sync: R/G/B numbers → color picker + agg
+            colorRow.querySelectorAll('input[data-color-channel]').forEach(inp => {
+                inp.oninput = function() {
+                    const nums = colorRow.querySelectorAll('input[data-color-channel]');
+                    const r = parseInt(nums[0] ? nums[0].value : 0, 10) || 0;
+                    const g = parseInt(nums[1] ? nums[1].value : 0, 10) || 0;
+                    const b = parseInt(nums[2] ? nums[2].value : 0, 10) || 0;
+                    colorPick.value = '#' + [r,g,b].map(n => n.toString(16).padStart(2,'0')).join('');
+                    agg.value = `${r},${g},${b}`;
+                };
+            });
+
+            wrap.appendChild(colorRow);
+            return wrap;
+        }
+
+        if (Array.isArray(enumVals) && enumVals.length > 0) {
+            const sel = document.createElement('select');
+            sel.className        = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm bg-white';
+            sel.dataset.modalProp = propPath;
+            enumVals.forEach(opt => {
+                if (opt === null) return;
+                const o = document.createElement('option');
+                o.value = opt; o.textContent = opt;
+                if (String(currentVal) === String(opt)) o.selected = true;
+                sel.appendChild(o);
+            });
+            wrap.appendChild(sel);
+            return wrap;
+        }
+
+        if (xWidget === 'date-picker') {
+            const inp = document.createElement('input');
+            inp.type              = 'date';
+            inp.value             = currentVal || '';
+            inp.className         = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
+            inp.dataset.modalProp = propPath;
+            wrap.appendChild(inp);
+            return wrap;
+        }
+
+        if (xWidget === 'time-picker') {
+            const inp = document.createElement('input');
+            inp.type              = 'time';
+            inp.value             = currentVal || '00:00';
+            inp.className         = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
+            inp.dataset.modalProp = propPath;
+            wrap.appendChild(inp);
+            return wrap;
+        }
+
+        if (propType === 'integer' || propType === 'number') {
+            const inp = document.createElement('input');
+            inp.type              = 'number';
+            inp.value             = currentVal !== '' && currentVal !== null ? currentVal : '';
+            inp.className         = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
+            inp.dataset.modalProp = propPath;
+            if (schema.minimum !== undefined) inp.min  = schema.minimum;
+            if (schema.maximum !== undefined) inp.max  = schema.maximum;
+            inp.step = propType === 'integer' ? '1' : 'any';
+            if (schema.description) inp.placeholder = schema.description;
+            wrap.appendChild(inp);
+            return wrap;
+        }
+
+        // Default: text
+        const inp = document.createElement('input');
+        inp.type              = 'text';
+        inp.value             = currentVal || '';
+        inp.className         = 'block w-full px-2 py-1 border border-gray-300 rounded text-sm';
+        inp.dataset.modalProp = propPath;
+        if (schema.description) inp.placeholder = schema.description;
+        wrap.appendChild(inp);
+        return wrap;
+    }
+
+
+    // ─── In-cell image upload ────────────────────────────────────────────────
+
+    /**
+     * Called from file-upload-single cells inside array-table rows.
+     * Uploads the selected file and updates the path text input.
+     */
+    window.handleArrayTableImageUpload = async function(event, pathInput, previewImg, pluginId) {
+        const file = event.target.files && event.target.files[0];
+        if (!file) return;
+
+        const notifyFn = window.showNotification || console.log;
+        const allowed  = ['image/png', 'image/jpeg', 'image/bmp', 'image/gif'];
+        if (!allowed.includes(file.type)) {
+            notifyFn(`File type "${file.type}" not allowed`, 'error');
+            return;
+        }
+        if (file.size > 5 * 1024 * 1024) {
+            notifyFn('File exceeds 5MB limit', 'error');
+            return;
+        }
+
+        const formData = new FormData();
+        formData.append('plugin_id', pluginId);
+        formData.append('files', file);
+
+        try {
+            const resp = await fetch('/api/v3/plugins/assets/upload', { method: 'POST', body: formData });
+            if (!resp.ok) throw new Error(`Server error ${resp.status}`);
+            const data = await resp.json();
+            if (data.status === 'success' && data.uploaded_files && data.uploaded_files[0]) {
+                const path = data.uploaded_files[0].path;
+                pathInput.value = path;
+                if (previewImg) { previewImg.src = '/' + path; previewImg.style.display = 'inline'; }
+                notifyFn('Image uploaded', 'success');
+            } else {
+                throw new Error(data.message || 'Upload failed');
+            }
+        } catch (err) {
+            notifyFn('Upload error: ' + err.message, 'error');
+        } finally {
+            event.target.value = '';
+        }
+    };
+
+    // ─── Button helpers ──────────────────────────────────────────────────────
+
     function updateAddButtonState(fieldId) {
         const tbody     = document.getElementById(fieldId + '_tbody');
-        if (!tbody) return;
-
-        // Find the add button by looking for the button with matching data-field-id
         const addButton = document.querySelector(`button[data-field-id="${fieldId}"]`);
-        if (!addButton) return;
+        if (!tbody || !addButton) return;
-
         const maxItems    = parseInt(addButton.getAttribute('data-max-items'), 10);
-        const currentRows = tbody.querySelectorAll('.array-table-row');
+        const currentRows = tbody.querySelectorAll('.array-table-row').length;
-        const isAtMax = currentRows.length >= maxItems;
+        const isAtMax     = currentRows >= maxItems;
-
         addButton.disabled    = isAtMax;
         addButton.style.opacity = isAtMax ? '0.5' : '';
     }
 
-    // Expose for external use if needed
     window.updateArrayTableAddButtonState = updateAddButtonState;
 
-    /**
-     * Add a new row to the array table
-     * @param {HTMLElement} button - The button element with data attributes
-     */
     window.addArrayTableRow = function(button) {
         const fieldId        = button.getAttribute('data-field-id');
         const fullKey        = button.getAttribute('data-full-key');
         const maxItems       = parseInt(button.getAttribute('data-max-items'), 10);
         const pluginId       = button.getAttribute('data-plugin-id');
 
-        // Parse JSON with fallback on error
         let itemProperties     = {};
         let displayColumns     = [];
-        const rawItemProps = button.getAttribute('data-item-properties') || '{}';
+        let fullItemProperties = {};
-        const rawDisplayCols = button.getAttribute('data-display-columns') || '[]';
 
-        try {
+        try { itemProperties     = JSON.parse(button.getAttribute('data-item-properties')     || '{}'); } catch(_e) {}
-            itemProperties = JSON.parse(rawItemProps);
+        try { displayColumns     = JSON.parse(button.getAttribute('data-display-columns')      || '[]'); } catch(_e) {}
-        } catch (e) {
+        try { fullItemProperties = JSON.parse(button.getAttribute('data-full-item-properties') || '{}'); } catch(_e) { fullItemProperties = itemProperties; }
-            console.error('[ArrayTableWidget] Failed to parse data-item-properties:', rawItemProps, e);
-            itemProperties = {};
-        }
-
-        try {
-            displayColumns = JSON.parse(rawDisplayCols);
-        } catch (e) {
-            console.error('[ArrayTableWidget] Failed to parse data-display-columns:', rawDisplayCols, e);
-            displayColumns = [];
-        }
 
         const tbody = document.getElementById(fieldId + '_tbody');
         if (!tbody) return;
 
-        const currentRows = tbody.querySelectorAll('.array-table-row');
+        const currentRows = tbody.querySelectorAll('.array-table-row').length;
-        if (currentRows.length >= maxItems) {
+        if (currentRows >= maxItems) {
-            const notifyFn = window.showNotification || alert;
+            (window.showNotification || alert)(`Maximum ${maxItems} items allowed`, 'error');
-            notifyFn(`Maximum ${maxItems} items allowed`, 'error');
             return;
         }
 
-        const newIndex = currentRows.length;
+        const newIndex = currentRows;
-        const row = createArrayTableRow(fieldId, fullKey, newIndex, pluginId, {}, itemProperties, displayColumns);
+        const row = createArrayTableRow(fieldId, fullKey, newIndex, pluginId, {}, itemProperties, displayColumns, fullItemProperties);
         tbody.appendChild(row);
-
-        // Update button state after adding
         updateAddButtonState(fieldId);
     };
 
-    /**
-     * Remove a row from the array table
-     * @param {HTMLElement} button - The remove button element
-     */
     window.removeArrayTableRow = function(button) {
         const row = button.closest('tr');
         if (!row) return;
+        if (!confirm('Remove this item?')) return;
 
-        if (confirm('Remove this item?')) {
         const tbody  = row.parentElement;
         if (!tbody) return;
-
-            // Get fieldId from tbody id (format: {fieldId}_tbody)
         const fieldId = tbody.id.replace('_tbody', '');
-
         row.remove();
 
         // Re-index remaining rows
-            const rows = tbody.querySelectorAll('.array-table-row');
+        tbody.querySelectorAll('.array-table-row').forEach((r, index) => {
-            rows.forEach(function(r, index) {
             r.setAttribute('data-index', index);
-                r.querySelectorAll('input').forEach(function(input) {
+            r.querySelectorAll('input, select').forEach(el => {
-                    const name = input.getAttribute('name');
+                const name = el.getAttribute('name');
-                    if (name) {
+                if (name) el.setAttribute('name', name.replace(/\.\d+\./, '.' + index + '.'));
-                        input.setAttribute('name', name.replace(/\.\d+\./, '.' + index + '.'));
+                // Also update data-nested-prop-based inputs (they don't have regular names needing re-index)
-                    }
             });
         });
 
-            // Update button state after removing
         updateAddButtonState(fieldId);
-        }
     };
 
-    /**
-     * Initialize all array table add buttons on page load
-     */
     function initArrayTableButtons() {
-        const addButtons = document.querySelectorAll('button[data-field-id][data-max-items]');
+        document.querySelectorAll('button[data-field-id][data-max-items]').forEach(button => {
-        addButtons.forEach(function(button) {
+            updateAddButtonState(button.getAttribute('data-field-id'));
-            const fieldId = button.getAttribute('data-field-id');
-            updateAddButtonState(fieldId);
         });
     }
 
-    // Initialize on DOM ready
     if (document.readyState === 'loading') {
         document.addEventListener('DOMContentLoaded', initArrayTableButtons);
     } else {
         initArrayTableButtons();
     }
 
-    console.log('[ArrayTableWidget] Array table widget registered');
+    console.log('[ArrayTableWidget] Array table widget registered (v2.0.0)');
 })();

web_interface/static/v3/js/widgets/base-widget.js

@@ -51,8 +51,10 @@
         sanitizeValue(value) {
             // Base implementation - widgets should override for specific needs
             if (typeof value === 'string') {
-                // Basic XSS prevention
+                // Strip all HTML tags via the DOM parser to prevent XSS
-                return value.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '');
+                const div = document.createElement('div');
+                div.textContent = value;
+                return div.textContent;
             }
             return value;
         }

web_interface/static/v3/js/widgets/file-upload-single.js

@@ -0,0 +1,291 @@
+/**
+ * LEDMatrix File Upload Single Widget
+ *
+ * Single-image upload for string fields. Uploads to the plugin's asset folder
+ * and sets the string field value to the returned relative path.
+ * Designed for per-item image fields within array-table rows.
+ *
+ * The plugin_id is injected automatically from the template context
+ * via options.pluginId — no need to specify it in the schema.
+ *
+ * Schema example (any plugin):
+ * {
+ *   "image_path": {
+ *     "type": "string",
+ *     "x-widget": "file-upload-single",
+ *     "x-upload-config": {
+ *       "allowed_types": ["image/png", "image/jpeg", "image/bmp", "image/gif"],
+ *       "max_size_mb": 5
+ *     }
+ *   }
+ * }
+ *
+ * @module FileUploadSingleWidget
+ */
+
+(function() {
+    'use strict';
+
+    if (typeof window.LEDMatrixWidgets === 'undefined') {
+        console.error('[FileUploadSingleWidget] LEDMatrixWidgets registry not found. Load registry.js first.');
+        return;
+    }
+
+    const base = window.BaseWidget ? new window.BaseWidget('FileUploadSingle', '1.0.0') : null;
+
+    function escapeHtml(text) {
+        if (base) return base.escapeHtml(text);
+        const div = document.createElement('div');
+        div.textContent = String(text);
+        return div.innerHTML.replace(/"/g, '"').replace(/'/g, ''');
+    }
+
+    function sanitizeId(id) {
+        if (base) return base.sanitizeId(id);
+        return String(id).replace(/[^a-zA-Z0-9_-]/g, '_');
+    }
+
+    function triggerChange(fieldId, value) {
+        if (base) {
+            base.triggerChange(fieldId, value);
+        } else {
+            document.dispatchEvent(new CustomEvent('widget-change', {
+                detail: { fieldId, value },
+                bubbles: true,
+                cancelable: true
+            }));
+        }
+    }
+
+    function isImagePath(path) {
+        if (!path) return false;
+        return /\.(png|jpg|jpeg|bmp|gif)$/i.test(path);
+    }
+
+    function safeSetHTML(target, html) {
+        target.textContent = '';
+        // createContextualFragment parses html relative to the document context
+        // without executing scripts — a widely recognised safe insertion method.
+        const frag = document.createRange().createContextualFragment(html);
+        target.appendChild(frag);
+    }
+
+    window.LEDMatrixWidgets.register('file-upload-single', {
+        name: 'File Upload Single Widget',
+        version: '1.0.0',
+
+        render: function(container, config, value, options) {
+            const fieldId = sanitizeId(options.fieldId || container.id || 'file_upload_single');
+            const uploadConfig = config['x-upload-config'] || config['x_upload_config'] || {};
+            const allowedTypes = (uploadConfig.allowed_types || ['image/png', 'image/jpeg', 'image/bmp', 'image/gif']).join(',');
+            const maxSizeMb = uploadConfig.max_size_mb || 5;
+            const pluginId = options.pluginId || '';
+            const currentValue = value || '';
+            const hasImage = isImagePath(currentValue);
+
+            let html = `<div id="${fieldId}_widget" class="file-upload-single-widget" data-field-id="${fieldId}" data-plugin-id="${escapeHtml(pluginId)}">`;
+
+            // Hidden input carries the actual string value
+            html += `<input type="hidden" id="${fieldId}" name="${escapeHtml(options.name || fieldId)}" value="${escapeHtml(currentValue)}">`;
+
+            // Preview area (shown when a value is set)
+            html += `<div id="${fieldId}_preview" class="${hasImage ? '' : 'hidden'} flex items-center space-x-3 mb-2 p-2 bg-gray-50 rounded border border-gray-200">`;
+            html += `<img id="${fieldId}_thumb" src="/${escapeHtml(currentValue)}" alt="Preview"
+                          class="w-12 h-12 object-cover rounded"
+                          onerror="this.style.display='none';document.getElementById('${fieldId}_thumb_placeholder').style.display='flex'">`;
+            html += `<div id="${fieldId}_thumb_placeholder" style="display:none" class="w-12 h-12 bg-gray-200 rounded flex items-center justify-center">
+                         <i class="fas fa-image text-gray-400 text-lg"></i>
+                     </div>`;
+            html += `<div class="flex-1 min-w-0">
+                         <p id="${fieldId}_filename" class="text-xs text-gray-600 truncate">${escapeHtml(currentValue.split('/').pop() || '')}</p>
+                         <p id="${fieldId}_fullpath" class="text-xs text-gray-400">${escapeHtml(currentValue)}</p>
+                     </div>`;
+            html += `<button type="button"
+                             onclick="window.LEDMatrixWidgets.getHandlers('file-upload-single').onClear('${fieldId}')"
+                             class="flex-shrink-0 text-red-400 hover:text-red-600 p-1" title="Remove image">
+                         <i class="fas fa-times"></i>
+                     </button>`;
+            html += '</div>';
+
+            // Upload drop zone — keyboard accessible via tabindex + Enter/Space
+            html += `<div id="${fieldId}_drop_zone"
+                          class="border-2 border-dashed border-gray-300 rounded-lg p-3 text-center hover:border-blue-400 transition-colors cursor-pointer"
+                          role="button" tabindex="0"
+                          aria-label="${hasImage ? 'Replace image' : 'Upload image'}"
+                          ondrop="window.LEDMatrixWidgets.getHandlers('file-upload-single').onDrop(event, '${fieldId}')"
+                          ondragover="event.preventDefault()"
+                          onclick="document.getElementById('${fieldId}_file_input').click()"
+                          onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();document.getElementById('${fieldId}_file_input').click();}">
+                         <input type="file"
+                                id="${fieldId}_file_input"
+                                accept="${escapeHtml(allowedTypes)}"
+                                style="display:none"
+                                data-field-id="${fieldId}"
+                                data-plugin-id="${escapeHtml(pluginId)}"
+                                data-max-size-mb="${maxSizeMb}"
+                                data-allowed-types="${escapeHtml(allowedTypes)}"
+                                onchange="window.LEDMatrixWidgets.getHandlers('file-upload-single').onFileSelect(event, '${fieldId}')">
+                         <i class="fas fa-cloud-upload-alt text-xl text-gray-400 mb-1"></i>
+                         <p class="text-xs text-gray-500">${hasImage ? 'Click to replace image' : 'Click or drag to upload image'}</p>
+                         <p class="text-xs text-gray-400">Max ${maxSizeMb}MB</p>
+                     </div>`;
+
+            // Status area for upload feedback
+            html += `<div id="${fieldId}_status" class="mt-1 text-xs hidden"></div>`;
+
+            html += '</div>';
+            safeSetHTML(container, html);
+        },
+
+        getValue: function(fieldId) {
+            const safeId = sanitizeId(fieldId);
+            const input = document.getElementById(safeId);
+            return input ? input.value : '';
+        },
+
+        setValue: function(fieldId, value) {
+            const safeId = sanitizeId(fieldId);
+            const hidden = document.getElementById(safeId);
+            const preview = document.getElementById(`${safeId}_preview`);
+            const thumb = document.getElementById(`${safeId}_thumb`);
+            const thumbPlaceholder = document.getElementById(`${safeId}_thumb_placeholder`);
+            const filename = document.getElementById(`${safeId}_filename`);
+            const dropZone = document.getElementById(`${safeId}_drop_zone`);
+
+            if (hidden) hidden.value = value || '';
+
+            const hasImage = isImagePath(value);
+            if (preview) preview.classList.toggle('hidden', !hasImage);
+            if (thumb && hasImage) {
+                thumb.src = `/${value}`;
+                thumb.style.display = '';
+                if (thumbPlaceholder) thumbPlaceholder.style.display = 'none';
+            }
+            if (filename) filename.textContent = hasImage ? value.split('/').pop() : '';
+            const fullpath = document.getElementById(`${safeId}_fullpath`);
+            if (fullpath) fullpath.textContent = value || '';
+
+            // Update drop zone hint text
+            const hint = dropZone ? dropZone.querySelector('p') : null;
+            if (hint) hint.textContent = hasImage ? 'Click to replace image' : 'Click or drag to upload image';
+        },
+
+        handlers: {
+            onFileSelect: function(event, fieldId) {
+                const files = event.target.files;
+                if (files && files.length > 0) {
+                    window.LEDMatrixWidgets.getHandlers('file-upload-single').uploadFile(fieldId, files[0]);
+                }
+            },
+
+            onDrop: function(event, fieldId) {
+                event.preventDefault();
+                const files = event.dataTransfer.files;
+                if (files && files.length > 0) {
+                    window.LEDMatrixWidgets.getHandlers('file-upload-single').uploadFile(fieldId, files[0]);
+                }
+            },
+
+            onClear: function(fieldId) {
+                const widget = window.LEDMatrixWidgets.get('file-upload-single');
+                widget.setValue(fieldId, '');
+                triggerChange(fieldId, '');
+                // Reset file input so the same file can be re-selected
+                const fileInput = document.getElementById(`${sanitizeId(fieldId)}_file_input`);
+                if (fileInput) fileInput.value = '';
+            },
+
+            uploadFile: async function(fieldId, file) {
+                const safeId = sanitizeId(fieldId);
+                const fileInput = document.getElementById(`${safeId}_file_input`);
+                const statusDiv = document.getElementById(`${safeId}_status`);
+                const notifyFn = window.showNotification || console.log;
+
+                // Read config from the file input data attributes
+                const pluginId = (fileInput && fileInput.dataset.pluginId) || '';
+                const maxSizeMb = parseFloat((fileInput && fileInput.dataset.maxSizeMb) || '5');
+                const allowedTypes = ((fileInput && fileInput.dataset.allowedTypes) || 'image/png,image/jpeg,image/bmp,image/gif')
+                    .split(',').map(t => t.trim());
+
+                if (!pluginId) {
+                    notifyFn('Plugin ID not set — cannot upload', 'error');
+                    return;
+                }
+
+                // Validate type
+                if (!allowedTypes.includes(file.type)) {
+                    notifyFn(`File type "${file.type}" not allowed`, 'error');
+                    return;
+                }
+
+                // Validate size
+                if (file.size > maxSizeMb * 1024 * 1024) {
+                    notifyFn(`File exceeds ${maxSizeMb}MB limit`, 'error');
+                    return;
+                }
+
+                // Show uploading status — use DOM methods to avoid innerHTML with dynamic data
+                if (statusDiv) {
+                    statusDiv.className = 'mt-1 text-xs text-gray-500';
+                    statusDiv.textContent = '';
+                    const spinner = document.createElement('i');
+                    spinner.className = 'fas fa-spinner fa-spin mr-1';
+                    statusDiv.appendChild(spinner);
+                    statusDiv.appendChild(document.createTextNode('Uploading…'));
+                }
+
+                const formData = new FormData();
+                formData.append('plugin_id', pluginId);
+                formData.append('files', file);
+
+                try {
+                    const response = await fetch('/api/v3/plugins/assets/upload', {
+                        method: 'POST',
+                        body: formData
+                    });
+
+                    if (!response.ok) {
+                        const body = await response.text();
+                        throw new Error(`Server error ${response.status}: ${body}`);
+                    }
+
+                    const data = await response.json();
+
+                    if (data.status === 'success' && data.uploaded_files && data.uploaded_files.length > 0) {
+                        const uploadedPath = data.uploaded_files[0].path;
+                        const widget = window.LEDMatrixWidgets.get('file-upload-single');
+                        widget.setValue(fieldId, uploadedPath);
+                        triggerChange(fieldId, uploadedPath);
+
+                        if (statusDiv) {
+                            statusDiv.className = 'mt-1 text-xs text-green-600';
+                            statusDiv.textContent = '';
+                            const icon = document.createElement('i');
+                            icon.className = 'fas fa-check-circle mr-1';
+                            statusDiv.appendChild(icon);
+                            statusDiv.appendChild(document.createTextNode('Uploaded successfully'));
+                            setTimeout(() => { statusDiv.className = 'mt-1 text-xs hidden'; statusDiv.textContent = ''; }, 3000);
+                        }
+                        notifyFn('Image uploaded successfully', 'success');
+                    } else {
+                        throw new Error(data.message || 'Upload failed');
+                    }
+                } catch (error) {
+                    if (statusDiv) {
+                        statusDiv.className = 'mt-1 text-xs text-red-600';
+                        statusDiv.textContent = '';
+                        const errIcon = document.createElement('i');
+                        errIcon.className = 'fas fa-exclamation-circle mr-1';
+                        statusDiv.appendChild(errIcon);
+                        statusDiv.appendChild(document.createTextNode(error.message || 'Upload failed'));
+                    }
+                    notifyFn(`Upload error: ${error.message}`, 'error');
+                } finally {
+                    if (fileInput) fileInput.value = '';
+                }
+            }
+        }
+    });
+
+    console.log('[FileUploadSingleWidget] File upload single widget registered');
+})();

web_interface/static/v3/js/widgets/json-file-manager.js

@@ -0,0 +1,783 @@
+/**
+ * JsonFileManager — reusable JSON file management widget for LEDMatrix plugins.
+ *
+ * Usage via config_schema.json:
+ *   "file_manager": {
+ *     "type": "null",
+ *     "title": "Data Files",
+ *     "x-widget": "json-file-manager",
+ *     "x-widget-config": {
+ *       "actions": {
+ *         "list":   "list-files",   // required
+ *         "get":    "get-file",     // required for editing
+ *         "save":   "save-file",    // required for editing
+ *         "upload": "upload-file",  // optional
+ *         "delete": "delete-file",  // optional
+ *         "create": "create-file",  // optional
+ *         "toggle": "toggle-category" // optional
+ *       },
+ *       "upload_hint":      "Hint text under the drop zone",
+ *       "directory_label":  "of_the_day/",
+ *       "create_fields": [
+ *         { "key": "category_name", "label": "Category Name",
+ *           "placeholder": "my_words", "pattern": "^[a-z0-9_]+$",
+ *           "hint": "Used as filename" },
+ *         { "key": "display_name", "label": "Display Name",
+ *           "placeholder": "My Words" }
+ *       ],
+ *       "toggle_key": "category_name"
+ *     }
+ *   }
+ *
+ * No CDN dependencies. Works on all modern browsers.
+ */
+(function () {
+    'use strict';
+
+    class JsonFileManager {
+        constructor(container, config, pluginId) {
+            // Prevent duplicate instances on the same container
+            if (container._jfmInstance) {
+                container._jfmInstance._destroy();
+            }
+            container._jfmInstance = this;
+
+            this.el         = container;
+            this.pluginId   = pluginId;
+            this.actions    = config.actions || {};
+            this.uploadHint = config.upload_hint || '';
+            this.dirLabel   = config.directory_label || '';
+            this.createFields = config.create_fields || [];
+            this.toggleKey  = config.toggle_key || null;
+
+            // Unique prefix for all DOM IDs in this instance
+            this._uid = 'jfm_' + Array.from(crypto.getRandomValues(new Uint8Array(4)), b => b.toString(16).padStart(2, '0')).join('');
+
+            // Mutable state
+            this._editFile   = null;
+            this._deleteFile = null;
+            this._keyHandler = this._onKey.bind(this);
+
+            this._inject();
+            this._bind();
+            this._loadList();
+        }
+
+        // ── Lifecycle ────────────────────────────────────────────────────────
+
+        _destroy() {
+            document.removeEventListener('keydown', this._keyHandler);
+            this.el._jfmInstance = null;
+        }
+
+        // ── DOM Injection ────────────────────────────────────────────────────
+
+        _inject() {
+            const u = this._uid;
+            const hasUpload = !!this.actions.upload;
+            const hasCreate = !!this.actions.create;
+            const hasDelete = !!this.actions.delete;
+
+            this.el.innerHTML = this._css(u) + `
+<div id="${u}" class="jfm">
+
+  <div class="jfm-header">
+    <div class="jfm-header-left">
+      <span class="jfm-title">Data Files</span>
+      ${this.dirLabel ? `<code class="jfm-dir">${this._esc(this.dirLabel)}</code>` : ''}
+    </div>
+    <div class="jfm-header-right">
+      ${hasCreate ? `<button type="button" class="jfm-btn jfm-btn-primary jfm-btn-sm" data-jfm="open-create">+ New File</button>` : ''}
+      <button type="button" class="jfm-btn jfm-btn-ghost jfm-btn-sm" data-jfm="refresh" title="Refresh file list">&#8635;</button>
+    </div>
+  </div>
+
+  <div id="${u}-list" class="jfm-list">
+    <div class="jfm-loading"><span class="jfm-spin"></span> Loading…</div>
+  </div>
+
+  ${hasUpload ? `
+  <div class="jfm-upload-wrap">
+    <input type="file" accept=".json" id="${u}-fileinput" tabindex="-1">
+    <div class="jfm-dropzone" id="${u}-dropzone" data-jfm="open-picker" role="button" tabindex="0"
+         aria-label="Upload JSON file">
+      <span class="jfm-drop-icon">&#128193;</span>
+      <p class="jfm-drop-primary">Drop a JSON file here, or click to browse</p>
+      ${this.uploadHint ? `<p class="jfm-drop-hint">${this._esc(this.uploadHint)}</p>` : ''}
+    </div>
+  </div>` : ''}
+
+  <!-- ── Edit modal ─────────────────────────────────────── -->
+  <div class="jfm-modal" id="${u}-edit-modal" role="dialog" aria-modal="true" hidden>
+    <div class="jfm-modal-box jfm-modal-wide">
+      <div class="jfm-modal-head">
+        <span id="${u}-edit-title" class="jfm-modal-title">Edit file</span>
+        <div class="jfm-modal-tools">
+          <button type="button" class="jfm-btn jfm-btn-ghost jfm-btn-sm" data-jfm="fmt">Format</button>
+          <button type="button" class="jfm-btn jfm-btn-ghost jfm-btn-sm" data-jfm="validate">Validate</button>
+          <button type="button" class="jfm-close-btn" data-jfm="close-edit" aria-label="Close">&times;</button>
+        </div>
+      </div>
+      <div id="${u}-edit-err" class="jfm-err-bar" hidden></div>
+      <textarea id="${u}-editor" class="jfm-editor"
+                spellcheck="false" autocomplete="off"
+                autocorrect="off" autocapitalize="off"
+                aria-label="JSON editor"></textarea>
+      <div class="jfm-modal-foot">
+        <span id="${u}-charcount" class="jfm-stat"></span>
+        <button type="button" class="jfm-btn jfm-btn-ghost" data-jfm="close-edit">Cancel</button>
+        <button type="button" class="jfm-btn jfm-btn-primary" data-jfm="save" id="${u}-save-btn">Save</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- ── Delete modal ───────────────────────────────────── -->
+  ${hasDelete ? `
+  <div class="jfm-modal" id="${u}-del-modal" role="dialog" aria-modal="true" hidden>
+    <div class="jfm-modal-box">
+      <div class="jfm-modal-head">
+        <span class="jfm-modal-title">Delete file</span>
+        <button type="button" class="jfm-close-btn" data-jfm="close-del" aria-label="Close">&times;</button>
+      </div>
+      <div class="jfm-modal-body">
+        <p>Delete <strong id="${u}-del-name"></strong>?</p>
+        <p class="jfm-muted">This permanently removes the file and its entry from the plugin configuration.</p>
+      </div>
+      <div class="jfm-modal-foot">
+        <button type="button" class="jfm-btn jfm-btn-ghost" data-jfm="close-del">Cancel</button>
+        <button type="button" class="jfm-btn jfm-btn-danger" data-jfm="confirm-del" id="${u}-del-btn">Delete</button>
+      </div>
+    </div>
+  </div>` : ''}
+
+  <!-- ── Create modal ───────────────────────────────────── -->
+  ${hasCreate ? `
+  <div class="jfm-modal" id="${u}-create-modal" role="dialog" aria-modal="true" hidden>
+    <div class="jfm-modal-box">
+      <div class="jfm-modal-head">
+        <span class="jfm-modal-title">Create new file</span>
+        <button type="button" class="jfm-close-btn" data-jfm="close-create" aria-label="Close">&times;</button>
+      </div>
+      <div class="jfm-modal-body">
+        ${this.createFields.map(f => `
+        <div class="jfm-field">
+          <label for="${u}-cf-${this._esc(f.key)}">${this._esc(f.label)}</label>
+          <input type="text" id="${u}-cf-${this._esc(f.key)}"
+                 placeholder="${this._esc(f.placeholder || '')}"
+                 ${f.pattern ? `pattern="${this._esc(f.pattern)}"` : ''}>
+          ${f.hint ? `<span class="jfm-hint">${this._esc(f.hint)}</span>` : ''}
+        </div>`).join('')}
+      </div>
+      <div class="jfm-modal-foot">
+        <button type="button" class="jfm-btn jfm-btn-ghost" data-jfm="close-create">Cancel</button>
+        <button type="button" class="jfm-btn jfm-btn-primary" data-jfm="do-create" id="${u}-create-btn">Create</button>
+      </div>
+    </div>
+  </div>` : ''}
+
+</div>`;  // end #${u}
+
+            // Cache frequently-used elements
+            this._root        = document.getElementById(u);
+            this._listEl      = document.getElementById(`${u}-list`);
+            this._editorEl    = document.getElementById(`${u}-editor`);
+            this._editModal   = document.getElementById(`${u}-edit-modal`);
+            this._delModal    = document.getElementById(`${u}-del-modal`);
+            this._createModal = document.getElementById(`${u}-create-modal`);
+            this._dropzone    = document.getElementById(`${u}-dropzone`);
+            this._fileInput   = document.getElementById(`${u}-fileinput`);
+        }
+
+        _css(u) {
+            return `<style>
+#${u}{font-family:inherit;color:#111827;}
+#${u} *{box-sizing:border-box;}
+
+/* Header */
+#${u} .jfm-header{display:flex;justify-content:space-between;align-items:center;margin-bottom:.875rem;gap:.5rem;}
+#${u} .jfm-header-left{display:flex;align-items:center;gap:.5rem;flex-wrap:wrap;}
+#${u} .jfm-title{font-size:.9375rem;font-weight:600;color:#111827;}
+#${u} .jfm-dir{font-size:.75rem;color:#6b7280;background:#f3f4f6;padding:.125rem .375rem;border-radius:.25rem;font-family:monospace;}
+#${u} .jfm-header-right{display:flex;gap:.375rem;align-items:center;flex-shrink:0;}
+
+/* Buttons */
+#${u} .jfm-btn{display:inline-flex;align-items:center;gap:.25rem;padding:.4375rem .875rem;border-radius:.375rem;border:1px solid #d1d5db;background:#fff;color:#374151;font-size:.875rem;font-weight:500;cursor:pointer;transition:background .12s,border-color .12s,opacity .12s;line-height:1.25;}
+#${u} .jfm-btn:hover:not(:disabled){background:#f9fafb;border-color:#9ca3af;}
+#${u} .jfm-btn:focus-visible{outline:2px solid #3b82f6;outline-offset:1px;}
+#${u} .jfm-btn:disabled{opacity:.5;cursor:not-allowed;}
+#${u} .jfm-btn-sm{padding:.3125rem .625rem;font-size:.8125rem;}
+#${u} .jfm-btn-primary{background:#3b82f6;border-color:#3b82f6;color:#fff;}
+#${u} .jfm-btn-primary:hover:not(:disabled){background:#2563eb;border-color:#2563eb;}
+#${u} .jfm-btn-danger{background:#ef4444;border-color:#ef4444;color:#fff;}
+#${u} .jfm-btn-danger:hover:not(:disabled){background:#dc2626;border-color:#dc2626;}
+#${u} .jfm-btn-ghost{background:transparent;border-color:transparent;color:#6b7280;}
+#${u} .jfm-btn-ghost:hover:not(:disabled){background:#f3f4f6;color:#374151;}
+#${u} .jfm-close-btn{display:flex;align-items:center;justify-content:center;width:2rem;height:2rem;border:none;background:none;color:#9ca3af;font-size:1.25rem;cursor:pointer;border-radius:.25rem;padding:0;line-height:1;}
+#${u} .jfm-close-btn:hover{background:#f3f4f6;color:#374151;}
+
+/* File list */
+#${u} .jfm-list{display:grid;grid-template-columns:repeat(auto-fill,minmax(240px,1fr));gap:.625rem;margin-bottom:1rem;min-height:5rem;}
+#${u} .jfm-loading{grid-column:1/-1;display:flex;align-items:center;justify-content:center;gap:.5rem;padding:2rem;color:#6b7280;font-size:.875rem;}
+#${u} .jfm-empty{grid-column:1/-1;text-align:center;padding:2.5rem 1rem;color:#9ca3af;}
+#${u} .jfm-empty-icon{font-size:2.25rem;margin-bottom:.625rem;}
+#${u} .jfm-empty-title{font-weight:600;color:#374151;margin:0 0 .25rem;}
+#${u} .jfm-empty-sub{font-size:.875rem;margin:0;}
+
+/* File cards */
+#${u} .jfm-card{border:1px solid #e5e7eb;border-radius:.5rem;padding:.875rem;background:#fff;display:flex;flex-direction:column;gap:.5rem;transition:border-color .15s,box-shadow .15s;}
+#${u} .jfm-card:hover{border-color:#93c5fd;box-shadow:0 2px 8px rgba(59,130,246,.1);}
+#${u} .jfm-card.jfm-off{opacity:.6;}
+#${u} .jfm-card-top{display:flex;justify-content:space-between;align-items:flex-start;gap:.5rem;}
+#${u} .jfm-card-name{font-weight:600;font-size:.9375rem;word-break:break-word;color:#111827;flex:1;}
+#${u} .jfm-card-meta{font-size:.75rem;color:#6b7280;display:flex;flex-direction:column;gap:.125rem;line-height:1.5;}
+#${u} .jfm-card-actions{display:flex;gap:.375rem;padding-top:.5rem;border-top:1px solid #f3f4f6;margin-top:.125rem;}
+#${u} .jfm-card-actions .jfm-btn{flex:1;justify-content:center;}
+#${u} .jfm-card-actions .jfm-del{flex:0 0 auto;}
+
+/* Toggle */
+#${u} .jfm-toggle{display:flex;align-items:center;gap:.3125rem;font-size:.75rem;color:#6b7280;white-space:nowrap;flex-shrink:0;}
+#${u} .jfm-toggle input[type=checkbox]{width:.9375rem;height:.9375rem;cursor:pointer;accent-color:#22c55e;margin:0;}
+
+/* Upload zone */
+#${u} .jfm-upload-wrap{margin-top:.25rem;}
+#${u} input[type=file]#${u}-fileinput{position:absolute;left:-9999px;width:1px;height:1px;opacity:0;}
+#${u} .jfm-dropzone{border:2px dashed #d1d5db;border-radius:.5rem;padding:1.25rem 1rem;text-align:center;cursor:pointer;transition:border-color .15s,background .15s;background:#f9fafb;user-select:none;}
+#${u} .jfm-dropzone:hover,#${u} .jfm-dropzone:focus-visible,#${u} .jfm-dropzone.jfm-over{border-color:#3b82f6;background:#eff6ff;border-style:solid;outline:none;}
+#${u} .jfm-drop-icon{font-size:1.75rem;display:block;margin-bottom:.375rem;}
+#${u} .jfm-drop-primary{font-size:.875rem;color:#374151;margin:0 0 .25rem;}
+#${u} .jfm-drop-hint{font-size:.75rem;color:#9ca3af;margin:0;}
+
+/* Modals */
+#${u} .jfm-modal{position:fixed;inset:0;background:rgba(0,0,0,.45);z-index:9999;display:flex;align-items:center;justify-content:center;padding:1rem;backdrop-filter:blur(1px);}
+#${u} .jfm-modal[hidden]{display:none;}
+#${u} .jfm-modal-box{background:#fff;border-radius:.5rem;box-shadow:0 20px 40px rgba(0,0,0,.15);display:flex;flex-direction:column;width:100%;max-width:440px;max-height:92vh;}
+#${u} .jfm-modal-wide{max-width:880px;}
+#${u} .jfm-modal-head{display:flex;justify-content:space-between;align-items:center;padding:.875rem 1.125rem;border-bottom:1px solid #e5e7eb;flex-shrink:0;gap:.5rem;}
+#${u} .jfm-modal-title{font-weight:600;font-size:.9375rem;color:#111827;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
+#${u} .jfm-modal-tools{display:flex;gap:.25rem;align-items:center;flex-shrink:0;}
+#${u} .jfm-modal-body{padding:1.125rem;overflow-y:auto;flex:1;}
+#${u} .jfm-modal-foot{display:flex;gap:.5rem;justify-content:flex-end;align-items:center;padding:.75rem 1.125rem;border-top:1px solid #e5e7eb;flex-shrink:0;background:#f9fafb;border-radius:0 0 .5rem .5rem;}
+#${u} .jfm-stat{margin-right:auto;font-size:.75rem;color:#9ca3af;font-variant-numeric:tabular-nums;}
+
+/* JSON editor */
+#${u} .jfm-editor{display:block;width:100%;min-height:400px;height:58vh;max-height:64vh;resize:vertical;font-family:'Courier New',Consolas,ui-monospace,monospace;font-size:.8rem;line-height:1.55;padding:.75rem 1rem;border:none;border-radius:0;outline:none;white-space:pre;overflow:auto;color:#1e293b;background:#fafafa;tab-size:2;}
+#${u} .jfm-err-bar{background:#fef2f2;border-bottom:1px solid #fecaca;color:#991b1b;font-size:.8125rem;padding:.5rem 1.125rem;flex-shrink:0;line-height:1.4;}
+#${u} .jfm-err-bar[hidden]{display:none;}
+
+/* Create form */
+#${u} .jfm-field{margin-bottom:.875rem;}
+#${u} .jfm-field:last-child{margin-bottom:0;}
+#${u} .jfm-field label{display:block;font-size:.875rem;font-weight:500;color:#374151;margin-bottom:.3125rem;}
+#${u} .jfm-field input{width:100%;padding:.4375rem .75rem;border:1px solid #d1d5db;border-radius:.375rem;font-size:.875rem;color:#111827;background:#fff;}
+#${u} .jfm-field input:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 3px rgba(59,130,246,.12);}
+#${u} .jfm-hint{display:block;font-size:.75rem;color:#9ca3af;margin-top:.25rem;}
+#${u} .jfm-muted{font-size:.875rem;color:#6b7280;margin-top:.375rem;}
+
+/* Spinner */
+#${u} .jfm-spin{display:inline-block;width:.9rem;height:.9rem;border:2px solid #e5e7eb;border-top-color:#3b82f6;border-radius:50%;animation:jfm-spin-${u} .6s linear infinite;vertical-align:middle;}
+@keyframes jfm-spin-${u}{to{transform:rotate(360deg);}}
+</style>`;
+        }
+
+        // ── Event Binding ────────────────────────────────────────────────────
+
+        _bind() {
+            // Delegated clicks on the widget root
+            this._root.addEventListener('click', this._onClick.bind(this));
+            this._root.addEventListener('change', this._onChange.bind(this));
+
+            // Drag-and-drop on the dropzone
+            if (this._dropzone) {
+                this._dropzone.addEventListener('dragover', e => {
+                    e.preventDefault();
+                    this._dropzone.classList.add('jfm-over');
+                });
+                this._dropzone.addEventListener('dragleave', () => {
+                    this._dropzone.classList.remove('jfm-over');
+                });
+                this._dropzone.addEventListener('drop', e => {
+                    e.preventDefault();
+                    this._dropzone.classList.remove('jfm-over');
+                    const file = e.dataTransfer?.files[0];
+                    if (file) this._uploadFile(file);
+                });
+                // Keyboard activation of drop zone
+                this._dropzone.addEventListener('keydown', e => {
+                    if (e.key === 'Enter' || e.key === ' ') {
+                        e.preventDefault();
+                        this._fileInput?.click();
+                    }
+                });
+            }
+
+            // Modal backdrop clicks
+            [this._editModal, this._delModal, this._createModal].forEach(m => {
+                if (m) m.addEventListener('click', e => { if (e.target === m) this._closeAll(); });
+            });
+
+            // Editor: char count + Tab indent
+            if (this._editorEl) {
+                this._editorEl.addEventListener('input', () => this._updateStat());
+                this._editorEl.addEventListener('keydown', e => {
+                    if (e.key === 'Tab') {
+                        e.preventDefault();
+                        const s = this._editorEl.selectionStart;
+                        const end = this._editorEl.selectionEnd;
+                        const v = this._editorEl.value;
+                        this._editorEl.value = v.slice(0, s) + '  ' + v.slice(end);
+                        this._editorEl.selectionStart = this._editorEl.selectionEnd = s + 2;
+                        this._updateStat();
+                    }
+                });
+            }
+
+            // Global keyboard shortcuts
+            document.addEventListener('keydown', this._keyHandler);
+        }
+
+        _onKey(e) {
+            const editOpen   = this._editModal   && !this._editModal.hidden;
+            const delOpen    = this._delModal    && !this._delModal.hidden;
+            const createOpen = this._createModal && !this._createModal.hidden;
+
+            if (e.key === 'Escape') {
+                if (editOpen)   { this._closeEdit();   return; }
+                if (delOpen)    { this._closeDel();    return; }
+                if (createOpen) { this._closeCreate(); return; }
+            }
+            if ((e.ctrlKey || e.metaKey) && e.key === 's' && editOpen) {
+                e.preventDefault();
+                this._doSave();
+            }
+        }
+
+        _onClick(e) {
+            const btn = e.target.closest('[data-jfm]');
+            if (!btn) return;
+            const action = btn.dataset.jfm;
+
+            switch (action) {
+                case 'refresh':      this._loadList(); break;
+                case 'open-picker':  this._fileInput?.click(); break;
+                case 'open-create':  this._openCreate(); break;
+                case 'close-edit':   this._closeEdit(); break;
+                case 'close-del':    this._closeDel(); break;
+                case 'close-create': this._closeCreate(); break;
+                case 'fmt':          this._formatJson(); break;
+                case 'validate':     this._validateJson(); break;
+                case 'save':         this._doSave(); break;
+                case 'confirm-del':  this._doDelete(); break;
+                case 'do-create':    this._doCreate(); break;
+                case 'edit-file': {
+                    const card = btn.closest('[data-jfm-file]');
+                    if (card) this._openEdit(card.dataset.jfmFile);
+                    break;
+                }
+                case 'del-file': {
+                    const card = btn.closest('[data-jfm-file]');
+                    if (card) this._openDel(card.dataset.jfmFile);
+                    break;
+                }
+            }
+        }
+
+        _onChange(e) {
+            // Toggle checkbox
+            if (e.target.classList.contains('jfm-toggle-cb')) {
+                const catName = e.target.dataset.cat;
+                const enabled = e.target.checked;
+                this._doToggle(catName, enabled, e.target);
+            }
+            // File input
+            if (e.target === this._fileInput) {
+                const file = e.target.files?.[0];
+                if (file) this._uploadFile(file);
+                e.target.value = '';
+            }
+        }
+
+        // ── API helper ───────────────────────────────────────────────────────
+
+        async _api(actionKey, params) {
+            const actionId = Object.prototype.hasOwnProperty.call(this.actions, actionKey) ? this.actions[actionKey] : undefined;
+            if (!actionId) throw new Error(`Action "${actionKey}" not configured`);
+            const body = { plugin_id: this.pluginId, action_id: actionId };
+            if (params !== undefined) body.params = params;
+            const r = await fetch('/api/v3/plugins/action', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(body)
+            });
+            if (!r.ok) throw new Error('Server error ' + r.status);
+            const ct = r.headers.get('content-type') || '';
+            if (!ct.includes('application/json')) {
+                const txt = await r.text();
+                throw new Error('Unexpected response: ' + txt.slice(0, 120));
+            }
+            return r.json();
+        }
+
+        // ── File List ────────────────────────────────────────────────────────
+
+        async _loadList() {
+            this._listEl.innerHTML = `<div class="jfm-loading"><span class="jfm-spin"></span> Loading…</div>`;
+            try {
+                const data = await this._api('list');
+                if (data.status !== 'success') throw new Error(data.message || 'Load failed');
+                this._renderList(data.files || []);
+            } catch (err) {
+                this._listEl.innerHTML = `
+                    <div class="jfm-empty">
+                        <div class="jfm-empty-icon">&#9888;</div>
+                        <p class="jfm-empty-title">Failed to load files</p>
+                        <p class="jfm-empty-sub">${this._esc(err.message)}</p>
+                    </div>`;
+            }
+        }
+
+        _renderList(files) {
+            if (!files.length) {
+                this._listEl.innerHTML = `
+                    <div class="jfm-empty">
+                        <div class="jfm-empty-icon">&#128193;</div>
+                        <p class="jfm-empty-title">No files yet</p>
+                        <p class="jfm-empty-sub">Upload or create a JSON file to get started</p>
+                    </div>`;
+                return;
+            }
+            this._listEl.innerHTML = files.map(f => this._card(f)).join('');
+        }
+
+        _card(f) {
+            const enabled     = f.enabled !== false;
+            const displayName = this._esc(f.display_name || f.filename);
+            const filename    = this._esc(f.filename);
+            const catName     = this.toggleKey ? this._esc(f[this.toggleKey] || '') : '';
+            const showToggle  = !!(this.actions.toggle && this.toggleKey && f[this.toggleKey]);
+            const hasEdit     = !!this.actions.get && !!this.actions.save;
+            const hasDelete   = !!this.actions.delete;
+
+            return `
+<div class="jfm-card${enabled ? '' : ' jfm-off'}" data-jfm-file="${filename}">
+  <div class="jfm-card-top">
+    <span class="jfm-card-name" title="${filename}">${displayName}</span>
+    ${showToggle ? `
+    <label class="jfm-toggle" title="${enabled ? 'Enabled — click to disable' : 'Disabled — click to enable'}">
+      <input type="checkbox" class="jfm-toggle-cb" data-cat="${catName}" ${enabled ? 'checked' : ''}>
+      <span>${enabled ? 'On' : 'Off'}</span>
+    </label>` : ''}
+  </div>
+  <div class="jfm-card-meta">
+    <span>&#128196; ${filename}</span>
+    <span>&#128202; ${f.entry_count ?? 0} entries &middot; ${this._fmtSize(f.size || 0)}</span>
+    <span>&#128337; ${this._fmtDate(f.modified)}</span>
+  </div>
+  <div class="jfm-card-actions">
+    ${hasEdit ? `<button type="button" class="jfm-btn jfm-btn-sm" data-jfm="edit-file">&#9998; Edit</button>` : ''}
+    ${hasDelete ? `<button type="button" class="jfm-btn jfm-btn-danger jfm-btn-sm jfm-del" data-jfm="del-file" title="Delete file">&#128465;</button>` : ''}
+  </div>
+</div>`;
+        }
+
+        // ── Edit flow ────────────────────────────────────────────────────────
+
+        async _openEdit(filename) {
+            this._editFile = filename;
+            document.getElementById(`${this._uid}-edit-title`).textContent = `Edit: ${filename}`;
+            this._clearErr();
+            this._editorEl.value = 'Loading…';
+            this._updateStat();
+            this._editModal.hidden = false;
+
+            try {
+                const data = await this._api('get', { filename });
+                if (data.status !== 'success') throw new Error(data.message || 'Load failed');
+                this._editorEl.value = JSON.stringify(data.content, null, 2);
+                this._updateStat();
+                this._editorEl.focus();
+                this._editorEl.setSelectionRange(0, 0);
+                this._editorEl.scrollTop = 0;
+            } catch (err) {
+                this._showErr('Failed to load file: ' + err.message);
+                this._editorEl.value = '';
+            }
+        }
+
+        _closeEdit() {
+            if (this._editModal) this._editModal.hidden = true;
+            this._editFile = null;
+            this._clearErr();
+        }
+
+        _formatJson() {
+            try {
+                const parsed = JSON.parse(this._editorEl.value);
+                this._editorEl.value = JSON.stringify(parsed, null, 2);
+                this._updateStat();
+                this._clearErr();
+            } catch (err) {
+                this._showErr('Invalid JSON — ' + err.message);
+            }
+        }
+
+        _validateJson() {
+            try {
+                const parsed = JSON.parse(this._editorEl.value);
+                const n = (typeof parsed === 'object' && parsed !== null) ? Object.keys(parsed).length : '?';
+                this._clearErr();
+                this._notify(`Valid JSON — ${n} top-level keys`, 'success');
+            } catch (err) {
+                this._showErr('Invalid JSON — ' + err.message);
+            }
+        }
+
+        async _doSave() {
+            if (!this._editFile) return;
+            let contentStr;
+            try {
+                const parsed = JSON.parse(this._editorEl.value);
+                contentStr = JSON.stringify(parsed, null, 2);
+            } catch (err) {
+                this._showErr('Cannot save — fix JSON first: ' + err.message);
+                return;
+            }
+            const btn = document.getElementById(`${this._uid}-save-btn`);
+            this._busy(btn, 'Saving…');
+            try {
+                const data = await this._api('save', { filename: this._editFile, content: contentStr });
+                if (data.status !== 'success') throw new Error(data.message || 'Save failed');
+                this._notify('File saved', 'success');
+                this._closeEdit();
+                this._loadList();
+            } catch (err) {
+                this._showErr('Save failed: ' + err.message);
+            } finally {
+                this._idle(btn, 'Save');
+            }
+        }
+
+        // ── Delete flow ──────────────────────────────────────────────────────
+
+        _openDel(filename) {
+            this._deleteFile = filename;
+            const el = document.getElementById(`${this._uid}-del-name`);
+            if (el) el.textContent = filename;
+            if (this._delModal) this._delModal.hidden = false;
+        }
+
+        _closeDel() {
+            if (this._delModal) this._delModal.hidden = true;
+            this._deleteFile = null;
+        }
+
+        async _doDelete() {
+            if (!this._deleteFile) return;
+            const btn = document.getElementById(`${this._uid}-del-btn`);
+            this._busy(btn, 'Deleting…');
+            try {
+                const data = await this._api('delete', { filename: this._deleteFile });
+                if (data.status !== 'success') throw new Error(data.message || 'Delete failed');
+                this._notify('File deleted', 'success');
+                this._closeDel();
+                this._loadList();
+            } catch (err) {
+                this._notify('Delete failed: ' + err.message, 'error');
+            } finally {
+                this._idle(btn, 'Delete');
+            }
+        }
+
+        // ── Create flow ──────────────────────────────────────────────────────
+
+        _openCreate() {
+            if (!this._createModal) return;
+            this.createFields.forEach(f => {
+                const el = document.getElementById(`${this._uid}-cf-${f.key}`);
+                if (el) el.value = '';
+            });
+            this._createModal.hidden = false;
+            const first = this.createFields[0];
+            if (first) document.getElementById(`${this._uid}-cf-${first.key}`)?.focus();
+        }
+
+        _closeCreate() {
+            if (this._createModal) this._createModal.hidden = true;
+        }
+
+        async _doCreate() {
+            const params = {};
+            for (const f of this.createFields) {
+                const el  = document.getElementById(`${this._uid}-cf-${f.key}`);
+                const val = (el?.value || '').trim();
+                // display_name may be blank — auto-derived from category_name below
+                if (!val && f.key !== 'display_name') {
+                    this._notify(`"${f.label}" is required`, 'error');
+                    el?.focus();
+                    return;
+                }
+                if (f.pattern && val && el && el.validity.patternMismatch) {
+                    this._notify(`"${f.label}" format is invalid`, 'error');
+                    el?.focus();
+                    return;
+                }
+                if (val) params[f.key] = val;
+            }
+            // Auto-derive display_name from category_name when left blank
+            if (!params.display_name && params.category_name) {
+                params.display_name = params.category_name.replace(/_/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
+            }
+            const btn = document.getElementById(`${this._uid}-create-btn`);
+            this._busy(btn, 'Creating…');
+            try {
+                const data = await this._api('create', params);
+                if (data.status !== 'success') throw new Error(data.message || 'Create failed');
+                this._notify('File created', 'success');
+                this._closeCreate();
+                this._loadList();
+            } catch (err) {
+                this._notify('Create failed: ' + err.message, 'error');
+            } finally {
+                this._idle(btn, 'Create');
+            }
+        }
+
+        // ── Upload ───────────────────────────────────────────────────────────
+
+        async _uploadFile(file) {
+            if (!file.name.endsWith('.json')) {
+                this._notify('Please select a .json file', 'error');
+                return;
+            }
+            let content;
+            try {
+                content = await file.text();
+                JSON.parse(content); // client-side validation
+            } catch (err) {
+                this._notify('Invalid JSON: ' + err.message, 'error');
+                return;
+            }
+            if (this._dropzone) this._dropzone.style.opacity = '.5';
+            try {
+                const data = await this._api('upload', { filename: file.name, content });
+                if (data.status !== 'success') throw new Error(data.message || 'Upload failed');
+                this._notify(`"${file.name}" uploaded`, 'success');
+                this._loadList();
+            } catch (err) {
+                this._notify('Upload failed: ' + err.message, 'error');
+            } finally {
+                if (this._dropzone) this._dropzone.style.opacity = '';
+            }
+        }
+
+        // ── Toggle ───────────────────────────────────────────────────────────
+
+        async _doToggle(catName, enabled, checkbox) {
+            checkbox.disabled = true;
+            try {
+                const params = { enabled };
+                if (this.toggleKey) params[this.toggleKey] = catName;
+                const data = await this._api('toggle', params);
+                if (data.status !== 'success') throw new Error(data.message || 'Toggle failed');
+                this._notify(enabled ? 'Category enabled' : 'Category disabled', 'success');
+                this._loadList();
+            } catch (err) {
+                this._notify('Toggle failed: ' + err.message, 'error');
+                checkbox.checked = !enabled; // revert
+                checkbox.disabled = false;
+            }
+        }
+
+        // ── Helpers ──────────────────────────────────────────────────────────
+
+        _closeAll() {
+            this._closeEdit();
+            this._closeDel();
+            this._closeCreate();
+        }
+
+        _updateStat() {
+            const v = this._editorEl?.value || '';
+            const lines = v ? v.split('\n').length : 0;
+            const el = document.getElementById(`${this._uid}-charcount`);
+            if (el) el.textContent = `${lines.toLocaleString()} lines · ${v.length.toLocaleString()} chars`;
+        }
+
+        _showErr(msg) {
+            const el = document.getElementById(`${this._uid}-edit-err`);
+            if (el) { el.textContent = msg; el.hidden = false; }
+        }
+
+        _clearErr() {
+            const el = document.getElementById(`${this._uid}-edit-err`);
+            if (el) { el.textContent = ''; el.hidden = true; }
+        }
+
+        _notify(msg, type) {
+            if (typeof window.showNotification === 'function') {
+                window.showNotification(msg, type || 'info');
+            } else {
+                console.info(`[JsonFileManager] ${type || 'info'}: ${msg}`);
+            }
+        }
+
+        _busy(btn, label) {
+            if (!btn) return;
+            btn._jfmOrigText = btn.textContent;
+            btn.disabled = true;
+            btn.textContent = '';
+            const spin = document.createElement('span');
+            spin.className = 'jfm-spin';
+            btn.appendChild(spin);
+            btn.appendChild(document.createTextNode(' ' + label));
+        }
+
+        _idle(btn, label) {
+            if (!btn) return;
+            btn.disabled = false;
+            btn.textContent = btn._jfmOrigText !== undefined ? btn._jfmOrigText : label;
+            delete btn._jfmOrigText;
+        }
+
+        _esc(str) {
+            const d = document.createElement('div');
+            d.textContent = String(str ?? '');
+            return d.innerHTML;
+        }
+
+        _fmtSize(bytes) {
+            if (!bytes) return '0 B';
+            const i = Math.min(Math.floor(Math.log2(bytes + 1) / 10), 2);
+            const unit = ['B', 'KB', 'MB'][i];
+            const val  = bytes / Math.pow(1024, i);
+            return (i ? val.toFixed(1) : val) + ' ' + unit;
+        }
+
+        _fmtDate(str) {
+            if (!str) return '—';
+            try {
+                return new Date(str).toLocaleDateString(undefined, {
+                    month: 'short', day: 'numeric', year: 'numeric'
+                });
+            } catch { return str; }
+        }
+    }
+
+    // ── Widget registry integration ──────────────────────────────────────────
+
+    window.JsonFileManager = JsonFileManager;
+
+    if (typeof window.LEDMatrixWidgets !== 'undefined') {
+        window.LEDMatrixWidgets.register('json-file-manager', {
+            name: 'JSON File Manager',
+            version: '1.0.0',
+            render(container, config, _value, options) {
+                new JsonFileManager(container, config || {}, options?.pluginId || '');
+            },
+            getValue() { return null; },
+            setValue() {}
+        });
+        console.log('[JsonFileManager] Registered with LEDMatrixWidgets');
+    } else {
+        console.log('[JsonFileManager] Loaded (LEDMatrixWidgets registry not available)');
+    }
+})();

web_interface/static/v3/js/widgets/plugin-file-manager.js

@@ -0,0 +1,797 @@
+/**
+ * Plugin File Manager Widget
+ *
+ * Reusable inline file manager for plugins that manage files via the
+ * web_ui_actions system. Driven entirely by x-widget-config in the schema —
+ * no external HTML file or iframe needed.
+ *
+ * Any plugin can adopt this widget by:
+ *   1. Defining web_ui_actions in manifest.json (list, get, save, upload,
+ *      delete, create, toggle) with ui_hidden: true
+ *   2. Adding x-widget: "plugin-file-manager" to a field in config_schema.json
+ *      with x-widget-config mapping the action IDs
+ *
+ * Schema example:
+ * {
+ *   "file_manager": {
+ *     "type": "null",
+ *     "title": "Data Files",
+ *     "x-widget": "plugin-file-manager",
+ *     "x-widget-config": {
+ *       "actions": {
+ *         "list":   "list-files",
+ *         "get":    "get-file",
+ *         "save":   "save-file",
+ *         "upload": "upload-file",
+ *         "delete": "delete-file",
+ *         "create": "create-file",
+ *         "toggle": "toggle-category"
+ *       },
+ *       "upload_hint":     "JSON files with day numbers 1–365 as keys",
+ *       "directory_label": "of_the_day/",
+ *       "create_fields": [
+ *         { "key": "category_name", "label": "Category Name",
+ *           "placeholder": "e.g., my_words", "pattern": "^[a-z0-9_]+$",
+ *           "hint": "Lowercase letters, numbers, underscores" },
+ *         { "key": "display_name", "label": "Display Name",
+ *           "placeholder": "e.g., My Words", "hint": "Optional — auto-generated if blank" }
+ *       ]
+ *     }
+ *   }
+ * }
+ *
+ * @module PluginFileManagerWidget
+ */
+
+(function () {
+    'use strict';
+
+    if (typeof window.LEDMatrixWidgets === 'undefined') {
+        console.error('[PluginFileManager] LEDMatrixWidgets registry not found.');
+        return;
+    }
+
+    // ─── Inject widget-scoped styles once ────────────────────────────────────
+
+    if (!document.getElementById('pfm-styles')) {
+        const style = document.createElement('style');
+        style.id = 'pfm-styles';
+        style.textContent = `
+.pfm-root { font-family: inherit; }
+.pfm-header { display:flex; align-items:center; justify-content:space-between;
+              margin-bottom:.75rem; }
+.pfm-title  { font-size:1rem; font-weight:600; color:#111827; }
+.pfm-dir    { font-size:.75rem; color:#6b7280; margin-top:.125rem; }
+.pfm-upload { border:2px dashed #d1d5db; border-radius:.5rem; padding:1.25rem;
+              text-align:center; cursor:pointer; transition:border-color .15s,background .15s; }
+.pfm-upload:hover,.pfm-upload.dragover { border-color:#3b82f6; background:#eff6ff; }
+.pfm-upload p  { font-size:.875rem; color:#4b5563; margin:.25rem 0 0; }
+.pfm-upload small { font-size:.75rem; color:#9ca3af; }
+.pfm-grid  { display:grid; grid-template-columns:repeat(auto-fill,minmax(260px,1fr));
+             gap:.75rem; margin-top:.75rem; }
+.pfm-card  { border:1px solid #e5e7eb; border-radius:.5rem; padding:.875rem;
+             background:#fff; transition:box-shadow .15s; }
+.pfm-card:hover { box-shadow:0 1px 4px rgba(0,0,0,.1); }
+.pfm-card.disabled { opacity:.55; }
+.pfm-card-top  { display:flex; align-items:center; justify-content:space-between;
+                 margin-bottom:.5rem; }
+.pfm-card-icon { width:2rem; height:2rem; background:#f3f4f6; border-radius:.375rem;
+                 display:flex; align-items:center; justify-content:center;
+                 color:#6b7280; font-size:1rem; }
+.pfm-card-name { font-weight:600; color:#111827; font-size:.875rem; margin:.375rem 0 .125rem; }
+.pfm-card-meta { font-size:.75rem; color:#6b7280; line-height:1.5; }
+.pfm-card-actions { display:flex; gap:.375rem; margin-top:.625rem; }
+.pfm-btn       { display:inline-flex; align-items:center; gap:.25rem; padding:.375rem .75rem;
+                 border-radius:.375rem; font-size:.8125rem; font-weight:500;
+                 border:none; cursor:pointer; transition:background .15s; }
+.pfm-btn-primary   { background:#2563eb; color:#fff; flex:1; justify-content:center; }
+.pfm-btn-primary:hover  { background:#1d4ed8; }
+.pfm-btn-danger    { background:#dc2626; color:#fff; }
+.pfm-btn-danger:hover   { background:#b91c1c; }
+.pfm-btn-secondary { background:#f3f4f6; color:#374151; border:1px solid #d1d5db; }
+.pfm-btn-secondary:hover { background:#e5e7eb; }
+.pfm-btn-sm { padding:.25rem .5rem; font-size:.75rem; }
+.pfm-btn-create { background:#059669; color:#fff; }
+.pfm-btn-create:hover { background:#047857; }
+.pfm-toggle-wrap  { display:flex; align-items:center; gap:.375rem; }
+.pfm-toggle-label { font-size:.75rem; color:#6b7280; }
+.pfm-toggle-cb    { position:relative; display:inline-block; width:2rem; height:1.125rem; }
+.pfm-toggle-cb input { opacity:0; width:0; height:0; }
+.pfm-toggle-slider { position:absolute; inset:0; background:#d1d5db; border-radius:9999px;
+                     cursor:pointer; transition:background .2s; }
+.pfm-toggle-slider:before { content:''; position:absolute; height:.75rem; width:.75rem;
+                             left:.1875rem; bottom:.1875rem; background:#fff;
+                             border-radius:50%; transition:transform .2s; }
+.pfm-toggle-cb input:checked + .pfm-toggle-slider { background:#10b981; }
+.pfm-toggle-cb input:checked + .pfm-toggle-slider:before { transform:translateX(.875rem); }
+.pfm-empty { text-align:center; padding:2rem; color:#9ca3af; }
+.pfm-empty i { font-size:2rem; margin-bottom:.5rem; display:block; }
+
+/* Modal */
+.pfm-overlay { position:fixed; inset:0; background:rgba(0,0,0,.5);
+               display:flex; align-items:flex-start; justify-content:center;
+               z-index:9999; padding:2rem 1rem; overflow-y:auto; }
+.pfm-modal   { background:#fff; border-radius:.75rem; width:100%; max-width:56rem;
+               box-shadow:0 20px 50px rgba(0,0,0,.3); margin:auto; }
+.pfm-modal-header { display:flex; align-items:center; justify-content:space-between;
+                    padding:1rem 1.25rem; border-bottom:1px solid #e5e7eb; }
+.pfm-modal-title  { font-size:1rem; font-weight:600; color:#111827; }
+.pfm-modal-body   { padding:1.25rem; overflow-y:auto; max-height:70vh; }
+.pfm-modal-footer { display:flex; justify-content:flex-end; gap:.5rem;
+                    padding:.875rem 1.25rem; border-top:1px solid #e5e7eb;
+                    background:#f9fafb; border-radius:0 0 .75rem .75rem; }
+
+/* Entry table */
+.pfm-table-wrap { overflow-x:auto; }
+.pfm-table { width:100%; border-collapse:collapse; font-size:.8125rem; }
+.pfm-table th { background:#f9fafb; text-align:left; padding:.5rem .625rem;
+                font-weight:600; color:#374151; border-bottom:1px solid #e5e7eb;
+                white-space:nowrap; position:sticky; top:0; }
+.pfm-table td { padding:.375rem .625rem; border-bottom:1px solid #f3f4f6;
+                vertical-align:top; }
+.pfm-table tr.today-row td { background:#fef9c3; }
+.pfm-table td input, .pfm-table td textarea {
+  width:100%; border:1px solid #d1d5db; border-radius:.25rem;
+  padding:.25rem .375rem; font-size:.8125rem; font-family:inherit;
+  resize:vertical; background:#fff; }
+.pfm-table td input:focus, .pfm-table td textarea:focus {
+  outline:none; border-color:#3b82f6; }
+.pfm-day-col { width:3rem; text-align:center; font-weight:600;
+               color:#6b7280; white-space:nowrap; }
+.pfm-pagination { display:flex; align-items:center; justify-content:space-between;
+                  margin-top:.75rem; font-size:.8125rem; color:#6b7280; }
+.pfm-page-jump  { display:flex; align-items:center; gap:.375rem; font-size:.8125rem; }
+.pfm-page-jump input { width:3.5rem; padding:.25rem .375rem; border:1px solid #d1d5db;
+                        border-radius:.25rem; text-align:center; }
+
+/* Form in create modal */
+.pfm-field { margin-bottom:.875rem; }
+.pfm-field label { display:block; font-size:.875rem; font-weight:500;
+                   color:#374151; margin-bottom:.25rem; }
+.pfm-field input { width:100%; padding:.4rem .625rem; border:1px solid #d1d5db;
+                   border-radius:.375rem; font-size:.875rem; }
+.pfm-field input:focus { outline:none; border-color:#3b82f6; }
+.pfm-field-hint { font-size:.75rem; color:#9ca3af; margin-top:.2rem; }
+.pfm-field-error { font-size:.75rem; color:#dc2626; margin-top:.2rem; }
+
+/* Delete danger box */
+.pfm-danger-box { background:#fef2f2; border:1px solid #fecaca;
+                  border-radius:.5rem; padding:.875rem; font-size:.875rem;
+                  color:#991b1b; }
+`;
+        document.head.appendChild(style);
+    }
+
+    // ─── Safe HTML helper ─────────────────────────────────────────────────────
+
+    /**
+     * Parse html in a sandboxed DOMParser document (scripts never execute) and
+     * replace target's children with the result.  All dynamic values in html
+     * must be escaped by the caller before passing here.
+     */
+    function safeSetHTML(target, html) {
+        target.textContent = '';
+        // createContextualFragment parses html relative to the document context
+        // without executing scripts — a widely recognised safe insertion method.
+        const frag = document.createRange().createContextualFragment(html);
+        target.appendChild(frag);
+    }
+
+    // ─── Per-instance state ───────────────────────────────────────────────────
+
+    const _state = new Map(); // fieldId → { pluginId, actions, createFields, files, page, entriesPerPage, modal }
+
+    function getState(fieldId) {
+        if (!_state.has(fieldId)) _state.set(fieldId, {
+            pluginId: '', actions: {}, createFields: [], uploadHint: '',
+            directoryLabel: '', files: [], page: 1, entriesPerPage: 20,
+            currentModal: null
+        });
+        return _state.get(fieldId);
+    }
+
+    // ─── API helper ───────────────────────────────────────────────────────────
+
+    async function callAction(pluginId, actionId, params = {}) {
+        const resp = await fetch('/api/v3/plugins/action', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ plugin_id: pluginId, action_id: actionId, params })
+        });
+        return resp.json();
+    }
+
+    function notify(msg, type) {
+        if (window.showNotification) window.showNotification(msg, type);
+        else console.log(`[PFM][${type}] ${msg}`);
+    }
+
+    function escHtml(s) {
+        const d = document.createElement('div');
+        d.textContent = String(s ?? '');
+        return d.innerHTML;
+    }
+
+    function formatSize(bytes) {
+        if (bytes >= 1048576) return (bytes / 1048576).toFixed(1) + ' MB';
+        return (bytes / 1024).toFixed(2) + ' KB';
+    }
+
+    function formatDate(iso) {
+        try { return new Date(iso).toLocaleString(undefined, { dateStyle: 'short', timeStyle: 'short' }); }
+        catch { return iso; }
+    }
+
+    // ─── Core: load files ─────────────────────────────────────────────────────
+
+    async function loadFiles(fieldId) {
+        const st = getState(fieldId);
+        const root = document.getElementById(`${fieldId}_pfm`);
+        if (!root) return;
+        const grid = root.querySelector('.pfm-grid');
+        if (grid) safeSetHTML(grid, '<div class="pfm-empty"><i class="fas fa-spinner fa-spin"></i>Loading…</div>');
+
+        const data = await callAction(st.pluginId, st.actions.list).catch(() => null);
+        if (!data || data.status !== 'success') {
+            if (grid) safeSetHTML(grid, '<div class="pfm-empty"><i class="fas fa-exclamation-circle"></i>Failed to load files.</div>');
+            return;
+        }
+        st.files = data.files || [];
+        renderCards(fieldId);
+    }
+
+    // ─── Card grid ────────────────────────────────────────────────────────────
+
+    function renderCards(fieldId) {
+        const st = getState(fieldId);
+        const root = document.getElementById(`${fieldId}_pfm`);
+        if (!root) return;
+        const grid = root.querySelector('.pfm-grid');
+        if (!grid) return;
+
+        if (!st.files.length) {
+            safeSetHTML(grid, '<div class="pfm-empty"><i class="fas fa-folder-open"></i>No files yet. Create or upload one.</div>');
+            return;
+        }
+
+        // Remove any existing delegated listener before re-render
+        if (st._gridClickHandler) grid.removeEventListener('click', st._gridClickHandler);
+        if (st._gridChangeHandler) grid.removeEventListener('change', st._gridChangeHandler);
+
+        // Event delegation: handles edit/delete/toggle via data attributes so
+        // filenames and category names are never interpolated into JS string literals.
+        st._gridClickHandler = function(e) {
+            const btn = e.target.closest('[data-pfm-action]');
+            if (!btn) return;
+            const action = btn.dataset.pfmAction;
+            const fId    = btn.dataset.pfmField;
+            if (action === 'edit')   window._pfmOpenEdit(fId, btn.dataset.pfmFile);
+            if (action === 'delete') window._pfmOpenDelete(fId, btn.dataset.pfmFile);
+        };
+        st._gridChangeHandler = function(e) {
+            const inp = e.target.closest('[data-pfm-action="toggle"]');
+            if (!inp) return;
+            window._pfmToggle(inp.dataset.pfmField, inp.dataset.pfmCategory, inp.checked);
+        };
+        grid.addEventListener('click',  st._gridClickHandler);
+        grid.addEventListener('change', st._gridChangeHandler);
+
+        // Build cards with DOM methods so no user-derived data flows through innerHTML.
+        grid.textContent = '';
+        const frag = document.createDocumentFragment();
+        st.files.forEach(function(f) {
+            const card = document.createElement('div');
+            card.className = 'pfm-card' + (f.enabled === false ? ' disabled' : '');
+            card.dataset.filename = f.filename;
+            card.dataset.category = f.category_name;
+
+            // Top row: label + optional toggle
+            const top = document.createElement('div');
+            top.className = 'pfm-card-top';
+            const lbl = document.createElement('span');
+            lbl.className = 'pfm-toggle-label';
+            lbl.textContent = f.enabled !== false ? 'Enabled' : 'Disabled';
+            top.appendChild(lbl);
+            if (st.actions.toggle) {
+                const tglLabel = document.createElement('label');
+                tglLabel.className = 'pfm-toggle-cb';
+                tglLabel.title = f.enabled !== false ? 'Click to disable' : 'Click to enable';
+                const tglInput = document.createElement('input');
+                tglInput.type = 'checkbox';
+                tglInput.checked = f.enabled !== false;
+                tglInput.dataset.pfmAction   = 'toggle';
+                tglInput.dataset.pfmField    = fieldId;
+                tglInput.dataset.pfmCategory = f.category_name;
+                const tglSlider = document.createElement('span');
+                tglSlider.className = 'pfm-toggle-slider';
+                tglLabel.appendChild(tglInput);
+                tglLabel.appendChild(tglSlider);
+                top.appendChild(tglLabel);
+            }
+            card.appendChild(top);
+
+            // Icon (static markup)
+            const icon = document.createElement('div');
+            icon.className = 'pfm-card-icon';
+            icon.innerHTML = '<i class="fas fa-file-code"></i>';
+            card.appendChild(icon);
+
+            // Name & meta — textContent avoids any HTML injection
+            const name = document.createElement('div');
+            name.className = 'pfm-card-name';
+            name.textContent = f.display_name || f.filename;
+            card.appendChild(name);
+
+            const meta = document.createElement('div');
+            meta.className = 'pfm-card-meta';
+            meta.appendChild(document.createTextNode(f.filename));
+            meta.appendChild(document.createElement('br'));
+            if (f.entry_count != null) {
+                meta.appendChild(document.createTextNode(f.entry_count + ' entries · ' + formatSize(f.size)));
+            }
+            meta.appendChild(document.createElement('br'));
+            meta.appendChild(document.createTextNode(formatDate(f.modified)));
+            card.appendChild(meta);
+
+            // Action buttons
+            const actions = document.createElement('div');
+            actions.className = 'pfm-card-actions';
+            if (st.actions.get && st.actions.save) {
+                const editBtn = document.createElement('button');
+                editBtn.className = 'pfm-btn pfm-btn-primary';
+                editBtn.dataset.pfmAction = 'edit';
+                editBtn.dataset.pfmField  = fieldId;
+                editBtn.dataset.pfmFile   = f.filename;
+                editBtn.innerHTML = '<i class="fas fa-edit"></i> Edit'; // static
+                actions.appendChild(editBtn);
+            }
+            if (st.actions.delete) {
+                const delBtn = document.createElement('button');
+                delBtn.className = 'pfm-btn pfm-btn-danger pfm-btn-sm';
+                delBtn.dataset.pfmAction = 'delete';
+                delBtn.dataset.pfmField  = fieldId;
+                delBtn.dataset.pfmFile   = f.filename;
+                delBtn.innerHTML = '<i class="fas fa-trash"></i>'; // static
+                actions.appendChild(delBtn);
+            }
+            card.appendChild(actions);
+            frag.appendChild(card);
+        });
+        grid.appendChild(frag);
+    }
+
+    // ─── Edit modal ───────────────────────────────────────────────────────────
+
+    window._pfmOpenEdit = async function (fieldId, filename) {
+        const st = getState(fieldId);
+        const overlay = createOverlay(fieldId);
+        // Build modal using DOM methods so filename never enters a JS string literal.
+        const modal = document.createElement('div');
+        modal.className = 'pfm-modal';
+        safeSetHTML(modal, `
+            <div class="pfm-modal-header">
+                <span class="pfm-modal-title"><i class="fas fa-edit mr-2"></i>${escHtml(filename)}</span>
+                <button class="pfm-btn pfm-btn-secondary pfm-btn-sm" id="${escHtml(fieldId)}_modal_close">
+                    <i class="fas fa-times"></i>
+                </button>
+            </div>
+            <div class="pfm-modal-body" id="${escHtml(fieldId)}_edit_body">
+                <div class="pfm-empty"><i class="fas fa-spinner fa-spin"></i>Loading…</div>
+            </div>
+            <div class="pfm-modal-footer">
+                <button class="pfm-btn pfm-btn-secondary" id="${escHtml(fieldId)}_modal_cancel">Cancel</button>
+                <button class="pfm-btn pfm-btn-primary" id="${escHtml(fieldId)}_save_btn">
+                    <i class="fas fa-save mr-1"></i>Save
+                </button>
+            </div>`;
+        overlay.appendChild(modal);
+        // Bind events after DOM insertion — filename captured in closure, not in HTML.
+        modal.querySelector(`#${CSS.escape(fieldId)}_modal_close`).addEventListener('click', () => window._pfmCloseModal(fieldId));
+        modal.querySelector(`#${CSS.escape(fieldId)}_modal_cancel`).addEventListener('click', () => window._pfmCloseModal(fieldId));
+        modal.querySelector(`#${CSS.escape(fieldId)}_save_btn`).addEventListener('click', () => window._pfmSave(fieldId, filename));
+
+        const data = await callAction(st.pluginId, st.actions.get, { filename }).catch(() => null);
+        const body = document.getElementById(`${fieldId}_edit_body`);
+        if (!data || data.status !== 'success' || !body) {
+            if (body) safeSetHTML(body, '<div class="pfm-empty" style="color:#dc2626">Failed to load file.</div>');
+            return;
+        }
+
+        const content = data.content || data.data || {};
+        st._editFilename = filename;
+
+        if (isTabular(content)) {
+            // Table path: track cell edits live in _editData
+            st._editData = content;
+            renderEntryTable(fieldId, body, content);
+        } else {
+            // Textarea path: _editData stays null; save() reads from the <textarea>
+            st._editData = null;
+            safeSetHTML(body, `
+                <textarea id="${escHtml(fieldId)}_json_ta" rows="20"
+                    style="width:100%;font-family:monospace;font-size:.75rem;border:1px solid #d1d5db;border-radius:.375rem;padding:.5rem;"
+                >${escHtml(JSON.stringify(content, null, 2))}</textarea>
+                <div id="${escHtml(fieldId)}_json_err" style="color:#dc2626;font-size:.75rem;margin-top:.25rem;"></div>`;
+        }
+    };
+
+    function isTabular(data) {
+        if (typeof data !== 'object' || Array.isArray(data)) return false;
+        const keys = Object.keys(data);
+        if (!keys.length) return false;
+        const first = data[keys[0]];
+        if (typeof first !== 'object' || Array.isArray(first)) return false;
+        const entryKeys = Object.keys(first);
+        return entryKeys.length > 0 && entryKeys.length <= 8;
+    }
+
+    function renderEntryTable(fieldId, container, content) {
+        const st = getState(fieldId);
+        const entries = Object.entries(content).sort((a, b) => parseInt(a[0]) - parseInt(b[0]));
+        if (!entries.length) { container.textContent = 'No entries.'; return; }
+
+        const cols = Object.keys(entries[0][1]);
+        const MS_PER_DAY = 86400 * 1000; // eslint-disable-line no-magic-numbers -- 86400s/day is not magic
+        const todayDoy = Math.ceil((new Date() - new Date(new Date().getFullYear(), 0, 0)) / MS_PER_DAY);
+        const total = entries.length;
+        const perPage = st.entriesPerPage;
+
+        function buildPage(page) {
+            const start = (page - 1) * perPage; // eslint-disable-line no-magic-numbers
+            const pageEntries = entries.slice(start, start + perPage);
+            const totalPages = Math.ceil(total / perPage);
+
+            safeSetHTML(container, `
+                <div class="pfm-table-info" style="font-size:.75rem;color:#6b7280;margin-bottom:.375rem;">
+                    ${total} entries total
+                    <button class="pfm-btn pfm-btn-secondary pfm-btn-sm" style="margin-left:.5rem"
+                        onclick="(function(){const targetPage=Math.ceil(${todayDoy}/${perPage});window._pfmTablePage('${fieldId}',targetPage);setTimeout(function(){const row=document.querySelector('tr[data-day=\\'${todayDoy}\\']');if(row)row.scrollIntoView({block:'center'});},60);})()">
+                        <i class="fas fa-calendar-day"></i> Jump to today (day ${todayDoy})
+                    </button>
+                </div>
+                <div id="${fieldId}_tbl_wrap" class="pfm-table-wrap" style="max-height:52vh;overflow-y:auto;">
+                    <table class="pfm-table">
+                        <thead>
+                            <tr>
+                                <th class="pfm-day-col">Day</th>
+                                ${cols.map(c => `<th>${escHtml(c.replace(/_/g, ' ').replace(/\b\w/g, l => l.toUpperCase()))}</th>`).join('')}
+                            </tr>
+                        </thead>
+                        <tbody>
+                            ${pageEntries.map(([day, val]) => `
+                            <tr data-day="${day}" class="${parseInt(day) === todayDoy ? 'today-row' : ''}">
+                                <td class="pfm-day-col" style="user-select:none;">${escHtml(day)}</td>
+                                ${cols.map(col => {
+                                    const v = val[col] ?? '';
+                                    const isLong = String(v).length > 60 || col === 'description' || col === 'definition' || col === 'content';
+                                    return isLong
+                                        ? `<td><textarea data-day="${day}" data-col="${escHtml(col)}" rows="2"
+                                            oninput="window._pfmCellEdit('${fieldId}','${day}','${escHtml(col)}',this.value)"
+                                            >${escHtml(String(v))}</textarea></td>`
+                                        : `<td><input type="text" data-day="${day}" data-col="${escHtml(col)}"
+                                            value="${escHtml(String(v))}"
+                                            oninput="window._pfmCellEdit('${fieldId}','${day}','${escHtml(col)}',this.value)"></td>`;
+                                }).join('')}
+                            </tr>`).join('')}
+                        </tbody>
+                    </table>
+                </div>
+                <div class="pfm-pagination">
+                    <span>Page ${page} of ${totalPages}</span>
+                    <div class="pfm-page-jump">
+                        <button class="pfm-btn pfm-btn-secondary pfm-btn-sm"
+                                ${page <= 1 ? 'disabled' : ''}
+                                onclick="window._pfmTablePage('${fieldId}',${page - 1})">‹ Prev</button>
+                        <span>Go to</span>
+                        <input type="number" min="1" max="${totalPages}" value="${page}"
+                            onchange="window._pfmTablePage('${fieldId}',+this.value)">
+                        <button class="pfm-btn pfm-btn-secondary pfm-btn-sm"
+                                ${page >= totalPages ? 'disabled' : ''}
+                                onclick="window._pfmTablePage('${fieldId}',${page + 1})">Next ›</button>
+                    </div>
+                </div>`;
+            st._tablePage = page;
+            st._tableEntries = entries;
+            st._tableCols = cols;
+        }
+
+        // Store buildPage in per-instance state so multiple instances don't
+        // clobber each other's pagination via a shared global.
+        st._buildPage = buildPage;
+        buildPage(st._tablePage || 1);
+    }
+
+    // Global dispatcher — resolves the per-instance buildPage from state so
+    // multiple plugin-file-manager instances don't clobber each other.
+    window._pfmTablePage = function (fId, p) {
+        const s = getState(fId);
+        if (s._buildPage) {
+            const total = s._tableEntries ? s._tableEntries.length : 0;
+            const totalP = Math.ceil(total / s.entriesPerPage) || 1;
+            s._buildPage(Math.max(1, Math.min(p, totalP)));
+        }
+    };
+
+    window._pfmCellEdit = function (fieldId, day, col, value) {
+        const st = getState(fieldId);
+        if (st._editData && st._editData[day]) st._editData[day][col] = value;
+    };
+
+    window._pfmSave = async function (fieldId, filename) {
+        const st = getState(fieldId);
+        const saveBtn = document.getElementById(`${fieldId}_save_btn`);
+        let content;
+
+        // Try getting from inline table data first, then textarea fallback
+        if (st._editData) {
+            content = st._editData;
+        } else {
+            const ta = document.getElementById(`${fieldId}_json_ta`);
+            if (!ta) return;
+            try { content = JSON.parse(ta.value); }
+            catch (e) {
+                const errEl = document.getElementById(`${fieldId}_json_err`);
+                if (errEl) errEl.textContent = 'Invalid JSON: ' + e.message;
+                return;
+            }
+        }
+
+        if (saveBtn) { saveBtn.disabled = true; (function(b){b.textContent='';const i=document.createElement('i');i.className='fas fa-spinner fa-spin mr-1';b.appendChild(i);b.appendChild(document.createTextNode('Saving…'));})(saveBtn); }
+
+        const result = await callAction(st.pluginId, st.actions.save, {
+            filename, content: JSON.stringify(content)
+        }).catch(() => ({ status: 'error', message: 'Network error' }));
+
+        if (saveBtn) { saveBtn.disabled = false; (function(b){b.textContent='';const i=document.createElement('i');i.className='fas fa-save mr-1';b.appendChild(i);b.appendChild(document.createTextNode('Save'));})(saveBtn); }
+
+        if (result.status === 'success') {
+            notify('File saved successfully', 'success');
+            window._pfmCloseModal(fieldId);
+            await loadFiles(fieldId);
+        } else {
+            notify('Save failed: ' + (result.message || 'Unknown error'), 'error');
+        }
+    };
+
+    // ─── Delete modal ─────────────────────────────────────────────────────────
+
+    window._pfmOpenDelete = function (fieldId, filename) {
+        const overlay = createOverlay(fieldId);
+        const modal = document.createElement('div');
+        modal.className = 'pfm-modal';
+        modal.style.maxWidth = '28rem';
+        safeSetHTML(modal, `
+            <div class="pfm-modal-header">
+                <span class="pfm-modal-title"><i class="fas fa-trash mr-2"></i>Delete File</span>
+                <button class="pfm-btn pfm-btn-secondary pfm-btn-sm" id="${escHtml(fieldId)}_del_close">
+                    <i class="fas fa-times"></i>
+                </button>
+            </div>
+            <div class="pfm-modal-body">
+                <div class="pfm-danger-box">
+                    <strong>${escHtml(filename)}</strong> will be permanently deleted and removed
+                    from the plugin configuration. This cannot be undone.
+                </div>
+            </div>
+            <div class="pfm-modal-footer">
+                <button class="pfm-btn pfm-btn-secondary" id="${escHtml(fieldId)}_del_cancel">Cancel</button>
+                <button class="pfm-btn pfm-btn-danger" id="${escHtml(fieldId)}_del_confirm">
+                    <i class="fas fa-trash mr-1"></i>Delete
+                </button>
+            </div>`;
+        overlay.appendChild(modal);
+        modal.querySelector(`#${CSS.escape(fieldId)}_del_close`).addEventListener('click', () => window._pfmCloseModal(fieldId));
+        modal.querySelector(`#${CSS.escape(fieldId)}_del_cancel`).addEventListener('click', () => window._pfmCloseModal(fieldId));
+        modal.querySelector(`#${CSS.escape(fieldId)}_del_confirm`).addEventListener('click', () => window._pfmConfirmDelete(fieldId, filename));
+    };
+
+    window._pfmConfirmDelete = async function (fieldId, filename) {
+        const st = getState(fieldId);
+        const result = await callAction(st.pluginId, st.actions.delete, { filename })
+            .catch(() => ({ status: 'error', message: 'Network error' }));
+        if (result.status === 'success') {
+            notify('File deleted', 'success');
+            window._pfmCloseModal(fieldId);
+            await loadFiles(fieldId);
+        } else {
+            notify('Delete failed: ' + (result.message || ''), 'error');
+        }
+    };
+
+    // ─── Create modal ─────────────────────────────────────────────────────────
+
+    window._pfmOpenCreate = function (fieldId) {
+        const st = getState(fieldId);
+        const fields = st.createFields;
+        const overlay = createOverlay(fieldId);
+        const modal = document.createElement('div');
+        modal.className = 'pfm-modal';
+        modal.style.maxWidth = '32rem';
+        safeSetHTML(modal, `
+            <div class="pfm-modal-header">
+                <span class="pfm-modal-title"><i class="fas fa-plus-circle mr-2"></i>Create New File</span>
+                <button class="pfm-btn pfm-btn-secondary pfm-btn-sm" id="${escHtml(fieldId)}_cre_close">
+                    <i class="fas fa-times"></i>
+                </button>
+            </div>
+            <div class="pfm-modal-body">
+                <div id="${escHtml(fieldId)}_create_err" class="pfm-field-error" style="margin-bottom:.5rem;"></div>
+                ${fields.map(f => `
+                <div class="pfm-field">
+                    <label for="${escHtml(fieldId)}_cf_${escHtml(f.key)}">${escHtml(f.label || f.key)}</label>
+                    <input type="text" id="${escHtml(fieldId)}_cf_${escHtml(f.key)}"
+                           placeholder="${escHtml(f.placeholder || '')}"
+                           ${f.pattern ? `pattern="${escHtml(f.pattern)}"` : ''}>
+                    ${f.hint ? `<div class="pfm-field-hint">${escHtml(f.hint)}</div>` : ''}
+                </div>`).join('')}
+            </div>
+            <div class="pfm-modal-footer">
+                <button class="pfm-btn pfm-btn-secondary" id="${escHtml(fieldId)}_cre_cancel">Cancel</button>
+                <button class="pfm-btn pfm-btn-create" id="${escHtml(fieldId)}_create_btn">
+                    <i class="fas fa-plus mr-1"></i>Create
+                </button>
+            </div>
+            </div>`;
+        overlay.appendChild(modal);
+        modal.querySelector(`#${CSS.escape(fieldId)}_cre_close`).addEventListener('click', () => window._pfmCloseModal(fieldId));
+        modal.querySelector(`#${CSS.escape(fieldId)}_cre_cancel`).addEventListener('click', () => window._pfmCloseModal(fieldId));
+        modal.querySelector(`#${CSS.escape(fieldId)}_create_btn`).addEventListener('click', () => window._pfmConfirmCreate(fieldId));
+    };
+
+    window._pfmConfirmCreate = async function (fieldId) {
+        const st = getState(fieldId);
+        const errEl = document.getElementById(`${fieldId}_create_err`);
+        const btn = document.getElementById(`${fieldId}_create_btn`);
+        const params = {};
+
+        for (const f of st.createFields) {
+            const inp = document.getElementById(`${fieldId}_cf_${f.key}`);
+            if (!inp) continue;
+            const val = inp.value.trim();
+            // Client-side pattern validation omitted — server-side create-file script validates.
+            params[f.key] = val;
+        }
+
+        if (btn) { btn.disabled = true; (function(b){b.textContent='';const i=document.createElement('i');i.className='fas fa-spinner fa-spin mr-1';b.appendChild(i);b.appendChild(document.createTextNode('Creating…'));})(btn); }
+        if (errEl) errEl.textContent = '';
+
+        const result = await callAction(st.pluginId, st.actions.create, params)
+            .catch(() => ({ status: 'error', message: 'Network error' }));
+
+        if (btn) { btn.disabled = false; (function(b){b.textContent='';const i=document.createElement('i');i.className='fas fa-plus mr-1';b.appendChild(i);b.appendChild(document.createTextNode('Create'));})(btn); }
+
+        if (result.status === 'success') {
+            notify('File created', 'success');
+            window._pfmCloseModal(fieldId);
+            await loadFiles(fieldId);
+        } else {
+            if (errEl) errEl.textContent = result.message || 'Create failed';
+        }
+    };
+
+    // ─── Toggle ───────────────────────────────────────────────────────────────
+
+    window._pfmToggle = async function (fieldId, categoryName, enabled) {
+        const st = getState(fieldId);
+        const result = await callAction(st.pluginId, st.actions.toggle, { category_name: categoryName, enabled })
+            .catch(() => ({ status: 'error' }));
+        if (result.status === 'success') {
+            notify(enabled ? `${categoryName} enabled` : `${categoryName} disabled`, 'success');
+            await loadFiles(fieldId);
+        } else {
+            notify('Toggle failed', 'error');
+            await loadFiles(fieldId); // revert UI
+        }
+    };
+
+    // ─── Upload ───────────────────────────────────────────────────────────────
+
+    window._pfmUpload = async function (fieldId, file) {
+        const st = getState(fieldId);
+        const notifyFn = window.showNotification || console.log;
+        if (!file.name.toLowerCase().endsWith('.json')) {
+            notifyFn('Only .json files can be uploaded', 'error'); return;
+        }
+        let content;
+        try { content = await file.text(); JSON.parse(content); }
+        catch { notifyFn('File contains invalid JSON', 'error'); return; }
+
+        const result = await callAction(st.pluginId, st.actions.upload, {
+            filename: file.name, content
+        }).catch(() => ({ status: 'error', message: 'Network error' }));
+
+        if (result.status === 'success') {
+            notify('File uploaded: ' + (result.filename || file.name), 'success');
+            await loadFiles(fieldId);
+        } else {
+            notify('Upload failed: ' + (result.message || ''), 'error');
+        }
+    };
+
+    // ─── Modal helpers ────────────────────────────────────────────────────────
+
+    function createOverlay(fieldId) {
+        window._pfmCloseModal(fieldId); // close any open modal first
+        const overlay = document.createElement('div');
+        overlay.className = 'pfm-overlay';
+        overlay.id = `${fieldId}_pfm_overlay`;
+        // Close on backdrop click
+        overlay.addEventListener('click', e => { if (e.target === overlay) window._pfmCloseModal(fieldId); });
+        document.body.appendChild(overlay);
+        getState(fieldId).currentModal = overlay;
+        return overlay;
+    }
+
+    window._pfmCloseModal = function (fieldId) {
+        const st = getState(fieldId);
+        if (st.currentModal) { st.currentModal.remove(); st.currentModal = null; }
+        st._editData = null;
+        st._editFilename = null;
+    };
+
+    // ─── Widget registration ──────────────────────────────────────────────────
+
+    window.LEDMatrixWidgets.register('plugin-file-manager', {
+        name: 'Plugin File Manager Widget',
+        version: '1.0.0',
+
+        render: function (container, config, value, options) {
+            const fieldId  = (options.fieldId || container.id || 'pfm').replace(/[^a-zA-Z0-9_-]/g, '_');
+            const wc       = config['x-widget-config'] || {};
+            const actions  = wc.actions        || {};
+            const pluginId = options.pluginId   || '';
+
+            const st = getState(fieldId);
+            Object.assign(st, {
+                pluginId,
+                actions,
+                createFields:   wc.create_fields    || [],
+                uploadHint:     wc.upload_hint       || 'Upload JSON files',
+                directoryLabel: wc.directory_label   || ''
+            });
+
+            safeSetHTML(container, `
+                <div class="pfm-root" id="${fieldId}_pfm">
+                    <div class="pfm-header">
+                        <div>
+                            <div class="pfm-title">File Explorer</div>
+                            ${st.directoryLabel ? `<div class="pfm-dir">Manage files in <code>${escHtml(st.directoryLabel)}</code></div>` : ''}
+                        </div>
+                        <div style="display:flex;gap:.375rem;">
+                            ${actions.create ? `
+                            <button class="pfm-btn pfm-btn-create"
+                                    onclick="window._pfmOpenCreate('${fieldId}')">
+                                <i class="fas fa-plus mr-1"></i>New File
+                            </button>` : ''}
+                        </div>
+                    </div>
+
+                    ${actions.upload ? `
+                    <div class="pfm-upload" id="${fieldId}_upload_zone"
+                         onclick="document.getElementById('${fieldId}_file_input').click()"
+                         ondragover="event.preventDefault();this.classList.add('dragover')"
+                         ondragleave="this.classList.remove('dragover')"
+                         ondrop="this.classList.remove('dragover');event.preventDefault();
+                                 if(event.dataTransfer.files[0])window._pfmUpload('${fieldId}',event.dataTransfer.files[0])">
+                        <input type="file" id="${fieldId}_file_input" accept=".json"
+                               style="display:none"
+                               onchange="if(this.files[0])window._pfmUpload('${fieldId}',this.files[0]);this.value=''">
+                        <i class="fas fa-cloud-upload-alt" style="font-size:1.5rem;color:#9ca3af;"></i>
+                        <p>Drag and drop or click to upload</p>
+                        <small>${escHtml(st.uploadHint)}</small>
+                    </div>` : ''}
+
+                    <div class="pfm-grid">
+                        <div class="pfm-empty"><i class="fas fa-spinner fa-spin"></i>Loading…</div>
+                    </div>
+                </div>`;
+
+            loadFiles(fieldId);
+        },
+
+        getValue: function () { return null; }, // file ops are immediate; nothing to submit
+        setValue: function (fieldId) { loadFiles(fieldId); }
+    });
+
+    console.log('[PluginFileManager] plugin-file-manager widget registered');
+})();

web_interface/static/v3/js/widgets/time-picker.js

@@ -0,0 +1,166 @@
+/**
+ * LEDMatrix Time Picker Widget
+ *
+ * Single time selection using the browser's native time input.
+ * Returns a string in HH:MM (24-hour) format.
+ *
+ * Schema example:
+ * {
+ *   "target_time": {
+ *     "type": "string",
+ *     "x-widget": "time-picker",
+ *     "default": "00:00",
+ *     "x-options": {
+ *       "placeholder": "Select time",
+ *       "clearable": true
+ *     }
+ *   }
+ * }
+ *
+ * @module TimePickerWidget
+ */
+
+(function() {
+    'use strict';
+
+    const base = window.BaseWidget ? new window.BaseWidget('TimePicker', '1.0.0') : null;
+
+    function escapeHtml(text) {
+        if (base) return base.escapeHtml(text);
+        const div = document.createElement('div');
+        div.textContent = String(text);
+        return div.innerHTML.replace(/"/g, '"').replace(/'/g, ''');
+    }
+
+    function sanitizeId(id) {
+        if (base) return base.sanitizeId(id);
+        return String(id).replace(/[^a-zA-Z0-9_-]/g, '_');
+    }
+
+    function triggerChange(fieldId, value) {
+        if (base) {
+            base.triggerChange(fieldId, value);
+        } else {
+            document.dispatchEvent(new CustomEvent('widget-change', {
+                detail: { fieldId, value },
+                bubbles: true,
+                cancelable: true
+            }));
+        }
+    }
+
+    function safeSetHTML(target, html) {
+        target.textContent = '';
+        // createContextualFragment parses html relative to the document context
+        // without executing scripts — a widely recognised safe insertion method.
+        const frag = document.createRange().createContextualFragment(html);
+        target.appendChild(frag);
+    }
+
+    window.LEDMatrixWidgets.register('time-picker', {
+        name: 'Time Picker Widget',
+        version: '1.0.0',
+
+        render: function(container, config, value, options) {
+            const fieldId = sanitizeId(options.fieldId || container.id || 'time_picker');
+            const xOptions = config['x-options'] || config['x_options'] || {};
+            const placeholder = xOptions.placeholder || '';
+            const clearable = xOptions.clearable === true;
+            const disabled = xOptions.disabled === true;
+            const required = xOptions.required === true;
+
+            const currentValue = value || '';
+
+            let html = `<div id="${fieldId}_widget" class="time-picker-widget" data-field-id="${fieldId}">`;
+            html += '<div class="flex items-center">';
+            html += `
+                <div class="relative flex-1">
+                    <input type="time"
+                           id="${fieldId}_input"
+                           name="${escapeHtml(options.name || fieldId)}"
+                           value="${escapeHtml(currentValue)}"
+                           ${placeholder ? `placeholder="${escapeHtml(placeholder)}"` : ''}
+                           ${disabled ? 'disabled' : ''}
+                           ${required ? 'required' : ''}
+                           onchange="window.LEDMatrixWidgets.getHandlers('time-picker').onChange('${fieldId}')"
+                           class="form-input w-full rounded-md border-gray-300 shadow-sm focus:border-blue-500 focus:ring-blue-500 ${disabled ? 'bg-gray-100 cursor-not-allowed' : 'bg-white'} text-black pr-10">
+                    <div class="absolute inset-y-0 right-0 flex items-center pr-3 pointer-events-none">
+                        <i class="fas fa-clock text-gray-400"></i>
+                    </div>
+                </div>
+            `;
+
+            if (clearable && !disabled) {
+                html += `
+                    <button type="button"
+                            id="${fieldId}_clear"
+                            onclick="window.LEDMatrixWidgets.getHandlers('time-picker').onClear('${fieldId}')"
+                            class="ml-2 inline-flex items-center px-2 py-2 text-gray-400 hover:text-gray-600 ${currentValue ? '' : 'hidden'}"
+                            title="Clear">
+                        <i class="fas fa-times"></i>
+                    </button>
+                `;
+            }
+
+            html += '</div>';
+            html += `<div id="${fieldId}_error" class="text-sm text-red-600 mt-1 hidden"></div>`;
+            html += '</div>';
+
+            safeSetHTML(container, html);
+        },
+
+        getValue: function(fieldId) {
+            const safeId = sanitizeId(fieldId);
+            const input = document.getElementById(`${safeId}_input`);
+            return input ? input.value : '';
+        },
+
+        setValue: function(fieldId, value) {
+            const safeId = sanitizeId(fieldId);
+            const input = document.getElementById(`${safeId}_input`);
+            const clearBtn = document.getElementById(`${safeId}_clear`);
+            if (input) input.value = value || '';
+            if (clearBtn) clearBtn.classList.toggle('hidden', !value);
+        },
+
+        validate: function(fieldId) {
+            const safeId = sanitizeId(fieldId);
+            const input = document.getElementById(`${safeId}_input`);
+            const errorEl = document.getElementById(`${safeId}_error`);
+            if (!input) return { valid: true, errors: [] };
+            const isValid = input.checkValidity();
+            if (errorEl) {
+                if (!isValid) {
+                    errorEl.textContent = input.validationMessage;
+                    errorEl.classList.remove('hidden');
+                    input.classList.add('border-red-500');
+                } else {
+                    errorEl.classList.add('hidden');
+                    input.classList.remove('border-red-500');
+                }
+            }
+            return { valid: isValid, errors: isValid ? [] : [input.validationMessage] };
+        },
+
+        handlers: {
+            onChange: function(fieldId) {
+                const widget = window.LEDMatrixWidgets.get('time-picker');
+                const safeId = sanitizeId(fieldId);
+                const clearBtn = document.getElementById(`${safeId}_clear`);
+                const value = widget.getValue(fieldId);
+                if (clearBtn) clearBtn.classList.toggle('hidden', !value);
+                widget.validate(fieldId);
+                triggerChange(fieldId, value);
+            },
+
+            onClear: function(fieldId) {
+                const widget = window.LEDMatrixWidgets.get('time-picker');
+                widget.setValue(fieldId, '');
+                widget.validate(fieldId); // refresh required/error state
+                triggerChange(fieldId, '');
+            }
+        }
+    });
+
+    console.log('[TimePickerWidget] Time picker widget registered');
+})();

web_interface/static/v3/plugins_manager.js

@@ -1442,9 +1442,14 @@ function renderInstalledPlugins(plugins) {
         return;
     }
 
-    // Helper function to escape attributes for use in HTML
+    // Helper function to escape values for use in HTML attributes
     const escapeAttr = (text) => {
-        return (text || '').replace(/'/g, "\\'").replace(/"/g, '"');
+        return (text || '')
+            .replace(/&/g, '&')
+            .replace(/"/g, '"')
+            .replace(/'/g, ''')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;');
     };
 
     // Helper function to escape for JavaScript strings (use JSON.stringify for proper escaping)
@@ -3441,6 +3446,28 @@ function generateFieldHtml(key, prop, value, prefix = '') {
             html += `<option value="${option}" ${selected}>${option}</option>`;
         });
         html += `</select>`;
+    } else if (prop['x-widget'] === 'json-file-manager') {
+        // Reusable JSON file manager widget (no CDN, keyboard shortcuts, configurable actions)
+        const widgetConfig = prop['x-widget-config'] || {};
+        const pluginId = currentPluginConfig?.pluginId || window.currentPluginConfig?.pluginId || '';
+        const safeFieldId = (fullKey || 'file_manager').replace(/[^a-zA-Z0-9_-]/g, '_');
+
+        html += `<div id="${safeFieldId}_jfm_mount"></div>`;
+
+        setTimeout(() => {
+            const mount = document.getElementById(`${safeFieldId}_jfm_mount`);
+            if (!mount) return;
+            // Destroy the previous instance for this mount only — leave other instances intact
+            window.__jfmInstances = window.__jfmInstances || {};
+            const prev = window.__jfmInstances[safeFieldId];
+            if (prev?._destroy) prev._destroy();
+            if (typeof JsonFileManager !== 'undefined') {
+                window.__jfmInstances[safeFieldId] = new JsonFileManager(mount, widgetConfig, pluginId);
+            } else {
+                window.__jfmInstances[safeFieldId] = null;
+                mount.innerHTML = '<p style="color:#dc2626;font-size:.875rem;">json-file-manager widget not loaded. Check base.html includes json-file-manager.js.</p>';
+            }
+        }, 150);
     } else if (prop['x-widget'] === 'custom-html') {
         // Custom HTML widget - load HTML from plugin directory
         const htmlFile = prop['x-html-file'];
@@ -4507,6 +4534,8 @@ function syncFormToJson() {
     // Deep merge with existing config to preserve nested structures
     function deepMerge(target, source) {
         for (const key in source) {
+            if (key === '__proto__' || key === 'constructor' || key === 'prototype') continue;
+            if (!Object.prototype.hasOwnProperty.call(source, key)) continue;
             if (source[key] && typeof source[key] === 'object' && !Array.isArray(source[key])) {
                 if (!target[key] || typeof target[key] !== 'object' || Array.isArray(target[key])) {
                     target[key] = {};
@@ -7473,17 +7502,28 @@ setTimeout(function() {
         console.log('installed-plugins-grid not found yet, will retry via event listeners');
     }
 
-    // Also try to attach install button handler after a delay (fallback)
+    // Also try to attach install button handler after a delay (fallback).
+    // Only run if the install button element is already in the DOM (i.e. the
+    // plugins partial has been loaded); otherwise the htmx:afterSettle listener
+    // below handles it when the tab is first visited.
     setTimeout(() => {
-        if (typeof window.attachInstallButtonHandler === 'function') {
+        if (typeof window.attachInstallButtonHandler === 'function' &&
-            console.log('[FALLBACK] Attempting to attach install button handler...');
+            document.getElementById('install-plugin-from-url')) {
             window.attachInstallButtonHandler();
-        } else {
-            console.warn('[FALLBACK] attachInstallButtonHandler not available on window');
         }
     }, 500);
 }, 200);
 
+// Re-run install button wiring after HTMX settles the plugins tab content.
+// Guard with element check so it only fires when the plugins partial is in the DOM,
+// preventing spurious warnings on other tab loads.
+document.addEventListener('htmx:afterSettle', function() {
+    if (document.getElementById('install-plugin-from-url') &&
+        typeof window.attachInstallButtonHandler === 'function') {
+        window.attachInstallButtonHandler();
+    }
+});
+
 // ─── Starlark Apps Integration ──────────────────────────────────────────────
 
 (function() {

web_interface/templates/v3/base.html

@@ -136,6 +136,7 @@
                                 setTimeout(function() {
                                     if (typeof htmx !== 'undefined') {
                                         console.log('HTMX loaded from fallback');
+                                        window.dispatchEvent(new Event('htmx:ready'));
                                         // Load extensions after core loads
                                         loadScript(sseSrc, isAPMode ? 'https://unpkg.com/htmx.org/dist/ext/sse.js' : '/static/v3/js/htmx-sse.js');
                                         loadScript(jsonEncSrc, isAPMode ? 'https://unpkg.com/htmx.org/dist/ext/json-enc.js' : '/static/v3/js/htmx-json-enc.js');
@@ -152,6 +153,7 @@
                         }
                     } else {
                         console.log('HTMX loaded successfully');
+                        window.dispatchEvent(new Event('htmx:ready'));
                         // Load extensions after core loads
                         loadScript(sseSrc, isAPMode ? 'https://unpkg.com/htmx.org/dist/ext/sse.js' : '/static/v3/js/htmx-sse.js');
                         loadScript(jsonEncSrc, isAPMode ? 'https://unpkg.com/htmx.org/dist/ext/json-enc.js' : '/static/v3/js/htmx-json-enc.js');
@@ -349,6 +351,19 @@
                             }
                         }
                     });
+
+                    // Mark tab containers as loaded once their content settles, so switching
+                    // away and back doesn't re-fetch. Scoped to the "loadtab" trigger (tab
+                    // containers only) so modals and plugin config panels can still reload.
+                    document.body.addEventListener('htmx:afterSettle', function(event) {
+                        if (event.detail && event.detail.target) {
+                            var target = event.detail.target;
+                            var trigger = target.getAttribute('hx-trigger') || '';
+                            if (trigger.includes('loadtab')) {
+                                target.setAttribute('data-loaded', 'true');
+                            }
+                        }
+                    });
                 } else {
                     if (document.readyState === 'loading') {
                         document.addEventListener('DOMContentLoaded', setupScriptExecution);
@@ -411,6 +426,9 @@
                     .then(html => {
                         clearTimeout(timeout);
                         content.innerHTML = html;
+                        if (typeof htmx !== 'undefined') {
+                            htmx.process(content);
+                        }
                         // Trigger full initialization chain
                         if (window.pluginManager) {
                             window.pluginManager.initialized = false;
@@ -430,7 +448,7 @@
         }
 
         // Fallback if HTMX doesn't load within 5 seconds
-        setTimeout(() => {
+        var _pluginsFallbackTimer = setTimeout(() => {
             if (typeof htmx === 'undefined') {
                 console.warn('HTMX not loaded after 5 seconds, using direct fetch for plugins');
                 // Load plugins tab content directly regardless of active tab,
@@ -438,6 +456,7 @@
                 loadPluginsDirect();
             }
         }, 5000);
+        window.addEventListener('htmx:ready', function() { clearTimeout(_pluginsFallbackTimer); }, { once: true });
     </script>
     <!-- Alpine.js app function - defined early so it's available when Alpine initializes -->
     <script>
@@ -847,7 +866,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
 
     <!-- Custom v3 styles -->
-    <link rel="stylesheet" href="{{ url_for('static', filename='v3/app.css') }}?v=20260216b">
+    <link rel="stylesheet" href="{{ url_for('static', filename='v3/app.css') }}">
 </head>
 <body x-data="app()" class="bg-gray-50 min-h-screen">
     <!-- Header -->
@@ -1010,7 +1029,7 @@
         <div id="tab-content" class="space-y-6">
             <!-- Overview tab -->
             <div x-show="activeTab === 'overview'" x-transition>
-                <div id="overview-content" hx-get="/v3/partials/overview" hx-trigger="revealed" hx-swap="innerHTML" hx-on::htmx:response-error="loadOverviewDirect()">
+                <div id="overview-content" hx-get="/v3/partials/overview" hx-trigger="loadtab" hx-swap="innerHTML" hx-on::htmx:response-error="loadOverviewDirect()">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1030,6 +1049,9 @@
                             .then(html => {
                                 overviewContent.innerHTML = html;
                                 overviewContent.setAttribute('data-loaded', 'true');
+                                if (typeof htmx !== 'undefined') {
+                                    htmx.process(overviewContent);
+                                }
                                 // Re-initialize Alpine.js for the new content
                                 if (window.Alpine) {
                                     window.Alpine.initTree(overviewContent);
@@ -1058,7 +1080,7 @@
                 });
                 
                 // Also try direct load if HTMX doesn't load within 5 seconds
-                setTimeout(() => {
+                var _overviewFallbackTimer = setTimeout(() => {
                     if (typeof htmx === 'undefined') {
                         console.warn('HTMX not loaded after 5 seconds, using direct fetch for content');
                         const appElement = document.querySelector('[x-data="app()"]');
@@ -1070,11 +1092,12 @@
                         }
                     }
                 }, 5000);
+                window.addEventListener('htmx:ready', function() { clearTimeout(_overviewFallbackTimer); }, { once: true });
             </script>
 
             <!-- General tab -->
             <div x-show="activeTab === 'general'" x-transition>
-                <div id="general-content" hx-get="/v3/partials/general" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="general-content" hx-get="/v3/partials/general" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1092,7 +1115,7 @@
             <div x-show="activeTab === 'wifi'" x-transition>
                 <div id="wifi-content" 
                      hx-get="/v3/partials/wifi" 
-                     hx-trigger="revealed" 
+                     hx-trigger="loadtab" 
                      hx-swap="innerHTML"
                      hx-on::htmx:response-error="loadWifiDirect()">
                     <div class="animate-pulse">
@@ -1143,7 +1166,7 @@
 
             <!-- Schedule tab -->
             <div x-show="activeTab === 'schedule'" x-transition>
-                <div id="schedule-content" hx-get="/v3/partials/schedule" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="schedule-content" hx-get="/v3/partials/schedule" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1159,7 +1182,7 @@
 
             <!-- Display tab -->
             <div x-show="activeTab === 'display'" x-transition>
-                <div id="display-content" hx-get="/v3/partials/display" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="display-content" hx-get="/v3/partials/display" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1174,7 +1197,7 @@
 
             <!-- Backup & Restore tab -->
             <div x-show="activeTab === 'backup-restore'" x-transition>
-                <div id="backup-restore-content" hx-get="/v3/partials/backup-restore" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="backup-restore-content" hx-get="/v3/partials/backup-restore" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1186,7 +1209,7 @@
 
             <!-- Config Editor tab -->
             <div x-show="activeTab === 'config-editor'" x-transition>
-                <div id="config-editor-content" hx-get="/v3/partials/raw-json" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="config-editor-content" hx-get="/v3/partials/raw-json" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1201,7 +1224,7 @@
 
             <!-- Plugins tab -->
             <div x-show="activeTab === 'plugins'" x-transition>
-                <div id="plugins-content" hx-get="/v3/partials/plugins" hx-trigger="revealed" hx-swap="innerHTML"
+                <div id="plugins-content" hx-get="/v3/partials/plugins" hx-trigger="loadtab" hx-swap="innerHTML"
                      hx-on::response-error="loadPluginsDirect()">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
@@ -1218,7 +1241,7 @@
 
             <!-- Fonts tab -->
             <div x-show="activeTab === 'fonts'" x-transition>
-                <div id="fonts-content" hx-get="/v3/partials/fonts" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="fonts-content" hx-get="/v3/partials/fonts" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1233,7 +1256,7 @@
 
             <!-- Logs tab -->
             <div x-show="activeTab === 'logs'" x-transition>
-                <div id="logs-content" hx-get="/v3/partials/logs" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="logs-content" hx-get="/v3/partials/logs" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1245,7 +1268,7 @@
 
             <!-- Cache tab -->
             <div x-show="activeTab === 'cache'" x-transition>
-                <div id="cache-content" hx-get="/v3/partials/cache" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="cache-content" hx-get="/v3/partials/cache" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1257,7 +1280,7 @@
 
             <!-- Operation History tab -->
             <div x-show="activeTab === 'operation-history'" x-transition>
-                <div id="operation-history-content" hx-get="/v3/partials/operation-history" hx-trigger="revealed" hx-swap="innerHTML">
+                <div id="operation-history-content" hx-get="/v3/partials/operation-history" hx-trigger="loadtab" hx-swap="innerHTML">
                     <div class="animate-pulse">
                         <div class="bg-white rounded-lg shadow p-6">
                             <div class="h-4 bg-gray-200 rounded w-1/4 mb-4"></div>
@@ -1346,34 +1369,64 @@
 
     <!-- SSE connection for real-time updates -->
     <script>
-        // Connect to SSE streams
+        // Assign to window so reconnectSSE() in app.js can reach them.
-        const statsSource = new EventSource('/api/v3/stream/stats');
+        window.statsSource = new EventSource('/api/v3/stream/stats');
-        const displaySource = new EventSource('/api/v3/stream/display');
+        window.displaySource = new EventSource('/api/v3/stream/display');
 
-        statsSource.onmessage = function(event) {
+        window.statsSource.onmessage = function(event) {
             const data = JSON.parse(event.data);
             updateSystemStats(data);
         };
 
-        displaySource.onmessage = function(event) {
+        window.displaySource.onmessage = function(event) {
             const data = JSON.parse(event.data);
             updateDisplayPreview(data);
         };
 
-        // Connection status
+        function _setConnectionStatus(connected, reconnecting) {
-        statsSource.addEventListener('open', function() {
+            const el = document.getElementById('connection-status');
-            document.getElementById('connection-status').innerHTML = `
+            if (!el) return;
+            if (connected) {
+                el.innerHTML = `
                     <div class="w-2 h-2 bg-green-500 rounded-full"></div>
                     <span class="text-gray-600">Connected</span>
                 `;
-        });
+            } else if (reconnecting) {
-
+                el.innerHTML = `
-        statsSource.addEventListener('error', function() {
+                    <div class="w-2 h-2 bg-yellow-500 rounded-full animate-pulse"></div>
-            document.getElementById('connection-status').innerHTML = `
+                    <span class="text-gray-600">Reconnecting…</span>
-                <div class="w-2 h-2 bg-red-500 rounded-full"></div>
-                <span class="text-gray-600">Disconnected</span>
                 `;
-        });
+            } else {
+                el.innerHTML = `
+                    <div class="w-2 h-2 bg-red-500 rounded-full"></div>
+                    <span class="text-gray-600" title="Connection lost — try refreshing the page">Disconnected</span>
+                `;
+            }
+        }
+
+        var _statsErrorCount = 0;
+
+        // Named on window so reconnectSSE() in app.js can reattach them after
+        // replacing the EventSource instances.
+        window._statsOpenHandler = function() {
+            _statsErrorCount = 0;
+            _setConnectionStatus(true, false);
+        };
+        window._statsErrorHandler = function() {
+            _statsErrorCount++;
+            // EventSource readyState 0 = CONNECTING (auto-retrying), 2 = CLOSED
+            var reconnecting = window.statsSource.readyState === EventSource.CONNECTING;
+            _setConnectionStatus(false, reconnecting && _statsErrorCount <= 3);
+        };
+        window._displayErrorHandler = function() {
+            // Display stream errors don't change the status badge but log to console
+            // so failures aren't completely silent.
+            console.warn('LEDMatrix: display preview stream error (readyState=' + window.displaySource.readyState + ')');
+        };
+
+        window.statsSource.addEventListener('open', window._statsOpenHandler);
+        window.statsSource.addEventListener('error', window._statsErrorHandler);
+        window.displaySource.addEventListener('error', window._displayErrorHandler);
 
         function updateSystemStats(data) {
             // Update CPU in header
@@ -1807,23 +1860,53 @@
                 },
 
                 loadTabContent(tab) {
-                    // Try to load content for the active tab
+                    const contentEl = document.getElementById(tab + '-content');
+                    // data-loaded: already fetched. data-loading: a fetch is queued or in
+                    // flight. Both guard against re-entry so a panel loads exactly once, even
+                    // if the tab is reopened before an in-progress (or polling) load settles.
+                    if (!contentEl || contentEl.hasAttribute('data-loaded') || contentEl.hasAttribute('data-loading')) return;
+                    const url = contentEl.getAttribute('hx-get');
+                    if (!url) return;
+
+                    contentEl.setAttribute('data-loading', 'true');
+
+                    // htmx.ajax issues the request and swaps the response into the panel
+                    // directly, so it works even before htmx has wired up the element's
+                    // hx-trigger listeners. data-loaded is stamped on success so the panel
+                    // loads once; the activeTab check drops loads for a tab the user navigated
+                    // away from while htmx was still loading (avoids fetching hidden panels).
+                    const swap = contentEl.getAttribute('hx-swap') || 'innerHTML';
+                    const load = () => {
+                        if (this.activeTab !== tab || contentEl.hasAttribute('data-loaded')) {
+                            contentEl.removeAttribute('data-loading');
+                            return;
+                        }
+                        return htmx.ajax('GET', url, { target: contentEl, swap: swap })
+                            .then(() => contentEl.setAttribute('data-loaded', 'true'))
+                            .catch(() => {}) // leave unstamped on failure so it can retry
+                            .finally(() => contentEl.removeAttribute('data-loading'));
+                    };
+
                     if (typeof htmx !== 'undefined') {
-                        const contentId = tab + '-content';
+                        load();
-                        const contentEl = document.getElementById(contentId);
+                        return;
-                        if (contentEl && !contentEl.hasAttribute('data-loaded')) {
-                            // Trigger HTMX load
-                            htmx.trigger(contentEl, 'revealed');
-                        }
-                    } else {
-                        // HTMX not available, use direct fetch
-                        console.warn('HTMX not available, using direct fetch for tab:', tab);
-                        if (tab === 'overview' && typeof loadOverviewDirect === 'function') {
-                            loadOverviewDirect();
-                        } else if (tab === 'wifi' && typeof loadWifiDirect === 'function') {
-                            loadWifiDirect();
                     }
+
+                    // htmx is loaded from a CDN and may not be ready yet. Poll until it is,
+                    // then load; if it never arrives, fall back to a direct fetch.
+                    let tries = 0;
+                    const timer = setInterval(() => {
+                        if (typeof htmx !== 'undefined') {
+                            clearInterval(timer);
+                            load();
+                        } else if (++tries > 100) { // ~10s
+                            clearInterval(timer);
+                            contentEl.removeAttribute('data-loading');
+                            if (tab === 'overview' && typeof loadOverviewDirect === 'function') loadOverviewDirect();
+                            else if (tab === 'wifi' && typeof loadWifiDirect === 'function') loadWifiDirect();
+                            else if (tab === 'plugins' && typeof loadPluginsDirect === 'function') loadPluginsDirect();
                         }
+                    }, 100);
                 },
 
                 async loadInstalledPlugins() {
@@ -4566,6 +4649,9 @@
     <script src="{{ url_for('static', filename='v3/js/widgets/timezone-selector.js') }}" defer></script>
     <script src="{{ url_for('static', filename='v3/js/widgets/plugin-loader.js') }}" defer></script>
     
+    <!-- Reusable JSON file manager widget (used by of-the-day and others via x-widget: json-file-manager) -->
+    <script src="{{ url_for('static', filename='v3/js/widgets/json-file-manager.js') }}" defer></script>
+
     <!-- Legacy plugins_manager.js (for backward compatibility during migration) -->
     <script src="{{ url_for('static', filename='v3/plugins_manager.js') }}?v=20260307" defer></script>
     

web_interface/templates/v3/index.html

@@ -73,7 +73,7 @@
             <button hx-post="/api/v3/system/action"
                     hx-vals='{"action": "start_display"}'
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Display started', event.detail.xhr.responseJSON.status || 'success'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Display started',s='success'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-green-600 hover:bg-green-700">
                 <i class="fas fa-play mr-2"></i>
                 Start Display
@@ -82,7 +82,7 @@
             <button hx-post="/api/v3/system/action"
                     hx-vals='{"action": "stop_display"}'
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Display stopped', event.detail.xhr.responseJSON.status || 'success'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Display stopped',s='success'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-red-600 hover:bg-red-700">
                 <i class="fas fa-stop mr-2"></i>
                 Stop Display
@@ -91,7 +91,7 @@
             <button hx-post="/api/v3/system/action"
                     hx-vals='{"action": "git_pull"}'
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Code update completed', event.detail.xhr.responseJSON.status || 'info'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Code update completed',s='info'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50">
                 <i class="fas fa-download mr-2"></i>
                 Update Code
@@ -101,7 +101,7 @@
                     hx-vals='{"action": "reboot_system"}'
                     hx-confirm="Are you sure you want to reboot the system?"
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'System rebooting...', event.detail.xhr.responseJSON.status || 'info'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='System rebooting...',s='info'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-white bg-yellow-600 hover:bg-yellow-700">
                 <i class="fas fa-power-off mr-2"></i>
                 Reboot System

web_interface/templates/v3/partials/display.html

@@ -68,7 +68,7 @@
                            name="chain_length"
                            value="{{ main_config.display.hardware.chain_length or 2 }}"
                            min="1"
-                           max="8"
+                           max="24"
                            class="form-control">
                     <p class="mt-1 text-sm text-gray-600">Number of LED panels chained together</p>
                 </div>

web_interface/templates/v3/partials/fonts.html

@@ -843,6 +843,14 @@ async function updateFontPreview() {
         return;
     }
 
+    // BDF bitmap fonts cannot be rendered server-side — skip the API call
+    if (family.toLowerCase().endsWith('.bdf')) {
+        previewImage.style.display = 'none';
+        loadingText.style.display = 'block';
+        loadingText.textContent = 'Preview not available for BDF bitmap fonts';
+        return;
+    }
+
     // Show loading state
     loadingText.textContent = 'Loading preview...';
     loadingText.style.display = 'block';

web_interface/templates/v3/partials/overview.html

@@ -1,3 +1,66 @@
+<!-- Reconciliation warning banner: shown when startup reconciliation found stale plugin config entries -->
+<div id="reconciliation-banner" class="bg-yellow-50 border border-yellow-300 rounded-lg p-4 mb-4 flex items-start" style="display:none !important" role="alert">
+    <div class="flex-shrink-0 mr-3 mt-0.5">
+        <i class="fas fa-exclamation-triangle text-yellow-500"></i>
+    </div>
+    <div class="flex-1">
+        <p class="text-sm font-medium text-yellow-800">Plugin Config Warning</p>
+        <p class="text-sm text-yellow-700 mt-1" id="reconciliation-banner-text"></p>
+    </div>
+    <button type="button" onclick="window.dismissReconciliationBanner()" class="ml-4 flex-shrink-0 text-yellow-500 hover:text-yellow-700" aria-label="Dismiss">
+        <i class="fas fa-times"></i>
+    </button>
+</div>
+<script>
+(function () {
+    var DISMISS_KEY = 'ledmatrix-recon-dismissed';
+    var _recon_timer = null;
+
+    function checkReconciliation() {
+        fetch('/api/v3/plugins/reconciliation-status')
+            .then(function (r) { return r.json(); })
+            .then(function (resp) {
+                var d = resp.data || {};
+                if (!d.done) {
+                    // Reconciliation still running — poll again shortly
+                    _recon_timer = setTimeout(checkReconciliation, 2000);
+                    return;
+                }
+                _recon_timer = null;
+                if (!d.unresolved || d.unresolved.length === 0) return;
+                var key = d.unresolved.map(function (i) { return i.plugin_id; }).sort().join(',');
+                if (sessionStorage.getItem(DISMISS_KEY) === key) return;
+                var ids = d.unresolved.map(function (i) { return i.plugin_id; }).join(', ');
+                document.getElementById('reconciliation-banner-text').textContent =
+                    'Stale plugin config entries found: ' + ids +
+                    '. Remove them from config.json or reinstall via the Plugin Store.';
+                var banner = document.getElementById('reconciliation-banner');
+                banner.dataset.dismissKey = key;
+                banner.style.setProperty('display', 'flex', 'important');
+            })
+            .catch(function () {});
+    }
+    checkReconciliation();
+
+    window.dismissReconciliationBanner = function () {
+        var banner = document.getElementById('reconciliation-banner');
+        banner.style.setProperty('display', 'none', 'important');
+        if (_recon_timer !== null) {
+            clearTimeout(_recon_timer);
+            _recon_timer = null;
+        }
+        // Persist dismissal immediately so the banner won't reappear on reload
+        // even if the background sync fetch below fails.
+        var key = banner.dataset.dismissKey;
+        if (key) {
+            try { sessionStorage.setItem(DISMISS_KEY, key); } catch (e) {}
+        }
+        // Background sync only — do not rely on this for DISMISS_KEY or hiding.
+        fetch('/api/v3/plugins/reconciliation-status').catch(function () {});
+    };
+}());
+</script>
+
 <div class="bg-white rounded-lg shadow p-6">
     <div class="border-b border-gray-200 pb-4 mb-6">
         <h2 class="text-lg font-semibold text-gray-900">System Overview</h2>
@@ -88,7 +151,7 @@
             <button hx-post="/api/v3/system/action"
                     hx-vals='{"action": "start_display"}'
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Display started', event.detail.xhr.responseJSON.status || 'success'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Display started',s='success'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-transparent text-base font-semibold rounded-md text-white bg-green-600 hover:bg-green-700">
                 <i class="fas fa-play mr-2"></i>
                 Start Display
@@ -97,7 +160,7 @@
             <button hx-post="/api/v3/system/action"
                     hx-vals='{"action": "stop_display"}'
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Display stopped', event.detail.xhr.responseJSON.status || 'success'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Display stopped',s='success'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-transparent text-base font-semibold rounded-md text-white bg-red-600 hover:bg-red-700">
                 <i class="fas fa-stop mr-2"></i>
                 Stop Display
@@ -107,7 +170,7 @@
                     hx-vals='{"action": "git_pull"}'
                     hx-confirm="This will stash any local changes and update the code. Continue?"
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Code update completed', event.detail.xhr.responseJSON.status || 'info'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Code update completed',s='info'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-gray-300 text-base font-semibold rounded-md text-gray-900 bg-white hover:bg-gray-50">
                 <i class="fas fa-download mr-2"></i>
                 Update Code
@@ -117,7 +180,7 @@
                     hx-vals='{"action": "reboot_system"}'
                     hx-confirm="Are you sure you want to reboot the system?"
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'System rebooting...', event.detail.xhr.responseJSON.status || 'info'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='System rebooting...',s='info'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-transparent text-base font-semibold rounded-md text-white bg-yellow-600 hover:bg-yellow-700">
                 <i class="fas fa-power-off mr-2"></i>
                 Reboot System
@@ -127,7 +190,7 @@
                     hx-vals='{"action": "shutdown_system"}'
                     hx-confirm="Are you sure you want to shut down the system? This will power off the Raspberry Pi."
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'System shutting down...', event.detail.xhr.responseJSON.status || 'info'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='System shutting down...',s='info'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-transparent text-base font-semibold rounded-md text-white bg-red-800 hover:bg-red-900">
                 <i class="fas fa-power-off mr-2"></i>
                 Shutdown System
@@ -136,7 +199,7 @@
             <button hx-post="/api/v3/system/action"
                     hx-vals='{"action": "restart_display_service"}'
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Display service restarted', event.detail.xhr.responseJSON.status || 'success'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Display service restarted',s='success'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-gray-300 text-base font-semibold rounded-md text-gray-900 bg-white hover:bg-gray-50">
                 <i class="fas fa-redo mr-2"></i>
                 Restart Display Service
@@ -145,7 +208,7 @@
             <button hx-post="/api/v3/system/action"
                     hx-vals='{"action": "restart_web_service"}'
                     hx-swap="none"
-                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined' && event.detail.xhr && event.detail.xhr.responseJSON) { showNotification(event.detail.xhr.responseJSON.message || 'Web service restarted', event.detail.xhr.responseJSON.status || 'success'); }"
+                    hx-on:htmx:after-request="if (typeof showNotification !== 'undefined') { var m='Web service restarted',s='success'; try { var d=JSON.parse(event.detail.xhr.responseText); m=d.message||m; s=d.status||s; } catch(e) { s=(event.detail.xhr&&event.detail.xhr.status>=400?'error':s); } showNotification(m,s); }"
                     class="inline-flex items-center px-4 py-2 border border-gray-300 text-base font-semibold rounded-md text-gray-900 bg-white hover:bg-gray-50">
                 <i class="fas fa-redo mr-2"></i>
                 Restart Web Service

web_interface/templates/v3/partials/plugin_config.html

@@ -9,7 +9,8 @@
     {% set field_id = (plugin_id ~ '-' ~ full_key)|replace('.', '-')|replace('_', '-') %}
     {% set label = prop.title if prop.title else key|replace('_', ' ')|title %}
     {% set description = prop.description if prop.description else '' %}
-    {% set field_type = prop.type if prop.type is string else (prop.type[0] if prop.type is iterable else 'string') %}
+    {% set _pt = prop.get('type') %}
+    {% set field_type = _pt if (_pt is string) else ((_pt | first) if (_pt and _pt is iterable and _pt is not string) else 'string') %}
     
     {# Handle nested objects - check for widget first #}
     {% if field_type == 'object' %}
@@ -496,15 +497,31 @@
                     {% endif %}
 
                     <div class="array-table-container mt-1" data-field-id="{{ field_id }}" data-full-key="{{ full_key }}" data-max-items="{{ max_items }}" data-plugin-id="{{ plugin_id }}">
-                        <table class="min-w-full divide-y divide-gray-200 border border-gray-300 rounded-lg">
+                        <div style="overflow-x:auto">
+                        <table class="divide-y divide-gray-200 border border-gray-300 rounded-lg" style="min-width:max-content;width:100%">
                             <thead class="bg-gray-50">
                                 <tr>
                                     {% for col_name in display_columns %}
                                         {% set col_def = item_properties.get(col_name, {}) %}
                                         {% set col_title = col_def.get('title', col_name|replace('_', ' ')|title) %}
-                                        <th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{{ col_title }}</th>
+                                        {% set col_xwidget = col_def.get('x-widget') or col_def.get('x_widget', '') %}
+                                        {% set col_enum = col_def.get('enum', []) %}
+                                        {% set _raw_ctype = col_def.get('type', 'string') %}
+                                        {% if _raw_ctype is iterable and _raw_ctype is not string %}
+                                            {% set col_ctype = (_raw_ctype | reject('equalto','null') | list | first) or 'string' %}
+                                        {% else %}
+                                            {% set col_ctype = _raw_ctype or 'string' %}
+                                        {% endif %}
+                                        {% if col_xwidget == 'date-picker' %}{% set col_min_w = '140px' %}
+                                        {% elif col_xwidget == 'time-picker' %}{% set col_min_w = '115px' %}
+                                        {% elif col_xwidget == 'file-upload-single' %}{% set col_min_w = '200px' %}
+                                        {% elif col_enum %}{% set col_min_w = '90px' %}
+                                        {% elif col_ctype == 'boolean' %}{% set col_min_w = '60px' %}
+                                        {% elif col_ctype in ['integer', 'number'] %}{% set col_min_w = '80px' %}
+                                        {% else %}{% set col_min_w = '110px' %}{% endif %}
+                                        <th class="px-3 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider" style="min-width:{{ col_min_w }}">{{ col_title }}</th>
                                     {% endfor %}
-                                    <th class="px-4 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider w-20">Actions</th>
+                                    <th class="px-3 py-3 text-center text-xs font-medium text-gray-500 uppercase tracking-wider" style="min-width:90px">Actions</th>
                                 </tr>
                             </thead>
                             <tbody id="{{ field_id }}_tbody" class="bg-white divide-y divide-gray-200">
@@ -513,9 +530,24 @@
                                 <tr class="array-table-row" data-index="{{ item_index }}">
                                     {% for col_name in display_columns %}
                                         {% set col_def = item_properties.get(col_name, {}) %}
-                                        {% set col_type = col_def.get('type', 'string') %}
+                                        {# Normalize nullable types e.g. ["null","integer"] → "integer" #}
+                                        {% set _raw_type = col_def.get('type', 'string') %}
+                                        {% if _raw_type is iterable and _raw_type is not string %}
+                                            {% set col_type = (_raw_type | reject('equalto','null') | list | first) or 'string' %}
+                                        {% else %}
+                                            {% set col_type = _raw_type or 'string' %}
+                                        {% endif %}
+                                        {% set col_xwidget = col_def.get('x-widget') or col_def.get('x_widget', '') %}
+                                        {% set col_enum = col_def.get('enum', []) %}
                                         {% set col_value = item.get(col_name, col_def.get('default', '')) %}
-                                        <td class="px-4 py-3 whitespace-nowrap">
+                                        {% if col_xwidget == 'date-picker' %}{% set td_min_w = '140px' %}
+                                        {% elif col_xwidget == 'time-picker' %}{% set td_min_w = '115px' %}
+                                        {% elif col_xwidget == 'file-upload-single' %}{% set td_min_w = '200px' %}
+                                        {% elif col_enum %}{% set td_min_w = '90px' %}
+                                        {% elif col_type == 'boolean' %}{% set td_min_w = '60px' %}
+                                        {% elif col_type in ['integer', 'number'] %}{% set td_min_w = '80px' %}
+                                        {% else %}{% set td_min_w = '110px' %}{% endif %}
+                                        <td class="px-3 py-3 whitespace-nowrap" style="min-width:{{ td_min_w }};vertical-align:middle">
                                             {% if col_type == 'boolean' %}
                                                 <input type="hidden" name="{{ full_key }}.{{ item_index }}.{{ col_name }}" value="false">
                                                 <input type="checkbox"
@@ -532,6 +564,43 @@
                                                        {% if col_type == 'integer' %}step="1"{% else %}step="any"{% endif %}
                                                        class="block w-20 px-2 py-1 border border-gray-300 rounded text-sm text-center"
                                                        {% if col_def.get('description') %}title="{{ col_def.get('description') }}"{% endif %}>
+                                            {% elif col_enum %}
+                                                <select name="{{ full_key }}.{{ item_index }}.{{ col_name }}"
+                                                        class="block w-full px-2 py-1 border border-gray-300 rounded text-sm bg-white">
+                                                    {% for opt in col_enum %}{% if opt is not none %}
+                                                    <option value="{{ opt }}" {% if col_value == opt or (col_value is none and col_def.get('default') == opt) %}selected{% endif %}>{{ opt }}</option>
+                                                    {% endif %}{% endfor %}
+                                                </select>
+                                            {% elif col_xwidget == 'date-picker' %}
+                                                <input type="date"
+                                                       name="{{ full_key }}.{{ item_index }}.{{ col_name }}"
+                                                       value="{{ col_value if col_value is not none else '' }}"
+                                                       class="block w-full px-2 py-1 border border-gray-300 rounded text-sm">
+                                            {% elif col_xwidget == 'time-picker' %}
+                                                <input type="time"
+                                                       name="{{ full_key }}.{{ item_index }}.{{ col_name }}"
+                                                       value="{{ col_value if col_value is not none else '00:00' }}"
+                                                       class="block w-full px-2 py-1 border border-gray-300 rounded text-sm">
+                                            {% elif col_xwidget == 'file-upload-single' %}
+                                                {% set cell_input_id = field_id ~ '_' ~ item_index ~ '_' ~ col_name %}
+                                                <div class="flex items-center gap-1">
+                                                    {% if col_value %}<img src="/{{ col_value }}" class="w-6 h-6 object-cover rounded flex-shrink-0" onerror="this.style.display='none'">{% endif %}
+                                                    <input type="text"
+                                                           id="{{ cell_input_id }}"
+                                                           name="{{ full_key }}.{{ item_index }}.{{ col_name }}"
+                                                           value="{{ col_value if col_value is not none else '' }}"
+                                                           class="block w-20 px-1 py-1 border border-gray-300 rounded text-xs"
+                                                           placeholder="path…">
+                                                    <label class="cursor-pointer flex-shrink-0 inline-flex items-center px-1 py-1 bg-blue-50 border border-blue-200 rounded text-xs text-blue-600 hover:bg-blue-100" title="Upload image">
+                                                        <i class="fas fa-upload"></i>
+                                                        <input type="file"
+                                                               accept="image/png,image/jpeg,image/bmp,image/gif"
+                                                               style="display:none"
+                                                               data-plugin-id="{{ plugin_id }}"
+                                                               data-target-input="{{ cell_input_id }}"
+                                                               onchange="(function(e){ const t=document.getElementById('{{ cell_input_id }}'); const p=t.previousElementSibling && t.previousElementSibling.tagName==='IMG' ? t.previousElementSibling : null; window.handleArrayTableImageUpload(e,t,p,'{{ plugin_id }}'); })(event)">
+                                                    </label>
+                                                </div>
                                             {% else %}
                                                 <input type="text"
                                                        name="{{ full_key }}.{{ item_index }}.{{ col_name }}"
@@ -544,13 +613,60 @@
                                             {% endif %}
                                         </td>
                                     {% endfor %}
-                                    <td class="px-4 py-3 whitespace-nowrap text-center">
+
+                                    {# Actions cell: delete + optional edit button for advanced props #}
+                                    {% set has_advanced = namespace(value=false) %}
+                                    {% for k in item_properties.keys() %}{% if k not in display_columns and k != 'id' %}{% set has_advanced.value = true %}{% endif %}{% endfor %}
+                                    <td class="px-3 py-3 whitespace-nowrap text-center" style="min-width:90px;vertical-align:middle">
                                         <button type="button"
                                                 onclick="removeArrayTableRow(this)"
                                                 class="text-red-600 hover:text-red-800 px-2 py-1">
                                             <i class="fas fa-trash"></i>
                                         </button>
+                                        {% if has_advanced.value %}
+                                        <button type="button"
+                                                onclick="openArrayTableRowEditor(this)"
+                                                class="text-blue-500 hover:text-blue-700 px-2 py-1 ml-1"
+                                                title="Edit layout, style and other advanced properties">
+                                            <i class="fas fa-sliders-h"></i>
+                                        </button>
+                                        {% endif %}
                                     </td>
+
+                                    {# Hidden cell: flat hidden inputs for non-displayed props (layout, style, etc.) #}
+                                    {% if has_advanced.value %}
+                                    {% set adv_schema = namespace(d={}) %}
+                                    {% for k, v in item_properties.items() %}{% if k not in display_columns and k != 'id' %}{% set _ = adv_schema.d.update({k: v}) %}{% endif %}{% endfor %}
+                                    <td style="display:none" class="array-table-advanced-data"
+                                        data-prop-schema='{{ adv_schema.d|tojson }}'>
+                                        {% for prop_name, prop_schema in adv_schema.d.items() %}
+                                            {% set prop_type = prop_schema.get('type', 'string') %}
+                                            {% if prop_type == 'object' and prop_schema.get('properties') %}
+                                                {% for sub_name, sub_schema in prop_schema.get('properties', {}).items() %}
+                                                    {% set sub_val = item.get(prop_name, {}).get(sub_name) %}
+                                                    {% set sub_default = sub_schema.get('default') %}
+                                                    {% set final_val = sub_val if sub_val is not none else sub_default %}
+                                                    <input type="hidden"
+                                                           name="{{ full_key }}.{{ item_index }}.{{ prop_name }}.{{ sub_name }}"
+                                                           data-nested-prop="{{ prop_name }}.{{ sub_name }}"
+                                                           data-prop-type="{{ sub_schema.get('type', 'string') }}"
+                                                           data-prop-schema='{{ sub_schema|tojson }}'
+                                                           value="{{ final_val if final_val is not none else '' }}">
+                                                {% endfor %}
+                                            {% else %}
+                                                {% set prop_val = item.get(prop_name) %}
+                                                {% set prop_default = prop_schema.get('default') %}
+                                                {% set final_val = prop_val if prop_val is not none else prop_default %}
+                                                <input type="hidden"
+                                                       name="{{ full_key }}.{{ item_index }}.{{ prop_name }}"
+                                                       data-nested-prop="{{ prop_name }}"
+                                                       data-prop-type="{{ prop_schema.get('type', 'string') }}"
+                                                       data-prop-schema='{{ prop_schema|tojson }}'
+                                                       value="{{ final_val if final_val is not none else '' }}">
+                                            {% endif %}
+                                        {% endfor %}
+                                    </td>
+                                    {% endif %}
                                 </tr>
                                 {% endfor %}
                             </tbody>
@@ -562,11 +678,58 @@
                                 data-max-items="{{ max_items }}"
                                 data-plugin-id="{{ plugin_id }}"
                                 data-item-properties='{% set ns = namespace(d={}) %}{% for k in display_columns %}{% if k in item_properties %}{% set _ = ns.d.update({k: item_properties[k]}) %}{% endif %}{% endfor %}{{ ns.d|tojson }}'
+                                data-full-item-properties='{{ item_properties|tojson }}'
                                 data-display-columns='{{ display_columns|tojson }}'
                                 class="mt-3 px-4 py-2 text-sm bg-blue-600 hover:bg-blue-700 text-white rounded-md"
                                 {% if array_value|length >= max_items %}disabled style="opacity: 0.5;"{% endif %}>
                             <i class="fas fa-plus mr-1"></i> Add Item
                         </button>
+                        </div>{# end overflow-x:auto wrapper #}
+                    </div>
+                {% elif x_widget == 'color-picker' %}
+                    {# RGB color array: R / G / B number inputs + visual swatch + sync'd hex picker #}
+                    {% set color_arr = value if value is not none and value is iterable and value is not string else (prop.default if prop.default is defined and prop.default is iterable and prop.default is not string else [255, 255, 255]) %}
+                    {% set r_val = color_arr[0] if color_arr|length > 0 else 255 %}
+                    {% set g_val = color_arr[1] if color_arr|length > 1 else 255 %}
+                    {% set b_val = color_arr[2] if color_arr|length > 2 else 255 %}
+                    {% set hex_val = '#%02x%02x%02x' % (r_val|int, g_val|int, b_val|int) %}
+                    <div class="flex items-center gap-3 flex-wrap mt-1" id="{{ field_id }}_color_row">
+                        <input type="color"
+                               id="{{ field_id }}_hex"
+                               value="{{ hex_val }}"
+                               class="h-9 w-12 cursor-pointer rounded border border-gray-300"
+                               title="Color picker"
+                               oninput="(function(h){var r=parseInt(h.slice(1,3),16),g=parseInt(h.slice(3,5),16),b=parseInt(h.slice(5,7),16);document.getElementById('{{ field_id }}_r').value=r;document.getElementById('{{ field_id }}_g').value=g;document.getElementById('{{ field_id }}_b').value=b;})(this.value)">
+                        <div class="flex items-center gap-1">
+                            <label class="text-xs text-gray-500 font-medium">R</label>
+                            <input type="number" min="0" max="255" step="1"
+                                   id="{{ field_id }}_r"
+                                   name="{{ full_key }}.0"
+                                   value="{{ r_val }}"
+                                   class="w-16 px-2 py-1 border border-gray-300 rounded text-sm text-center"
+                                   oninput="(function(){var r=+document.getElementById('{{ field_id }}_r').value||0,g=+document.getElementById('{{ field_id }}_g').value||0,b=+document.getElementById('{{ field_id }}_b').value||0;document.getElementById('{{ field_id }}_hex').value='#'+[r,g,b].map(function(n){return n.toString(16).padStart(2,'0')}).join('')})()">
+                        </div>
+                        <div class="flex items-center gap-1">
+                            <label class="text-xs text-gray-500 font-medium">G</label>
+                            <input type="number" min="0" max="255" step="1"
+                                   id="{{ field_id }}_g"
+                                   name="{{ full_key }}.1"
+                                   value="{{ g_val }}"
+                                   class="w-16 px-2 py-1 border border-gray-300 rounded text-sm text-center"
+                                   oninput="(function(){var r=+document.getElementById('{{ field_id }}_r').value||0,g=+document.getElementById('{{ field_id }}_g').value||0,b=+document.getElementById('{{ field_id }}_b').value||0;document.getElementById('{{ field_id }}_hex').value='#'+[r,g,b].map(function(n){return n.toString(16).padStart(2,'0')}).join('')})()">
+                        </div>
+                        <div class="flex items-center gap-1">
+                            <label class="text-xs text-gray-500 font-medium">B</label>
+                            <input type="number" min="0" max="255" step="1"
+                                   id="{{ field_id }}_b"
+                                   name="{{ full_key }}.2"
+                                   value="{{ b_val }}"
+                                   class="w-16 px-2 py-1 border border-gray-300 rounded text-sm text-center"
+                                   oninput="(function(){var r=+document.getElementById('{{ field_id }}_r').value||0,g=+document.getElementById('{{ field_id }}_g').value||0,b=+document.getElementById('{{ field_id }}_b').value||0;document.getElementById('{{ field_id }}_hex').value='#'+[r,g,b].map(function(n){return n.toString(16).padStart(2,'0')}).join('')})()">
+                        </div>
+                        <div class="w-8 h-8 rounded border border-gray-300 flex-shrink-0"
+                             style="background-color: rgb({{ r_val }}, {{ g_val }}, {{ b_val }})"
+                             title="Color preview"></div>
                     </div>
                 {% else %}
                     {# Generic array-of-objects would go here if needed in the future #}
@@ -625,7 +788,19 @@
                            name="{{ full_key }}"
                            value="{{ str_value }}">
                 </div>
-            {% elif str_widget in ['text-input', 'textarea', 'select-dropdown', 'toggle-switch', 'radio-group', 'date-picker', 'slider', 'color-picker', 'email-input', 'url-input', 'password-input', 'font-selector'] %}
+            {% elif str_widget == 'json-file-manager' %}
+                {# Embedded file manager — plugin's web_ui/file_manager.html served via /v3/plugin-ui/ route #}
+                <div class="mt-1 rounded-lg border border-gray-200 overflow-hidden">
+                    <iframe id="{{ field_id }}_frame"
+                            src="/v3/plugin-ui/{{ plugin_id }}/web-ui/file_manager.html"
+                            style="width:100%;height:640px;border:none;"
+                            title="File Manager for {{ plugin_id }}"></iframe>
+                </div>
+                <p class="text-xs text-amber-600 mt-2 flex items-center">
+                    <i class="fas fa-info-circle mr-1"></i>
+                    Changes in the file manager save immediately — no need to click Save Configuration.
+                </p>
+            {% elif str_widget in ['text-input', 'textarea', 'select-dropdown', 'toggle-switch', 'radio-group', 'date-picker', 'time-picker', 'slider', 'color-picker', 'email-input', 'url-input', 'password-input', 'font-selector', 'file-upload-single', 'plugin-file-manager'] %}
                 {# Render widget container #}
                 <div id="{{ field_id }}_container" class="{{ str_widget }}-container"></div>
                 <script>
@@ -642,7 +817,9 @@
                             'enum': {{ (prop.enum or [])|tojson|safe }},
                             'minimum': {{ prop.minimum|tojson if prop.minimum is defined else 'null' }},
                             'maximum': {{ prop.maximum|tojson if prop.maximum is defined else 'null' }},
-                            'x-options': {{ (prop.get('x-options') or prop.get('x_options') or {})|tojson|safe }}
+                            'x-options': {{ (prop.get('x-options') or prop.get('x_options') or {})|tojson|safe }},
+                            'x-upload-config': {{ (prop.get('x-upload-config') or prop.get('x_upload_config') or {})|tojson|safe }},
+                            'x-widget-config': {{ (prop.get('x-widget-config') or prop.get('x_widget_config') or {})|tojson|safe }}
                         };
                         widget.render(container, config, value, { fieldId: '{{ field_id }}', name: '{{ full_key }}', pluginId: '{{ plugin_id }}' });
                     }
@@ -863,15 +1040,28 @@
             </div>
         </div>
         
-        {# Web UI Actions (if any) #}
+        {# Web UI Actions — hide if schema has a dedicated file-manager widget,
-        {% if web_ui_actions %}
+           or if every action is marked ui_hidden in the manifest. #}
+        {% set has_file_manager_widget = namespace(value=false) %}
+        {% for _fk, _fp in schema.get('properties', {}).items() %}
+            {% if (_fp.get('x-widget') or _fp.get('x_widget')) in ('json-file-manager', 'plugin-file-manager') %}
+                {% set has_file_manager_widget.value = true %}
+            {% endif %}
+        {% endfor %}
+        {% set visible_actions = [] %}
+        {% for _a in web_ui_actions %}
+            {% if not _a.get('ui_hidden', false) %}
+                {% set _ = visible_actions.append(_a) %}
+            {% endif %}
+        {% endfor %}
+        {% if visible_actions and not has_file_manager_widget.value %}
         <div class="mt-6 pt-4 border-t border-gray-200">
             <h3 class="text-md font-medium text-gray-900 mb-3">Plugin Actions</h3>
-            {% if web_ui_actions[0].section_description %}
+            {% if visible_actions[0].section_description %}
-            <p class="text-sm text-gray-600 mb-4">{{ web_ui_actions[0].section_description }}</p>
+            <p class="text-sm text-gray-600 mb-4">{{ visible_actions[0].section_description }}</p>
             {% endif %}
             <div class="space-y-3">
-                {% for action in web_ui_actions %}
+                {% for action in visible_actions %}
                 {% set action_id = "action-" ~ action.id ~ "-" ~ loop.index0 %}
                 {% set status_id = "action-status-" ~ action.id ~ "-" ~ loop.index0 %}
                 {% set bg_color = action.color or 'blue' %}