@riddix/hamh 2.1.0-alpha.872 → 2.1.0-alpha.873

package/dist/backend/cli.js

@@ -158205,6 +158205,139 @@ function ensureCommissioningConfig(server) {
 // src/services/bridges/bridge.ts
 init_diagnostic_event_bus();
 
+// src/services/bridges/entity-isolation-service.ts
+init_esm();
+init_diagnostic_event_bus();
+var logger204 = Logger.get("EntityIsolation");
+var EntityIsolationServiceImpl = class {
+  isolatedEntities = /* @__PURE__ */ new Map();
+  isolationCallbacks = /* @__PURE__ */ new Map();
+  /**
+   * Register a callback to be called when an entity needs to be isolated.
+   * The callback should remove the entity from the bridge's aggregator.
+   */
+  registerIsolationCallback(bridgeId, callback) {
+    this.isolationCallbacks.set(bridgeId, callback);
+  }
+  unregisterIsolationCallback(bridgeId) {
+    this.isolationCallbacks.delete(bridgeId);
+  }
+  /**
+   * Parse the endpoint path from a Matter.js error message and extract the entity name.
+   * Example path: "ed5b4f8d042e4599b833f21da4ededba.aggregator.Küchenlicht.onOff.on"
+   * Returns: { bridgeId: "ed5b4f8d...", entityName: "Küchenlicht" }
+   */
+  parseEndpointPath(errorMessage) {
+    const match = errorMessage.match(/([a-f0-9]{32})\.aggregator\.([^.\s>]+)/i);
+    if (match) {
+      return {
+        bridgeId: match[1],
+        entityName: match[2]
+      };
+    }
+    return null;
+  }
+  classifyError(msg) {
+    if (msg.includes("Invalid intervalMs")) {
+      return "Subscription timing error (Invalid intervalMs)";
+    }
+    if (msg.includes("Behaviors have errors")) {
+      return "Behavior initialization failure";
+    }
+    if (msg.includes("TransactionDestroyedError")) {
+      return "Transaction destroyed during operation";
+    }
+    if (msg.includes("DestroyedDependencyError")) {
+      return "Dependency destroyed during operation";
+    }
+    if (msg.includes("UninitializedDependencyError")) {
+      return "Uninitialized dependency access";
+    }
+    if (msg.includes("Endpoint storage inaccessible")) {
+      return "Endpoint storage inaccessible";
+    }
+    if (msg.includes("Error initializing part")) {
+      return "Endpoint construction failure";
+    }
+    if (msg.includes("aggregator.")) {
+      return "Runtime error in endpoint";
+    }
+    return null;
+  }
+  /**
+   * Attempt to isolate an entity based on an error.
+   * Returns true if the entity was successfully identified and isolation was triggered.
+   */
+  async isolateFromError(error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    const classification = this.classifyError(msg);
+    if (!classification) {
+      return false;
+    }
+    const parsed = this.parseEndpointPath(msg);
+    if (!parsed) {
+      logger204.warn("Could not parse entity from error:", msg);
+      return false;
+    }
+    const { bridgeId, entityName } = parsed;
+    const callback = this.isolationCallbacks.get(bridgeId);
+    if (!callback) {
+      logger204.warn(
+        `No isolation callback registered for bridge ${bridgeId}, entity: ${entityName}`
+      );
+      return false;
+    }
+    const key = `${bridgeId}:${entityName}`;
+    if (this.isolatedEntities.has(key)) {
+      return true;
+    }
+    const reason = `${classification}. Entity isolated to protect bridge stability.`;
+    this.isolatedEntities.set(key, {
+      entityId: entityName,
+      reason,
+      failedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    logger204.warn(
+      `Isolating entity "${entityName}" from bridge ${bridgeId} due to: ${reason}`
+    );
+    diagnosticEventBus.emit("entity_error", `Entity isolated: ${entityName}`, {
+      bridgeId,
+      entityId: entityName,
+      details: { reason: classification }
+    });
+    try {
+      await callback(entityName);
+      return true;
+    } catch (e) {
+      logger204.error(`Failed to isolate entity ${entityName}:`, e);
+      return false;
+    }
+  }
+  /**
+   * Get all isolated entities for a specific bridge.
+   */
+  getIsolatedEntities(bridgeId) {
+    const result = [];
+    for (const [key, entity] of this.isolatedEntities) {
+      if (key.startsWith(`${bridgeId}:`)) {
+        result.push(entity);
+      }
+    }
+    return result;
+  }
+  /**
+   * Clear isolated entities for a bridge (e.g., on restart).
+   */
+  clearIsolatedEntities(bridgeId) {
+    for (const key of this.isolatedEntities.keys()) {
+      if (key.startsWith(`${bridgeId}:`)) {
+        this.isolatedEntities.delete(key);
+      }
+    }
+  }
+};
+var EntityIsolationService = new EntityIsolationServiceImpl();
+
 // src/services/bridges/session-supervisor.ts
 init_dist();
 init_esm7();
@@ -159441,6 +159574,7 @@ var Bridge = class {
   }
   async runStart() {
     this.lastSyncedStates.clear();
+    EntityIsolationService.clearIsolatedEntities(this.id);
     try {
       this.setStatus({
         code: BridgeStatus.Starting,
@@ -159974,7 +160108,7 @@ init_esm();
 init_esm7();
 import crypto6 from "node:crypto";
 init_home_assistant_entity_behavior();
-var logger204 = Logger.get("BasicInformationServer");
+var logger205 = Logger.get("BasicInformationServer");
 var appliedUniqueIds = /* @__PURE__ */ new Map();
 var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer {
   async initialize() {
@@ -160020,7 +160154,7 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
       // records keyed on it can be shed (#385).
       uniqueId: this.frozenUniqueId(anchor)
     });
-    logger204.debug(
+    logger205.debug(
       `[${entity.entity_id}] basicInfo vendor=${this.state.vendorName} product=${this.state.productName} label=${this.state.productLabel} serial=${this.state.serialNumber} node=${this.state.nodeLabel} uniqueId=${this.state.uniqueId}`
     );
   }
@@ -160050,7 +160184,7 @@ function isValidVendorId(value) {
 // src/matter/behaviors/electrical-energy-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger205 = Logger.get("ElectricalEnergyMeasurementServer");
+var logger206 = Logger.get("ElectricalEnergyMeasurementServer");
 var FeaturedBase = ElectricalEnergyMeasurementServer.with("CumulativeEnergy", "ImportedEnergy");
 var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase {
   async initialize() {
@@ -160059,7 +160193,7 @@ var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase {
     const entityId = homeAssistant.entityId;
     const energyEntity = homeAssistant.state.mapping?.energyEntity;
     if (energyEntity) {
-      logger205.debug(
+      logger206.debug(
         `[${entityId}] ElectricalEnergyMeasurement using mapped energy entity: ${energyEntity}`
       );
     }
@@ -160115,7 +160249,7 @@ var HaElectricalEnergyMeasurementServer = ElectricalEnergyMeasurementServerBase.
 // src/matter/behaviors/electrical-power-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger206 = Logger.get("ElectricalPowerMeasurementServer");
+var logger207 = Logger.get("ElectricalPowerMeasurementServer");
 var FeaturedBase2 = ElectricalPowerMeasurementServer.with("AlternatingCurrent");
 var ElectricalPowerMeasurementServerBase = class extends FeaturedBase2 {
   async initialize() {
@@ -160124,7 +160258,7 @@ var ElectricalPowerMeasurementServerBase = class extends FeaturedBase2 {
     const entityId = homeAssistant.entityId;
     const powerEntity = homeAssistant.state.mapping?.powerEntity;
     if (powerEntity) {
-      logger206.debug(
+      logger207.debug(
         `[${entityId}] ElectricalPowerMeasurement using mapped power entity: ${powerEntity}`
       );
     }
@@ -160257,7 +160391,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/humidity-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger207 = Logger.get("HumidityMeasurementServer");
+var logger208 = Logger.get("HumidityMeasurementServer");
 var HumidityMeasurementServerBase = class extends RelativeHumidityMeasurementServer {
   async initialize() {
     await super.initialize();
@@ -160270,7 +160404,7 @@ var HumidityMeasurementServerBase = class extends RelativeHumidityMeasurementSer
       return;
     }
     const humidity = this.getHumidity(this.state.config, entity.state);
-    logger207.debug(
+    logger208.debug(
       `Humidity ${entity.state.entity_id} raw=${entity.state.state} measuredValue=${humidity}`
     );
     applyPatchState(this.state, {
@@ -160300,7 +160434,7 @@ function HumidityMeasurementServer(config8) {
 // src/matter/behaviors/power-source-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger208 = Logger.get("PowerSourceServer");
+var logger209 = Logger.get("PowerSourceServer");
 var FeaturedBase3 = PowerSourceServer.with("Battery", "Rechargeable");
 var PowerSourceServerBase = class extends FeaturedBase3 {
   async initialize() {
@@ -160312,17 +160446,17 @@ var PowerSourceServerBase = class extends FeaturedBase3 {
       applyPatchState(this.state, {
         endpointList: [endpointNumber]
       });
-      logger208.debug(
+      logger209.debug(
         `[${entityId}] PowerSource initialized with endpointList=[${endpointNumber}]`
       );
     } else {
-      logger208.warn(
+      logger209.warn(
         `[${entityId}] PowerSource endpoint number is null during initialize - endpointList will be empty!`
       );
     }
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
-      logger208.debug(
+      logger209.debug(
         `[${entityId}] PowerSource using mapped battery entity: ${batteryEntity}`
       );
     }
@@ -160698,7 +160832,7 @@ function notifyLightTurnedOff(entityId, haLastChanged) {
   sweepLastTurnOff(now);
   lastTurnOffTimestamps.set(entityId, { ts: now, haLastChanged });
 }
-var logger209 = Logger.get("LevelControlServer");
+var logger210 = Logger.get("LevelControlServer");
 var FeaturedBase5 = LevelControlServer.with("OnOff", "Lighting");
 var LevelControlServerBase = class extends FeaturedBase5 {
   pendingTransitionTime;
@@ -160716,7 +160850,7 @@ var LevelControlServerBase = class extends FeaturedBase5 {
     try {
       await super.initialize();
     } catch (error) {
-      logger209.error("super.initialize() failed:", error);
+      logger210.error("super.initialize() failed:", error);
       throw error;
     }
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -160834,7 +160968,7 @@ var LevelControlServerBase = class extends FeaturedBase5 {
         expectedLevel: remembered,
         timestamp: now2
       });
-      logger209.debug(
+      logger210.debug(
         `[${entityId}] Storing level ${level} without calling HA - moveToLevel arrived ${sinceTurnOff}ms after a Matter off while still off (#434)`
       );
       return;
@@ -160845,7 +160979,7 @@ var LevelControlServerBase = class extends FeaturedBase5 {
       const lastTurnOn = lastTurnOnTimestamps.get(entityId);
       const timeSinceTurnOn = lastTurnOn ? Date.now() - lastTurnOn : Infinity;
       if (level >= this.maxLevel && timeSinceTurnOn < 200) {
-        logger209.debug(
+        logger210.debug(
           `[${entityId}] Ignoring moveToLevel(${level}) - Alexa brightness reset detected (${timeSinceTurnOn}ms after turn-on)`
         );
         return;
@@ -160891,7 +161025,7 @@ function LevelControlServer2(config8) {
 }
 
 // src/matter/behaviors/on-off-server.ts
-var logger210 = Logger.get("OnOffServer");
+var logger211 = Logger.get("OnOffServer");
 var optimisticOnOffState = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS2 = 3e3;
 function sweepOptimisticOnOff(now) {
@@ -160955,7 +161089,7 @@ var OnOffServerBase = class extends OnOffServer {
     if (!action) {
       return;
     }
-    logger210.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
+    logger211.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
     notifyLightTurnedOn(homeAssistant.entityId);
     if (!skipMomentaryFlip) {
       const now = Date.now();
@@ -160986,7 +161120,7 @@ var OnOffServerBase = class extends OnOffServer {
     if (!action) {
       return;
     }
-    logger210.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
+    logger211.info(`[${homeAssistant.entityId}] Turning OFF -> ${action.action}`);
     const now = Date.now();
     sweepOptimisticOnOff(now);
     optimisticOnOffState.set(homeAssistant.entityId, {
@@ -161020,7 +161154,7 @@ function setOptimisticOnOff(entityId, expectedOnOff) {
 }
 
 // src/matter/behaviors/fan-control-server.ts
-var logger211 = Logger.get("FanControlServer");
+var logger212 = Logger.get("FanControlServer");
 var defaultStepSize = 33.33;
 var minSpeedMax = 3;
 var maxSpeedMax = 100;
@@ -161360,7 +161494,7 @@ var FanControlServerBase = class extends FeaturedBase6 {
     const wasOff = homeAssistant.entity.state?.state === "off" || this.agent.has(OnOffBehavior) && !this.agent.get(OnOffBehavior).state.onOff;
     const remembered = this.remembered();
     if (wasOff) {
-      logger211.debug(
+      logger212.debug(
         `[${homeAssistant.entityId}] power-on write ${percentage}%: restore flag=${restoreOnPowerOn}, last speed=${remembered.percent}`
       );
     }
@@ -161553,7 +161687,7 @@ var FanControlServerBase = class extends FeaturedBase6 {
       const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
       setOptimisticOnOff(entityId, on);
     } catch (e) {
-      logger211.debug(
+      logger212.debug(
         `syncOnOff(${on}) failed: ${e instanceof Error ? e.message : String(e)}`
       );
     }
@@ -161696,7 +161830,7 @@ var FanOnOffServer = OnOffServer2({
 });
 
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
-var logger212 = Logger.get("ComposedAirPurifierEndpoint");
+var logger213 = Logger.get("ComposedAirPurifierEndpoint");
 var temperatureConfig = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
@@ -161914,7 +162048,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       config8.powerEntityId ? "+Pwr" : "",
       config8.energyEntityId ? "+Nrg" : ""
     ].filter(Boolean).join("");
-    logger212.info(
+    logger213.info(
       `Created composed air purifier ${primaryEntityId}: ${clusterLabels}`
     );
     return endpoint;
@@ -162232,12 +162366,12 @@ var ClimateHumidityMeasurementServer = HumidityMeasurementServer(humidityConfig2
 // src/matter/endpoints/legacy/climate/behaviors/climate-on-off-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger213 = Logger.get("ClimateOnOffServer");
+var logger214 = Logger.get("ClimateOnOffServer");
 var ClimateOnOffServer = OnOffServer2({
   turnOn: (_value, agent) => {
     const entity = agent.get(HomeAssistantEntityBehavior).entity;
     if (entity.state.state !== "off" && agent.get(OnOffServer).state.onOff) {
-      logger213.debug(
+      logger214.debug(
         `[${entity.entity_id}] Skipping redundant OnOff.on(), cached state "${entity.state.state}"`
       );
       return void 0;
@@ -162272,7 +162406,7 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_entity_behavior();
 init_transaction_is_offline();
-var logger214 = Logger.get("ThermostatServer");
+var logger215 = Logger.get("ThermostatServer");
 var SystemMode = Thermostat3.SystemMode;
 var RunningMode = Thermostat3.ThermostatRunningMode;
 var nudgingSetpoints = /* @__PURE__ */ new Set();
@@ -162351,7 +162485,7 @@ function clearInactiveSetpointState(self, scope) {
 }
 function thermostatPreInitialize(self) {
   const currentLocal = self.state.localTemperature;
-  logger214.debug(
+  logger215.debug(
     `initialize: features - heating=${self.features.heating}, cooling=${self.features.cooling}`
   );
   const localValue = typeof currentLocal === "number" && !Number.isNaN(currentLocal) ? currentLocal : currentLocal === null ? null : 2100;
@@ -162398,7 +162532,7 @@ function thermostatPreInitialize(self) {
   } else {
     clearInactiveSetpointState(self, "Cool");
   }
-  logger214.debug(
+  logger215.debug(
     `initialize: after force-set - local=${self.state.localTemperature}`
   );
   self.state.thermostatRunningState = runningStateAllOff;
@@ -162491,7 +162625,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
       maxCoolLimit,
       "cool"
     );
-    logger214.debug(
+    logger215.debug(
       `update: limits heat=[${minHeatLimit}, ${maxHeatLimit}], cool=[${minCoolLimit}, ${maxCoolLimit}], systemMode=${systemMode}, runningMode=${runningMode}`
     );
     let controlSequence = config8.getControlSequence(entity.state, this.agent);
@@ -162567,18 +162701,18 @@ var ThermostatServerBase = class extends FullFeaturedBase {
    */
   // biome-ignore lint/correctness/noUnusedPrivateClassMembers: Called via thermostatPostInitialize + prototype copy
   heatingSetpointChanging(value, _oldValue, context) {
-    logger214.debug(
+    logger215.debug(
       `heatingSetpointChanging: value=${value}, oldValue=${_oldValue}, isOffline=${transactionIsOffline(context)}`
     );
     if (transactionIsOffline(context)) {
-      logger214.debug(
+      logger215.debug(
         "heatingSetpointChanging: skipping - transaction is offline"
       );
       return;
     }
     const next = Temperature.celsius(value / 100);
     if (!next) {
-      logger214.debug("heatingSetpointChanging: skipping - invalid temperature");
+      logger215.debug("heatingSetpointChanging: skipping - invalid temperature");
       return;
     }
     this.agent.asLocalActor(() => {
@@ -162589,7 +162723,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         this.agent
       );
       const currentMode2 = this.state.systemMode;
-      logger214.debug(
+      logger215.debug(
         `heatingSetpointChanging: supportsRange=${supportsRange}, systemMode=${currentMode2}, features.heating=${this.features.heating}, features.cooling=${this.features.cooling}`
       );
       if (!supportsRange) {
@@ -162599,12 +162733,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         const isOff = currentMode2 === Thermostat3.SystemMode.Off;
         if (isOff && this.features.heating) {
           if (nudgingSetpoints.has(homeAssistant.entityId)) {
-            logger214.debug(
+            logger215.debug(
               `heatingSetpointChanging: skipping auto-resume - nudge write in progress`
             );
             return;
           }
-          logger214.info(
+          logger215.info(
             `heatingSetpointChanging: auto-resume - switching to Heat (was Off)`
           );
           const modeAction = config8.setSystemMode(
@@ -162613,17 +162747,17 @@ var ThermostatServerBase = class extends FullFeaturedBase {
           );
           homeAssistant.callAction(modeAction);
         } else if (!isAutoMode && !isHeatingMode) {
-          logger214.debug(
+          logger215.debug(
             `heatingSetpointChanging: skipping - not in heating/auto mode (mode=${currentMode2}, haMode=${haHvacMode})`
           );
           return;
         }
-        logger214.debug(
+        logger215.debug(
           `heatingSetpointChanging: proceeding - isAutoMode=${isAutoMode}, isHeatingMode=${isHeatingMode}, isOff=${isOff}, haMode=${haHvacMode}`
         );
       }
       const coolingSetpoint = this.features.cooling ? this.state.occupiedCoolingSetpoint : value;
-      logger214.debug(
+      logger215.debug(
         `heatingSetpointChanging: calling setTemperature with heat=${next.celsius(true)}, cool=${coolingSetpoint}`
       );
       this.setTemperature(
@@ -162662,12 +162796,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
         const isOff = currentMode2 === Thermostat3.SystemMode.Off;
         if (isOff && !this.features.heating && this.features.cooling) {
           if (nudgingSetpoints.has(homeAssistant.entityId)) {
-            logger214.debug(
+            logger215.debug(
               `coolingSetpointChanging: skipping auto-resume - nudge write in progress`
             );
             return;
           }
-          logger214.info(
+          logger215.info(
             `coolingSetpointChanging: auto-resume - switching to Cool (was Off)`
           );
           const modeAction = config8.setSystemMode(
@@ -162676,12 +162810,12 @@ var ThermostatServerBase = class extends FullFeaturedBase {
           );
           homeAssistant.callAction(modeAction);
         } else if (!isAutoMode && !isCoolingMode) {
-          logger214.debug(
+          logger215.debug(
             `coolingSetpointChanging: skipping - not in cooling/auto mode (mode=${currentMode2}, haMode=${haHvacMode})`
           );
           return;
         }
-        logger214.debug(
+        logger215.debug(
           `coolingSetpointChanging: proceeding - isAutoMode=${isAutoMode}, isCoolingMode=${isCoolingMode}, isOff=${isOff}, haMode=${haHvacMode}`
         );
       }
@@ -162795,7 +162929,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
     const effectiveMax = max ?? 5e3;
     if (value == null || Number.isNaN(value)) {
       const defaultValue = type === "heat" ? 2e3 : 2400;
-      logger214.debug(
+      logger215.debug(
         `${type} setpoint is undefined, using default: ${defaultValue}`
       );
       return Math.max(effectiveMin, Math.min(effectiveMax, defaultValue));
@@ -163373,7 +163507,7 @@ function ClimateDevice(homeAssistantEntity, includeBasicInformation = true) {
 }
 
 // src/matter/endpoints/composed/composed-climate-fan-endpoint.ts
-var logger215 = Logger.get("ComposedClimateFanEndpoint");
+var logger216 = Logger.get("ComposedClimateFanEndpoint");
 function createEndpointId3(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
@@ -163411,7 +163545,7 @@ var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpo
       climateSub = new Endpoint(climateType, { id: `${endpointId}_climate` });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      logger215.warn(
+      logger216.warn(
         `Companion fan: climate sub build failed for ${primaryEntityId}: ${message}`
       );
       return void 0;
@@ -163455,7 +163589,7 @@ var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpo
       endpointId,
       [climateSub, fanSub]
     );
-    logger215.info(`Created composed climate+fan endpoint ${primaryEntityId}`);
+    logger216.info(`Created composed climate+fan endpoint ${primaryEntityId}`);
     return endpoint;
   }
   constructor(type, entityId, id, parts) {
@@ -163550,7 +163684,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/pressure-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger216 = Logger.get("PressureMeasurementServer");
+var logger217 = Logger.get("PressureMeasurementServer");
 var MIN_PRESSURE = 300;
 var MAX_PRESSURE = 1100;
 var PressureMeasurementServerBase = class extends PressureMeasurementServer {
@@ -163578,7 +163712,7 @@ var PressureMeasurementServerBase = class extends PressureMeasurementServer {
     }
     const rounded = Math.round(value);
     if (rounded < MIN_PRESSURE || rounded > MAX_PRESSURE) {
-      logger216.warn(
+      logger217.warn(
         `Pressure value ${rounded} (raw: ${value}) for ${entity.entity_id} is outside valid range [${MIN_PRESSURE}-${MAX_PRESSURE}], ignoring`
       );
       return null;
@@ -163597,7 +163731,7 @@ function PressureMeasurementServer2(config8) {
 }
 
 // src/matter/endpoints/composed/composed-sensor-endpoint.ts
-var logger217 = Logger.get("ComposedSensorEndpoint");
+var logger218 = Logger.get("ComposedSensorEndpoint");
 var temperatureConfig2 = {
   getValue(entity, agent) {
     const fallbackUnit = agent.env.get(HomeAssistantConfig).unitSystem.temperature;
@@ -163775,7 +163909,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     if (config8.pressureEntityId && pressSub) {
       endpoint.subEndpoints.set(config8.pressureEntityId, pressSub);
     }
-    logger217.info(
+    logger218.info(
       `Created composed sensor ${primaryEntityId} with ${parts.length} sub-endpoint(s): T${humSub ? "+H" : ""}${pressSub ? "+P" : ""}${config8.batteryEntityId ? "+Bat" : ""}${config8.powerEntityId ? "+Pwr" : ""}${config8.energyEntityId ? "+Nrg" : ""}`
     );
     return endpoint;
@@ -163912,7 +164046,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/mode-select-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger218 = Logger.get("ModeSelectServer");
+var logger219 = Logger.get("ModeSelectServer");
 function buildSupportedModes(options) {
   return options.map((label, index) => ({
     label: label.length > 64 ? label.substring(0, 64) : label,
@@ -163949,13 +164083,13 @@ var ModeSelectServerBase = class extends ModeSelectServer {
     const options = config8.getOptions(homeAssistant.entity);
     const { newMode } = request;
     if (newMode < 0 || newMode >= options.length) {
-      logger218.warn(
+      logger219.warn(
         `[${homeAssistant.entityId}] Invalid mode ${newMode}, options: [${options.join(", ")}]`
       );
       return;
     }
     const option = options[newMode];
-    logger218.info(
+    logger219.info(
       `[${homeAssistant.entityId}] changeToMode(${newMode}) -> "${option}"`
     );
     applyPatchState(this.state, { currentMode: newMode });
@@ -164506,7 +164640,7 @@ var CoAlarmWithBatteryType = SmokeCoAlarmDevice.with(
 );
 
 // src/matter/endpoints/legacy/binary-sensor/index.ts
-var logger219 = Logger.get("BinarySensorDevice");
+var logger220 = Logger.get("BinarySensorDevice");
 var deviceClasses = {
   [BinarySensorDeviceClass.CarbonMonoxide]: CoAlarmType,
   [BinarySensorDeviceClass.Gas]: CoAlarmType,
@@ -164557,11 +164691,11 @@ function BinarySensorDevice(homeAssistantEntity) {
   const originalTypeName = type.name;
   if (hasBattery && batteryTypes.has(type)) {
     type = batteryTypes.get(type);
-    logger219.info(
+    logger220.info(
       `[${entityId}] Using battery variant: ${originalTypeName} -> ${type.name}, batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"}`
     );
   } else if (hasBattery) {
-    logger219.warn(
+    logger220.warn(
       `[${entityId}] Has battery but no variant available for ${originalTypeName}`
     );
   }
@@ -164648,7 +164782,7 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_home_assistant_actions();
 init_home_assistant_entity_behavior();
-var logger220 = Logger.get("WindowCoveringServer");
+var logger221 = Logger.get("WindowCoveringServer");
 var MovementStatus = WindowCovering3.MovementStatus;
 var FeaturedBase7 = WindowCoveringServer.with(
   "Lift",
@@ -164859,7 +164993,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       }
       return existing100ths ?? current100ths;
     };
-    logger220.debug(
+    logger221.debug(
       `Cover update for ${entity.entity_id}: state=${state.state}, lift=${currentLift}%, tilt=${currentTilt}%, ha=${MovementStatus[movementStatus]}, effective=${MovementStatus[globalStatus]}`
     );
     const overrideType = config8.getCoverType?.(state, this.agent);
@@ -164904,9 +165038,9 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     );
     if (Object.keys(appliedPatch).length > 0) {
       const hasOperationalChange = "operationalStatus" in appliedPatch;
-      const log = hasOperationalChange ? logger220.info : logger220.debug;
+      const log = hasOperationalChange ? logger221.info : logger221.debug;
       log.call(
-        logger220,
+        logger221,
         `Cover ${entity.entity_id} state changed: ${JSON.stringify(appliedPatch)}`
       );
     }
@@ -165015,7 +165149,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
             }
           });
         } catch (error) {
-          logger220.debug(
+          logger221.debug(
             `Optimistic ${axis} timeout write failed (endpoint may be closing): ${error}`
           );
         }
@@ -165050,7 +165184,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const currentTilt = this.state.currentPositionTiltPercent100ths ?? 0;
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const flags2 = this.state.config.getDiagnosticFlags?.(this.agent);
-    logger220.info(
+    logger221.info(
       `handleMovement ${homeAssistant.entityId}: type=${MovementType[type]}, direction=${MovementDirection[direction]}, target=${targetPercent100ths}, currentLift=${currentLift}, currentTilt=${currentTilt}${flags2 ? `, ${flags2}` : ""}`
     );
     if (type === MovementType.Lift) {
@@ -165069,7 +165203,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       }
     } else if (type === MovementType.Tilt) {
       if (targetPercent100ths == null && this.lastLiftMovementDirection === direction && Date.now() - this.lastLiftMovementMs < 50) {
-        logger220.info(
+        logger221.info(
           `Skipping tilt ${MovementDirection[direction]}, lift already moving in same direction`
         );
         return;
@@ -165114,7 +165248,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     } else {
       this.startOptimisticMovement("lift", MovementStatus.Opening, end);
     }
-    logger220.info(
+    logger221.info(
       `handleLiftOpen ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -165130,7 +165264,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     } else {
       this.startOptimisticMovement("lift", MovementStatus.Closing, end);
     }
-    logger220.info(
+    logger221.info(
       `handleLiftClose ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -165160,7 +165294,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
     const overrideMs = this.resolveDebounceOverride(homeAssistant);
     const debounceMs = overrideMs != null ? overrideMs : isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
-    logger220.debug(
+    logger221.debug(
       `Lift command: target=${targetPosition}%, debounce=${debounceMs}ms (${overrideMs != null ? "override" : isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (st.liftTimer) {
@@ -165192,7 +165326,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       this.startOptimisticMovement("tilt", MovementStatus.Opening, end);
     }
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    logger220.info(
+    logger221.info(
       `handleTiltOpen ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -165210,7 +165344,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
       this.startOptimisticMovement("tilt", MovementStatus.Closing, end);
     }
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    logger220.info(
+    logger221.info(
       `handleTiltClose ${homeAssistant.entityId}: calling action=${action.action}, atRest=${atRest}, ${this.state.config.getDiagnosticFlags?.(this.agent) ?? ""}`
     );
     homeAssistant.callAction(action);
@@ -165240,7 +165374,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     const isFirstInSequence = timeSinceLastCommand > _WindowCoveringServerBase.COMMAND_SEQUENCE_THRESHOLD_MS;
     const overrideMs = this.resolveDebounceOverride(homeAssistant);
     const debounceMs = overrideMs != null ? overrideMs : isFirstInSequence ? _WindowCoveringServerBase.DEBOUNCE_INITIAL_MS : _WindowCoveringServerBase.DEBOUNCE_SUBSEQUENT_MS;
-    logger220.debug(
+    logger221.debug(
       `Tilt command: target=${targetPosition}%, debounce=${debounceMs}ms (${overrideMs != null ? "override" : isFirstInSequence ? "initial" : "subsequent"})`
     );
     if (st.tiltTimer) {
@@ -165292,7 +165426,7 @@ function adjustPositionForWriting(position, flags2, matterSemantics) {
 }
 
 // src/matter/endpoints/legacy/cover/behaviors/cover-window-covering-server.ts
-var logger221 = Logger.get("CoverWindowCoveringServer");
+var logger222 = Logger.get("CoverWindowCoveringServer");
 var attributes6 = (entity) => entity.attributes;
 var DEVICE_CLASS_TO_MATTER_TYPE = {
   curtain: {
@@ -165370,7 +165504,7 @@ var adjustPositionForReading2 = (position, agent) => {
   const { featureFlags } = agent.env.get(BridgeDataProvider);
   const matterSem = usesMatterSemantics(agent);
   const result = adjustPositionForReading(position, featureFlags, matterSem);
-  logger221.debug(`adjustPositionForReading: HA=${position}%, result=${result}%`);
+  logger222.debug(`adjustPositionForReading: HA=${position}%, result=${result}%`);
   return result;
 };
 var adjustPositionForWriting2 = (position, agent) => {
@@ -165595,14 +165729,14 @@ var CoverAsDimmableLightWithBatteryType = DimmableLightDevice.with(
 );
 
 // src/matter/endpoints/legacy/cover/index.ts
-var logger222 = Logger.get("CoverDevice");
+var logger223 = Logger.get("CoverDevice");
 var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
   const features = /* @__PURE__ */ new Set();
   if (testBit(supportedFeatures, CoverSupportedFeatures.support_open)) {
     features.add("Lift");
     features.add("PositionAwareLift");
   } else {
-    logger222.warn(
+    logger223.warn(
       `[${entityId}] Cover has no support_open feature (supported_features=${supportedFeatures}), adding Lift anyway`
     );
     features.add("Lift");
@@ -165617,7 +165751,7 @@ var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
       features.add("PositionAwareTilt");
     }
   }
-  logger222.info(
+  logger223.info(
     `[${entityId}] Creating WindowCovering with features: [${[...features].join(", ")}], supported_features=${supportedFeatures}`
   );
   const baseBehaviors2 = [
@@ -165641,16 +165775,16 @@ function CoverDevice(homeAssistantEntity) {
   const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
   const hasBattery = hasBatteryAttr || hasBatteryEntity;
   if (hasBattery) {
-    logger222.info(
+    logger223.info(
       `[${entityId}] Creating cover with PowerSource cluster, batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"}`
     );
   } else {
-    logger222.debug(
+    logger223.debug(
       `[${entityId}] Creating cover without battery (batteryAttr=${hasBatteryAttr}, batteryEntity=${homeAssistantEntity.mapping?.batteryEntity ?? "none"})`
     );
   }
   if (homeAssistantEntity.mapping?.coverExposeAsDimmableLight) {
-    logger222.info(`[${entityId}] Exposing cover as a Dimmable Light (#372)`);
+    logger223.info(`[${entityId}] Exposing cover as a Dimmable Light (#372)`);
     const type = hasBattery ? CoverAsDimmableLightWithBatteryType : CoverAsDimmableLightType;
     return type.set({ homeAssistantEntity });
   }
@@ -165765,7 +165899,7 @@ function DishwasherEndpoint(homeAssistantEntity) {
 // src/matter/behaviors/generic-switch-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger223 = Logger.get("GenericSwitchServer");
+var logger224 = Logger.get("GenericSwitchServer");
 var SimpleBase = SwitchServer.with(
   "MomentarySwitch",
   "MomentarySwitchRelease",
@@ -165807,7 +165941,7 @@ var HaGenericSwitchServerBase = class extends SimpleBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     const entityId = homeAssistant.entityId;
-    logger223.debug(`[${entityId}] GenericSwitch initialized (simple)`);
+    logger224.debug(`[${entityId}] GenericSwitch initialized (simple)`);
     this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
   handleEventChange() {
@@ -165818,7 +165952,7 @@ var HaGenericSwitchServerBase = class extends SimpleBase {
     const eventType = attrs.event_type;
     if (!eventType) return;
     const entityId = homeAssistant.entityId;
-    logger223.debug(`[${entityId}] Event fired: ${eventType}`);
+    logger224.debug(`[${entityId}] Event fired: ${eventType}`);
     this.triggerPress(eventType);
   }
   triggerPress(eventType) {
@@ -165864,7 +165998,7 @@ var HaGenericSwitchServerMultiBase = class extends FullBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     const entityId = homeAssistant.entityId;
-    logger223.debug(`[${entityId}] GenericSwitch initialized (multi)`);
+    logger224.debug(`[${entityId}] GenericSwitch initialized (multi)`);
     this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
   handleEventChange() {
@@ -165875,7 +166009,7 @@ var HaGenericSwitchServerMultiBase = class extends FullBase {
     const eventType = attrs.event_type;
     if (!eventType) return;
     const entityId = homeAssistant.entityId;
-    logger223.debug(`[${entityId}] Event fired: ${eventType}`);
+    logger224.debug(`[${entityId}] Event fired: ${eventType}`);
     this.triggerPress(eventType);
   }
   triggerPress(eventType) {
@@ -166252,7 +166386,7 @@ init_nodejs();
 init_home_assistant_entity_behavior();
 var OperationalState4 = RvcOperationalState4.OperationalState;
 var ErrorState = RvcOperationalState4.ErrorState;
-var logger224 = Logger.get("RvcOperationalStateServer");
+var logger225 = Logger.get("RvcOperationalStateServer");
 var activeStates = /* @__PURE__ */ new Set([
   OperationalState4.Running,
   OperationalState4.SeekingCharger
@@ -166304,7 +166438,7 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       { force: true }
     );
     if (activeStates.has(previousState) && !activeStates.has(newState)) {
-      logger224.info(
+      logger225.info(
         `Operation completed: ${OperationalState4[previousState]} -> ${OperationalState4[newState]}`
       );
       try {
@@ -166317,7 +166451,7 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
           this.context
         );
       } catch (e) {
-        logger224.debug("Failed to emit operationCompletion event:", e);
+        logger225.debug("Failed to emit operationCompletion event:", e);
       }
     }
   }
@@ -166352,7 +166486,7 @@ var RvcOperationalStateServerBase = class extends RvcOperationalStateServer {
       const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
       homeAssistant.callAction(goHomeAction(void 0, this.agent));
     } else {
-      logger224.warn("GoHome command received but no goHome action configured");
+      logger225.warn("GoHome command received but no goHome action configured");
     }
     return {
       commandResponseState: {
@@ -166372,7 +166506,7 @@ function RvcOperationalStateServer2(config8) {
 }
 
 // src/matter/endpoints/legacy/lawn-mower/behaviors/lawn-mower-rvc-operational-state-server.ts
-var logger225 = Logger.get("LawnMowerRvcOperationalStateServer");
+var logger226 = Logger.get("LawnMowerRvcOperationalStateServer");
 function mapLawnMowerOperationalState(entity) {
   const state = entity.state;
   switch (state) {
@@ -166388,7 +166522,7 @@ function mapLawnMowerOperationalState(entity) {
     case "unavailable":
       return RvcOperationalState4.OperationalState.Error;
     default:
-      logger225.info(`Unknown lawn_mower state "${state}", treating as Stopped`);
+      logger226.info(`Unknown lawn_mower state "${state}", treating as Stopped`);
       return RvcOperationalState4.OperationalState.Stopped;
   }
 }
@@ -166442,7 +166576,7 @@ function inferCleanedAreaProgress(cleanedSqm, orderedAreas) {
 }
 
 // src/matter/behaviors/rvc-run-mode-server.ts
-var logger226 = Logger.get("RvcRunModeServer");
+var logger227 = Logger.get("RvcRunModeServer");
 var ROOM_MODE_BASE = 100;
 function isRoomMode(mode) {
   return mode >= ROOM_MODE_BASE;
@@ -166568,7 +166702,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     const s = getSession(this.endpoint);
     if (s.loggedShortCircuits.has(reason)) return;
     s.loggedShortCircuits.add(reason);
-    logger226.info(message);
+    logger227.info(message);
   }
   /**
    * Read the currentRoomEntity sensor and update currentArea + progress
@@ -166625,7 +166759,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         }
       }
       if (matchedAreaId === null) {
-        logger226.info(
+        logger227.info(
           `currentRoom sensor: no match for "${roomName}" (segmentId=${segmentId}), activeAreas=[${s.activeAreas.join(", ")}], supportedAreas=[${serviceArea.state.supportedAreas.map((a) => `${a.areaId}:${a.areaInfo.locationInfo?.locationName}`).join(", ")}]`
         );
         return;
@@ -166635,14 +166769,14 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         s.completedAreas.add(s.lastCurrentArea);
       }
       s.lastCurrentArea = matchedAreaId;
-      logger226.info(
+      logger227.info(
         `currentRoom sensor: transition to area ${matchedAreaId} ("${roomName}"), completed: [${[...s.completedAreas].join(", ")}]`
       );
       this.trySetCurrentArea(matchedAreaId);
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       if (!msg.includes("No provider for") && !msg.includes("not supported")) {
-        logger226.warn(`currentRoom sensor update failed: ${msg}`);
+        logger227.warn(`currentRoom sensor update failed: ${msg}`);
       }
     }
   }
@@ -166722,7 +166856,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         cleaned,
         ordered
       );
-      logger226.debug(
+      logger227.debug(
         `cleanedArea: raw=${raw} baseline=${s.cleanedAreaBaseline} cleaned=${cleaned} sizes=[${ordered.map((o) => `${o.areaId}:${o.sizeSqm}`).join(",")}] -> current=${currentArea} completed=[${completed.join(",")}]`
       );
       for (const id of completed) {
@@ -166736,7 +166870,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       if (!msg.includes("No provider for") && !msg.includes("not supported")) {
-        logger226.warn(`cleanedArea room update failed: ${msg}`);
+        logger227.warn(`cleanedArea room update failed: ${msg}`);
       }
     }
   }
@@ -166751,7 +166885,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       const serviceArea = this.agent.get(ServiceAreaBehavior);
       if (serviceArea.state.currentArea !== areaId) {
         serviceArea.state.currentArea = areaId;
-        logger226.debug(`currentArea set to ${areaId}`);
+        logger227.debug(`currentArea set to ${areaId}`);
       }
       this.updateProgress(serviceArea, areaId);
     } catch {
@@ -167034,7 +167168,7 @@ init_nodejs();
 
 // src/matter/behaviors/color-control-server.ts
 init_home_assistant_entity_behavior();
-var logger227 = Logger.get("ColorControlServer");
+var logger228 = Logger.get("ColorControlServer");
 var optimisticColorState = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS3 = 3e3;
 var OPTIMISTIC_TOLERANCE2 = 5;
@@ -167073,7 +167207,7 @@ var ColorControlServerBase = class extends FeaturedBase8 {
       if (this.state.startUpColorTemperatureMireds == null) {
         this.state.startUpColorTemperatureMireds = defaultMireds;
       }
-      logger227.debug(
+      logger228.debug(
         `initialize: set ColorTemperature defaults - min=${this.state.colorTempPhysicalMinMireds}, max=${this.state.colorTempPhysicalMaxMireds}, current=${this.state.colorTemperatureMireds}`
       );
     }
@@ -167627,7 +167761,7 @@ init_home_assistant_entity_behavior();
 init_esm();
 init_types2();
 init_home_assistant_entity_behavior();
-var logger228 = Logger.get("LockServer");
+var logger229 = Logger.get("LockServer");
 var SUPPORTED_SLOT = 1;
 function normalizeSupportedIndex(index) {
   if (index === 0 || index === SUPPORTED_SLOT) {
@@ -167968,7 +168102,7 @@ var LockServerWithPinBase = class extends PinCredentialBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.lock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger228.debug(
+    logger229.debug(
       `lockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}`
     );
     if (request.pinCode) {
@@ -167981,12 +168115,12 @@ var LockServerWithPinBase = class extends PinCredentialBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.unlock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger228.debug(
+    logger229.debug(
       `unlockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}, requirePin: ${this.state.requirePinForRemoteOperation}`
     );
     if (this.state.requirePinForRemoteOperation) {
       if (!request.pinCode) {
-        logger228.info(
+        logger229.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - no PIN provided`
         );
         throw new StatusResponseError(
@@ -167996,12 +168130,12 @@ var LockServerWithPinBase = class extends PinCredentialBase {
       }
       const providedPin = new TextDecoder().decode(request.pinCode);
       if (!verifyStoredPinHelper(this.env, homeAssistant.entityId, providedPin)) {
-        logger228.info(
+        logger229.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - invalid PIN`
         );
         throw new StatusResponseError("Invalid PIN code", StatusCode.Failure);
       }
-      logger228.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
+      logger229.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
       action.data = { ...action.data, code: providedPin };
     }
     homeAssistant.callAction(action);
@@ -168143,7 +168277,7 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.lock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger228.debug(
+    logger229.debug(
       `lockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}`
     );
     if (request.pinCode) {
@@ -168157,12 +168291,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     const unlatchConfig = this.state.config.unlatch;
     const action = unlatchConfig ? unlatchConfig(void 0, this.agent) : this.state.config.unlock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger228.debug(
+    logger229.debug(
       `unlockDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}, requirePin: ${this.state.requirePinForRemoteOperation}, usingUnlatch: ${!!unlatchConfig}`
     );
     if (this.state.requirePinForRemoteOperation) {
       if (!request.pinCode) {
-        logger228.info(
+        logger229.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - no PIN provided`
         );
         throw new StatusResponseError(
@@ -168172,12 +168306,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
       }
       const providedPin = new TextDecoder().decode(request.pinCode);
       if (!verifyStoredPinHelper(this.env, homeAssistant.entityId, providedPin)) {
-        logger228.info(
+        logger229.info(
           `unlockDoor REJECTED for ${homeAssistant.entityId} - invalid PIN`
         );
         throw new StatusResponseError("Invalid PIN code", StatusCode.Failure);
       }
-      logger228.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
+      logger229.debug(`unlockDoor PIN verified for ${homeAssistant.entityId}`);
       action.data = { ...action.data, code: providedPin };
     }
     homeAssistant.callAction(action);
@@ -168186,12 +168320,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.unlock(void 0, this.agent);
     const hasPinProvided = !!request.pinCode;
-    logger228.debug(
+    logger229.debug(
       `unboltDoor called for ${homeAssistant.entityId}, PIN provided: ${hasPinProvided}, requirePin: ${this.state.requirePinForRemoteOperation}`
     );
     if (this.state.requirePinForRemoteOperation) {
       if (!request.pinCode) {
-        logger228.info(
+        logger229.info(
           `unboltDoor REJECTED for ${homeAssistant.entityId} - no PIN provided`
         );
         throw new StatusResponseError(
@@ -168201,12 +168335,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
       }
       const providedPin = new TextDecoder().decode(request.pinCode);
       if (!verifyStoredPinHelper(this.env, homeAssistant.entityId, providedPin)) {
-        logger228.info(
+        logger229.info(
           `unboltDoor REJECTED for ${homeAssistant.entityId} - invalid PIN`
         );
         throw new StatusResponseError("Invalid PIN code", StatusCode.Failure);
       }
-      logger228.debug(`unboltDoor PIN verified for ${homeAssistant.entityId}`);
+      logger229.debug(`unboltDoor PIN verified for ${homeAssistant.entityId}`);
       action.data = { ...action.data, code: providedPin };
     }
     homeAssistant.callAction(action);
@@ -168345,7 +168479,7 @@ init_home_assistant_entity_behavior();
 init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
-var logger229 = Logger.get("MediaPlayerKeypadInputServer");
+var logger230 = Logger.get("MediaPlayerKeypadInputServer");
 var MediaPlayerKeypadInputServer = class extends KeypadInputServer {
   sendKey(request) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
@@ -168356,12 +168490,12 @@ var MediaPlayerKeypadInputServer = class extends KeypadInputServer {
     const features = attributes9.supported_features ?? 0;
     const action = this.mapKeyToAction(request.keyCode, features);
     if (!action) {
-      logger229.debug(
+      logger230.debug(
         `Unsupported key code ${request.keyCode} for ${homeAssistant.entityId}`
       );
       return { status: KeypadInput3.Status.UnsupportedKey };
     }
-    logger229.debug(
+    logger230.debug(
       `sendKey(${request.keyCode}) \u2192 ${action} for ${homeAssistant.entityId}`
     );
     homeAssistant.callAction({ action });
@@ -168640,7 +168774,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/speaker-level-control-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger230 = Logger.get("SpeakerLevelControlServer");
+var logger231 = Logger.get("SpeakerLevelControlServer");
 var optimisticLevelState2 = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS4 = 3e3;
 var OPTIMISTIC_TOLERANCE3 = 5;
@@ -168683,7 +168817,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
       currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
     }
     const entityId = this.agent.get(HomeAssistantEntityBehavior).entity.entity_id;
-    logger230.debug(
+    logger231.debug(
       `[${entityId}] Volume update: HA=${currentLevelPercent != null ? Math.round(currentLevelPercent * 100) : "null"}% -> currentLevel=${currentLevel}`
     );
     const optimistic = optimisticLevelState2.get(entity.entity_id);
@@ -168731,7 +168865,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
     const config8 = this.state.config;
     const entityId = homeAssistant.entity.entity_id;
     const levelPercent = level / 254;
-    logger230.debug(
+    logger231.debug(
       `[${entityId}] Volume command: level=${level} -> HA volume_level=${levelPercent}`
     );
     const current = config8.getValuePercent(
@@ -169769,7 +169903,7 @@ function mapEvseStatus(rawState, chargingSwitchOn) {
 }
 
 // src/matter/endpoints/legacy/sensor/devices/energy-evse.ts
-var logger231 = Logger.get("EnergyEvse");
+var logger232 = Logger.get("EnergyEvse");
 var MIN_CHARGE_CURRENT_MA = 6e3;
 var MAX_CHARGE_CURRENT_MA = 32e3;
 var CIRCUIT_CAPACITY_MA = 32e3;
@@ -169853,7 +169987,7 @@ var EvseStatusServer = class _EvseStatusServer extends EnergyEvseServer {
       dispatched = true;
     }
     if (!dispatched) {
-      logger231.debug(
+      logger232.debug(
         `enableCharging ignored for ${homeAssistant.entityId}: no charging switch or current limit mapped`
       );
       return;
@@ -169893,7 +170027,7 @@ var EvseStatusServer = class _EvseStatusServer extends EnergyEvseServer {
                 chargingEnabledUntil: null
               });
             } catch (error) {
-              logger231.debug(
+              logger232.debug(
                 `EVSE charge-window expiry write failed (endpoint may be closing): ${error}`
               );
             } finally {
@@ -169924,7 +170058,7 @@ var EvseStatusServer = class _EvseStatusServer extends EnergyEvseServer {
         chargingEnabledUntil: null
       });
     } else {
-      logger231.debug(
+      logger232.debug(
         `disable ignored for ${homeAssistant.entityId}: no charging switch mapped`
       );
     }
@@ -170613,7 +170747,7 @@ init_home_assistant_entity_behavior();
 // src/matter/behaviors/pm25-concentration-measurement-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger232 = Logger.get("Pm25ConcentrationMeasurementServer");
+var logger233 = Logger.get("Pm25ConcentrationMeasurementServer");
 var Pm25ConcentrationMeasurementServerBase = Pm25ConcentrationMeasurementServer.with(
   ConcentrationMeasurement3.Feature.NumericMeasurement
 );
@@ -170637,11 +170771,11 @@ var Pm25ConcentrationMeasurementServer2 = class extends Pm25ConcentrationMeasure
     if (this.state.measurementMedium === void 0) {
       this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
     }
-    logger232.debug(
+    logger233.debug(
       "Pm25ConcentrationMeasurementServer: before super.initialize()"
     );
     await super.initialize();
-    logger232.debug(
+    logger233.debug(
       "Pm25ConcentrationMeasurementServer: after super.initialize()"
     );
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -170664,7 +170798,7 @@ var Pm25ConcentrationMeasurementServer2 = class extends Pm25ConcentrationMeasure
 };
 
 // src/matter/endpoints/legacy/sensor/devices/pm25-sensor.ts
-var logger233 = Logger.get("Pm25AirQualityServer");
+var logger234 = Logger.get("Pm25AirQualityServer");
 var Pm25AirQualityServerBase = AirQualityServer.with(
   AirQuality3.Feature.Fair,
   AirQuality3.Feature.Moderate,
@@ -170676,9 +170810,9 @@ var Pm25AirQualityServer = class extends Pm25AirQualityServerBase {
     if (this.state.airQuality === void 0) {
       this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
     }
-    logger233.debug("Pm25AirQualityServer: before super.initialize()");
+    logger234.debug("Pm25AirQualityServer: before super.initialize()");
     await super.initialize();
-    logger233.debug("Pm25AirQualityServer: after super.initialize()");
+    logger234.debug("Pm25AirQualityServer: after super.initialize()");
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update, { offline: true });
@@ -170931,7 +171065,7 @@ var TvocConcentrationMeasurementServer = class extends TvocConcentrationMeasurem
 };
 
 // src/matter/endpoints/legacy/sensor/devices/tvoc-sensor.ts
-var logger234 = Logger.get("TvocSensor");
+var logger235 = Logger.get("TvocSensor");
 function airQualityFromUgm3(value) {
   if (value <= 300) return AirQuality3.AirQualityEnum.Good;
   if (value <= 1e3) return AirQuality3.AirQualityEnum.Fair;
@@ -170972,17 +171106,17 @@ var TvocAirQualityServer = class extends TvocAirQualityServerBase {
     const attributes9 = entity.state.attributes;
     const deviceClass = attributes9.device_class;
     let airQuality = AirQuality3.AirQualityEnum.Unknown;
-    logger234.debug(
+    logger235.debug(
       `[${entity.entity_id}] TVOC update: state="${state}", device_class="${deviceClass}"`
     );
     if (state != null && !Number.isNaN(+state)) {
       const value = +state;
       airQuality = deviceClass === SensorDeviceClass.volatile_organic_compounds ? airQualityFromUgm3(value) : airQualityFromPpb(value);
-      logger234.debug(
+      logger235.debug(
         `[${entity.entity_id}] TVOC value=${value} (${deviceClass}) -> airQuality=${AirQuality3.AirQualityEnum[airQuality]}`
       );
     } else {
-      logger234.warn(
+      logger235.warn(
         `[${entity.entity_id}] TVOC state not a valid number: "${state}"`
       );
     }
@@ -171392,13 +171526,13 @@ init_home_assistant_entity_behavior();
 init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
-var logger235 = Logger.get("VacuumIdentifyServer");
+var logger236 = Logger.get("VacuumIdentifyServer");
 var VacuumIdentifyServer = class extends IdentifyServer2 {
   identifyInHomeAssistant(source) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const features = homeAssistant.entity.state.attributes.supported_features ?? 0;
     if (testBit(features, VacuumDeviceFeature.LOCATE)) {
-      logger235.info(`${source} \u2192 vacuum.locate for ${homeAssistant.entityId}`);
+      logger236.info(`${source} \u2192 vacuum.locate for ${homeAssistant.entityId}`);
       homeAssistant.callAction({ action: "vacuum.locate" });
       return;
     }
@@ -171406,7 +171540,7 @@ var VacuumIdentifyServer = class extends IdentifyServer2 {
       super.identifyInHomeAssistant(source);
       return;
     }
-    logger235.warn(
+    logger236.warn(
       `${source} for ${homeAssistant.entityId}, LOCATE not in supported_features (${features}), trying vacuum.locate anyway`
     );
     homeAssistant.callAction({ action: "vacuum.locate" });
@@ -171590,7 +171724,7 @@ init_esm();
 // src/matter/behaviors/service-area-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
-var logger236 = Logger.get("ServiceAreaServer");
+var logger237 = Logger.get("ServiceAreaServer");
 function orderSelection(areas, agent) {
   try {
     const ascending = agent?.get(HomeAssistantEntityBehavior).state.mapping?.vacuumAscendingRoomOrder === true;
@@ -171605,7 +171739,7 @@ var ServiceAreaWithProgress = ServiceAreaBehavior.with(
 var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
   selectAreas(request) {
     const { newAreas } = request;
-    logger236.info(
+    logger237.info(
       `ServiceArea selectAreas called with: ${JSON.stringify(newAreas)}`
     );
     const uniqueAreas = orderSelection([...new Set(newAreas)], this.agent);
@@ -171614,7 +171748,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
       (id) => !supportedAreaIds.includes(id)
     );
     if (invalidAreas.length > 0) {
-      logger236.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
+      logger237.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
       return {
         status: ServiceArea3.SelectAreasStatus.UnsupportedArea,
         statusText: `Invalid area IDs: ${invalidAreas.join(", ")}`
@@ -171626,7 +171760,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
       status: ServiceArea3.OperationalStatus.Pending
     }));
     this.state.currentArea = null;
-    logger236.info(
+    logger237.info(
       `ServiceArea: Stored ${uniqueAreas.length} areas for cleaning: ${uniqueAreas.join(", ")}`
     );
     return {
@@ -171647,7 +171781,7 @@ var ServiceAreaServerBase = class extends ServiceAreaWithProgress {
   ServiceAreaServerBase2.State = State;
 })(ServiceAreaServerBase || (ServiceAreaServerBase = {}));
 function ServiceAreaServer2(initialState) {
-  logger236.info(
+  logger237.info(
     `Creating ServiceAreaServer with ${initialState.supportedAreas.length} areas`
   );
   return ServiceAreaServerBase.set({
@@ -171664,7 +171798,7 @@ var ServiceAreaWithMapsAndProgress = ServiceAreaBehavior.with(
 var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress {
   selectAreas(request) {
     const { newAreas } = request;
-    logger236.info(
+    logger237.info(
       `ServiceArea selectAreas called with: ${JSON.stringify(newAreas)}`
     );
     const uniqueAreas = orderSelection([...new Set(newAreas)], this.agent);
@@ -171673,7 +171807,7 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
       (id) => !supportedAreaIds.includes(id)
     );
     if (invalidAreas.length > 0) {
-      logger236.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
+      logger237.warn(`Invalid area IDs requested: ${invalidAreas.join(", ")}`);
       return {
         status: ServiceArea3.SelectAreasStatus.UnsupportedArea,
         statusText: `Invalid area IDs: ${invalidAreas.join(", ")}`
@@ -171685,7 +171819,7 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
       status: ServiceArea3.OperationalStatus.Pending
     }));
     this.state.currentArea = null;
-    logger236.info(
+    logger237.info(
       `ServiceArea: Stored ${uniqueAreas.length} areas for cleaning: ${uniqueAreas.join(", ")}`
     );
     return {
@@ -171706,14 +171840,14 @@ var ServiceAreaServerWithMapsBase = class extends ServiceAreaWithMapsAndProgress
   ServiceAreaServerWithMapsBase2.State = State;
 })(ServiceAreaServerWithMapsBase || (ServiceAreaServerWithMapsBase = {}));
 function ServiceAreaServerWithMaps(initialState) {
-  logger236.info(
+  logger237.info(
     `Creating ServiceAreaServer with Maps: ${initialState.supportedAreas.length} areas, ${initialState.supportedMaps.length} maps`
   );
   for (const map of initialState.supportedMaps) {
     const areaCount = initialState.supportedAreas.filter(
       (a) => a.mapId === map.mapId
     ).length;
-    logger236.info(`  Map ${map.mapId}: "${map.name}" (${areaCount} areas)`);
+    logger237.info(`  Map ${map.mapId}: "${map.name}" (${areaCount} areas)`);
   }
   return ServiceAreaServerWithMapsBase.set({
     supportedAreas: initialState.supportedAreas,
@@ -171725,7 +171859,7 @@ function ServiceAreaServerWithMaps(initialState) {
 }
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-service-area-server.ts
-var logger237 = Logger.get("VacuumServiceAreaServer");
+var logger238 = Logger.get("VacuumServiceAreaServer");
 function toAreaId(roomId) {
   if (typeof roomId === "number") {
     return roomId;
@@ -171804,13 +171938,13 @@ function createVacuumServiceAreaServer(attributes9, roomEntities, includeUnnamed
   let rooms;
   if (roomEntities && roomEntities.length > 0) {
     rooms = buttonEntitiesToRooms(roomEntities, attributes9);
-    logger237.info(
+    logger238.info(
       `Using ${rooms.length} button entities as rooms: ${rooms.map((r) => r.name).join(", ")}`
     );
   } else {
     rooms = parseVacuumRooms(attributes9, includeUnnamedRooms);
     if (rooms.length > 0) {
-      logger237.info(
+      logger238.info(
         `Using ${rooms.length} rooms from attributes: ${rooms.map((r) => r.name).join(", ")}`
       );
     }
@@ -171864,7 +171998,7 @@ function createCustomServiceAreaServer(customAreas) {
       landmarkInfo: null
     }
   }));
-  logger237.info(
+  logger238.info(
     `Using ${customAreas.length} custom service areas: ${customAreas.map((a) => a.name).join(", ")}`
   );
   return ServiceAreaServer2({
@@ -171886,7 +172020,7 @@ function createCleanAreaServiceAreaServer(cleanAreaRooms) {
       landmarkInfo: null
     }
   }));
-  logger237.info(
+  logger238.info(
     `Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA: ${cleanAreaRooms.map((r) => r.name).join(", ")}`
   );
   return ServiceAreaServer2({
@@ -171922,11 +172056,11 @@ function getVacuumServiceAreas(attributes9, mapping) {
 }
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
-var logger238 = Logger.get("VacuumRvcRunModeServer");
+var logger239 = Logger.get("VacuumRvcRunModeServer");
 function buildValetudoSegmentAction(vacuumEntityId, segmentIds, valetudoIdentifier) {
   const identifier = valetudoIdentifier || vacuumEntityId.replace(/^vacuum\.valetudo_/, "");
   const topic = `valetudo/${identifier}/MapSegmentationCapability/clean/set`;
-  logger238.info(
+  logger239.info(
     `Valetudo: mqtt.publish to ${topic}, segments: ${segmentIds.join(", ")}`
   );
   return {
@@ -172031,14 +172165,14 @@ function mergeBatchData(areas) {
 function handleCustomServiceAreas(selectedAreas, customAreas, session) {
   const matched = selectedAreas.map((areaId) => ({ areaId, area: customAreas[areaId - 1] })).filter((m) => !!m.area);
   if (matched.length === 0) {
-    logger238.warn(
+    logger239.warn(
       `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
     );
     return { action: "vacuum.start" };
   }
   const batchArea = matched.find(({ area }) => area.batchDispatch === true);
   if (batchArea) {
-    logger238.info(
+    logger239.info(
       `Custom service areas (batch): single call for ${matched.length} room(s): ${matched.map(({ area }) => area.name).join(", ")}`
     );
     session.pendingDispatches = [];
@@ -172059,7 +172193,7 @@ function handleCustomServiceAreas(selectedAreas, customAreas, session) {
       }
     };
   }
-  logger238.info(
+  logger239.info(
     `Custom service areas: ${matched.length} room(s) queued: ${matched.map(({ area }) => `${area.service} (${area.name})`).join(", ")}`
   );
   session.pendingDispatches = matched.slice(1).map(({ areaId, area }) => ({
@@ -172117,7 +172251,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
   if (cleanAreaRooms && cleanAreaRooms.length > 0) {
     const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
     if (haAreaIds.length > 0) {
-      logger238.info(`CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`);
+      logger239.info(`CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`);
       return {
         action: {
           action: "vacuum.clean_area",
@@ -172137,7 +172271,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
       }
     }
     if (matched.length > 0) {
-      logger238.info(
+      logger239.info(
         `Roborock: ${matched.length} room button(s) queued: ${matched.map((m) => m.entityId).join(", ")}`
       );
       return {
@@ -172172,12 +172306,12 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
     }
   }
   if (roomIds.length > 0) {
-    logger238.info(`Starting cleaning with selected areas: ${roomIds.join(", ")}`);
+    logger239.info(`Starting cleaning with selected areas: ${roomIds.join(", ")}`);
     if (isDreameVacuum(attributes9)) {
       if (targetMapName) {
         const vacName = entityId.replace("vacuum.", "");
         const selectedMapEntity = `select.${vacName}_selected_map`;
-        logger238.info(
+        logger239.info(
           `Dreame multi-floor: switching to map "${targetMapName}" via ${selectedMapEntity}`
         );
         seam.callAction({
@@ -172205,7 +172339,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
     }
     if (isEcovacsVacuum(attributes9)) {
       const roomIdStr = roomIds.join(",");
-      logger238.info(`Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`);
+      logger239.info(`Ecovacs vacuum: Using spot_area for rooms: ${roomIdStr}`);
       return {
         action: {
           action: "vacuum.send_command",
@@ -172217,7 +172351,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
         pending: []
       };
     }
-    logger238.warn(
+    logger239.warn(
       `Room cleaning via send_command not supported for this vacuum type. Rooms: ${roomIds.join(", ")}. Falling back to vacuum.start`
     );
   }
@@ -172226,7 +172360,7 @@ function dispatchRoomClean(attributes9, mapping, entityId, selectedAreas, seam)
 var vacuumRvcRunModeConfig = {
   getCurrentMode: (entity) => {
     const isCleaning = vacuumIsCleaning(entity.state);
-    logger238.debug(
+    logger239.debug(
       `Vacuum state: "${entity.state}", isCleaning: ${isCleaning}, currentMode: ${isCleaning ? "Cleaning" : "Idle"}`
     );
     return isCleaning ? 1 /* Cleaning */ : 0 /* Idle */;
@@ -172265,7 +172399,7 @@ var vacuumRvcRunModeConfig = {
       }
     } catch {
     }
-    logger238.info("Starting regular cleaning (no areas selected)");
+    logger239.info("Starting regular cleaning (no areas selected)");
     return { action: "vacuum.start" };
   },
   returnToBase: () => ({ action: "vacuum.return_to_base" }),
@@ -172280,7 +172414,7 @@ var vacuumRvcRunModeConfig = {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
     const entity = homeAssistant.entity;
     const attributes9 = entity.state.attributes;
-    logger238.info(`cleanRoom called: roomMode=${roomMode}`);
+    logger239.info(`cleanRoom called: roomMode=${roomMode}`);
     const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
     if (cleanAreaRooms && cleanAreaRooms.length > 0) {
       const sorted = [...cleanAreaRooms].sort(
@@ -172289,7 +172423,7 @@ var vacuumRvcRunModeConfig = {
       const areaIndex = roomMode - ROOM_MODE_BASE2 - 1;
       if (areaIndex >= 0 && areaIndex < sorted.length) {
         const area = sorted[areaIndex];
-        logger238.info(
+        logger239.info(
           `cleanRoom: CLEAN_AREA "${area.name}" \u2192 vacuum.clean_area(${area.haAreaId})`
         );
         return {
@@ -172306,7 +172440,7 @@ var vacuumRvcRunModeConfig = {
       const areaIndex = roomMode - ROOM_MODE_BASE2 - 1;
       if (areaIndex >= 0 && areaIndex < sorted.length) {
         const area = sorted[areaIndex];
-        logger238.info(
+        logger239.info(
           `cleanRoom: custom service area "${area.name}" \u2192 ${area.service}`
         );
         return {
@@ -172327,7 +172461,7 @@ var vacuumRvcRunModeConfig = {
     }
     const rooms = parseVacuumRooms(attributes9);
     const numericIdFromMode = getRoomIdFromMode(roomMode);
-    logger238.info(
+    logger239.info(
       `cleanRoom: numericIdFromMode=${numericIdFromMode}, available rooms: ${JSON.stringify(rooms.map((r) => ({ id: r.id, name: r.name, modeValue: getRoomModeValue(r) })))}`
     );
     const room = rooms.find((r) => getRoomModeValue(r) === roomMode);
@@ -172337,7 +172471,7 @@ var vacuumRvcRunModeConfig = {
         if (room.mapName) {
           const vacuumName = vacuumEntityId.replace("vacuum.", "");
           const selectedMapEntity = `select.${vacuumName}_selected_map`;
-          logger238.info(
+          logger239.info(
             `Dreame multi-floor: switching to map "${room.mapName}" via ${selectedMapEntity}`
           );
           homeAssistant.callAction({
@@ -172346,7 +172480,7 @@ var vacuumRvcRunModeConfig = {
             data: { option: room.mapName }
           });
         }
-        logger238.debug(
+        logger239.debug(
           `Dreame vacuum detected, using dreame_vacuum.vacuum_clean_segment for room ${room.name} (commandId: ${commandId3}, id: ${room.id})`
         );
         return {
@@ -172357,7 +172491,7 @@ var vacuumRvcRunModeConfig = {
         };
       }
       if (isRoborockVacuum(attributes9) || isXiaomiMiotVacuum(attributes9)) {
-        logger238.debug(
+        logger239.debug(
           `Using vacuum.send_command with app_segment_clean for room ${room.name} (commandId: ${commandId3}, id: ${room.id})`
         );
         return {
@@ -172370,7 +172504,7 @@ var vacuumRvcRunModeConfig = {
       }
       if (isEcovacsVacuum(attributes9)) {
         const roomIdStr = String(commandId3);
-        logger238.info(
+        logger239.info(
           `Ecovacs vacuum: Using spot_area for room ${room.name} (id: ${roomIdStr})`
         );
         return {
@@ -172385,7 +172519,7 @@ var vacuumRvcRunModeConfig = {
           }
         };
       }
-      logger238.warn(
+      logger239.warn(
         `Room cleaning via send_command not supported for this vacuum type. Room: ${room.name} (id=${commandId3}). Falling back to vacuum.start`
       );
     }
@@ -172402,20 +172536,20 @@ function createVacuumRvcRunModeServer(attributes9, includeUnnamedRooms = false,
     customAreas,
     disableRoomModes
   );
-  logger238.info(
+  logger239.info(
     `Creating VacuumRvcRunModeServer with ${rooms.length} rooms, ${supportedModes2.length} total modes`
   );
   if (rooms.length > 0) {
-    logger238.info(`Rooms found: ${rooms.map((r) => r.name).join(", ")}`);
+    logger239.info(`Rooms found: ${rooms.map((r) => r.name).join(", ")}`);
   }
   if (filteredCount > 0) {
     const filtered = allRooms.filter((r) => !rooms.some((x) => x.id === r.id));
-    logger238.info(
+    logger239.info(
       `Filtered out ${filteredCount} unnamed room(s): ${filtered.map((r) => r.name).join(", ")}`
     );
   }
   if (allRooms.length === 0) {
-    logger238.debug(
+    logger239.debug(
       `No rooms found. Attributes: rooms=${JSON.stringify(attributes9.rooms)}, segments=${JSON.stringify(attributes9.segments)}, room_list=${attributes9.room_list}`
     );
   }
@@ -172449,7 +172583,7 @@ function createCleanAreaRvcRunModeServer(cleanAreaRooms) {
       modeTags: [{ value: RvcRunMode3.ModeTag.Cleaning }]
     });
   }
-  logger238.info(
+  logger239.info(
     `Creating CLEAN_AREA RvcRunModeServer with ${cleanAreaRooms.length} HA areas, ${modes.length} total modes`
   );
   return RvcRunModeServer2(vacuumRvcRunModeConfig, {
@@ -172539,7 +172673,7 @@ init_nodejs();
 
 // src/matter/behaviors/rvc-clean-mode-server.ts
 init_home_assistant_entity_behavior();
-var logger239 = Logger.get("RvcCleanModeServerBase");
+var logger240 = Logger.get("RvcCleanModeServerBase");
 var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeServer {
   // Pending mode from a recent changeToMode command.
   // Prevents stale HA state (from a different entity like select.xxx)
@@ -172586,14 +172720,14 @@ var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeS
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const { newMode } = request;
     if (newMode !== this.state.currentMode && !this.state.supportedModes.some((m) => m.mode === newMode)) {
-      logger239.warn(`changeToMode(${newMode}) rejected: unsupported mode`);
+      logger240.warn(`changeToMode(${newMode}) rejected: unsupported mode`);
       return {
         status: ModeBase3.ModeChangeStatus.UnsupportedMode,
         statusText: `Unsupported mode: ${newMode}`
       };
     }
     const modeLabel = this.state.supportedModes.find((m) => m.mode === newMode);
-    logger239.info(
+    logger240.info(
       `changeToMode(${newMode}) "${modeLabel?.label ?? "unknown"}" for ${homeAssistant.entityId}`
     );
     this.pendingMode = newMode;
@@ -172601,7 +172735,7 @@ var RvcCleanModeServerBase = class _RvcCleanModeServerBase extends RvcCleanModeS
     this.state.currentMode = newMode;
     const action = this.state.config.setCleanMode(newMode, this.agent);
     if (action) {
-      logger239.info(
+      logger240.info(
         `changeToMode: dispatching action ${action.action} \u2192 ${action.target ?? homeAssistant.entityId}`
       );
       homeAssistant.callAction(action);
@@ -172634,7 +172768,7 @@ function RvcCleanModeServer2(config8, initialState) {
 }
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-clean-mode-server.ts
-var logger240 = Logger.get("VacuumRvcCleanModeServer");
+var logger241 = Logger.get("VacuumRvcCleanModeServer");
 var MODE_VACUUM = 0;
 var MODE_VACUUM_AND_MOP = 1;
 var MODE_MOP = 2;
@@ -172904,7 +173038,7 @@ function findMatchingCleanOption(ct, availableOptions) {
     const match = availableOptions.find((o) => classifyCleanOption(o) === type);
     if (match) return match;
   }
-  logger240.warn(
+  logger241.warn(
     `No match for ${CLEAN_TYPE_LABELS[ct]} in [${availableOptions.join(", ")}]`
   );
   return availableOptions[0];
@@ -172913,7 +173047,7 @@ function buildCleaningModeAction(targetCleanType, agent) {
   const selectEntityId = getCleaningModeSelectEntity(agent);
   const { options } = readSelectEntity(selectEntityId, agent);
   const optionToUse = findMatchingCleanOption(targetCleanType, options);
-  logger240.info(
+  logger241.info(
     `Switching cleaning mode to: ${optionToUse} via ${selectEntityId}`
   );
   return {
@@ -173002,7 +173136,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
           }
         }
         if (speedMode !== void 0) {
-          logger240.debug(
+          logger241.debug(
             `Current mode: Vacuum + fan_speed="${speedState}" -> mode ${speedMode}`
           );
           return speedMode;
@@ -173023,7 +173157,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
           }
         }
         if (mopMode !== void 0) {
-          logger240.debug(
+          logger241.debug(
             `Current mode: Mop + intensity="${state}" -> mode ${mopMode}`
           );
           return mopMode;
@@ -173041,14 +173175,14 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
       const homeAssistant = agent.get(HomeAssistantEntityBehavior);
       const vacuumEntityId = homeAssistant.entityId;
       const mapping = homeAssistant.state.mapping;
-      logger240.info(
+      logger241.info(
         `setCleanMode(${mode}) for ${vacuumEntityId}, suctionEntity=${mapping?.suctionLevelEntity ?? "none"}, mopEntity=${mapping?.mopIntensityEntity ?? "none"}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, customTags=${JSON.stringify(customFanSpeedTags ?? {})}`
       );
       if (mopIntensityList && mopIntensityList.length > 0 && isMopIntensityMode(mode)) {
         const mopIndex = mode - MOP_INTENSITY_MODE_BASE;
         const mopName = mopIntensityList[mopIndex];
         if (!mopName) {
-          logger240.warn(`Invalid mop intensity mode index: ${mopIndex}`);
+          logger241.warn(`Invalid mop intensity mode index: ${mopIndex}`);
           return void 0;
         }
         if (hasCleanTypes) {
@@ -173061,18 +173195,18 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
             mapping.mopIntensityEntity,
             agent
           );
-          logger240.info(
+          logger241.info(
             `Mop intensity entity ${mapping.mopIntensityEntity}: current="${state}", options=${JSON.stringify(options ?? [])}`
           );
           let option = matchMopIntensityOption(mopName, options);
           if (!option && options && mopIndex < options.length) {
             option = options[mopIndex];
-            logger240.info(
+            logger241.info(
               `Positional match for mop "${mopName}" -> "${option}" (index ${mopIndex})`
             );
           }
           if (option) {
-            logger240.info(
+            logger241.info(
               `Setting mop intensity to: ${option} via ${mapping.mopIntensityEntity}`
             );
             return {
@@ -173081,11 +173215,11 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
               target: mapping.mopIntensityEntity
             };
           }
-          logger240.warn(
+          logger241.warn(
             `No match for mop intensity "${mopName}" in options: [${(options ?? []).join(", ")}]`
           );
         } else {
-          logger240.warn(
+          logger241.warn(
             `Mop intensity mode ${mode} requested but no mopIntensityEntity configured`
           );
         }
@@ -173095,7 +173229,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
         const fanSpeedIndex = mode - FAN_SPEED_MODE_BASE;
         const fanSpeedName = fanSpeedList[fanSpeedIndex];
         if (!fanSpeedName) {
-          logger240.warn(`Invalid fan speed mode index: ${fanSpeedIndex}`);
+          logger241.warn(`Invalid fan speed mode index: ${fanSpeedIndex}`);
           return void 0;
         }
         if (mapping?.suctionLevelEntity) {
@@ -173108,7 +173242,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
             mapping.suctionLevelEntity,
             agent
           );
-          logger240.info(
+          logger241.info(
             `Suction entity ${mapping.suctionLevelEntity}: current="${state}", options=${JSON.stringify(options ?? [])}`
           );
           let option = matchFanSpeedOption(
@@ -173118,12 +173252,12 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
           );
           if (!option && options && fanSpeedIndex < options.length) {
             option = options[fanSpeedIndex];
-            logger240.info(
+            logger241.info(
               `Positional match for fan "${fanSpeedName}" -> "${option}" (index ${fanSpeedIndex})`
             );
           }
           if (option) {
-            logger240.info(
+            logger241.info(
               `Setting suction to: ${option} via ${mapping.suctionLevelEntity}`
             );
             return {
@@ -173132,7 +173266,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
               target: mapping.suctionLevelEntity
             };
           }
-          logger240.warn(
+          logger241.warn(
             `No match for fan speed "${fanSpeedName}" in suction options: [${(options ?? []).join(", ")}]`
           );
           return void 0;
@@ -173142,7 +173276,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
             buildCleaningModeAction(0 /* Sweeping */, agent)
           );
         }
-        logger240.info(
+        logger241.info(
           `Setting fan speed to: ${fanSpeedName} via vacuum.set_fan_speed`
         );
         return {
@@ -173152,7 +173286,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
         };
       }
       if (!hasCleanTypes) {
-        logger240.debug(
+        logger241.debug(
           `Ignoring cleaning type change (mode=${mode}): no cleaning mode entity`
         );
         return void 0;
@@ -173164,7 +173298,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
         agent
       );
       const optionToUse = findMatchingCleanOption(cleanType, availableOptions);
-      logger240.info(
+      logger241.info(
         `Setting cleaning mode to: ${optionToUse} (mode=${mode}) via ${selectEntityId}`
       );
       return {
@@ -173182,10 +173316,10 @@ function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityL
     cleaningModeOptions,
     customFanSpeedTags
   );
-  logger240.info(
+  logger241.info(
     `Creating VacuumRvcCleanModeServer with ${supportedModes2.length} modes (fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])}, customTags=${JSON.stringify(customFanSpeedTags ?? {})})`
   );
-  logger240.info(
+  logger241.info(
     `Modes: ${supportedModes2.map((m) => `${m.mode}:${m.label}[${m.modeTags.map((t) => t.value).join(",")}]`).join(", ")}`
   );
   const initialState = {
@@ -173248,7 +173382,7 @@ function resolveMopIntensityList(mopIntensityEntity) {
 init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
-var logger241 = Logger.get("VacuumRvcOperationalStateServer");
+var logger242 = Logger.get("VacuumRvcOperationalStateServer");
 function batteryFromAttributes(attrs) {
   const raw = attrs.battery_level ?? attrs.battery;
   if (raw == null) return null;
@@ -173301,16 +173435,16 @@ function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttribute
     operationalState = RvcOperationalState4.OperationalState.Error;
   } else {
     if (state.toLowerCase().includes("clean")) {
-      logger241.info(
+      logger242.info(
         `Unknown vacuum state "${state}" contains 'clean', treating as Running`
       );
       operationalState = RvcOperationalState4.OperationalState.Running;
     } else {
-      logger241.info(`Unknown vacuum state "${state}", treating as Stopped`);
+      logger242.info(`Unknown vacuum state "${state}", treating as Stopped`);
       operationalState = RvcOperationalState4.OperationalState.Stopped;
     }
   }
-  logger241.debug(
+  logger242.debug(
     `Vacuum operationalState: "${state}" -> ${RvcOperationalState4.OperationalState[operationalState]}`
   );
   return operationalState;
@@ -173339,7 +173473,7 @@ var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
 });
 
 // src/matter/endpoints/legacy/vacuum/index.ts
-var logger242 = Logger.get("VacuumDevice");
+var logger243 = Logger.get("VacuumDevice");
 var VacuumEndpointType = RoboticVacuumCleanerDevice.with(
   BasicInformationServer2,
   VacuumIdentifyServer,
@@ -173353,7 +173487,7 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
   const entityId = homeAssistantEntity.entity.entity_id;
   const attributes9 = homeAssistantEntity.entity.state.attributes;
   const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
-  logger242.info(
+  logger243.info(
     `Creating vacuum endpoint for ${entityId}, mapping: ${JSON.stringify(homeAssistantEntity.mapping ?? "none")}`
   );
   const cleanAreaRooms = homeAssistantEntity.mapping?.cleanAreaRooms;
@@ -173366,32 +173500,32 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
     )
   ).set({ homeAssistantEntity });
   if (includeOnOff) {
-    logger242.info(`${entityId}: Adding OnOff cluster (vacuumOnOff flag enabled)`);
+    logger243.info(`${entityId}: Adding OnOff cluster (vacuumOnOff flag enabled)`);
     device = device.with(VacuumOnOffServer);
   }
   device = device.with(VacuumPowerSourceServer);
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes9);
-  logger242.info(
+  logger243.info(
     `${entityId}: customAreas=${customAreas?.length ?? 0}, roomEntities=${JSON.stringify(roomEntities ?? [])}, parsedRooms=${rooms.length}, cleanAreaRooms=${cleanAreaRooms?.length ?? 0}`
   );
   if (cleanAreaRooms && cleanAreaRooms.length > 0) {
-    logger242.info(
+    logger243.info(
       `${entityId}: Adding ServiceArea (${cleanAreaRooms.length} HA areas via CLEAN_AREA)`
     );
     device = device.with(createCleanAreaServiceAreaServer(cleanAreaRooms));
   } else if (customAreas && customAreas.length > 0) {
-    logger242.info(
+    logger243.info(
       `${entityId}: Adding ServiceArea (${customAreas.length} custom areas)`
     );
     device = device.with(createCustomServiceAreaServer(customAreas));
   } else if (rooms.length > 0 || roomEntities && roomEntities.length > 0) {
-    logger242.info(`${entityId}: Adding ServiceArea (${rooms.length} rooms)`);
+    logger243.info(`${entityId}: Adding ServiceArea (${rooms.length} rooms)`);
     device = device.with(
       createVacuumServiceAreaServer(attributes9, roomEntities)
     );
   } else {
-    logger242.info(`${entityId}: Adding ServiceArea (default single-area)`);
+    logger243.info(`${entityId}: Adding ServiceArea (default single-area)`);
     device = device.with(createDefaultServiceAreaServer());
   }
   const fanSpeedList = resolveFanSpeedList(
@@ -173402,7 +173536,7 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
     homeAssistantEntity.mapping?.mopIntensityEntity
   );
   if (cleaningModeOptions || fanSpeedList || mopIntensityList) {
-    logger242.info(
+    logger243.info(
       `${entityId}: Adding RvcCleanMode (multi-mode, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])})`
     );
     device = device.with(
@@ -173415,7 +173549,7 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, cleaningModeOpt
       )
     );
   } else {
-    logger242.info(`${entityId}: Adding RvcCleanMode (default single-mode)`);
+    logger243.info(`${entityId}: Adding RvcCleanMode (default single-mode)`);
     device = device.with(createDefaultRvcCleanModeServer());
   }
   return device;
@@ -173581,7 +173715,7 @@ var WaterHeaterThermostatServer = ThermostatServer2(
 );
 
 // src/matter/endpoints/legacy/water-heater/index.ts
-var logger243 = Logger.get("WaterHeaterDevice");
+var logger244 = Logger.get("WaterHeaterDevice");
 var WaterHeaterDeviceType = ThermostatDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
@@ -173597,7 +173731,7 @@ function toMatterTemp2(value) {
 }
 function WaterHeaterDevice2(homeAssistantEntity) {
   const attributes9 = homeAssistantEntity.entity.state.attributes;
-  logger243.debug(
+  logger244.debug(
     `Creating device for ${homeAssistantEntity.entity.entity_id}, min_temp=${attributes9.min_temp}, max_temp=${attributes9.max_temp}`
   );
   const minLimit = toMatterTemp2(attributes9.min_temp) ?? 0;
@@ -173840,7 +173974,7 @@ function activeHeatSource(attributes9) {
 }
 
 // src/matter/endpoints/legacy/water-heater/behaviors/water-heater-management-server.ts
-var logger244 = Logger.get("WaterHeaterManagementServer");
+var logger245 = Logger.get("WaterHeaterManagementServer");
 var MAX_TIMER_MS2 = 2147483647;
 var boostSessions = /* @__PURE__ */ new WeakMap();
 function clearBoostTimer(endpoint) {
@@ -174086,7 +174220,7 @@ var WaterHeaterManagementServerBase = class _WaterHeaterManagementServerBase ext
   armBoostTimer(durationSeconds) {
     const delay = durationSeconds * 1e3;
     if (!Number.isFinite(delay) || delay <= 0 || delay > MAX_TIMER_MS2) {
-      logger244.debug(
+      logger245.debug(
         `Boost duration ${durationSeconds}s outside the timer range, boost stays active until CancelBoost`
       );
       return;
@@ -174100,7 +174234,7 @@ var WaterHeaterManagementServerBase = class _WaterHeaterManagementServerBase ext
             agent.get(_WaterHeaterManagementServerBase).endBoost({ restoreMode: true });
           });
         } catch (error) {
-          logger244.debug(
+          logger245.debug(
             `Boost expiry failed (endpoint may be closing): ${error}`
           );
         }
@@ -174203,13 +174337,13 @@ function WaterHeaterModeServer2(mapping, initialMode) {
 }
 
 // src/matter/endpoints/legacy/water-heater/water-heater-management-device.ts
-var logger245 = Logger.get("WaterHeaterManagementDevice");
+var logger246 = Logger.get("WaterHeaterManagementDevice");
 function WaterHeaterManagementDevice(homeAssistantEntity) {
   const entityState = homeAssistantEntity.entity.state;
   const attributes9 = entityState.attributes;
   const modeMapping = buildModeMapping(attributes9);
   const initialMode = currentMode(modeMapping, entityState.state, attributes9);
-  logger245.debug(
+  logger246.debug(
     `Creating Matter 1.4 water heater for ${homeAssistantEntity.entity.entity_id}, modes=[${modeMapping.supportedModes.map((m) => `${m.mode}:${m.label}`).join(", ")}], boostMode=${modeMapping.boostOperationMode ?? "none"}`
   );
   const minLimit = toMatterTemp2(attributes9.min_temp) ?? 0;
@@ -174483,7 +174617,7 @@ var matterDeviceTypeFactories = {
 };
 
 // src/matter/endpoints/composed/user-composed-endpoint.ts
-var logger246 = Logger.get("UserComposedEndpoint");
+var logger247 = Logger.get("UserComposedEndpoint");
 function stripBasicInformation(type) {
   const behaviors = { ...type.behaviors };
   delete behaviors.bridgedDeviceBasicInformation;
@@ -174559,7 +174693,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       { vacuumOnOff: registry3.isVacuumOnOffEnabled() }
     );
     if (!primaryType) {
-      logger246.warn(
+      logger247.warn(
         `Cannot create endpoint type for primary entity ${primaryEntityId}`
       );
       return void 0;
@@ -174574,7 +174708,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       if (!sub.entityId) continue;
       const subPayload = buildEntityPayload4(registry3, sub.entityId);
       if (!subPayload) {
-        logger246.warn(
+        logger247.warn(
           `Cannot find state for composed sub-entity ${sub.entityId}, it does not exist in Home Assistant (removed or renamed?)`
         );
         continue;
@@ -174589,7 +174723,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
         config8.areaName
       );
       if (!subType) {
-        logger246.warn(
+        logger247.warn(
           `Cannot create endpoint type for composed sub-entity ${sub.entityId}`
         );
         continue;
@@ -174602,7 +174736,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       mappedIds.push(sub.entityId);
     }
     if (parts.length < 2) {
-      logger246.warn(
+      logger247.warn(
         `User composed device ${primaryEntityId}: only ${parts.length} sub-endpoint(s), need at least 2 (primary + one sub-entity). Falling back to standalone.`
       );
       return void 0;
@@ -174626,7 +174760,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
     const labels = parts.map(
       (_, i) => i === 0 ? primaryEntityId.split(".")[0] : composedEntities[i - 1]?.entityId?.split(".")[0] ?? "?"
     ).join("+");
-    logger246.info(
+    logger247.info(
       `Created user composed device ${primaryEntityId}: ${parts.length} sub-endpoint(s) [${labels}]`
     );
     return endpoint;
@@ -174732,7 +174866,7 @@ function asStandaloneEndpointType(type) {
 }
 
 // src/matter/endpoints/legacy/legacy-endpoint.ts
-var logger247 = Logger.get("LegacyEndpoint");
+var logger248 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId, vacuumEffective) {
     super(type, entityId, customName, mappedEntityIds, endpointId);
@@ -174748,25 +174882,25 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       return;
     }
     if (registry3.isAutoBatteryMappingEnabled() && registry3.isBatteryEntityUsed(entityId)) {
-      logger247.debug(
+      logger248.debug(
         `Skipping ${entityId} - already auto-assigned as battery to another device`
       );
       return;
     }
     if (registry3.isAutoHumidityMappingEnabled() && registry3.isHumidityEntityUsed(entityId)) {
-      logger247.debug(
+      logger248.debug(
         `Skipping ${entityId} - already auto-assigned as humidity to a temperature sensor`
       );
       return;
     }
     if (registry3.isAutoPressureMappingEnabled() && registry3.isPressureEntityUsed(entityId)) {
-      logger247.debug(
+      logger248.debug(
         `Skipping ${entityId} - already auto-assigned as pressure to a temperature sensor`
       );
       return;
     }
     if (registry3.isAutoComposedDevicesEnabled() && registry3.isComposedSubEntityUsed(entityId)) {
-      logger247.debug(
+      logger248.debug(
         `Skipping ${entityId} - already consumed by a composed device`
       );
       return;
@@ -174786,7 +174920,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               humidityEntity: humidityEntityId
             };
             registry3.markHumidityEntityUsed(humidityEntityId);
-            logger247.debug(
+            logger248.debug(
               `Auto-assigned humidity ${humidityEntityId} to ${entityId}`
             );
           }
@@ -174805,7 +174939,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               pressureEntity: pressureEntityId
             };
             registry3.markPressureEntityUsed(pressureEntityId);
-            logger247.debug(
+            logger248.debug(
               `Auto-assigned pressure ${pressureEntityId} to ${entityId}`
             );
           }
@@ -174823,7 +174957,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             batteryEntity: batteryEntityId
           };
           registry3.markBatteryEntityUsed(batteryEntityId);
-          logger247.debug(
+          logger248.debug(
             `Auto-assigned battery ${batteryEntityId} to ${entityId}`
           );
         }
@@ -174840,7 +174974,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             faultEntity: faultEntityId
           };
-          logger247.debug(`Auto-assigned fault ${faultEntityId} to ${entityId}`);
+          logger248.debug(`Auto-assigned fault ${faultEntityId} to ${entityId}`);
         }
       }
       if (!mapping?.powerEntity) {
@@ -174856,7 +174990,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               powerEntity: powerEntityId
             };
             registry3.markPowerEntityUsed(powerEntityId);
-            logger247.debug(`Auto-assigned power ${powerEntityId} to ${entityId}`);
+            logger248.debug(`Auto-assigned power ${powerEntityId} to ${entityId}`);
           }
         }
       }
@@ -174873,7 +175007,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               energyEntity: energyEntityId
             };
             registry3.markEnergyEntityUsed(energyEntityId);
-            logger247.debug(
+            logger248.debug(
               `Auto-assigned energy ${energyEntityId} to ${entityId}`
             );
           }
@@ -174889,7 +175023,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             cleaningModeEntity: vacuumEntities.cleaningModeEntity
           };
-          logger247.info(
+          logger248.info(
             `Auto-assigned cleaningMode ${vacuumEntities.cleaningModeEntity} to ${entityId}`
           );
         }
@@ -174899,7 +175033,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             suctionLevelEntity: vacuumEntities.suctionLevelEntity
           };
-          logger247.info(
+          logger248.info(
             `Auto-assigned suctionLevel ${vacuumEntities.suctionLevelEntity} to ${entityId}`
           );
         }
@@ -174909,7 +175043,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             mopIntensityEntity: vacuumEntities.mopIntensityEntity
           };
-          logger247.info(
+          logger248.info(
             `Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity} to ${entityId}`
           );
         }
@@ -174919,7 +175053,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             currentRoomEntity: vacuumEntities.currentRoomEntity
           };
-          logger247.info(
+          logger248.info(
             `Auto-assigned currentRoom ${vacuumEntities.currentRoomEntity} to ${entityId}`
           );
         }
@@ -174934,7 +175068,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             cleanAreaRooms
           };
-          logger247.info(
+          logger248.info(
             `Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA for ${entityId}`
           );
         }
@@ -174955,7 +175089,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                 rooms: roomsObj
               }
             };
-            logger247.debug(
+            logger248.debug(
               `Auto-detected ${valetudoRooms.length} Valetudo segments for ${entityId}`
             );
           } else {
@@ -174972,7 +175106,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
                   rooms: roomsObj
                 }
               };
-              logger247.debug(
+              logger248.debug(
                 `Auto-detected ${roborockRooms.length} Roborock rooms for ${entityId}`
               );
             }
@@ -174981,7 +175115,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       }
     }
     if (standalone && ((effectiveMapping?.composedEntities?.length ?? 0) > 0 || effectiveMapping?.climateExposeFan === true)) {
-      logger247.warn(
+      logger248.warn(
         `Composed mappings are not supported in server mode, exposing ${entityId} as a flat standalone endpoint`
       );
     }
@@ -175000,7 +175134,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       if (composed) {
         return composed;
       }
-      logger247.warn(
+      logger248.warn(
         `User composed device creation failed for ${entityId}, falling back to standalone`
       );
     }
@@ -175065,7 +175199,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         if (composed) {
           return composed;
         }
-        logger247.warn(
+        logger248.warn(
           `Companion fan creation failed for ${entityId}, falling back to standalone`
         );
       }
@@ -175143,11 +175277,11 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     }
     if (mappedChanged) {
       this.pendingMappedChange = true;
-      logger247.debug(
+      logger248.debug(
         `Mapped entity change detected for ${this.entityId}, forcing update`
       );
     }
-    logger247.debug(
+    logger248.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
     this.lastState = state;
@@ -175378,7 +175512,7 @@ init_esm3();
 init_esm();
 init_types2();
 init_esm4();
-var logger248 = Logger.get("CameraWebRtcRequestor");
+var logger249 = Logger.get("CameraWebRtcRequestor");
 var registry2 = /* @__PURE__ */ new Map();
 var pendingDeliveries = /* @__PURE__ */ new Map();
 var invokeTransport = defaultInvoke;
@@ -175412,19 +175546,19 @@ function deliverAnswerDeferred(sessionId, sdp, onGiveUp) {
             return;
           }
           if (await sendAnswer(sessionId, sdp)) {
-            logger248.info(`answer delivered for session ${sessionId}`);
+            logger249.info(`answer delivered for session ${sessionId}`);
             return;
           }
         }
         if (registry2.get(sessionId) !== owner || pendingDeliveries.get(sessionId) !== timer) {
           return;
         }
-        logger248.info(
+        logger249.info(
           `answer delivery failed for session ${sessionId}, giving up`
         );
         await onGiveUp();
       } catch (err) {
-        logger248.info(
+        logger249.info(
           `answer delivery for session ${sessionId} threw: ${errText(err)}`
         );
       } finally {
@@ -175449,11 +175583,11 @@ function sendAnswer(sessionId, sdp) {
 async function invokeRequestor(sessionId, command, fields) {
   const registration = registry2.get(sessionId);
   if (!registration) {
-    logger248.info(`requestor ${command}: no session ${sessionId} registered`);
+    logger249.info(`requestor ${command}: no session ${sessionId} registered`);
     return false;
   }
   if (registration.session.isClosed) {
-    logger248.info(`requestor ${command}: session ${sessionId} already closed`);
+    logger249.info(`requestor ${command}: session ${sessionId} already closed`);
     return false;
   }
   const request = {
@@ -175465,7 +175599,7 @@ async function invokeRequestor(sessionId, command, fields) {
   try {
     return await invokeTransport({ registration, request });
   } catch (err) {
-    logger248.info(
+    logger249.info(
       `requestor ${command} failed for session ${sessionId}: ${errText(err)}`
     );
     return false;
@@ -175500,7 +175634,7 @@ async function defaultInvoke({
       for (const entry of chunk) {
         if (entry.kind === "cmd-status") {
           if (entry.status !== Status2.Success) {
-            logger248.info(
+            logger249.info(
               `requestor ${request.command} status ${entry.status} for session ${String(request.fields.webRtcSessionId)}`
             );
             return false;
@@ -175520,7 +175654,7 @@ function errText(err) {
 }
 
 // src/plugins/builtin/camera/webrtc-provider-server.ts
-var logger249 = Logger.get("CameraWebRtc");
+var logger250 = Logger.get("CameraWebRtc");
 var nextGlobalSessionId = 0;
 function mintSessionId() {
   for (let i = 0; i <= 65534; i++) {
@@ -175534,14 +175668,14 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
   solicitOffer(request) {
     const id = mintSessionId();
     this.trackSession(id, request.streamUsage, request.originatingEndpointId);
-    logger249.info(
+    logger250.info(
       `solicitOffer session=${id} (${this.state.entityId}), deferred offer`
     );
     void this.state.bridge.startSession(id, this.state.entityId, {
       iceServers: request.iceServers,
       iceTransportPolicy: request.iceTransportPolicy
     }).catch(
-      (err) => logger249.info(
+      (err) => logger250.info(
         `solicitOffer startSession failed for ${this.state.entityId}: ${errText2(err)}`
       )
     );
@@ -175549,7 +175683,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
   }
   async provideOffer(request) {
     const id = request.webRtcSessionId ?? mintSessionId();
-    logger249.info(
+    logger250.info(
       `provideOffer entry: entityId=${this.state.entityId} session=${id} (sdp ${request.sdp.length} chars)`
     );
     if (request.webRtcSessionId == null) {
@@ -175583,7 +175717,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
       );
     } catch (err) {
       const message = errText2(err);
-      logger249.info(
+      logger250.info(
         `provideOffer failed for ${this.state.entityId} session=${id}: ${message}`
       );
       unregisterRequestor(id);
@@ -175595,7 +175729,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
         StatusCode.Failure
       );
     }
-    logger249.info(
+    logger250.info(
       `provideOffer answer computed for ${this.state.entityId} session=${id} (${answerSdp.length} chars); delivering via requestor`
     );
     const bridge = this.state.bridge;
@@ -175614,7 +175748,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     return { webRtcSessionId: id };
   }
   provideAnswer(request) {
-    logger249.info(
+    logger250.info(
       `provideAnswer session=${request.webRtcSessionId} (sdp ${request.sdp.length} chars, ${this.state.entityId})`
     );
     return this.state.bridge.acceptControllerAnswer(
@@ -175623,7 +175757,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     );
   }
   async provideIceCandidates(request) {
-    logger249.info(
+    logger250.info(
       `provideIceCandidates session=${request.webRtcSessionId}: ${request.iceCandidates.length} candidate(s) (${this.state.entityId})`
     );
     for (const c of request.iceCandidates) {
@@ -175636,7 +175770,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     }
   }
   async endSession(request) {
-    logger249.info(
+    logger250.info(
       `endSession session=${request.webRtcSessionId} (${this.state.entityId})`
     );
     await this.state.bridge.endSession(request.webRtcSessionId);
@@ -175757,7 +175891,7 @@ import {
   createLongLivedTokenAuth as createLongLivedTokenAuth2
 } from "home-assistant-js-websocket";
 import { RTCPeerConnection } from "werift";
-var logger250 = Logger.get("CameraWebRtc");
+var logger251 = Logger.get("CameraWebRtc");
 var DEFAULT_HA_WEBRTC_TIMEOUT_MS = 15e3;
 var haWebRtcTimeoutMs = DEFAULT_HA_WEBRTC_TIMEOUT_MS;
 var WebRtcBridge = class {
@@ -175804,7 +175938,7 @@ var WebRtcBridge = class {
       const haOffer = await haPeer.createOffer();
       await haPeer.setLocalDescription(haOffer);
       const haOfferSdp = this.localSdp(haPeer);
-      logger250.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
+      logger251.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
       const { answer, sessionId, unsubscribe } = await this.requestHaWebRtc(
         entityId,
         haOfferSdp,
@@ -175827,12 +175961,12 @@ var WebRtcBridge = class {
       const controllerOffer = await controllerPeer.createOffer();
       await controllerPeer.setLocalDescription(controllerOffer);
       const sdp = this.localSdp(controllerPeer);
-      logger250.info(
+      logger251.info(
         `controller offer created for ${entityId} (${sdp.length} chars)`
       );
       return { sdp, iceCandidates };
     } catch (err) {
-      logger250.info(`startSession failed for ${entityId}: ${errText3(err)}`);
+      logger251.info(`startSession failed for ${entityId}: ${errText3(err)}`);
       await this.endSession(matterSessionId);
       throw err;
     }
@@ -175862,7 +175996,7 @@ var WebRtcBridge = class {
       const haOffer = await haPeer.createOffer();
       await haPeer.setLocalDescription(haOffer);
       const haOfferSdp = this.localSdp(haPeer);
-      logger250.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
+      logger251.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
       const { answer, sessionId, unsubscribe } = await this.requestHaWebRtc(
         entityId,
         haOfferSdp,
@@ -175881,12 +176015,12 @@ var WebRtcBridge = class {
       const controllerAnswer = await controllerPeer.createAnswer();
       await controllerPeer.setLocalDescription(controllerAnswer);
       const answerSdp = this.localSdp(controllerPeer);
-      logger250.info(
+      logger251.info(
         `controller answer created for ${entityId} (${answerSdp.length} chars)`
       );
       return answerSdp;
     } catch (err) {
-      logger250.info(
+      logger251.info(
         `acceptControllerOffer failed for ${entityId}: ${errText3(err)}`
       );
       await this.endSession(matterSessionId);
@@ -175897,14 +176031,14 @@ var WebRtcBridge = class {
   async acceptControllerAnswer(matterSessionId, sdp) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger250.debug(`controller answer applied for ${session.entityId}`);
+    logger251.debug(`controller answer applied for ${session.entityId}`);
     await session.controllerPeer.setRemoteDescription({ type: "answer", sdp });
   }
   /** Add a remote ICE candidate from the Matter controller. */
   async addControllerIceCandidate(matterSessionId, candidate, sdpMid, sdpMLineIndex) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger250.debug(
+    logger251.debug(
       `controller ICE candidate for ${session.entityId}: ${candidate}`
     );
     await session.controllerPeer.addIceCandidate({
@@ -175918,12 +176052,12 @@ var WebRtcBridge = class {
   async closeExistingPeers(matterSessionId) {
     const prior = this.sessions.get(matterSessionId);
     if (!prior) return;
-    logger250.info(
+    logger251.info(
       `replacing session ${matterSessionId} (${prior.entityId}), closing prior peers`
     );
     if (prior.haUnsubscribe) {
       await Promise.resolve(prior.haUnsubscribe()).catch(
-        (err) => logger250.debug(`HA unsubscribe failed: ${errText3(err)}`)
+        (err) => logger251.debug(`HA unsubscribe failed: ${errText3(err)}`)
       );
     }
     await prior.haPeer.close().catch(() => {
@@ -175936,11 +176070,11 @@ var WebRtcBridge = class {
   async endSession(matterSessionId) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger250.info(`ending session ${matterSessionId} (${session.entityId})`);
+    logger251.info(`ending session ${matterSessionId} (${session.entityId})`);
     this.sessions.delete(matterSessionId);
     if (session.haUnsubscribe) {
       await Promise.resolve(session.haUnsubscribe()).catch(
-        (err) => logger250.debug(`HA unsubscribe failed: ${errText3(err)}`)
+        (err) => logger251.debug(`HA unsubscribe failed: ${errText3(err)}`)
       );
     }
     await session.haPeer.close().catch(() => {
@@ -175970,11 +176104,11 @@ var WebRtcBridge = class {
         headers: { Authorization: `Bearer ${this.config.haToken}` }
       });
     } catch (err) {
-      logger250.info(`snapshot fetch failed for ${entityId}: ${errText3(err)}`);
+      logger251.info(`snapshot fetch failed for ${entityId}: ${errText3(err)}`);
       throw err;
     }
     if (!res.ok) {
-      logger250.info(
+      logger251.info(
         `snapshot fetch failed for ${entityId}: camera_proxy ${res.status}`
       );
       throw new Error(`HA camera_proxy ${entityId}: ${res.status}`);
@@ -175991,10 +176125,10 @@ var WebRtcBridge = class {
   // Forward every track HA sends into the matching pre-added controller sender.
   forwardHaTracks(haPeer, senders, entityId) {
     haPeer.onTrack.subscribe((track) => {
-      logger250.info(`onTrack ${track.kind} from HA (${entityId})`);
+      logger251.info(`onTrack ${track.kind} from HA (${entityId})`);
       const transceiver = senders.get(track.kind);
       if (!transceiver) {
-        logger250.info(
+        logger251.info(
           `no controller transceiver for ${track.kind} (${entityId})`
         );
         return;
@@ -176003,7 +176137,7 @@ var WebRtcBridge = class {
       track.onReceiveRtp.subscribe((rtp) => {
         if (!firstLogged) {
           firstLogged = true;
-          logger250.info(`first RTP forwarded for ${track.kind} (${entityId})`);
+          logger251.info(`first RTP forwarded for ${track.kind} (${entityId})`);
         }
         transceiver.sender.sendRtp(rtp);
       });
@@ -176012,10 +176146,10 @@ var WebRtcBridge = class {
   // Log connection/ice state transitions (these events fire on change only).
   wireStateLogging(peer, label, entityId) {
     peer.connectionStateChange.subscribe(
-      (s) => logger250.info(`${label} connectionState=${s} (${entityId})`)
+      (s) => logger251.info(`${label} connectionState=${s} (${entityId})`)
     );
     peer.iceConnectionStateChange.subscribe(
-      (s) => logger250.info(`${label} iceConnectionState=${s} (${entityId})`)
+      (s) => logger251.info(`${label} iceConnectionState=${s} (${entityId})`)
     );
   }
   // Map the Matter ICE struct onto werift's config. Only the controller peer
@@ -176029,11 +176163,11 @@ var WebRtcBridge = class {
       }))
     );
     if (iceServers.length === 0) {
-      logger250.info(`controller peer using default ICE servers (${entityId})`);
+      logger251.info(`controller peer using default ICE servers (${entityId})`);
       return void 0;
     }
     const policy = ice?.iceTransportPolicy === "relay" || ice?.iceTransportPolicy === "all" ? ice.iceTransportPolicy : void 0;
-    logger250.info(
+    logger251.info(
       `controller peer using ${iceServers.length} controller ICE server(s)${policy ? ` policy=${policy}` : ""} (${entityId})`
     );
     return policy ? { iceServers, iceTransportPolicy: policy } : { iceServers };
@@ -176047,13 +176181,13 @@ var WebRtcBridge = class {
   feedHaCandidate(entityId, haPeer, candidate) {
     const value = candidate?.candidate;
     if (!value) return;
-    logger250.debug(`HA ICE candidate for ${entityId}: ${value}`);
+    logger251.debug(`HA ICE candidate for ${entityId}: ${value}`);
     void haPeer.addIceCandidate({
       candidate: value,
       sdpMid: candidate?.sdpMid ?? void 0,
       sdpMLineIndex: candidate?.sdpMLineIndex ?? void 0
     }).catch(
-      (e) => logger250.debug(
+      (e) => logger251.debug(
         `HA addIceCandidate failed for ${entityId}: ${errText3(e)}`
       )
     );
@@ -176082,7 +176216,7 @@ var WebRtcBridge = class {
         reject(err);
       });
       timer = setTimeout(() => {
-        logger250.info(
+        logger251.info(
           `HA WebRTC timed out after ${haWebRtcTimeoutMs}ms for ${entityId}`
         );
         fail(
@@ -176100,7 +176234,7 @@ var WebRtcBridge = class {
                 if (msg.session_id) sessionId = msg.session_id;
                 const ans = msg.answer;
                 settle(() => {
-                  logger250.info(
+                  logger251.info(
                     `HA answer received for ${entityId} (${ans.length} chars)`
                   );
                   resolve11(ans);
@@ -176109,7 +176243,7 @@ var WebRtcBridge = class {
               break;
             case "error": {
               const detail = msg.message ?? msg.code ?? "unknown error";
-              logger250.info(`HA WebRTC error for ${entityId}: ${detail}`);
+              logger251.info(`HA WebRTC error for ${entityId}: ${detail}`);
               fail(new Error(`HA WebRTC error: ${detail}`));
               break;
             }
@@ -177266,7 +177400,7 @@ import {
   getCollection
 } from "home-assistant-js-websocket";
 import { atLeastHaVersion } from "home-assistant-js-websocket/dist/util.js";
-var logger251 = Logger.get("SubscribeEntities");
+var logger252 = Logger.get("SubscribeEntities");
 function processEvent(store, updates) {
   const state = { ...store.state };
   if (updates.a) {
@@ -177292,7 +177426,7 @@ function processEvent(store, updates) {
     for (const entityId in updates.c) {
       let entityState = state[entityId];
       if (!entityState) {
-        logger251.warn("Received state update for unknown entity", entityId);
+        logger252.warn("Received state update for unknown entity", entityId);
         continue;
       }
       entityState = { ...entityState };
@@ -178179,138 +178313,130 @@ function hashAreaId(areaId) {
   return Math.abs(hash2);
 }
 
-// src/services/bridges/entity-isolation-service.ts
-init_esm();
-init_diagnostic_event_bus();
-var logger252 = Logger.get("EntityIsolation");
-var EntityIsolationServiceImpl = class {
-  isolatedEntities = /* @__PURE__ */ new Map();
-  isolationCallbacks = /* @__PURE__ */ new Map();
-  /**
-   * Register a callback to be called when an entity needs to be isolated.
-   * The callback should remove the entity from the bridge's aggregator.
-   */
-  registerIsolationCallback(bridgeId, callback) {
-    this.isolationCallbacks.set(bridgeId, callback);
+// src/services/bridges/entity-mapping-sync.ts
+var EntityMappingSync = class {
+  constructor(registry3, getMapping, log) {
+    this.registry = registry3;
+    this.getMapping = getMapping;
+    this.log = log;
   }
-  unregisterIsolationCallback(bridgeId) {
-    this.isolationCallbacks.delete(bridgeId);
+  registry;
+  getMapping;
+  log;
+  retryScheduled = false;
+  retryTimer = null;
+  // deviceId -> primary entityId of endpoints that auto-map but carry no
+  // battery, bounds the per-state-batch check to a map hit
+  candidates = /* @__PURE__ */ new Map();
+  // Only endpoints the auto-mapping applies to belong in the candidates: a
+  // manual or disabled mapping, or a sensor endpoint sharing the device,
+  // must not claim the slot (last writer would win) and stall the recovery.
+  eligible(entityId) {
+    const mapping = this.getMapping(entityId);
+    if (mapping?.batteryEntity || mapping?.disableBatteryMapping) return false;
+    if (entityId.startsWith("sensor.") || entityId.startsWith("binary_sensor.")) {
+      return false;
+    }
+    return entityId.startsWith("vacuum.") || !!this.registry.isAutoBatteryMappingEnabled?.();
   }
-  /**
-   * Parse the endpoint path from a Matter.js error message and extract the entity name.
-   * Example path: "ed5b4f8d042e4599b833f21da4ededba.aggregator.Küchenlicht.onOff.on"
-   * Returns: { bridgeId: "ed5b4f8d...", entityName: "Küchenlicht" }
-   */
-  parseEndpointPath(errorMessage) {
-    const match = errorMessage.match(/([a-f0-9]{32})\.aggregator\.([^.\s>]+)/i);
-    if (match) {
-      return {
-        bridgeId: match[1],
-        entityName: match[2]
-      };
-    }
-    return null;
+  // the auto-resolved battery is part of the endpoint shape, so a sensor
+  // that appears later must change the fingerprint and rebuild. JSON tuple
+  // so mapping text can never collide with a battery marker.
+  computeFingerprint(mapping, entityId) {
+    const battery = entityId ? this.registry.batteryFingerprintFor(entityId, mapping) : "";
+    return JSON.stringify([mapping ?? null, battery || null]);
   }
-  classifyError(msg) {
-    if (msg.includes("Invalid intervalMs")) {
-      return "Subscription timing error (Invalid intervalMs)";
-    }
-    if (msg.includes("Behaviors have errors")) {
-      return "Behavior initialization failure";
-    }
-    if (msg.includes("TransactionDestroyedError")) {
-      return "Transaction destroyed during operation";
-    }
-    if (msg.includes("DestroyedDependencyError")) {
-      return "Dependency destroyed during operation";
-    }
-    if (msg.includes("UninitializedDependencyError")) {
-      return "Uninitialized dependency access";
-    }
-    if (msg.includes("Endpoint storage inaccessible")) {
-      return "Endpoint storage inaccessible";
-    }
-    if (msg.includes("Error initializing part")) {
-      return "Endpoint construction failure";
-    }
-    if (msg.includes("aggregator.")) {
-      return "Runtime error in endpoint";
+  // Live fingerprint for reconcile compares: when the resolver finds nothing
+  // right now but the stored fingerprint maps a sensor that still exists on
+  // the SAME device, keep it. An unavailable snapshot (HA restart) must not
+  // strip the mapping and rebuild the endpoint battery-less.
+  compareFingerprint(mapping, entityId, storedFingerprint) {
+    const fingerprint = this.computeFingerprint(mapping, entityId);
+    if (fingerprintBattery(fingerprint) != null || !storedFingerprint)
+      return fingerprint;
+    if (!this.eligible(entityId)) return fingerprint;
+    const battery = fingerprintBattery(storedFingerprint);
+    if (!battery) return fingerprint;
+    const deviceId = this.registry.entity(entityId)?.device_id;
+    const stillSameDevice = !!deviceId && this.registry.fullEntities[battery]?.device_id === deviceId;
+    return stillSameDevice ? JSON.stringify([mapping ?? null, battery]) : fingerprint;
+  }
+  // The stored fingerprint must reflect what the endpoint actually maps: a
+  // battery resolved while it was built without one (sensor outage during a
+  // forced rebuild) would otherwise never trigger the catch-up.
+  fingerprintAsBuilt(mapping, entityId, mappedEntityIds) {
+    const fingerprint = this.computeFingerprint(mapping, entityId);
+    const battery = fingerprintBattery(fingerprint);
+    if (battery == null) return fingerprint;
+    return (mappedEntityIds ?? []).includes(battery) ? fingerprint : JSON.stringify([mapping ?? null, null]);
+  }
+  rebuildCandidates(entries) {
+    this.candidates.clear();
+    for (const [entityId, fingerprint] of entries) {
+      if (fingerprintBattery(fingerprint) != null) continue;
+      if (!this.eligible(entityId)) continue;
+      const deviceId = this.registry.entity(entityId)?.device_id;
+      if (deviceId) this.candidates.set(deviceId, entityId);
     }
-    return null;
   }
-  /**
-   * Attempt to isolate an entity based on an error.
-   * Returns true if the entity was successfully identified and isolation was triggered.
-   */
-  async isolateFromError(error) {
-    const msg = error instanceof Error ? error.message : String(error);
-    const classification = this.classifyError(msg);
-    if (!classification) {
-      return false;
+  // battery-less auto-map endpoints watch their device's sensors, an
+  // unresolved battery is not mapped so it would never arrive otherwise
+  candidateSensorIds() {
+    if (this.candidates.size === 0) return [];
+    const ids = [];
+    for (const entity of Object.values(this.registry.fullEntities)) {
+      if (!entity.device_id) continue;
+      if (!this.candidates.has(entity.device_id)) continue;
+      if (entity.entity_id.startsWith("sensor.") || entity.entity_id.startsWith("binary_sensor.")) {
+        ids.push(entity.entity_id);
+      }
     }
-    const parsed = this.parseEndpointPath(msg);
-    if (!parsed) {
-      logger252.warn("Could not parse entity from error:", msg);
-      return false;
+    return ids;
+  }
+  // An endpoint built while its battery sensor was unavailable stays
+  // battery-less, because registry ticks only refresh on structural changes.
+  // When a same-device sensor state arrives, re-resolve and rebuild once.
+  maybeRetry(states, changed, observing, refresh) {
+    if (!observing || this.retryScheduled || this.candidates.size === 0) {
+      return;
     }
-    const { bridgeId, entityName } = parsed;
-    const callback = this.isolationCallbacks.get(bridgeId);
-    if (!callback) {
-      logger252.warn(
-        `No isolation callback registered for bridge ${bridgeId}, entity: ${entityName}`
+    for (const id of changed ?? Object.keys(states)) {
+      if (!id.startsWith("sensor.") && !id.startsWith("binary_sensor."))
+        continue;
+      const deviceId = this.registry.fullEntities[id]?.device_id;
+      if (!deviceId) continue;
+      const entityId = this.candidates.get(deviceId);
+      if (!entityId) continue;
+      this.registry.forgetBatteryCacheForDevice(deviceId);
+      const resolved = this.registry.batteryFingerprintFor(
+        entityId,
+        this.getMapping(entityId)
       );
-      return false;
-    }
-    const key = `${bridgeId}:${entityName}`;
-    if (this.isolatedEntities.has(key)) {
-      return true;
-    }
-    const reason = `${classification}. Entity isolated to protect bridge stability.`;
-    this.isolatedEntities.set(key, {
-      entityId: entityName,
-      reason,
-      failedAt: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    logger252.warn(
-      `Isolating entity "${entityName}" from bridge ${bridgeId} due to: ${reason}`
-    );
-    diagnosticEventBus.emit("entity_error", `Entity isolated: ${entityName}`, {
-      bridgeId,
-      entityId: entityName,
-      details: { reason: classification }
-    });
-    try {
-      await callback(entityName);
-      return true;
-    } catch (e) {
-      logger252.error(`Failed to isolate entity ${entityName}:`, e);
-      return false;
+      if (!resolved) continue;
+      this.retryScheduled = true;
+      this.log.info(
+        `Battery sensor ${resolved} appeared for ${entityId}, rebuilding`
+      );
+      this.retryTimer = setTimeout(() => {
+        this.retryTimer = null;
+        refresh().catch((e) => this.log.warn("Battery retry refresh failed:", e)).finally(() => {
+          this.retryScheduled = false;
+        });
+      }, 0);
+      return;
     }
   }
-  /**
-   * Get all isolated entities for a specific bridge.
-   */
-  getIsolatedEntities(bridgeId) {
-    const result = [];
-    for (const [key, entity] of this.isolatedEntities) {
-      if (key.startsWith(`${bridgeId}:`)) {
-        result.push(entity);
-      }
+  cancelRetry() {
+    if (this.retryTimer) {
+      clearTimeout(this.retryTimer);
+      this.retryTimer = null;
     }
-    return result;
+    this.retryScheduled = false;
   }
-  /**
-   * Clear isolated entities for a bridge (e.g., on restart).
-   */
-  clearIsolatedEntities(bridgeId) {
-    for (const key of this.isolatedEntities.keys()) {
-      if (key.startsWith(`${bridgeId}:`)) {
-        this.isolatedEntities.delete(key);
-      }
-    }
+  get retryPending() {
+    return this.retryScheduled;
   }
 };
-var EntityIsolationService = new EntityIsolationServiceImpl();
 
 // src/services/bridges/bridge-endpoint-manager.ts
 var MAX_ENTITY_ID_LENGTH = 150;
@@ -178338,6 +178464,11 @@ var BridgeEndpointManager = class extends Service {
       identityStorage,
       mappingStorage
     );
+    this.mappingSync = new EntityMappingSync(
+      registry3,
+      (entityId) => this.getEntityMapping(entityId),
+      log
+    );
     EntityIsolationService.registerIsolationCallback(
       bridgeId,
       this.isolateEntity.bind(this)
@@ -178361,6 +178492,7 @@ var BridgeEndpointManager = class extends Service {
   observingRequested = false;
   _failedEntities = [];
   mappingFingerprints = /* @__PURE__ */ new Map();
+  mappingSync;
   // entityId -> first absence stamp (grace window)
   pendingRemovals = /* @__PURE__ */ new Map();
   removalRecheckTimer = null;
@@ -178698,95 +178830,6 @@ var BridgeEndpointManager = class extends Service {
   getEntityMapping(entityId) {
     return this.mappingStorage.getMapping(this.bridgeId, entityId);
   }
-  // #450: an endpoint built while its battery sensor was unavailable stays
-  // battery-less, because registry ticks only refresh on structural changes.
-  // When a same-device sensor state arrives, re-resolve and rebuild.
-  batteryRetryScheduled = false;
-  batteryRetryTimer = null;
-  // deviceId -> primary entityId of endpoints that auto-map but carry no
-  // battery, bounds the per-state-batch check to a map hit
-  batteryRetryCandidates = /* @__PURE__ */ new Map();
-  // Only endpoints the auto-mapping applies to belong here: a manual or
-  // disabled mapping, or a sensor endpoint sharing the device, must not
-  // claim the slot (last writer would win) and stall the recovery.
-  batteryRetryEligible(entityId) {
-    const mapping = this.getEntityMapping(entityId);
-    if (mapping?.batteryEntity || mapping?.disableBatteryMapping) return false;
-    if (entityId.startsWith("sensor.") || entityId.startsWith("binary_sensor.")) {
-      return false;
-    }
-    return entityId.startsWith("vacuum.") || !!this.registry.isAutoBatteryMappingEnabled?.();
-  }
-  rebuildBatteryRetryCandidates() {
-    this.batteryRetryCandidates.clear();
-    for (const part of this.root.parts) {
-      if (!hasEntityIdentity(part)) continue;
-      const fingerprint = this.mappingFingerprints.get(part.entityId);
-      if (fingerprint === void 0) continue;
-      if (fingerprintBattery(fingerprint) != null) continue;
-      if (!this.batteryRetryEligible(part.entityId)) continue;
-      const deviceId = this.registry.entity(part.entityId)?.device_id;
-      if (deviceId) this.batteryRetryCandidates.set(deviceId, part.entityId);
-    }
-  }
-  maybeRetryBatteryMapping(states, changed) {
-    if (!this.observingRequested || this.batteryRetryScheduled || this.batteryRetryCandidates.size === 0) {
-      return;
-    }
-    for (const id of changed ?? Object.keys(states)) {
-      if (!id.startsWith("sensor.") && !id.startsWith("binary_sensor."))
-        continue;
-      const deviceId = this.registry.fullEntities[id]?.device_id;
-      if (!deviceId) continue;
-      const entityId = this.batteryRetryCandidates.get(deviceId);
-      if (!entityId) continue;
-      this.registry.forgetBatteryCacheForDevice(deviceId);
-      const resolved = this.registry.batteryFingerprintFor(
-        entityId,
-        this.getEntityMapping(entityId)
-      );
-      if (!resolved) continue;
-      this.batteryRetryScheduled = true;
-      this.log.info(
-        `Battery sensor ${resolved} appeared for ${entityId}, rebuilding`
-      );
-      this.batteryRetryTimer = setTimeout(() => {
-        this.batteryRetryTimer = null;
-        this.refreshDevices().catch((e) => this.log.warn("Battery retry refresh failed:", e)).finally(() => {
-          this.batteryRetryScheduled = false;
-        });
-      }, 0);
-      return;
-    }
-  }
-  computeMappingFingerprint(mapping, entityId) {
-    const battery = entityId ? this.registry.batteryFingerprintFor(entityId, mapping) : "";
-    return JSON.stringify([mapping ?? null, battery || null]);
-  }
-  // Live fingerprint for reconcile compares: when the resolver finds nothing
-  // right now but the stored fingerprint maps a sensor that still exists on
-  // the SAME device, keep it. An unavailable snapshot (HA restart) must not
-  // strip the mapping and rebuild the endpoint battery-less (#450).
-  compareFingerprint(mapping, entityId, storedFingerprint) {
-    const fingerprint = this.computeMappingFingerprint(mapping, entityId);
-    if (fingerprintBattery(fingerprint) != null || !storedFingerprint)
-      return fingerprint;
-    if (!this.batteryRetryEligible(entityId)) return fingerprint;
-    const battery = fingerprintBattery(storedFingerprint);
-    if (!battery) return fingerprint;
-    const deviceId = this.registry.entity(entityId)?.device_id;
-    const stillSameDevice = !!deviceId && this.registry.fullEntities[battery]?.device_id === deviceId;
-    return stillSameDevice ? JSON.stringify([mapping ?? null, battery]) : fingerprint;
-  }
-  // The stored fingerprint must reflect what this endpoint actually maps: a
-  // battery resolved while the endpoint was built without one (sensor outage
-  // during a forced rebuild) would otherwise never trigger the catch-up (#450).
-  fingerprintAsBuilt(mapping, entityId, endpoint) {
-    const fingerprint = this.computeMappingFingerprint(mapping, entityId);
-    const battery = fingerprintBattery(fingerprint);
-    if (battery == null) return fingerprint;
-    return (endpoint.mappedEntityIds ?? []).includes(battery) ? fingerprint : JSON.stringify([mapping ?? null, null]);
-  }
   async dispose() {
     this.stopObserving();
     if (this.removalRecheckTimer) {
@@ -178829,14 +178872,8 @@ var BridgeEndpointManager = class extends Service {
         }
       }
     }
-    if (this.batteryRetryCandidates.size > 0) {
-      for (const entity of Object.values(this.registry.fullEntities)) {
-        if (!entity.device_id) continue;
-        if (!this.batteryRetryCandidates.has(entity.device_id)) continue;
-        if (entity.entity_id.startsWith("sensor.") || entity.entity_id.startsWith("binary_sensor.")) {
-          ids.add(entity.entity_id);
-        }
-      }
+    for (const id of this.mappingSync.candidateSensorIds()) {
+      ids.add(id);
     }
     return [...ids];
   }
@@ -178852,11 +178889,7 @@ var BridgeEndpointManager = class extends Service {
       clearTimeout(this.removalRecheckTimer);
       this.removalRecheckTimer = null;
     }
-    if (this.batteryRetryTimer) {
-      clearTimeout(this.batteryRetryTimer);
-      this.batteryRetryTimer = null;
-    }
-    this.batteryRetryScheduled = false;
+    this.mappingSync.cancelRetry();
   }
   async refreshDevices() {
     this.registry.refresh();
@@ -179009,7 +179042,7 @@ var BridgeEndpointManager = class extends Service {
       } else {
         const currentMapping = this.getEntityMapping(endpoint.entityId);
         const storedFp = this.mappingFingerprints.get(endpoint.entityId) ?? "";
-        const currentFp = this.compareFingerprint(
+        const currentFp = this.mappingSync.compareFingerprint(
           currentMapping,
           endpoint.entityId,
           storedFp
@@ -179100,7 +179133,11 @@ var BridgeEndpointManager = class extends Service {
             await this.root.add(endpoint);
             this.mappingFingerprints.set(
               entityId,
-              this.fingerprintAsBuilt(mapping, entityId, endpoint)
+              this.mappingSync.fingerprintAsBuilt(
+                mapping,
+                entityId,
+                endpoint.mappedEntityIds
+              )
             );
           } catch (e) {
             const errorMessage = e instanceof Error ? e.message : String(e);
@@ -179114,7 +179151,12 @@ var BridgeEndpointManager = class extends Service {
       }
     }
     await this.reconcileAreaSwitches();
-    this.rebuildBatteryRetryCandidates();
+    this.mappingSync.rebuildCandidates(
+      [...this.root.parts].filter(hasEntityIdentity).flatMap((p) => {
+        const fp = this.mappingFingerprints.get(p.entityId);
+        return fp === void 0 ? [] : [[p.entityId, fp]];
+      })
+    );
     if (this.observingRequested) {
       this.startObserving();
     }
@@ -179258,7 +179300,12 @@ var BridgeEndpointManager = class extends Service {
   async runUpdateStates(states, changed) {
     const startMs = performance.now();
     this.registry.mergeExternalStates(states);
-    this.maybeRetryBatteryMapping(states, changed);
+    this.mappingSync.maybeRetry(
+      states,
+      changed,
+      this.observingRequested,
+      () => this.refreshDevices()
+    );
     const allEndpoints = [...this.root.parts].filter(isEntityPart);
     const endpoints = changed === null ? allEndpoints : allEndpoints.filter(
       (e) => changed.has(e.entityId) || (e.mappedEntityIds ?? []).some((id) => changed.has(id))
@@ -180009,6 +180056,11 @@ var ServerModeEndpointManager = class extends Service {
       identityStorage,
       mappingStorage
     );
+    this.mappingSync = new EntityMappingSync(
+      registry3,
+      (entityId) => this.getEntityMapping(entityId),
+      log
+    );
   }
   serverNode;
   client;
@@ -180022,6 +180074,7 @@ var ServerModeEndpointManager = class extends Service {
   observingRequested = false;
   _failedEntities = [];
   endpoints = /* @__PURE__ */ new Map();
+  mappingSync;
   // Same grace as the aggregator manager: server mode deleted on the FIRST
   // refresh an entity was absent, so one partial HA snapshot re-minted the
   // device (#438).
@@ -180044,83 +180097,6 @@ var ServerModeEndpointManager = class extends Service {
   getEntityMapping(entityId) {
     return this.mappingStorage.getMapping(this.dataProvider.id, entityId);
   }
-  // #450: an endpoint built while its battery sensor was unavailable stays
-  // battery-less, because registry ticks only refresh on structural changes.
-  // When a same-device sensor state arrives, re-resolve and rebuild.
-  batteryRetryScheduled = false;
-  batteryRetryTimer = null;
-  // deviceId -> primary entityId of endpoints that auto-map but carry no
-  // battery, bounds the per-state-batch check to a map hit
-  batteryRetryCandidates = /* @__PURE__ */ new Map();
-  // Only endpoints the auto-mapping applies to belong here: a manual or
-  // disabled mapping, or a sensor endpoint sharing the device, must not
-  // claim the slot (last writer would win) and stall the recovery.
-  batteryRetryEligible(entityId) {
-    const mapping = this.getEntityMapping(entityId);
-    if (mapping?.batteryEntity || mapping?.disableBatteryMapping) return false;
-    if (entityId.startsWith("sensor.") || entityId.startsWith("binary_sensor.")) {
-      return false;
-    }
-    return entityId.startsWith("vacuum.") || !!this.registry.isAutoBatteryMappingEnabled?.();
-  }
-  rebuildBatteryRetryCandidates() {
-    this.batteryRetryCandidates.clear();
-    for (const [entityId, entry] of this.endpoints) {
-      if (fingerprintBattery(entry.fingerprint) != null) continue;
-      if (!this.batteryRetryEligible(entityId)) continue;
-      const deviceId = this.registry.entity(entityId)?.device_id;
-      if (deviceId) this.batteryRetryCandidates.set(deviceId, entityId);
-    }
-  }
-  maybeRetryBatteryMapping(states) {
-    if (!this.observingRequested || this.batteryRetryScheduled || this.batteryRetryCandidates.size === 0) {
-      return;
-    }
-    for (const id of Object.keys(states)) {
-      if (!id.startsWith("sensor.") && !id.startsWith("binary_sensor."))
-        continue;
-      const deviceId = this.registry.fullEntities[id]?.device_id;
-      if (!deviceId) continue;
-      const entityId = this.batteryRetryCandidates.get(deviceId);
-      if (!entityId) continue;
-      this.registry.forgetBatteryCacheForDevice(deviceId);
-      const resolved = this.registry.batteryFingerprintFor(
-        entityId,
-        this.getEntityMapping(entityId)
-      );
-      if (!resolved) continue;
-      this.batteryRetryScheduled = true;
-      this.log.info(
-        `Battery sensor ${resolved} appeared for ${entityId}, rebuilding`
-      );
-      this.batteryRetryTimer = setTimeout(() => {
-        this.batteryRetryTimer = null;
-        this.refreshDevices().catch((e) => this.log.warn("Battery retry refresh failed:", e)).finally(() => {
-          this.batteryRetryScheduled = false;
-        });
-      }, 0);
-      return;
-    }
-  }
-  computeMappingFingerprint(mapping, entityId) {
-    const battery = entityId ? this.registry.batteryFingerprintFor(entityId, mapping) : "";
-    return JSON.stringify([mapping ?? null, battery || null]);
-  }
-  // Live fingerprint for reconcile compares: when the resolver finds nothing
-  // right now but the stored fingerprint maps a sensor that still exists on
-  // the SAME device, keep it. An unavailable snapshot (HA restart) must not
-  // strip the mapping and rebuild the endpoint battery-less (#450).
-  compareFingerprint(mapping, entityId, storedFingerprint) {
-    const fingerprint = this.computeMappingFingerprint(mapping, entityId);
-    if (fingerprintBattery(fingerprint) != null || !storedFingerprint)
-      return fingerprint;
-    if (!this.batteryRetryEligible(entityId)) return fingerprint;
-    const battery = fingerprintBattery(storedFingerprint);
-    if (!battery) return fingerprint;
-    const deviceId = this.registry.entity(entityId)?.device_id;
-    const stillSameDevice = !!deviceId && this.registry.fullEntities[battery]?.device_id === deviceId;
-    return stillSameDevice ? JSON.stringify([mapping ?? null, battery]) : fingerprint;
-  }
   async dispose() {
     this.stopObserving();
     if (this.removalRecheckTimer) {
@@ -180160,14 +180136,8 @@ var ServerModeEndpointManager = class extends Service {
         ids.add(mappedId);
       }
     }
-    if (this.batteryRetryCandidates.size > 0) {
-      for (const entity of Object.values(this.registry.fullEntities)) {
-        if (!entity.device_id) continue;
-        if (!this.batteryRetryCandidates.has(entity.device_id)) continue;
-        if (entity.entity_id.startsWith("sensor.") || entity.entity_id.startsWith("binary_sensor.")) {
-          ids.add(entity.entity_id);
-        }
-      }
+    for (const id of this.mappingSync.candidateSensorIds()) {
+      ids.add(id);
     }
     return [...ids];
   }
@@ -180183,11 +180153,7 @@ var ServerModeEndpointManager = class extends Service {
       clearTimeout(this.removalRecheckTimer);
       this.removalRecheckTimer = null;
     }
-    if (this.batteryRetryTimer) {
-      clearTimeout(this.batteryRetryTimer);
-      this.batteryRetryTimer = null;
-    }
-    this.batteryRetryScheduled = false;
+    this.mappingSync.cancelRetry();
   }
   /** Primary first (the entity the first include matcher tests true for). */
   orderEntityIds(ids) {
@@ -180382,9 +180348,12 @@ var ServerModeEndpointManager = class extends Service {
           });
           continue;
         }
-        const fingerprint = this.computeMappingFingerprint(mapping, entityId);
         const existing = this.endpoints.get(entityId);
-        if (existing && existing.fingerprint === this.compareFingerprint(mapping, entityId, existing.fingerprint)) {
+        if (existing && existing.fingerprint === this.mappingSync.compareFingerprint(
+          mapping,
+          entityId,
+          existing.fingerprint
+        )) {
           this.log.debug(`Device endpoint already exists for ${entityId}`);
           continue;
         }
@@ -180453,9 +180422,14 @@ var ServerModeEndpointManager = class extends Service {
             continue;
           }
           await this.serverNode.addDevice(endpoint);
-          const builtBattery = fingerprintBattery(fingerprint);
-          const asBuilt = builtBattery != null && !endpoint.mappedEntityIds.includes(builtBattery) ? JSON.stringify([mapping ?? null, null]) : fingerprint;
-          this.endpoints.set(entityId, { endpoint, fingerprint: asBuilt });
+          this.endpoints.set(entityId, {
+            endpoint,
+            fingerprint: this.mappingSync.fingerprintAsBuilt(
+              mapping,
+              entityId,
+              endpoint.mappedEntityIds
+            )
+          });
           for (const [id, owner] of this.parkedEndpointIds) {
             if (id === endpointId || owner === entityId) {
               this.parkedEndpointIds.delete(id);
@@ -180483,7 +180457,11 @@ var ServerModeEndpointManager = class extends Service {
       if (lifecycle === this.lifecycle) {
         this.scheduleRemovalRecheck();
       }
-      this.rebuildBatteryRetryCandidates();
+      this.mappingSync.rebuildCandidates(
+        [...this.endpoints].map(
+          ([entityId, entry]) => [entityId, entry.fingerprint]
+        )
+      );
       if (this.observingRequested) {
         this.startObserving();
       }
@@ -180491,7 +180469,12 @@ var ServerModeEndpointManager = class extends Service {
   }
   async updateStates(states) {
     this.registry.mergeExternalStates(states);
-    this.maybeRetryBatteryMapping(states);
+    this.mappingSync.maybeRetry(
+      states,
+      null,
+      this.observingRequested,
+      () => this.refreshDevices()
+    );
     for (const [entityId, entry] of this.endpoints) {
       try {
         await entry.endpoint.updateStates(states);