@riddix/hamh 2.0.41 → 2.0.43

package/dist/backend/cli.js

@@ -146781,7 +146781,7 @@ var init_bridge_config_schema = __esm({
         },
         autoComposedDevices: {
           title: "Auto Composed Devices",
-          description: "Master toggle: combine related entities from the same Home Assistant device into a single Matter endpoint. Turns on battery, humidity, pressure, power, and energy auto-mapping at once \u2014 a Shelly Plug shows up as one device with power monitoring instead of several siblings.",
+          description: "Master toggle: combine related entities from the same Home Assistant device into a single Matter endpoint. Turns on battery, humidity, pressure, power, and energy auto-mapping at once, a Shelly Plug shows up as one device with power monitoring instead of several siblings.",
           type: "boolean",
           default: false
         },
@@ -146799,13 +146799,13 @@ var init_bridge_config_schema = __esm({
         },
         preferEntityRegistryName: {
           title: "Prefer Entity Registry Name (HA 2026.4 workaround)",
-          description: "Use the entity registry name (or original_name) as nodeLabel instead of the composed friendly_name. Since Home Assistant 2026.4, friendly_name is prefixed with the device name, which breaks voice commands that relied on the short entity name. Resolution order: customName \u2192 registry name \u2192 registry original_name \u2192 friendly_name \u2192 entity_id. Matter has no alias concept \u2014 this only changes which single name is reported.",
+          description: "Use the entity registry name (or original_name) as nodeLabel instead of the composed friendly_name. Since Home Assistant 2026.4, friendly_name is prefixed with the device name, which breaks voice commands that relied on the short entity name. Resolution order: customName \u2192 registry name \u2192 registry original_name \u2192 friendly_name \u2192 entity_id. Matter has no alias concept, this only changes which single name is reported.",
           type: "boolean",
           default: false
         },
         vacuumOnOff: {
           title: "Vacuum: Include OnOff Cluster (Alexa)",
-          description: "Add an OnOff cluster to robot vacuum endpoints. Alexa REQUIRES this (PowerController) to show robotic vacuums in the app. Without it, Alexa commissions the device but never displays it. In Server Mode this is enabled automatically \u2014 only check this for bridge mode. WARNING: OnOff is NOT part of the Matter RVC device type specification. Enabling this may break Apple Home (shows 'Updating') and Google Home.",
+          description: "Add an OnOff cluster to robot vacuum endpoints. Alexa REQUIRES this (PowerController) to show robotic vacuums in the app. Without it, Alexa commissions the device but never displays it. In Server Mode this is enabled automatically, only check this for bridge mode. WARNING: OnOff is NOT part of the Matter RVC device type specification. Enabling this may break Apple Home (shows 'Updating') and Google Home.",
           type: "boolean"
         },
         alexaPreserveBrightnessOnTurnOn: {
@@ -147874,6 +147874,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     valetudoIdentifier: config10.valetudoIdentifier,
                     coverSwapOpenClose: config10.coverSwapOpenClose,
                     disableClimateOnOff: config10.disableClimateOnOff,
+                    disableClimateFanControl: config10.disableClimateFanControl,
                     customServiceAreas: config10.customServiceAreas,
                     customFanSpeedTags: config10.customFanSpeedTags,
                     composedEntities: config10.composedEntities
@@ -148020,6 +148021,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   valetudoIdentifier: config10.valetudoIdentifier,
                   coverSwapOpenClose: config10.coverSwapOpenClose,
                   disableClimateOnOff: config10.disableClimateOnOff,
+                  disableClimateFanControl: config10.disableClimateFanControl,
                   customServiceAreas: config10.customServiceAreas,
                   customFanSpeedTags: config10.customFanSpeedTags,
                   composedEntities: config10.composedEntities
@@ -148594,7 +148596,14 @@ function addLogEntry(entry) {
 function logsApi(_logger) {
   const router = express5.Router();
   router.get("/", (req, res) => {
-    const { level, search, limit = "100", offset = "0" } = req.query;
+    const {
+      level,
+      search,
+      category,
+      facility,
+      limit = "100",
+      offset = "0"
+    } = req.query;
     const limitNum = Math.min(
       500,
       Math.max(1, parseInt(limit, 10) || 100)
@@ -148605,6 +148614,18 @@ function logsApi(_logger) {
       const levels = level.split(",").map((l) => l.toLowerCase().trim());
       entries = entries.filter((e) => levels.includes(e.level.toLowerCase()));
     }
+    if (category && typeof category === "string") {
+      const cats = category.split(",").map((c) => c.toLowerCase().trim());
+      entries = entries.filter(
+        (e) => e.category != null && cats.includes(e.category.toLowerCase())
+      );
+    }
+    if (facility && typeof facility === "string") {
+      const facLower = facility.toLowerCase();
+      entries = entries.filter(
+        (e) => e.facility?.toLowerCase().includes(facLower)
+      );
+    }
     if (search && typeof search === "string") {
       const searchLower = search.toLowerCase();
       entries = entries.filter(
@@ -148840,6 +148861,7 @@ function entityMappingApi(mappingStorage) {
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
       disableClimateOnOff: body.disableClimateOnOff,
+      disableClimateFanControl: body.disableClimateFanControl,
       composedEntities: body.composedEntities
     };
     const config10 = await mappingStorage.setMapping(request);
@@ -149303,7 +149325,8 @@ function configToProfileEntry(config10) {
     customFanSpeedTags: config10.customFanSpeedTags,
     valetudoIdentifier: config10.valetudoIdentifier,
     coverSwapOpenClose: config10.coverSwapOpenClose,
-    disableClimateOnOff: config10.disableClimateOnOff
+    disableClimateOnOff: config10.disableClimateOnOff,
+    disableClimateFanControl: config10.disableClimateFanControl
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -149425,7 +149448,8 @@ function mappingProfileApi(mappingStorage) {
           customFanSpeedTags: entry.customFanSpeedTags,
           valetudoIdentifier: entry.valetudoIdentifier,
           coverSwapOpenClose: entry.coverSwapOpenClose,
-          disableClimateOnOff: entry.disableClimateOnOff
+          disableClimateOnOff: entry.disableClimateOnOff,
+          disableClimateFanControl: entry.disableClimateFanControl
         });
         applied++;
       } catch (e) {
@@ -151603,6 +151627,17 @@ init_esm7();
 
 // src/core/app/logger.ts
 init_esm();
+var MATTER_TRAFFIC_FACILITIES = /* @__PURE__ */ new Set([
+  "InteractionServer",
+  "MessageExchange",
+  "MessageChannel",
+  "ServerSubscription",
+  "IncomingInteractionServerMessenger",
+  "ExchangeManager"
+]);
+function categoryFor(facility) {
+  return MATTER_TRAFFIC_FACILITIES.has(facility) ? "matter-traffic" : void 0;
+}
 function logLevelFromString(level) {
   const customNames = {
     SILLY: -1 /* SILLY */
@@ -151648,6 +151683,26 @@ var LoggerService = class {
       MessageExchange: resolvedProtocolLevel
     };
     Logger.format = options.disableColors ? LogFormat.PLAIN : LogFormat.ANSI;
+    const destinationLevel = this.customLogLevelMapping[this._level] ?? this._level;
+    Logger.destinations["hamh-buffer"] = LogDestination({
+      name: "hamh-buffer",
+      level: destinationLevel,
+      facilityLevels: {
+        MessageChannel: resolvedProtocolLevel,
+        MessageExchange: resolvedProtocolLevel
+      },
+      write: (text, message) => {
+        const category = categoryFor(message.facility);
+        if (!category) return;
+        addLogEntry({
+          timestamp: message.now.toISOString(),
+          level: logLevelToString(message.level).toLowerCase(),
+          message: text,
+          facility: message.facility,
+          category
+        });
+      }
+    });
   }
   get(nameOrService) {
     let name;
@@ -152743,7 +152798,7 @@ var HomeAssistantRegistry = class extends Service {
     let refreshing = false;
     this.autoRefresh = setInterval(async () => {
       if (refreshing) {
-        logger146.debug("Skipping registry refresh \u2014 previous tick still running");
+        logger146.debug("Skipping registry refresh, previous tick still running");
         return;
       }
       refreshing = true;
@@ -153295,9 +153350,10 @@ var EntityMappingStorage = class extends Service {
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       disableClimateOnOff: request.disableClimateOnOff || void 0,
+      disableClimateFanControl: request.disableClimateFanControl || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && !config10.disableClimateOnOff && (!config10.composedEntities || config10.composedEntities.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && !config10.customSerialNumber && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && !config10.disableClimateOnOff && !config10.disableClimateFanControl && (!config10.composedEntities || config10.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -165331,7 +165387,7 @@ var ServerModeServerNode = class extends ServerNode {
   /**
    * Update root-level BasicInformation with entity-specific data.
    * In server mode, controllers (Apple Home, Alexa) read the root node's
-   * BasicInformation — not the device endpoint's BridgedDeviceBasicInformation.
+   * BasicInformation, not the device endpoint's BridgedDeviceBasicInformation.
    * Without this, server-mode devices show bridge defaults (e.g. "riddix" / "MatterHub").
    */
   async updateDeviceIdentity(entityId, device, mapping, friendlyName) {
@@ -167516,7 +167572,9 @@ function createBridgeServerConfig(data) {
       hardwareVersion: data.basicInformation.hardwareVersion,
       softwareVersion: data.basicInformation.softwareVersion,
       hardwareVersionString: data.basicInformation.hardwareVersionString,
-      softwareVersionString: data.basicInformation.softwareVersionString ?? String(data.basicInformation.softwareVersion),
+      // Keep the root string aligned with the numeric softwareVersion. Aqara
+      // stalls bridge registration when the two diverge (#316).
+      softwareVersionString: String(data.basicInformation.softwareVersion),
       ...data.countryCode ? { location: data.countryCode } : {}
     },
     subscriptions: {
@@ -167840,7 +167898,7 @@ ${e?.toString()}`);
         );
         if (totalSubs === 0 && sessions.length > 0) {
           this.log.warn(
-            `All subscriptions lost \u2014 ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
+            `All subscriptions lost, ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
           );
           if (!this.deadSessionTimer) {
             this.deadSessionTimer = setTimeout(() => {
@@ -167888,7 +167946,7 @@ ${e?.toString()}`);
         for (const s of [...sessionManager.sessions]) {
           if (s !== newSession && !s.isClosing && s.peerNodeId === newSession.peerNodeId && s.fabric?.fabricIndex === newSession.fabric?.fabricIndex && s.subscriptions.size === 0) {
             this.log.info(
-              `Closing stale session ${s.id} (peer ${s.peerNodeId}, 0 subs) \u2014 replaced by session ${newSession.id}`
+              `Closing stale session ${s.id} (peer ${s.peerNodeId}, 0 subs), replaced by session ${newSession.id}`
             );
             s.initiateForceClose().catch(() => {
             });
@@ -168343,7 +168401,7 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -168409,7 +168467,7 @@ var ElectricalEnergyMeasurementServerBase = class extends FeaturedBase {
       );
     }
     this.update();
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update() {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
@@ -168469,7 +168527,7 @@ var ElectricalPowerMeasurementServerBase = class extends ElectricalPowerMeasurem
       );
     }
     this.update();
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update() {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
@@ -168522,7 +168580,7 @@ var HumidityMeasurementServerBase = class extends RelativeHumidityMeasurementSer
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -168586,7 +168644,7 @@ var PowerSourceServerBase = class extends FeaturedBase2 {
       );
     }
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -168672,7 +168730,7 @@ var TemperatureMeasurementServerBase = class extends TemperatureMeasurementServe
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -168714,7 +168772,7 @@ var HepaFilterMonitoringServerBase = class extends FeaturedBase3 {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -169192,7 +169250,7 @@ var FeaturedBase5 = FanControlServer.with(
   "Rocking",
   "Wind"
 ).set({
-  // rockSupport / windSupport are Fixed quality attributes — they MUST be set
+  // rockSupport / windSupport are Fixed quality attributes, they MUST be set
   // via .set() at behavior creation time, NOT in initialize().
   // Without these, controllers reject attempts to enable rocking/wind.
   rockSupport: { rockUpDown: true },
@@ -169968,7 +170026,7 @@ var PressureMeasurementServerBase = class extends PressureMeasurementServer {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -170528,7 +170586,7 @@ var BooleanStateServerBase = class extends BooleanStateServer {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -170606,7 +170664,7 @@ var PirOccupancySensingServer = class extends PirOccupancySensingServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -170674,7 +170732,7 @@ var OccupancySensingServer2 = class extends OccupancySensingServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -170789,7 +170847,7 @@ var SmokeAlarmServerImpl = class extends SmokeAlarmServerWithFeature {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const isOn = this.agent.get(HomeAssistantEntityBehavior).isAvailable && entity.state.state === "on";
@@ -170803,7 +170861,7 @@ var CoAlarmServerImpl = class extends CoAlarmServerWithFeature {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const isOn = this.agent.get(HomeAssistantEntityBehavior).isAvailable && entity.state.state === "on";
@@ -171084,6 +171142,23 @@ var ClimateOnOffServer = OnOffServer2({
 
 // src/matter/endpoints/legacy/climate/behaviors/climate-thermostat-server.ts
 init_dist();
+
+// src/utils/converters/snap-to-step.ts
+function snapToStep(target, current, step) {
+  if (step == null || !Number.isFinite(step) || step <= 0) return target;
+  const ratio = target / step;
+  const lower = Math.floor(ratio) * step;
+  const upper = Math.ceil(ratio) * step;
+  if (lower === upper) return target;
+  const distLower = target - lower;
+  const distUpper = upper - target;
+  if (distLower < distUpper) return lower;
+  if (distUpper < distLower) return upper;
+  if (current == null || !Number.isFinite(current)) return upper;
+  return target > current ? upper : lower;
+}
+
+// src/matter/endpoints/legacy/climate/behaviors/climate-thermostat-server.ts
 init_home_assistant_entity_behavior();
 
 // src/matter/behaviors/thermostat-server.ts
@@ -171279,7 +171354,7 @@ var ThermostatServerBase = class extends FullFeaturedBase {
       // Heat/Cool/Off but SKIPS Auto (see #handleSystemModeChange in Matter.js).
       // Without this, switching Heat→Auto leaves runningMode stale at Heat.
       // 889010b set for ALL modes (conflicted with reactor), 0678d35 set for NONE
-      // (stale in Auto). da04b2e's Auto-only approach is correct — the issues
+      // (stale in Auto). da04b2e's Auto-only approach is correct, the issues
       // reported after it were caused by localTemperature fallback, not runningMode.
       ...this.features.heating && this.features.cooling && systemMode === Thermostat3.SystemMode.Auto ? { thermostatRunningMode: runningMode } : {}
     });
@@ -171564,7 +171639,7 @@ var CoolingOnlyThermostatServerBase = class extends CoolingOnlyFeaturedBase {
   static State = class extends CoolingOnlyFeaturedBase.State {
     config;
   };
-  // Each variant MUST define its own initialize() — see HeatingOnly comment above.
+  // Each variant MUST define its own initialize(), see HeatingOnly comment above.
   async initialize() {
     thermostatPreInitialize(this);
     await super.initialize();
@@ -171586,7 +171661,7 @@ var HeatingAndCoolingThermostatServerBase = class extends HeatingAndCoolingFeatu
   static State = class extends HeatingAndCoolingFeaturedBase.State {
     config;
   };
-  // Each variant MUST define its own initialize() — see HeatingOnly comment above.
+  // Each variant MUST define its own initialize(), see HeatingOnly comment above.
   async initialize() {
     thermostatPreInitialize(this);
     await super.initialize();
@@ -171667,6 +171742,18 @@ var getTemp = (agent, entity, attributeName) => {
     return Temperature.withUnit(+temperature3, unit);
   }
 };
+var getStep = (entity) => {
+  const raw = attributes4(entity).target_temp_step;
+  if (raw == null) return void 0;
+  const num = typeof raw === "string" ? parseFloat(raw) : raw;
+  return Number.isFinite(num) && num > 0 ? num : void 0;
+};
+var getRefTemp = (entity, attr) => {
+  const raw = attributes4(entity)[attr];
+  if (raw == null) return void 0;
+  const num = typeof raw === "string" ? parseFloat(raw) : raw;
+  return Number.isFinite(num) ? num : void 0;
+};
 var systemModeToHvacMode = {
   [Thermostat3.SystemMode.Auto]: ClimateHvacMode.heat_cool,
   [Thermostat3.SystemMode.Precooling]: ClimateHvacMode.cool,
@@ -171745,7 +171832,7 @@ var config4 = {
         const direction = getHeatCoolOnlyDirection(entity, agent);
         return direction === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
       }
-      const hasMatterAuto = modes.includes(ClimateHvacMode.heat_cool) || modes.includes(ClimateHvacMode.auto);
+      const hasMatterAuto = modes.includes(ClimateHvacMode.heat_cool) && (modes.includes(ClimateHvacMode.heat) || modes.includes(ClimateHvacMode.cool));
       if (hasMatterAuto) {
         return systemMode;
       }
@@ -171759,11 +171846,34 @@ var config4 = {
       if (hasCooling && !hasHeating) {
         return Thermostat3.SystemMode.Cool;
       }
+      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+      const entityId = homeAssistant.entityId;
       const action = attributes4(entity).hvac_action;
       if (action === ClimateHvacAction.cooling) {
+        lastHvacDirection.set(entityId, "cooling");
         return Thermostat3.SystemMode.Cool;
       }
-      return Thermostat3.SystemMode.Heat;
+      if (action === ClimateHvacAction.heating) {
+        lastHvacDirection.set(entityId, "heating");
+        return Thermostat3.SystemMode.Heat;
+      }
+      const remembered = lastHvacDirection.get(entityId);
+      if (remembered) {
+        return remembered === "cooling" ? Thermostat3.SystemMode.Cool : Thermostat3.SystemMode.Heat;
+      }
+      const current = attributes4(entity).current_temperature;
+      const target = attributes4(entity).temperature;
+      if (typeof current === "number" && typeof target === "number") {
+        if (current > target) {
+          lastHvacDirection.set(entityId, "cooling");
+          return Thermostat3.SystemMode.Cool;
+        }
+        if (current < target) {
+          lastHvacDirection.set(entityId, "heating");
+          return Thermostat3.SystemMode.Heat;
+        }
+      }
+      return Thermostat3.SystemMode.Cool;
     }
     return systemMode;
   },
@@ -171825,19 +171935,37 @@ var config4 = {
       data: { hvac_mode: targetMode }
     };
   },
-  setTargetTemperature: (value, agent) => ({
-    action: "climate.set_temperature",
-    data: {
-      temperature: value.toUnit(getUnit(agent))
-    }
-  }),
-  setTargetTemperatureRange: ({ low, high }, agent) => ({
-    action: "climate.set_temperature",
-    data: {
-      target_temp_low: low.toUnit(getUnit(agent)),
-      target_temp_high: high.toUnit(getUnit(agent))
-    }
-  })
+  setTargetTemperature: (value, agent) => {
+    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    const entity = homeAssistant.entity.state;
+    const unit = getUnit(agent);
+    const target = value.toUnit(unit);
+    const step = getStep(entity);
+    const current = getRefTemp(entity, "temperature") ?? getRefTemp(entity, "target_temperature");
+    return {
+      action: "climate.set_temperature",
+      data: {
+        temperature: snapToStep(target, current, step)
+      }
+    };
+  },
+  setTargetTemperatureRange: ({ low, high }, agent) => {
+    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    const entity = homeAssistant.entity.state;
+    const unit = getUnit(agent);
+    const step = getStep(entity);
+    const lowTarget = low.toUnit(unit);
+    const highTarget = high.toUnit(unit);
+    const lowCurrent = getRefTemp(entity, "target_temp_low") ?? getRefTemp(entity, "temperature");
+    const highCurrent = getRefTemp(entity, "target_temp_high") ?? getRefTemp(entity, "temperature");
+    return {
+      action: "climate.set_temperature",
+      data: {
+        target_temp_low: snapToStep(lowTarget, lowCurrent, step),
+        target_temp_high: snapToStep(highTarget, highCurrent, step)
+      }
+    };
+  }
 };
 function ClimateThermostatServer(initialState = {}, features2) {
   return ThermostatServer2(config4, initialState, features2);
@@ -171917,10 +172045,7 @@ function ClimateDevice(homeAssistantEntity) {
   }
   const supportsHumidity = attributes7.current_humidity != null || testBit(supportedFeatures, ClimateDeviceFeature.TARGET_HUMIDITY);
   const supportsOnOff = testBit(supportedFeatures, ClimateDeviceFeature.TURN_ON) && testBit(supportedFeatures, ClimateDeviceFeature.TURN_OFF) && homeAssistantEntity.mapping?.disableClimateOnOff !== true;
-  const supportsFanMode = testBit(
-    supportedFeatures,
-    ClimateDeviceFeature.FAN_MODE
-  );
+  const supportsFanMode = testBit(supportedFeatures, ClimateDeviceFeature.FAN_MODE) && homeAssistantEntity.mapping?.disableClimateFanControl !== true;
   const initialState = {
     // Pass actual current_temperature for initial state.
     // If unavailable (null/undefined), update() will fall back to the
@@ -171934,7 +172059,7 @@ function ClimateDevice(homeAssistantEntity) {
     minCoolSetpointLimit: toMatterTemp(attributes7.min_temp) ?? 0,
     maxCoolSetpointLimit: toMatterTemp(attributes7.max_temp) ?? 5e3
   };
-  const autoMode = supportsHeating && supportsCooling && (attributes7.hvac_modes.includes(ClimateHvacMode.heat_cool) || attributes7.hvac_modes.includes(ClimateHvacMode.auto)) && (attributes7.hvac_modes.includes(ClimateHvacMode.heat) || attributes7.hvac_modes.includes(ClimateHvacMode.cool));
+  const autoMode = supportsHeating && supportsCooling && attributes7.hvac_modes.includes(ClimateHvacMode.heat_cool) && (attributes7.hvac_modes.includes(ClimateHvacMode.heat) || attributes7.hvac_modes.includes(ClimateHvacMode.cool));
   return ClimateDeviceType(
     supportsOnOff,
     supportsHumidity,
@@ -172059,6 +172184,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
         this.state.targetPositionTiltPercent100ths = null;
       }
     }
+    this.state.type = this.features.lift && this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindLift : this.features.tilt ? WindowCovering3.WindowCoveringType.TiltBlindTiltOnly : WindowCovering3.WindowCoveringType.Rollershade;
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
@@ -172177,7 +172303,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     } else if (type === MovementType.Tilt) {
       if (targetPercent100ths == null && this.lastLiftMovementDirection === direction && Date.now() - this.lastLiftMovementMs < 50) {
         logger179.info(
-          `Skipping tilt ${MovementDirection[direction]} \u2014 lift already moving in same direction`
+          `Skipping tilt ${MovementDirection[direction]}, lift already moving in same direction`
         );
         return;
       }
@@ -172351,6 +172477,13 @@ var DEVICE_CLASS_TO_MATTER_TYPE = {
   shade: {
     type: WindowCovering3.WindowCoveringType.Rollershade,
     endProductType: WindowCovering3.EndProductType.RollerShade
+  },
+  // Velux-style motorized roof/casement windows. There's no Matter
+  // WindowCoveringType for "window", so we map to lift-only Rollershade
+  // and use Unknown end-product to avoid implying a specific physical form.
+  window: {
+    type: WindowCovering3.WindowCoveringType.Rollershade,
+    endProductType: WindowCovering3.EndProductType.Unknown
   }
 };
 var deviceClassMapping = (entity) => {
@@ -172359,12 +172492,21 @@ var deviceClassMapping = (entity) => {
   const mapping = DEVICE_CLASS_TO_MATTER_TYPE[raw.toLowerCase()];
   if (!mapping) return void 0;
   const supportedFeatures = attributes5(entity).supported_features ?? 0;
+  const hasLift = (supportedFeatures & CoverSupportedFeatures.support_open) !== 0;
   const hasTilt = (supportedFeatures & CoverSupportedFeatures.support_open_tilt) !== 0;
-  if (mapping.type === WindowCovering3.WindowCoveringType.TiltBlindTiltOnly && !hasTilt) {
-    return {
-      type: WindowCovering3.WindowCoveringType.Rollershade,
-      endProductType: mapping.endProductType
-    };
+  if (mapping.type === WindowCovering3.WindowCoveringType.TiltBlindTiltOnly) {
+    if (!hasTilt) {
+      return {
+        type: WindowCovering3.WindowCoveringType.Rollershade,
+        endProductType: mapping.endProductType
+      };
+    }
+    if (hasLift) {
+      return {
+        type: WindowCovering3.WindowCoveringType.TiltBlindLift,
+        endProductType: mapping.endProductType
+      };
+    }
   }
   return mapping;
 };
@@ -174596,7 +174738,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase8 {
    *
    * The base class registers a reactor on onOff$Changed that sets
    * currentLevel = onLevel. This is designed for lights (restore brightness
-   * on power-on) but is wrong for speakers — it overwrites the correct
+   * on power-on) but is wrong for speakers, it overwrites the correct
    * volume (e.g. 191 for 75%) with a stale onLevel value, causing Google
    * Home to display the wrong percentage (Issue #79).
    */
@@ -174943,7 +175085,7 @@ var AirQualitySensorServerImpl = class extends AirQualityServerWithFeatures {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175054,7 +175196,7 @@ var CarbonMonoxideConcentrationMeasurementServer2 = class extends CarbonMonoxide
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175085,7 +175227,7 @@ var CoAirQualityServer = class extends CoAirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -175125,7 +175267,7 @@ var StandalonePowerServer = class extends ElectricalPowerMeasurementServer {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175183,7 +175325,7 @@ var StandaloneEnergyServer = class extends EnergyFeaturedBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175239,7 +175381,7 @@ var FlowMeasurementServerBase = class extends FlowMeasurementServer {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175331,7 +175473,7 @@ var FormaldehydeConcentrationMeasurementServer2 = class extends FormaldehydeConc
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175362,7 +175504,7 @@ var FormaldehydeAirQualityServer = class extends FormaldehydeAirQualityServerBas
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -175421,7 +175563,7 @@ var IlluminanceMeasurementServerBase = class extends IlluminanceMeasurementServe
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175505,7 +175647,7 @@ var NitrogenDioxideConcentrationMeasurementServer2 = class extends NitrogenDioxi
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175535,7 +175677,7 @@ var No2AirQualityServer = class extends No2AirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -175598,7 +175740,7 @@ var OzoneConcentrationMeasurementServer2 = class extends OzoneConcentrationMeasu
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175628,7 +175770,7 @@ var OzoneAirQualityServer = class extends OzoneAirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -175691,7 +175833,7 @@ var Pm1ConcentrationMeasurementServer2 = class extends Pm1ConcentrationMeasureme
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175721,7 +175863,7 @@ var Pm1AirQualityServer = class extends Pm1AirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -175804,7 +175946,7 @@ var RadonConcentrationMeasurementServer2 = class extends RadonConcentrationMeasu
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -175834,7 +175976,7 @@ var RadonAirQualityServer = class extends RadonAirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -175952,7 +176094,7 @@ var TvocConcentrationMeasurementServer = class extends TvocConcentrationMeasurem
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -176002,7 +176144,7 @@ var TvocAirQualityServer = class extends TvocAirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -176069,7 +176211,7 @@ var CarbonDioxideConcentrationMeasurementServer2 = class extends CarbonDioxideCo
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -176102,7 +176244,7 @@ var Co2AirQualityServer = class extends Co2AirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -176165,7 +176307,7 @@ var Pm10ConcentrationMeasurementServer2 = class extends Pm10ConcentrationMeasure
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -176197,7 +176339,7 @@ var Pm10AirQualityServer = class extends Pm10AirQualityServerBase {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -176269,7 +176411,7 @@ var Pm25ConcentrationMeasurementServer2 = class extends Pm25ConcentrationMeasure
     );
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     if (!entity.state || !entity.state.attributes) {
@@ -176304,7 +176446,7 @@ var Pm25AirQualityServer = class extends Pm25AirQualityServerBase {
     logger189.debug("Pm25AirQualityServer: after super.initialize()");
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
     const state = entity.state.state;
@@ -176601,7 +176743,7 @@ function SensorDevice(homeAssistantEntity) {
   if (deviceClass) {
     diagnosticEventBus.emit(
       "entity_warning",
-      `Sensor "${homeAssistantEntity.entity.entity_id}" has unsupported device_class "${deviceClass}" \u2014 skipped`,
+      `Sensor "${homeAssistantEntity.entity.entity_id}" has unsupported device_class "${deviceClass}", skipped`,
       {
         entityId: homeAssistantEntity.entity.entity_id,
         details: { device_class: deviceClass }
@@ -176688,6 +176830,7 @@ init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
 var logger190 = Logger.get("VacuumIdentifyServer");
+var IDENTIFY_BUTTON_SUFFIXES = ["_identify", "_locate", "_find_me"];
 var VacuumIdentifyServer = class extends IdentifyServer2 {
   triggerEffect(effect) {
     this.#locate("triggerEffect");
@@ -176702,16 +176845,40 @@ var VacuumIdentifyServer = class extends IdentifyServer2 {
   #locate(source) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const features2 = homeAssistant.entity.state.attributes.supported_features ?? 0;
-    const hasLocate = testBit(features2, VacuumDeviceFeature.LOCATE);
-    if (!hasLocate) {
-      logger190.warn(
-        `${source} for ${homeAssistant.entityId} \u2014 LOCATE not in supported_features (${features2}), calling vacuum.locate anyway`
-      );
-    } else {
+    if (testBit(features2, VacuumDeviceFeature.LOCATE)) {
       logger190.info(`${source} \u2192 vacuum.locate for ${homeAssistant.entityId}`);
+      homeAssistant.callAction({ action: "vacuum.locate" });
+      return;
     }
+    const sibling = this.#findIdentifyButton(homeAssistant);
+    if (sibling) {
+      logger190.info(
+        `${source} \u2192 button.press ${sibling} for ${homeAssistant.entityId}`
+      );
+      homeAssistant.callAction({ action: "button.press", target: sibling });
+      return;
+    }
+    logger190.warn(
+      `${source} for ${homeAssistant.entityId}, LOCATE not in supported_features (${features2}), trying vacuum.locate anyway`
+    );
     homeAssistant.callAction({ action: "vacuum.locate" });
   }
+  #findIdentifyButton(homeAssistant) {
+    const deviceId = homeAssistant.entity.registry?.device_id;
+    if (!deviceId) return void 0;
+    const registry2 = this.env.get(HomeAssistantRegistry);
+    for (const entity of Object.values(registry2.entities)) {
+      if (entity.device_id !== deviceId) continue;
+      if (!entity.entity_id.startsWith("button.")) continue;
+      const uniqueId = entity.unique_id ?? "";
+      if (IDENTIFY_BUTTON_SUFFIXES.some(
+        (s) => entity.entity_id.endsWith(s) || uniqueId.endsWith(s)
+      )) {
+        return entity.entity_id;
+      }
+    }
+    return void 0;
+  }
 };
 
 // src/matter/behaviors/rvc-run-mode-server.ts
@@ -176822,7 +176989,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
       if (!currentRoomEntityId) {
         this.logShortCircuitOnce(
           "no-mapping",
-          "currentRoom sensor: no currentRoomEntity in mapping \u2014 auto-detect did not run or sensor not on same HA device"
+          "currentRoom sensor: no currentRoomEntity in mapping, auto-detect did not run or sensor not on same HA device"
         );
         return;
       }
@@ -176835,26 +177002,22 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         );
         return;
       }
-      if (s.activeAreas.length === 0) {
-        this.logShortCircuitOnce(
-          "no-active-areas",
-          `currentRoom sensor: activeAreas empty while cleaning \u2014 sensor=${currentRoomEntityId} state="${roomState.state}"`
-        );
-        return;
-      }
       const serviceArea = this.agent.get(ServiceAreaBehavior);
+      const externalSession = s.activeAreas.length === 0;
+      const supportedAreaIds = serviceArea.state.supportedAreas.map(
+        (a) => a.areaId
+      );
+      const isAllowedArea = (id) => externalSession ? supportedAreaIds.includes(id) : s.activeAreas.includes(id);
       const sensorAttrs = roomState.attributes;
       const segmentId = sensorAttrs.segment_id ?? sensorAttrs.room_id;
       const roomName = roomState.state;
       let matchedAreaId = null;
-      if (segmentId != null) {
-        if (s.activeAreas.includes(segmentId)) {
-          matchedAreaId = segmentId;
-        }
+      if (segmentId != null && isAllowedArea(segmentId)) {
+        matchedAreaId = segmentId;
       }
       if (matchedAreaId === null && segmentId != null) {
         for (const area of serviceArea.state.supportedAreas) {
-          if (s.activeAreas.includes(area.areaId) && area.areaId % 1e4 === segmentId) {
+          if (isAllowedArea(area.areaId) && area.areaId % 1e4 === segmentId) {
             matchedAreaId = area.areaId;
             break;
           }
@@ -176864,7 +177027,7 @@ var RvcRunModeServerBase = class extends RvcRunModeServer {
         const area = serviceArea.state.supportedAreas.find(
           (a) => a.areaInfo.locationInfo?.locationName?.toLowerCase() === roomName.toLowerCase()
         );
-        if (area && s.activeAreas.includes(area.areaId)) {
+        if (area && isAllowedArea(area.areaId)) {
           matchedAreaId = area.areaId;
         }
       }
@@ -177608,9 +177771,8 @@ function buildSupportedModes2(attributes7, includeUnnamedRooms = false, customAr
   }
   return modes;
 }
-function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant, serviceArea) {
+function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant) {
   const matched = selectedAreas.map((areaId) => customAreas[areaId - 1]).filter(Boolean);
-  serviceArea.state.selectedAreas = [];
   if (matched.length === 0) {
     logger194.warn(
       `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
@@ -177680,14 +177842,12 @@ var vacuumRvcRunModeConfig = {
           return handleCustomServiceAreas(
             selectedAreas,
             customAreas,
-            homeAssistant,
-            serviceArea
+            homeAssistant
           );
         }
         const cleanAreaRooms = homeAssistant.state.mapping?.cleanAreaRooms;
         if (cleanAreaRooms && cleanAreaRooms.length > 0) {
           const haAreaIds = resolveCleanAreaIds(selectedAreas, cleanAreaRooms);
-          serviceArea.state.selectedAreas = [];
           if (haAreaIds.length > 0) {
             logger194.info(
               `CLEAN_AREA: cleaning HA areas: ${haAreaIds.join(", ")}`
@@ -177713,7 +177873,6 @@ var vacuumRvcRunModeConfig = {
             logger194.info(
               `Roborock: Pressing button entities for selected rooms: ${buttonEntityIds.join(", ")}`
             );
-            serviceArea.state.selectedAreas = [];
             for (let i = 1; i < buttonEntityIds.length; i++) {
               homeAssistant.callAction({
                 action: "button.press",
@@ -177728,7 +177887,6 @@ var vacuumRvcRunModeConfig = {
         }
         const vacuumEntityId = homeAssistant.entityId;
         if (vacuumEntityId.startsWith("vacuum.valetudo_")) {
-          serviceArea.state.selectedAreas = [];
           return buildValetudoSegmentAction(
             vacuumEntityId,
             selectedAreas,
@@ -177751,7 +177909,6 @@ var vacuumRvcRunModeConfig = {
           logger194.info(
             `Starting cleaning with selected areas: ${roomIds.join(", ")}`
           );
-          serviceArea.state.selectedAreas = [];
           if (isDreameVacuum(attributes7)) {
             if (targetMapName) {
               const vacName = vacuumEntityId.replace("vacuum.", "");
@@ -178209,33 +178366,24 @@ function buildSupportedModes3(fanSpeedList, mopIntensityList, cleaningModeOption
   }
   return modes;
 }
-var CLEANING_MODE_ALIASES = {
-  [0 /* Sweeping */]: [
-    "Sweeping",
-    "Vacuum",
-    "Vacuuming",
-    "Sweep",
-    "vacuum",
-    "sweeping"
-  ],
-  [1 /* Mopping */]: ["Mopping", "Mop", "mopping", "mop", "wet_mop"],
-  [2 /* SweepingAndMopping */]: [
-    "Sweeping and mopping",
-    "Vacuum and mop",
-    "Vacuum & Mop",
-    "Vacuum & mop",
-    "vacuum_and_mop",
-    "sweeping_and_mopping"
-  ],
-  [3 /* MoppingAfterSweeping */]: [
-    "Mopping after sweeping",
-    "mopping_after_sweeping",
-    "Vacuum then mop",
-    "Mop after vacuum",
-    "vacuum_then_mop",
-    "mop_after_vacuum"
-  ]
+var CLEAN_TOKENS = {
+  vacuum: /\b(vacuum|vacuuming|sweep|sweeping|suction)\b/i,
+  mop: /\b(mop|mopping|wipe|wet|wash|scrub)\b/i,
+  sequential: /\b(then|after|before|followed|following|first|secondly|sequentially)\b/i
 };
+function normalizeCleanLabel(s) {
+  return s.toLowerCase().replace(/[_\-+&/. ]+/g, " ").replace(/\band\b/g, " ").trim();
+}
+function classifyCleanOption(option) {
+  const s = normalizeCleanLabel(option);
+  const hasVac = CLEAN_TOKENS.vacuum.test(s);
+  const hasMop = CLEAN_TOKENS.mop.test(s);
+  const hasSeq = CLEAN_TOKENS.sequential.test(s);
+  if (hasVac && hasMop && hasSeq) return 3 /* MoppingAfterSweeping */;
+  if (hasVac && hasMop) return 2 /* SweepingAndMopping */;
+  if (hasMop) return 1 /* Mopping */;
+  return 0 /* Sweeping */;
+}
 var CLEAN_TYPE_LABELS = {
   [0 /* Sweeping */]: "Sweeping",
   [1 /* Mopping */]: "Mopping",
@@ -178368,17 +178516,7 @@ function matchMopIntensityOption(name, availableOptions) {
 }
 function parseCleanType(modeString) {
   if (!modeString) return 0 /* Sweeping */;
-  const s = modeString.toLowerCase();
-  if (s.includes("mopping after") || s.includes("after sweeping") || s.includes("then_mop") || s.includes("then mop")) {
-    return 3 /* MoppingAfterSweeping */;
-  }
-  if (s.includes("and") || s.includes("sweeping and mopping")) {
-    return 2 /* SweepingAndMopping */;
-  }
-  if (s === "mopping" || s.includes("mop")) {
-    return 1 /* Mopping */;
-  }
-  return 0 /* Sweeping */;
+  return classifyCleanOption(modeString);
 }
 function cleanTypeToModeId(ct) {
   switch (ct) {
@@ -178419,30 +178557,20 @@ var CLEAN_TYPE_FALLBACK = {
   [3 /* MoppingAfterSweeping */]: 2 /* SweepingAndMopping */
 };
 function findMatchingCleanOption(ct, availableOptions) {
-  const aliases = CLEANING_MODE_ALIASES[ct];
-  if (!availableOptions || availableOptions.length === 0) return aliases[0];
+  if (!availableOptions || availableOptions.length === 0) {
+    return CLEAN_TYPE_LABELS[ct];
+  }
   const typesToTry = [ct];
   const fallback = CLEAN_TYPE_FALLBACK[ct];
   if (fallback !== void 0) typesToTry.push(fallback);
   for (const type of typesToTry) {
-    const typeAliases = CLEANING_MODE_ALIASES[type];
-    for (const alias of typeAliases) {
-      const match = availableOptions.find(
-        (o) => o.toLowerCase() === alias.toLowerCase()
-      );
-      if (match) return match;
-    }
-    for (const alias of typeAliases) {
-      const match = availableOptions.find(
-        (o) => o.toLowerCase().includes(alias.toLowerCase())
-      );
-      if (match) return match;
-    }
+    const match = availableOptions.find((o) => classifyCleanOption(o) === type);
+    if (match) return match;
   }
   logger196.warn(
     `No match for ${CLEAN_TYPE_LABELS[ct]} in [${availableOptions.join(", ")}]`
   );
-  return aliases[0];
+  return availableOptions[0];
 }
 function buildCleaningModeAction(targetCleanType, agent) {
   const selectEntityId = getCleaningModeSelectEntity(agent);
@@ -178577,7 +178705,7 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
       const vacuumEntityId = homeAssistant.entityId;
       const mapping = homeAssistant.state.mapping;
       logger196.info(
-        `setCleanMode(${mode}) for ${vacuumEntityId} \u2014 suctionEntity=${mapping?.suctionLevelEntity ?? "none"}, mopEntity=${mapping?.mopIntensityEntity ?? "none"}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, customTags=${JSON.stringify(customFanSpeedTags ?? {})}`
+        `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;
@@ -180544,7 +180672,7 @@ var BridgeEndpointManager = class extends Service {
         this.mappingFingerprints.delete(endpoint.entityId);
       } else if (this.registry.isAutoComposedDevicesEnabled() && this.registry.isComposedSubEntityUsed(endpoint.entityId)) {
         this.log.info(
-          `Deleting standalone endpoint ${endpoint.entityId} \u2014 consumed by composed device`
+          `Deleting standalone endpoint ${endpoint.entityId}, consumed by composed device`
         );
         try {
           await endpoint.delete();
@@ -180582,14 +180710,14 @@ var BridgeEndpointManager = class extends Service {
       if (!memoryLimitReached && isHeapUnderPressure()) {
         memoryLimitReached = true;
         this.log.error(
-          "Memory pressure detected \u2014 skipping remaining entities to prevent OOM crash. Reduce the number of entities in this bridge or increase the Node.js heap size (NODE_OPTIONS=--max-old-space-size=1024)."
+          "Memory pressure detected, skipping remaining entities to prevent OOM crash. Reduce the number of entities in this bridge or increase the Node.js heap size (NODE_OPTIONS=--max-old-space-size=1024)."
         );
       }
       if (memoryLimitReached) {
         if (!existingEndpoints.some((e) => e.entityId === entityId)) {
           this._failedEntities.push({
             entityId,
-            reason: "Skipped due to memory pressure \u2014 reduce entities or increase heap size"
+            reason: "Skipped due to memory pressure, reduce entities or increase heap size"
           });
         }
         continue;
@@ -180601,7 +180729,7 @@ var BridgeEndpointManager = class extends Service {
       }
       if (this.registry.isAutoComposedDevicesEnabled() && this.registry.isComposedSubEntityUsed(entityId)) {
         this.log.debug(
-          `Skipping ${entityId} \u2014 already part of a composed device`
+          `Skipping ${entityId}, already part of a composed device`
         );
         continue;
       }
@@ -180701,7 +180829,7 @@ var BridgeEndpointManager = class extends Service {
   }
   /**
    * Log detailed behavior error information for debugging "Behaviors have errors".
-   * Matter.js EndpointBehaviorsError extends AggregateError — the `errors` array
+   * Matter.js EndpointBehaviorsError extends AggregateError, the `errors` array
    * contains individual behavior crash errors (one per failed behavior).
    */
   logDetailedError(entityId, error) {
@@ -180850,7 +180978,7 @@ var BridgeRegistry = class _BridgeRegistry {
    * Check if auto composed devices mode is enabled.
    * When enabled, temperature sensors with auto-mapped humidity/pressure/battery
    * build real Matter Composed Devices (BridgedNodeEndpoint with sub-endpoints)
-   * rather than stacking extra clusters onto a flat TemperatureSensor —
+   * rather than stacking extra clusters onto a flat TemperatureSensor.
    * Apple Home, Google Home, and Alexa render each sub-endpoint using its
    * own device type.
    */
@@ -180996,8 +181124,8 @@ var BridgeRegistry = class _BridgeRegistry {
         } else if (id.endsWith("_mode")) {
           const options = state.attributes?.options;
           if (options?.some(
-            (o) => /^(vacuum|mop|sweep|vacuum_and_mop|vacuum_then_mop|mopping|sweeping|sweeping_and_mopping|mopping_after_sweeping)$/i.test(
-              o
+            (o) => /^(vacuum|mop|sweep|sweep_mop|sweep_before_mopping|sweep_then_mop|vacuum_and_mop|vacuum_then_mop|mopping|sweeping|sweeping_and_mopping|mopping_after_sweeping)$/i.test(
+              o.replace(/\s+/g, "_")
             )
           )) {
             cleaningModeEntity = entity.entity_id;
@@ -181155,14 +181283,14 @@ var BridgeRegistry = class _BridgeRegistry {
         const segments = areaMapping[haAreaId];
         if (!segments || segments.length === 0) {
           _BridgeRegistry.cleanAreaLogger.debug(
-            `${entityId}: Skipping HA area ${haAreaId} \u2014 no segments mapped`
+            `${entityId}: Skipping HA area ${haAreaId}, no segments mapped`
           );
           continue;
         }
         if (validSegmentIds && !segments.some((sid) => validSegmentIds.has(sid))) {
           const areaName2 = this.registry.areas.get(haAreaId) ?? haAreaId;
           _BridgeRegistry.cleanAreaLogger.info(
-            `${entityId}: Skipping stale HA area "${areaName2}" (${haAreaId}) \u2014 segments [${segments.join(", ")}] no longer exist on vacuum`
+            `${entityId}: Skipping stale HA area "${areaName2}" (${haAreaId}), segments [${segments.join(", ")}] no longer exist on vacuum`
           );
           continue;
         }
@@ -181638,7 +181766,7 @@ ${e?.toString()}`);
         );
         if (totalSubs === 0 && sessions.length > 0) {
           this.log.warn(
-            `All subscriptions lost \u2014 ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
+            `All subscriptions lost, ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
           );
           if (!this.deadSessionTimer) {
             this.deadSessionTimer = setTimeout(() => {
@@ -181677,7 +181805,7 @@ ${e?.toString()}`);
         for (const s of [...sessionManager.sessions]) {
           if (s !== newSession && !s.isClosing && s.peerNodeId === newSession.peerNodeId && s.fabric?.fabricIndex === newSession.fabric?.fabricIndex && s.subscriptions.size === 0) {
             this.log.info(
-              `Closing stale session ${s.id} (peer ${s.peerNodeId}, 0 subs) \u2014 replaced by session ${newSession.id}`
+              `Closing stale session ${s.id} (peer ${s.peerNodeId}, 0 subs), replaced by session ${newSession.id}`
             );
             s.initiateForceClose().catch(() => {
             });
@@ -182098,7 +182226,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
         }
       }
     } else {
-      logger205.warn(`${entityId}: No device_id \u2014 cannot auto-assign battery`);
+      logger205.warn(`${entityId}: No device_id, cannot auto-assign battery`);
     }
     const payload = {
       entity_id: entityId,
@@ -182154,7 +182282,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
    *  Previous approaches that pushed state through
    *  HomeAssistantEntityBehavior failed because the reactor writes
    *  (RvcOperationalStateServer.update()) run inside the postCommit
-   *  phase of the HAEntityBehavior transaction — those writes are
+   *  phase of the HAEntityBehavior transaction, those writes are
    *  buffered but never committed, so no attrsChanged event reaches
    *  the ServerSubscription.
    *
@@ -182400,11 +182528,11 @@ var ServerModeEndpointManager = class extends Service {
     }
     if (isHeapUnderPressure()) {
       this.log.error(
-        "Memory pressure detected \u2014 cannot create device endpoint. Reduce entities on other bridges or increase the Node.js heap size (NODE_OPTIONS=--max-old-space-size=1024)."
+        "Memory pressure detected, cannot create device endpoint. Reduce entities on other bridges or increase the Node.js heap size (NODE_OPTIONS=--max-old-space-size=1024)."
       );
       this._failedEntities.push({
         entityId,
-        reason: "Skipped due to memory pressure \u2014 reduce entities or increase heap size"
+        reason: "Skipped due to memory pressure, reduce entities or increase heap size"
       });
       return;
     }
@@ -182794,7 +182922,7 @@ function patchLevelControlTlv() {
     );
   } else {
     logger206.warn(
-      "Failed to patch LevelControl TLV schemas \u2014 field definitions not found. Google Home brightness adjustment may not work."
+      "Failed to patch LevelControl TLV schemas, field definitions not found. Google Home brightness adjustment may not work."
     );
   }
 }