Refactor MQTT Discovery to streamline legacy interface implementations and improve memory management

Author: Odyno

main/mqttDiscovery.cpp

@@ -85,8 +85,6 @@ String getUniqueId(String name, String sufix) {
 
 #    include <string>
 
-std::unique_ptr<omg::hass::HassDiscoveryManager> g_discoveryManager;
-
 //=============================================================================
 // INTERFACE IMPLEMENTATIONS FOR LEGACY BRIDGE
 // These implementations bridge modern C++ interfaces with legacy C system
@@ -184,6 +182,10 @@ class LegacyMqttPublisher : public IMqttPublisher {
 // HMD DISCOVERY FUNCTIONS (NEW ARCHITECTURE)
 // Only compiled when ZmqttDiscovery2 is defined
 //=============================================================================
+static omg::hass::LegacySettingsProvider settingsProvider;
+static omg::hass::LegacyMqttPublisher mqttPublisher;
+
+std::unique_ptr<omg::hass::HassDiscoveryManager> g_discoveryManager;
 
 /**
  * @brief Publish OpenMQTTGateway system entities
@@ -309,9 +311,6 @@ void publishSystemEntities() {
 void pubMqttDiscovery() {
   THEENGS_LOG_TRACE(F("Starting refactored HA Discovery" CR));
 
-  static omg::hass::LegacySettingsProvider settingsProvider;
-  static omg::hass::LegacyMqttPublisher mqttPublisher;
-
   // Initialize discovery manager if not already done
   if (!g_discoveryManager) {
     g_discoveryManager = std::make_unique<omg::hass::HassDiscoveryManager>(