Merge remote-tracking branch 'origin/main' into claude/ponytail-audit-e181d9

# Conflicts:
#	CHANGELOG.md
#	src/plugin_system/plugin_catalog.py
#	web_interface/app.py

web_interface/app.py

@@ -159,7 +159,17 @@ schema_manager = SchemaManager(
 # saves reach the running plugins through the display's config watcher; what
 # the display knows at run time (health, metrics, errors, current mode) it
 # publishes to the shared cache. See docs/ARCHITECTURE.md.
-plugin_catalog = PluginCatalog(plugins_dir=plugins_dir)
+def _catalog_runtime_view():
+    """The display's runtime view, for the catalog's mode lookups. Imported
+    on call, as the startup reconciliation below imports it."""
+    from web_interface.blueprints.api_v3 import _plugin_runtime_view
+    return _plugin_runtime_view()
+
+
+plugin_catalog = PluginCatalog(
+    plugins_dir=plugins_dir,
+    runtime_source=_catalog_runtime_view,
+)
 
 # Initialize operation queue for plugin operations
 operation_queue = PluginOperationQueue(max_history=500)