refactor(plugin_manager): Simplify plugin loading and metadata handling

Author: CJFWeatherhead

chatrixcd/commands.py

@@ -2362,35 +2362,23 @@ def _gather_plugin_info(self) -> tuple:
             lines.append("• No plugins loaded")
             return lines, info_list
 
-        # Separate enabled and disabled plugins
-        enabled_plugins = [p for p in plugins_status if p.get("enabled", False)]
-        disabled_plugins = [p for p in plugins_status if not p.get("enabled", False)]
-
-        # Sort each list by type, then name
-        enabled_plugins.sort(
-            key=lambda p: (p.get("type", "generic"), p.get("name", ""))
-        )
-        disabled_plugins.sort(
-            key=lambda p: (p.get("type", "generic"), p.get("name", ""))
+        # Sort plugins by enabled status (enabled first), then type, then name
+        plugins_status.sort(
+            key=lambda p: (
+                not p.get(
+                    "enabled", False
+                ),  # False (enabled) sorts before True (disabled)
+                p.get("type", "generic"),
+                p.get("name", ""),
+            )
         )
 
-        # Process enabled plugins first
-        if enabled_plugins:
-            lines.append("**Enabled:**")
-            for status in enabled_plugins:
-                line = self._format_plugin_line(status, enabled=True)
-                lines.append(line)
-                info_list.append(self._prepare_plugin_info(status))
-
-        # Then disabled plugins
-        if disabled_plugins:
-            if enabled_plugins:
-                lines.append("")  # Empty line separator
-            lines.append("**Disabled:**")
-            for status in disabled_plugins:
-                line = self._format_plugin_line(status, enabled=False)
-                lines.append(line)
-                info_list.append(self._prepare_plugin_info(status))
+        # Process all plugins
+        for status in plugins_status:
+            enabled = status.get("enabled", False)
+            line = self._format_plugin_line(status, enabled=enabled)
+            lines.append(line)
+            info_list.append(self._prepare_plugin_info(status))
 
         return lines, info_list
 
@@ -2502,27 +2490,16 @@ def _build_plugin_html_table(self, plugin_info: list) -> str:
         if not plugin_info:
             return ""
 
-        # Separate enabled and disabled
-        enabled_info = [p for p in plugin_info if p["enabled"]]
-        disabled_info = [p for p in plugin_info if not p["enabled"]]
-
         table_html = '<br/><table><thead><tr><th colspan="5">Plugins 🔌</th></tr>'
         table_html += (
             "<tr><th>Name</th><th>Description</th><th>Version</th>"
             "<th>Type</th><th>Status</th></tr></thead><tbody>"
         )
 
-        # Add enabled plugins first
-        if enabled_info:
-            table_html += '<tr><td colspan="5"><strong>Enabled</strong></td></tr>'
-            for info in enabled_info:
-                table_html += self._build_plugin_row(info, enabled=True)
-
-        # Add disabled plugins
-        if disabled_info:
-            table_html += '<tr><td colspan="5"><strong>Disabled</strong></td></tr>'
-            for info in disabled_info:
-                table_html += self._build_plugin_row(info, enabled=False)
+        # Add all plugins (already sorted by enabled status)
+        for info in plugin_info:
+            enabled = info["enabled"]
+            table_html += self._build_plugin_row(info, enabled=enabled)
 
         table_html += "</tbody></table>"
         return table_html

chatrixcd/plugin_manager.py

@@ -5,13 +5,13 @@
 webhooks), custom commands, or other extensions.
 """
 
-import logging
-import json
 import importlib.util
+import json
+import logging
 import sys
-from pathlib import Path
-from typing import Dict, List, Optional, Any, Type
 from abc import ABC, abstractmethod
+from pathlib import Path
+from typing import Any, Dict, List, Optional, Type
 
 logger = logging.getLogger(__name__)
 
@@ -59,6 +59,8 @@ def __init__(self, bot: Any, config: Dict[str, Any], metadata: PluginMetadata):
         self.config = config
         self.metadata = metadata
         self.logger = logging.getLogger(f"plugin.{metadata.name}")
+        # Track runtime enabled state (True if plugin is loaded and initialized)
+        self._enabled = True
 
     @abstractmethod
     async def initialize(self) -> bool:
@@ -106,7 +108,7 @@ def get_status(self) -> Dict[str, Any]:
             "version": self.metadata.version,
             "type": self.metadata.plugin_type,
             "category": self.metadata.category,
-            "enabled": self.metadata.enabled,
+            "enabled": self._enabled,
         }
 
 
@@ -199,7 +201,9 @@ def load_plugin_metadata(self, plugin_dir: Path) -> Optional[PluginMetadata]:
                 data = json.load(f)
 
             metadata = PluginMetadata(data, plugin_dir)
-            logger.debug(f"Loaded metadata for plugin: {metadata.name} v{metadata.version}")
+            logger.debug(
+                f"Loaded metadata for plugin: {metadata.name} v{metadata.version}"
+            )
             return metadata
 
         except json.JSONDecodeError as e:
@@ -209,7 +213,9 @@ def load_plugin_metadata(self, plugin_dir: Path) -> Optional[PluginMetadata]:
             logger.error(f"Error loading metadata from {meta_file}: {e}")
             return None
 
-    def load_plugin_config(self, plugin_dir: Path, metadata: PluginMetadata) -> Dict[str, Any]:
+    def load_plugin_config(
+        self, plugin_dir: Path, metadata: PluginMetadata
+    ) -> Dict[str, Any]:
         """Load plugin configuration from plugin.json file.
 
         Args:
@@ -340,7 +346,9 @@ async def load_plugin(self, plugin_dir: Path) -> bool:
             # Track task monitor plugins separately
             if isinstance(plugin, TaskMonitorPlugin):
                 self.task_monitor = plugin
-                logger.info(f"Loaded task monitor plugin: {metadata.name} v{metadata.version}")
+                logger.info(
+                    f"Loaded task monitor plugin: {metadata.name} v{metadata.version}"
+                )
             else:
                 logger.info(f"Loaded plugin: {metadata.name} v{metadata.version}")
 
@@ -378,7 +386,10 @@ async def load_all_plugins(self) -> int:
 
             if enabled:
                 # Enforce mutual exclusion: only one TaskMonitorPlugin may be loaded
-                if metadata.plugin_type == "task_monitor" and self.task_monitor is not None:
+                if (
+                    metadata.plugin_type == "task_monitor"
+                    and self.task_monitor is not None
+                ):
                     logger.info(
                         f"Skipping task monitor plugin '{metadata.name}' because '{self.task_monitor.metadata.name}' is already active"
                     )